Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Re-register OK browser-stack proofs and speed up the ledger check (#6350)

Nick Gomez05afe8337dde
diff --git a/knip.config.ts b/knip.config.ts
index eb9727af8..e43118957 100644
--- a/knip.config.ts
+++ b/knip.config.ts
@@ -155,15 +155,11 @@ export default {
'src/shadow-fixture-launch.test-helper.mjs',
],
project: 'src/**',
- ignoreDependencies: [
- '@types/shell-quote',
- ],
+ ignoreDependencies: ['@types/shell-quote'],
},
'packages/cli': {
entry: ['src/**/*.test.ts', 'scripts/*.ts', 'tests/**/*.ts', 'src/parse-worker.ts'],
- ignoreDependencies: [
- 'yjs',
- ],
+ ignoreDependencies: ['yjs'],
},
'packages/desktop': {
entry: [
diff --git a/packages/app/tests/foundation/owned-server-lifetime-loss.node.test.ts b/packages/app/tests/foundation/owned-server-lifetime-loss.node.test.ts
index 0c254b53e..6cd9d7cd9 100644
--- a/packages/app/tests/foundation/owned-server-lifetime-loss.node.test.ts
+++ b/packages/app/tests/foundation/owned-server-lifetime-loss.node.test.ts
@@ -27,7 +27,7 @@ vi.mock('../stress/_helpers/worker-server-lifetime.ts', async (importOriginal) =
await importOriginal<typeof import('../stress/_helpers/worker-server-lifetime.ts')>();
return {
...lifetime,
- killGracefully: async () => {
+ stopWorkerServer: async () => {
harness.releases.push('stop');
},
completeWorkerServerRelease: async () => {
diff --git a/packages/app/tests/foundation/worker-lifetime/observe-worker-spawn-error.test-helper.ts b/packages/app/tests/foundation/worker-lifetime/observe-worker-spawn-error.test-helper.ts
index 196152bfa..c11447b8c 100644
--- a/packages/app/tests/foundation/worker-lifetime/observe-worker-spawn-error.test-helper.ts
+++ b/packages/app/tests/foundation/worker-lifetime/observe-worker-spawn-error.test-helper.ts
@@ -111,7 +111,7 @@ async function runFailedSpawnActor(
openServerLog,
prepareViteCacheDir,
} = await import('../../stress/_helpers/server-process.ts');
- const { completeWorkerServerRelease, killGracefully } = await import(
+ const { completeWorkerServerRelease, stopWorkerServer } = await import(
'../../stress/_helpers/worker-server-lifetime.ts'
);
const { removeAllDuringTeardown, runTeardownPhases } = await import(
@@ -135,13 +135,9 @@ async function runFailedSpawnActor(
JSON.stringify(prebuiltManifest(join(APP_DIR, '..', '..'), PREBUILT_BUILD_OPTIONS)),
);
}
- const proc: ChildProcess =
+ const workerProc =
backend === 'native'
- ? spawn('pnpm', [...FAILED_SPAWN_COMMANDS[mode]], {
- cwd: APP_DIR,
- env: { ...process.env, PATH: emptyPath },
- stdio: ['ignore', serverLog.fd, 'inherit'],
- })
+ ? undefined
: fixture.spawnWorkerDevServer(
request,
{ PATH: emptyPath },
@@ -150,6 +146,13 @@ async function runFailedSpawnActor(
serverLog,
mode === 'prebuilt' ? { kind: 'prebuilt', outputDir } : { kind: 'dev-server' },
);
+ const proc: ChildProcess =
+ workerProc ??
+ spawn('pnpm', [...FAILED_SPAWN_COMMANDS[mode]], {
+ cwd: APP_DIR,
+ env: { ...process.env, PATH: emptyPath },
+ stdio: ['ignore', serverLog.fd, 'inherit'],
+ });
const exits: Array<z.infer<typeof terminalSchema>> = [];
proc.on('exit', (code, signal) => exits.push({ code, signal }));
const closed = new Promise<z.infer<typeof terminalSchema>>((resolve) =>
@@ -177,12 +180,13 @@ async function runFailedSpawnActor(
}
} finally {
await runTeardownPhases(
- () => (backend === 'native' ? killNative(proc, 5_000) : killGracefully(proc, 5_000)),
+ () =>
+ workerProc === undefined ? killNative(proc, 5_000) : stopWorkerServer(workerProc, 5_000),
() => {
closeServerLog(serverLog);
removeAllDuringTeardown(contentDir, viteCacheDir, request.receiptDir, serverLog.path);
},
- () => (backend === 'exported' ? completeWorkerServerRelease(proc) : undefined),
+ () => (workerProc === undefined ? undefined : completeWorkerServerRelease(workerProc)),
);
}
writeFileSync(
diff --git a/packages/app/tests/foundation/worker-server-handle.type-tests.ts b/packages/app/tests/foundation/worker-server-handle.type-tests.ts
new file mode 100644
index 000000000..2a6abcb99
--- /dev/null
+++ b/packages/app/tests/foundation/worker-server-handle.type-tests.ts
@@ -0,0 +1,23 @@
+import type { ChildProcess } from 'node:child_process';
+import { killGracefully } from '../stress/_helpers/server-process.ts';
+import {
+ completeWorkerServerRelease,
+ stopWorkerServer,
+ type WorkerServerProcess,
+} from '../stress/_helpers/worker-server-lifetime.ts';
+
+declare const handle: WorkerServerProcess;
+declare const command: ChildProcess;
+
+void stopWorkerServer(handle, 1_000);
+void completeWorkerServerRelease(handle);
+void killGracefully(command, 1_000);
+const _asChild: ChildProcess = handle;
+void _asChild;
+
+// @ts-expect-error -- a worker server handle is stopped through its lifetime owner; signalling its process group directly would bypass the release protocol.
+void killGracefully(handle, 1_000);
+// @ts-expect-error -- only a handle acquireWorkerServer returned has a lifetime owner to stop.
+void stopWorkerServer(command, 1_000);
+// @ts-expect-error -- only a handle acquireWorkerServer returned has a lifetime owner to release.
+void completeWorkerServerRelease(command);
diff --git a/packages/app/tests/foundation/worker-server-lifetime-loss.node.test.ts b/packages/app/tests/foundation/worker-server-lifetime-loss.node.test.ts
new file mode 100644
index 000000000..e47b164c2
--- /dev/null
+++ b/packages/app/tests/foundation/worker-server-lifetime-loss.node.test.ts
@@ -0,0 +1,91 @@
+import { mkdirSync, mkdtempSync, readdirSync, realpathSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { afterEach, describe, expect, test } from 'vitest';
+import {
+ closeServerLog,
+ createViteStartupRequest,
+ openServerLog,
+} from '../stress/_helpers/server-process.ts';
+import {
+ acquireWorkerServer,
+ completeWorkerServerRelease,
+ stopWorkerServer,
+} from '../stress/_helpers/worker-server-lifetime.ts';
+
+const LIFETIME_LOSS =
+ 'worker server lifetime closed without completed release (code=1, signal=null)';
+const RELEASE_LOSS = 'worker server lifetime closed before release completed';
+const REAP_MS = 10_000;
+const saved = { TMPDIR: process.env.TMPDIR, NODE_OPTIONS: process.env.NODE_OPTIONS };
+const scratchDirs: string[] = [];
+
+afterEach(() => {
+ for (const [name, value] of Object.entries(saved)) {
+ if (value === undefined) delete process.env[name];
+ else process.env[name] = value;
+ }
+ for (const dir of scratchDirs.splice(0)) rmSync(dir, { recursive: true, force: true });
+});
+
+function lostOwnerLaunch() {
+ const root = realpathSync(mkdtempSync(join(tmpdir(), 'ok-lifetime-loss-')));
+ scratchDirs.push(root);
+ const tmp = join(root, 'tmp');
+ mkdirSync(tmp);
+ const contentDir = join(root, 'content');
+ mkdirSync(contentDir);
+ const viteCacheDir = join(root, 'vite-cache');
+ mkdirSync(viteCacheDir);
+ process.env.TMPDIR = tmp;
+ const request = createViteStartupRequest('127.0.0.1');
+ const serverLog = openServerLog('lifetime-loss');
+ process.env.NODE_OPTIONS = `--require=${join(root, 'no-such-preload.cjs')}`;
+ const proc = acquireWorkerServer(
+ request,
+ {},
+ contentDir,
+ viteCacheDir,
+ serverLog,
+ { kind: 'dev-server' },
+ REAP_MS,
+ );
+ const cleanup = () => {
+ closeServerLog(serverLog);
+ request.dispose();
+ rmSync(serverLog.path, { force: true });
+ };
+ return { proc, cleanup, tmp };
+}
+
+describe('a worker server lifetime whose owner is lost, with no caller listening for errors', () => {
+ test('the loss reaches the release that follows, and never surfaces as an unhandled error', async () => {
+ const { proc, cleanup, tmp } = lostOwnerLaunch();
+
+ const release = await completeWorkerServerRelease(proc, cleanup).then(
+ () => undefined,
+ (error: unknown) => error,
+ );
+
+ expect(release).toBeInstanceOf(Error);
+ expect((release as Error).message).toBe(RELEASE_LOSS);
+ expect(readdirSync(tmp)).toEqual([]);
+ });
+
+ test('a stop after the loss reports the same loss instead of waiting out its bound', async () => {
+ const { proc, cleanup } = lostOwnerLaunch();
+ const release = await completeWorkerServerRelease(proc, cleanup).then(
+ () => undefined,
+ (error: unknown) => error,
+ );
+
+ const stop = await stopWorkerServer(proc, REAP_MS).then(
+ () => undefined,
+ (error: unknown) => error,
+ );
+
+ expect((release as Error).message).toBe(RELEASE_LOSS);
+ expect(stop).toBeInstanceOf(Error);
+ expect((stop as Error).message).toBe(LIFETIME_LOSS);
+ });
+});
diff --git a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts b/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
index 4549c74b3..a50b00123 100644
--- a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
+++ b/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
@@ -1,4 +1,3 @@
-
import { readFileSync } from 'node:fs';
import { join } from 'node:path';
import { setTimeout as wait } from 'node:timers/promises';
diff --git a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts b/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
index 4fc2c11f9..6fcdc23f2 100644
--- a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
+++ b/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
@@ -1,4 +1,3 @@
-
import { setTimeout as wait } from 'node:timers/promises';
import { normalizeBridge } from '@inkeep/open-knowledge-core';
import { updateYFragment } from '@tiptap/y-tiptap';
diff --git a/packages/app/tests/integration/interior-edit-freshness.test.ts b/packages/app/tests/integration/interior-edit-freshness.test.ts
index 9f2f6feb6..40b5cdfd6 100644
--- a/packages/app/tests/integration/interior-edit-freshness.test.ts
+++ b/packages/app/tests/integration/interior-edit-freshness.test.ts
@@ -1,4 +1,3 @@
-
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts b/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
index 2a085742b..93666af70 100644
--- a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
+++ b/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
@@ -1,4 +1,3 @@
-
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/producer-guard-wiring.test.ts b/packages/app/tests/integration/producer-guard-wiring.test.ts
index 878d5196b..867598d34 100644
--- a/packages/app/tests/integration/producer-guard-wiring.test.ts
+++ b/packages/app/tests/integration/producer-guard-wiring.test.ts
@@ -1,4 +1,3 @@
-
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts b/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
index 4ada3cf26..0970ac12f 100644
--- a/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
+++ b/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
@@ -1,4 +1,3 @@
-
import { randomUUID } from 'node:crypto';
import { afterEach, describe, expect, test } from 'vitest';
import { agentWriteMd, createTestServer, type TestServer } from './test-harness';
diff --git a/packages/app/tests/integration/qa-045-restore-after-gc.test.ts b/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
index cbe2b705f..b632185e1 100644
--- a/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
+++ b/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
@@ -1,4 +1,3 @@
-
import { execFileSync } from 'node:child_process';
import { randomUUID } from 'node:crypto';
import { join } from 'node:path';
diff --git a/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts b/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
index 89bc9b4d9..c530ce4ba 100644
--- a/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
+++ b/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
@@ -1,4 +1,3 @@
-
import { randomUUID } from 'node:crypto';
import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest';
import type * as Y from 'yjs';
diff --git a/packages/app/tests/integration/undo-after-rollback.test.ts b/packages/app/tests/integration/undo-after-rollback.test.ts
index a78aeb0e4..d3767adc9 100644
--- a/packages/app/tests/integration/undo-after-rollback.test.ts
+++ b/packages/app/tests/integration/undo-after-rollback.test.ts
@@ -1,4 +1,3 @@
-
import { ROLLBACK_ORIGIN } from '@inkeep/open-knowledge-server';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
import * as Y from 'yjs';
diff --git a/packages/app/tests/integration/undo-recycle-reset.test.ts b/packages/app/tests/integration/undo-recycle-reset.test.ts
index e7cc69c3f..b076f955c 100644
--- a/packages/app/tests/integration/undo-recycle-reset.test.ts
+++ b/packages/app/tests/integration/undo-recycle-reset.test.ts
@@ -1,4 +1,3 @@
-
import { writeFileSync } from 'node:fs';
import { join } from 'node:path';
import { setTimeout as wait } from 'node:timers/promises';
diff --git a/packages/app/tests/integration/undo-rederive-survival.test.ts b/packages/app/tests/integration/undo-rederive-survival.test.ts
index 9ddcd0730..7935e35f8 100644
--- a/packages/app/tests/integration/undo-rederive-survival.test.ts
+++ b/packages/app/tests/integration/undo-rederive-survival.test.ts
@@ -1,4 +1,3 @@
-
import { prependFrontmatter } from '@inkeep/open-knowledge-core';
import { Plugin, PluginKey } from '@tiptap/pm/state';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
diff --git a/packages/app/tests/meta/worker-server-budget.test.ts b/packages/app/tests/meta/worker-server-budget.test.ts
index 71a546c72..40977f7b4 100644
--- a/packages/app/tests/meta/worker-server-budget.test.ts
+++ b/packages/app/tests/meta/worker-server-budget.test.ts
@@ -1489,7 +1489,7 @@ const SERVER_PROCESS_SOURCE_PATH = join(
const READINESS_BOUND_SITE = 'waitForServerReady -> waitForHttpReady readiness bound';
const WARMUP_NAVIGATION_STALL_SITE = 'warmupAppFirstLoad -> gotoWhileLoadProgresses stall window';
const WARMUP_VISIBLE_SITE = 'warmupAppFirstLoad -> locator.waitFor visibility bound';
-const DEV_SERVER_REAP_SITE = 'workerServer fixture body -> killGracefully reap bound';
+const DEV_SERVER_REAP_SITE = 'workerServer fixture body -> stopWorkerServer reap bound';
const STARVATION_ELAPSED_SITE =
'workerServer fixture body -> refuseStarvedBudgetSlot elapsed-since-fixture-start argument';
const FIXTURE_START_IDENTIFIER = 'fixtureStartedAt';
@@ -1562,7 +1562,7 @@ const BUDGET_WIRING_SITES: readonly BudgetWiringSite[] = [
{
site: DEV_SERVER_REAP_SITE,
scope: { kind: 'worker-server-fixture-body' },
- callee: 'killGracefully',
+ callee: 'stopWorkerServer',
calls: 2,
argument: { kind: 'positional', index: 1 },
requires: { kind: 'reserve', key: DEV_SERVER_REAP_RESERVE_KEY },
@@ -2264,12 +2264,12 @@ function plantedFixtureSource(overrides: {
' await warmupAppFirstLoad(browser, baseURL, setupOverhead);',
` refuseStarvedBudgetSlot(setupOverhead, ${starvationElapsed}, residue);`,
' } catch (err) {',
- ` await killGracefully(${reap[0]});`,
+ ` await stopWorkerServer(${reap[0]});`,
' throw err;',
' }',
' await use({ port, baseURL, contentDir });',
` const teardown = openBudgetPhase('teardown', ${teardownPhase});`,
- ` await killGracefully(${reap[1]});`,
+ ` await stopWorkerServer(${reap[1]});`,
' await spendOnBudgetPhase(teardown, () => removeAllDuringTeardown(contentDir));',
' },',
` { scope: 'worker', timeout: ${DECLARED_TOTAL_EXPORT} },`,
@@ -2334,7 +2334,7 @@ describe('worker-server fixture budget wiring', () => {
expect(
findingsAt(scanBudgetWiring(source), DEV_SERVER_REAP_SITE),
- `both reap calls must spend ${DECLARED_RESERVES_EXPORT}.${DEV_SERVER_REAP_RESERVE_KEY}. killGracefully keeps its own default for the globalSetup caller that has no enclosing fixture slot, so an omitted argument here silently reverts the fixture's reap bound and compiles clean`,
+ `both reap calls must spend ${DECLARED_RESERVES_EXPORT}.${DEV_SERVER_REAP_RESERVE_KEY}. stopWorkerServer takes its bound as a required argument, so the drift this pins is a free literal or any expression other than the declared reserve, which compiles clean and detaches the fixture's reap bound from the budget`,
).toEqual([]);
});
@@ -2700,8 +2700,8 @@ describe('worker-server fixture budget wiring', () => {
const thirdReapCall = scanBudgetWiring(
plantedFixtureSource({}).replace(
- ` await killGracefully(${COMPLIANT_REAP_ARGUMENT});`,
- ` await killGracefully(${COMPLIANT_REAP_ARGUMENT});\n await killGracefully(proc);`,
+ ` await stopWorkerServer(${COMPLIANT_REAP_ARGUMENT});`,
+ ` await stopWorkerServer(${COMPLIANT_REAP_ARGUMENT});\n await stopWorkerServer(proc);`,
),
);
expect(reasonsOf(thirdReapCall)).toEqual(['call-count', 'argument-missing']);
diff --git a/packages/app/tests/stress/_helpers/fixtures.ts b/packages/app/tests/stress/_helpers/fixtures.ts
index d892fd804..431f68972 100644
--- a/packages/app/tests/stress/_helpers/fixtures.ts
+++ b/packages/app/tests/stress/_helpers/fixtures.ts
@@ -1,4 +1,3 @@
-import type { ChildProcess } from 'node:child_process';
import { mkdirSync, mkdtempSync, writeFileSync } from 'node:fs';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
@@ -29,7 +28,8 @@ import { removeAllDuringTeardown, runTeardownPhases } from './teardown-fs.ts';
import {
acquireWorkerServer,
completeWorkerServerRelease,
- killGracefully,
+ stopWorkerServer,
+ type WorkerServerProcess,
} from './worker-server-lifetime.ts';
interface ProblemError extends Error {
@@ -452,7 +452,7 @@ export function spawnWorkerDevServer(
viteCacheDir: string,
serverLog: ServerLog,
serving: WorkerServing = workerServingFromEnv(process.env),
-): ChildProcess {
+): WorkerServerProcess {
return acquireWorkerServer(
request,
workerServerEnv,
@@ -469,7 +469,7 @@ export interface StartedWorkerServer {
contentDir: string;
viteCacheDir: string;
serverLog: ServerLog;
- proc: ChildProcess;
+ proc: WorkerServerProcess;
}
function setupResidueOf(started: StartedWorkerServer): string {
@@ -494,7 +494,7 @@ export const test = base.extend<TestFixtures, WorkerFixtures>({
const releaseSetupResources: Array<() => void | Promise<void>> = [];
let openedServerLog: ServerLog | undefined;
let started: StartedWorkerServer | undefined;
- let ownedProc: ChildProcess | undefined;
+ let ownedProc: WorkerServerProcess | undefined;
let endpoint: BoundViteEndpoint;
try {
@@ -523,7 +523,7 @@ export const test = base.extend<TestFixtures, WorkerFixtures>({
);
ownedProc = proc;
releaseSetupResources.push(() =>
- killGracefully(proc, WORKER_SERVER_BUDGET_RESERVES.devServerReap),
+ stopWorkerServer(proc, WORKER_SERVER_BUDGET_RESERVES.devServerReap),
);
proc.on('error', (err) => {
@@ -589,7 +589,7 @@ export const test = base.extend<TestFixtures, WorkerFixtures>({
const teardown = openBudgetPhase(TEARDOWN_PHASE_NAME, WORKER_SERVER_BUDGET_RESERVES.teardown);
await completeWorkerServerRelease(proc, async () => {
try {
- await killGracefully(proc, WORKER_SERVER_BUDGET_RESERVES.devServerReap);
+ await stopWorkerServer(proc, WORKER_SERVER_BUDGET_RESERVES.devServerReap);
} finally {
await spendOnBudgetPhase(teardown, () => {
closeServerLog(serverLog);
diff --git a/packages/app/tests/stress/_helpers/reuse/owned-dev-server.ts b/packages/app/tests/stress/_helpers/reuse/owned-dev-server.ts
index 8879c0a21..8af073b39 100644
--- a/packages/app/tests/stress/_helpers/reuse/owned-dev-server.ts
+++ b/packages/app/tests/stress/_helpers/reuse/owned-dev-server.ts
@@ -19,7 +19,11 @@ import {
tailServerLog,
} from '../server-process.ts';
import { removeAllDuringTeardown, runTeardownPhases } from '../teardown-fs.ts';
-import { completeWorkerServerRelease, killGracefully } from '../worker-server-lifetime.ts';
+import {
+ completeWorkerServerRelease,
+ stopWorkerServer,
+ type WorkerServerProcess,
+} from '../worker-server-lifetime.ts';
import type { WorkerServerEnv } from './lease-protocol.ts';
import type { LaunchOwnedServer, OwnedServer } from './server-supervisor.ts';
@@ -33,7 +37,7 @@ export async function launchOwnedWorkerServer({
readonly serving: WorkerServing;
}): Promise<OwnedServer> {
const teardown: Array<() => void | Promise<void>> = [];
- let ownedProc: import('node:child_process').ChildProcess | undefined;
+ let ownedProc: WorkerServerProcess | undefined;
const releaseAll = () =>
runTeardownPhases(
() => runTeardownPhases(...[...teardown].reverse()),
@@ -64,7 +68,7 @@ export async function launchOwnedWorkerServer({
const lifetimeLost = new Promise<never>((_, reject) => {
proc.on('error', reject);
});
- teardown.push(() => killGracefully(proc, WORKER_SERVER_BUDGET_RESERVES.devServerReap));
+ teardown.push(() => stopWorkerServer(proc, WORKER_SERVER_BUDGET_RESERVES.devServerReap));
const endpoint = await Promise.race([
waitForServerReady({
pending: beginViteStartup(request, proc),
diff --git a/packages/app/tests/stress/_helpers/server-process.ts b/packages/app/tests/stress/_helpers/server-process.ts
index ada73d0e7..15fb3cd23 100644
--- a/packages/app/tests/stress/_helpers/server-process.ts
+++ b/packages/app/tests/stress/_helpers/server-process.ts
@@ -466,7 +466,12 @@ export function signalTree(proc: ChildProcess, signal: NodeJS.Signals): boolean
const GROUP_DRAIN_POLL_INTERVAL_MS = 25;
-export async function killGracefully(proc: ChildProcess, timeoutMs = 5000): Promise<void> {
+export declare const WORKER_SERVER_HANDLE: unique symbol;
+
+export async function killGracefully(
+ proc: ChildProcess & { readonly [WORKER_SERVER_HANDLE]?: never },
+ timeoutMs = 5000,
+): Promise<void> {
const deadline = Date.now() + timeoutMs;
if (proc.exitCode === null && proc.signalCode === null) {
const exited = new Promise<void>((resolve) => proc.once('exit', () => resolve()));
diff --git a/packages/app/tests/stress/_helpers/worker-server-lifetime.ts b/packages/app/tests/stress/_helpers/worker-server-lifetime.ts
index 516d3dbc5..4901c7542 100644
--- a/packages/app/tests/stress/_helpers/worker-server-lifetime.ts
+++ b/packages/app/tests/stress/_helpers/worker-server-lifetime.ts
@@ -5,14 +5,17 @@ import { z } from 'zod';
import { prebuiltServerCommand, type WorkerServing } from './prebuilt/prebuilt-serving.ts';
import {
APP_PACKAGE_ROOT,
- killGracefully as killCommandGracefully,
type ServerLog,
type ViteStartupRequest,
+ type WORKER_SERVER_HANDLE,
} from './server-process.ts';
import { runTeardownPhases } from './teardown-fs.ts';
import type { WorkerServerLaunch } from './worker-server-command.ts';
+export type WorkerServerProcess = ChildProcess & { readonly [WORKER_SERVER_HANDLE]: true };
+
interface Lifetime {
+ readonly sendToOwner: (type: 'stop' | 'release') => void;
readonly stopped: Promise<void>;
readonly released: Promise<void>;
readonly exited: Promise<void>;
@@ -22,6 +25,12 @@ interface Lifetime {
const lifetimes = new WeakMap<ChildProcess, Lifetime>();
+function lifetimeOf(proc: WorkerServerProcess): Lifetime {
+ const lifetime = lifetimes.get(proc);
+ if (lifetime === undefined) throw new Error('not a handle acquireWorkerServer returned');
+ return lifetime;
+}
+
const commandStatusSchema = z.object({
code: z.number().int().nullable(),
signal: z
@@ -64,7 +73,7 @@ export function acquireWorkerServer(
serverLog: ServerLog,
serving: WorkerServing,
reapMs: number,
-): ChildProcess {
+): WorkerServerProcess {
const command =
serving.kind === 'prebuilt'
? prebuiltServerCommand(request.host, serving, join(APP_PACKAGE_ROOT, '..', '..'))
@@ -166,6 +175,7 @@ export function acquireWorkerServer(
}
return nativeEmit(event, ...args);
};
+ proc.on('error', () => undefined);
proc.on('message', (input: unknown) => {
const result = lifetimeMessageSchema.safeParse(input);
if (!result.success) {
@@ -215,21 +225,32 @@ export function acquireWorkerServer(
message satisfies never;
}
});
+ const sendToOwner = (type: 'stop' | 'release') => {
+ if (!proc.connected) return;
+ proc.send({ type }, (error) => {
+ if (error === null) return;
+ if (type === 'stop') rejectStopped(error);
+ else rejectReleased(error);
+ });
+ };
lifetimes.set(proc, {
+ sendToOwner,
stopped,
released,
exited,
ownerExited: () => nativeExitCode !== null || nativeSignalCode !== null,
reapMs,
});
- return proc;
+ return proc as WorkerServerProcess;
}
-export async function killGracefully(proc: ChildProcess, timeoutMs: number): Promise<void> {
- const lifetime = lifetimes.get(proc);
- if (lifetime === undefined) return killCommandGracefully(proc, timeoutMs);
+export async function stopWorkerServer(
+ proc: WorkerServerProcess,
+ timeoutMs: number,
+): Promise<void> {
+ const lifetime = lifetimeOf(proc);
if (lifetime.ownerExited()) return lifetime.exited;
- if (proc.connected) proc.send({ type: 'stop' });
+ lifetime.sendToOwner('stop');
let timer: ReturnType<typeof setTimeout> | undefined;
try {
await Promise.race([
@@ -247,13 +268,12 @@ export async function killGracefully(proc: ChildProcess, timeoutMs: number): Pro
}
export async function completeWorkerServerRelease(
- proc: ChildProcess,
+ proc: WorkerServerProcess,
cleanup: () => void | Promise<void> = () => undefined,
): Promise<void> {
await runTeardownPhases(cleanup, async () => {
- const lifetime = lifetimes.get(proc);
- if (lifetime === undefined) return;
- if (proc.connected) proc.send({ type: 'release' });
+ const lifetime = lifetimeOf(proc);
+ lifetime.sendToOwner('release');
let timer: ReturnType<typeof setTimeout> | undefined;
try {
await Promise.race([
diff --git a/packages/core/src/bridge/compose.ts b/packages/core/src/bridge/compose.ts
index 2a597ec3d..f4cc8a286 100644
--- a/packages/core/src/bridge/compose.ts
+++ b/packages/core/src/bridge/compose.ts
@@ -1,4 +1,3 @@
-
import { prependFrontmatter, stripFrontmatter } from '../extensions/frontmatter.ts';
export type ComposeAdjustment = 'none' | 'body' | 'frontmatter' | 'unresolved';
diff --git a/packages/core/src/bridge/doc-boundary-space.ts b/packages/core/src/bridge/doc-boundary-space.ts
index ffd8fce06..e7e63f43d 100644
--- a/packages/core/src/bridge/doc-boundary-space.ts
+++ b/packages/core/src/bridge/doc-boundary-space.ts
@@ -1,4 +1,3 @@
-
import { FRONTMATTER_RE, stripFrontmatter } from '../extensions/frontmatter.ts';
import { carriedEdgeEmpties, type DocEdgeEmpties } from '../markdown/doc-edge-blank-runs.ts';
diff --git a/packages/core/src/markdown/comment-promoter.ts b/packages/core/src/markdown/comment-promoter.ts
index fb0ba5a7c..fc267cbea 100644
--- a/packages/core/src/markdown/comment-promoter.ts
+++ b/packages/core/src/markdown/comment-promoter.ts
@@ -1,4 +1,3 @@
-
import type { Nodes, Paragraph, PhrasingContent, Root, RootContent, Text } from 'mdast';
import { SKIP, visit } from 'unist-util-visit';
import type { VFile } from 'vfile';
diff --git a/packages/core/src/markdown/merged-walker.ts b/packages/core/src/markdown/merged-walker.ts
index ae8cb390b..861003fb4 100644
--- a/packages/core/src/markdown/merged-walker.ts
+++ b/packages/core/src/markdown/merged-walker.ts
@@ -1,4 +1,3 @@
-
import type { Nodes, Parent, Root } from 'mdast';
import { SKIP, visit } from 'unist-util-visit';
import type { VFile } from 'vfile';
diff --git a/packages/core/src/markdown/safe-url.ts b/packages/core/src/markdown/safe-url.ts
index 8be632ba4..4d3250d3a 100644
--- a/packages/core/src/markdown/safe-url.ts
+++ b/packages/core/src/markdown/safe-url.ts
@@ -1,4 +1,3 @@
-
export const SAFE_URL_SCHEMES = ['https', 'http', 'mailto', 'tel', 'ftp', 'sms'] as const;
const SCHEME_ALT = SAFE_URL_SCHEMES.map((s) => `${s}:`).join('|');