@nodetool-ai/nodes-utils 0.8.3 → 0.8.4-a24.1

package/dist/.nodetool-build-stamp

@@ -1 +1 @@
-2026-10-12T12:29:59.667Z
+2026-10-16T07:29:18.966Z

package/dist/file-watch-match.d.ts

@@ -0,0 +1,50 @@
+/** Shared pattern matching and per-path debounce for file-watch nodes and hosts. */
+/** The filter a watcher applies before turning a raw fs event into an event. */
+export interface FileWatchFilter {
+    /** Glob-ish include patterns (e.g. "*.txt"); "*" matches everything. */
+    patterns: string[];
+    /** Glob-ish patterns to exclude, checked before include patterns. */
+    ignorePatterns: string[];
+    /** Event types to react to ("created" | "modified" | "deleted" | "moved" | ...). */
+    events: string[];
+}
+/**
+ * Minimal glob match against a filename: `*` matches any run of characters,
+ * `?` matches any single character, everything else is literal. `pattern ===
+ * "*"` is short-circuited since it is the common "match everything" case.
+ */
+export declare function matchesFileWatchPattern(filename: string, pattern: string): boolean;
+/**
+ * True when a changed file's basename passes the ignore/include pattern
+ * filter: ignore patterns are checked first (an ignored file is never
+ * processed even if an include pattern also matches it), then include
+ * patterns — no include pattern match means the file is skipped.
+ */
+export declare function shouldProcessFileWatchPath(filePath: string, filter: Pick<FileWatchFilter, "patterns" | "ignorePatterns">): boolean;
+/** True when an event type is one the watcher cares about. */
+export declare function isWatchedFileEvent(eventType: string, events: string[]): boolean;
+/**
+ * Per-path debounce: tracks the last time each path fired and suppresses a
+ * repeat for the same path within `debounceMs`. One instance per watcher (a
+ * node run, or one per registration in the host adapter) — state is scoped to
+ * that watcher, not shared across paths or watchers.
+ */
+export declare class FileWatchDebouncer {
+    private readonly debounceMs;
+    private readonly now;
+    private readonly lastFiredAt;
+    constructor(debounceMs: number, now?: () => number);
+    /** Returns true when the event for `filePath` should be suppressed. A path
+     * that has never fired is never suppressed — `now` is injectable, so 0 is a
+     * time a clock can genuinely read, not a stand-in for "no entry". */
+    shouldSuppress(filePath: string): boolean;
+}
+/**
+ * Combines the event-type, include/ignore-pattern, and debounce checks in the
+ * same order `FileWatchTriggerNode.genProcess()`'s `emitEvent` always applied
+ * them: event type first (cheapest), then patterns, then debounce (which has
+ * a side effect — it records the fire time — so it must run last and only
+ * once the event is otherwise known to matter).
+ */
+export declare function shouldEmitFileWatchEvent(eventType: string, filePath: string, filter: FileWatchFilter, debouncer: FileWatchDebouncer): boolean;
+//# sourceMappingURL=file-watch-match.d.ts.map

package/dist/file-watch-match.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"file-watch-match.d.ts","sourceRoot":"","sources":["../src/file-watch-match.ts"],"names":[],"mappings":"AAAA,oFAAoF;AAIpF,gFAAgF;AAChF,MAAM,WAAW,eAAe;IAC9B,wEAAwE;IACxE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,qEAAqE;IACrE,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,oFAAoF;IACpF,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd,OAAO,CAgBT;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,UAAU,GAAG,gBAAgB,CAAC,GAC3D,OAAO,CAYT;AAED,8DAA8D;AAC9D,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EAAE,GACf,OAAO,CAET;AAED;;;;;GAKG;AACH,qBAAa,kBAAkB;IAI3B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,GAAG;IAJtB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA6B;IAEzD,YACmB,UAAU,EAAE,MAAM,EAClB,GAAG,GAAE,MAAM,MAAiB,EAC3C;IAEJ;;yEAEqE;IACrE,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAMxC;CACF;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,eAAe,EACvB,SAAS,EAAE,kBAAkB,GAC5B,OAAO,CAKT"}

package/dist/file-watch-match.js

@@ -0,0 +1,90 @@
+/** Shared pattern matching and per-path debounce for file-watch nodes and hosts. */
+import * as path from "path";
+/**
+ * Minimal glob match against a filename: `*` matches any run of characters,
+ * `?` matches any single character, everything else is literal. `pattern ===
+ * "*"` is short-circuited since it is the common "match everything" case.
+ */
+export function matchesFileWatchPattern(filename, pattern) {
+    if (pattern === "*")
+        return true;
+    // Escape every regex metacharacter first, then reinstate the two glob
+    // wildcards from their escaped forms. Escaping only "." would leave the
+    // rest live: "\d" would match any digit instead of a literal backslash,
+    // and an unbalanced "(" would throw at watch time rather than simply
+    // failing to match.
+    const source = pattern
+        .replace(/[\\^$.*+?()[\]{}|]/g, "\\$&")
+        .replace(/\\\*/g, ".*")
+        .replace(/\\\?/g, ".");
+    // "s" because a bare "." skips the four JS line terminators, all of which
+    // are legal in a POSIX filename; "u" because it otherwise counts one UTF-16
+    // unit, so "?" ate half an emoji. Neither flag can make the compile throw:
+    // the escape above already covers every character "u" is strict about.
+    return new RegExp(`^${source}$`, "us").test(filename);
+}
+/**
+ * True when a changed file's basename passes the ignore/include pattern
+ * filter: ignore patterns are checked first (an ignored file is never
+ * processed even if an include pattern also matches it), then include
+ * patterns — no include pattern match means the file is skipped.
+ */
+export function shouldProcessFileWatchPath(filePath, filter) {
+    const filename = path.basename(filePath);
+    for (const pattern of filter.ignorePatterns) {
+        if (matchesFileWatchPattern(filename, pattern))
+            return false;
+    }
+    for (const pattern of filter.patterns) {
+        if (matchesFileWatchPattern(filename, pattern))
+            return true;
+    }
+    return false;
+}
+/** True when an event type is one the watcher cares about. */
+export function isWatchedFileEvent(eventType, events) {
+    return events.includes(eventType);
+}
+/**
+ * Per-path debounce: tracks the last time each path fired and suppresses a
+ * repeat for the same path within `debounceMs`. One instance per watcher (a
+ * node run, or one per registration in the host adapter) — state is scoped to
+ * that watcher, not shared across paths or watchers.
+ */
+export class FileWatchDebouncer {
+    debounceMs;
+    now;
+    lastFiredAt = new Map();
+    constructor(debounceMs, now = Date.now) {
+        this.debounceMs = debounceMs;
+        this.now = now;
+    }
+    /** Returns true when the event for `filePath` should be suppressed. A path
+     * that has never fired is never suppressed — `now` is injectable, so 0 is a
+     * time a clock can genuinely read, not a stand-in for "no entry". */
+    shouldSuppress(filePath) {
+        const now = this.now();
+        const last = this.lastFiredAt.get(filePath);
+        if (last !== undefined && now - last < this.debounceMs)
+            return true;
+        this.lastFiredAt.set(filePath, now);
+        return false;
+    }
+}
+/**
+ * Combines the event-type, include/ignore-pattern, and debounce checks in the
+ * same order `FileWatchTriggerNode.genProcess()`'s `emitEvent` always applied
+ * them: event type first (cheapest), then patterns, then debounce (which has
+ * a side effect — it records the fire time — so it must run last and only
+ * once the event is otherwise known to matter).
+ */
+export function shouldEmitFileWatchEvent(eventType, filePath, filter, debouncer) {
+    if (!isWatchedFileEvent(eventType, filter.events))
+        return false;
+    if (!shouldProcessFileWatchPath(filePath, filter))
+        return false;
+    if (debouncer.shouldSuppress(filePath))
+        return false;
+    return true;
+}
+//# sourceMappingURL=file-watch-match.js.map

package/dist/file-watch-match.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"file-watch-match.js","sourceRoot":"","sources":["../src/file-watch-match.ts"],"names":[],"mappings":"AAAA,oFAAoF;AAEpF,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAY7B;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CACrC,QAAgB,EAChB,OAAe;IAEf,IAAI,OAAO,KAAK,GAAG;QAAE,OAAO,IAAI,CAAC;IACjC,sEAAsE;IACtE,wEAAwE;IACxE,wEAAwE;IACxE,qEAAqE;IACrE,oBAAoB;IACpB,MAAM,MAAM,GAAG,OAAO;SACnB,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC;SACtC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC;SACtB,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACzB,0EAA0E;IAC1E,4EAA4E;IAC5E,2EAA2E;IAC3E,uEAAuE;IACvE,OAAO,IAAI,MAAM,CAAC,IAAI,MAAM,GAAG,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACxD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,0BAA0B,CACxC,QAAgB,EAChB,MAA4D;IAE5D,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAEzC,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;QAC5C,IAAI,uBAAuB,CAAC,QAAQ,EAAE,OAAO,CAAC;YAAE,OAAO,KAAK,CAAC;IAC/D,CAAC;IAED,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACtC,IAAI,uBAAuB,CAAC,QAAQ,EAAE,OAAO,CAAC;YAAE,OAAO,IAAI,CAAC;IAC9D,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,8DAA8D;AAC9D,MAAM,UAAU,kBAAkB,CAChC,SAAiB,EACjB,MAAgB;IAEhB,OAAO,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;AACpC,CAAC;AAED;;;;;GAKG;AACH,MAAM,OAAO,kBAAkB;IAIV,UAAU;IACV,GAAG;IAJL,WAAW,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEzD,YACmB,UAAkB,EAClB,GAAG,GAAiB,IAAI,CAAC,GAAG;0BAD5B,UAAU;mBACV,GAAG;IACnB,CAAC;IAEJ;;yEAEqE;IACrE,cAAc,CAAC,QAAgB;QAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,IAAI,KAAK,SAAS,IAAI,GAAG,GAAG,IAAI,GAAG,IAAI,CAAC,UAAU;YAAE,OAAO,IAAI,CAAC;QACpE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QACpC,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAED;;;;;;GAMG;AACH,MAAM,UAAU,wBAAwB,CACtC,SAAiB,EACjB,QAAgB,EAChB,MAAuB,EACvB,SAA6B;IAE7B,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IAChE,IAAI,CAAC,0BAA0B,CAAC,QAAQ,EAAE,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IAChE,IAAI,SAAS,CAAC,cAAc,CAAC,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAC;IACrD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/index.d.ts

@@ -26,4 +26,5 @@ export { resolveModelBytes } from "./model-bytes.js";
 export type { ModelBytesRefLike } from "./model-bytes.js";
 export { SAVE_TO_WORKSPACE_TITLE, SAVE_TO_WORKSPACE_DESCRIPTION, VISIBLE_WHEN_NOT_SAVING_TO_WORKSPACE, folderPathOf, resolveSaveFolder, saveFilename, uniqueFilePath, resolveSaveTarget, writeSavedFile } from "./save-target.js";
 export type { SaveFilenameOptions, SaveFolderOptions, SaveTargetOptions, SaveWorkspace } from "./save-target.js";
+export * from "./file-watch-match.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EACL,WAAW,EACX,SAAS,EACT,WAAW,EACX,eAAe,EACf,cAAc,EACd,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,YAAY,EACZ,UAAU,EACV,WAAW,EACZ,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpE,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAEjE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,YAAY,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EACL,uBAAuB,EACvB,6BAA6B,EAC7B,oCAAoC,EACpC,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,YAAY,EACV,mBAAmB,EACnB,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,EACd,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EACL,WAAW,EACX,SAAS,EACT,WAAW,EACX,eAAe,EACf,cAAc,EACd,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,YAAY,EACZ,UAAU,EACV,WAAW,EACZ,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpE,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAEjE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,YAAY,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EACL,uBAAuB,EACvB,6BAA6B,EAC7B,oCAAoC,EACpC,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,YAAY,EACV,mBAAmB,EACnB,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,EACd,MAAM,kBAAkB,CAAC;AAE1B,cAAc,uBAAuB,CAAC"}

package/dist/index.js

@@ -23,4 +23,5 @@ export { renderTemplate, referencedVariables } from "./template.js";
 export { base64ToBytes, bytesToBase64 } from "./base64.js";
 export { resolveModelBytes } from "./model-bytes.js";
 export { SAVE_TO_WORKSPACE_TITLE, SAVE_TO_WORKSPACE_DESCRIPTION, VISIBLE_WHEN_NOT_SAVING_TO_WORKSPACE, folderPathOf, resolveSaveFolder, saveFilename, uniqueFilePath, resolveSaveTarget, writeSavedFile } from "./save-target.js";
+export * from "./file-watch-match.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EACL,WAAW,EACX,SAAS,EACT,WAAW,EACX,eAAe,EACf,cAAc,EACd,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,YAAY,EACZ,UAAU,EACV,WAAW,EACZ,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAGpE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGrD,OAAO,EACL,uBAAuB,EACvB,6BAA6B,EAC7B,oCAAoC,EACpC,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,cAAc,EACf,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EACL,WAAW,EACX,SAAS,EACT,WAAW,EACX,eAAe,EACf,cAAc,EACd,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,YAAY,EACZ,UAAU,EACV,WAAW,EACZ,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAGpE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGrD,OAAO,EACL,uBAAuB,EACvB,6BAA6B,EAC7B,oCAAoC,EACpC,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,cAAc,EACf,MAAM,kBAAkB,CAAC;AAQ1B,cAAc,uBAAuB,CAAC"}

package/dist/model-bytes.d.ts

@@ -1,11 +1,11 @@
 /**
- * Browser-safe model-bytes resolution (inline data → storage → uri fetch).
+ * Browser-safe model-bytes resolution (inline data → asset → storage → uri).
  *
  * Moved here from `packages/video-nodes/src/nodes/model3d/render.ts` so the
- * Blender nodes and `RenderToImage` share it. Stays browser-safe: no
- * `node:path` at module scope — the one Node-only read (`file://`) loads
- * `node:fs/promises` and `node:url` through a dynamic import that only runs
- * when `IS_NODE` is set.
+ * Blender nodes and `RenderToImage` share it. It delegates to the runtime's
+ * shared `loadMediaRefBytes`, which resolves `asset://<id>` and asset-id-only
+ * refs (the shape the Model 3D constant stores), and keeps one difference: a
+ * failed HTTP fetch throws with its status instead of reading as empty bytes.
  */
 import type { ProcessingContext } from "@nodetool-ai/runtime";
 /**
@@ -16,7 +16,8 @@ import type { ProcessingContext } from "@nodetool-ai/runtime";
 export interface ModelBytesRefLike {
     data?: Uint8Array | string;
     uri?: string;
+    asset_id?: string | null;
 }
-/** Browser-safe model-bytes resolution (inline data → storage → uri fetch). */
+/** Browser-safe model-bytes resolution (inline data → asset → storage → uri). */
 export declare function resolveModelBytes(model: ModelBytesRefLike | null | undefined, context?: ProcessingContext): Promise<Uint8Array>;
 //# sourceMappingURL=model-bytes.d.ts.map

package/dist/model-bytes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-bytes.d.ts","sourceRoot":"","sources":["../src/model-bytes.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAKH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAI9D;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE,UAAU,GAAG,MAAM,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,+EAA+E;AAC/E,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,iBAAiB,GAAG,IAAI,GAAG,SAAS,EAC3C,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAyCrB"}
+{"version":3,"file":"model-bytes.d.ts","sourceRoot":"","sources":["../src/model-bytes.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9D;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE,UAAU,GAAG,MAAM,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,iFAAiF;AACjF,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,iBAAiB,GAAG,IAAI,GAAG,SAAS,EAC3C,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAkBrB"}

package/dist/model-bytes.js

@@ -1,54 +1,27 @@
 /**
- * Browser-safe model-bytes resolution (inline data → storage → uri fetch).
+ * Browser-safe model-bytes resolution (inline data → asset → storage → uri).
  *
  * Moved here from `packages/video-nodes/src/nodes/model3d/render.ts` so the
- * Blender nodes and `RenderToImage` share it. Stays browser-safe: no
- * `node:path` at module scope — the one Node-only read (`file://`) loads
- * `node:fs/promises` and `node:url` through a dynamic import that only runs
- * when `IS_NODE` is set.
+ * Blender nodes and `RenderToImage` share it. It delegates to the runtime's
+ * shared `loadMediaRefBytes`, which resolves `asset://<id>` and asset-id-only
+ * refs (the shape the Model 3D constant stores), and keeps one difference: a
+ * failed HTTP fetch throws with its status instead of reading as empty bytes.
  */
-import { IS_NODE } from "@nodetool-ai/config";
-import { isNonEmptyString } from "@nodetool-ai/protocol";
-import { fetchExternalMedia } from "@nodetool-ai/runtime";
-import { base64ToBytes } from "./base64.js";
-/** Browser-safe model-bytes resolution (inline data → storage → uri fetch). */
+import { fetchExternalMedia, loadMediaRefBytes } from "@nodetool-ai/runtime";
+/** Browser-safe model-bytes resolution (inline data → asset → storage → uri). */
 export async function resolveModelBytes(model, context) {
     if (model === null || model === undefined)
         return new Uint8Array();
-    const ref = model;
-    if (ref.data instanceof Uint8Array && ref.data.length > 0) {
-        return ref.data;
-    }
-    if (ref.data !== undefined && isNonEmptyString(ref.data)) {
-        return base64ToBytes(ref.data);
-    }
-    const uri = ref.uri ?? "";
-    if (uri === "")
-        return new Uint8Array();
-    if (uri.startsWith("data:")) {
-        const comma = uri.indexOf(",");
-        if (comma === -1)
-            throw new Error(`Malformed data URI: ${uri.slice(0, 32)}…`);
-        return base64ToBytes(uri.slice(comma + 1));
-    }
-    if (context?.storage) {
-        const stored = await context.storage.retrieve(uri);
-        if (stored && stored.length > 0)
-            return new Uint8Array(stored);
-    }
-    if (uri.startsWith("file://") && IS_NODE) {
-        const { readFile } = await import("node:fs/promises");
-        const { fileURLToPath } = await import("node:url");
-        return new Uint8Array(await readFile(fileURLToPath(uri)));
-    }
-    if (uri.startsWith("http://") || uri.startsWith("https://")) {
-        // Caller-supplied media uri — the media-ref egress policy decides.
-        const res = await fetchExternalMedia(uri);
-        if (!res.ok) {
-            throw new Error(`Failed to fetch model (${res.status}): ${uri}`);
+    const bytes = await loadMediaRefBytes({ data: model.data, uri: model.uri, asset_id: model.asset_id, type: "model3d" }, context, {
+        fetchHttp: async (uri) => {
+            // Caller-supplied media uri — the media-ref egress policy decides.
+            const res = await fetchExternalMedia(uri);
+            if (!res.ok) {
+                throw new Error(`Failed to fetch model (${res.status}): ${uri}`);
+            }
+            return new Uint8Array(await res.arrayBuffer());
         }
-        return new Uint8Array(await res.arrayBuffer());
-    }
-    return new Uint8Array();
+    });
+    return bytes ?? new Uint8Array();
 }
 //# sourceMappingURL=model-bytes.js.map

package/dist/model-bytes.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-bytes.js","sourceRoot":"","sources":["../src/model-bytes.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAY5C,+EAA+E;AAC/E,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,KAA2C,EAC3C,OAA2B;IAE3B,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,IAAI,UAAU,EAAE,CAAC;IACnE,MAAM,GAAG,GAAG,KAAK,CAAC;IAElB,IAAI,GAAG,CAAC,IAAI,YAAY,UAAU,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1D,OAAO,GAAG,CAAC,IAAI,CAAC;IAClB,CAAC;IACD,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QACzD,OAAO,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC;IAC1B,IAAI,GAAG,KAAK,EAAE;QAAE,OAAO,IAAI,UAAU,EAAE,CAAC;IAExC,IAAI,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,KAAK,KAAK,CAAC,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;QAC9E,OAAO,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,OAAO,EAAE,OAAO,EAAE,CAAC;QACrB,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnD,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC;IAED,IAAI,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,OAAO,EAAE,CAAC;QACzC,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;QACtD,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;QACnD,OAAO,IAAI,UAAU,CAAC,MAAM,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5D,mEAAmE;QACnE,MAAM,GAAG,GAAG,MAAM,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,0BAA0B,GAAG,CAAC,MAAM,MAAM,GAAG,EAAE,CAAC,CAAC;QACnE,CAAC;QACD,OAAO,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,IAAI,UAAU,EAAE,CAAC;AAC1B,CAAC"}
+{"version":3,"file":"model-bytes.js","sourceRoot":"","sources":["../src/model-bytes.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAc7E,iFAAiF;AACjF,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,KAA2C,EAC3C,OAA2B;IAE3B,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,IAAI,UAAU,EAAE,CAAC;IAEnE,MAAM,KAAK,GAAG,MAAM,iBAAiB,CACnC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,EAC/E,OAAO,EACP;QACE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YACvB,mEAAmE;YACnE,MAAM,GAAG,GAAG,MAAM,kBAAkB,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;gBACZ,MAAM,IAAI,KAAK,CAAC,0BAA0B,GAAG,CAAC,MAAM,MAAM,GAAG,EAAE,CAAC,CAAC;YACnE,CAAC;YACD,OAAO,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;QACjD,CAAC;KACF,CACF,CAAC;IACF,OAAO,KAAK,IAAI,IAAI,UAAU,EAAE,CAAC;AACnC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nodetool-ai/nodes-utils",
-  "version": "0.8.3",
+  "version": "0.8.4-a24.1",
   "description": "Shared helpers for node packages: platform tags and lazy Node-only module loaders",
   "type": "module",
   "engines": {
@@ -15,10 +15,10 @@
     "lint": "node ../../scripts/run-tsc.mjs --noEmit"
   },
   "dependencies": {
-    "@nodetool-ai/config": "0.8.3",
-    "@nodetool-ai/node-sdk": "0.8.3",
-    "@nodetool-ai/protocol": "0.8.3",
-    "@nodetool-ai/runtime": "0.8.3"
+    "@nodetool-ai/config": "0.8.4-a24.1",
+    "@nodetool-ai/node-sdk": "0.8.4-a24.1",
+    "@nodetool-ai/protocol": "0.8.4-a24.1",
+    "@nodetool-ai/runtime": "0.8.4-a24.1"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",