@doki-land/live2d-loader 0.0.23 → 0.0.24

package/dist/index.d.ts

@@ -1,23 +1,27 @@
 import { ModelFormat, ModelSettings, AssetKey, AssetResolver } from '@doki-land/live2d-core';
 
 /**
- * Fetch helpers with optional byte-level progress.
+ * Fetch helpers with optional byte-level progress and AbortSignal.
  */
 type FetchProgressHandler = (update: {
     bytesLoaded: number;
     bytesTotal: number | null;
 }) => void;
+type FetchInit = {
+    signal?: AbortSignal;
+};
 /**
  * Fetch bytes with progress. Uses `arrayBuffer()` when streaming is unavailable
  * or when Content-Length is known (avoids stuck ReadableStream readers in some
  * embedded Chromium hosts during rapid remounts).
  */
-declare function fetchArrayBufferWithProgress(url: string, onProgress?: FetchProgressHandler): Promise<ArrayBuffer>;
-declare function fetchJsonWithProgress(url: string, onProgress?: FetchProgressHandler): Promise<unknown>;
+declare function fetchArrayBufferWithProgress(url: string, onProgress?: FetchProgressHandler, init?: FetchInit): Promise<ArrayBuffer>;
+declare function fetchJsonWithProgress(url: string, onProgress?: FetchProgressHandler, init?: FetchInit): Promise<unknown>;
 
 /** Resolve a relative asset URL against the model settings URL. */
 declare function resolveAssetUrl(baseUrl: string, relative: string): string;
 interface UrlAssetResolverOptions {
+    signal?: AbortSignal;
     onBytesProgress?: (key: AssetKey, update: {
         bytesLoaded: number;
         bytesTotal: number | null;
@@ -36,7 +40,9 @@ declare function runLoadPipeline(ctx: LoadPipelineContext, middlewares: LoadMidd
 declare function fetchModelJson(url: string, onProgress?: (update: {
     bytesLoaded: number;
     bytesTotal: number | null;
-}) => void): Promise<unknown>;
+}) => void, init?: {
+    signal?: AbortSignal;
+}): Promise<unknown>;
 /** Detect moc2 vs moc3 from settings JSON shape (core helper; throws if unknown). */
 declare function detectModelFormat(json: unknown): ModelFormat;
 /** Normalize raw model3.json / model.json into ModelSettings. */

package/dist/index.js

@@ -6,8 +6,8 @@ function safeProgress(onProgress, update) {
   } catch {
   }
 }
-async function fetchArrayBufferWithProgress(url, onProgress) {
-  const res = await fetch(url);
+async function fetchArrayBufferWithProgress(url, onProgress, init) {
+  const res = await fetch(url, { signal: init?.signal });
   if (!res.ok) {
     throw new Error(
       `@doki-land/live2d-loader: failed to fetch bytes (${res.status}): ${url}`
@@ -49,8 +49,8 @@ async function fetchArrayBufferWithProgress(url, onProgress) {
   });
   return out.buffer;
 }
-async function fetchJsonWithProgress(url, onProgress) {
-  const bytes = await fetchArrayBufferWithProgress(url, onProgress);
+async function fetchJsonWithProgress(url, onProgress, init) {
+  const bytes = await fetchArrayBufferWithProgress(url, onProgress, init);
   const text = new TextDecoder().decode(bytes);
   return JSON.parse(text);
 }
@@ -77,15 +77,23 @@ function createUrlAssetResolver(baseUrl, options = {}) {
     },
     async fetchJson(key) {
       const url = resolveAssetUrl(baseUrl, key);
-      return fetchJsonWithProgress(url, (update) => {
-        options.onBytesProgress?.(key, update);
-      });
+      return fetchJsonWithProgress(
+        url,
+        (update) => {
+          options.onBytesProgress?.(key, update);
+        },
+        { signal: options.signal }
+      );
     },
     async fetchBytes(key) {
       const url = resolveAssetUrl(baseUrl, key);
-      return fetchArrayBufferWithProgress(url, (update) => {
-        options.onBytesProgress?.(key, update);
-      });
+      return fetchArrayBufferWithProgress(
+        url,
+        (update) => {
+          options.onBytesProgress?.(key, update);
+        },
+        { signal: options.signal }
+      );
     }
   };
 }
@@ -99,8 +107,8 @@ async function runLoadPipeline(ctx, middlewares) {
   await dispatch();
   return ctx;
 }
-async function fetchModelJson(url, onProgress) {
-  return fetchJsonWithProgress(url, onProgress);
+async function fetchModelJson(url, onProgress, init) {
+  return fetchJsonWithProgress(url, onProgress, init);
 }
 function detectModelFormat(json) {
   if (!json || typeof json !== "object") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@doki-land/live2d-loader",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "description": "Fetch and normalize Live2D model.json/model3.json, resolve npm: URLs, AssetResolver for moc/textures.",
   "type": "module",
   "license": "MIT",
@@ -42,7 +42,7 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@doki-land/live2d-core": "0.0.23"
+    "@doki-land/live2d-core": "0.0.24"
   },
   "sideEffects": false
 }

package/src/fetch/index.ts

@@ -1,5 +1,5 @@
 /**
- * Fetch helpers with optional byte-level progress.
+ * Fetch helpers with optional byte-level progress and AbortSignal.
  */
 
 export type FetchProgressHandler = (update: {
@@ -7,6 +7,10 @@ export type FetchProgressHandler = (update: {
     bytesTotal: number | null;
 }) => void;
 
+export type FetchInit = {
+    signal?: AbortSignal;
+};
+
 function safeProgress(
     onProgress: FetchProgressHandler | undefined,
     update: { bytesLoaded: number; bytesTotal: number | null },
@@ -27,8 +31,9 @@ function safeProgress(
 export async function fetchArrayBufferWithProgress(
     url: string,
     onProgress?: FetchProgressHandler,
+    init?: FetchInit,
 ): Promise<ArrayBuffer> {
-    const res = await fetch(url);
+    const res = await fetch(url, { signal: init?.signal });
     if (!res.ok) {
         throw new Error(
             `@doki-land/live2d-loader: failed to fetch bytes (${res.status}): ${url}`,
@@ -82,8 +87,9 @@ export async function fetchArrayBufferWithProgress(
 export async function fetchJsonWithProgress(
     url: string,
     onProgress?: FetchProgressHandler,
+    init?: FetchInit,
 ): Promise<unknown> {
-    const bytes = await fetchArrayBufferWithProgress(url, onProgress);
+    const bytes = await fetchArrayBufferWithProgress(url, onProgress, init);
     const text = new TextDecoder().decode(bytes);
     return JSON.parse(text) as unknown;
 }

package/src/pipeline/index.ts

@@ -28,6 +28,7 @@ export function resolveAssetUrl(baseUrl: string, relative: string): string {
 }
 
 export interface UrlAssetResolverOptions {
+    signal?: AbortSignal;
     onBytesProgress?: (
         key: AssetKey,
         update: { bytesLoaded: number; bytesTotal: number | null },
@@ -45,15 +46,23 @@ export function createUrlAssetResolver(
         },
         async fetchJson(key: AssetKey) {
             const url = resolveAssetUrl(baseUrl, key);
-            return fetchJsonWithProgress(url, (update) => {
-                options.onBytesProgress?.(key, update);
-            });
+            return fetchJsonWithProgress(
+                url,
+                (update) => {
+                    options.onBytesProgress?.(key, update);
+                },
+                { signal: options.signal },
+            );
         },
         async fetchBytes(key: AssetKey) {
             const url = resolveAssetUrl(baseUrl, key);
-            return fetchArrayBufferWithProgress(url, (update) => {
-                options.onBytesProgress?.(key, update);
-            });
+            return fetchArrayBufferWithProgress(
+                url,
+                (update) => {
+                    options.onBytesProgress?.(key, update);
+                },
+                { signal: options.signal },
+            );
         },
     };
 }
@@ -91,8 +100,9 @@ export async function fetchModelJson(
         bytesLoaded: number;
         bytesTotal: number | null;
     }) => void,
+    init?: { signal?: AbortSignal },
 ): Promise<unknown> {
-    return fetchJsonWithProgress(url, onProgress);
+    return fetchJsonWithProgress(url, onProgress, init);
 }
 
 /** Detect moc2 vs moc3 from settings JSON shape (core helper; throws if unknown). */