channel-worker 2.1.7 → 2.2.1

package/lib/command-poller.js

@@ -1169,6 +1169,7 @@ class CommandPoller {
               await this.api.resetRendererCommands(r.nst_profile_id);
               await this._launchRendererProfile(r);
               runningRenderers.push(r);
+              this._profileLastActivity[r.nst_profile_id] = Date.now();
               console.log(`[scene-dispatch] ${r.name} recovered (${cmdCount} commands reset)`);
             } catch (err) {
               console.error(`[scene-dispatch] Failed to recover ${r.name}: ${err.message}`);
@@ -1179,19 +1180,24 @@ class CommandPoller {
 
       // 3b. Running profiles with stale heartbeat + PENDING commands → extension never started
       // Only restart if commands are still "pending" (not "running" = extension picked up but busy)
-      const HEARTBEAT_STALE = 30 * 1000; // 30s — extension heartbeats every 15s even when busy
+      const HEARTBEAT_STALE = 60 * 1000; // 60s — extension heartbeats every 15s
+      const LAUNCH_GRACE = 60 * 1000; // 60s grace period after launch for extension to init
       const now = Date.now();
       for (const r of [...runningRenderers]) {
         try {
-          // Only check profiles that have pending commands (not running = actively processing)
           const cmdCount = await this.api.rendererHasCommands(r.nst_profile_id);
           if (cmdCount === 0) continue;
+          // Skip if recently launched (grace period for extension to init + first heartbeat)
+          const lastLaunch = this._profileLastActivity[r.nst_profile_id] || 0;
+          if (lastLaunch && (now - lastLaunch) < LAUNCH_GRACE) continue;
           const hb = r.last_heartbeat ? new Date(r.last_heartbeat).getTime() : 0;
-          if (hb && (now - hb) < HEARTBEAT_STALE) continue;
+          if (hb && (now - hb) < HEARTBEAT_STALE) continue; // heartbeat fresh
+          if (!hb && lastLaunch) continue; // never heartbeated but recently tracked — still in grace
           console.log(`[scene-dispatch] Stuck: ${r.name} running but heartbeat stale (${hb ? Math.round((now - hb) / 1000) + 's' : 'never'}) — restarting`);
           try {
             await this.api.resetRendererCommands(r.nst_profile_id);
             await this._launchRendererProfile(r, { forceRelaunch: true });
+            this._profileLastActivity[r.nst_profile_id] = Date.now();
             console.log(`[scene-dispatch] ${r.name} restarted`);
           } catch (err) {
             console.error(`[scene-dispatch] Failed to restart ${r.name}: ${err.message}`);
@@ -1214,7 +1220,8 @@ class CommandPoller {
         console.log(`[scene-dispatch] Launching ${toLaunch.name} (running: ${runningRenderers.length + li}/${parallelLimit})`);
         try {
           await this._launchRendererProfile(toLaunch);
-          runningRenderers.push(toLaunch); // now considered running
+          runningRenderers.push(toLaunch);
+          this._profileLastActivity[toLaunch.nst_profile_id] = Date.now();
           console.log(`[scene-dispatch] ${toLaunch.name} launched`);
         } catch (err) {
           console.error(`[scene-dispatch] Failed to launch ${toLaunch.name}: ${err.message}`);
@@ -1226,17 +1233,18 @@ class CommandPoller {
         return;
       }
 
-      // 7. Assign queued commands round-robin across running renderers
+      // 7. Assign 1 command per free profile (no pending/running commands)
       let assigned = 0;
-      for (let qi = 0; qi < queueCount; qi++) {
-        const target = runningRenderers[qi % runningRenderers.length];
-        const cmd = await this.api.sceneDispatch(target.nst_profile_id);
-        if (!cmd) break; // queue empty
-        this._profileLastActivity[target.nst_profile_id] = Date.now();
-        assigned++;
-      }
-      if (assigned > 0) {
-        console.log(`[scene-dispatch] Assigned ${assigned} commands across ${runningRenderers.length} renderers`);
+      for (const r of runningRenderers) {
+        try {
+          const cmdCount = await this.api.rendererHasCommands(r.nst_profile_id);
+          if (cmdCount > 0) continue; // already has work
+          const cmd = await this.api.sceneDispatch(r.nst_profile_id);
+          if (!cmd) break; // queue empty
+          this._profileLastActivity[r.nst_profile_id] = Date.now();
+          assigned++;
+          console.log(`[scene-dispatch] Assigned ${cmd.type} → ${r.name}`);
+        } catch {}
       }
     } catch (err) {
       console.error(`[scene-dispatch] Error: ${err.message}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "channel-worker",
-  "version": "2.1.7",
+  "version": "2.2.1",
   "description": "Channel Manager worker daemon — runs on remote machines to execute video pipeline jobs",
   "main": "lib/daemon.js",
   "bin": {