@jackwener/opencli 1.6.10 → 1.7.0

package/dist/src/constants.js

@@ -3,8 +3,6 @@
  */
 /** Default daemon port for HTTP/WebSocket communication with browser extension */
 export const DEFAULT_DAEMON_PORT = 19825;
-/** Default idle timeout before daemon auto-exits (ms). Override via OPENCLI_DAEMON_TIMEOUT env var. */
-export const DEFAULT_DAEMON_IDLE_TIMEOUT = 4 * 60 * 60 * 1000; // 4 hours
 /** URL query params that are volatile/ephemeral and should be stripped from patterns */
 export const VOLATILE_PARAMS = new Set([
     'w_rid', 'wts', '_', 'callback', 'timestamp', 't', 'nonce', 'sign',

package/dist/src/daemon.d.ts

@@ -15,7 +15,7 @@
  *
  * Lifecycle:
  *   - Auto-spawned by opencli on first browser command
- *   - Auto-exits after idle timeout (default 4h, configurable via OPENCLI_DAEMON_TIMEOUT)
+ *   - Persistent — stays alive until explicit shutdown, SIGTERM, or uninstall
  *   - Listens on localhost:19825
  */
 export {};

package/dist/src/daemon.js

@@ -15,16 +15,14 @@
  *
  * Lifecycle:
  *   - Auto-spawned by opencli on first browser command
- *   - Auto-exits after idle timeout (default 4h, configurable via OPENCLI_DAEMON_TIMEOUT)
+ *   - Persistent — stays alive until explicit shutdown, SIGTERM, or uninstall
  *   - Listens on localhost:19825
  */
 import { createServer } from 'node:http';
 import { WebSocketServer, WebSocket } from 'ws';
-import { DEFAULT_DAEMON_PORT, DEFAULT_DAEMON_IDLE_TIMEOUT } from './constants.js';
+import { DEFAULT_DAEMON_PORT } from './constants.js';
 import { EXIT_CODES } from './errors.js';
-import { IdleManager } from './idle-manager.js';
 const PORT = parseInt(process.env.OPENCLI_DAEMON_PORT ?? String(DEFAULT_DAEMON_PORT), 10);
-const IDLE_TIMEOUT = Number(process.env.OPENCLI_DAEMON_TIMEOUT ?? DEFAULT_DAEMON_IDLE_TIMEOUT);
 // ─── State ───────────────────────────────────────────────────────────
 let extensionWs = null;
 let extensionVersion = null;
@@ -36,11 +34,6 @@ function pushLog(entry) {
     if (logBuffer.length > LOG_BUFFER_SIZE)
         logBuffer.shift();
 }
-// ─── Idle auto-exit ──────────────────────────────────────────────────
-const idleManager = new IdleManager(IDLE_TIMEOUT, () => {
-    console.error('[daemon] Idle timeout (no CLI requests + no Extension), shutting down');
-    process.exit(EXIT_CODES.SUCCESS);
-});
 // ─── HTTP Server ─────────────────────────────────────────────────────
 const MAX_BODY = 1024 * 1024; // 1 MB — commands are tiny; this prevents OOM
 function readBody(req) {
@@ -118,7 +111,6 @@ async function handleRequest(req, res) {
             extensionConnected: extensionWs?.readyState === WebSocket.OPEN,
             extensionVersion,
             pending: pending.size,
-            lastCliRequestTime: idleManager.lastCliRequestTime,
             memoryMB: Math.round(mem.rss / 1024 / 1024 * 10) / 10,
             port: PORT,
         });
@@ -144,7 +136,6 @@ async function handleRequest(req, res) {
         return;
     }
     if (req.method === 'POST' && url === '/command') {
-        idleManager.onCliRequest();
         try {
             const body = JSON.parse(await readBody(req));
             if (!body.id) {
@@ -196,7 +187,6 @@ wss.on('connection', (ws) => {
     console.error('[daemon] Extension connected');
     extensionWs = ws;
     extensionVersion = null; // cleared until hello message arrives
-    idleManager.setExtensionConnected(true);
     // ── Heartbeat: ping every 15s, close if 2 pongs missed ──
     let missedPongs = 0;
     const heartbeatInterval = setInterval(() => {
@@ -249,7 +239,6 @@ wss.on('connection', (ws) => {
         if (extensionWs === ws) {
             extensionWs = null;
             extensionVersion = null;
-            idleManager.setExtensionConnected(false);
             // Reject all pending requests since the extension is gone
             for (const [id, p] of pending) {
                 clearTimeout(p.timer);
@@ -263,7 +252,6 @@ wss.on('connection', (ws) => {
         if (extensionWs === ws) {
             extensionWs = null;
             extensionVersion = null;
-            idleManager.setExtensionConnected(false);
             // Reject pending requests in case 'close' does not follow this 'error'
             for (const [, p] of pending) {
                 clearTimeout(p.timer);
@@ -276,7 +264,6 @@ wss.on('connection', (ws) => {
 // ─── Start ───────────────────────────────────────────────────────────
 httpServer.listen(PORT, '127.0.0.1', () => {
     console.error(`[daemon] Listening on http://127.0.0.1:${PORT}`);
-    idleManager.onCliRequest();
 });
 httpServer.on('error', (err) => {
     if (err.code === 'EADDRINUSE') {

package/dist/src/execution.js

@@ -167,10 +167,14 @@ export async function executeCommand(cmd, rawKwargs, debug = false) {
                     }
                 }
                 try {
-                    return await runWithTimeout(runCommand(cmd, page, kwargs, debug), {
+                    const result = await runWithTimeout(runCommand(cmd, page, kwargs, debug), {
                         timeout: cmd.timeoutSeconds ?? DEFAULT_BROWSER_COMMAND_TIMEOUT,
                         label: fullName(cmd),
                     });
+                    // Adapter commands are one-shot — close the automation window immediately
+                    // instead of waiting for the 30s idle timeout.
+                    await page.closeWindow?.().catch(() => { });
+                    return result;
                 }
                 catch (err) {
                     // Collect diagnostic while page is still alive (before browserSession closes it).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jackwener/opencli",
-  "version": "1.6.10",
+  "version": "1.7.0",
   "publishConfig": {
     "access": "public"
   },
@@ -48,6 +48,7 @@
     "copy-yaml": "node scripts/copy-yaml.cjs",
     "start": "node dist/src/main.js",
     "start:bun": "bun dist/src/main.js",
+    "preuninstall": "node -e \"fetch('http://127.0.0.1:19825/shutdown',{method:'POST',headers:{'X-OpenCLI':'1'},signal:AbortSignal.timeout(3000)}).catch(()=>{})\" || true",
     "postinstall": "node scripts/postinstall.js || true; node scripts/fetch-adapters.js || true",
     "typecheck": "tsc --noEmit",
     "lint": "tsc --noEmit",

package/dist/src/daemon.test.js

@@ -1,65 +0,0 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { IdleManager } from './idle-manager.js';
-describe('IdleManager', () => {
-    beforeEach(() => {
-        vi.useFakeTimers();
-    });
-    afterEach(() => {
-        vi.useRealTimers();
-    });
-    it('does not start timer when extension is connected', () => {
-        const exit = vi.fn();
-        const mgr = new IdleManager(300_000, exit);
-        mgr.setExtensionConnected(true);
-        mgr.onCliRequest();
-        vi.advanceTimersByTime(300_000 + 1000);
-        expect(exit).not.toHaveBeenCalled();
-    });
-    it('starts timer when extension disconnects and CLI is idle', () => {
-        const exit = vi.fn();
-        const mgr = new IdleManager(300_000, exit);
-        mgr.onCliRequest();
-        mgr.setExtensionConnected(true);
-        mgr.setExtensionConnected(false);
-        expect(exit).not.toHaveBeenCalled();
-        vi.advanceTimersByTime(300_000 + 1000);
-        expect(exit).toHaveBeenCalledTimes(1);
-    });
-    it('exits immediately on extension disconnect if CLI has been idle past timeout', () => {
-        const exit = vi.fn();
-        const mgr = new IdleManager(300_000, exit);
-        mgr.onCliRequest();
-        mgr.setExtensionConnected(true); // connect before timeout elapses
-        vi.advanceTimersByTime(400_000); // CLI idle time exceeds timeout, but extension is connected so no exit
-        expect(exit).not.toHaveBeenCalled();
-        mgr.setExtensionConnected(false); // disconnect → should exit immediately since CLI idle > timeout
-        expect(exit).toHaveBeenCalledTimes(1);
-    });
-    it('resets timer on new CLI request', () => {
-        const exit = vi.fn();
-        const mgr = new IdleManager(300_000, exit);
-        mgr.onCliRequest();
-        vi.advanceTimersByTime(200_000);
-        mgr.onCliRequest();
-        vi.advanceTimersByTime(200_000);
-        expect(exit).not.toHaveBeenCalled();
-        vi.advanceTimersByTime(100_001);
-        expect(exit).toHaveBeenCalledTimes(1);
-    });
-    it('does not exit when timeout is 0 (disabled)', () => {
-        const exit = vi.fn();
-        const mgr = new IdleManager(0, exit);
-        mgr.onCliRequest();
-        vi.advanceTimersByTime(24 * 60 * 60 * 1000);
-        expect(exit).not.toHaveBeenCalled();
-    });
-    it('clears timer when extension connects', () => {
-        const exit = vi.fn();
-        const mgr = new IdleManager(300_000, exit);
-        mgr.onCliRequest();
-        vi.advanceTimersByTime(200_000);
-        mgr.setExtensionConnected(true);
-        vi.advanceTimersByTime(200_000);
-        expect(exit).not.toHaveBeenCalled();
-    });
-});

package/dist/src/idle-manager.d.ts

@@ -1,19 +0,0 @@
-/**
- * Manages daemon idle timeout with dual-condition logic:
- * exits only when BOTH CLI is idle AND Extension is disconnected.
- */
-export declare class IdleManager {
-    private _timer;
-    private _lastCliRequestTime;
-    private _extensionConnected;
-    private _timeoutMs;
-    private _onExit;
-    constructor(timeoutMs: number, onExit: () => void);
-    get lastCliRequestTime(): number;
-    /** Call when an HTTP request arrives from CLI */
-    onCliRequest(): void;
-    /** Call when Extension WebSocket connects or disconnects */
-    setExtensionConnected(connected: boolean): void;
-    private _clearTimer;
-    private _resetTimer;
-}

package/dist/src/idle-manager.js

@@ -1,54 +0,0 @@
-/**
- * Manages daemon idle timeout with dual-condition logic:
- * exits only when BOTH CLI is idle AND Extension is disconnected.
- */
-export class IdleManager {
-    _timer = null;
-    _lastCliRequestTime = Date.now();
-    _extensionConnected = false;
-    _timeoutMs;
-    _onExit;
-    constructor(timeoutMs, onExit) {
-        this._timeoutMs = timeoutMs;
-        this._onExit = onExit;
-    }
-    get lastCliRequestTime() {
-        return this._lastCliRequestTime;
-    }
-    /** Call when an HTTP request arrives from CLI */
-    onCliRequest() {
-        this._lastCliRequestTime = Date.now();
-        this._resetTimer();
-    }
-    /** Call when Extension WebSocket connects or disconnects */
-    setExtensionConnected(connected) {
-        this._extensionConnected = connected;
-        if (connected) {
-            this._clearTimer();
-        }
-        else {
-            this._resetTimer();
-        }
-    }
-    _clearTimer() {
-        if (this._timer) {
-            clearTimeout(this._timer);
-            this._timer = null;
-        }
-    }
-    _resetTimer() {
-        this._clearTimer();
-        if (this._timeoutMs <= 0)
-            return;
-        if (this._extensionConnected)
-            return;
-        const elapsed = Date.now() - this._lastCliRequestTime;
-        if (elapsed >= this._timeoutMs) {
-            this._onExit();
-            return;
-        }
-        this._timer = setTimeout(() => {
-            this._onExit();
-        }, this._timeoutMs - elapsed);
-    }
-}