Skip to content

Commit bb3aabc

Browse files
Merge remote-tracking branch 'origin/main' into fix/issue-30358
2 parents df3ec2f + aee76a8 commit bb3aabc

22 files changed

Lines changed: 557 additions & 74 deletions

‎apps/server/src/device/DeviceService.test.ts‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import * as Exit from "effect/Exit";
1818
import * as Deferred from "effect/Deferred";
1919
import * as Fiber from "effect/Fiber";
2020
import * as FileSystem from "effect/FileSystem";
21+
import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
2122
import * as Layer from "effect/Layer";
2223
import * as Option from "effect/Option";
2324
import * as PubSub from "effect/PubSub";
@@ -534,6 +535,11 @@ describe("device setup consent", () => {
534535
);
535536
});
536537

538+
const layerSecretResolver = Layer.succeed(SecretResolver.SecretResolver, {
539+
read: (references) => Effect.succeed(references.map(() => undefined)),
540+
invalidate: () => Effect.void,
541+
});
542+
537543
it.effect("publishes boot progress and does not restore sessions after support is disabled", () =>
538544
Effect.gen(function* () {
539545
const started = yield* Deferred.make<void>();
@@ -1437,7 +1443,12 @@ it.effect("reconciles SSH host settings without publishing no-op changes", () =>
14371443
}).pipe(
14381444
Effect.scoped,
14391445
Effect.provide(
1440-
Layer.mergeAll(ServerSettings.layerTest(), NodeServices.layer, NodeCrypto.layer),
1446+
Layer.mergeAll(
1447+
ServerSettings.layerTest(),
1448+
layerSecretResolver,
1449+
NodeServices.layer,
1450+
NodeCrypto.layer,
1451+
),
14411452
),
14421453
),
14431454
);
@@ -1496,6 +1507,7 @@ it.effect("a failed tool update reports npm's exit code but not its output", ()
14961507
Effect.provide(
14971508
Layer.mergeAll(
14981509
ServerSettings.layerTest({ enableDeviceSupport: true }),
1510+
layerSecretResolver,
14991511
ServerConfig.layerTest(process.cwd(), { prefix: "t3-device-update-" }),
15001512
NodeCrypto.layer,
15011513
NetService.layer,

‎apps/server/src/device/DeviceService.ts‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,14 @@ import { isLocalSshDeviceHost, remoteSshDeviceHosts } from "./localSshDeviceHost
6868

6969
import { readDeviceDetail, runDeviceAction } from "./DeviceActions.ts";
7070
import * as ProcessRunner from "../processRunner.ts";
71+
import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
72+
import * as SecretResolverLayer from "../secrets/SecretResolver.ts";
7173
import * as DeviceHost from "./DeviceHost.ts";
7274
import * as SshDeviceHost from "./SshDeviceHost.ts";
7375
import * as EasDeviceHost from "./EasDeviceHost.ts";
7476
import * as SimlockDeviceHost from "./SimlockDeviceHost.ts";
7577
import * as HostProcess from "@t3tools/shared/HostProcess";
76-
import { makeExpoApi, resolveExpoCredential } from "./ExpoApi.ts";
78+
import { makeExpoApi } from "./ExpoApi.ts";
7779
import * as Exit from "effect/Exit";
7880
import * as LocalDeviceHost from "./LocalDeviceHost.ts";
7981

@@ -1220,6 +1222,7 @@ export const make = Effect.gen(function* () {
12201222
const path = yield* Path.Path;
12211223
const runner = yield* ProcessRunner.ProcessRunner;
12221224
const settings = yield* ServerSettings.ServerSettingsService;
1225+
const secrets = yield* SecretResolver.SecretResolver;
12231226
const scope = yield* Scope.Scope;
12241227
const hosts = new Map<DeviceHostId, DeviceHost.DeviceHost["Service"]>([
12251228
[localHost.id, localHost],
@@ -1537,7 +1540,10 @@ export const make = Effect.gen(function* () {
15371540
? ""
15381541
: ((yield* settings.getSettings).easDeviceHosts.find((host) => host.id === input.hostId)
15391542
?.accessToken ?? "");
1540-
const credential = yield* resolveExpoCredential(input.accessToken ?? saved);
1543+
const credential = yield* EasDeviceHost.resolveSavedExpoCredential(
1544+
secrets,
1545+
input.accessToken ?? saved,
1546+
);
15411547
const viewer = yield* makeExpoApi(yield* HttpClient.HttpClient, credential).viewer;
15421548
return { signedInAs: viewer.name, credentialSource: credential.source, apps: viewer.apps };
15431549
},
@@ -1618,7 +1624,10 @@ export const make = Effect.gen(function* () {
16181624
};
16191625
});
16201626

1621-
export const layer = Layer.effect(DeviceService, make).pipe(Layer.provide(LocalDeviceHost.layer));
1627+
export const layer = Layer.effect(DeviceService, make).pipe(
1628+
Layer.provide(LocalDeviceHost.layer),
1629+
Layer.provide(SecretResolverLayer.layer),
1630+
);
16221631

16231632
export const stateStream = (service: DeviceService["Service"]): Stream.Stream<DeviceServiceState> =>
16241633
Stream.unwrap(

‎apps/server/src/device/EasDeviceHost.test.ts‎

Lines changed: 76 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { describe, expect, it } from "@effect/vitest";
22
import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
33
import * as NodeServices from "@effect/platform-node/NodeServices";
4-
import { type EasDeviceHostConfig, ThreadId } from "@t3tools/contracts";
5-
import * as HostProcess from "@t3tools/shared/HostProcess";
4+
import { type EasDeviceHostConfig, SecretProviderId, ThreadId } from "@t3tools/contracts";
5+
import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
66
import * as Deferred from "effect/Deferred";
77
import * as Effect from "effect/Effect";
88
import * as Fiber from "effect/Fiber";
@@ -13,6 +13,7 @@ import * as Path from "effect/Path";
1313
import * as Scope from "effect/Scope";
1414
import * as TestClock from "effect/testing/TestClock";
1515
import { HttpClient, HttpClientResponse } from "effect/http";
16+
import * as HostProcess from "@t3tools/shared/HostProcess";
1617

1718
import * as ServerConfig from "../config.ts";
1819
import * as ProcessRunner from "../processRunner.ts";
@@ -228,9 +229,24 @@ const fakeExpo = (
228229
return { http, named, stopped, allowPreview, allowCreate, releases, previews };
229230
};
230231

232+
const makeSecretResolver = (values: Record<string, string> = {}) =>
233+
Layer.succeed(SecretResolver.SecretResolver, {
234+
read: (references) =>
235+
Effect.succeed(references.map((reference) => values[reference.reference])),
236+
invalidate: () => Effect.void,
237+
});
238+
239+
const layerWith = (secrets: Layer.Layer<SecretResolver.SecretResolver>) =>
240+
Layer.mergeAll(
241+
ProcessRunner.layer,
242+
ServerConfig.layerTest(process.cwd(), { prefix: "t3-eas-host-" }),
243+
secrets,
244+
).pipe(Layer.provideMerge(NodeServices.layer));
245+
231246
const layer = Layer.mergeAll(
232247
ProcessRunner.layer,
233248
ServerConfig.layerTest(process.cwd(), { prefix: "t3-eas-host-" }),
249+
makeSecretResolver(),
234250
).pipe(Layer.provideMerge(NodeServices.layer));
235251

236252
const makeHost = (
@@ -299,6 +315,64 @@ describe("EAS Simulator host", () => {
299315
}).pipe(Effect.scoped, Effect.provide(layer)),
300316
);
301317

318+
it.effect("reads its token from the secret provider the setting names", () =>
319+
Effect.gen(function* () {
320+
const expo = fakeExpo();
321+
const source = { provider: SecretProviderId.make("homelab"), reference: "expo#token" };
322+
const host = yield* makeHost(expo, config({ accessToken: source }), yield* Scope.make());
323+
const ready = yield* host.ensureReady(() => Effect.void);
324+
const [catalogDevice] = (yield* ready.devices.list).devices;
325+
expect(yield* ready.devices.boot(catalogDevice!)).toBe("session-1");
326+
}).pipe(
327+
Effect.scoped,
328+
Effect.provide(layerWith(makeSecretResolver({ "expo#token": "expo-token" }))),
329+
),
330+
);
331+
332+
it.effect("fails instead of using another Expo login when its secret cannot be read", () =>
333+
Effect.gen(function* () {
334+
const expo = fakeExpo();
335+
const source = { provider: SecretProviderId.make("homelab"), reference: "expo#token" };
336+
const host = yield* makeHost(expo, config({ accessToken: source }), yield* Scope.make()).pipe(
337+
Effect.provideService(HostProcess.Environment, { EXPO_TOKEN: "expo-token" }),
338+
);
339+
const ready = yield* host.ensureReady(() => Effect.void);
340+
const [catalogDevice] = (yield* ready.devices.list).devices;
341+
const failure = yield* ready.devices.boot(catalogDevice!).pipe(Effect.flip);
342+
expect(failure.message).toContain('secret provider "homelab"');
343+
expect(expo.named("T3CreateEasSimulatorSession")).toHaveLength(0);
344+
}).pipe(Effect.scoped, Effect.provide(layer)),
345+
);
346+
347+
it.effect("still stops its sessions when the secret becomes unreadable after they start", () => {
348+
const readable = { value: true };
349+
return Effect.gen(function* () {
350+
const expo = fakeExpo();
351+
const source = { provider: SecretProviderId.make("homelab"), reference: "expo#token" };
352+
const scope = yield* Scope.make();
353+
const host = yield* makeHost(expo, config({ accessToken: source }), scope);
354+
const ready = yield* host.ensureReady(() => Effect.void);
355+
const [catalogDevice] = (yield* ready.devices.list).devices;
356+
expect(yield* ready.devices.boot(catalogDevice!)).toBe("session-1");
357+
358+
readable.value = false;
359+
yield* ready.devices.shutdown({ ...catalogDevice!, id: "session-1" });
360+
expect(expo.stopped()).toEqual(["session-1"]);
361+
yield* Scope.close(scope, Exit.void);
362+
}).pipe(
363+
Effect.scoped,
364+
Effect.provide(
365+
layerWith(
366+
Layer.succeed(SecretResolver.SecretResolver, {
367+
read: (references) =>
368+
Effect.succeed(references.map(() => (readable.value ? "expo-token" : undefined))),
369+
invalidate: () => Effect.void,
370+
}),
371+
),
372+
),
373+
);
374+
});
375+
302376
it.effect("runs an Android session through serve-emu beside an iOS one", () =>
303377
Effect.gen(function* () {
304378
const expo = fakeExpo();

‎apps/server/src/device/EasDeviceHost.ts‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
DeviceOperationError,
1212
type DevicePlatform,
1313
type EasDeviceHostConfig,
14+
type SettingsSecretValue,
1415
} from "@t3tools/contracts";
1516
import * as Cause from "effect/Cause";
1617
import * as Clock from "effect/Clock";
@@ -32,6 +33,8 @@ import { writeFileStringAtomically } from "@t3tools/shared/atomicWrite";
3233
import * as HostProcess from "@t3tools/shared/HostProcess";
3334

3435
import * as ServerConfig from "../config.ts";
36+
import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
37+
import { requireSettingsSecret } from "../secrets/settingsSecretValue.ts";
3538
import { releaseAgentDeviceSession } from "./AgentDeviceTarget.ts";
3639
import * as DeviceHost from "./DeviceHost.ts";
3740
import { findEasProjectId } from "./easProjectId.ts";
@@ -140,11 +143,21 @@ const decodePathSegment = (segment: string): string | null => {
140143
}
141144
};
142145

146+
/**
147+
* The Expo credential a host's setting holds or names. Every session bills the account behind
148+
* it, so a named secret that cannot be read fails rather than falling back to another login.
149+
*/
150+
export const resolveSavedExpoCredential = (
151+
secrets: SecretResolver.SecretResolver["Service"],
152+
saved: SettingsSecretValue,
153+
) => requireSettingsSecret(secrets, saved).pipe(Effect.flatMap(resolveExpoCredential));
154+
143155
export const make = Effect.fn("EasDeviceHost.make")(function* (config: EasDeviceHostConfig) {
144156
const http = yield* HttpClient.HttpClient;
145157
const fs = yield* FileSystem.FileSystem;
146158
const path = yield* Path.Path;
147159
const server = yield* ServerConfig.ServerConfig;
160+
const secrets = yield* SecretResolver.SecretResolver;
148161
const services = yield* Effect.context<
149162
FileSystem.FileSystem | Path.Path | Effect.Services<ReturnType<typeof findEasProjectId>>
150163
>();
@@ -198,13 +211,24 @@ export const make = Effect.fn("EasDeviceHost.make")(function* (config: EasDevice
198211
...(cause === undefined ? {} : { cause }),
199212
});
200213

201-
const api: Effect.Effect<ExpoApi, DeviceHostUnavailableError> = resolveExpoCredential(
214+
let lastApi: ExpoApi | undefined;
215+
const api: Effect.Effect<ExpoApi, DeviceHostUnavailableError> = resolveSavedExpoCredential(
216+
secrets,
202217
config.accessToken,
203218
).pipe(
204219
Effect.map((credential) => makeExpoApi(http, credential)),
220+
Effect.tap((expo) =>
221+
Effect.sync(() => {
222+
lastApi = expo;
223+
}),
224+
),
205225
Effect.provide(services),
206226
Effect.mapError((error) => unavailable(error.message, error)),
207227
);
228+
/** Stopping a billed session must not depend on the secret still being readable; starting one must. */
229+
const apiForStop = api.pipe(
230+
Effect.catch((error) => (lastApi === undefined ? Effect.fail(error) : Effect.succeed(lastApi))),
231+
);
208232

209233
/** A missing ledger is empty; an unreadable one is an error, never an empty list. */
210234
const readLedger = fs.readFileString(ledgerPath).pipe(
@@ -626,7 +650,7 @@ export const make = Effect.fn("EasDeviceHost.make")(function* (config: EasDevice
626650
if (stale.length === 0 && unresolved.size === 0 && uncertain.size === 0 && !reapDue) return;
627651
const reap = reapDue || uncertain.size > 0;
628652
if (reap) reapedAt = now;
629-
const expo = yield* api.pipe(
653+
const expo = yield* apiForStop.pipe(
630654
// Without a credential no sweep can look; a record Expo would have
631655
// listed by now still stops counting, so the limit is not held forever.
632656
Effect.tapError(() =>
@@ -723,7 +747,7 @@ export const make = Effect.fn("EasDeviceHost.make")(function* (config: EasDevice
723747
Option.match(sessionFor(device.id), {
724748
onNone: () => Effect.void,
725749
onSome: (session) =>
726-
api.pipe(
750+
apiForStop.pipe(
727751
Effect.flatMap((expo) => stopTracked(expo, session)),
728752
Effect.asVoid,
729753
Effect.mapError(
@@ -853,7 +877,7 @@ export const make = Effect.fn("EasDeviceHost.make")(function* (config: EasDevice
853877
// Interrupted starts stop the sessions they created before this returns.
854878
yield* FiberSet.clear(starts);
855879
yield* FiberSet.clear(background);
856-
const expo = yield* api;
880+
const expo = yield* apiForStop;
857881
yield* Effect.forEach(
858882
[...sessions.values()],
859883
(session) => stopTracked(expo, session).pipe(Effect.ignore),
@@ -884,7 +908,7 @@ export const make = Effect.fn("EasDeviceHost.make")(function* (config: EasDevice
884908
// Each server signs in on its own, so one with no Expo credential answers for itself. Reading
885909
// the credential is local; whether Expo accepts it is only known once a session starts.
886910
const platformAvailability = (platform: DevicePlatform) =>
887-
resolveExpoCredential(config.accessToken).pipe(
911+
resolveSavedExpoCredential(secrets, config.accessToken).pipe(
888912
Effect.provide(services),
889913
Effect.as({ platform, available: true }),
890914
Effect.catch((error) =>

0 commit comments

Comments
 (0)