@omote/core 0.5.5 → 0.5.6

package/dist/index.mjs

@@ -1813,6 +1813,16 @@ function getModelCache() {
   return cacheInstance;
 }
 var MAX_CACHE_SIZE_BYTES = 500 * 1024 * 1024;
+function fetchWithTimeout(url, timeoutMs, signal) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  const onCallerAbort = () => controller.abort();
+  signal?.addEventListener("abort", onCallerAbort, { once: true });
+  return fetch(url, { signal: controller.signal }).finally(() => {
+    clearTimeout(timer);
+    signal?.removeEventListener("abort", onCallerAbort);
+  });
+}
 async function fetchWithCache(url, optionsOrProgress) {
   let options = {};
   if (typeof optionsOrProgress === "function") {
@@ -1866,61 +1876,84 @@ async function fetchWithCache(url, optionsOrProgress) {
   }
   span?.setAttributes({ "fetch.cache_hit": false });
   console.log(`[ModelCache] Cache miss, fetching: ${url}`);
-  try {
-    const response = await fetch(url);
-    if (!response.ok) {
-      throw new Error(`Failed to fetch ${url}: ${response.status}`);
-    }
-    const contentLength = response.headers.get("content-length");
-    const total = contentLength ? parseInt(contentLength, 10) : 0;
-    const etag = response.headers.get("etag") ?? void 0;
-    const tooLargeForCache = total > MAX_CACHE_SIZE_BYTES;
-    if (tooLargeForCache) {
-      console.log(`[ModelCache] File too large for IndexedDB (${(total / 1024 / 1024).toFixed(0)}MB > 500MB), using HTTP cache only`);
-    }
-    if (!response.body) {
-      const data2 = await response.arrayBuffer();
+  const timeout = options.timeoutMs ?? 12e4;
+  const maxRetries = options.maxRetries ?? 2;
+  let lastError = null;
+  for (let attempt = 0; attempt <= maxRetries; attempt++) {
+    if (options.signal?.aborted) {
+      throw new Error(`Fetch aborted for ${url}`);
+    }
+    if (attempt > 0) {
+      const backoff = Math.min(2e3 * Math.pow(2, attempt - 1), 16e3);
+      console.log(`[ModelCache] Retry ${attempt}/${maxRetries} after ${backoff}ms: ${url}`);
+      await new Promise((r) => setTimeout(r, backoff));
+    }
+    try {
+      const response = await fetchWithTimeout(url, timeout, options.signal);
+      if (!response.ok) {
+        throw new Error(`Failed to fetch ${url}: ${response.status}`);
+      }
+      const contentLength = response.headers.get("content-length");
+      const total = contentLength ? parseInt(contentLength, 10) : 0;
+      const etag = response.headers.get("etag") ?? void 0;
+      const tooLargeForCache = total > MAX_CACHE_SIZE_BYTES;
+      if (tooLargeForCache) {
+        console.log(`[ModelCache] File too large for IndexedDB (${(total / 1024 / 1024).toFixed(0)}MB > 500MB), using HTTP cache only`);
+      }
+      if (!response.body) {
+        const data2 = await response.arrayBuffer();
+        if (!tooLargeForCache) {
+          await cache.set(cacheKey, data2, etag, version);
+        }
+        span?.setAttributes({
+          "fetch.size_bytes": data2.byteLength,
+          "fetch.cached_to_indexeddb": !tooLargeForCache,
+          ...attempt > 0 && { "fetch.retry_count": attempt }
+        });
+        span?.end();
+        return data2;
+      }
+      const reader = response.body.getReader();
+      const chunks = [];
+      let loaded = 0;
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done) break;
+        chunks.push(value);
+        loaded += value.length;
+        onProgress?.(loaded, total || loaded);
+      }
+      const data = new Uint8Array(loaded);
+      let offset = 0;
+      for (const chunk of chunks) {
+        data.set(chunk, offset);
+        offset += chunk.length;
+      }
+      const buffer = data.buffer;
       if (!tooLargeForCache) {
-        await cache.set(cacheKey, data2, etag, version);
+        await cache.set(cacheKey, buffer, etag, version);
+        console.log(`[ModelCache] Cached: ${url} (${(buffer.byteLength / 1024 / 1024).toFixed(1)}MB)`);
       }
       span?.setAttributes({
-        "fetch.size_bytes": data2.byteLength,
-        "fetch.cached_to_indexeddb": !tooLargeForCache
+        "fetch.size_bytes": buffer.byteLength,
+        "fetch.cached_to_indexeddb": !tooLargeForCache,
+        ...attempt > 0 && { "fetch.retry_count": attempt }
       });
       span?.end();
-      return data2;
-    }
-    const reader = response.body.getReader();
-    const chunks = [];
-    let loaded = 0;
-    while (true) {
-      const { done, value } = await reader.read();
-      if (done) break;
-      chunks.push(value);
-      loaded += value.length;
-      onProgress?.(loaded, total || loaded);
-    }
-    const data = new Uint8Array(loaded);
-    let offset = 0;
-    for (const chunk of chunks) {
-      data.set(chunk, offset);
-      offset += chunk.length;
-    }
-    const buffer = data.buffer;
-    if (!tooLargeForCache) {
-      await cache.set(cacheKey, buffer, etag, version);
-      console.log(`[ModelCache] Cached: ${url} (${(buffer.byteLength / 1024 / 1024).toFixed(1)}MB)`);
+      return buffer;
+    } catch (error) {
+      lastError = error instanceof Error ? error : new Error(String(error));
+      if (options.signal?.aborted) {
+        span?.endWithError(lastError);
+        throw lastError;
+      }
+      if (attempt < maxRetries) {
+        console.warn(`[ModelCache] Attempt ${attempt + 1} failed for ${url}: ${lastError.message}`);
+      }
     }
-    span?.setAttributes({
-      "fetch.size_bytes": buffer.byteLength,
-      "fetch.cached_to_indexeddb": !tooLargeForCache
-    });
-    span?.end();
-    return buffer;
-  } catch (error) {
-    span?.endWithError(error instanceof Error ? error : new Error(String(error)));
-    throw error;
   }
+  span?.endWithError(lastError);
+  throw lastError;
 }
 async function preloadModels(urls, onProgress) {
   const cache = getModelCache();
@@ -2169,6 +2202,15 @@ function getSessionOptions(backend) {
     graphOptimizationLevel: "all"
   };
 }
+function withTimeout(promise, ms, label) {
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(
+      () => reject(new Error(`${label} timed out after ${ms}ms`)),
+      ms
+    );
+    promise.then(resolve, reject).finally(() => clearTimeout(timer));
+  });
+}
 
 // src/inference/blendshapeUtils.ts
 var LAM_BLENDSHAPES = [
@@ -2441,7 +2483,11 @@ var _Wav2Vec2Inference = class _Wav2Vec2Inference {
           )
         });
         try {
-          this.session = await this.ort.InferenceSession.create(modelUrl, sessionOptions);
+          this.session = await withTimeout(
+            this.ort.InferenceSession.create(modelUrl, sessionOptions),
+            18e4,
+            "Wav2Vec2 InferenceSession.create (iOS URL pass-through)"
+          );
         } catch (sessionErr) {
           logger3.error("iOS: InferenceSession.create() failed", {
             error: sessionErr instanceof Error ? sessionErr.message : String(sessionErr),
@@ -3529,9 +3575,10 @@ var _SenseVoiceInference = class _SenseVoiceInference {
         logger5.info("iOS: passing model URL directly to ORT (low-memory path)", {
           modelUrl: this.config.modelUrl
         });
-        this.session = await this.ort.InferenceSession.create(
-          this.config.modelUrl,
-          sessionOptions
+        this.session = await withTimeout(
+          this.ort.InferenceSession.create(this.config.modelUrl, sessionOptions),
+          18e4,
+          "SenseVoice InferenceSession.create (iOS URL pass-through)"
         );
       } else {
         const cache = getModelCache();
@@ -3784,6 +3831,12 @@ var WORKER_SCRIPT = `
 var ort = null;
 var session = null;
 var tokenMap = null;
+
+function fetchWithTimeout(url, timeoutMs) {
+  var controller = new AbortController();
+  var timer = setTimeout(function() { controller.abort(); }, timeoutMs);
+  return fetch(url, { signal: controller.signal }).finally(function() { clearTimeout(timer); });
+}
 var negMean = null;
 var invStddev = null;
 var languageId = 0;
@@ -4227,7 +4280,7 @@ async function loadOrt(wasmPaths) {
   var ortUrl = wasmPaths + 'ort.wasm.min.js';
 
   // Load the script by fetching and executing it
-  var response = await fetch(ortUrl);
+  var response = await fetchWithTimeout(ortUrl, 30000);
   var scriptText = await response.text();
 
   // Create a blob URL for the script
@@ -4253,7 +4306,7 @@ async function loadOrt(wasmPaths) {
  */
 async function loadModel(modelUrl, tokensUrl, isIOSDevice, lang, textNorm) {
   // 1. Fetch and parse tokens.txt
-  var tokensResponse = await fetch(tokensUrl);
+  var tokensResponse = await fetchWithTimeout(tokensUrl, 30000);
   if (!tokensResponse.ok) {
     throw new Error('Failed to fetch tokens.txt: ' + tokensResponse.status + ' ' + tokensResponse.statusText);
   }
@@ -4276,7 +4329,7 @@ async function loadModel(modelUrl, tokensUrl, isIOSDevice, lang, textNorm) {
     session = await ort.InferenceSession.create(modelUrl, sessionOptions);
   } else {
     // Desktop: fetch ArrayBuffer for potential caching
-    var modelResponse = await fetch(modelUrl);
+    var modelResponse = await fetchWithTimeout(modelUrl, 120000);
     if (!modelResponse.ok) {
       throw new Error('Failed to fetch model: ' + modelResponse.status + ' ' + modelResponse.statusText);
     }
@@ -4787,6 +4840,12 @@ var WORKER_SCRIPT2 = `
 
 var ort = null;
 
+function fetchWithTimeout(url, timeoutMs) {
+  var controller = new AbortController();
+  var timer = setTimeout(function() { controller.abort(); }, timeoutMs);
+  return fetch(url, { signal: controller.signal }).finally(function() { clearTimeout(timer); });
+}
+
 // SenseVoice state
 var svSession = null;
 var svTokenMap = null;
@@ -5101,7 +5160,7 @@ function symmetrizeBlendshapes(frame) {
 async function loadOrt(wasmPaths, isIOSDevice) {
   if (ort) return;
   var ortUrl = wasmPaths + 'ort.wasm.min.js';
-  var response = await fetch(ortUrl);
+  var response = await fetchWithTimeout(ortUrl, 30000);
   var scriptText = await response.text();
   var blob = new Blob([scriptText], { type: 'application/javascript' });
   var blobUrl = URL.createObjectURL(blob);
@@ -5119,7 +5178,7 @@ async function loadOrt(wasmPaths, isIOSDevice) {
 // \u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550
 
 async function svLoad(msg) {
-  var tokensResponse = await fetch(msg.tokensUrl);
+  var tokensResponse = await fetchWithTimeout(msg.tokensUrl, 30000);
   if (!tokensResponse.ok) throw new Error('Failed to fetch tokens.txt: ' + tokensResponse.status);
   var tokensText = await tokensResponse.text();
   svTokenMap = parseTokensFile(tokensText);
@@ -5130,7 +5189,7 @@ async function svLoad(msg) {
   if (msg.isIOS) {
     svSession = await ort.InferenceSession.create(msg.modelUrl, sessionOptions);
   } else {
-    var modelResponse = await fetch(msg.modelUrl);
+    var modelResponse = await fetchWithTimeout(msg.modelUrl, 120000);
     if (!modelResponse.ok) throw new Error('Failed to fetch model: ' + modelResponse.status);
     var modelBuffer = await modelResponse.arrayBuffer();
     svSession = await ort.InferenceSession.create(new Uint8Array(modelBuffer), sessionOptions);
@@ -5205,11 +5264,11 @@ async function cpuLoad(msg) {
     }
     cpuSession = await ort.InferenceSession.create(msg.modelUrl, sessionOptions);
   } else {
-    var graphResponse = await fetch(msg.modelUrl);
+    var graphResponse = await fetchWithTimeout(msg.modelUrl, 120000);
     if (!graphResponse.ok) throw new Error('Failed to fetch model graph: ' + graphResponse.status);
     var graphBuffer = await graphResponse.arrayBuffer();
     if (msg.externalDataUrl && dataFilename) {
-      var dataResponse = await fetch(msg.externalDataUrl);
+      var dataResponse = await fetchWithTimeout(msg.externalDataUrl, 120000);
       if (!dataResponse.ok) throw new Error('Failed to fetch external data: ' + dataResponse.status);
       var dataBuffer = await dataResponse.arrayBuffer();
       sessionOptions.externalData = [{ path: dataFilename, data: new Uint8Array(dataBuffer) }];
@@ -5261,7 +5320,7 @@ async function vadLoad(msg) {
   vadChunkSize = vadSampleRate === 16000 ? 512 : 256;
   vadContextSize = vadSampleRate === 16000 ? 64 : 32;
 
-  var response = await fetch(msg.modelUrl);
+  var response = await fetchWithTimeout(msg.modelUrl, 60000);
   if (!response.ok) throw new Error('Failed to fetch VAD model: ' + response.status);
   var modelBuffer = await response.arrayBuffer();
   vadSession = await ort.InferenceSession.create(new Uint8Array(modelBuffer), {
@@ -6109,7 +6168,11 @@ var _Wav2ArkitCpuInference = class _Wav2ArkitCpuInference {
             // URL string — ORT fetches directly into WASM
           }];
         }
-        this.session = await this.ort.InferenceSession.create(modelUrl, sessionOptions);
+        this.session = await withTimeout(
+          this.ort.InferenceSession.create(modelUrl, sessionOptions),
+          18e4,
+          "Wav2ArkitCpu InferenceSession.create (iOS URL pass-through)"
+        );
       } else {
         const cache = getModelCache();
         const isCached = await cache.has(modelUrl);
@@ -6377,6 +6440,12 @@ var WORKER_SCRIPT3 = `
 var ort = null;
 var session = null;
 
+function fetchWithTimeout(url, timeoutMs) {
+  var controller = new AbortController();
+  var timer = setTimeout(function() { controller.abort(); }, timeoutMs);
+  return fetch(url, { signal: controller.signal }).finally(function() { clearTimeout(timer); });
+}
+
 // Precomputed symmetric index pairs from LAM_BLENDSHAPES alphabetical ordering
 // Used to average left/right blendshape pairs for symmetrized output
 const SYMMETRIC_INDEX_PAIRS = [
@@ -6426,7 +6495,7 @@ async function loadOrt(wasmPaths) {
   const ortUrl = wasmPaths + 'ort.wasm.min.js';
 
   // Load the script by fetching and executing it
-  const response = await fetch(ortUrl);
+  const response = await fetchWithTimeout(ortUrl, 30000);
   const scriptText = await response.text();
 
   // Create a blob URL for the script
@@ -6468,7 +6537,7 @@ async function loadModel(modelUrl, externalDataUrl, isIOS) {
     session = await ort.InferenceSession.create(modelUrl, sessionOptions);
   } else {
     // Desktop: fetch model graph as ArrayBuffer
-    const graphResponse = await fetch(modelUrl);
+    const graphResponse = await fetchWithTimeout(modelUrl, 120000);
     if (!graphResponse.ok) {
       throw new Error('Failed to fetch model graph: ' + graphResponse.status + ' ' + graphResponse.statusText);
     }
@@ -6476,7 +6545,7 @@ async function loadModel(modelUrl, externalDataUrl, isIOS) {
 
     // Fetch external data file if present
     if (externalDataUrl && dataFilename) {
-      const dataResponse = await fetch(externalDataUrl);
+      const dataResponse = await fetchWithTimeout(externalDataUrl, 120000);
       if (!dataResponse.ok) {
         throw new Error('Failed to fetch external data: ' + dataResponse.status + ' ' + dataResponse.statusText);
       }
@@ -7611,6 +7680,13 @@ var WORKER_SCRIPT4 = `
 
 var ort = null;
 var session = null;
+
+function fetchWithTimeout(url, timeoutMs) {
+  var controller = new AbortController();
+  var timer = setTimeout(function() { controller.abort(); }, timeoutMs);
+  return fetch(url, { signal: controller.signal }).finally(function() { clearTimeout(timer); });
+}
+
 var sampleRate = 16000;
 var chunkSize = 512;
 var contextSize = 64;
@@ -7626,7 +7702,7 @@ async function loadOrt(wasmPaths) {
   const ortUrl = wasmPaths + 'ort.wasm.min.js';
 
   // Load the script by fetching and executing it
-  const response = await fetch(ortUrl);
+  const response = await fetchWithTimeout(ortUrl, 30000);
   const scriptText = await response.text();
 
   // Create a blob URL for the script
@@ -7656,7 +7732,7 @@ async function loadModel(modelUrl, sr) {
   contextSize = sr === 16000 ? 64 : 32;
 
   // Fetch model data
-  const response = await fetch(modelUrl);
+  const response = await fetchWithTimeout(modelUrl, 60000);
   if (!response.ok) {
     throw new Error('Failed to fetch model: ' + response.status + ' ' + response.statusText);
   }