The best way to control Claude Code, Codex and more from any computer or phone
fix(server): close media streams on session invalidation (#37871)
Julius Marminge committed
Nov 17, 2026 at 01:37 UTC
d1f7683d7ecc244271748edc720693a9d7045f39
5 files changed
+124
-16
apps/server/src/device/DeviceHubProxy.stream.test.ts
+19
@@ -2,6 +2,7 @@ import { expect, it } from "@effect/vitest";
2
import * as NodeWS from "@effect/platform-node/NodeWS";
3
import * as NodeNet from "node:net";
4
import * as Context from "effect/Context";
5
+import * as Deferred from "effect/Deferred";
6
import * as Effect from "effect/Effect";
7
import * as Fiber from "effect/Fiber";
8
import * as Layer from "effect/Layer";
@@ -14,6 +15,7 @@ import {
15
LOCAL_DEVICE_HOST_ID,
16
} from "@t3tools/contracts";
17
import * as EnvironmentAuth from "../auth/EnvironmentAuth.ts";
18
+import * as SessionStore from "../auth/SessionStore.ts";
19
import * as DeviceService from "./DeviceService.ts";
20
import * as DeviceHubProxy from "./DeviceHubProxy.ts";
21
@@ -34,13 +36,23 @@ it.effect("preserves binary input and admission frames through the real socket p
36
yield* Effect.promise(() => new Promise<void>((resolve) => hub.once("listening", resolve)));
37
const address = hub.address();
38
if (typeof address !== "object" || !address) throw new Error("Missing hub port");
39
+ const upstreamClosed = Promise.withResolvers<void>();
40
hub.on("connection", (socket) => {
41
+ socket.once("close", upstreamClosed.resolve);
42
socket.send(Uint8Array.of(0x83));
43
socket.on("message", (data, binary) => socket.send(data, { binary }));
44
});
45
+ const invalidated = yield* Deferred.make<void>();
46
const services = yield* Layer.build(
47
HttpRouter.serve(DeviceHubProxy.layer, { disableListenLog: true }).pipe(
48
Layer.provideMerge(NodeHttpServer.layerTest),
49
+ Layer.provide(
50
+ Layer.mock(SessionStore.SessionStore, {
51
+ cookieName: "test",
52
+ legacyCookieName: undefined,
53
+ awaitInvalidation: () => Deferred.await(invalidated),
54
+ }),
55
+ ),
56
Layer.provide(
57
Layer.succeed(EnvironmentAuth.EnvironmentAuth, {
58
authenticateWebSocketUpgrade: () =>
@@ -88,6 +100,12 @@ it.effect("preserves binary input and admission frames through the real socket p
100
});
101
yield* Effect.promise(() => received.promise);
102
expect(frames).toEqual([[0x83], [0x03, 1], [0x03, 2]]);
103
+
104
+ const closed = new Promise<void>((resolve) =>
105
+ client.addEventListener("close", () => resolve(), { once: true }),
106
+ );
107
+ yield* Deferred.succeed(invalidated, undefined);
108
+ yield* Effect.promise(() => Promise.all([closed, upstreamClosed.promise]));
109
}),
110
);
111
@@ -117,6 +135,7 @@ it.live("closes an upstream socket that is still connecting without an unhandled
135
);
136
const connection = yield* Effect.promise(() => dialed.promise);
137
const abandoned = new Promise<void>((resolve) => connection.once("close", () => resolve()));
138
+ connection.resume();
139
yield* Fiber.interrupt(reading);
140
yield* Effect.promise(() => abandoned);
141
}),
apps/server/src/device/DeviceHubProxy.test.ts
+35
-1
@@ -10,6 +10,7 @@ import * as Effect from "effect/Effect";
10
import * as Layer from "effect/Layer";
11
import { HttpClient, HttpClientResponse, HttpRouter } from "effect/http";
12
import * as EnvironmentAuth from "../auth/EnvironmentAuth.ts";
13
+import * as SessionStore from "../auth/SessionStore.ts";
14
import type * as DeviceHost from "./DeviceHost.ts";
15
import * as DeviceService from "./DeviceService.ts";
16
import * as DeviceHubProxy from "./DeviceHubProxy.ts";
@@ -24,6 +25,8 @@ const fixture = (
25
fail = false,
26
authError?: EnvironmentAuth.ServerAuthCredentialError | EnvironmentAuth.ServerAuthInternalError,
27
upstream?: DeviceHost.DeviceHostReady["upstream"],
28
+ stream?: ReadableStream<Uint8Array>,
29
+ invalidated?: Promise<void>,
30
) => {
31
let finalized = 0;
32
const requests: string[] = [];
@@ -41,7 +44,7 @@ const fixture = (
44
if (fail) return yield* Effect.die(new Error("upstream failed"));
45
return HttpClientResponse.fromWeb(
46
request,
44
- new Response("frame", { headers: { "set-cookie": "upstream=1" } }),
47
+ new Response(stream ?? "frame", { headers: { "set-cookie": "upstream=1" } }),
48
);
49
}),
50
);
@@ -97,6 +100,13 @@ const fixture = (
100
}),
101
),
102
Layer.provideMerge(Layer.succeed(HttpClient.HttpClient, client)),
103
+ Layer.provideMerge(
104
+ Layer.mock(SessionStore.SessionStore, {
105
+ cookieName: "test",
106
+ legacyCookieName: undefined,
107
+ awaitInvalidation: () => (invalidated ? Effect.promise(() => invalidated) : Effect.never),
108
+ }),
109
+ ),
110
),
111
{ disableLogger: true },
112
);
@@ -116,6 +126,30 @@ describe("device hub proxy", () => {
126
expect(finalized()).toBe(1);
127
});
128
129
+ it("stops an open HTTP stream and releases its upstream on session invalidation", async () => {
130
+ const invalidated = Promise.withResolvers<void>();
131
+ const stream = new ReadableStream<Uint8Array>({
132
+ start: (controller) => controller.enqueue(new Uint8Array([1])),
133
+ });
134
+ const { handler, finalized } = fixture(
135
+ [AuthOrchestrationReadScope],
136
+ false,
137
+ undefined,
138
+ undefined,
139
+ stream,
140
+ invalidated.promise,
141
+ );
142
+ const response = await handler(
143
+ new Request("http://t3.test/api/device-hub/vendor/serve-sim/helper/device/stream.avcc"),
144
+ );
145
+ expect(response.status).toBe(200);
146
+ const reader = response.body!.getReader();
147
+ expect(await reader.read()).toEqual({ done: false, value: new Uint8Array([1]) });
148
+ invalidated.resolve();
149
+ expect((await reader.read()).done).toBe(true);
150
+ expect(finalized()).toBe(1);
151
+ });
152
+
153
it.each(["/vendor/serve-sim/helper/ws", "/vendor/serve-emu/ws"])(
154
"rejects input socket %s for a read-only session",
155
async (path) => {
apps/server/src/device/DeviceHubProxy.ts
+28
-10
@@ -5,6 +5,7 @@ import { AuthOrchestrationReadScope, AuthOrchestrationOperateScope } from "@t3to
5
import * as Effect from "effect/Effect";
6
import * as Layer from "effect/Layer";
7
import * as Option from "effect/Option";
8
+import * as Stream from "effect/Stream";
9
import {
10
HttpClient,
11
HttpClientRequest,
@@ -14,9 +15,11 @@ import {
15
HttpServerResponse,
16
} from "effect/http";
17
import * as Socket from "effect/socket/Socket";
18
+import * as NodeHttpServerRequest from "@effect/platform-node/NodeHttpServerRequest";
19
import * as NodeSocket from "@effect/platform-node/NodeSocket";
20
19
-import { authenticateMediaRequest } from "../auth/http.ts";
21
+import { authenticateMediaRequest, failEnvironmentInternal } from "../auth/http.ts";
22
+import * as SessionStore from "../auth/SessionStore.ts";
23
import * as DeviceService from "./DeviceService.ts";
24
import { repeatStillFrame } from "./mjpegStillFrame.ts";
25
@@ -101,6 +104,7 @@ const proxyWebSocket = Effect.fn("DeviceHubProxy.proxyWebSocket")(function* (
104
protocols: ReadonlyArray<string> = [],
105
headers: Readonly<Record<string, string>> = {},
106
) {
107
+ const transport = NodeHttpServerRequest.toIncomingMessage(request).socket;
108
const client = yield* request.upgrade;
109
const upstream = yield* Socket.makeWebSocket(upstreamUrl, {
110
openTimeout: "10 seconds",
@@ -116,7 +120,10 @@ const proxyWebSocket = Effect.fn("DeviceHubProxy.proxyWebSocket")(function* (
120
pumpFrames(client, writeToUpstream),
121
);
122
}),
119
- ).pipe(Effect.ignoreCause);
123
+ ).pipe(
124
+ Effect.onInterrupt(() => Effect.sync(() => transport.destroy())),
125
+ Effect.ignoreCause,
126
+ );
127
return HttpServerResponse.empty();
128
});
129
@@ -132,6 +139,7 @@ const pumpFrames =
139
const proxyHttp = Effect.fn("DeviceHubProxy.proxyHttp")(function* (
140
request: HttpServerRequest.HttpServerRequest,
141
upstreamUrl: string,
142
+ invalidated: Effect.Effect<void>,
143
extraHeaders: Readonly<Record<string, string>> = {},
144
) {
145
const httpClient = HttpClient.withScope(yield* HttpClient.HttpClient);
@@ -171,7 +179,7 @@ const proxyHttp = Effect.fn("DeviceHubProxy.proxyHttp")(function* (
179
const body = headers["content-type"]?.startsWith("multipart/x-mixed-replace")
180
? repeatStillFrame(response.stream)
181
: response.stream;
174
- return HttpServerResponse.stream(body, {
182
+ return HttpServerResponse.stream(body.pipe(Stream.interruptWhen(invalidated)), {
183
status: response.status,
184
headers,
185
...(headers["content-type"] ? { contentType: headers["content-type"] } : {}),
@@ -200,9 +208,16 @@ const handler = Effect.gen(function* () {
208
const controlsDevice =
209
(upgrade && hubPath !== "/api/devices/ws") ||
210
(!readOnly && /\/api\/(stream-(mode|settings)|fold)$/.test(hubPath));
203
- yield* authenticateMediaRequest(
211
+ const session = yield* authenticateMediaRequest(
212
controlsDevice ? AuthOrchestrationOperateScope : AuthOrchestrationReadScope,
213
);
214
+ const sessions = yield* SessionStore.SessionStore;
215
+ const invalidated = sessions.awaitInvalidation(session.sessionId).pipe(
216
+ Effect.catchTags({
217
+ SessionCredentialVerificationError: (error) =>
218
+ failEnvironmentInternal("internal_error", error).pipe(Effect.ignore),
219
+ }),
220
+ );
221
const devices = yield* DeviceService.DeviceService;
222
const ready = yield* devices.currentReadiness(url.value.searchParams.get("hostId") ?? undefined);
223
if (!ready) {
@@ -231,14 +246,17 @@ const handler = Effect.gen(function* () {
246
}
247
const upstreamUrl = routed?.url ?? `${ready.hub.origin}${hubPath}${search}`;
248
if (upgrade) {
234
- return yield* proxyWebSocket(
235
- request,
236
- upstreamUrl.replace(/^http/, "ws"),
237
- routed?.protocols,
238
- routed?.headers,
249
+ return yield* Effect.raceFirst(
250
+ proxyWebSocket(
251
+ request,
252
+ upstreamUrl.replace(/^http/, "ws"),
253
+ routed?.protocols,
254
+ routed?.headers,
255
+ ),
256
+ invalidated.pipe(Effect.as(HttpServerResponse.empty())),
257
);
258
}
241
- return yield* proxyHttp(request, upstreamUrl, routed?.headers);
259
+ return yield* proxyHttp(request, upstreamUrl, invalidated, routed?.headers);
260
});
261
262
export const layer = HttpRouter.add("*", `${DeviceService.DEVICE_HUB_ROUTE_PREFIX}/*`, handler);
apps/server/src/preview/ServerBrowserStream.test.ts
+25
-2
@@ -12,6 +12,7 @@ import {
12
type AuthEnvironmentScope,
13
} from "@t3tools/contracts";
14
import * as Context from "effect/Context";
15
+import * as Deferred from "effect/Deferred";
16
import * as Effect from "effect/Effect";
17
import * as FileSystem from "effect/FileSystem";
18
import * as Layer from "effect/Layer";
@@ -21,6 +22,7 @@ import * as Schema from "effect/Schema";
22
import { HttpRouter, HttpServer } from "effect/http";
23
24
import * as EnvironmentAuth from "../auth/EnvironmentAuth.ts";
25
+import * as SessionStore from "../auth/SessionStore.ts";
26
import * as PreviewBrowserHost from "./PreviewBrowserHost.ts";
27
import * as ServerBrowser from "./ServerBrowser.ts";
28
import { routeLayer } from "./ServerBrowserStream.ts";
@@ -30,6 +32,7 @@ const platformLayer = NodeHttpPlatform.layer.pipe(Layer.provideMerge(NodeService
32
const makeAuth = (
33
scopes: ReadonlyArray<AuthEnvironmentScope>,
34
error?: EnvironmentAuth.ServerAuthCredentialError,
35
+ awaitInvalidation: SessionStore.SessionStore["Service"]["awaitInvalidation"] = () => Effect.never,
36
) => {
37
const requests: string[] = [];
38
const layer = Layer.mock(EnvironmentAuth.EnvironmentAuth, {
@@ -45,7 +48,17 @@ const makeAuth = (
48
});
49
},
50
});
48
- return { layer, requests };
51
+ return {
52
+ layer: Layer.merge(
53
+ layer,
54
+ Layer.mock(SessionStore.SessionStore, {
55
+ cookieName: "test",
56
+ legacyCookieName: undefined,
57
+ awaitInvalidation,
58
+ }),
59
+ ),
60
+ requests,
61
+ };
62
};
63
64
const mutations = [
@@ -157,6 +170,7 @@ it.effect("sends replies ahead of stale frames and only the newest frame after a
170
Effect.gen(function* () {
171
const output = yield* Queue.make<ServerBrowser.ServerBrowserViewerOutput>();
172
const released: number[] = [];
173
+ const invalidated = yield* Deferred.make<void>();
174
const frame = (id: number): ServerBrowser.ServerBrowserViewerOutput => ({
175
_tag: "frame",
176
data: new Uint8Array([id]),
@@ -178,7 +192,10 @@ it.effect("sends replies ahead of stale frames and only the newest frame after a
192
{ disableListenLog: true },
193
).pipe(
194
Layer.provideMerge(NodeHttpServer.layerTest),
181
- Layer.provide(makeAuth([AuthOrchestrationReadScope]).layer),
195
+ Layer.provide(
196
+ makeAuth([AuthOrchestrationReadScope], undefined, () => Deferred.await(invalidated))
197
+ .layer,
198
+ ),
199
),
200
);
201
const server = Context.get(services, HttpServer.HttpServer);
@@ -222,6 +239,12 @@ it.effect("sends replies ahead of stale frames and only the newest frame after a
239
yield* Effect.promise(() => next.promise);
240
expect(received).toEqual([1, "probe", 4]);
241
expect(released).toEqual([2, 3, 1]);
242
+
243
+ const closed = new Promise<void>((resolve) =>
244
+ socket.addEventListener("close", () => resolve(), { once: true }),
245
+ );
246
+ yield* Deferred.succeed(invalidated, undefined);
247
+ yield* Effect.promise(() => closed);
248
}),
249
);
250
apps/server/src/preview/ServerBrowserStream.ts
+17
-3
@@ -20,7 +20,8 @@ import {
20
} from "effect/http";
21
import * as Socket from "effect/socket/Socket";
22
23
-import { authenticateMediaRequest } from "../auth/http.ts";
23
+import { authenticateMediaRequest, failEnvironmentInternal } from "../auth/http.ts";
24
+import * as SessionStore from "../auth/SessionStore.ts";
25
import { assetResponseHeaders } from "../http.ts";
26
import * as PreviewBrowserHost from "./PreviewBrowserHost.ts";
27
import * as ServerBrowser from "./ServerBrowser.ts";
@@ -79,7 +80,8 @@ const makeHandler = Effect.fnUntraced(function* (browser: ServerBrowser.ServerBr
80
if (threadId.length === 0 || tabId.length === 0) {
81
return HttpServerResponse.text("Not Found", { status: 404 });
82
}
82
- return yield* Effect.scoped(
83
+ const sessions = yield* SessionStore.SessionStore;
84
+ const stream = Effect.scoped(
85
Effect.gen(function* () {
86
const attached = yield* browser
87
.attachViewer({
@@ -198,7 +200,9 @@ const makeHandler = Effect.fnUntraced(function* (browser: ServerBrowser.ServerBr
200
const receiveInput = reader.pull.pipe(
201
Effect.flatMap((chunks) => Effect.forEach(chunks, receive, { discard: true })),
202
);
201
- return yield* Effect.raceFirst(Effect.forever(sendOutput), Effect.forever(receiveInput));
203
+ return yield* Effect.raceFirst(Effect.forever(sendOutput), Effect.forever(receiveInput)).pipe(
204
+ Effect.onInterrupt(() => Effect.sync(() => transport.destroy())),
205
+ );
206
}),
207
).pipe(
208
Effect.catchTags({
@@ -209,6 +213,16 @@ const makeHandler = Effect.fnUntraced(function* (browser: ServerBrowser.ServerBr
213
}),
214
Effect.orElseSucceed(() => HttpServerResponse.empty()),
215
);
216
+ return yield* Effect.raceFirst(
217
+ stream,
218
+ sessions.awaitInvalidation(session.sessionId).pipe(
219
+ Effect.as(HttpServerResponse.empty()),
220
+ Effect.catchTags({
221
+ SessionCredentialVerificationError: (error) =>
222
+ failEnvironmentInternal("internal_error", error),
223
+ }),
224
+ ),
225
+ );
226
});
227
228
const hostSetup = (cause: unknown): PreviewStreamHostSetup | undefined =>