server: restore weak workspace web access

This commit is contained in:
2026-08-02 03:24:54 +09:00
parent e530150e43
commit e5f3c20f64
5 changed files with 34 additions and 368 deletions
@@ -731,12 +731,4 @@ Deno.test("Workspace Worker list and Console share the multiplexed connection",
multiplexer.includes("frame: 'worker_protocol'"),
"Sidebar and Console should share one Workspace multiplexer and route Worker methods through a subscription lane",
);
assert(
multiplexer.includes("loadWhoami") &&
multiplexer.includes("actor === null") &&
multiplexer.includes("AUTH_RECHECK_DELAY_MS") &&
multiplexer.includes("Register or sign in on the Account page") &&
consolePage.includes("workspace_subscription_auth_required"),
"Workspace multiplexer should replace a tight unauthenticated WebSocket loop with an actionable auth status and bounded recheck",
);
});
+14 -43
View File
@@ -6,7 +6,6 @@ import type {
SubscriptionId,
} from '$lib/generated/protocol';
import { workspaceApiPath } from '$lib/workspace/api/http';
import { loadWhoami } from '$lib/workspace/auth/api';
type Listener = {
onFrame(frame: SubscriptionFrame): void;
@@ -27,9 +26,6 @@ export type WorkspaceMultiplexerSubscription = {
};
const multiplexers = new Map<string, WorkspaceMultiplexer>();
const RECONNECT_DELAY_MS = 500;
const AUTH_RECHECK_DELAY_MS = 5_000;
const AUTH_REQUIRED_MESSAGE = 'Authentication required. Register or sign in on the Account page.';
export function workspaceMultiplexer(workspaceId: string): WorkspaceMultiplexer {
let multiplexer = multiplexers.get(workspaceId);
@@ -93,45 +89,20 @@ export class WorkspaceMultiplexer {
});
socket.addEventListener('message', (event) => this.#receive(String(event.data)));
socket.addEventListener('error', () => socket.close());
socket.addEventListener('close', () => void this.#handleSocketClose(socket));
}
async #handleSocketClose(socket: WebSocket): Promise<void> {
if (this.#socket !== socket) return;
this.#socket = null;
this.#requests.clear();
this.#runtimeSubscriptions.clear();
for (const subscription of this.#subscriptions.values()) {
subscription.requestId = null;
subscription.subscriptionId = null;
}
if (this.#closed || this.#subscriptions.size === 0) return;
let authenticationRequired = false;
try {
authenticationRequired = (await loadWhoami()).actor === null;
} catch {
// A failed auth probe is treated as a transient network/backend failure.
}
if (this.#closed || this.#subscriptions.size === 0 || this.#socket) return;
const message = authenticationRequired
? AUTH_REQUIRED_MESSAGE
: 'Workspace subscription disconnected';
for (const subscription of this.#subscriptions.values()) {
subscription.listener.onStatus?.('closed', message);
}
this.#scheduleReconnect(
authenticationRequired ? AUTH_RECHECK_DELAY_MS : RECONNECT_DELAY_MS,
);
}
#scheduleReconnect(delayMs: number): void {
if (this.#reconnectTimer) clearTimeout(this.#reconnectTimer);
this.#reconnectTimer = setTimeout(() => {
this.#reconnectTimer = null;
this.#ensureConnected();
}, delayMs);
socket.addEventListener('close', () => {
if (this.#socket !== socket) return;
this.#socket = null;
this.#requests.clear();
this.#runtimeSubscriptions.clear();
for (const subscription of this.#subscriptions.values()) {
subscription.requestId = null;
subscription.subscriptionId = null;
subscription.listener.onStatus?.('closed', 'Workspace subscription disconnected');
}
if (!this.#closed && this.#subscriptions.size > 0) {
this.#reconnectTimer = setTimeout(() => this.#ensureConnected(), 500);
}
});
}
#sendSubscribe(subscription: ActiveSubscription): void {
@@ -564,29 +564,11 @@
];
}
},
onStatus: (status, message) => {
onStatus: (status) => {
if (token !== reloadToken) return;
const authenticationRequired = message?.startsWith("Authentication required") ?? false;
protocolState = authenticationRequired
? "error"
: status === "open"
? "connecting"
: status;
if (authenticationRequired && message) {
streamDiagnostics = [
...streamDiagnostics.filter(
(diagnostic) =>
diagnostic.code !== "workspace_subscription_auth_required",
),
{
code: "workspace_subscription_auth_required",
severity: "error",
message,
},
];
}
protocolState = status === "open" ? "connecting" : status;
if (status === "closed") {
rejectPendingCompletion(new Error(message ?? "Worker protocol WebSocket closed."));
rejectPendingCompletion(new Error("Worker protocol WebSocket closed."));
}
},
},