channel-worker 2.3.3 → 2.3.5

package/lib/command-poller.js

@@ -1207,14 +1207,52 @@ class CommandPoller {
         } catch {}
       }
 
-      // 4. Check queued commands
-      const queueCount = await this.api.getSceneQueueCount();
+      // 4. Check queued commands — new API returns {total, flowkit_count, dom_count}
+      const queueInfo = await this.api.getSceneQueueCount();
+      const queueCount = typeof queueInfo === 'number' ? queueInfo : (queueInfo?.total || 0);
+      const flowkitQ = typeof queueInfo === 'number' ? 0 : (queueInfo?.flowkit_count || 0);
+      const domQ = typeof queueInfo === 'number' ? queueCount : (queueInfo?.dom_count || 0);
       if (!queueCount) { this._dispatching = false; return; }
 
-      // 5. Launch new profiles up to parallel limit (recompute offline after recovery)
-      const parallelLimit = parseInt(await this.api.getSetting('veo3_parallel_limit')) || 1;
+      // 5. Pick the right parallel limit based on queue composition
+      //    - queue toàn flowkit  → dùng flowkit_max_concurrent
+      //    - queue toàn DOM      → dùng veo3_parallel_limit
+      //    - mixed (hiếm)        → dùng max của 2 để không bottleneck nhánh nào
+      const flowkitLimit = parseInt(await this.api.getSetting('flowkit_max_concurrent')) || 5;
+      const veo3Limit = parseInt(await this.api.getSetting('veo3_parallel_limit')) || 1;
+      let parallelLimit;
+      if (flowkitQ > 0 && domQ === 0) parallelLimit = flowkitLimit;
+      else if (domQ > 0 && flowkitQ === 0) parallelLimit = veo3Limit;
+      else parallelLimit = Math.max(flowkitLimit, veo3Limit);
       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)}]`);
+      console.log(`[scene-dispatch] running=${runningRenderers.length}/${parallelLimit} (flowkit=${flowkitQ} dom=${domQ}) offline=${stillOffline.length} queue=${queueCount} names=[${runningRenderers.map(r=>r.name)}]`);
+
+      // 5b. Close excess profiles — when parallelLimit drops (e.g., after a DOM→FlowKit
+      //     switch), idle profiles over the cap should shut down instead of staying open
+      //     and getting throttled at /flowkit/claim-command.
+      if (runningRenderers.length > parallelLimit) {
+        const excess = runningRenderers.length - parallelLimit;
+        const idleRenderers = [];
+        for (const r of runningRenderers) {
+          try {
+            const c = await this.api.rendererHasCommands(r.nst_profile_id);
+            if (c === 0) idleRenderers.push(r);
+          } catch {}
+        }
+        const toClose = idleRenderers.slice(0, excess);
+        for (const r of toClose) {
+          console.log(`[scene-dispatch] Closing excess profile ${r.name} (over cap ${parallelLimit})`);
+          try {
+            await this.nst.stopProfile(r.nst_profile_id);
+            delete this._profileLastActivity[r.nst_profile_id];
+            if (r.name) delete this._profileLastActivity[r.name.toLowerCase()];
+            const idx = runningRenderers.indexOf(r);
+            if (idx >= 0) runningRenderers.splice(idx, 1);
+          } catch (e) {
+            console.warn(`[scene-dispatch] Failed to close excess ${r.name}: ${e.message}`);
+          }
+        }
+      }
 
       // Count how many running profiles are actually free (no commands)
       let freeRunning = 0;
@@ -1316,7 +1354,8 @@ class CommandPoller {
       if (running.length === 0) return;
 
       // Check if there are any queued commands — if so, don't close anything
-      const queueCount = await this.api.getSceneQueueCount();
+      const qi = await this.api.getSceneQueueCount();
+      const queueCount = typeof qi === 'number' ? qi : (qi?.total || 0);
       if (queueCount > 0) return;
 
       for (const browser of running) {

package/lib/nst-manager.js

@@ -66,7 +66,16 @@ class NstManager {
 
   // Create profile if not exists, return profileId
   async ensureProfile(name, options = {}) {
-    const existing = await this.findProfile(name);
+    // Retry findProfile up to 3 times — Nstbrowser API can transiently return empty
+    let existing = null;
+    for (let attempt = 1; attempt <= 3; attempt++) {
+      existing = await this.findProfile(name);
+      if (existing) break;
+      if (attempt < 3) {
+        console.log(`[nst] Profile "${name}" not found (attempt ${attempt}/3), retrying in 2s...`);
+        await new Promise(r => setTimeout(r, 2000));
+      }
+    }
     if (existing) {
       console.log(`[nst] Profile "${name}" exists: ${existing}`);
       // Set proxy on existing profile if provided
@@ -75,7 +84,7 @@ class NstManager {
     }
 
     const platform = (options.os || 'windows').toLowerCase() === 'mac' ? 'MacOS' : 'Windows';
-    console.log(`[nst] WARNING: Profile "${name}" NOT FOUND — creating new profile (${platform})...`);
+    console.log(`[nst] WARNING: Profile "${name}" NOT FOUND after 3 retries — creating new profile (${platform})...`);
     const res = await this.api('/profiles', {
       method: 'POST',
       body: JSON.stringify({

package/package.json

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