Skip to content

Commit be4d5ef

Browse files
PR Batch Testerclaude
andcommitted
fix(server): stop writing the startup pairing token to the service log
Under the background service, `t3 serve` stdout is boot-service.log, so every start persisted a one-time admin pairing token there. Service-managed starts now skip minting it and point to `t3 pair` instead. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 82b10d5 commit be4d5ef

3 files changed

Lines changed: 72 additions & 11 deletions

File tree

‎apps/server/src/serverRuntimeStartup.ts‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,7 @@ import * as AnalyticsService from "./telemetry/AnalyticsService.ts";
4949
import { getServerOwners } from "./telemetry/Identify.ts";
5050
import * as ServerEnvironment from "./environment/ServerEnvironment.ts";
5151
import * as EnvironmentAuth from "./auth/EnvironmentAuth.ts";
52-
import {
53-
formatHeadlessServeOutput,
54-
formatHostForUrl,
55-
isWildcardHost,
56-
issueHeadlessServeAccessInfo,
57-
} from "./startupAccess.ts";
52+
import { announceHeadlessAccess, formatHostForUrl, isWildcardHost } from "./startupAccess.ts";
5853

5954
export class ServerRuntimeStartupError extends Schema.TaggedError<ServerRuntimeStartupError>()(
6055
"ServerRuntimeStartupError",
@@ -614,10 +609,9 @@ const make = Effect.fn("serverRuntimeStartup.make")(function* (options?: Startup
614609
);
615610
if (serverConfig.startupPresentation === "headless") {
616611
yield* Effect.logDebug("startup phase: headless access info");
617-
const accessInfo = yield* issueHeadlessServeAccessInfo();
618612
yield* runStartupPhase(
619613
"headless.output",
620-
Console.log(formatHeadlessServeOutput(accessInfo)),
614+
announceHeadlessAccess({ serviceManaged: launcher.managed }),
621615
);
622616
} else {
623617
yield* Effect.logDebug("startup phase: browser open check");

‎apps/server/src/startupAccess.test.ts‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
import type * as NodeOS from "node:os";
2+
import * as NodeUtil from "node:util";
23

34
import { describe, expect, it } from "@effect/vitest";
5+
import * as Console from "effect/Console";
6+
import * as DateTime from "effect/DateTime";
7+
import * as Effect from "effect/Effect";
8+
import * as Layer from "effect/Layer";
9+
import * as NetAddress from "effect/net/NetAddress";
10+
import { HttpServer } from "effect/http";
411

12+
import * as EnvironmentAuth from "./auth/EnvironmentAuth.ts";
13+
import * as ServerConfig from "./config.ts";
514
import {
615
acceptsPrivateNetworkConnection,
16+
announceHeadlessAccess,
717
resolveHeadlessConnectionString,
818
} from "./startupAccess.ts";
919

@@ -73,3 +83,48 @@ describe("acceptsPrivateNetworkConnection", () => {
7383
expect(accepts(undefined, "192.168.1.31")).toBe(false);
7484
});
7585
});
86+
87+
it.effect.each([
88+
{ serviceManaged: false, issued: 1, printsToken: true },
89+
{ serviceManaged: true, issued: 0, printsToken: false },
90+
])(
91+
"prints a startup pairing token only outside the background service: %o",
92+
({ serviceManaged, issued, printsToken }) =>
93+
Effect.gen(function* () {
94+
const printed: Array<string> = [];
95+
let issuedCount = 0;
96+
yield* announceHeadlessAccess({ serviceManaged }).pipe(
97+
Effect.provide(
98+
Layer.mergeAll(
99+
Layer.mock(ServerConfig.ServerConfig)({
100+
host: "127.0.0.1",
101+
port: 3773,
102+
privateNetworkOnly: false,
103+
} as never),
104+
Layer.mock(HttpServer.HttpServer)({
105+
address: NetAddress.inetAddressFromIpStringUnsafe("127.0.0.1", 3773),
106+
}),
107+
Layer.mock(EnvironmentAuth.EnvironmentAuth)({
108+
issueStartupPairingCredential: () =>
109+
Effect.sync(() => {
110+
issuedCount += 1;
111+
return {
112+
id: "startup",
113+
credential: "startup-secret",
114+
expiresAt: DateTime.makeUnsafe(0),
115+
};
116+
}),
117+
}),
118+
),
119+
),
120+
Effect.provideService(Console.Console, {
121+
...globalThis.console,
122+
log: (...args: ReadonlyArray<unknown>) => {
123+
printed.push(NodeUtil.format(...args));
124+
},
125+
}),
126+
);
127+
expect(issuedCount).toBe(issued);
128+
expect(printed.join("\n").includes("startup-secret")).toBe(printsToken);
129+
}),
130+
);

‎apps/server/src/startupAccess.ts‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ import * as NodeOS from "node:os";
44
import { isPrivateNetworkHost, isSharedAddressSpaceHost } from "@t3tools/shared/hostClassification";
55
import { QrCode } from "@t3tools/shared/qrCode";
66
import { buildPairingAppLink } from "@t3tools/shared/remote";
7+
import * as Console from "effect/Console";
78
import * as Effect from "effect/Effect";
89
import { HttpServer } from "effect/http";
910
import * as NetAddress from "effect/net/NetAddress";
1011

1112
import * as ServerConfig from "./config.ts";
1213
import * as EnvironmentAuth from "./auth/EnvironmentAuth.ts";
1314

14-
export interface HeadlessServeAccessInfo {
15+
interface HeadlessServeAccessInfo {
1516
readonly connectionString: string;
1617
readonly token: string;
1718
readonly pairingUrl: string;
@@ -181,7 +182,7 @@ export const renderTerminalQrCode = (value: string, margin = 2): string => {
181182
return rows.join("\n");
182183
};
183184

184-
export const formatHeadlessServeOutput = (accessInfo: HeadlessServeAccessInfo): string =>
185+
const formatHeadlessServeOutput = (accessInfo: HeadlessServeAccessInfo): string =>
185186
[
186187
"T3 Code server is ready.",
187188
`Connection string: ${accessInfo.connectionString}`,
@@ -193,7 +194,7 @@ export const formatHeadlessServeOutput = (accessInfo: HeadlessServeAccessInfo):
193194
"",
194195
].join("\n");
195196

196-
export const issueHeadlessServeAccessInfo = Effect.fn("issueHeadlessServeAccessInfo")(function* () {
197+
const issueHeadlessServeAccessInfo = Effect.fn("issueHeadlessServeAccessInfo")(function* () {
197198
const serverConfig = yield* ServerConfig.ServerConfig;
198199
const httpServer = yield* HttpServer.HttpServer;
199200
const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
@@ -210,3 +211,14 @@ export const issueHeadlessServeAccessInfo = Effect.fn("issueHeadlessServeAccessI
210211
pairingUrl: buildPairingUrl(connectionString, issued.credential),
211212
} satisfies HeadlessServeAccessInfo;
212213
});
214+
215+
/** A service's stdout is its persistent log file, so it never mints or prints a credential. */
216+
export const announceHeadlessAccess = Effect.fn("announceHeadlessAccess")(function* (input: {
217+
readonly serviceManaged: boolean;
218+
}) {
219+
if (input.serviceManaged) {
220+
return yield* Console.log("T3 Code server is ready. Run `t3 pair` to pair a device.");
221+
}
222+
const accessInfo = yield* issueHeadlessServeAccessInfo();
223+
yield* Console.log(formatHeadlessServeOutput(accessInfo));
224+
});

0 commit comments

Comments
 (0)