channel-worker 2.4.3 → 2.4.5

package/lib/command-poller.js

@@ -1176,18 +1176,30 @@ class CommandPoller {
       const offlineRenderers = renderers.filter(r => !runningRenderers.includes(r));
 
       // 3. Crash recovery
-      // 3a. Offline profiles with assigned commands → reset + relaunch
+      // 3a. Offline profiles with assigned commands → reset + relaunch.
+      // BUT: Nstbrowser API can briefly drop a profile from its running list
+      // during heavy ops (image gen, captcha solving). The reset endpoint
+      // returns { skipped: 'heartbeat-fresh' } if the extension is still
+      // sending heartbeats — meaning the profile is alive even though
+      // Nstbrowser doesn't list it. Skip relaunch in that case to avoid
+      // a tabs-close + tabs-open loop.
       for (const r of offlineRenderers) {
         try {
           const cmdCount = await this.api.rendererHasCommands(r.nst_profile_id);
           if (cmdCount > 0) {
-            console.log(`[scene-dispatch] Crash recovery: ${r.name} has ${cmdCount} commands but not running — relaunching`);
+            console.log(`[scene-dispatch] Crash recovery: ${r.name} has ${cmdCount} commands but not running — checking heartbeat`);
             try {
-              await this.api.resetRendererCommands(r.nst_profile_id);
+              const resetRes = await this.api.resetRendererCommands(r.nst_profile_id);
+              if (resetRes && resetRes.skipped === 'heartbeat-fresh') {
+                console.log(`[scene-dispatch] ${r.name} heartbeat fresh — extension is alive, skipping relaunch`);
+                runningRenderers.push(r);
+                this._profileLastActivity[r.nst_profile_id] = Date.now();
+                continue;
+              }
               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)`);
+              console.log(`[scene-dispatch] ${r.name} recovered (${(resetRes && resetRes.modified) || cmdCount} commands reset)`);
             } catch (err) {
               console.error(`[scene-dispatch] Failed to recover ${r.name}: ${err.message}`);
             }
@@ -1454,6 +1466,21 @@ class CommandPoller {
         // User-launched profiles have no tracking entry — leave them alone.
         if (!lastActivity) continue;
         if ((now - lastActivity) > IDLE_TIMEOUT) {
+          // Per-profile in-flight check — getSceneQueueCount only counts
+          // QUEUED cmds, not RUNNING ones. Without this, a profile actively
+          // running a master cast / scene cmd gets closed mid-task because
+          // the queue is empty after the cmd was claimed.
+          let inFlight = 0;
+          try {
+            const probeId = name || profileId;
+            inFlight = await this.api.rendererHasCommands(probeId);
+          } catch {}
+          if (inFlight > 0) {
+            // Bump activity so we re-evaluate after another IDLE_TIMEOUT.
+            this._profileLastActivity[profileId] = now;
+            if (name) this._profileLastActivity[name] = now;
+            continue;
+          }
           console.log(`[profile-timeout] Closing idle profile ${browser.name || profileId} (idle ${Math.round((now - lastActivity) / 1000)}s)`);
           try {
             await this.nst.stopProfile(profileId);

package/package.json

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