Skip to content

Commit f18e67f

Browse files
authored
Use dev suffix on app data dir to separate dev db from npx default path (#415)
Also remove older db migration script
1 parent 506bf5c commit f18e67f

5 files changed

Lines changed: 12 additions & 81 deletions

File tree

‎package.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
"sdk:generate": "bash scripts/generate-sdk.sh",
3232
"smoke:down": "docker compose down",
3333
"smoke": "docker compose up --build --wait && node -e \"Promise.all([fetch('http://127.0.0.1:8791/healthz'), fetch('http://127.0.0.1:8791/')]).then(async ([health, ui]) => { if (!health.ok) throw new Error('healthz returned ' + health.status); const html = await ui.text(); if (!ui.ok || !html.includes('id=\\\"root\\\"')) throw new Error('UI did not return its app shell'); console.log('healthz and UI OK'); })\"",
34-
"prestandalone:dev:no-watch": "pnpm --filter @truefoundry/trueforge migrate:legacy-sqlite-path",
35-
"prestandalone:dev": "pnpm --filter @truefoundry/trueforge migrate:legacy-sqlite-path",
3634
"standalone:dev:no-watch": "STANDALONE=true NODE_ENV=development pnpm --parallel --filter @truefoundry/trueforge --filter frontend dev:no-watch",
3735
"standalone:dev": "STANDALONE=true NODE_ENV=development pnpm --parallel --filter @truefoundry/trueforge-core --filter @truefoundry/trueforge --filter frontend dev",
3836
"standalone:start": "STANDALONE=true NODE_ENV=production pnpm --filter @truefoundry/trueforge start",

‎packages/trueforge/.env.example‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
## server package directly (e.g. `node dist/main.js` or `tsx src/main.ts`).
1111
## ---------------------------------------------------------------------------
1212

13+
## Useful to configure the application data dir for different environments.
14+
APP_DATA_DIR_SUFFIX=dev
15+
1316
## HTTP port the server listens on. Optional, defaults to 8790.
1417
PORT=8790
1518

‎packages/trueforge/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
"migrate": "NODE_OPTIONS='--conditions=trueforge-dev' STANDALONE=false tsx --env-file=.env src/db/postgres/migrate-cli.ts",
4343
"openapi:write": "pnpm run build:gen && NODE_OPTIONS='--conditions=trueforge-dev' tsx --env-file=.env.test scripts/write-openapi.ts",
4444
"pack:dry": "pnpm pack --dry-run",
45-
"migrate:legacy-sqlite-path": "node scripts/migrate-legacy-sqlite-path.mjs",
4645
"predev:no-watch": "pnpm --filter @truefoundry/trueforge-core build:gen && pnpm run build:gen",
4746
"predev": "pnpm --filter @truefoundry/trueforge-core build:gen && pnpm run build:gen",
4847
"test:eventsub": "jest --config jest.eventsub.config.cjs",

‎packages/trueforge/scripts/migrate-legacy-sqlite-path.mjs‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎packages/trueforge/src/config.ts‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,18 +159,17 @@ function resolveOptionalPathEnv(envKey: string): string | undefined {
159159
* Absolute SQLite file path for standalone mode.
160160
* Env: `SQLITE_PATH` (optional). Default: `{env-paths data}/db/db.sqlite`.
161161
*/
162-
function resolveSqlitePath(): string {
162+
function resolveSqlitePath(appDataDir: string): string {
163163
const override = getEnv('SQLITE_PATH');
164164
if (override !== undefined && override.trim() !== '') {
165165
return path.resolve(override);
166166
}
167-
const paths = envPaths(ENV_PATHS_APP_NAME, { suffix: '' });
168-
return path.join(paths.data, 'db', 'db.sqlite');
167+
return path.join(appDataDir, 'db', 'db.sqlite');
169168
}
170169

171170
/** Parent for local sandbox roots. Same env-paths data dir as SQLite (`{suffix:''}`). */
172-
function resolveLocalSandboxRootParent(): string {
173-
return path.join(envPaths(ENV_PATHS_APP_NAME, { suffix: '' }).data, 'sandboxes');
171+
function resolveLocalSandboxRootParent(appDataDir: string): string {
172+
return path.join(appDataDir, 'sandboxes');
174173
}
175174

176175
/** Short tmp parent for Code Mode UDS socks (≤65 bytes after realpath). */
@@ -478,6 +477,9 @@ const standalone = parseBoolean({
478477
defaultValue: true,
479478
});
480479

480+
const appDataDirSuffix = getEnv('APP_DATA_DIR_SUFFIX', { defaultValue: '' }) ?? '';
481+
const appDataDir = envPaths(ENV_PATHS_APP_NAME, { suffix: appDataDirSuffix }).data;
482+
481483
const port = parsePort(getEnv('PORT'));
482484
const host = getEnv('HOST', { defaultValue: DEFAULT_HOST }) ?? DEFAULT_HOST;
483485

@@ -563,8 +565,8 @@ const configuration: ServerConfiguration = standalone
563565
? {
564566
...shared,
565567
STANDALONE: true,
566-
SQLITE_PATH: resolveSqlitePath(),
567-
LOCAL_SANDBOX_ROOT_PARENT: resolveLocalSandboxRootParent(),
568+
SQLITE_PATH: resolveSqlitePath(appDataDir),
569+
LOCAL_SANDBOX_ROOT_PARENT: resolveLocalSandboxRootParent(appDataDir),
568570
CODE_MODE_SOCKET_PARENT: resolveCodeModeSocketParent(),
569571
}
570572
: {

0 commit comments

Comments
 (0)