channel-worker 2.2.2 → 2.2.4

package/lib/command-poller.js

@@ -1214,9 +1214,17 @@ class CommandPoller {
       const stillOffline = renderers.filter(r => !runningRenderers.includes(r));
       console.log(`[scene-dispatch] running=${runningRenderers.length}/${parallelLimit} offline=${stillOffline.length} queue=${queueCount} names=[${runningRenderers.map(r=>r.name)}]`);
 
-      // Only launch if queue has more work than running profiles can handle
-      const freeSlots = Math.max(0, queueCount - runningRenderers.length);
-      const neededLaunches = Math.min(parallelLimit - runningRenderers.length, stillOffline.length, freeSlots);
+      // Count how many running profiles are actually free (no commands)
+      let freeRunning = 0;
+      for (const r of runningRenderers) {
+        try {
+          const c = await this.api.rendererHasCommands(r.nst_profile_id);
+          if (c === 0) freeRunning++;
+        } catch {}
+      }
+      // Only launch new profiles if queue has more work than free profiles
+      const needNew = Math.max(0, queueCount - freeRunning);
+      const neededLaunches = Math.min(parallelLimit - runningRenderers.length, stillOffline.length, needNew);
       for (let li = 0; li < neededLaunches; li++) {
         const toLaunch = stillOffline[li];
         console.log(`[scene-dispatch] Launching ${toLaunch.name} (running: ${runningRenderers.length + li}/${parallelLimit})`);
@@ -1310,12 +1318,18 @@ class CommandPoller {
 
       for (const browser of running) {
         const profileId = browser.profileId;
-        const lastActivity = this._profileLastActivity[profileId] || 0;
-        if (lastActivity && (now - lastActivity) > IDLE_TIMEOUT) {
+        const name = browser.name?.toLowerCase();
+        // Match by UUID or name (renderers use name as nst_profile_id)
+        const lastActivity = this._profileLastActivity[profileId]
+          || (name && this._profileLastActivity[name])
+          || 0;
+        if (!lastActivity) continue; // never tracked — skip (just launched by another process)
+        if ((now - lastActivity) > IDLE_TIMEOUT) {
           console.log(`[profile-timeout] Closing idle profile ${browser.name || profileId} (idle ${Math.round((now - lastActivity) / 1000)}s)`);
           try {
             await this.nst.stopProfile(profileId);
             delete this._profileLastActivity[profileId];
+            if (name) delete this._profileLastActivity[name];
           } catch (e) {
             console.warn(`[profile-timeout] Failed to close ${profileId}: ${e.message}`);
           }

package/package.json

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