@plasius/gpu-model-runtime 0.2.5 → 0.3.1

package/dist/index.d.ts

@@ -1,14 +1,12 @@
+import { GpuModelDiagnosticMode, GpuModelDocument, ModelSource as ModelSource$1, ModelProvenance as ModelProvenance$1 } from '@plasius/gpu-model-core';
+export { GpuModelConversionDiagnostic, GpuModelDiagnosticMode, GpuModelDocument } from '@plasius/gpu-model-core';
 import { ModelAssetRef, ModelLodLevel } from '@plasius/asset-contracts';
 
 /** Default ceiling per entrypoint or related resource: 64 MiB. */
 declare const DEFAULT_MODEL_MAX_BYTES: number;
-type ModelSourceKind = "file-path" | "url" | "blob-storage-url" | "blob" | "array-buffer" | "uint8-array" | "stream";
-type ModelProvenance = Readonly<{
-    sourceId?: string;
-    sourceSystem?: string;
-    acquiredAt?: string;
-    licenseHint?: string;
-}>;
+/** Canonical source and policy contracts stay owned by the published core. */
+type ModelSourceKind = ModelSource$1["kind"];
+type ModelProvenance = ModelProvenance$1;
 type ModelResourceInput = Readonly<{
     bytes: ArrayBuffer | Blob | Uint8Array;
     contentType?: string;
@@ -19,56 +17,9 @@ type ModelPackage = Readonly<{
     baseUrl?: string;
     resources?: Readonly<Record<string, ModelResourceInput>>;
 }>;
-type ModelSource = Readonly<{
-    kind: "file-path";
-    path: string;
-    mimeTypeHint?: string;
-    fileNameHint?: string;
-    package?: ModelPackage;
-    provenance?: ModelProvenance;
-}> | Readonly<{
-    kind: "url";
-    url: string;
-    headers?: Readonly<Record<string, string>>;
-    mimeTypeHint?: string;
-    package?: ModelPackage;
-    provenance?: ModelProvenance;
-}> | Readonly<{
-    kind: "blob-storage-url";
-    url: string;
-    credentialMode?: "anonymous" | "signed" | "runtime-resolved";
-    mimeTypeHint?: string;
-    package?: ModelPackage;
-    provenance?: ModelProvenance;
-}> | Readonly<{
-    kind: "blob";
-    blob: Blob;
-    fileNameHint?: string;
-    mimeTypeHint?: string;
-    package?: ModelPackage;
-    provenance?: ModelProvenance;
-}> | Readonly<{
-    kind: "array-buffer";
-    bytes: ArrayBuffer;
-    fileNameHint?: string;
-    mimeTypeHint?: string;
-    package?: ModelPackage;
-    provenance?: ModelProvenance;
-}> | Readonly<{
-    kind: "uint8-array";
-    bytes: Uint8Array;
-    fileNameHint?: string;
-    mimeTypeHint?: string;
-    package?: ModelPackage;
-    provenance?: ModelProvenance;
-}> | Readonly<{
-    kind: "stream";
-    stream: ReadableStream<Uint8Array> | AsyncIterable<Uint8Array>;
-    fileNameHint?: string;
-    mimeTypeHint?: string;
-    byteLengthHint?: number;
+/** Runtime acquisition extends canonical IO with package-resource resolution. */
+type ModelSource = ModelSource$1 & Readonly<{
     package?: ModelPackage;
-    provenance?: ModelProvenance;
 }>;
 type ResourceReference = Readonly<{
     path: string;
@@ -134,16 +85,16 @@ type SniffInput = Readonly<{
 }>;
 type AdapterLoadContext = Readonly<{
     signal: AbortSignal;
-    mode: "strict" | "tolerant" | "forensic";
+    mode: GpuModelDiagnosticMode;
     execution: "main" | "worker";
     adapterOptions: unknown;
 }>;
-type AdapterLoadResult<TCanonicalModel, TRendererReady = unknown> = Readonly<{
+type AdapterLoadResult<TCanonicalModel = GpuModelDocument, TRendererReady = unknown> = Readonly<{
     canonicalModel: TCanonicalModel;
     rendererReady?: TRendererReady;
     diagnostics?: readonly unknown[];
 }>;
-interface ModelAdapter<TCanonicalModel, TRendererReady = unknown> {
+interface ModelAdapter<TCanonicalModel = GpuModelDocument, TRendererReady = unknown> {
     readonly formatId: string;
     readonly supportsWorker?: boolean;
     sniff(input: SniffInput): number | boolean;
@@ -175,7 +126,7 @@ type ModelCache = Readonly<{
 }>;
 type LoadModelOptions = Readonly<{
     signal?: AbortSignal;
-    mode?: "strict" | "tolerant" | "forensic";
+    mode?: GpuModelDiagnosticMode;
     adapterOptions?: unknown;
     formatId?: string;
     fetchPolicy?: FetchPolicy;
@@ -185,7 +136,7 @@ type LoadModelOptions = Readonly<{
         mode?: "auto" | "never" | "always";
     }>;
 }>;
-type ModelLoadResult<TCanonicalModel, TRendererReady = unknown> = Readonly<{
+type ModelLoadResult<TCanonicalModel = GpuModelDocument, TRendererReady = unknown> = Readonly<{
     canonicalModel: TCanonicalModel;
     rendererReady?: TRendererReady;
     diagnostics?: readonly unknown[];

package/dist/index.js

@@ -33,6 +33,10 @@ function createModelCacheKey(contentHash, formatId, adapterOptions) {
 var DEFAULT_MODEL_MAX_BYTES = 64 * 1024 * 1024;
 
 // src/bytes.ts
+var typedArrayKind = Object.getOwnPropertyDescriptor(
+  Object.getPrototypeOf(Uint8Array.prototype),
+  Symbol.toStringTag
+)?.get;
 var ModelResourceTooLargeError = class extends Error {
   code = "MODEL_RESOURCE_TOO_LARGE";
   constructor() {
@@ -109,7 +113,7 @@ async function readBoundedStream(source, maxBytes, signal) {
       const next = await abortable(reader ? reader.read() : iterator.next(), signal);
       checkAbort(signal);
       if (next.done) break;
-      if (!(next.value instanceof Uint8Array)) throw new TypeError("Model stream chunks must be Uint8Array");
+      if (!ArrayBuffer.isView(next.value) || typedArrayKind?.call(next.value) !== "Uint8Array") throw new TypeError("Model stream chunks must be Uint8Array");
       const chunk = next.value;
       if (chunk.byteLength > maxBytes - length) throw new ModelResourceTooLargeError();
       const required = length + chunk.byteLength;
@@ -241,12 +245,15 @@ async function verifyIntegrity(bytes, integrity, hashBytes) {
   if (!integrity) {
     return;
   }
-  const expected = integrity.replace(/^sha256-/iu, "").toLowerCase();
-  const actualHex = (await hashBytes(bytes)).toLowerCase();
-  const actualBase64 = bytesToBase64(await digestBytes(bytes, hashBytes));
-  if (expected !== actualHex && expected !== actualBase64) {
-    throw new NonRetryableResourceError("Model resource integrity check failed");
+  const expected = integrity.replace(/^sha256-/iu, "");
+  if (/^[0-9a-f]{64}$/iu.test(expected)) {
+    const actualHex = await hashBytes(bytes);
+    if (expected.toLowerCase() === actualHex.toLowerCase()) return;
+  } else if (/^[A-Za-z0-9+/]{43}=$/u.test(expected)) {
+    const actualBase64 = bytesToBase64(await digestBytes(bytes, hashBytes));
+    if (expected === actualBase64) return;
   }
+  throw new NonRetryableResourceError("Model resource integrity check failed");
 }
 async function digestBytes(bytes, hashBytes) {
   if (globalThis.crypto?.subtle) {
@@ -336,7 +343,7 @@ var PackageResourceResolver = class {
       const memoryResource = this.memoryResources[memoryKey] ?? this.memoryResources[`./${memoryKey}`];
       if (memoryResource) {
         const bytes = await boundedBytes(memoryResource.bytes, maxBytes, controller.signal);
-        await abortable(verifyResourceIntegrity(bytes, requested.integrity ?? memoryResource.integrity, this.hashBytes), controller.signal);
+        await abortable(verifyIntegrity(bytes, requested.integrity ?? memoryResource.integrity, this.hashBytes), controller.signal);
         return {
           path: memoryKey,
           bytes,
@@ -424,7 +431,23 @@ var ModelRuntime = class {
       fileName: input.fileName,
       sourceKind: source.kind
     }, options.formatId);
-    const cacheKey = createModelCacheKey(input.contentHash, adapter.formatId, { adapterOptions: options.adapterOptions ?? null, maxBytes: byteLimit(options.fetchPolicy?.maxBytes) });
+    const workerMode = options.worker?.mode ?? "auto";
+    const canUseWorker = workerMode !== "never" && Boolean(this.workerDispatcher) && Boolean(adapter.supportsWorker);
+    if (workerMode === "always" && !canUseWorker) {
+      throw new Error(`Adapter ${adapter.formatId} does not support the requested worker execution`);
+    }
+    const context = {
+      signal: options.signal ?? new AbortController().signal,
+      mode: options.mode ?? "strict",
+      execution: canUseWorker ? "worker" : "main",
+      adapterOptions: options.adapterOptions ?? null
+    };
+    const cacheKey = createModelCacheKey(input.contentHash, adapter.formatId, {
+      adapterOptions: context.adapterOptions,
+      maxBytes: byteLimit(options.fetchPolicy?.maxBytes),
+      mode: context.mode,
+      execution: context.execution
+    });
     const useCache = options.useCache ?? true;
     if (useCache) {
       const cached = await this.cache.get(cacheKey);
@@ -432,13 +455,7 @@ var ModelRuntime = class {
         return { ...cached, fromCache: true };
       }
     }
-    const context = {
-      signal: options.signal ?? new AbortController().signal,
-      mode: options.mode ?? "strict",
-      execution: "main",
-      adapterOptions: options.adapterOptions ?? null
-    };
-    const adapterResult = await this.loadWithExecution(adapter, input, context, options);
+    const adapterResult = await this.loadWithExecution(adapter, input, context);
     const result = {
       ...adapterResult,
       contentHash: input.contentHash,
@@ -453,13 +470,8 @@ var ModelRuntime = class {
     }
     return result;
   }
-  async loadWithExecution(adapter, input, context, options) {
-    const workerMode = options.worker?.mode ?? "auto";
-    const canUseWorker = workerMode !== "never" && Boolean(this.workerDispatcher) && Boolean(adapter.supportsWorker);
-    if (workerMode === "always" && !canUseWorker) {
-      throw new Error(`Adapter ${adapter.formatId} does not support the requested worker execution`);
-    }
-    if (canUseWorker && this.workerDispatcher) {
+  async loadWithExecution(adapter, input, context) {
+    if (context.execution === "worker" && this.workerDispatcher) {
       const workerRequest = {
         formatId: adapter.formatId,
         input,
@@ -565,14 +577,6 @@ async function sourceToBytes(source, maxBytes, signal) {
   if (source.byteLengthHint !== void 0) checkSize(source.byteLengthHint, maxBytes);
   return readBoundedStream(source.stream, maxBytes, signal);
 }
-async function verifyResourceIntegrity(bytes, integrity, hashBytes) {
-  if (!integrity) return;
-  const expected = integrity.replace(/^sha256-/iu, "").toLowerCase();
-  const actual = (await hashBytes(bytes)).toLowerCase();
-  if (actual !== expected) {
-    throw new Error("Model resource integrity check failed");
-  }
-}
 var defaultFetch = (input, init) => {
   if (!globalThis.fetch) {
     throw new Error("URL sources require fetch or an injected fetch dependency");