mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-16 03:42:21 +03:00
* test(infra): retry recursive temp-dir removal on main (main twin of #11968)
`main` has been red since b342c1a361 on the vitest and integration gates:
✖ tests/unit/autoCombo/provider-family-combos.test.ts > auto/<family>
✖ chat pipeline applies Codex OAuth fingerprint and priority tier inside combos
Both call resetStorage() from beforeEach, which does an fs.rmSync(TEST_DATA_DIR,
{recursive: true, force: true}) with no retry, and intermittently loses the race
with a not-yet-released SQLite handle (ENOTEMPTY).
release/v3.8.51 fixed this in #11968 with a mechanical codemod adding
maxRetries/retryDelay to every recursive rm/rmSync/rmdirSync under tests/, but
that PR landed only on the release branch. Because main only receives work at
the release squash, it stayed broken for the whole cycle — and repo-wide gates
then turn every open PR into main red on checks unrelated to their diff.
This is the --base main twin: re-runs the same codemod that already shipped on
the release branch (scripts/ad-hoc/codemod-rm-maxretries.mjs), so the two
branches converge on identical test-teardown semantics. Test-only; no product
logic is touched.
The remaining three failures reported on #12133 (unit full suite exceeding its
4800s ceiling, package-artifact exceeding 1200s, and the boot-smoke that is
skipped as a consequence) are runner-contention timeouts, not code defects —
validate-release-green.mjs runs those heavy gates concurrently on one shared
hosted runner. There is no fix to port for those.
* chore(scripts): carry the rm-maxretries codemod onto main alongside its output
The codemod that generated the previous commit lives in the repo on
release/v3.8.51 (added by #11968) but was never on main. Bringing it over keeps
the tool next to the change it produced, so the transformation stays
reproducible and auditable from either branch.
115 lines
4.3 KiB
TypeScript
115 lines
4.3 KiB
TypeScript
import test from "node:test";
|
|
import assert from "node:assert/strict";
|
|
import { spawnSync } from "node:child_process";
|
|
import fs from "node:fs";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
import { fileURLToPath } from "node:url";
|
|
|
|
const BIN = path.join(
|
|
path.dirname(fileURLToPath(import.meta.url)),
|
|
"..",
|
|
"..",
|
|
"bin",
|
|
"omniroute.mjs"
|
|
);
|
|
|
|
function runCli(dataDir: string): { code: number | null; stdout: string; stderr: string } {
|
|
const cleanEnv = { ...process.env };
|
|
delete cleanEnv.STORAGE_ENCRYPTION_KEY;
|
|
delete cleanEnv.JWT_SECRET;
|
|
delete cleanEnv.API_KEY_SECRET;
|
|
delete cleanEnv.DATA_DIR;
|
|
const isolatedHome = fs.mkdtempSync(path.join(os.tmpdir(), "omniroute-migration-home-"));
|
|
try {
|
|
const res = spawnSync("node", [BIN, "config", "list", "--json"], {
|
|
cwd: dataDir,
|
|
env: {
|
|
...cleanEnv,
|
|
DATA_DIR: dataDir,
|
|
HOME: isolatedHome,
|
|
USERPROFILE: isolatedHome,
|
|
NO_UPDATE_NOTIFIER: "1",
|
|
OMNIROUTE_CLI_SKIP_REPO_ENV: "1",
|
|
},
|
|
timeout: 60_000,
|
|
encoding: "utf-8",
|
|
});
|
|
return { code: res.status, stdout: res.stdout ?? "", stderr: res.stderr ?? "" };
|
|
} finally {
|
|
fs.rmSync(isolatedHome, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
|
|
}
|
|
}
|
|
|
|
// #7302: Electron persists secrets to <DATA_DIR>/server.env (electron/main.js), but the CLI
|
|
// (bin/omniroute.mjs) only ever loaded <DATA_DIR>/.env — so migrating storage.sqlite +
|
|
// server.env from the desktop app to the CLI silently lost STORAGE_ENCRYPTION_KEY and
|
|
// permanently corrupted every encrypted credential. The CLI must recognize server.env as a
|
|
// legacy/migration fallback source when .env is absent, without letting it override an
|
|
// existing .env.
|
|
|
|
test("#7302: CLI must recognize DATA_DIR/server.env (Electron's secrets file) when migrating an existing database", () => {
|
|
const dir = fs.mkdtempSync(path.join(os.tmpdir(), "omniroute-migration-"));
|
|
try {
|
|
fs.writeFileSync(path.join(dir, "storage.sqlite"), "fake-existing-db-with-real-data");
|
|
const electronKey = "electron-storage-key-0123456789abcdef0123456789abcdef";
|
|
fs.writeFileSync(
|
|
path.join(dir, "server.env"),
|
|
[
|
|
"JWT_SECRET=electron-jwt-secret-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
|
|
"API_KEY_SECRET=electron-api-key-secret-bbbbbbbbbbbbbbbbbbbbbbbbbbbb",
|
|
`STORAGE_ENCRYPTION_KEY=${electronKey}`,
|
|
"STORAGE_ENCRYPTION_KEY_VERSION=v1",
|
|
"",
|
|
].join("\n")
|
|
);
|
|
|
|
const { stderr } = runCli(dir);
|
|
|
|
const envPath = path.join(dir, ".env");
|
|
const envContent = fs.existsSync(envPath) ? fs.readFileSync(envPath, "utf-8") : "";
|
|
assert.match(
|
|
envContent,
|
|
new RegExp(`STORAGE_ENCRYPTION_KEY=${electronKey}`),
|
|
"the Electron-persisted STORAGE_ENCRYPTION_KEY from server.env must be honored " +
|
|
"after migrating to the CLI install — got .env content: " + JSON.stringify(envContent)
|
|
);
|
|
|
|
assert.doesNotMatch(
|
|
stderr,
|
|
/STORAGE_ENCRYPTION_KEY is not set but a database already exists/,
|
|
"the CLI should not need to refuse key generation — it should have found the " +
|
|
"Electron-persisted key in server.env"
|
|
);
|
|
} finally {
|
|
fs.rmSync(dir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
|
|
}
|
|
});
|
|
|
|
test("#7302: an existing DATA_DIR/.env must still win over DATA_DIR/server.env when both exist", () => {
|
|
const dir = fs.mkdtempSync(path.join(os.tmpdir(), "omniroute-migration-winner-"));
|
|
try {
|
|
fs.writeFileSync(path.join(dir, "storage.sqlite"), "fake-existing-db-with-real-data");
|
|
const cliKey = "cli-owned-storage-key-fedcba9876543210fedcba9876543210";
|
|
const electronKey = "electron-storage-key-0123456789abcdef0123456789abcdef";
|
|
fs.writeFileSync(path.join(dir, ".env"), `STORAGE_ENCRYPTION_KEY=${cliKey}\n`);
|
|
fs.writeFileSync(path.join(dir, "server.env"), `STORAGE_ENCRYPTION_KEY=${electronKey}\n`);
|
|
|
|
runCli(dir);
|
|
|
|
const envContent = fs.readFileSync(path.join(dir, ".env"), "utf-8");
|
|
assert.match(
|
|
envContent,
|
|
new RegExp(`STORAGE_ENCRYPTION_KEY=${cliKey}`),
|
|
"an existing .env must never be overwritten by server.env"
|
|
);
|
|
assert.doesNotMatch(
|
|
envContent,
|
|
new RegExp(electronKey),
|
|
"server.env must not leak into an existing .env"
|
|
);
|
|
} finally {
|
|
fs.rmSync(dir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
|
|
}
|
|
});
|