openworkgraph 0.3.0 → 0.3.1

package/dist/operations/daemon.js

@@ -7,7 +7,7 @@ import { waitForBackups, clearStaleResourceLeases } from './backups.js';
 import { localCapacity } from './capacity.js';
 import { registerLocalPlugin } from './plugins.js';
 import { fileURLToPath } from 'node:url';
-import { isGlobalNpmInstallation, startWebUpdate } from './update.js';
+import { isGlobalNpmInstallation, isNpxInstallation, startWebUpdate } from './update.js';
 export function activeRunCount(db) {
     return Number(db.prepare("SELECT count(*) AS n FROM runs WHERE status NOT IN ('accepted','queued','paused_restore','succeeded','failed','cancelled','interrupted')").get().n);
 }
@@ -17,9 +17,11 @@ export async function serveManaged(dataDir, host, port, onStopped) {
     let service;
     const cliPath = fileURLToPath(new URL('../cli.js', import.meta.url));
     const npmInstallation = isGlobalNpmInstallation(cliPath);
+    const npxInstallation = npmInstallation.then(global => global ? false : isNpxInstallation(cliPath));
     try {
         service = createService(lock.root, {
             npmInstallation: () => npmInstallation,
+            npxInstallation: () => npxInstallation,
             updateRuntime: async (onExit) => {
                 if (state !== 'running')
                     throw new Error('Runtime is stopping.');
@@ -40,10 +42,13 @@ export async function serveManaged(dataDir, host, port, onStopped) {
     let stopping = false;
     const drains = new Set();
     let closing;
+    let listenAddress;
     let recoveryAttempted = false;
     const onSignal = () => { void stop(false).catch(() => log.append('shutdown_failed')); };
     const removeSignals = () => { process.removeListener('SIGINT', onSignal); process.removeListener('SIGTERM', onSignal); };
-    const status = () => ({ state, activeRuns: activeRunCount(service.db), listenHost: service.server.address().address, ...listenerInfo(service.server.address(), service.info.serviceId, service.instanceId) });
+    // server.address() becomes null as soon as HTTP shutdown begins; local
+    // management must remain available until connections close and locks release.
+    const status = () => ({ state, activeRuns: closing ? 0 : activeRunCount(service.db), listenHost: listenAddress.address, ...listenerInfo(listenAddress, service.info.serviceId, service.instanceId) });
     async function stop(interrupt) {
         // Escalation remains available while an earlier drain waits indefinitely.
         if (stopping && (!interrupt || state === 'interrupting'))
@@ -91,6 +96,7 @@ export async function serveManaged(dataDir, host, port, onStopped) {
         clearStaleResourceLeases(service.db, lock);
         await service.api.backups.recoverCreating(lock);
         await new Promise((done, reject) => { service.server.once('error', reject); service.server.listen(port, host, done); });
+        listenAddress = service.server.address();
         // Own the kernel lock before transferring scheduler epochs. Runtime.start
         // resets acceptingRuns after a normal shutdown and starts its dispatch timer.
         recoveryAttempted = true;

package/dist/operations/update.d.ts

@@ -1,5 +1,7 @@
 import { spawn } from 'node:child_process';
 import { readInstance, requestInstance, startBackground, waitUntilStopped } from './lifecycle.js';
+/** Recognize the package actually running from npm exec/npx's cache, including custom cache roots. */
+export declare function isNpxInstallation(cliPath: string, spawnProcess?: SpawnProcess): Promise<boolean>;
 /** Compare the running package against npm's actual global package location. */
 export declare function isGlobalNpmInstallation(cliPath: string, spawnProcess?: SpawnProcess): Promise<boolean>;
 /** The updater must outlive the Runtime that it stops. */

package/dist/operations/update.js

@@ -4,20 +4,39 @@ import { join, relative, isAbsolute, sep } from 'node:path';
 import { SERVICE_VERSION } from "../vendor/protocol/index.js";
 import { readInstance, requestInstance, startBackground, waitUntilStopped } from './lifecycle.js';
 const PACKAGE_NAME = 'openworkgraph';
+async function npmPath(args, spawnProcess) {
+    const invocation = process.platform === 'win32'
+        ? { command: process.env.ComSpec ?? process.env.COMSPEC ?? 'cmd.exe', args: ['/d', '/s', '/c', 'npm ' + args.join(' ')] }
+        : { command: 'npm', args };
+    return new Promise((resolve, reject) => {
+        const child = spawnProcess(invocation.command, invocation.args, { windowsHide: true, stdio: ['ignore', 'pipe', 'ignore'], timeout: 5000 });
+        let output = '';
+        child.stdout?.on('data', chunk => { if (output.length < 8192)
+            output += chunk.toString('utf8'); });
+        child.once('error', reject);
+        child.once('close', code => code === 0 ? resolve(output.trim()) : reject(new Error('npm path query failed')));
+    });
+}
+/** Recognize the package actually running from npm exec/npx's cache, including custom cache roots. */
+export async function isNpxInstallation(cliPath, spawnProcess = spawn) {
+    try {
+        const cache = await npmPath(['config', 'get', 'cache'], spawnProcess);
+        if (!cache)
+            return false;
+        const npxRoot = await realpath(join(cache, '_npx'));
+        const runningPath = await realpath(cliPath);
+        const inside = relative(npxRoot, runningPath).split(sep);
+        return inside.length === 5 && inside[0] !== '..' && inside[0] !== '' && !isAbsolute(inside[0])
+            && inside[1] === 'node_modules' && inside[2] === PACKAGE_NAME && inside[3] === 'dist' && inside[4] === 'cli.js';
+    }
+    catch {
+        return false;
+    }
+}
 /** Compare the running package against npm's actual global package location. */
 export async function isGlobalNpmInstallation(cliPath, spawnProcess = spawn) {
-    const invocation = process.platform === 'win32'
-        ? { command: process.env.ComSpec ?? process.env.COMSPEC ?? 'cmd.exe', args: ['/d', '/s', '/c', 'npm root -g'] }
-        : { command: 'npm', args: ['root', '-g'] };
     try {
-        const root = await new Promise((resolve, reject) => {
-            const child = spawnProcess(invocation.command, invocation.args, { windowsHide: true, stdio: ['ignore', 'pipe', 'ignore'], timeout: 5000 });
-            let output = '';
-            child.stdout?.on('data', chunk => { if (output.length < 8192)
-                output += chunk.toString('utf8'); });
-            child.once('error', reject);
-            child.once('close', code => code === 0 ? resolve(output.trim()) : reject(new Error('npm root failed')));
-        });
+        const root = await npmPath(['root', '-g'], spawnProcess);
         if (!root)
             return false;
         const installedPath = join(root, PACKAGE_NAME);

package/dist/service.d.ts

@@ -11,6 +11,7 @@ export declare function createService(dataDir?: string, options?: {
     projectProbe?: ProjectProbe;
     runtime?: WorkflowRuntimeOptions;
     npmInstallation?: () => Promise<boolean>;
+    npxInstallation?: () => Promise<boolean>;
     latestNpmVersion?: () => Promise<string>;
     updateRuntime?: (onExit: () => void) => Promise<void>;
 }): {

package/dist/service.js

@@ -58,6 +58,7 @@ export function createService(dataDir, options = {}) {
     const events = new Events(db, serviceId, auth);
     const instanceId = randomUUID();
     const npmInstallation = options.npmInstallation ?? (async () => false);
+    const npxInstallation = options.npxInstallation ?? (async () => false);
     let updateQueued = false;
     const unavailable = {
         status: "unavailable",
@@ -202,7 +203,7 @@ export function createService(dataDir, options = {}) {
                 const runtimeInfo = runtime.serviceInfo;
                 send({
                     ...info,
-                    installation: await npmInstallation() ? 'npm-global' : 'other',
+                    installation: await npmInstallation() ? 'npm-global' : await npxInstallation() ? 'npx' : 'other',
                     imageRoutes: runtimeInfo.imageRoutes,
                     capabilities: {
                         ...info.capabilities,
@@ -470,13 +471,29 @@ export function createService(dataDir, options = {}) {
         db.prepare("INSERT INTO settings(key,value) VALUES('listener',?) ON CONFLICT(key) DO UPDATE SET value=excluded.value").run(JSON.stringify(listenerInfo(address, serviceId, instanceId)));
     });
     let closing;
+    async function closeHttpServer() {
+        if (!server.listening)
+            return;
+        await new Promise((resolve, reject) => {
+            // Runs and event streams have already drained. A browser's unfinished
+            // request must not hold the service's lifetime locks indefinitely.
+            const timeout = setTimeout(() => server.closeAllConnections(), 1000);
+            timeout.unref();
+            server.close(error => {
+                clearTimeout(timeout);
+                if (error)
+                    reject(error);
+                else
+                    resolve();
+            });
+        });
+    }
     async function abortStartup() {
         runtime.disposeUnstarted();
         projectProbe.close();
         events.close();
         try {
-            if (server.listening)
-                await new Promise((resolve, reject) => server.close((error) => (error ? reject(error) : resolve())));
+            await closeHttpServer();
         }
         finally {
             db.close();
@@ -489,8 +506,7 @@ export function createService(dataDir, options = {}) {
             projectProbe.close();
             events.close();
             try {
-                if (server.listening)
-                    await new Promise((resolve, reject) => server.close((error) => (error ? reject(error) : resolve())));
+                await closeHttpServer();
                 db.prepare("DELETE FROM settings WHERE key='listener' AND json_extract(value,'$.instanceId')=?").run(instanceId);
             }
             finally {

package/dist/vendor/protocol/index.d.ts

@@ -5,7 +5,7 @@ export * from './execution-chain.js';
 export * from './graph-title.js';
 export * from './graph-binary.js';
 export declare const PROTOCOL_VERSION: '1.0';
-export declare const SERVICE_VERSION: '0.3.0';
+export declare const SERVICE_VERSION: '0.3.1';
 /** Work Graph uploads use the UI's binary MB convention. */
 export declare const WORKGRAPH_UPLOAD_MAX_BYTES: number;
 export declare const WORKGRAPH_TRANSFER_TOTAL_BYTES: number;
@@ -57,7 +57,7 @@ export interface ServiceInfo {
     serviceId: string;
     version: string;
     protocolVersion: string;
-    installation?: 'npm-global' | 'other';
+    installation?: 'npm-global' | 'npx' | 'other';
     capabilities: Record<CoreCapabilityName, Capability> & Partial<Record<ProjectFileCapabilityName, Capability>>;
     imageRoutes?: ImageRouteCapability[];
 }

package/dist/vendor/protocol/index.js

@@ -5,7 +5,7 @@ export * from './execution-chain.js';
 export * from './graph-title.js';
 export * from './graph-binary.js';
 export const PROTOCOL_VERSION = '1.0';
-export const SERVICE_VERSION = '0.3.0';
+export const SERVICE_VERSION = '0.3.1';
 /** Work Graph uploads use the UI's binary MB convention. */
 export const WORKGRAPH_UPLOAD_MAX_BYTES = 300 * 1024 * 1024;
 export const WORKGRAPH_TRANSFER_TOTAL_BYTES = 1024 * 1024 * 1024;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "openworkgraph", "version": "0.3.0", "type": "module",
+  "name": "openworkgraph", "version": "0.3.1", "type": "module",
   "publishConfig": { "access": "public" },
   "engines": { "node": ">=24.0.0" },
   "bin": { "openworkgraph": "dist/cli.js" },