channel-worker 2.5.0 → 2.5.2

package/lib/api-client.js

@@ -84,6 +84,13 @@ class ApiClient {
     return this.request('POST', `/extension/commands/${commandId}/result`, { status, result: result || {}, error: error || null });
   }
 
+  // Return the calling daemon's own Worker doc — primarily for reading
+  // parallel_limit (the per-daemon scene-generation concurrency cap that
+  // replaced the legacy global flowkit_max_concurrent setting).
+  async getMyWorker() {
+    return this.request('GET', '/workers/me');
+  }
+
   // Scene dispatch
   async getRenderers() {
     return this.request('GET', '/workers/renderers');

package/lib/command-poller.js

@@ -1313,16 +1313,29 @@ class CommandPoller {
       const domQ = typeof queueInfo === 'number' ? queueCount : (queueInfo?.dom_count || 0);
       if (!queueCount) { this._dispatching = false; return; }
 
-      // 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);
+      // 5. Parallel limit — sourced from THIS daemon's Worker.parallel_limit
+      //    via /workers/me. Replaces the legacy global Settings
+      //    (flowkit_max_concurrent / veo3_parallel_limit) which throttled
+      //    across all daemons of a user — making multi-machine setup
+      //    impossible to scale (set global=1 → only one machine runs at a
+      //    time). Server-side enforcement in /scene-dispatch +
+      //    /flowkit/claim-command uses the same field, so a daemon trying
+      //    to over-launch profiles will simply get yielded responses on
+      //    overflow. We still cap launches here to avoid keeping idle
+      //    profiles open (each NST profile holds RAM + a Chromium tab).
+      let parallelLimit = 2; // sane default if /workers/me fails or is
+                             // unavailable on an older API; effective limit
+                             // is still bounded by server-side enforcement.
+      try {
+        if (this.api.getMyWorker) {
+          const me = await this.api.getMyWorker();
+          if (me && typeof me.parallel_limit === 'number') {
+            parallelLimit = Math.max(0, me.parallel_limit);
+          }
+        }
+      } catch (e) {
+        if (this.config.verbose) console.warn('[scene-dispatch] getMyWorker failed, using default:', e.message);
+      }
       const stillOffline = renderers.filter(r => !runningRenderers.includes(r));
       console.log(`[scene-dispatch] running=${runningRenderers.length}/${parallelLimit} (flowkit=${flowkitQ} dom=${domQ}) offline=${stillOffline.length} queue=${queueCount} names=[${runningRenderers.map(r=>r.name)}]`);
 
@@ -1425,17 +1438,24 @@ class CommandPoller {
     // two daemons would happily double-launch and corrupt cookies / kill
     // sessions for the underlying Google/FB accounts.
     if (renderer.nst_profile_id && this.api.leaseRenderer) {
+      // api.leaseRenderer returns json.data on success (a {nst_profile_id,
+      // leased_at, lessee} envelope) and THROWS on success=false. So:
+      //   - throw → another daemon holds the lease OR API rejected → skip
+      //   - return → lease acquired → proceed with NST launch
+      // Previous bug: checked `leaseRes.success !== true` but `.success` is
+      // already stripped from json.data → always falsy → every launch was
+      // wrongfully denied with reason="unknown".
       try {
         const leaseRes = await this.api.leaseRenderer(renderer.nst_profile_id);
-        if (!leaseRes || leaseRes.success !== true) {
-          const reason = leaseRes && leaseRes.message ? leaseRes.message : 'unknown';
-          console.warn(`[scene-dispatch] LEASE DENIED for ${renderer.name || renderer.nst_profile_id}: ${reason} — skipping launch`);
+        if (!leaseRes || !leaseRes.nst_profile_id) {
+          console.warn(`[scene-dispatch] lease returned no data for ${renderer.name || renderer.nst_profile_id} — skipping launch (API may be older)`);
           return;
         }
       } catch (e) {
-        // Treat lease failure as a soft block — the API might be down OR
-        // running an older version. Better to skip than risk double-launch.
-        console.warn(`[scene-dispatch] lease request failed for ${renderer.name || renderer.nst_profile_id}: ${e.message} — skipping launch`);
+        // Either API said success=false (lease held by peer / unowned /
+        // stale rules failed) OR network failure. Either way, do NOT
+        // launch — better idle than collision.
+        console.warn(`[scene-dispatch] LEASE DENIED for ${renderer.name || renderer.nst_profile_id}: ${e.message} — skipping launch`);
         return;
       }
     }

package/package.json

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