comfyui-mcp 0.6.0 → 0.7.0
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/.codex/hooks.json +15 -0
- package/CHANGELOG.md +64 -0
- package/README.md +45 -1
- package/ROADMAP.md +120 -0
- package/TODO.md +75 -0
- package/blog/comfyui-mcp-tdqs-case-study.md +102 -0
- package/design/embedded-agent-panel.md +118 -0
- package/dist/experimental/agent-poc.d.ts +30 -0
- package/dist/experimental/agent-poc.d.ts.map +1 -0
- package/dist/experimental/agent-poc.js +210 -0
- package/dist/experimental/agent-poc.js.map +1 -0
- package/dist/experimental/chat-handler.d.ts +34 -0
- package/dist/experimental/chat-handler.d.ts.map +1 -0
- package/dist/experimental/chat-handler.js +60 -0
- package/dist/experimental/chat-handler.js.map +1 -0
- package/dist/experimental/provider-registry.d.ts +8 -0
- package/dist/experimental/provider-registry.d.ts.map +1 -0
- package/dist/experimental/provider-registry.js +50 -0
- package/dist/experimental/provider-registry.js.map +1 -0
- package/dist/experimental/run.d.ts +3 -0
- package/dist/experimental/run.d.ts.map +1 -0
- package/dist/experimental/run.js +34 -0
- package/dist/experimental/run.js.map +1 -0
- package/dist/services/download-auth.d.ts +23 -0
- package/dist/services/download-auth.d.ts.map +1 -0
- package/dist/services/download-auth.js +78 -0
- package/dist/services/download-auth.js.map +1 -0
- package/dist/services/download-cache.d.ts +26 -0
- package/dist/services/download-cache.d.ts.map +1 -0
- package/dist/services/download-cache.js +167 -0
- package/dist/services/download-cache.js.map +1 -0
- package/dist/services/image-management.d.ts +14 -0
- package/dist/services/image-management.d.ts.map +1 -1
- package/dist/services/image-management.js +57 -0
- package/dist/services/image-management.js.map +1 -1
- package/dist/services/job-history.d.ts +28 -0
- package/dist/services/job-history.d.ts.map +1 -0
- package/dist/services/job-history.js +130 -0
- package/dist/services/job-history.js.map +1 -0
- package/dist/services/job-watcher.d.ts +8 -0
- package/dist/services/job-watcher.d.ts.map +1 -1
- package/dist/services/job-watcher.js +16 -20
- package/dist/services/job-watcher.js.map +1 -1
- package/dist/services/model-resolver.d.ts +2 -1
- package/dist/services/model-resolver.d.ts.map +1 -1
- package/dist/services/model-resolver.js +11 -18
- package/dist/services/model-resolver.js.map +1 -1
- package/dist/services/node-authoring.d.ts +112 -0
- package/dist/services/node-authoring.d.ts.map +1 -0
- package/dist/services/node-authoring.js +418 -0
- package/dist/services/node-authoring.js.map +1 -0
- package/dist/services/node-management.d.ts +7 -0
- package/dist/services/node-management.d.ts.map +1 -1
- package/dist/services/node-management.js +123 -8
- package/dist/services/node-management.js.map +1 -1
- package/dist/services/process-control.d.ts +45 -0
- package/dist/services/process-control.d.ts.map +1 -1
- package/dist/services/process-control.js +262 -54
- package/dist/services/process-control.js.map +1 -1
- package/dist/services/queue-manager.d.ts +8 -3
- package/dist/services/queue-manager.d.ts.map +1 -1
- package/dist/services/queue-manager.js +25 -2
- package/dist/services/queue-manager.js.map +1 -1
- package/dist/services/tunnel.d.ts +23 -0
- package/dist/services/tunnel.d.ts.map +1 -0
- package/dist/services/tunnel.js +151 -0
- package/dist/services/tunnel.js.map +1 -0
- package/dist/tools/image-management.d.ts.map +1 -1
- package/dist/tools/image-management.js +57 -1
- package/dist/tools/image-management.js.map +1 -1
- package/dist/tools/index.d.ts.map +1 -1
- package/dist/tools/index.js +2 -0
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/model-management.d.ts.map +1 -1
- package/dist/tools/model-management.js +26 -1
- package/dist/tools/model-management.js.map +1 -1
- package/dist/tools/node-authoring.d.ts +3 -0
- package/dist/tools/node-authoring.d.ts.map +1 -0
- package/dist/tools/node-authoring.js +96 -0
- package/dist/tools/node-authoring.js.map +1 -0
- package/dist/tools/node-management.d.ts.map +1 -1
- package/dist/tools/node-management.js +5 -1
- package/dist/tools/node-management.js.map +1 -1
- package/dist/tools/process-control.js +2 -2
- package/dist/tools/process-control.js.map +1 -1
- package/dist/tools/queue-management.js +1 -1
- package/dist/tools/queue-management.js.map +1 -1
- package/infra/cloudflare/docs-proxy.js +45 -0
- package/infra/cloudflare/wrangler.jsonc +19 -0
- package/package.json +11 -2
- package/scripts/gen-tool-docs.ts +357 -0
|
@@ -0,0 +1,167 @@
|
|
|
1
|
+
import { createHash, randomUUID } from "node:crypto";
|
|
2
|
+
import { createWriteStream } from "node:fs";
|
|
3
|
+
import { copyFile, link, mkdir, readdir, rename, rm, stat, utimes, } from "node:fs/promises";
|
|
4
|
+
import { homedir } from "node:os";
|
|
5
|
+
import { basename, extname, join, resolve } from "node:path";
|
|
6
|
+
import { Readable } from "node:stream";
|
|
7
|
+
import { pipeline } from "node:stream/promises";
|
|
8
|
+
import { ModelError } from "../utils/errors.js";
|
|
9
|
+
import { logger } from "../utils/logger.js";
|
|
10
|
+
import { redactUrlForLogs } from "./download-auth.js";
|
|
11
|
+
const DEFAULT_CACHE_DIR = join(homedir(), ".comfyui-mcp", "cache");
|
|
12
|
+
const HASH_CHARS = 32;
|
|
13
|
+
const inflight = new Map();
|
|
14
|
+
export const downloadCacheFs = {
|
|
15
|
+
copyFile,
|
|
16
|
+
link,
|
|
17
|
+
mkdir,
|
|
18
|
+
readdir,
|
|
19
|
+
rename,
|
|
20
|
+
rm,
|
|
21
|
+
stat,
|
|
22
|
+
utimes,
|
|
23
|
+
};
|
|
24
|
+
function cacheDir() {
|
|
25
|
+
return resolve(process.env.COMFYUI_DOWNLOAD_CACHE_DIR || DEFAULT_CACHE_DIR);
|
|
26
|
+
}
|
|
27
|
+
function cacheSizeLimitBytes() {
|
|
28
|
+
const raw = Number(process.env.COMFYUI_LRU_CACHE_SIZE_GB ?? "0");
|
|
29
|
+
if (!Number.isFinite(raw) || raw <= 0)
|
|
30
|
+
return 0;
|
|
31
|
+
return raw * 1024 * 1024 * 1024;
|
|
32
|
+
}
|
|
33
|
+
function cachePathForUrl(url) {
|
|
34
|
+
const hash = createHash("sha256").update(url).digest("hex").slice(0, HASH_CHARS);
|
|
35
|
+
let extension = "";
|
|
36
|
+
try {
|
|
37
|
+
extension = extname(basename(new URL(url).pathname));
|
|
38
|
+
}
|
|
39
|
+
catch {
|
|
40
|
+
// Callers validate URLs before reaching this layer; keep the cache helper
|
|
41
|
+
// defensive so fallback direct downloads can still surface the real error.
|
|
42
|
+
}
|
|
43
|
+
return join(cacheDir(), `${hash}${extension}`);
|
|
44
|
+
}
|
|
45
|
+
async function touch(path) {
|
|
46
|
+
const now = new Date();
|
|
47
|
+
await downloadCacheFs.utimes(path, now, now);
|
|
48
|
+
}
|
|
49
|
+
async function streamUrlToFile(url, targetPath, headers, logUrl = redactUrlForLogs(url)) {
|
|
50
|
+
const res = await fetch(url, { headers });
|
|
51
|
+
if (!res.ok) {
|
|
52
|
+
throw new ModelError(`Download failed: ${res.status} ${res.statusText}`, { url: logUrl, status: res.status });
|
|
53
|
+
}
|
|
54
|
+
if (!res.body) {
|
|
55
|
+
throw new ModelError("Download response has no body", { url: logUrl });
|
|
56
|
+
}
|
|
57
|
+
const nodeStream = Readable.fromWeb(res.body);
|
|
58
|
+
const fileStream = createWriteStream(targetPath);
|
|
59
|
+
await pipeline(nodeStream, fileStream);
|
|
60
|
+
}
|
|
61
|
+
async function downloadIntoCache(url, headers, logUrl) {
|
|
62
|
+
const target = cachePathForUrl(url);
|
|
63
|
+
const key = target;
|
|
64
|
+
const existing = inflight.get(key);
|
|
65
|
+
if (existing)
|
|
66
|
+
return existing;
|
|
67
|
+
const promise = (async () => {
|
|
68
|
+
await downloadCacheFs.mkdir(cacheDir(), { recursive: true });
|
|
69
|
+
try {
|
|
70
|
+
const info = await downloadCacheFs.stat(target);
|
|
71
|
+
if (info.isFile()) {
|
|
72
|
+
await touch(target);
|
|
73
|
+
return target;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
catch {
|
|
77
|
+
// Cache miss.
|
|
78
|
+
}
|
|
79
|
+
const tmp = join(cacheDir(), `.${basename(target)}.${process.pid}.${randomUUID()}.tmp`);
|
|
80
|
+
try {
|
|
81
|
+
await streamUrlToFile(url, tmp, headers, logUrl);
|
|
82
|
+
await downloadCacheFs.rename(tmp, target);
|
|
83
|
+
await touch(target);
|
|
84
|
+
return target;
|
|
85
|
+
}
|
|
86
|
+
catch (err) {
|
|
87
|
+
await downloadCacheFs.rm(tmp, { force: true }).catch(() => undefined);
|
|
88
|
+
throw err;
|
|
89
|
+
}
|
|
90
|
+
})();
|
|
91
|
+
inflight.set(key, promise);
|
|
92
|
+
try {
|
|
93
|
+
return await promise;
|
|
94
|
+
}
|
|
95
|
+
finally {
|
|
96
|
+
inflight.delete(key);
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
async function materializeCacheFile(cachePath, targetPath) {
|
|
100
|
+
if (resolve(cachePath) === resolve(targetPath))
|
|
101
|
+
return "hardlink";
|
|
102
|
+
await downloadCacheFs.rm(targetPath, { force: true });
|
|
103
|
+
try {
|
|
104
|
+
await downloadCacheFs.link(cachePath, targetPath);
|
|
105
|
+
return "hardlink";
|
|
106
|
+
}
|
|
107
|
+
catch {
|
|
108
|
+
await downloadCacheFs.copyFile(cachePath, targetPath);
|
|
109
|
+
return "copy";
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
async function evictLruIfNeeded() {
|
|
113
|
+
const limit = cacheSizeLimitBytes();
|
|
114
|
+
if (limit <= 0)
|
|
115
|
+
return;
|
|
116
|
+
const dir = cacheDir();
|
|
117
|
+
const entries = await downloadCacheFs.readdir(dir, { withFileTypes: true });
|
|
118
|
+
const files = await Promise.all(entries
|
|
119
|
+
.filter((entry) => entry.isFile() && !entry.name.startsWith("."))
|
|
120
|
+
.map(async (entry) => {
|
|
121
|
+
const path = join(dir, entry.name);
|
|
122
|
+
const info = await downloadCacheFs.stat(path);
|
|
123
|
+
return {
|
|
124
|
+
path,
|
|
125
|
+
size: info.size,
|
|
126
|
+
time: Math.max(info.atimeMs, info.mtimeMs),
|
|
127
|
+
};
|
|
128
|
+
}));
|
|
129
|
+
let total = files.reduce((sum, file) => sum + file.size, 0);
|
|
130
|
+
if (total <= limit)
|
|
131
|
+
return;
|
|
132
|
+
files.sort((a, b) => a.time - b.time);
|
|
133
|
+
for (const file of files) {
|
|
134
|
+
await downloadCacheFs.rm(file.path, { force: true });
|
|
135
|
+
total -= file.size;
|
|
136
|
+
if (total <= limit)
|
|
137
|
+
break;
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
export async function downloadUrlToFile(url, targetPath, headers, logUrl) {
|
|
141
|
+
await streamUrlToFile(url, targetPath, headers, logUrl);
|
|
142
|
+
}
|
|
143
|
+
export async function downloadWithCache(options) {
|
|
144
|
+
const logUrl = options.logUrl ?? redactUrlForLogs(options.url);
|
|
145
|
+
try {
|
|
146
|
+
const cachePath = await downloadIntoCache(options.url, options.headers, logUrl);
|
|
147
|
+
const materializedBy = await materializeCacheFile(cachePath, options.targetPath);
|
|
148
|
+
await evictLruIfNeeded();
|
|
149
|
+
return {
|
|
150
|
+
targetPath: options.targetPath,
|
|
151
|
+
usedCache: true,
|
|
152
|
+
cachePath,
|
|
153
|
+
materializedBy,
|
|
154
|
+
};
|
|
155
|
+
}
|
|
156
|
+
catch (err) {
|
|
157
|
+
if (err instanceof ModelError)
|
|
158
|
+
throw err;
|
|
159
|
+
logger.warn("Download cache unavailable; falling back to direct download", {
|
|
160
|
+
url: logUrl,
|
|
161
|
+
error: err instanceof Error ? err.message : String(err),
|
|
162
|
+
});
|
|
163
|
+
await downloadUrlToFile(options.url, options.targetPath, options.headers, logUrl);
|
|
164
|
+
return { targetPath: options.targetPath, usedCache: false };
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
//# sourceMappingURL=download-cache.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"download-cache.js","sourceRoot":"","sources":["../../src/services/download-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,4 +44,18 @@ export declare function getOutputImage(filename: string, type?: "output" | "inpu
|
|
|
44
44
|
export declare function uploadImageAuto(sourcePath: string, filename?: string): Promise<{
|
|
45
45
|
filename: string;
|
|
46
46
|
}>;
|
|
47
|
+
export declare const uploadVideoAuto: (sourcePath: string, filename?: string) => Promise<{
|
|
48
|
+
filename: string;
|
|
49
|
+
}>;
|
|
50
|
+
export declare const uploadVideoLocal: (sourcePath: string, filename?: string) => Promise<{
|
|
51
|
+
filename: string;
|
|
52
|
+
path: string;
|
|
53
|
+
}>;
|
|
54
|
+
export declare const uploadAudioAuto: (sourcePath: string, filename?: string) => Promise<{
|
|
55
|
+
filename: string;
|
|
56
|
+
}>;
|
|
57
|
+
export declare const uploadAudioLocal: (sourcePath: string, filename?: string) => Promise<{
|
|
58
|
+
filename: string;
|
|
59
|
+
path: string;
|
|
60
|
+
}>;
|
|
47
61
|
//# sourceMappingURL=image-management.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image-management.d.ts","sourceRoot":"","sources":["../../src/services/image-management.ts"],"names":[],"mappings":"AAwBA;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAyB7C;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC,CAqCnF;AA2ED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,CAAC,EAAE;IAC/C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAuCzB;AAKD;;;GAGG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,QAAQ,GAAG,OAAO,GAAG,MAAiB,EAC5C,SAAS,SAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAGjE;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAmB/B"}
|
|
1
|
+
{"version":3,"file":"image-management.d.ts","sourceRoot":"","sources":["../../src/services/image-management.ts"],"names":[],"mappings":"AAwBA;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAyB7C;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC,CAqCnF;AA2ED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,CAAC,EAAE;IAC/C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAuCzB;AAKD;;;GAGG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,QAAQ,GAAG,OAAO,GAAG,MAAiB,EAC5C,SAAS,SAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAGjE;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAmB/B;AA8ED,eAAO,MAAM,eAAe,GAAI,YAAY,MAAM,EAAE,WAAW,MAAM;cA/B9C,MAAM;EAgC+B,CAAC;AAC7D,eAAO,MAAM,gBAAgB,GAAI,YAAY,MAAM,EAAE,WAAW,MAAM;cAlB/C,MAAM;UAAQ,MAAM;EAmBkB,CAAC;AAC9D,eAAO,MAAM,eAAe,GAAI,YAAY,MAAM,EAAE,WAAW,MAAM;cAnC9C,MAAM;EAoC+B,CAAC;AAC7D,eAAO,MAAM,gBAAgB,GAAI,YAAY,MAAM,EAAE,WAAW,MAAM;cAtB/C,MAAM;UAAQ,MAAM;EAuBkB,CAAC"}
|
|
@@ -211,4 +211,61 @@ export async function uploadImageAuto(sourcePath, filename) {
|
|
|
211
211
|
const result = await uploadImageHttp(resolvedFilename, data, mimeType);
|
|
212
212
|
return { filename: result.name };
|
|
213
213
|
}
|
|
214
|
+
// ---------------------------------------------------------------------------
|
|
215
|
+
// Video / audio upload — mirrors upload_image. ComfyUI's /upload/image endpoint
|
|
216
|
+
// (and the input/ directory) accept arbitrary media, which video/audio loader
|
|
217
|
+
// nodes (e.g. VHS_LoadVideo, LoadAudio) then read by filename.
|
|
218
|
+
// ---------------------------------------------------------------------------
|
|
219
|
+
const VIDEO_MIME = {
|
|
220
|
+
".mp4": "video/mp4",
|
|
221
|
+
".mov": "video/quicktime",
|
|
222
|
+
".webm": "video/webm",
|
|
223
|
+
".avi": "video/x-msvideo",
|
|
224
|
+
".mkv": "video/x-matroska",
|
|
225
|
+
".m4v": "video/x-m4v",
|
|
226
|
+
};
|
|
227
|
+
const AUDIO_MIME = {
|
|
228
|
+
".wav": "audio/wav",
|
|
229
|
+
".mp3": "audio/mpeg",
|
|
230
|
+
".flac": "audio/flac",
|
|
231
|
+
".ogg": "audio/ogg",
|
|
232
|
+
".m4a": "audio/mp4",
|
|
233
|
+
".aac": "audio/aac",
|
|
234
|
+
};
|
|
235
|
+
function resolveMediaMime(filename, mimeMap, kind) {
|
|
236
|
+
const ext = extname(filename).toLowerCase();
|
|
237
|
+
const mime = mimeMap[ext];
|
|
238
|
+
if (!mime) {
|
|
239
|
+
throw new ValidationError(`Unsupported ${kind} format "${ext}". Supported: ${Object.keys(mimeMap).join(", ")}`);
|
|
240
|
+
}
|
|
241
|
+
return mime;
|
|
242
|
+
}
|
|
243
|
+
/** HTTP multipart upload of a media file to ComfyUI's input/ (works remotely). */
|
|
244
|
+
async function uploadMediaHttp(sourcePath, filename, mimeMap, kind) {
|
|
245
|
+
const resolvedFilename = filename ?? basename(sourcePath);
|
|
246
|
+
const mimeType = resolveMediaMime(resolvedFilename, mimeMap, kind);
|
|
247
|
+
const data = await nodeReadFile(sourcePath);
|
|
248
|
+
logger.info(`Uploading ${kind} to ComfyUI via HTTP`, { sourcePath, resolvedFilename });
|
|
249
|
+
const result = await uploadImageHttp(resolvedFilename, data, mimeType);
|
|
250
|
+
return { filename: result.name };
|
|
251
|
+
}
|
|
252
|
+
/** Local filesystem copy of a media file into ComfyUI's input/ (needs COMFYUI_PATH). */
|
|
253
|
+
async function uploadMediaLocal(sourcePath, filename, mimeMap, kind) {
|
|
254
|
+
const inputDir = getInputDir();
|
|
255
|
+
const resolvedFilename = filename ?? basename(sourcePath);
|
|
256
|
+
resolveMediaMime(resolvedFilename, mimeMap, kind);
|
|
257
|
+
const targetPath = join(inputDir, resolvedFilename);
|
|
258
|
+
logger.info(`Uploading ${kind} to ComfyUI input`, { sourcePath, targetPath });
|
|
259
|
+
try {
|
|
260
|
+
await copyFile(sourcePath, targetPath);
|
|
261
|
+
}
|
|
262
|
+
catch (err) {
|
|
263
|
+
throw new ValidationError(`Failed to copy ${kind}: ${err instanceof Error ? err.message : err}`);
|
|
264
|
+
}
|
|
265
|
+
return { filename: resolvedFilename, path: targetPath };
|
|
266
|
+
}
|
|
267
|
+
export const uploadVideoAuto = (sourcePath, filename) => uploadMediaHttp(sourcePath, filename, VIDEO_MIME, "video");
|
|
268
|
+
export const uploadVideoLocal = (sourcePath, filename) => uploadMediaLocal(sourcePath, filename, VIDEO_MIME, "video");
|
|
269
|
+
export const uploadAudioAuto = (sourcePath, filename) => uploadMediaHttp(sourcePath, filename, AUDIO_MIME, "audio");
|
|
270
|
+
export const uploadAudioLocal = (sourcePath, filename) => uploadMediaLocal(sourcePath, filename, AUDIO_MIME, "audio");
|
|
214
271
|
//# sourceMappingURL=image-management.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image-management.js","sourceRoot":"","sources":["../../src/services/image-management.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"image-management.js","sourceRoot":"","sources":["../../src/services/image-management.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,eAAe,EAAc,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,SAAS,WAAW;IAClB,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,IAAI,eAAe,CACvB,4EAA4E,CAC7E,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,YAAY;IACnB,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,IAAI,eAAe,CACvB,4EAA4E,CAC7E,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;AAC5C,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,UAAkB,EAClB,QAAiB;IAEjB,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,gBAAgB,GAAG,QAAQ,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC;IAE1D,qBAAqB;IACrB,MAAM,GAAG,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,WAAW,EAAE,CAAC;IACpD,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACpF,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,eAAe,CACvB,6BAA6B,GAAG,iBAAiB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACtE,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;IACpD,MAAM,CAAC,IAAI,CAAC,kCAAkC,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC;IAE5E,IAAI,CAAC;QACH,MAAM,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,eAAe,CACvB,yBAAyB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CACpE,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;AAC1D,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,SAAiB;IAEjB,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC;IAC7C,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;QACnB,MAAM,IAAI,eAAe,CACvB,4FAA4F,CAC7F,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,CAAC;IACzC,MAAM,MAAM,GAA6E,EAAE,CAAC;IAE5F,6EAA6E;IAC7E,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAE1C,KAAK,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,MAAM,EAAE,CAAC;QACvC,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;YACzB,IAAI,CAAC;gBACH,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACnC,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC;aAAM,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC;YAClC,IAAI,CAAC;gBACH,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACrC,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACvC,MAAM,IAAI,eAAe,CACvB,iJAAiJ,CAClJ,CAAC;IACJ,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAOD;;;GAGG;AACH,SAAS,kBAAkB,CAAC,MAAc;IACxC,MAAM,OAAO,GAAmB,EAAE,CAAC;IAEnC,uBAAuB;IACvB,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAC/D,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QAChE,MAAM,IAAI,eAAe,CAAC,sBAAsB,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,MAAM,GAAG,CAAC,CAAC,CAAC,iBAAiB;IAEjC,OAAO,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QACnC,MAAM,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC5E,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,CAAC;QAC7B,MAAM,OAAO,GAAG,SAAS,GAAG,WAAW,CAAC;QAExC,IAAI,OAAO,GAAG,MAAM,CAAC,MAAM;YAAE,MAAM;QAEnC,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;YACzB,sBAAsB;YACtB,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACjD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAChC,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC;gBACjB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBAC7D,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBAC3D,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;aAAM,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;YAChC,0FAA0F;YAC1F,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACjD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAChC,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC;gBACjB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBAC5D,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;gBAC1C,qEAAqE;gBACrE,IAAI,SAAS,GAAG,OAAO,GAAG,CAAC,CAAC,CAAC,gDAAgD;gBAC7E,sCAAsC;gBACtC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;gBAC3C,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC;oBACjB,SAAS,GAAG,OAAO,GAAG,CAAC,CAAC;oBACxB,4CAA4C;oBAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;oBAC5C,IAAI,QAAQ,IAAI,CAAC,EAAE,CAAC;wBAClB,SAAS,GAAG,QAAQ,GAAG,CAAC,CAAC;oBAC3B,CAAC;gBACH,CAAC;gBACD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBAC1C,IAAI,eAAe,KAAK,CAAC,EAAE,CAAC;oBAC1B,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBAC9D,CAAC;gBACD,uEAAuE;YACzE,CAAC;QACH,CAAC;QAED,IAAI,SAAS,KAAK,MAAM;YAAE,MAAM;QAEhC,+DAA+D;QAC/D,MAAM,GAAG,OAAO,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AASD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAGtC;IACC,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;IACjC,MAAM,KAAK,GAAG,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC;IACnC,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IAEhD,IAAI,OAAiB,CAAC;IACtB,IAAI,CAAC;QACH,OAAO,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,CAAC;IACrC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAkB,EAAE,CAAC;IAEjC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;QACzC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,SAAS;QAClC,IAAI,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;YAAE,SAAS;QAEhE,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QACxC,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC;YAClC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBAAE,SAAS;YAC7B,MAAM,CAAC,IAAI,CAAC;gBACV,QAAQ,EAAE,KAAK;gBACf,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;aACnC,CAAC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;IACH,CAAC;IAED,oBAAoB;IACpB,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE5D,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;AAChC,CAAC;AAED,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE5D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,QAAgB,EAChB,OAAoC,QAAQ,EAC5C,SAAS,GAAG,EAAE;IAEd,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IAC3D,OAAO,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,CAAC;AACjC,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,UAAkB,EAClB,QAAiB;IAEjB,MAAM,gBAAgB,GAAG,QAAQ,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,WAAW,EAAE,CAAC;IACpD,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACpF,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,eAAe,CACvB,6BAA6B,GAAG,iBAAiB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACtE,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,UAAU,CAAC,CAAC;IAC5C,MAAM,OAAO,GAA2B;QACtC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,YAAY;QAChE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW;QAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY;KAC5C,CAAC;IACF,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,0BAA0B,CAAC;IAC5D,MAAM,CAAC,IAAI,CAAC,qCAAqC,EAAE,EAAE,UAAU,EAAE,gBAAgB,EAAE,CAAC,CAAC;IACrF,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,gBAAgB,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IACvE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;AACnC,CAAC;AAED,8EAA8E;AAC9E,gFAAgF;AAChF,8EAA8E;AAC9E,+DAA+D;AAC/D,8EAA8E;AAE9E,MAAM,UAAU,GAA2B;IACzC,MAAM,EAAE,WAAW;IACnB,MAAM,EAAE,iBAAiB;IACzB,OAAO,EAAE,YAAY;IACrB,MAAM,EAAE,iBAAiB;IACzB,MAAM,EAAE,kBAAkB;IAC1B,MAAM,EAAE,aAAa;CACtB,CAAC;AAEF,MAAM,UAAU,GAA2B;IACzC,MAAM,EAAE,WAAW;IACnB,MAAM,EAAE,YAAY;IACpB,OAAO,EAAE,YAAY;IACrB,MAAM,EAAE,WAAW;IACnB,MAAM,EAAE,WAAW;IACnB,MAAM,EAAE,WAAW;CACpB,CAAC;AAEF,SAAS,gBAAgB,CACvB,QAAgB,EAChB,OAA+B,EAC/B,IAAuB;IAEvB,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;IAC5C,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1B,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,eAAe,CACvB,eAAe,IAAI,YAAY,GAAG,iBAAiB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACrF,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,kFAAkF;AAClF,KAAK,UAAU,eAAe,CAC5B,UAAkB,EAClB,QAA4B,EAC5B,OAA+B,EAC/B,IAAuB;IAEvB,MAAM,gBAAgB,GAAG,QAAQ,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,gBAAgB,CAAC,gBAAgB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACnE,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,UAAU,CAAC,CAAC;IAC5C,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,sBAAsB,EAAE,EAAE,UAAU,EAAE,gBAAgB,EAAE,CAAC,CAAC;IACvF,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,gBAAgB,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IACvE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;AACnC,CAAC;AAED,wFAAwF;AACxF,KAAK,UAAU,gBAAgB,CAC7B,UAAkB,EAClB,QAA4B,EAC5B,OAA+B,EAC/B,IAAuB;IAEvB,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,gBAAgB,GAAG,QAAQ,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC1D,gBAAgB,CAAC,gBAAgB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAClD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;IACpD,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,mBAAmB,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC;IAC9E,IAAI,CAAC;QACH,MAAM,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,eAAe,CACvB,kBAAkB,IAAI,KAAK,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CACtE,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;AAC1D,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,UAAkB,EAAE,QAAiB,EAAE,EAAE,CACvE,eAAe,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;AAC7D,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,UAAkB,EAAE,QAAiB,EAAE,EAAE,CACxE,gBAAgB,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;AAC9D,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,UAAkB,EAAE,QAAiB,EAAE,EAAE,CACvE,eAAe,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;AAC7D,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,UAAkB,EAAE,QAAiB,EAAE,EAAE,CACxE,gBAAgB,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import type { HistoryEntry } from "../comfyui/client.js";
|
|
2
|
+
export declare const TRACEBACK_MAX_CHARS = 2000;
|
|
3
|
+
export interface ExecutionErrorDetails {
|
|
4
|
+
node_id: string;
|
|
5
|
+
node_type: string;
|
|
6
|
+
exception_message: string;
|
|
7
|
+
exception_type?: string;
|
|
8
|
+
traceback?: string;
|
|
9
|
+
traceback_truncated?: boolean;
|
|
10
|
+
current_inputs?: unknown;
|
|
11
|
+
is_oom?: boolean;
|
|
12
|
+
}
|
|
13
|
+
export interface ExecutionStats {
|
|
14
|
+
total_duration_ms?: number;
|
|
15
|
+
nodes: Record<string, {
|
|
16
|
+
duration_ms: number;
|
|
17
|
+
}>;
|
|
18
|
+
}
|
|
19
|
+
export interface HistoryAnalysis {
|
|
20
|
+
error?: ExecutionErrorDetails;
|
|
21
|
+
execution_stats?: ExecutionStats;
|
|
22
|
+
}
|
|
23
|
+
export type HistoryStatusMessage = readonly [string, Record<string, unknown>];
|
|
24
|
+
export declare function normalizeHistoryMessages(entry: HistoryEntry): HistoryStatusMessage[];
|
|
25
|
+
export declare function extractExecutionError(entry: HistoryEntry): ExecutionErrorDetails | undefined;
|
|
26
|
+
export declare function extractExecutionStats(entry: HistoryEntry): ExecutionStats | undefined;
|
|
27
|
+
export declare function analyzeHistoryEntry(entry: HistoryEntry): HistoryAnalysis;
|
|
28
|
+
//# sourceMappingURL=job-history.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"job-history.d.ts","sourceRoot":"","sources":["../../src/services/job-history.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAExC,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAChD;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,EAAE,qBAAqB,CAAC;IAC9B,eAAe,CAAC,EAAE,cAAc,CAAC;CAClC;AAED,MAAM,MAAM,oBAAoB,GAAG,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAW9E,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,YAAY,GAClB,oBAAoB,EAAE,CAaxB;AAmDD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,GAClB,qBAAqB,GAAG,SAAS,CAmBnC;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,GAClB,cAAc,GAAG,SAAS,CAqC5B;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,YAAY,GAAG,eAAe,CAKxE"}
|
|
@@ -0,0 +1,130 @@
|
|
|
1
|
+
import { z } from "zod";
|
|
2
|
+
export const TRACEBACK_MAX_CHARS = 2000;
|
|
3
|
+
const executionErrorSchema = z.object({
|
|
4
|
+
node_id: z.union([z.string(), z.number()]).optional(),
|
|
5
|
+
node_type: z.string().optional(),
|
|
6
|
+
exception_message: z.string().optional(),
|
|
7
|
+
exception_type: z.string().optional(),
|
|
8
|
+
traceback: z.union([z.string(), z.array(z.string())]).optional(),
|
|
9
|
+
current_inputs: z.unknown().optional(),
|
|
10
|
+
}).passthrough();
|
|
11
|
+
export function normalizeHistoryMessages(entry) {
|
|
12
|
+
const rawMessages = entry.status.messages;
|
|
13
|
+
if (!Array.isArray(rawMessages))
|
|
14
|
+
return [];
|
|
15
|
+
const messages = [];
|
|
16
|
+
for (const rawMessage of rawMessages) {
|
|
17
|
+
if (!Array.isArray(rawMessage) || rawMessage.length < 2)
|
|
18
|
+
continue;
|
|
19
|
+
const [type, data] = rawMessage;
|
|
20
|
+
if (typeof type !== "string")
|
|
21
|
+
continue;
|
|
22
|
+
if (data === null || typeof data !== "object" || Array.isArray(data))
|
|
23
|
+
continue;
|
|
24
|
+
messages.push([type, data]);
|
|
25
|
+
}
|
|
26
|
+
return messages;
|
|
27
|
+
}
|
|
28
|
+
function messageData(entry, type) {
|
|
29
|
+
const msg = normalizeHistoryMessages(entry).find((m) => m[0] === type);
|
|
30
|
+
return msg?.[1];
|
|
31
|
+
}
|
|
32
|
+
function timestamp(data) {
|
|
33
|
+
const raw = data?.timestamp;
|
|
34
|
+
return typeof raw === "number" && Number.isFinite(raw) ? raw : undefined;
|
|
35
|
+
}
|
|
36
|
+
function durationMs(start, end) {
|
|
37
|
+
const delta = end - start;
|
|
38
|
+
if (!Number.isFinite(delta) || delta < 0)
|
|
39
|
+
return undefined;
|
|
40
|
+
// ComfyUI history commonly uses epoch seconds; some websocket/event docs use
|
|
41
|
+
// epoch milliseconds. Infer the unit from absolute magnitude, then fall back
|
|
42
|
+
// to seconds for short relative durations.
|
|
43
|
+
if (start > 1_000_000_000_000 || end > 1_000_000_000_000) {
|
|
44
|
+
return Math.round(delta);
|
|
45
|
+
}
|
|
46
|
+
if (start > 1_000_000_000 || end > 1_000_000_000 || delta < 1000) {
|
|
47
|
+
return Math.round(delta * 1000);
|
|
48
|
+
}
|
|
49
|
+
return Math.round(delta);
|
|
50
|
+
}
|
|
51
|
+
function tracebackText(value) {
|
|
52
|
+
if (typeof value === "string")
|
|
53
|
+
return value;
|
|
54
|
+
if (Array.isArray(value))
|
|
55
|
+
return value.map((line) => String(line)).join("");
|
|
56
|
+
return undefined;
|
|
57
|
+
}
|
|
58
|
+
function truncateTraceback(text) {
|
|
59
|
+
if (text.length <= TRACEBACK_MAX_CHARS)
|
|
60
|
+
return { text, truncated: false };
|
|
61
|
+
return { text: text.slice(0, TRACEBACK_MAX_CHARS), truncated: true };
|
|
62
|
+
}
|
|
63
|
+
function isOomError(error) {
|
|
64
|
+
const haystack = [
|
|
65
|
+
error.exception_type,
|
|
66
|
+
error.exception_message,
|
|
67
|
+
error.traceback,
|
|
68
|
+
].filter(Boolean).join("\n").toLowerCase();
|
|
69
|
+
return haystack.includes("out of memory") || haystack.includes("cuda oom");
|
|
70
|
+
}
|
|
71
|
+
export function extractExecutionError(entry) {
|
|
72
|
+
const parsed = executionErrorSchema.safeParse(messageData(entry, "execution_error"));
|
|
73
|
+
if (!parsed.success)
|
|
74
|
+
return undefined;
|
|
75
|
+
const data = parsed.data;
|
|
76
|
+
const rawTraceback = tracebackText(data.traceback);
|
|
77
|
+
const traceback = rawTraceback ? truncateTraceback(rawTraceback) : undefined;
|
|
78
|
+
const error = {
|
|
79
|
+
node_id: data.node_id === undefined ? "" : String(data.node_id),
|
|
80
|
+
node_type: data.node_type ?? "",
|
|
81
|
+
exception_message: data.exception_message ?? "",
|
|
82
|
+
exception_type: data.exception_type,
|
|
83
|
+
traceback: traceback?.text,
|
|
84
|
+
traceback_truncated: traceback?.truncated || undefined,
|
|
85
|
+
current_inputs: data.current_inputs,
|
|
86
|
+
};
|
|
87
|
+
if (isOomError(error))
|
|
88
|
+
error.is_oom = true;
|
|
89
|
+
return error;
|
|
90
|
+
}
|
|
91
|
+
export function extractExecutionStats(entry) {
|
|
92
|
+
const messages = normalizeHistoryMessages(entry);
|
|
93
|
+
const startTs = timestamp(messageData(entry, "execution_start"));
|
|
94
|
+
const endMsg = messages.find((m) => m[0] === "execution_success" || m[0] === "execution_error");
|
|
95
|
+
const endTs = timestamp(endMsg?.[1]);
|
|
96
|
+
const nodes = {};
|
|
97
|
+
let previousTs = startTs;
|
|
98
|
+
for (const [type, data] of messages) {
|
|
99
|
+
if (type !== "executed")
|
|
100
|
+
continue;
|
|
101
|
+
const executedTs = timestamp(data);
|
|
102
|
+
const nodeId = data.node ?? data.node_id ?? data.display_node;
|
|
103
|
+
if (executedTs === undefined || nodeId === undefined)
|
|
104
|
+
continue;
|
|
105
|
+
if (previousTs !== undefined) {
|
|
106
|
+
const nodeDuration = durationMs(previousTs, executedTs);
|
|
107
|
+
if (nodeDuration !== undefined) {
|
|
108
|
+
nodes[String(nodeId)] = { duration_ms: nodeDuration };
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
previousTs = executedTs;
|
|
112
|
+
}
|
|
113
|
+
const totalDuration = startTs !== undefined && endTs !== undefined
|
|
114
|
+
? durationMs(startTs, endTs)
|
|
115
|
+
: undefined;
|
|
116
|
+
if (totalDuration === undefined && Object.keys(nodes).length === 0) {
|
|
117
|
+
return undefined;
|
|
118
|
+
}
|
|
119
|
+
return {
|
|
120
|
+
total_duration_ms: totalDuration,
|
|
121
|
+
nodes,
|
|
122
|
+
};
|
|
123
|
+
}
|
|
124
|
+
export function analyzeHistoryEntry(entry) {
|
|
125
|
+
return {
|
|
126
|
+
error: extractExecutionError(entry),
|
|
127
|
+
execution_stats: extractExecutionStats(entry),
|
|
128
|
+
};
|
|
129
|
+
}
|
|
130
|
+
//# sourceMappingURL=job-history.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"job-history.js","sourceRoot":"","sources":["../../src/services/job-history.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import { type HistoryEntry } from "../comfyui/client.js";
|
|
1
2
|
import type { WorkflowJSON } from "../comfyui/types.js";
|
|
3
|
+
import { type ExecutionStats } from "./job-history.js";
|
|
2
4
|
export interface CompletionNotification {
|
|
3
5
|
prompt_id: string;
|
|
4
6
|
status: "success" | "error" | "interrupted";
|
|
@@ -8,7 +10,11 @@ export interface CompletionNotification {
|
|
|
8
10
|
node_id: string;
|
|
9
11
|
node_type: string;
|
|
10
12
|
exception_message: string;
|
|
13
|
+
exception_type?: string;
|
|
11
14
|
traceback?: string;
|
|
15
|
+
traceback_truncated?: boolean;
|
|
16
|
+
current_inputs?: unknown;
|
|
17
|
+
is_oom?: boolean;
|
|
12
18
|
};
|
|
13
19
|
outputs: Array<{
|
|
14
20
|
node_id: string;
|
|
@@ -21,7 +27,9 @@ export interface CompletionNotification {
|
|
|
21
27
|
}>;
|
|
22
28
|
}>;
|
|
23
29
|
cached_nodes: string[];
|
|
30
|
+
execution_stats?: ExecutionStats;
|
|
24
31
|
}
|
|
32
|
+
export declare function buildCompletionNotification(promptId: string, entry: HistoryEntry, startTime: number): CompletionNotification;
|
|
25
33
|
export declare const JobWatcher: {
|
|
26
34
|
/**
|
|
27
35
|
* Start monitoring a prompt_id for completion via WS + polling dual-track.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job-watcher.d.ts","sourceRoot":"","sources":["../../src/services/job-watcher.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"job-watcher.d.ts","sourceRoot":"","sources":["../../src/services/job-watcher.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,KAAK,YAAY,EAClB,MAAM,sBAAsB,CAAC;AAK9B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAGL,KAAK,cAAc,EAEpB,MAAM,kBAAkB,CAAC;AAI1B,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,SAAS,GAAG,OAAO,GAAG,aAAa,CAAC;IAC5C,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE;QACN,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,mBAAmB,CAAC,EAAE,OAAO,CAAC;QAC9B,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,CAAC;IACF,OAAO,EAAE,KAAK,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,KAAK,CAAC;YACZ,QAAQ,EAAE,MAAM,CAAC;YACjB,SAAS,EAAE,MAAM,CAAC;YAClB,IAAI,EAAE,MAAM,CAAC;YACb,GAAG,EAAE,MAAM,CAAC;YACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;SACnB,CAAC,CAAC;KACJ,CAAC,CAAC;IACH,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,eAAe,CAAC,EAAE,cAAc,CAAC;CAClC;AA4CD,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,MAAM,GAChB,sBAAsB,CAyExB;AA6HD,eAAO,MAAM,UAAU;IACrB;;;;OAIG;oBACa,MAAM,aAAa,YAAY,GAAG,IAAI;IA4GtD;;OAEG;sBACe,MAAM,GAAG,IAAI;IAS/B;;OAEG;kBACW,MAAM,EAAE;IAItB;;OAEG;uBACsB,OAAO,CAAC,IAAI,CAAC;IA4BtC,oCAAoC;;CAIrC,CAAC"}
|
|
@@ -6,6 +6,7 @@ import { getComfyUIApiHost, getComfyUIProtocol } from "../config.js";
|
|
|
6
6
|
import { attachExecutionListeners } from "../comfyui/events.js";
|
|
7
7
|
import { logger } from "../utils/logger.js";
|
|
8
8
|
import { AssetRegistry } from "./asset-registry.js";
|
|
9
|
+
import { analyzeHistoryEntry, normalizeHistoryMessages, } from "./job-history.js";
|
|
9
10
|
// ── Constants ──────────────────────────────────────────────────────────
|
|
10
11
|
const COMPLETIONS_DIR = join(tmpdir(), "comfyui-mcp-completions");
|
|
11
12
|
const POLL_INTERVAL_MS = 2000;
|
|
@@ -26,16 +27,18 @@ function buildImageUrl(filename, subfolder, type) {
|
|
|
26
27
|
const params = new URLSearchParams({ filename, subfolder, type });
|
|
27
28
|
return `${getComfyUIProtocol()}://${host}/view?${params.toString()}`;
|
|
28
29
|
}
|
|
29
|
-
function
|
|
30
|
-
const messages = entry
|
|
30
|
+
export function buildCompletionNotification(promptId, entry, startTime) {
|
|
31
|
+
const messages = normalizeHistoryMessages(entry);
|
|
32
|
+
const analysis = analyzeHistoryEntry(entry);
|
|
31
33
|
// Timing
|
|
32
34
|
const startMsg = messages.find((m) => m[0] === "execution_start");
|
|
33
35
|
const endMsg = messages.find((m) => m[0] === "execution_success" || m[0] === "execution_error");
|
|
34
36
|
const startTs = startMsg?.[1]?.timestamp;
|
|
35
37
|
const endTs = endMsg?.[1]?.timestamp;
|
|
36
|
-
const durationMs =
|
|
37
|
-
|
|
38
|
-
|
|
38
|
+
const durationMs = analysis.execution_stats?.total_duration_ms ??
|
|
39
|
+
(startTs && endTs
|
|
40
|
+
? (endTs - startTs) * 1000 // ComfyUI timestamps are seconds
|
|
41
|
+
: Date.now() - startTime);
|
|
39
42
|
// Status
|
|
40
43
|
const errorMsg = messages.find((m) => m[0] === "execution_error");
|
|
41
44
|
const interruptMsg = messages.find((m) => m[0] === "execution_interrupted");
|
|
@@ -45,22 +48,14 @@ function buildNotification(promptId, entry, startTime) {
|
|
|
45
48
|
else if (interruptMsg)
|
|
46
49
|
status = "interrupted";
|
|
47
50
|
// Error details
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
error = {
|
|
52
|
-
node_id: d.node_id ?? "",
|
|
53
|
-
node_type: d.node_type ?? "",
|
|
54
|
-
exception_message: d.exception_message ?? "",
|
|
55
|
-
traceback: Array.isArray(d.traceback)
|
|
56
|
-
? d.traceback.join("")
|
|
57
|
-
: undefined,
|
|
58
|
-
};
|
|
59
|
-
}
|
|
51
|
+
const error = errorMsg
|
|
52
|
+
? analysis.error
|
|
53
|
+
: undefined;
|
|
60
54
|
// Cached nodes
|
|
61
55
|
const cachedMsg = messages.find((m) => m[0] === "execution_cached");
|
|
62
|
-
const
|
|
63
|
-
|
|
56
|
+
const cachedNodesRaw = cachedMsg?.[1].nodes;
|
|
57
|
+
const cachedNodes = Array.isArray(cachedNodesRaw)
|
|
58
|
+
? cachedNodesRaw.map((node) => String(node))
|
|
64
59
|
: [];
|
|
65
60
|
// Output images
|
|
66
61
|
const outputs = [];
|
|
@@ -86,6 +81,7 @@ function buildNotification(promptId, entry, startTime) {
|
|
|
86
81
|
error,
|
|
87
82
|
outputs,
|
|
88
83
|
cached_nodes: cachedNodes,
|
|
84
|
+
execution_stats: analysis.execution_stats,
|
|
89
85
|
};
|
|
90
86
|
}
|
|
91
87
|
async function handleCompletion(promptId, state, detectedBy) {
|
|
@@ -127,7 +123,7 @@ async function handleCompletion(promptId, state, detectedBy) {
|
|
|
127
123
|
}
|
|
128
124
|
// Build and write notification
|
|
129
125
|
try {
|
|
130
|
-
const notification =
|
|
126
|
+
const notification = buildCompletionNotification(promptId, entry, state.startTime);
|
|
131
127
|
// Register outputs with the AssetRegistry so they can be referenced by
|
|
132
128
|
// asset_id for view_image / regenerate. Only register on successful
|
|
133
129
|
// completion with a stored workflow snapshot.
|