Skip to content

Commit a4f3bba

Browse files
committed
fix(cli): acquire ownership before offline database initialization
1 parent 1e69690 commit a4f3bba

3 files changed

Lines changed: 73 additions & 46 deletions

File tree

‎apps/server/src/auth/EnvironmentAuth.ts‎

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,8 +1126,6 @@ export const layer = Layer.effect(EnvironmentAuth, make).pipe(
11261126
Layer.provideMerge(EnvironmentAuthPolicy.layer),
11271127
);
11281128

1129-
const layerStorage = Layer.mergeAll(ServerSecretStore.layer, SqlitePersistence.layerConfig);
1130-
11311129
export class CliDatabaseAccessError extends Schema.TaggedError<CliDatabaseAccessError>()(
11321130
"CliDatabaseAccessError",
11331131
{ stateDir: Schema.String, cause: Schema.Defect() },
@@ -1137,19 +1135,30 @@ export class CliDatabaseAccessError extends Schema.TaggedError<CliDatabaseAccess
11371135
}
11381136
}
11391137

1140-
export const layerRuntime = Layer.unwrap(
1141-
Effect.gen(function* () {
1142-
const config = yield* ServerConfig.ServerConfig;
1143-
yield* Effect.acquireRelease(
1144-
Effect.tryPromise({
1145-
try: () => acquireServerOwnershipLock(config.stateDir, { cli: true }),
1146-
catch: (cause) => new CliDatabaseAccessError({ stateDir: config.stateDir, cause }),
1147-
}),
1148-
(lock) => Effect.sync(() => lock.close()),
1149-
);
1150-
return layer.pipe(
1151-
Layer.provideMerge(layerStorage),
1152-
Layer.provideMerge(ServerEnvironment.layerIdentity),
1153-
);
1154-
}),
1155-
);
1138+
const makeLayerRuntime = (existingDatabase: boolean) =>
1139+
Layer.unwrap(
1140+
Effect.gen(function* () {
1141+
const config = yield* ServerConfig.ServerConfig;
1142+
yield* Effect.acquireRelease(
1143+
Effect.tryPromise({
1144+
try: () => acquireServerOwnershipLock(config.stateDir, { cli: true }),
1145+
catch: (cause) => new CliDatabaseAccessError({ stateDir: config.stateDir, cause }),
1146+
}),
1147+
(lock) => Effect.sync(() => lock.close()),
1148+
);
1149+
return layer.pipe(
1150+
Layer.provideMerge(
1151+
Layer.mergeAll(
1152+
ServerSecretStore.layer,
1153+
existingDatabase
1154+
? SqlitePersistence.layerExistingConfig
1155+
: SqlitePersistence.layerConfig,
1156+
),
1157+
),
1158+
Layer.provideMerge(ServerEnvironment.layerIdentity),
1159+
);
1160+
}),
1161+
);
1162+
1163+
export const layerRuntime = makeLayerRuntime(false);
1164+
export const layerRuntimeExistingDatabase = makeLayerRuntime(true);

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

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -346,22 +346,21 @@ const getOfflineSnapshot = Effect.fn("getOfflineSnapshot")(function* () {
346346
});
347347

348348
const tryResolveLiveProjectExecutionMode = Effect.fn("tryResolveLiveProjectExecutionMode")(
349-
function* (
350-
environmentAuth: EnvironmentAuth.EnvironmentAuth["Service"],
351-
config: ServerConfig.ServerConfig["Service"],
352-
) {
349+
function* (config: ServerConfig.ServerConfig["Service"]) {
353350
const runtimeState = yield* readPersistedServerRuntimeState(config.serverRuntimeStatePath);
354-
if (Option.isNone(runtimeState)) {
351+
const fs = yield* FileSystem.FileSystem;
352+
if (Option.isNone(runtimeState) || !(yield* fs.exists(config.dbPath))) {
355353
return Option.none<{ readonly origin: string }>();
356354
}
357355

358-
const attempt = withProjectCliSessionToken(environmentAuth, (token) =>
359-
fetchLiveOrchestrationSnapshot(runtimeState.value.origin, token).pipe(
360-
Effect.as({
361-
origin: runtimeState.value.origin,
362-
}),
363-
),
364-
);
356+
const attempt = Effect.gen(function* () {
357+
const environmentAuth = yield* EnvironmentAuth.EnvironmentAuth;
358+
return yield* withProjectCliSessionToken(environmentAuth, (token) =>
359+
fetchLiveOrchestrationSnapshot(runtimeState.value.origin, token).pipe(
360+
Effect.as({ origin: runtimeState.value.origin }),
361+
),
362+
);
363+
}).pipe(Effect.provide(EnvironmentAuth.layerRuntimeExistingDatabase));
365364

366365
const attempted = yield* Effect.result(attempt);
367366
if (attempted._tag === "Success") {
@@ -399,22 +398,24 @@ const runProjectMutation = Effect.fn("runProjectMutation")(function* (
399398
const minimumLogLevel = config.logLevel;
400399

401400
return yield* Effect.gen(function* () {
402-
const environmentAuth = yield* EnvironmentAuth.EnvironmentAuth;
403-
const liveMode = yield* tryResolveLiveProjectExecutionMode(environmentAuth, config);
401+
const liveMode = yield* tryResolveLiveProjectExecutionMode(config);
404402

405403
if (Option.isSome(liveMode)) {
406-
return yield* withProjectCliSessionToken(environmentAuth, (token) =>
407-
Effect.gen(function* () {
408-
const snapshot = yield* fetchLiveOrchestrationSnapshot(liveMode.value.origin, token);
409-
const output = yield* run({
410-
snapshot,
411-
dispatch: (command) =>
412-
dispatchLiveOrchestrationCommand(liveMode.value.origin, token, command),
413-
mode: "live",
414-
});
415-
yield* Console.log(output);
416-
}),
417-
);
404+
return yield* Effect.gen(function* () {
405+
const environmentAuth = yield* EnvironmentAuth.EnvironmentAuth;
406+
return yield* withProjectCliSessionToken(environmentAuth, (token) =>
407+
Effect.gen(function* () {
408+
const snapshot = yield* fetchLiveOrchestrationSnapshot(liveMode.value.origin, token);
409+
const output = yield* run({
410+
snapshot,
411+
dispatch: (command) =>
412+
dispatchLiveOrchestrationCommand(liveMode.value.origin, token, command),
413+
mode: "live",
414+
});
415+
yield* Console.log(output);
416+
}),
417+
);
418+
}).pipe(Effect.provide(EnvironmentAuth.layerRuntimeExistingDatabase));
418419
}
419420

420421
const layerOfflineRuntime = layerProjectCliRuntime.pipe(
@@ -440,9 +441,9 @@ const runProjectMutation = Effect.fn("runProjectMutation")(function* (
440441
).pipe(Effect.provide(ProcessRunner.layer));
441442
}).pipe(
442443
Effect.provide(
443-
Layer.mergeAll(EnvironmentAuth.layerRuntime, WorkspacePaths.layer).pipe(
444+
WorkspacePaths.layer.pipe(
444445
Layer.provideMerge(FetchHttpClient.layer),
445-
Layer.provide(ServerConfig.layer(config)),
446+
Layer.provideMerge(ServerConfig.layer(config)),
446447
Layer.provide(Layer.succeed(References.MinimumLogLevel, minimumLogLevel)),
447448
),
448449
),

‎apps/server/src/persistence/Sqlite.ts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,20 @@ export const layerConfig = Layer.unwrap(
5555
return layerFromPath(dbPath);
5656
}),
5757
);
58+
59+
// A live server owns schema initialization; CLI authentication only writes sessions.
60+
export const layerExistingConfig = Layer.unwrap(
61+
Effect.gen(function* () {
62+
const { dbPath } = yield* ServerConfig.ServerConfig;
63+
return Layer.provideMerge(
64+
Layer.effectDiscard(
65+
Effect.gen(function* () {
66+
const sql = yield* SqlClient.SqlClient;
67+
yield* sql`PRAGMA busy_timeout = 5000;`;
68+
yield* sql`PRAGMA foreign_keys = ON;`;
69+
}),
70+
),
71+
NodeSqliteClient.layer({ filename: dbPath }),
72+
);
73+
}),
74+
);

0 commit comments

Comments
 (0)