@nodetool-ai/runtime 0.7.0-rc.23 → 0.8.2

package/dist/blender-executor.js

@@ -0,0 +1,294 @@
+/**
+ * Blender worker executor — runs a `BlenderJob` on a GPU worker over the
+ * Python bridge, the transport half of Stage 4a (D6).
+ *
+ * This is the worker-tier counterpart of `LocalBlenderRunner` in
+ * `@nodetool-ai/blender-nodes` (which this package must not import — the
+ * dependency runs the other way, so the job travels here as a structural
+ * type). `WorkerBlenderRunner` (Stage 4b) wraps this function behind the
+ * `BlenderRunner` interface; nodes never call it directly.
+ *
+ * Contract, mirroring the local tier step for step (D6):
+ *
+ *  - inputs travel as bridge blobs: the request carries the verbatim `job`,
+ *    an `inputs` manifest mapping each logical input name to its blob key,
+ *    the input bytes under those keys, and a worker-side `timeout`.
+ *  - outputs come back as bridge blobs on the terminal `result` frame.
+ *  - the same output caps apply as on the local tier, enforced from the
+ *    worker's declared `sizes` BEFORE any blob bytes are consumed — and
+ *    re-checked against the actual byte lengths, so a lying worker cannot
+ *    bypass them either way.
+ *  - a name in the worker's result that the job did not declare is ignored
+ *    and logged at warn, exactly as `LocalBlenderRunner` does.
+ *  - `blender.event` progress frames become `onProgress(frame, total)` calls.
+ *  - the run is abortable through an `AbortSignal`: aborting sends the
+ *    worker a `cancel` frame for this exact request (it does not just abandon
+ *    the local promise) and rejects with the signal's reason, unwrapped —
+ *    the same way the local tier rejects with the abort reason.
+ *
+ * Error codes are the local tier's codes verbatim (`render_failed`,
+ * `missing_output`, `output_too_large`, `bad_job`, `bad_result`, …): the
+ * worker's op failure (`ok: false`) preserves its code, and a transport or
+ * malformed-result failure is `bad_result`, the way a crashed Blender is.
+ * Stage 4b maps these into `BlenderJobError`; this module cannot throw that
+ * class itself without a dependency cycle.
+ */
+import { randomUUID } from "node:crypto";
+import { createLogger } from "@nodetool-ai/config";
+import { isNumber, isString } from "@nodetool-ai/protocol";
+const log = createLogger("runtime:blender-executor");
+/**
+ * Worker-tier Blender failure. `code` is the local tier's code for the same
+ * case, so Stage 4b can map it one-to-one into `BlenderJobError`.
+ */
+export class BlenderExecutorError extends Error {
+    code;
+    constructor(code, message) {
+        super(message);
+        this.name = "BlenderExecutorError";
+        this.code = code;
+    }
+}
+/**
+ * Run one Blender job on a worker bridge and collect its outputs.
+ *
+ * Route only to a bridge whose {@link PythonBridge.supportsBlender} is true —
+ * an older worker answers `blender.execute` with `Unknown message type`,
+ * which surfaces here as `bad_result`.
+ */
+export async function executeBlender(bridge, job, inputs, options) {
+    const { timeoutMs, signal, onProgress, maxOutputBytes, maxTotalOutputBytes, extraBlobs } = options;
+    // Mirror the local tier: an input the job did not declare is `bad_job`
+    // before anything is sent.
+    for (const name of Object.keys(inputs)) {
+        if (!(name in job.inputs)) {
+            throw new BlenderExecutorError("bad_job", `Input "${name}" is not declared in job.inputs.`);
+        }
+    }
+    // The blob key for an input is its logical name: unambiguous, and the
+    // manifest still declares the mapping for workers that stage by key.
+    const manifest = {};
+    const blobs = {};
+    for (const [name, bytes] of Object.entries(inputs)) {
+        manifest[name] = name;
+        blobs[name] = bytes;
+    }
+    for (const [key, bytes] of Object.entries(extraBlobs ?? {})) {
+        if (key in blobs) {
+            throw new BlenderExecutorError("bad_job", `Additional Blender blob "${key}" conflicts with a declared input.`);
+        }
+        blobs[key] = bytes;
+    }
+    const requestId = randomUUID();
+    const timeout = Math.max(1, Math.ceil(timeoutMs / 1000));
+    return new Promise((resolve, reject) => {
+        let settled = false;
+        let timeoutHandle;
+        const cleanup = () => {
+            if (signal && abortHandler) {
+                signal.removeEventListener("abort", abortHandler);
+            }
+            if (timeoutHandle !== undefined) {
+                clearTimeout(timeoutHandle);
+                timeoutHandle = undefined;
+            }
+        };
+        const cancel = () => {
+            try {
+                bridge.cancelBlenderExecute(requestId);
+            }
+            catch {
+                // Worker may already be gone; cancel is best-effort.
+            }
+        };
+        const abortHandler = () => {
+            if (settled)
+                return;
+            settled = true;
+            cleanup();
+            // The abort reaches the worker: without the cancel frame the Blender
+            // process would keep rendering a run nobody reads.
+            cancel();
+            // Unwrapped, the way the local tier rejects with the abort reason.
+            reject(signal?.reason ??
+                new Error(`Blender execution "${requestId}" was aborted.`));
+        };
+        const timeoutHandler = () => {
+            if (settled)
+                return;
+            settled = true;
+            cleanup();
+            // The worker receives its own timeout, but the transport promise must
+            // also have a local deadline in case the worker stops responding.
+            cancel();
+            reject(new BlenderExecutorError("timeout", `Blender render timed out after ${timeoutMs}ms. ` +
+                "The worker did not complete the request in time."));
+        };
+        if (signal?.aborted) {
+            abortHandler();
+            return;
+        }
+        if (signal) {
+            signal.addEventListener("abort", abortHandler, { once: true });
+        }
+        timeoutHandle = setTimeout(timeoutHandler, Math.max(1, timeoutMs));
+        Promise.resolve()
+            .then(() => {
+            // An abort can fire after executeBlender returns but before this
+            // microtask dispatches the bridge request.
+            if (settled) {
+                throw signal?.reason ?? new Error("Blender execution was aborted.");
+            }
+            return bridge.blenderExecute(job, manifest, { blobs, timeout }, (event) => {
+                if (event.event === "progress" &&
+                    onProgress &&
+                    isNumber(event.frame) &&
+                    isNumber(event.total)) {
+                    onProgress(event.frame, event.total);
+                }
+            }, requestId);
+        })
+            .then((result) => {
+            if (settled)
+                return;
+            settled = true;
+            cleanup();
+            try {
+                resolve(collectBlenderOutputs(job, result, {
+                    maxOutputBytes,
+                    maxTotalOutputBytes
+                }));
+            }
+            catch (err) {
+                reject(err);
+            }
+        }, (err) => {
+            if (settled)
+                return;
+            settled = true;
+            cleanup();
+            // A terminal `error` frame (worker crash, unknown message type) is
+            // `bad_result`, the way a crashed Blender with no result.json is.
+            reject(new BlenderExecutorError("bad_result", messageOf(err)));
+        });
+    });
+}
+/**
+ * An `ok: false` result. The op's `{code, message}` passes through verbatim;
+ * whatever the worker did send survives into the message, so a frame with
+ * only a code, or an `error` that is a bare string, is not flattened to a
+ * generic "no payload" text.
+ */
+function failureError(result) {
+    const raw = result.error;
+    if (isString(raw)) {
+        return new BlenderExecutorError("bad_result", raw);
+    }
+    const error = raw != null && typeof raw === "object" ? raw : {};
+    const code = error.code;
+    const message = error.message;
+    if (isString(message) && message !== "") {
+        return new BlenderExecutorError(isString(code) && code !== "" ? code : "bad_result", message);
+    }
+    if (isString(code) && code !== "") {
+        return new BlenderExecutorError(code, `Blender worker failed with code "${code}" and no message.`);
+    }
+    return new BlenderExecutorError("bad_result", "Blender worker reported failure without an error payload " +
+        `(fields: ${Object.keys(result).join(", ") || "none"}).`);
+}
+function messageOf(err) {
+    return err instanceof Error ? err.message : String(err);
+}
+/**
+ * Turn the terminal `result` into outputs, enforcing the local tier's step 5.
+ * A name the job did not declare is ignored at warn; a declared output that
+ * is missing, or above either cap, throws the local tier's code with the
+ * local tier's message shape.
+ */
+function collectBlenderOutputs(job, result, caps) {
+    const { maxOutputBytes, maxTotalOutputBytes } = caps;
+    // The bridge delivers blobs inline in the terminal frame, so "before
+    // transfer" means before any blob entry is consumed: the declared-size
+    // pass below throws before a single output byte is read.
+    if (!result.ok) {
+        throw failureError(result);
+    }
+    if (!Array.isArray(result.produced)) {
+        throw new BlenderExecutorError("bad_result", "Blender worker returned ok without a produced list " +
+            `(fields: ${Object.keys(result).join(", ") || "none"}).`);
+    }
+    const stats = readStats(result.stats);
+    const declared = Object.entries(job.outputs);
+    const produced = new Set(result.produced);
+    for (const name of result.produced) {
+        if (!(name in job.outputs)) {
+            log.warn(`Blender produced undeclared output "${name}"; ignoring.`);
+        }
+    }
+    // Declared sizes first: refuse an oversize result without pulling blob
+    // bytes into the outputs record. Entries without a usable declared size
+    // fall through to the actual-length check below.
+    let declaredTotal = 0;
+    for (const [name] of declared) {
+        if (!produced.has(name)) {
+            throw new BlenderExecutorError("missing_output", `Blender did not produce declared output "${name}" (file "${job.outputs[name]}").`);
+        }
+        const size = result.sizes?.[name];
+        if (isNumber(size) && size >= 0) {
+            if (size > maxOutputBytes) {
+                throw new BlenderExecutorError("output_too_large", `Output "${name}" is ${size} bytes, above the ${maxOutputBytes}-byte per-output cap.`);
+            }
+            declaredTotal += size;
+            if (declaredTotal > maxTotalOutputBytes) {
+                throw new BlenderExecutorError("output_too_large", `Outputs total ${declaredTotal} bytes, above the ${maxTotalOutputBytes}-byte total cap (reached at "${name}").`);
+            }
+        }
+    }
+    // Then the bytes themselves: a missing blob, a non-bytes entry, or an
+    // actual length above either cap fails the same way, so a worker that
+    // lies in `sizes` gains nothing.
+    const outputs = {};
+    let actualTotal = 0;
+    for (const [name] of declared) {
+        const raw = result.blobs?.[name];
+        if (!(raw instanceof Uint8Array)) {
+            throw new BlenderExecutorError("missing_output", `Blender worker returned no bytes for declared output "${name}".`);
+        }
+        if (raw.byteLength > maxOutputBytes) {
+            throw new BlenderExecutorError("output_too_large", `Output "${name}" is ${raw.byteLength} bytes, above the ${maxOutputBytes}-byte per-output cap.`);
+        }
+        actualTotal += raw.byteLength;
+        if (actualTotal > maxTotalOutputBytes) {
+            throw new BlenderExecutorError("output_too_large", `Outputs total ${actualTotal} bytes, above the ${maxTotalOutputBytes}-byte total cap (reached at "${name}").`);
+        }
+        // Normalize to a plain Uint8Array: the bridge codec hands back Buffers
+        // on Node, and the local tier wraps its reads the same way, so both
+        // tiers hand callers the same type.
+        outputs[name] = new Uint8Array(raw);
+    }
+    return { outputs, stats };
+}
+/** Narrow the worker's stats record to the local tier's stats shape. */
+function readStats(stats) {
+    if (!stats ||
+        !isString(stats["blender_version"]) ||
+        !isNumber(stats["render_seconds"])) {
+        throw new BlenderExecutorError("bad_result", "Blender worker returned ok without usable stats.");
+    }
+    const out = {
+        blender_version: stats["blender_version"],
+        render_seconds: stats["render_seconds"]
+    };
+    for (const key of ["frames", "objects"]) {
+        if (isNumber(stats[key]))
+            out[key] = stats[key];
+    }
+    for (const key of ["depth_near", "depth_far"]) {
+        if (isNumber(stats[key]))
+            out[key] = stats[key];
+    }
+    if (isString(stats["camera"]))
+        out["camera"] = stats["camera"];
+    return out;
+}
+//# sourceMappingURL=blender-executor.js.map

package/dist/blender-executor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"blender-executor.js","sourceRoot":"","sources":["../src/blender-executor.ts"],"names":[],"mappings":"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"}

package/dist/comfy-executor.d.ts

@@ -3,9 +3,25 @@ export interface ComfyImage {
     data: string;
     filename: string;
 }
+/** A single file produced by a ComfyUI output node (image, audio, or video). */
+export interface ComfyFileOutput {
+    /** base64-encoded file bytes */
+    data: string;
+    filename: string;
+    mimeType: string;
+}
+/** Outputs produced by one ComfyUI node, grouped by media kind. */
+export interface ComfyNodeOutputs {
+    images?: ComfyFileOutput[];
+    audio?: ComfyFileOutput[];
+    video?: ComfyFileOutput[];
+}
 export interface ComfyExecutorResult {
     status: "completed" | "failed";
+    /** Flat list of all output images, across every node (legacy convenience). */
     images?: ComfyImage[];
+    /** Per-node outputs keyed by ComfyUI node id, grouped by media kind. */
+    nodeOutputs?: Record<string, ComfyNodeOutputs>;
     raw_output?: Record<string, unknown>;
     error?: string;
 }
@@ -36,6 +52,12 @@ export interface ComfyExecutionHandle {
  *
  * Returns a handle with a result promise and a cancel() method.
  */
-export declare function executeComfy(prompt: ComfyPrompt, addr: string, onProgress?: (event: ComfyProgressEvent) => void, timeoutMs?: number): ComfyExecutionHandle;
+export declare function executeComfy(prompt: ComfyPrompt, addr: string, onProgress?: (event: ComfyProgressEvent) => void, timeoutMs?: number, onNodeOutput?: (nodeId: string, outputs: ComfyNodeOutputs) => void): ComfyExecutionHandle;
+/**
+ * Upload a file to a ComfyUI server's input folder via `/upload/image`
+ * (ComfyUI accepts arbitrary input files on this endpoint, not just images).
+ * Returns the stored filename to reference from a Load* node's input.
+ */
+export declare function uploadComfyFile(addr: string, bytes: Uint8Array, filename: string, mimeType?: string): Promise<string>;
 export {};
 //# sourceMappingURL=comfy-executor.d.ts.map

package/dist/comfy-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"comfy-executor.d.ts","sourceRoot":"","sources":["../src/comfy-executor.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,WAAW,GAAG,QAAQ,CAAC;IAC/B,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,gDAAgD;AAChD,MAAM,WAAW,kBAAkB;IACjC,IAAI,EACA,WAAW,GACX,UAAU,GACV,UAAU,GACV,kBAAkB,GAClB,iBAAiB,GACjB,iBAAiB,GACjB,uBAAuB,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,KAAK,WAAW,GAAG,MAAM,CACvB,MAAM,EACN;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CACxD,CAAC;AAEF,gEAAgE;AAChE,MAAM,WAAW,oBAAoB;IACnC,+DAA+D;IAC/D,MAAM,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACrC,uEAAuE;IACvE,MAAM,EAAE,MAAM,IAAI,CAAC;CACpB;AAeD;;;;;GAKG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,WAAW,EACnB,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,EAChD,SAAS,SAAS,GACjB,oBAAoB,CAmHtB"}
+{"version":3,"file":"comfy-executor.d.ts","sourceRoot":"","sources":["../src/comfy-executor.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,gFAAgF;AAChF,MAAM,WAAW,eAAe;IAC9B,gCAAgC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,mEAAmE;AACnE,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,eAAe,EAAE,CAAC;IAC3B,KAAK,CAAC,EAAE,eAAe,EAAE,CAAC;IAC1B,KAAK,CAAC,EAAE,eAAe,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,WAAW,GAAG,QAAQ,CAAC;IAC/B,8EAA8E;IAC9E,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;IACtB,wEAAwE;IACxE,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC/C,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AASD,gDAAgD;AAChD,MAAM,WAAW,kBAAkB;IACjC,IAAI,EACA,WAAW,GACX,UAAU,GACV,UAAU,GACV,kBAAkB,GAClB,iBAAiB,GACjB,iBAAiB,GACjB,uBAAuB,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,KAAK,WAAW,GAAG,MAAM,CACvB,MAAM,EACN;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CACxD,CAAC;AAEF,gEAAgE;AAChE,MAAM,WAAW,oBAAoB;IACnC,+DAA+D;IAC/D,MAAM,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACrC,uEAAuE;IACvE,MAAM,EAAE,MAAM,IAAI,CAAC;CACpB;AAeD;;;;;GAKG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,WAAW,EACnB,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,EAChD,SAAS,SAAS,EAClB,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,KAAK,IAAI,GACjE,oBAAoB,CAwLtB;AA2UD;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,SAA6B,GACpC,OAAO,CAAC,MAAM,CAAC,CAwBjB"}