Skip to content

Commit 022c69b

Browse files
Merge branch 'main' into fix/issue-27080
2 parents fad5292 + fd64128 commit 022c69b

188 files changed

Lines changed: 7370 additions & 616 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.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ it.effect.each([false, true])(
109109
platform: "linux",
110110
isDevelopment: false,
111111
isPackaged: true,
112+
stateDir: "/isolated/userdata",
112113
configuredBackendPort: Option.some(3773),
113114
defaultDesktopSettings: { serverExposureMode: "local-only" },
114115
} as unknown as DesktopEnvironment.DesktopEnvironment["Service"]),

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import * as DesktopWindow from "../window/DesktopWindow.ts";
2121
import * as PreviewPasskeys from "../preview/Passkeys.ts";
2222
import * as DesktopBackendManager from "../backend/DesktopBackendManager.ts";
2323
import * as DesktopBackendPool from "../backend/DesktopBackendPool.ts";
24+
import * as DesktopHomeOwner from "../backend/DesktopHomeOwner.ts";
2425
import * as DesktopEnvironment from "./DesktopEnvironment.ts";
2526
import * as DesktopLegacyLocalStorage from "./DesktopLegacyLocalStorage.ts";
2627
import * as DesktopLifecycle from "./DesktopLifecycle.ts";
@@ -223,6 +224,22 @@ const bootstrap = Effect.gen(function* () {
223224
return yield* new DesktopDevelopmentBackendPortRequiredError();
224225
}
225226

227+
// A backend started while another server holds this home's lock can only exit with code 78.
228+
if (
229+
!(settings.wslOnly && settings.wslBackendEnabled) &&
230+
(yield* DesktopHomeOwner.isHomeOwnershipLocked())
231+
) {
232+
const owner = yield* DesktopHomeOwner.readLiveHomeOwner();
233+
yield* logBootstrapWarning("bootstrap found another server owning the T3 home", {
234+
owner: Option.getOrNull(owner),
235+
});
236+
yield* (yield* ElectronDialog.ElectronDialog).showErrorBox(
237+
"This T3 home is unavailable",
238+
DesktopHomeOwner.homeOwnedMessage(owner),
239+
);
240+
return yield* (yield* ElectronApp.ElectronApp).quit;
241+
}
242+
226243
const backendPortSelection = yield* resolveDesktopBackendPort(environment.configuredBackendPort);
227244
const backendPort = backendPortSelection.port;
228245
yield* logBootstrapInfo(

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,16 @@ export class DesktopState extends Context.Service<
1717
{
1818
readonly backendReady: Ref.Ref<boolean>;
1919
readonly quitting: Ref.Ref<boolean>;
20+
// Set by DesktopUpdates.configure, which runs before the first backend start.
21+
readonly canInstallUpdates: Ref.Ref<boolean>;
2022
readonly primaryBackendStartup: SubscriptionRef.SubscriptionRef<PrimaryBackendStartup>;
2123
}
2224
>()("@t3tools/desktop/app/DesktopState") {}
2325

2426
const make = Effect.all({
2527
backendReady: Ref.make(false),
2628
quitting: Ref.make(false),
29+
canInstallUpdates: Ref.make(false),
2730
primaryBackendStartup: SubscriptionRef.make<PrimaryBackendStartup>({ _tag: "Starting" }),
2831
});
2932

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import * as DesktopBackendConfiguration from "./DesktopBackendConfiguration.ts";
1919
import * as DesktopShellEnvironment from "../shell/DesktopShellEnvironment.ts";
2020
import * as DesktopConfig from "../app/DesktopConfig.ts";
2121
import * as DesktopServerExposure from "./DesktopServerExposure.ts";
22+
import * as DesktopState from "../app/DesktopState.ts";
2223
import * as DesktopAppSettings from "../settings/DesktopAppSettings.ts";
2324
import * as DesktopWslEnvironment from "../wsl/DesktopWslEnvironment.ts";
2425
import * as DesktopWslServerTree from "../wsl/DesktopWslServerTree.ts";
@@ -32,7 +33,10 @@ const layerShellEnvironment = (prepared = true) =>
3233
});
3334

3435
const layerBackendConfiguration = (prepared = true) =>
35-
DesktopBackendConfiguration.layer.pipe(Layer.provide(layerShellEnvironment(prepared)));
36+
DesktopBackendConfiguration.layer.pipe(
37+
Layer.provide(layerShellEnvironment(prepared)),
38+
Layer.provide(DesktopState.layer),
39+
);
3640

3741
const layerServerExposure = Layer.succeed(DesktopServerExposure.DesktopServerExposure, {
3842
getState: Effect.die("unexpected getState"),

‎apps/desktop/src/backend/DesktopBackendConfiguration.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import * as FileSystem from "effect/FileSystem";
1313
import * as Layer from "effect/Layer";
1414
import * as Option from "effect/Option";
1515
import * as PlatformError from "effect/PlatformError";
16+
import * as Ref from "effect/Ref";
1617
import * as Schema from "effect/Schema";
1718
import * as SynchronizedRef from "effect/SynchronizedRef";
1819

@@ -21,6 +22,7 @@ import serverPackageJson from "../../../server/package.json" with { type: "json"
2122
import * as DesktopBackendManager from "./DesktopBackendManager.ts";
2223
import * as DesktopCliShim from "../app/DesktopCliShim.ts";
2324
import * as DesktopEnvironment from "../app/DesktopEnvironment.ts";
25+
import * as DesktopState from "../app/DesktopState.ts";
2426
import * as DesktopServerExposure from "./DesktopServerExposure.ts";
2527
import * as DesktopShellEnvironment from "../shell/DesktopShellEnvironment.ts";
2628
import * as DesktopAppSettings from "../settings/DesktopAppSettings.ts";
@@ -488,6 +490,7 @@ const resolvePrimaryStartConfig = Effect.fn("desktop.backendConfiguration.resolv
488490
readonly resourceMonitorPath: Option.Option<string>;
489491
readonly cliPath: Option.Option<string>;
490492
readonly shellEnvironmentPrepared: boolean;
493+
readonly desktopAppUpdate: boolean;
491494
},
492495
): Effect.fn.Return<
493496
DesktopBackendManager.DesktopBackendStartConfig,
@@ -511,6 +514,7 @@ const resolvePrimaryStartConfig = Effect.fn("desktop.backendConfiguration.resolv
511514
tailscaleServePort: backendExposure.tailscaleServePort,
512515
desktopTelemetryFd: 4,
513516
desktopTelemetryControlFd: 5,
517+
desktopAppUpdate: input.desktopAppUpdate,
514518
desktopBrowserFd: 6,
515519
desktopBrowserControlFd: 7,
516520
...Option.match(input.resourceMonitorPath, {
@@ -726,6 +730,7 @@ export const make = Effect.gen(function* () {
726730
const wslEnvironment = yield* DesktopWslEnvironment.DesktopWslEnvironment;
727731
const wslServerTree = yield* DesktopWslServerTree.DesktopWslServerTree;
728732
const settings = yield* DesktopAppSettings.DesktopAppSettings;
733+
const desktopState = yield* DesktopState.DesktopState;
729734
const mac = yield* Mac.Mac;
730735
const random = yield* SecureRandom.SecureRandom;
731736
// Random generation yields; serialize it so concurrent backends cannot capture distinct bootstrap secrets.
@@ -793,6 +798,7 @@ export const make = Effect.gen(function* () {
793798
resourceMonitorPath,
794799
cliPath,
795800
shellEnvironmentPrepared,
801+
desktopAppUpdate: yield* Ref.get(desktopState.canInstallUpdates),
796802
}).pipe(
797803
Effect.provideService(DesktopEnvironment.DesktopEnvironment, environment),
798804
Effect.provideService(DesktopServerExposure.DesktopServerExposure, serverExposure),

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import * as NodeServices from "@effect/platform-node/NodeServices";
12
import { assert, describe, it } from "@effect/vitest";
23
import * as Deferred from "effect/Deferred";
34
import * as Duration from "effect/Duration";
@@ -8,12 +9,15 @@ import * as TestClock from "effect/testing/TestClock";
89
import * as FileSystem from "effect/FileSystem";
910
import * as Layer from "effect/Layer";
1011
import * as Option from "effect/Option";
12+
import * as Path from "effect/Path";
1113
import * as Ref from "effect/Ref";
1214
import * as Sink from "effect/Sink";
1315
import * as Stream from "effect/Stream";
1416
import { HttpClient, HttpClientResponse } from "effect/http";
1517
import { ChildProcessSpawner } from "effect/process";
1618

19+
import * as DesktopConfig from "../app/DesktopConfig.ts";
20+
import * as DesktopEnvironment from "../app/DesktopEnvironment.ts";
1721
import * as DesktopObservability from "../app/DesktopObservability.ts";
1822
import * as DesktopState from "../app/DesktopState.ts";
1923
import * as DesktopAppSettings from "../settings/DesktopAppSettings.ts";
@@ -112,6 +116,7 @@ function layerPool(
112116
Layer.provideMerge(
113117
Layer.mergeAll(
114118
FileSystem.layerNoop({ exists: () => Effect.succeed(true) }),
119+
Path.layer,
115120
backend?.layer ??
116121
Layer.succeed(
117122
ChildProcessSpawner.ChildProcessSpawner,
@@ -156,6 +161,20 @@ function layerPool(
156161
currentBootstrapToken: Effect.die("unexpected bootstrap token read"),
157162
} satisfies DesktopBackendConfiguration.DesktopBackendConfiguration["Service"]),
158163
DesktopAppSettings.layerTest(),
164+
DesktopEnvironment.layer({
165+
dirname: "/repo/apps/desktop/src",
166+
homeDirectory: "/home/test",
167+
platform: "linux",
168+
processArch: "x64",
169+
appVersion: "0.0.0",
170+
appPath: "/repo",
171+
isPackaged: true,
172+
resourcesPath: "/missing/resources",
173+
runningUnderArm64Translation: false,
174+
}).pipe(
175+
Layer.provide(Layer.mergeAll(NodeServices.layer, DesktopConfig.layerTest({}))),
176+
Layer.orDie,
177+
),
159178
DesktopState.layer,
160179
DesktopWslEnvironment.layerTest(),
161180
ElectronDialog.layer,

‎apps/desktop/src/backend/DesktopBackendPool.ts‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import * as Effect from "effect/Effect";
44
import * as Exit from "effect/Exit";
55
import * as Layer from "effect/Layer";
66
import * as Option from "effect/Option";
7+
import * as Path from "effect/Path";
78
import * as Schema from "effect/Schema";
89
import * as Scope from "effect/Scope";
910
import * as SubscriptionRef from "effect/SubscriptionRef";
@@ -15,6 +16,8 @@ import { ChildProcessSpawner } from "effect/process";
1516

1617
import * as DesktopBackendConfiguration from "./DesktopBackendConfiguration.ts";
1718
import * as DesktopBackendManager from "./DesktopBackendManager.ts";
19+
import * as DesktopHomeOwner from "./DesktopHomeOwner.ts";
20+
import * as DesktopEnvironment from "../app/DesktopEnvironment.ts";
1821
import * as DesktopObservability from "../app/DesktopObservability.ts";
1922
import * as DesktopState from "../app/DesktopState.ts";
2023
import * as DesktopAppSettings from "../settings/DesktopAppSettings.ts";
@@ -112,6 +115,9 @@ export const layer = Layer.effect(
112115
// Parent instance scopes to the pool so shutdown runs stop finalizers before the OS kills backends.
113116
const layerScope = yield* Scope.Scope;
114117
const factoryContext = yield* Effect.context<BackendInstanceFactoryRequirements>();
118+
const homeOwnerContext = yield* Effect.context<
119+
FileSystem.FileSystem | Path.Path | DesktopEnvironment.DesktopEnvironment
120+
>();
115121

116122
// Persist fatal Windows fallbacks; transient transport failures must preserve the user's WSL preference.
117123
const handlePrimaryPreflightFailure = Effect.fn("desktop.backendPool.primaryPreflightFailed")(
@@ -174,12 +180,16 @@ export const layer = Layer.effect(
174180
onShutdown: () => desktopWindow.handleBackendNotReady,
175181
onPreflightFailed: handlePrimaryPreflightFailure,
176182
onStateDirOwned: () =>
177-
electronDialog
178-
.showErrorBox(
179-
"This T3 home is unavailable",
180-
"Another T3 Code server, such as the background service, is using this data directory, or an older background service is set up for it. Stop that server or try `t3 update`. If the older launcher cannot update, run `t3 service uninstall` and optionally reinstall with `t3 service install` from a current CLI. Use `npx t3@latest` if `t3` is missing or outdated, and pass `--base-dir` with the service's T3 home to each command. Then reopen T3 Code. You can also set a separate T3CODE_HOME and pair with the running server.",
181-
)
182-
.pipe(Effect.andThen(electronApp.quit)),
183+
DesktopHomeOwner.readLiveHomeOwner().pipe(
184+
Effect.flatMap((owner) =>
185+
electronDialog.showErrorBox(
186+
"This T3 home is unavailable",
187+
DesktopHomeOwner.homeOwnedMessage(owner),
188+
),
189+
),
190+
Effect.provideContext(homeOwnerContext),
191+
Effect.andThen(electronApp.quit),
192+
),
183193
});
184194

185195
const instancesRef = yield* SynchronizedRef.make<
Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
import * as NodeSqlite from "node:sqlite";
2+
3+
import * as NodeServices from "@effect/platform-node/NodeServices";
4+
import { assert, describe, it } from "@effect/vitest";
5+
import * as Effect from "effect/Effect";
6+
import * as FileSystem from "effect/FileSystem";
7+
import * as Layer from "effect/Layer";
8+
import * as Option from "effect/Option";
9+
import * as Path from "effect/Path";
10+
11+
import * as DesktopConfig from "../app/DesktopConfig.ts";
12+
import * as DesktopEnvironment from "../app/DesktopEnvironment.ts";
13+
import * as DesktopHomeOwner from "./DesktopHomeOwner.ts";
14+
15+
const withTempHome = <A, E>(
16+
run: (
17+
userdata: string,
18+
) => Effect.Effect<
19+
A,
20+
E,
21+
DesktopEnvironment.DesktopEnvironment | FileSystem.FileSystem | Path.Path
22+
>,
23+
) =>
24+
Effect.gen(function* () {
25+
const fs = yield* FileSystem.FileSystem;
26+
const home = yield* fs.makeTempDirectoryScoped({ prefix: "t3-desktop-home-owner-" });
27+
yield* fs.makeDirectory(`${home}/userdata`, { recursive: true });
28+
return yield* run(`${home}/userdata`).pipe(
29+
Effect.provide(
30+
DesktopEnvironment.layer({
31+
dirname: "/repo/apps/desktop/src",
32+
homeDirectory: home,
33+
platform: "linux",
34+
processArch: "x64",
35+
appVersion: "0.0.0",
36+
appPath: "/repo",
37+
isPackaged: true,
38+
resourcesPath: "/missing/resources",
39+
runningUnderArm64Translation: false,
40+
}).pipe(
41+
Layer.provide(
42+
Layer.mergeAll(NodeServices.layer, DesktopConfig.layerTest({ T3CODE_HOME: home })),
43+
),
44+
),
45+
),
46+
);
47+
}).pipe(Effect.provide(NodeServices.layer));
48+
49+
const readOwnerWithRuntimeFile = (contents: string | undefined) =>
50+
withTempHome((userdata) =>
51+
Effect.gen(function* () {
52+
if (contents !== undefined) {
53+
yield* (yield* FileSystem.FileSystem).writeFileString(
54+
`${userdata}/server-runtime.json`,
55+
contents,
56+
);
57+
}
58+
return yield* DesktopHomeOwner.readLiveHomeOwner();
59+
}),
60+
);
61+
62+
describe("DesktopHomeOwner.readLiveHomeOwner", () => {
63+
it.effect("reports a live server recorded in server-runtime.json", () =>
64+
Effect.gen(function* () {
65+
const owner = yield* readOwnerWithRuntimeFile(
66+
JSON.stringify({
67+
version: 1,
68+
pid: process.pid,
69+
port: 3790,
70+
origin: "http://127.0.0.1:3790",
71+
startedAt: "2026-01-01T00:00:00.000Z",
72+
serverVersion: "1.2.3",
73+
}),
74+
);
75+
assert.deepStrictEqual(
76+
owner,
77+
Option.some({ pid: process.pid, port: 3790, serverVersion: "1.2.3" }),
78+
);
79+
assert.include(
80+
DesktopHomeOwner.homeOwnedMessage(owner),
81+
`PID ${process.pid}, port 3790, version 1.2.3`,
82+
);
83+
}),
84+
);
85+
86+
it.effect("ignores a missing, malformed or dead owner record", () =>
87+
Effect.gen(function* () {
88+
assert.isTrue(Option.isNone(yield* readOwnerWithRuntimeFile(undefined)));
89+
assert.isTrue(Option.isNone(yield* readOwnerWithRuntimeFile("{not json")));
90+
assert.isTrue(
91+
Option.isNone(yield* readOwnerWithRuntimeFile(JSON.stringify({ pid: 0, port: 3790 }))),
92+
);
93+
}),
94+
);
95+
});
96+
97+
describe("DesktopHomeOwner.isHomeOwnershipLocked", () => {
98+
it.effect("reports the ownership lock only while a server holds it", () =>
99+
withTempHome((userdata) =>
100+
Effect.gen(function* () {
101+
assert.isFalse(yield* DesktopHomeOwner.isHomeOwnershipLocked());
102+
const lock = new NodeSqlite.DatabaseSync(`${userdata}/server-owner.sqlite`);
103+
lock.exec("BEGIN EXCLUSIVE;");
104+
assert.isTrue(yield* DesktopHomeOwner.isHomeOwnershipLocked());
105+
lock.close();
106+
assert.isFalse(yield* DesktopHomeOwner.isHomeOwnershipLocked());
107+
}),
108+
),
109+
);
110+
});

0 commit comments

Comments
 (0)