fix: remove secure-context websocket id dependency

This commit is contained in:
2026-08-11 04:58:47 +09:00
parent e88b0cda18
commit 1d498d13c3
3 changed files with 24 additions and 5 deletions
@@ -735,6 +735,11 @@ 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('nextMultiplexerId') &&
!multiplexer.includes('crypto.randomUUID'),
"Workspace subscription correlation IDs should not require secure-context crypto APIs",
);
assert(
multiplexer.includes("this.#socket?.readyState === WebSocket.OPEN") &&
multiplexer.includes("this.#sendSubscribe(subscription)") &&
@@ -26,6 +26,12 @@ export type WorkspaceMultiplexerSubscription = {
};
const multiplexers = new Map<string, WorkspaceMultiplexer>();
let nextMultiplexerSequence = 0;
function nextMultiplexerId(kind: 'client' | 'request'): string {
nextMultiplexerSequence += 1;
return `${kind}-${nextMultiplexerSequence}`;
}
export function workspaceMultiplexer(workspaceId: string): WorkspaceMultiplexer {
let multiplexer = multiplexers.get(workspaceId);
@@ -53,7 +59,7 @@ export class WorkspaceMultiplexer {
selector: EventSubscriptionSelector,
listener: Listener,
): WorkspaceMultiplexerSubscription {
const clientId = crypto.randomUUID();
const clientId = nextMultiplexerId('client');
const subscription: ActiveSubscription = {
clientId,
selector,
@@ -112,7 +118,7 @@ export class WorkspaceMultiplexer {
}
#sendSubscribe(subscription: ActiveSubscription): void {
const requestId = crypto.randomUUID();
const requestId = nextMultiplexerId('request');
subscription.requestId = requestId;
this.#requests.set(requestId, subscription.clientId);
this.#send({
@@ -198,7 +204,7 @@ export class WorkspaceMultiplexer {
message: {
method: 'unsubscribe_events',
params: {
request_id: crypto.randomUUID(),
request_id: nextMultiplexerId('request'),
subscription_id: subscription.subscriptionId,
},
},