comfyui-node 1.3.1 → 1.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.OLD.md +1395 -0
- package/README.md +112 -1223
- package/dist/.tsbuildinfo +1 -1
- package/dist/call-wrapper.d.ts +1 -0
- package/dist/call-wrapper.d.ts.map +1 -1
- package/dist/call-wrapper.js +136 -41
- package/dist/call-wrapper.js.map +1 -1
- package/dist/client.js +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/pool/WorkflowPool.d.ts +93 -0
- package/dist/pool/WorkflowPool.d.ts.map +1 -0
- package/dist/pool/WorkflowPool.js +438 -0
- package/dist/pool/WorkflowPool.js.map +1 -0
- package/dist/pool/client/ClientManager.d.ts +71 -0
- package/dist/pool/client/ClientManager.d.ts.map +1 -0
- package/dist/pool/client/ClientManager.js +167 -0
- package/dist/pool/client/ClientManager.js.map +1 -0
- package/dist/pool/failover/SmartFailoverStrategy.d.ts +18 -0
- package/dist/pool/failover/SmartFailoverStrategy.d.ts.map +1 -0
- package/dist/pool/failover/SmartFailoverStrategy.js +65 -0
- package/dist/pool/failover/SmartFailoverStrategy.js.map +1 -0
- package/dist/pool/failover/Strategy.d.ts +10 -0
- package/dist/pool/failover/Strategy.d.ts.map +1 -0
- package/dist/pool/failover/Strategy.js +2 -0
- package/dist/pool/failover/Strategy.js.map +1 -0
- package/dist/pool/index.d.ts +9 -0
- package/dist/pool/index.d.ts.map +1 -0
- package/dist/pool/index.js +4 -0
- package/dist/pool/index.js.map +1 -0
- package/dist/pool/queue/QueueAdapter.d.ts +31 -0
- package/dist/pool/queue/QueueAdapter.d.ts.map +1 -0
- package/dist/pool/queue/QueueAdapter.js +2 -0
- package/dist/pool/queue/QueueAdapter.js.map +1 -0
- package/dist/pool/queue/adapters/memory.d.ts +21 -0
- package/dist/pool/queue/adapters/memory.d.ts.map +1 -0
- package/dist/pool/queue/adapters/memory.js +96 -0
- package/dist/pool/queue/adapters/memory.js.map +1 -0
- package/dist/pool/types/events.d.ts +75 -0
- package/dist/pool/types/events.d.ts.map +1 -0
- package/dist/pool/types/events.js +2 -0
- package/dist/pool/types/events.js.map +1 -0
- package/dist/pool/types/job.d.ts +56 -0
- package/dist/pool/types/job.d.ts.map +1 -0
- package/dist/pool/types/job.js +2 -0
- package/dist/pool/types/job.js.map +1 -0
- package/dist/pool/utils/clone.d.ts +2 -0
- package/dist/pool/utils/clone.d.ts.map +1 -0
- package/dist/pool/utils/clone.js +7 -0
- package/dist/pool/utils/clone.js.map +1 -0
- package/dist/pool/utils/hash.d.ts +5 -0
- package/dist/pool/utils/hash.d.ts.map +1 -0
- package/dist/pool/utils/hash.js +19 -0
- package/dist/pool/utils/hash.js.map +1 -0
- package/dist/types/event.d.ts +3 -2
- package/dist/types/event.d.ts.map +1 -1
- package/dist/workflow.d.ts.map +1 -1
- package/dist/workflow.js +2 -1
- package/dist/workflow.js.map +1 -1
- package/package.json +4 -4
|
@@ -0,0 +1,438 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
2
|
+
import { TypedEventTarget } from "../typed-event-target.js";
|
|
3
|
+
import { Workflow } from "../workflow.js";
|
|
4
|
+
import { PromptBuilder } from "../prompt-builder.js";
|
|
5
|
+
import { CallWrapper } from "../call-wrapper.js";
|
|
6
|
+
import { MemoryQueueAdapter } from "./queue/adapters/memory.js";
|
|
7
|
+
import { SmartFailoverStrategy } from "./failover/SmartFailoverStrategy.js";
|
|
8
|
+
import { ClientManager } from "./client/ClientManager.js";
|
|
9
|
+
import { hashWorkflow } from "./utils/hash.js";
|
|
10
|
+
import { cloneDeep } from "./utils/clone.js";
|
|
11
|
+
const DEFAULT_MAX_ATTEMPTS = 3;
|
|
12
|
+
const DEFAULT_RETRY_DELAY = 1000;
|
|
13
|
+
export class WorkflowPool extends TypedEventTarget {
|
|
14
|
+
queue;
|
|
15
|
+
strategy;
|
|
16
|
+
clientManager;
|
|
17
|
+
opts;
|
|
18
|
+
jobStore = new Map();
|
|
19
|
+
initPromise;
|
|
20
|
+
processing = false;
|
|
21
|
+
activeJobs = new Map();
|
|
22
|
+
constructor(clients, opts) {
|
|
23
|
+
super();
|
|
24
|
+
this.strategy = opts?.failoverStrategy ?? new SmartFailoverStrategy();
|
|
25
|
+
this.queue = opts?.queueAdapter ?? new MemoryQueueAdapter();
|
|
26
|
+
this.clientManager = new ClientManager(this.strategy, {
|
|
27
|
+
healthCheckIntervalMs: opts?.healthCheckIntervalMs ?? 30000
|
|
28
|
+
});
|
|
29
|
+
this.opts = opts ?? {};
|
|
30
|
+
this.clientManager.on("client:state", (ev) => {
|
|
31
|
+
this.dispatchEvent(new CustomEvent("client:state", { detail: ev.detail }));
|
|
32
|
+
});
|
|
33
|
+
this.clientManager.on("client:blocked_workflow", (ev) => {
|
|
34
|
+
this.dispatchEvent(new CustomEvent("client:blocked_workflow", { detail: ev.detail }));
|
|
35
|
+
});
|
|
36
|
+
this.clientManager.on("client:unblocked_workflow", (ev) => {
|
|
37
|
+
this.dispatchEvent(new CustomEvent("client:unblocked_workflow", { detail: ev.detail }));
|
|
38
|
+
});
|
|
39
|
+
this.initPromise = this.clientManager
|
|
40
|
+
.initialize(clients)
|
|
41
|
+
.then(() => {
|
|
42
|
+
this.dispatchEvent(new CustomEvent("pool:ready", {
|
|
43
|
+
detail: { clientIds: this.clientManager.list().map((c) => c.id) }
|
|
44
|
+
}));
|
|
45
|
+
})
|
|
46
|
+
.catch((error) => {
|
|
47
|
+
this.dispatchEvent(new CustomEvent("pool:error", { detail: { error } }));
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
async ready() {
|
|
51
|
+
await this.initPromise;
|
|
52
|
+
}
|
|
53
|
+
async enqueue(workflowInput, options) {
|
|
54
|
+
await this.ready();
|
|
55
|
+
const workflowJson = this.normalizeWorkflow(workflowInput);
|
|
56
|
+
const workflowHash = hashWorkflow(workflowJson);
|
|
57
|
+
const jobId = options?.jobId ?? this.generateJobId();
|
|
58
|
+
// Extract workflow metadata (outputAliases, outputNodeIds, etc.) if input is a Workflow instance
|
|
59
|
+
let workflowMeta;
|
|
60
|
+
if (workflowInput instanceof Workflow) {
|
|
61
|
+
workflowMeta = {
|
|
62
|
+
outputNodeIds: workflowInput.outputNodeIds ?? [],
|
|
63
|
+
outputAliases: workflowInput.outputAliases ?? {}
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
const payload = {
|
|
67
|
+
jobId,
|
|
68
|
+
workflow: workflowJson,
|
|
69
|
+
workflowHash,
|
|
70
|
+
attempts: 0,
|
|
71
|
+
enqueuedAt: Date.now(),
|
|
72
|
+
workflowMeta,
|
|
73
|
+
options: {
|
|
74
|
+
maxAttempts: options?.maxAttempts ?? DEFAULT_MAX_ATTEMPTS,
|
|
75
|
+
retryDelayMs: options?.retryDelayMs ?? DEFAULT_RETRY_DELAY,
|
|
76
|
+
priority: options?.priority ?? 0,
|
|
77
|
+
preferredClientIds: options?.preferredClientIds ?? [],
|
|
78
|
+
excludeClientIds: options?.excludeClientIds ?? [],
|
|
79
|
+
metadata: options?.metadata ?? {},
|
|
80
|
+
includeOutputs: options?.includeOutputs ?? []
|
|
81
|
+
}
|
|
82
|
+
};
|
|
83
|
+
const record = {
|
|
84
|
+
...payload,
|
|
85
|
+
attachments: options?.attachments,
|
|
86
|
+
status: "queued"
|
|
87
|
+
};
|
|
88
|
+
this.jobStore.set(jobId, record);
|
|
89
|
+
await this.queue.enqueue(payload, { priority: payload.options.priority });
|
|
90
|
+
this.dispatchEvent(new CustomEvent("job:queued", { detail: { job: record } }));
|
|
91
|
+
void this.processQueue();
|
|
92
|
+
return jobId;
|
|
93
|
+
}
|
|
94
|
+
getJob(jobId) {
|
|
95
|
+
return this.jobStore.get(jobId);
|
|
96
|
+
}
|
|
97
|
+
async cancel(jobId) {
|
|
98
|
+
const record = this.jobStore.get(jobId);
|
|
99
|
+
if (!record) {
|
|
100
|
+
return false;
|
|
101
|
+
}
|
|
102
|
+
if (record.status === "queued") {
|
|
103
|
+
const removed = await this.queue.remove(jobId);
|
|
104
|
+
if (removed) {
|
|
105
|
+
record.status = "cancelled";
|
|
106
|
+
record.completedAt = Date.now();
|
|
107
|
+
this.dispatchEvent(new CustomEvent("job:cancelled", { detail: { job: record } }));
|
|
108
|
+
return true;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
const active = this.activeJobs.get(jobId);
|
|
112
|
+
if (active?.cancel) {
|
|
113
|
+
await active.cancel();
|
|
114
|
+
record.status = "cancelled";
|
|
115
|
+
record.completedAt = Date.now();
|
|
116
|
+
this.dispatchEvent(new CustomEvent("job:cancelled", { detail: { job: record } }));
|
|
117
|
+
return true;
|
|
118
|
+
}
|
|
119
|
+
return false;
|
|
120
|
+
}
|
|
121
|
+
async shutdown() {
|
|
122
|
+
this.clientManager.destroy();
|
|
123
|
+
await this.queue.shutdown();
|
|
124
|
+
for (const [, ctx] of this.activeJobs) {
|
|
125
|
+
ctx.release({ success: false });
|
|
126
|
+
}
|
|
127
|
+
this.activeJobs.clear();
|
|
128
|
+
}
|
|
129
|
+
async getQueueStats() {
|
|
130
|
+
return this.queue.stats();
|
|
131
|
+
}
|
|
132
|
+
normalizeWorkflow(input) {
|
|
133
|
+
if (typeof input === "string") {
|
|
134
|
+
return JSON.parse(input);
|
|
135
|
+
}
|
|
136
|
+
if (input instanceof Workflow) {
|
|
137
|
+
return cloneDeep(input.json ?? {});
|
|
138
|
+
}
|
|
139
|
+
if (typeof input?.toJSON === "function") {
|
|
140
|
+
return cloneDeep(input.toJSON());
|
|
141
|
+
}
|
|
142
|
+
return cloneDeep(input);
|
|
143
|
+
}
|
|
144
|
+
generateJobId() {
|
|
145
|
+
try {
|
|
146
|
+
return randomUUID();
|
|
147
|
+
}
|
|
148
|
+
catch {
|
|
149
|
+
return WorkflowPool.fallbackId();
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
static fallbackId() {
|
|
153
|
+
return (globalThis.crypto && "randomUUID" in globalThis.crypto)
|
|
154
|
+
? globalThis.crypto.randomUUID()
|
|
155
|
+
: `job_${Math.random().toString(36).slice(2, 10)}`;
|
|
156
|
+
}
|
|
157
|
+
scheduleProcess(delayMs) {
|
|
158
|
+
const wait = Math.max(delayMs, 10);
|
|
159
|
+
setTimeout(() => {
|
|
160
|
+
void this.processQueue();
|
|
161
|
+
}, wait);
|
|
162
|
+
}
|
|
163
|
+
applyAutoSeed(workflow) {
|
|
164
|
+
const autoSeeds = {};
|
|
165
|
+
for (const [nodeId, nodeValue] of Object.entries(workflow)) {
|
|
166
|
+
if (!nodeValue || typeof nodeValue !== "object")
|
|
167
|
+
continue;
|
|
168
|
+
const inputs = nodeValue.inputs;
|
|
169
|
+
if (!inputs || typeof inputs !== "object")
|
|
170
|
+
continue;
|
|
171
|
+
if (typeof inputs.seed === "number" && inputs.seed === -1) {
|
|
172
|
+
const val = Math.floor(Math.random() * 2_147_483_647);
|
|
173
|
+
inputs.seed = val;
|
|
174
|
+
autoSeeds[nodeId] = val;
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
return autoSeeds;
|
|
178
|
+
}
|
|
179
|
+
async processQueue() {
|
|
180
|
+
if (this.processing) {
|
|
181
|
+
return;
|
|
182
|
+
}
|
|
183
|
+
this.processing = true;
|
|
184
|
+
try {
|
|
185
|
+
while (true) {
|
|
186
|
+
const reservation = await this.queue.reserve();
|
|
187
|
+
if (!reservation) {
|
|
188
|
+
break;
|
|
189
|
+
}
|
|
190
|
+
const job = this.jobStore.get(reservation.payload.jobId);
|
|
191
|
+
if (!job) {
|
|
192
|
+
await this.queue.commit(reservation.reservationId);
|
|
193
|
+
continue;
|
|
194
|
+
}
|
|
195
|
+
const lease = this.clientManager.claim(job);
|
|
196
|
+
if (!lease) {
|
|
197
|
+
await this.queue.retry(reservation.reservationId, { delayMs: job.options.retryDelayMs });
|
|
198
|
+
this.scheduleProcess(job.options.retryDelayMs);
|
|
199
|
+
break;
|
|
200
|
+
}
|
|
201
|
+
this.runJob({ reservation, job, clientId: lease.clientId, release: lease.release }).catch((error) => {
|
|
202
|
+
console.error("[WorkflowPool] Unhandled job error", error);
|
|
203
|
+
});
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
finally {
|
|
207
|
+
this.processing = false;
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
async runJob(ctx) {
|
|
211
|
+
const { reservation, job, clientId, release } = ctx;
|
|
212
|
+
const managed = this.clientManager.getClient(clientId);
|
|
213
|
+
const client = managed?.client;
|
|
214
|
+
if (!client) {
|
|
215
|
+
await this.queue.retry(reservation.reservationId, { delayMs: job.options.retryDelayMs });
|
|
216
|
+
release({ success: false });
|
|
217
|
+
return;
|
|
218
|
+
}
|
|
219
|
+
job.status = "running";
|
|
220
|
+
job.clientId = clientId;
|
|
221
|
+
job.attempts += 1;
|
|
222
|
+
reservation.payload.attempts = job.attempts;
|
|
223
|
+
job.startedAt = Date.now();
|
|
224
|
+
this.dispatchEvent(new CustomEvent("job:started", { detail: { job } }));
|
|
225
|
+
const workflowPayload = cloneDeep(reservation.payload.workflow);
|
|
226
|
+
if (job.attachments?.length) {
|
|
227
|
+
for (const attachment of job.attachments) {
|
|
228
|
+
const filename = attachment.filename ?? `${job.jobId}-${attachment.nodeId}-${attachment.inputName}.bin`;
|
|
229
|
+
const blob = attachment.file instanceof Buffer ? new Blob([new Uint8Array(attachment.file)]) : attachment.file;
|
|
230
|
+
await client.ext.file.uploadImage(blob, filename, { override: true });
|
|
231
|
+
const node = workflowPayload[attachment.nodeId];
|
|
232
|
+
if (node?.inputs) {
|
|
233
|
+
node.inputs[attachment.inputName] = filename;
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
}
|
|
237
|
+
const autoSeeds = this.applyAutoSeed(workflowPayload);
|
|
238
|
+
let wfInstance = Workflow.from(workflowPayload);
|
|
239
|
+
if (job.options.includeOutputs?.length) {
|
|
240
|
+
for (const nodeId of job.options.includeOutputs) {
|
|
241
|
+
if (nodeId) {
|
|
242
|
+
wfInstance = wfInstance.output(nodeId);
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
wfInstance.inferDefaultOutputs?.();
|
|
247
|
+
// Use stored metadata if available (from Workflow instance), otherwise extract from recreated instance
|
|
248
|
+
const outputNodeIds = reservation.payload.workflowMeta?.outputNodeIds ??
|
|
249
|
+
wfInstance.outputNodeIds ??
|
|
250
|
+
job.options.includeOutputs ?? [];
|
|
251
|
+
const outputAliases = reservation.payload.workflowMeta?.outputAliases ??
|
|
252
|
+
wfInstance.outputAliases ?? {};
|
|
253
|
+
let promptBuilder = new PromptBuilder(wfInstance.json, wfInstance.inputPaths ?? [], outputNodeIds);
|
|
254
|
+
for (const nodeId of outputNodeIds) {
|
|
255
|
+
const alias = outputAliases[nodeId] ?? nodeId;
|
|
256
|
+
promptBuilder = promptBuilder.setOutputNode(alias, nodeId);
|
|
257
|
+
}
|
|
258
|
+
const wrapper = new CallWrapper(client, promptBuilder);
|
|
259
|
+
let pendingSettled = false;
|
|
260
|
+
let resolvePending;
|
|
261
|
+
let rejectPending;
|
|
262
|
+
const pendingPromise = new Promise((resolve, reject) => {
|
|
263
|
+
resolvePending = () => {
|
|
264
|
+
if (!pendingSettled) {
|
|
265
|
+
pendingSettled = true;
|
|
266
|
+
resolve();
|
|
267
|
+
}
|
|
268
|
+
};
|
|
269
|
+
rejectPending = (err) => {
|
|
270
|
+
if (!pendingSettled) {
|
|
271
|
+
pendingSettled = true;
|
|
272
|
+
reject(err);
|
|
273
|
+
}
|
|
274
|
+
};
|
|
275
|
+
});
|
|
276
|
+
let resolveCompletion;
|
|
277
|
+
let rejectCompletion;
|
|
278
|
+
const completionPromise = new Promise((resolve, reject) => {
|
|
279
|
+
resolveCompletion = resolve;
|
|
280
|
+
rejectCompletion = reject;
|
|
281
|
+
});
|
|
282
|
+
wrapper.onProgress((progress, promptId) => {
|
|
283
|
+
if (!job.promptId && promptId) {
|
|
284
|
+
job.promptId = promptId;
|
|
285
|
+
}
|
|
286
|
+
this.dispatchEvent(new CustomEvent("job:progress", {
|
|
287
|
+
detail: { jobId: job.jobId, clientId, progress }
|
|
288
|
+
}));
|
|
289
|
+
});
|
|
290
|
+
wrapper.onPreview((blob, promptId) => {
|
|
291
|
+
if (!job.promptId && promptId) {
|
|
292
|
+
job.promptId = promptId;
|
|
293
|
+
}
|
|
294
|
+
this.dispatchEvent(new CustomEvent("job:preview", {
|
|
295
|
+
detail: { jobId: job.jobId, clientId, blob }
|
|
296
|
+
}));
|
|
297
|
+
});
|
|
298
|
+
wrapper.onPreviewMeta((payload, promptId) => {
|
|
299
|
+
if (!job.promptId && promptId) {
|
|
300
|
+
job.promptId = promptId;
|
|
301
|
+
}
|
|
302
|
+
this.dispatchEvent(new CustomEvent("job:preview_meta", {
|
|
303
|
+
detail: { jobId: job.jobId, clientId, payload }
|
|
304
|
+
}));
|
|
305
|
+
});
|
|
306
|
+
wrapper.onOutput((key, data, promptId) => {
|
|
307
|
+
if (!job.promptId && promptId) {
|
|
308
|
+
job.promptId = promptId;
|
|
309
|
+
}
|
|
310
|
+
this.dispatchEvent(new CustomEvent("job:output", {
|
|
311
|
+
detail: { jobId: job.jobId, clientId, key: String(key), data }
|
|
312
|
+
}));
|
|
313
|
+
});
|
|
314
|
+
wrapper.onPending((promptId) => {
|
|
315
|
+
if (!job.promptId && promptId) {
|
|
316
|
+
job.promptId = promptId;
|
|
317
|
+
}
|
|
318
|
+
this.dispatchEvent(new CustomEvent("job:accepted", { detail: { job } }));
|
|
319
|
+
resolvePending?.();
|
|
320
|
+
});
|
|
321
|
+
wrapper.onStart((promptId) => {
|
|
322
|
+
if (!job.promptId && promptId) {
|
|
323
|
+
job.promptId = promptId;
|
|
324
|
+
}
|
|
325
|
+
});
|
|
326
|
+
wrapper.onFinished((data, promptId) => {
|
|
327
|
+
if (!job.promptId && promptId) {
|
|
328
|
+
job.promptId = promptId;
|
|
329
|
+
}
|
|
330
|
+
job.status = "completed";
|
|
331
|
+
job.lastError = undefined;
|
|
332
|
+
const resultPayload = {};
|
|
333
|
+
for (const nodeId of outputNodeIds) {
|
|
334
|
+
const alias = outputAliases[nodeId] ?? nodeId;
|
|
335
|
+
// CallWrapper uses alias keys when mapOutputKeys is configured, fallback to nodeId
|
|
336
|
+
const nodeResult = data[alias];
|
|
337
|
+
const fallbackResult = data[nodeId];
|
|
338
|
+
const finalResult = nodeResult !== undefined ? nodeResult : fallbackResult;
|
|
339
|
+
resultPayload[alias] = finalResult;
|
|
340
|
+
}
|
|
341
|
+
resultPayload._nodes = [...outputNodeIds];
|
|
342
|
+
resultPayload._aliases = { ...outputAliases };
|
|
343
|
+
if (job.promptId) {
|
|
344
|
+
resultPayload._promptId = job.promptId;
|
|
345
|
+
}
|
|
346
|
+
if (Object.keys(autoSeeds).length) {
|
|
347
|
+
resultPayload._autoSeeds = { ...autoSeeds };
|
|
348
|
+
}
|
|
349
|
+
job.result = resultPayload;
|
|
350
|
+
job.completedAt = Date.now();
|
|
351
|
+
this.dispatchEvent(new CustomEvent("job:completed", { detail: { job } }));
|
|
352
|
+
resolveCompletion?.();
|
|
353
|
+
});
|
|
354
|
+
wrapper.onFailed((error, promptId) => {
|
|
355
|
+
if (!job.promptId && promptId) {
|
|
356
|
+
job.promptId = promptId;
|
|
357
|
+
}
|
|
358
|
+
job.lastError = error;
|
|
359
|
+
rejectPending?.(error);
|
|
360
|
+
rejectCompletion?.(error);
|
|
361
|
+
});
|
|
362
|
+
try {
|
|
363
|
+
const exec = wrapper.run();
|
|
364
|
+
await pendingPromise;
|
|
365
|
+
this.activeJobs.set(job.jobId, {
|
|
366
|
+
reservation,
|
|
367
|
+
job,
|
|
368
|
+
clientId,
|
|
369
|
+
release,
|
|
370
|
+
cancel: async () => {
|
|
371
|
+
try {
|
|
372
|
+
if (job.promptId) {
|
|
373
|
+
await client.ext.queue.interrupt(job.promptId);
|
|
374
|
+
}
|
|
375
|
+
}
|
|
376
|
+
finally {
|
|
377
|
+
this.activeJobs.delete(job.jobId);
|
|
378
|
+
await this.queue.discard(reservation.reservationId, new Error("cancelled"));
|
|
379
|
+
release({ success: false });
|
|
380
|
+
}
|
|
381
|
+
}
|
|
382
|
+
});
|
|
383
|
+
const result = await exec;
|
|
384
|
+
if (result === false) {
|
|
385
|
+
// Execution failed - try to get the error from completionPromise rejection
|
|
386
|
+
try {
|
|
387
|
+
await completionPromise;
|
|
388
|
+
}
|
|
389
|
+
catch (err) {
|
|
390
|
+
throw err;
|
|
391
|
+
}
|
|
392
|
+
throw job.lastError ?? new Error("Execution failed");
|
|
393
|
+
}
|
|
394
|
+
await completionPromise;
|
|
395
|
+
await this.queue.commit(reservation.reservationId);
|
|
396
|
+
release({ success: true });
|
|
397
|
+
}
|
|
398
|
+
catch (error) {
|
|
399
|
+
const latestStatus = this.jobStore.get(job.jobId)?.status;
|
|
400
|
+
if (latestStatus === "cancelled") {
|
|
401
|
+
release({ success: false });
|
|
402
|
+
return;
|
|
403
|
+
}
|
|
404
|
+
job.lastError = error;
|
|
405
|
+
job.status = "failed";
|
|
406
|
+
this.clientManager.recordFailure(clientId, job, error);
|
|
407
|
+
const remainingAttempts = job.options.maxAttempts - job.attempts;
|
|
408
|
+
const willRetry = remainingAttempts > 0;
|
|
409
|
+
this.dispatchEvent(new CustomEvent("job:failed", {
|
|
410
|
+
detail: { job, willRetry }
|
|
411
|
+
}));
|
|
412
|
+
if (willRetry) {
|
|
413
|
+
const delay = this.opts.retryBackoffMs ?? job.options.retryDelayMs;
|
|
414
|
+
this.dispatchEvent(new CustomEvent("job:retrying", { detail: { job, delayMs: delay } }));
|
|
415
|
+
job.status = "queued";
|
|
416
|
+
job.clientId = undefined;
|
|
417
|
+
job.promptId = undefined;
|
|
418
|
+
job.startedAt = undefined;
|
|
419
|
+
job.completedAt = undefined;
|
|
420
|
+
job.result = undefined;
|
|
421
|
+
await this.queue.retry(reservation.reservationId, { delayMs: delay });
|
|
422
|
+
this.dispatchEvent(new CustomEvent("job:queued", { detail: { job } }));
|
|
423
|
+
this.scheduleProcess(delay);
|
|
424
|
+
release({ success: false });
|
|
425
|
+
}
|
|
426
|
+
else {
|
|
427
|
+
job.completedAt = Date.now();
|
|
428
|
+
await this.queue.discard(reservation.reservationId, error);
|
|
429
|
+
release({ success: false });
|
|
430
|
+
}
|
|
431
|
+
}
|
|
432
|
+
finally {
|
|
433
|
+
this.activeJobs.delete(job.jobId);
|
|
434
|
+
void this.processQueue();
|
|
435
|
+
}
|
|
436
|
+
}
|
|
437
|
+
}
|
|
438
|
+
//# sourceMappingURL=WorkflowPool.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"WorkflowPool.js","sourceRoot":"","sources":["../../src/pool/WorkflowPool.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
import type { ComfyApi } from "../../client.js";
|
|
2
|
+
import { TypedEventTarget } from "../../typed-event-target.js";
|
|
3
|
+
import type { JobRecord } from "../types/job.js";
|
|
4
|
+
import type { FailoverStrategy } from "../failover/Strategy.js";
|
|
5
|
+
import type { WorkflowPoolEventMap } from "../types/events.js";
|
|
6
|
+
export interface ManagedClient {
|
|
7
|
+
client: ComfyApi;
|
|
8
|
+
id: string;
|
|
9
|
+
online: boolean;
|
|
10
|
+
busy: boolean;
|
|
11
|
+
lastError?: unknown;
|
|
12
|
+
lastSeenAt: number;
|
|
13
|
+
supportedWorkflows: Set<string>;
|
|
14
|
+
}
|
|
15
|
+
interface ClientLease {
|
|
16
|
+
client: ComfyApi;
|
|
17
|
+
clientId: string;
|
|
18
|
+
release: (opts?: {
|
|
19
|
+
success?: boolean;
|
|
20
|
+
}) => void;
|
|
21
|
+
}
|
|
22
|
+
export declare class ClientManager extends TypedEventTarget<WorkflowPoolEventMap> {
|
|
23
|
+
private clients;
|
|
24
|
+
private strategy;
|
|
25
|
+
private healthCheckInterval;
|
|
26
|
+
private readonly healthCheckIntervalMs;
|
|
27
|
+
/**
|
|
28
|
+
* Create a new ClientManager for managing ComfyUI client connections.
|
|
29
|
+
*
|
|
30
|
+
* @param strategy - Failover strategy for handling client failures
|
|
31
|
+
* @param opts - Configuration options
|
|
32
|
+
* @param opts.healthCheckIntervalMs - Interval (ms) for health check pings to keep connections alive.
|
|
33
|
+
* Set to 0 to disable. Default: 30000 (30 seconds).
|
|
34
|
+
*/
|
|
35
|
+
constructor(strategy: FailoverStrategy, opts?: {
|
|
36
|
+
/**
|
|
37
|
+
* Interval in milliseconds for health check pings.
|
|
38
|
+
* Health checks keep idle connections alive by periodically polling client status.
|
|
39
|
+
* @default 30000 (30 seconds)
|
|
40
|
+
*/
|
|
41
|
+
healthCheckIntervalMs?: number;
|
|
42
|
+
});
|
|
43
|
+
private emitBlocked;
|
|
44
|
+
private emitUnblocked;
|
|
45
|
+
initialize(clients: ComfyApi[]): Promise<void>;
|
|
46
|
+
addClient(client: ComfyApi): Promise<void>;
|
|
47
|
+
list(): ManagedClient[];
|
|
48
|
+
getClient(clientId: string): ManagedClient | undefined;
|
|
49
|
+
claim(job: JobRecord): ClientLease | null;
|
|
50
|
+
recordFailure(clientId: string, job: JobRecord, error: unknown): void;
|
|
51
|
+
/**
|
|
52
|
+
* Start periodic health check to keep connections alive and detect issues early.
|
|
53
|
+
* Pings idle clients by polling their queue status.
|
|
54
|
+
*/
|
|
55
|
+
private startHealthCheck;
|
|
56
|
+
/**
|
|
57
|
+
* Perform health check on all clients.
|
|
58
|
+
* For idle clients, polls queue status to keep WebSocket alive and detect connection issues.
|
|
59
|
+
*/
|
|
60
|
+
private performHealthCheck;
|
|
61
|
+
/**
|
|
62
|
+
* Stop health check interval (called during shutdown).
|
|
63
|
+
*/
|
|
64
|
+
stopHealthCheck(): void;
|
|
65
|
+
/**
|
|
66
|
+
* Cleanup resources when destroying the manager.
|
|
67
|
+
*/
|
|
68
|
+
destroy(): void;
|
|
69
|
+
}
|
|
70
|
+
export {};
|
|
71
|
+
//# sourceMappingURL=ClientManager.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ClientManager.d.ts","sourceRoot":"","sources":["../../../src/pool/client/ClientManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE/D,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,QAAQ,CAAC;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACjC;AAED,UAAU,WAAW;IACnB,MAAM,EAAE,QAAQ,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAC;CACjD;AAED,qBAAa,aAAc,SAAQ,gBAAgB,CAAC,oBAAoB,CAAC;IACvE,OAAO,CAAC,OAAO,CAAuB;IACtC,OAAO,CAAC,QAAQ,CAAmB;IACnC,OAAO,CAAC,mBAAmB,CAA+B;IAC1D,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAS;IAE/C;;;;;;;OAOG;gBACS,QAAQ,EAAE,gBAAgB,EAAE,IAAI,CAAC,EAAE;QAC7C;;;;WAIG;QACH,qBAAqB,CAAC,EAAE,MAAM,CAAA;KAC/B;IAMD,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,aAAa;IAIf,UAAU,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAO9C,SAAS,CAAC,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BhD,IAAI,IAAI,aAAa,EAAE;IAIvB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAItD,KAAK,CAAC,GAAG,EAAE,SAAS,GAAG,WAAW,GAAG,IAAI;IAkCzC,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO;IAkB9D;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAYxB;;;OAGG;YACW,kBAAkB;IAkBhC;;OAEG;IACH,eAAe,IAAI,IAAI;IAOvB;;OAEG;IACH,OAAO,IAAI,IAAI;CAGhB"}
|