Skip to content

Commit e304dab

Browse files
fix(server): t3 theme updates a dev server running in the default home (pingdotgg#34700)
1 parent 4ae66e2 commit e304dab

2 files changed

Lines changed: 54 additions & 1 deletion

File tree

‎apps/server/src/cli/theme.test.ts‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
77
import * as NodeServices from "@effect/platform-node/NodeServices";
88
import * as NetService from "@t3tools/shared/Net";
99
import { assert, describe, it } from "@effect/vitest";
10+
import * as ConfigProvider from "effect/ConfigProvider";
1011
import * as Effect from "effect/Effect";
1112
import * as Layer from "effect/Layer";
1213
import * as TestConsole from "effect/testing/TestConsole";
@@ -80,6 +81,40 @@ describe("t3 theme", () => {
8081
}),
8182
);
8283

84+
it.effect("sets the theme of a dev server running in the default home", () =>
85+
Effect.gen(function* () {
86+
const home = makeBaseDir();
87+
const devStateDir = NodePath.join(home, ".t3", "dev");
88+
NodeFS.mkdirSync(devStateDir, { recursive: true });
89+
NodeFS.writeFileSync(
90+
NodePath.join(devStateDir, "server-runtime.json"),
91+
`${JSON.stringify({
92+
version: 1,
93+
pid: process.pid,
94+
port: 4888,
95+
origin: "http://127.0.0.1:4888",
96+
devUrl: "http://127.0.0.1:5999",
97+
startedAt: "1970-01-01T00:00:00.000Z",
98+
})}\n`,
99+
);
100+
101+
const result = yield* runCli(["theme", "set", "ocean"]).pipe(
102+
Effect.provideService(HostProcess.HomeDirectory, home),
103+
Effect.provide(ConfigProvider.layer(ConfigProvider.fromEnv({ env: {} }))),
104+
Effect.result,
105+
);
106+
107+
assert.equal(
108+
NodeFS.existsSync(NodePath.join(home, ".t3", "userdata", "settings.json")),
109+
false,
110+
);
111+
if (result._tag === "Success") {
112+
const devSettings = NodePath.join(devStateDir, "settings.json");
113+
assert.equal(JSON.parse(NodeFS.readFileSync(devSettings, "utf8")).defaultTheme, "ocean");
114+
}
115+
}),
116+
);
117+
83118
it.effect("publishes a theme file under its filename and sets it", () =>
84119
Effect.gen(function* () {
85120
const baseDir = makeBaseDir();

‎apps/server/src/cli/theme.ts‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import {
2828
readThemeFileGuarded,
2929
} from "../environmentTheme.ts";
3030
import { expandHomePath, resolveBaseDir } from "../os-jank.ts";
31+
import { isProcessAlive, readPersistedServerRuntimeState } from "../serverRuntimeState.ts";
3132
import { baseDirFlag } from "./config.ts";
3233

3334
const SparseSettings = Schema.Record(Schema.String, Schema.Unknown);
@@ -159,14 +160,31 @@ export class ThemeTargetMissingError extends Schema.TaggedError<ThemeTargetMissi
159160
}
160161

161162
const envT3Home = Config.String("T3CODE_HOME").pipe(Config.option);
163+
const DEV_STATE_PLACEHOLDER_URL = new URL("http://localhost");
164+
165+
const hasLiveServer = (statePath: string) =>
166+
readPersistedServerRuntimeState(statePath).pipe(
167+
Effect.map((state) => Option.isSome(state) && isProcessAlive(state.value.pid)),
168+
Effect.orElseSucceed(() => false),
169+
);
162170

163171
const resolveThemePaths = Effect.fn(function* (explicitBaseDir: Option.Option<string>) {
164172
const envHome = Option.filter(yield* envT3Home, (value) => value.trim().length > 0);
165173
const configuredBaseDir = Option.orElse(explicitBaseDir, () => envHome);
166174
const baseDir = yield* resolveBaseDir(Option.getOrUndefined(configuredBaseDir));
167-
const derivedPaths = yield* ServerConfig.deriveServerPaths(baseDir, undefined, {
175+
const userdataPaths = yield* ServerConfig.deriveServerPaths(baseDir, undefined, {
168176
baseDirIsExplicit: Option.isSome(configuredBaseDir),
169177
});
178+
// A dev server with an implicit home keeps its state in `dev`; follow it unless a
179+
// `userdata` server is running too, the same order `t3 pair` checks.
180+
let derivedPaths = userdataPaths;
181+
if (
182+
Option.isNone(configuredBaseDir) &&
183+
!(yield* hasLiveServer(userdataPaths.serverRuntimeStatePath))
184+
) {
185+
const devPaths = yield* ServerConfig.deriveServerPaths(baseDir, DEV_STATE_PLACEHOLDER_URL);
186+
if (yield* hasLiveServer(devPaths.serverRuntimeStatePath)) derivedPaths = devPaths;
187+
}
170188
return {
171189
settingsPath: derivedPaths.settingsPath,
172190
themesDir: derivedPaths.environmentThemesDir,

0 commit comments

Comments
 (0)