Skip to content

Commit 18cc4e7

Browse files
authored
Merge branch 'main' into feat/desktop-voice-dictation-mic
2 parents f52f2d5 + 8ddd9f7 commit 18cc4e7

381 files changed

Lines changed: 29860 additions & 6249 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ dist-electron/
3030
.electron-runtime/
3131
.showcase/
3232
apps/mobile/.showcase/
33+
apps/mobile/.generated/
34+
/.generated/
3335
artifacts/app-store/screenshots/
3436
.github/pr-assets/
3537
native/**/target/
@@ -38,3 +40,6 @@ node_modules/
3840
*.log
3941
.env*
4042
!.env.example
43+
44+
# pnpm content-addressable store; never belongs in the repo.
45+
.pnpm-store/

‎apps/desktop/src/app/DesktopApp.ts‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import * as Cause from "effect/Cause";
2+
import * as Duration from "effect/Duration";
23
import * as Effect from "effect/Effect";
34
import * as Option from "effect/Option";
45
import * as Ref from "effect/Ref";
@@ -142,6 +143,20 @@ const handleFatalStartupError = Effect.fn("desktop.startup.handleFatalStartupErr
142143
const fatalStartupCause = <E>(stage: string, cause: Cause.Cause<E>) =>
143144
handleFatalStartupError(stage, Cause.pretty(cause)).pipe(Effect.andThen(Effect.failCause(cause)));
144145

146+
export const stopAllPoolInstances = Effect.fn("desktop.app.stopAllPoolInstances")(
147+
function* (): Effect.fn.Return<void, never, DesktopBackendPool.DesktopBackendPool> {
148+
// Stop every backend in the pool with a timeout to guarantee the quit
149+
// path makes progress even if a backend hangs during teardown.
150+
const pool = yield* DesktopBackendPool.DesktopBackendPool;
151+
const instances = yield* pool.list;
152+
yield* Effect.forEach(
153+
instances,
154+
(instance) => instance.stop({ timeout: Duration.seconds(5) }),
155+
{ concurrency: "unbounded" },
156+
);
157+
},
158+
);
159+
145160
const bootstrap = Effect.gen(function* () {
146161
const pool = yield* DesktopBackendPool.DesktopBackendPool;
147162
const primaryBackend = yield* pool.primary;
@@ -313,18 +328,12 @@ const scopedProgram = Effect.scoped(
313328
const shutdown = yield* DesktopShutdown.DesktopShutdown;
314329

315330
yield* Effect.addFinalizer(() =>
316-
Effect.gen(function* () {
317-
const pool = yield* DesktopBackendPool.DesktopBackendPool;
318-
// Stop every backend in the pool, not just the primary. The
319-
// electronApp.quit() path can race ahead of the layer-scope
320-
// cascade, so leaving the WSL instance for its parent scope
321-
// finalizer means it gets hard-killed by the OS instead of
322-
// receiving SIGTERM + grace. Stops run concurrently.
323-
const instances = yield* pool.list;
324-
yield* Effect.forEach(instances, (instance) => instance.stop(), {
325-
concurrency: "unbounded",
326-
});
327-
}).pipe(Effect.ensuring(shutdown.markComplete)),
331+
// Stop every backend in the pool, not just the primary. The
332+
// electronApp.quit() path can race ahead of the layer-scope
333+
// cascade, so leaving the WSL instance for its parent scope
334+
// finalizer means it gets hard-killed by the OS instead of
335+
// receiving SIGTERM + grace.
336+
stopAllPoolInstances().pipe(Effect.ensuring(shutdown.markComplete)),
328337
);
329338

330339
yield* startup;

‎apps/desktop/src/backend/DesktopBackendManager.test.ts‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstab
2323
import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
2424

2525
import * as DesktopBackendManager from "./DesktopBackendManager.ts";
26+
import * as DesktopApp from "../app/DesktopApp.ts";
27+
import * as DesktopBackendPool from "./DesktopBackendPool.ts";
2628
import * as DesktopObservability from "../app/DesktopObservability.ts";
2729
import * as DesktopTelemetryPublisher from "../telemetry/DesktopTelemetryPublisher.ts";
2830
import * as DesktopWslEnvironment from "../wsl/DesktopWslEnvironment.ts";
@@ -1503,4 +1505,76 @@ describe("DesktopBackendManager", () => {
15031505
}).pipe(Effect.provide(TestClock.layer())),
15041506
),
15051507
);
1508+
1509+
it.effect("stopAllPoolInstances bounds the quit finalizer when backends hang", () =>
1510+
Effect.scoped(
1511+
Effect.gen(function* () {
1512+
// Each backend's process-scope finalizer reports when it starts and
1513+
// when it finishes, keyed by instance name, so the test can prove
1514+
// both backends reached each milestone instead of inferring it from
1515+
// a shared flag or a clock advance.
1516+
const teardownStarted = yield* Queue.unbounded<string>();
1517+
const teardownFinished = yield* Queue.unbounded<string>();
1518+
const allowTeardown = yield* Deferred.make<void>();
1519+
1520+
const makeInstance = (name: string) =>
1521+
makeTestInstance({
1522+
spawnerLayer: Layer.succeed(
1523+
ChildProcessSpawner.ChildProcessSpawner,
1524+
ChildProcessSpawner.make(() =>
1525+
Effect.gen(function* () {
1526+
const scope = yield* Scope.Scope;
1527+
yield* Scope.addFinalizer(
1528+
scope,
1529+
Queue.offer(teardownStarted, name).pipe(
1530+
Effect.andThen(Deferred.await(allowTeardown)),
1531+
Effect.andThen(Queue.offer(teardownFinished, name)),
1532+
Effect.asVoid,
1533+
),
1534+
);
1535+
return makeProcess({ exitCode: Effect.never });
1536+
}),
1537+
),
1538+
),
1539+
httpClientLayer: httpClientLayer(() => Effect.never),
1540+
});
1541+
1542+
const instance1 = yield* makeInstance("instance1");
1543+
const instance2 = yield* makeInstance("instance2");
1544+
1545+
yield* instance1.start;
1546+
yield* instance2.start;
1547+
1548+
const mockPool = Layer.succeed(DesktopBackendPool.DesktopBackendPool, {
1549+
list: Effect.succeed([instance1, instance2]),
1550+
get: () => Effect.succeed(Option.none()),
1551+
primary: Effect.die(new Error("primary not implemented")),
1552+
register: () => Effect.die(new Error("register not implemented")),
1553+
unregister: () => Effect.die(new Error("unregister not implemented")),
1554+
});
1555+
1556+
// Mirror the quit path: register stopAllPoolInstances as a scope
1557+
// finalizer and let the scope close run it, rather than calling it
1558+
// as an ordinary interruptible effect.
1559+
const quitFiber = yield* Effect.scoped(
1560+
Effect.addFinalizer(() => DesktopApp.stopAllPoolInstances()),
1561+
).pipe(Effect.provide(mockPool), Effect.forkChild);
1562+
1563+
const started = yield* Queue.takeN(teardownStarted, 2);
1564+
assert.deepEqual(started.toSorted(), ["instance1", "instance2"]);
1565+
1566+
// Both backends are now hung in teardown. Advancing past the 5s
1567+
// budget must let the quit finalizer return without them.
1568+
yield* TestClock.adjust(Duration.seconds(5));
1569+
yield* Fiber.join(quitFiber);
1570+
assert.equal(yield* Queue.size(teardownFinished), 0);
1571+
1572+
// The timed-out closes keep running in the background and finish
1573+
// once the backends unblock.
1574+
yield* Deferred.succeed(allowTeardown, undefined);
1575+
const finished = yield* Queue.takeN(teardownFinished, 2);
1576+
assert.deepEqual(finished.toSorted(), ["instance1", "instance2"]);
1577+
}).pipe(Effect.provide(TestClock.layer())),
1578+
),
1579+
);
15061580
});

‎apps/desktop/src/electron/ElectronProtocol.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ describe("ElectronProtocol", () => {
226226
"https:",
227227
]);
228228
assert.deepEqual(directives["media-src"], ["'self'", "t3code:", "blob:", "http:", "https:"]);
229+
assert.deepEqual(directives["frame-src"], ["'self'", "blob:", "http:", "https:"]);
229230
assert.deepEqual(directives["font-src"], ["'self'", "t3code:", "data:"]);
230231
});
231232
});

‎apps/desktop/src/electron/ElectronProtocol.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,9 @@ export function makeDesktopContentSecurityPolicy(input: DesktopProtocolRegistrat
9191
"style-src 'self' 'unsafe-inline'",
9292
`font-src 'self' ${input.scheme}: data:`,
9393
"worker-src 'self' blob:",
94-
"frame-src 'self' https://challenges.cloudflare.com",
94+
// Document viewers use local Blob URLs and signed assets from runtime environments.
95+
// HTML viewers retain their own sandbox; the renderer's script policy stays unchanged.
96+
"frame-src 'self' blob: http: https:",
9597
"form-action 'self'",
9698
].join("; ");
9799
}

‎apps/desktop/src/preview/BrowserSession.test.ts‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const { fromPartition, sessions } = vi.hoisted(() => ({
1313
{
1414
readonly clearCache: ReturnType<typeof vi.fn>;
1515
readonly clearStorageData: ReturnType<typeof vi.fn>;
16-
readonly getUserAgent: ReturnType<typeof vi.fn>;
16+
readonly getUserAgent: ReturnType<typeof vi.fn<() => string>>;
1717
readonly setPermissionRequestHandler: ReturnType<typeof vi.fn>;
1818
readonly setPermissionCheckHandler: ReturnType<typeof vi.fn>;
1919
readonly setUserAgent: ReturnType<typeof vi.fn>;
@@ -102,6 +102,44 @@ describe("BrowserSession", () => {
102102
}).pipe(Effect.provide(layer)),
103103
);
104104

105+
// A rewritten session UA — any variant, even ones that keep the Electron
106+
// token — makes Cloudflare Turnstile loop with error 600010 (#5002), so
107+
// the guest must end up with Electron's native User-Agent. The mock applies
108+
// setUserAgent calls, so this fails on any reintroduced rewrite while still
109+
// permitting a harmless re-set of the unchanged native string.
110+
it.effect("keeps the guest's effective User-Agent equal to Electron's native one", () =>
111+
Effect.gen(function* () {
112+
// Electron's real UA shape: app token, then Chrome, then Electron, then
113+
// Safari — the token order and casing matter to any strip regex.
114+
const nativeUserAgent =
115+
"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) T3Code(Alpha)/0.0.33 Chrome/146.0.7680.216 Electron/41.5.0 Safari/537.36";
116+
fromPartition.mockReset();
117+
fromPartition.mockImplementation((partition: string) => {
118+
let userAgent = nativeUserAgent;
119+
const browserSession = {
120+
clearCache: vi.fn(() => Promise.resolve()),
121+
clearStorageData: vi.fn(() => Promise.resolve()),
122+
getUserAgent: vi.fn(() => userAgent),
123+
setPermissionRequestHandler: vi.fn(),
124+
setPermissionCheckHandler: vi.fn(),
125+
setUserAgent: vi.fn((next: string) => {
126+
userAgent = next;
127+
}),
128+
};
129+
sessions.set(partition, browserSession);
130+
return browserSession;
131+
});
132+
133+
const browserSessions = yield* BrowserSession.BrowserSession;
134+
const partition = yield* browserSessions.getPartition("scope-a");
135+
yield* browserSessions.getSession("scope-a");
136+
137+
const browserSession = sessions.get(partition);
138+
assert.isDefined(browserSession);
139+
assert.strictEqual(browserSession.getUserAgent(), nativeUserAgent);
140+
}).pipe(Effect.provide(layer)),
141+
);
142+
105143
it.effect("grants clipboard-sanitized-write through both the request and check handlers", () =>
106144
Effect.gen(function* () {
107145
const browserSessions = yield* BrowserSession.BrowserSession;

‎apps/desktop/src/preview/BrowserSession.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,12 @@ export const make = Effect.gen(function* BrowserSessionMake() {
197197
return Effect.try({
198198
try: () => {
199199
const browserSession = session.fromPartition(partition);
200-
const userAgent = browserSession
201-
.getUserAgent()
202-
.replace(/Electron\/[\d.]+ /, "")
203-
.replace(/\s*t3code\/[\d.]+/, "");
204-
browserSession.setUserAgent(userAgent);
200+
// The guest keeps Electron's native User-Agent. Rewriting it in any
201+
// form — even variants that keep the Electron token — makes Cloudflare
202+
// Turnstile fail its integrity check with error 600010 and recreate
203+
// the challenge every few seconds, so logins behind it never complete
204+
// (#5002). Re-setting the unchanged native string is harmless, so it
205+
// is the rewritten string itself that trips the check.
205206
browserSession.setPermissionRequestHandler((_webContents, permission, callback) => {
206207
callback(ALLOWED_PREVIEW_PERMISSIONS.has(permission));
207208
});

0 commit comments

Comments
 (0)