@playcraft/cli 0.1.6 → 0.1.7

package/dist/workspace-runtime/server/desktop-host.js

@@ -2,6 +2,11 @@ import { connect as connectTcp } from 'node:net';
 import { WebSocket, WebSocketServer } from 'ws';
 import { desktopHealthSchema, desktopResourceName, runtimeError, } from '@playcraft/common/cloud-workspace/runtime';
 import { controlTokenMatches, extractControlToken } from './auth.js';
+/**
+ * A takeover holds the desktop for this long, whether or not a page is watching, and ends on its
+ * own unless the user renews it.
+ */
+const HOLD_MS = 20 * 60_000;
 const sources = new WeakMap();
 const hosts = new WeakMap();
 export function setDesktopSource(state, source) {
@@ -33,6 +38,9 @@ export class DesktopHost {
     sockets = new WebSocketServer({ noServer: true });
     source;
     upstream = loopbackUpstream(process.env.PLAYCRAFT_DESKTOP_UPSTREAM);
+    holdMs = holdDuration(process.env.PLAYCRAFT_DESKTOP_HOLD_MS);
+    holdExpiresAt;
+    holdTimer;
     constructor(state) {
         this.state = state;
         this.source = sources.get(state);
@@ -46,6 +54,9 @@ export class DesktopHost {
             streamGeneration: this.generation,
             holder: this.holder,
             agentInput: this.holder === 'human' ? 'revoked' : 'open',
+            ...(this.holder === 'human' && this.holdExpiresAt
+                ? { holdExpiresAt: new Date(this.holdExpiresAt).toISOString() }
+                : {}),
         });
     }
     async refresh() {
@@ -71,12 +82,21 @@ export class DesktopHost {
             }
             this.holder = 'human';
             this.cutViewers();
+            this.hold();
+            writeJson(response, 200, this.snapshot());
+            return;
+        }
+        if (request.method === 'POST' && url.pathname === '/runtime/desktop/renew') {
+            if (this.holder !== 'human') {
+                writeError(response, 'desktop_not_held');
+                return;
+            }
+            this.hold();
             writeJson(response, 200, this.snapshot());
             return;
         }
         if (request.method === 'DELETE' && url.pathname === '/runtime/desktop') {
-            this.holder = 'none';
-            this.cutViewers();
+            this.release();
             writeJson(response, 200, this.snapshot());
             return;
         }
@@ -114,9 +134,30 @@ export class DesktopHost {
         this.sockets.handleUpgrade(request, socket, head, (ws) => this.attach(ws, generation));
     }
     dispose() {
+        this.release();
+        this.sockets.close();
+    }
+    release() {
+        this.clearHold();
         this.holder = 'none';
         this.cutViewers();
-        this.sockets.close();
+    }
+    /** Starts or renews the hold; when it runs out the desktop is released as if by hand. */
+    hold() {
+        this.clearHold();
+        this.holdExpiresAt = Date.now() + this.holdMs;
+        this.holdTimer = setTimeout(() => {
+            this.holdTimer = undefined;
+            if (this.holder === 'human')
+                this.release();
+        }, this.holdMs);
+        this.holdTimer.unref?.();
+    }
+    clearHold() {
+        if (this.holdTimer)
+            clearTimeout(this.holdTimer);
+        this.holdTimer = undefined;
+        this.holdExpiresAt = undefined;
     }
     currentStatus() {
         if (this.source)
@@ -248,6 +289,7 @@ export function desktopRoute(pathname) {
     return (pathname === '/runtime/desktop/health' ||
         pathname === '/runtime/desktop/connect' ||
         pathname === '/runtime/desktop/takeover' ||
+        pathname === '/runtime/desktop/renew' ||
         pathname === '/runtime/desktop' ||
         pathname.startsWith('/runtime/desktop/resources/'));
 }
@@ -268,6 +310,10 @@ function loopbackUpstream(value) {
         return undefined;
     return { port };
 }
+function holdDuration(value) {
+    const parsed = Number(value);
+    return Number.isInteger(parsed) && parsed > 0 ? parsed : HOLD_MS;
+}
 function probePort(port) {
     return new Promise((resolve) => {
         const socket = connectTcp({ host: '127.0.0.1', port });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@playcraft/cli",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "private": false,
   "type": "module",
   "engines": {
@@ -48,8 +48,8 @@
     "@gltf-transform/core": "^4.3.0",
     "@gltf-transform/extensions": "^4.3.0",
     "@gltf-transform/functions": "^4.3.0",
-    "@playcraft/build": "^0.1.6",
-    "@playcraft/common": "^0.1.6",
+    "@playcraft/build": "^0.1.7",
+    "@playcraft/common": "^0.1.7",
     "better-sqlite3-pinned": "npm:better-sqlite3@13.0.3",
     "chokidar": "^4.0.3",
     "commander": "^13.1.0",