comfyui-node 1.6.1 → 1.6.2

package/dist/pool/client/ClientManager.js

@@ -1,216 +1,216 @@
-import { TypedEventTarget } from "../../typed-event-target.js";
-export class ClientManager extends TypedEventTarget {
-    clients = [];
-    strategy;
-    healthCheckInterval = null;
-    healthCheckIntervalMs;
-    debugLogs = process.env.WORKFLOW_POOL_DEBUG === "1";
-    /**
-     * Grace period after reconnection before client is considered stable (default: 10 seconds).
-     * ComfyUI sometimes quickly disconnects/reconnects after job execution.
-     * During this grace period, the client won't be used for new jobs.
-     */
-    reconnectionGracePeriodMs = 10000;
-    /**
-     * Create a new ClientManager for managing ComfyUI client connections.
-     *
-     * @param strategy - Failover strategy for handling client failures
-     * @param opts - Configuration options
-     * @param opts.healthCheckIntervalMs - Interval (ms) for health check pings to keep connections alive.
-     *   Set to 0 to disable. Default: 30000 (30 seconds).
-     */
-    constructor(strategy, opts) {
-        super();
-        this.strategy = strategy;
-        this.healthCheckIntervalMs = opts?.healthCheckIntervalMs ?? 30000; // Default: 30 seconds
-    }
-    emitBlocked(clientId, workflowHash) {
-        this.dispatchEvent(new CustomEvent("client:blocked_workflow", { detail: { clientId, workflowHash } }));
-    }
-    emitUnblocked(clientId, workflowHash) {
-        this.dispatchEvent(new CustomEvent("client:unblocked_workflow", { detail: { clientId, workflowHash } }));
-    }
-    async initialize(clients) {
-        for (const client of clients) {
-            await this.addClient(client);
-        }
-        this.startHealthCheck();
-    }
-    async addClient(client) {
-        await client.init();
-        const managed = {
-            client,
-            id: client.id,
-            online: true,
-            busy: false,
-            lastSeenAt: Date.now(),
-            supportedWorkflows: new Set()
-        };
-        this.clients.push(managed);
-        client.on("disconnected", () => {
-            managed.online = false;
-            managed.busy = false;
-            managed.lastSeenAt = Date.now();
-            managed.lastDisconnectedAt = Date.now();
-            this.dispatchEvent(new CustomEvent("client:state", {
-                detail: { clientId: managed.id, online: false, busy: false, lastError: managed.lastError }
-            }));
-        });
-        client.on("reconnected", () => {
-            const now = Date.now();
-            managed.online = true;
-            managed.lastSeenAt = now;
-            managed.reconnectionStableAt = now + this.reconnectionGracePeriodMs;
-            // Log if this is a quick reconnect (within 30 seconds of disconnect)
-            if (managed.lastDisconnectedAt && (now - managed.lastDisconnectedAt) < 30000) {
-                console.warn(`[ClientManager] Client ${managed.id} reconnected ${((now - managed.lastDisconnectedAt) / 1000).toFixed(1)}s after disconnect. ` +
-                    `Grace period active until ${new Date(managed.reconnectionStableAt).toISOString()}`);
-            }
-            this.dispatchEvent(new CustomEvent("client:state", {
-                detail: { clientId: managed.id, online: true, busy: managed.busy }
-            }));
-        });
-    }
-    list() {
-        return [...this.clients];
-    }
-    getClient(clientId) {
-        return this.clients.find((c) => c.id === clientId);
-    }
-    /**
-     * Checks if a client is truly available for work.
-     * A client must be online, not busy, AND past the reconnection grace period.
-     */
-    isClientStable(client) {
-        if (!client.online || client.busy) {
-            return false;
-        }
-        // If client recently reconnected, wait for grace period
-        if (client.reconnectionStableAt && Date.now() < client.reconnectionStableAt) {
-            return false;
-        }
-        return true;
-    }
-    canClientRunJob(client, job) {
-        if (job.options.preferredClientIds?.length && !job.options.preferredClientIds.includes(client.id)) {
-            return false; // Job has preferred clients and this isn't one of them
-        }
-        if (job.options.excludeClientIds?.includes(client.id)) {
-            return false; // Job has excluded clients and this is one of them
-        }
-        if (this.strategy.shouldSkipClient(client, job)) {
-            return false; // Strategy says to skip
-        }
-        return true;
-    }
-    claim(job, specificClientId) {
-        let chosen;
-        if (specificClientId) {
-            const candidate = this.clients.find(c => c.id === specificClientId);
-            if (candidate && this.isClientStable(candidate) && this.canClientRunJob(candidate, job)) {
-                chosen = candidate;
-            }
-        }
-        else {
-            const candidates = this.clients.filter((c) => this.isClientStable(c));
-            chosen = candidates.find(c => this.canClientRunJob(c, job));
-        }
-        if (!chosen) {
-            return null;
-        }
-        chosen.busy = true;
-        chosen.busy = true;
-        chosen.lastSeenAt = Date.now();
-        return {
-            client: chosen.client,
-            clientId: chosen.id,
-            release: (opts) => {
-                if (this.debugLogs) {
-                    console.log(`[ClientManager.release] Releasing client ${chosen.id} for job ${job.jobId}. Setting busy: false.`);
-                }
-                chosen.busy = false;
-                if (opts?.success) {
-                    const wasBlocked = this.strategy.isWorkflowBlocked?.(chosen, job.workflowHash) ?? false;
-                    this.strategy.recordSuccess(chosen, job);
-                    const stillBlocked = this.strategy.isWorkflowBlocked?.(chosen, job.workflowHash) ?? false;
-                    if (wasBlocked && !stillBlocked) {
-                        this.emitUnblocked(chosen.id, job.workflowHash);
-                    }
-                }
-                this.dispatchEvent(new CustomEvent("client:state", {
-                    detail: { clientId: chosen.id, online: chosen.online, busy: chosen.busy }
-                }));
-            }
-        };
-    }
-    recordFailure(clientId, job, error) {
-        const client = this.clients.find((c) => c.id === clientId);
-        if (!client) {
-            return;
-        }
-        client.lastError = error;
-        client.busy = false;
-        const wasBlocked = this.strategy.isWorkflowBlocked?.(client, job.workflowHash) ?? false;
-        this.strategy.recordFailure(client, job, error);
-        const isBlocked = this.strategy.isWorkflowBlocked?.(client, job.workflowHash) ?? false;
-        if (!wasBlocked && isBlocked) {
-            this.emitBlocked(client.id, job.workflowHash);
-        }
-        this.dispatchEvent(new CustomEvent("client:state", {
-            detail: { clientId: client.id, online: client.online, busy: client.busy, lastError: error }
-        }));
-    }
-    /**
-     * Start periodic health check to keep connections alive and detect issues early.
-     * Pings idle clients by polling their queue status.
-     */
-    startHealthCheck() {
-        if (this.healthCheckInterval) {
-            return; // Already running
-        }
-        this.healthCheckInterval = setInterval(() => {
-            this.performHealthCheck().catch((error) => {
-                console.error("[ClientManager] Health check error:", error);
-            });
-        }, this.healthCheckIntervalMs);
-    }
-    /**
-     * Perform health check on all clients.
-     * Polls queue status to keep WebSocket alive and detect connection issues.
-     * IMPORTANT: Pings ALL online clients (including busy ones) to prevent WebSocket timeout during heavy load.
-     */
-    async performHealthCheck() {
-        for (const managed of this.clients) {
-            // Ping ALL online clients (not just idle ones) to keep WebSocket alive during heavy load
-            if (managed.online) {
-                try {
-                    // Lightweight ping: poll queue status (triggers WebSocket activity via fetchApi)
-                    await managed.client.getQueue();
-                    managed.lastSeenAt = Date.now();
-                }
-                catch (error) {
-                    // Health check failed - client may have connection issues
-                    console.warn(`[ClientManager] Health check failed for client ${managed.id}:`, error);
-                    // Don't mark as offline here - let the WebSocket disconnect event handle that
-                    // This prevents false positives from temporary network hiccups
-                }
-            }
-        }
-    }
-    /**
-     * Stop health check interval (called during shutdown).
-     */
-    stopHealthCheck() {
-        if (this.healthCheckInterval) {
-            clearInterval(this.healthCheckInterval);
-            this.healthCheckInterval = null;
-        }
-    }
-    /**
-     * Cleanup resources when destroying the manager.
-     */
-    destroy() {
-        this.stopHealthCheck();
-    }
-}
+import { TypedEventTarget } from "../../typed-event-target.js";
+export class ClientManager extends TypedEventTarget {
+    clients = [];
+    strategy;
+    healthCheckInterval = null;
+    healthCheckIntervalMs;
+    debugLogs = process.env.WORKFLOW_POOL_DEBUG === "1";
+    /**
+     * Grace period after reconnection before client is considered stable (default: 10 seconds).
+     * ComfyUI sometimes quickly disconnects/reconnects after job execution.
+     * During this grace period, the client won't be used for new jobs.
+     */
+    reconnectionGracePeriodMs = 10000;
+    /**
+     * Create a new ClientManager for managing ComfyUI client connections.
+     *
+     * @param strategy - Failover strategy for handling client failures
+     * @param opts - Configuration options
+     * @param opts.healthCheckIntervalMs - Interval (ms) for health check pings to keep connections alive.
+     *   Set to 0 to disable. Default: 30000 (30 seconds).
+     */
+    constructor(strategy, opts) {
+        super();
+        this.strategy = strategy;
+        this.healthCheckIntervalMs = opts?.healthCheckIntervalMs ?? 30000; // Default: 30 seconds
+    }
+    emitBlocked(clientId, workflowHash) {
+        this.dispatchEvent(new CustomEvent("client:blocked_workflow", { detail: { clientId, workflowHash } }));
+    }
+    emitUnblocked(clientId, workflowHash) {
+        this.dispatchEvent(new CustomEvent("client:unblocked_workflow", { detail: { clientId, workflowHash } }));
+    }
+    async initialize(clients) {
+        for (const client of clients) {
+            await this.addClient(client);
+        }
+        this.startHealthCheck();
+    }
+    async addClient(client) {
+        await client.init();
+        const managed = {
+            client,
+            id: client.id,
+            online: true,
+            busy: false,
+            lastSeenAt: Date.now(),
+            supportedWorkflows: new Set()
+        };
+        this.clients.push(managed);
+        client.on("disconnected", () => {
+            managed.online = false;
+            managed.busy = false;
+            managed.lastSeenAt = Date.now();
+            managed.lastDisconnectedAt = Date.now();
+            this.dispatchEvent(new CustomEvent("client:state", {
+                detail: { clientId: managed.id, online: false, busy: false, lastError: managed.lastError }
+            }));
+        });
+        client.on("reconnected", () => {
+            const now = Date.now();
+            managed.online = true;
+            managed.lastSeenAt = now;
+            managed.reconnectionStableAt = now + this.reconnectionGracePeriodMs;
+            // Log if this is a quick reconnect (within 30 seconds of disconnect)
+            if (managed.lastDisconnectedAt && (now - managed.lastDisconnectedAt) < 30000) {
+                console.warn(`[ClientManager] Client ${managed.id} reconnected ${((now - managed.lastDisconnectedAt) / 1000).toFixed(1)}s after disconnect. ` +
+                    `Grace period active until ${new Date(managed.reconnectionStableAt).toISOString()}`);
+            }
+            this.dispatchEvent(new CustomEvent("client:state", {
+                detail: { clientId: managed.id, online: true, busy: managed.busy }
+            }));
+        });
+    }
+    list() {
+        return [...this.clients];
+    }
+    getClient(clientId) {
+        return this.clients.find((c) => c.id === clientId);
+    }
+    /**
+     * Checks if a client is truly available for work.
+     * A client must be online, not busy, AND past the reconnection grace period.
+     */
+    isClientStable(client) {
+        if (!client.online || client.busy) {
+            return false;
+        }
+        // If client recently reconnected, wait for grace period
+        if (client.reconnectionStableAt && Date.now() < client.reconnectionStableAt) {
+            return false;
+        }
+        return true;
+    }
+    canClientRunJob(client, job) {
+        if (job.options.preferredClientIds?.length && !job.options.preferredClientIds.includes(client.id)) {
+            return false; // Job has preferred clients and this isn't one of them
+        }
+        if (job.options.excludeClientIds?.includes(client.id)) {
+            return false; // Job has excluded clients and this is one of them
+        }
+        if (this.strategy.shouldSkipClient(client, job)) {
+            return false; // Strategy says to skip
+        }
+        return true;
+    }
+    claim(job, specificClientId) {
+        let chosen;
+        if (specificClientId) {
+            const candidate = this.clients.find(c => c.id === specificClientId);
+            if (candidate && this.isClientStable(candidate) && this.canClientRunJob(candidate, job)) {
+                chosen = candidate;
+            }
+        }
+        else {
+            const candidates = this.clients.filter((c) => this.isClientStable(c));
+            chosen = candidates.find(c => this.canClientRunJob(c, job));
+        }
+        if (!chosen) {
+            return null;
+        }
+        chosen.busy = true;
+        chosen.busy = true;
+        chosen.lastSeenAt = Date.now();
+        return {
+            client: chosen.client,
+            clientId: chosen.id,
+            release: (opts) => {
+                if (this.debugLogs) {
+                    console.log(`[ClientManager.release] Releasing client ${chosen.id} for job ${job.jobId}. Setting busy: false.`);
+                }
+                chosen.busy = false;
+                if (opts?.success) {
+                    const wasBlocked = this.strategy.isWorkflowBlocked?.(chosen, job.workflowHash) ?? false;
+                    this.strategy.recordSuccess(chosen, job);
+                    const stillBlocked = this.strategy.isWorkflowBlocked?.(chosen, job.workflowHash) ?? false;
+                    if (wasBlocked && !stillBlocked) {
+                        this.emitUnblocked(chosen.id, job.workflowHash);
+                    }
+                }
+                this.dispatchEvent(new CustomEvent("client:state", {
+                    detail: { clientId: chosen.id, online: chosen.online, busy: chosen.busy }
+                }));
+            }
+        };
+    }
+    recordFailure(clientId, job, error) {
+        const client = this.clients.find((c) => c.id === clientId);
+        if (!client) {
+            return;
+        }
+        client.lastError = error;
+        client.busy = false;
+        const wasBlocked = this.strategy.isWorkflowBlocked?.(client, job.workflowHash) ?? false;
+        this.strategy.recordFailure(client, job, error);
+        const isBlocked = this.strategy.isWorkflowBlocked?.(client, job.workflowHash) ?? false;
+        if (!wasBlocked && isBlocked) {
+            this.emitBlocked(client.id, job.workflowHash);
+        }
+        this.dispatchEvent(new CustomEvent("client:state", {
+            detail: { clientId: client.id, online: client.online, busy: client.busy, lastError: error }
+        }));
+    }
+    /**
+     * Start periodic health check to keep connections alive and detect issues early.
+     * Pings idle clients by polling their queue status.
+     */
+    startHealthCheck() {
+        if (this.healthCheckInterval) {
+            return; // Already running
+        }
+        this.healthCheckInterval = setInterval(() => {
+            this.performHealthCheck().catch((error) => {
+                console.error("[ClientManager] Health check error:", error);
+            });
+        }, this.healthCheckIntervalMs);
+    }
+    /**
+     * Perform health check on all clients.
+     * Polls queue status to keep WebSocket alive and detect connection issues.
+     * IMPORTANT: Pings ALL online clients (including busy ones) to prevent WebSocket timeout during heavy load.
+     */
+    async performHealthCheck() {
+        for (const managed of this.clients) {
+            // Ping ALL online clients (not just idle ones) to keep WebSocket alive during heavy load
+            if (managed.online) {
+                try {
+                    // Lightweight ping: poll queue status (triggers WebSocket activity via fetchApi)
+                    await managed.client.getQueue();
+                    managed.lastSeenAt = Date.now();
+                }
+                catch (error) {
+                    // Health check failed - client may have connection issues
+                    console.warn(`[ClientManager] Health check failed for client ${managed.id}:`, error);
+                    // Don't mark as offline here - let the WebSocket disconnect event handle that
+                    // This prevents false positives from temporary network hiccups
+                }
+            }
+        }
+    }
+    /**
+     * Stop health check interval (called during shutdown).
+     */
+    stopHealthCheck() {
+        if (this.healthCheckInterval) {
+            clearInterval(this.healthCheckInterval);
+            this.healthCheckInterval = null;
+        }
+    }
+    /**
+     * Cleanup resources when destroying the manager.
+     */
+    destroy() {
+        this.stopHealthCheck();
+    }
+}
 //# sourceMappingURL=ClientManager.js.map

package/dist/pool/index.d.ts

@@ -1,12 +1,10 @@
-export { WorkflowPool } from "./WorkflowPool.js";
-export { SmartPool } from "./SmartPool.js";
-export { SmartPoolV2 } from "./SmartPoolV2.js";
-export type { WorkflowPoolOpts } from "./WorkflowPool.js";
-export type { WorkflowPoolEventMap } from "./types/events.js";
-export type { JobRecord, JobStatus, WorkflowJobOptions } from "./types/job.js";
-export type { QueueAdapter, QueueReservation, QueueStats } from "./queue/QueueAdapter.js";
-export { MemoryQueueAdapter } from "./queue/adapters/memory.js";
-export type { FailoverStrategy } from "./failover/Strategy.js";
-export { SmartFailoverStrategy } from "./failover/SmartFailoverStrategy.js";
-export type { JobProfileStats, NodeExecutionProfile } from "./profiling/JobProfiler.js";
+export { WorkflowPool } from "./WorkflowPool.js";
+export type { WorkflowPoolOpts } from "./WorkflowPool.js";
+export type { WorkflowPoolEventMap } from "./types/events.js";
+export type { JobRecord, JobStatus, WorkflowJobOptions } from "./types/job.js";
+export type { QueueAdapter, QueueReservation, QueueStats } from "./queue/QueueAdapter.js";
+export { MemoryQueueAdapter } from "./queue/adapters/memory.js";
+export type { FailoverStrategy } from "./failover/Strategy.js";
+export { SmartFailoverStrategy } from "./failover/SmartFailoverStrategy.js";
+export type { JobProfileStats, NodeExecutionProfile } from "./profiling/JobProfiler.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/pool/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/pool/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,YAAY,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAC9D,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC/E,YAAY,EAAE,YAAY,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,YAAY,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,YAAY,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/pool/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,YAAY,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAC9D,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC/E,YAAY,EAAE,YAAY,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,YAAY,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,YAAY,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC"}

package/dist/pool/index.js

@@ -1,6 +1,4 @@
-export { WorkflowPool } from "./WorkflowPool.js";
-export { SmartPool } from "./SmartPool.js";
-export { SmartPoolV2 } from "./SmartPoolV2.js";
-export { MemoryQueueAdapter } from "./queue/adapters/memory.js";
-export { SmartFailoverStrategy } from "./failover/SmartFailoverStrategy.js";
+export { WorkflowPool } from "./WorkflowPool.js";
+export { MemoryQueueAdapter } from "./queue/adapters/memory.js";
+export { SmartFailoverStrategy } from "./failover/SmartFailoverStrategy.js";
 //# sourceMappingURL=index.js.map

package/dist/pool/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/pool/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAK/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/pool/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "comfyui-node",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "ComfyUI Node.js Client",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",