@openheart/tavio-renderer 2.3.2-with-wasm → 2.3.3-with-wasm

package/build/esm/index.js

@@ -37463,19 +37463,36 @@ function WorkerWrapper$1(options) {
     );
   }
 }
+let wasmPkgBaseUrlOverride = null;
+function setWasmPkgBaseUrl(url) {
+  const u = url.trim();
+  wasmPkgBaseUrlOverride = u.endsWith("/") ? u : `${u}/`;
+}
+function getWasmPkgBaseUrl() {
+  if (wasmPkgBaseUrlOverride != null) {
+    return wasmPkgBaseUrlOverride;
+  }
+  return new URL(
+    /* @vite-ignore */
+    "./wasm/pkg/",
+    import.meta.url
+  ).href;
+}
 const TavioWasm = /* @__PURE__ */ (() => {
   let instancePromise = null;
   return () => {
     if (instancePromise == null) {
       instancePromise = (async () => {
-        const isThreadSupported = false;
-        const instance = isThreadSupported ? (
-          // @ts-ignore
-          await import("./wasm/pkg/thread/tavio.js")
-        ) : (
-          // @ts-ignore
-          await import("./wasm/pkg/no-thread/tavio.js")
-        );
+        let instance;
+        {
+          const raw = getWasmPkgBaseUrl();
+          const base = raw.endsWith("/") ? raw : `${raw}/`;
+          const href = new URL("no-thread/tavio.js", base).href;
+          instance = await import(
+            /* @vite-ignore */
+            href
+          );
+        }
         console.info("[TavioMesh] Initializing WASM...");
         try {
           await instance.default();
@@ -37503,7 +37520,7 @@ const TavioWasm = /* @__PURE__ */ (() => {
 })();
 function WorkerWrapper(options) {
   return new Worker(
-    "" + new URL("wasm-worker-CEuC2YyS.js", import.meta.url).href,
+    "" + new URL("wasm-worker-_2ktlwfC.js", import.meta.url).href,
     {
       type: "module",
       name: options?.name
@@ -37521,7 +37538,10 @@ class TavioWasmWorkerClient {
     this.worker.onmessage = this.handleMessage;
     this.worker.postMessage({
       kind: "init",
-      options
+      options: {
+        ...options,
+        wasmPkgBaseUrl: options?.wasmPkgBaseUrl ?? getWasmPkgBaseUrl()
+      }
     });
     this.readyPromise = new Promise((resolve) => {
       this.readyResolve = resolve;
@@ -45204,5 +45224,7 @@ export {
   Core,
   TavioError,
   TavioErrorCode,
-  Core as default
+  Core as default,
+  getWasmPkgBaseUrl,
+  setWasmPkgBaseUrl
 };

package/build/esm/types/module.d.ts

@@ -2,4 +2,5 @@ import { Core, TavioError, TavioErrorCode } from './viewer/canvas';
 import { iAnimationConfig } from './animation/animationController';
 export { Core, TavioError, TavioErrorCode };
 export type { iAnimationConfig };
+export { getWasmPkgBaseUrl, setWasmPkgBaseUrl } from './wasm-bindings/wasm-pkg-base-url';
 export default Core;

package/build/esm/types/wasm-bindings/wasm-pkg-base-url.d.ts

@@ -1,6 +1,2 @@
-/**
- * wasm/pkg のベース URL（末尾スラッシュ付き）。
- * - ライブラリ本番ビルド（build/esm/index.js）: index と同階層の ./wasm/pkg/
- * - Vite 開発サーバ: ソースは src/wasm-bindings 配下のためリポジトリルートの ../../wasm/pkg/
- */
+export declare function setWasmPkgBaseUrl(url: string): void;
 export declare function getWasmPkgBaseUrl(): string;

package/build/esm/types/wasm-bindings/wasm-worker.d.ts

@@ -13,6 +13,8 @@ export type WasmWorkerInitRequest = {
     options?: {
         useSharedArrayBuffer?: boolean;
         threadCount?: number;
+        /** メインスレッドの {@link getWasmPkgBaseUrl} を渡す（バンドラで Worker の import.meta.url が壊れる場合に必須） */
+        wasmPkgBaseUrl?: string;
     };
 };
 export type WasmWorkerRegisterEventHandlerRequest = {

package/build/esm/{wasm-worker-CEuC2YyS.js → wasm-worker-_2ktlwfC.js}

@@ -42,16 +42,13 @@ self.onmessage = async (e) => {
       break;
   }
 };
-async function importWasmBindings(useSharedArrayBuffer) {
-  const href = useSharedArrayBuffer ? new URL(
+async function importWasmBindings(useSharedArrayBuffer, wasmPkgBaseUrl) {
+  const base = wasmPkgBaseUrl != null && wasmPkgBaseUrl !== "" ? wasmPkgBaseUrl.endsWith("/") ? wasmPkgBaseUrl : `${wasmPkgBaseUrl}/` : new URL(
     /* @vite-ignore */
-    "./wasm/pkg/thread/tavio.js",
-    import.meta.url
-  ).href : new URL(
-    /* @vite-ignore */
-    "./wasm/pkg/no-thread/tavio.js",
+    "./wasm/pkg/",
     import.meta.url
   ).href;
+  const href = useSharedArrayBuffer ? new URL("thread/tavio.js", base).href : new URL("no-thread/tavio.js", base).href;
   return await import(
     /* @vite-ignore */
     href
@@ -64,7 +61,10 @@ async function init(options) {
     navigator.hardwareConcurrency
   );
   const isParallel = useSharedArrayBuffer && threadCount > 1;
-  wasm = await importWasmBindings(useSharedArrayBuffer);
+  wasm = await importWasmBindings(
+    useSharedArrayBuffer,
+    options?.wasmPkgBaseUrl
+  );
   try {
     await wasm.default();
     console.info(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openheart/tavio-renderer",
-  "version": "2.3.2-with-wasm",
+  "version": "2.3.3-with-wasm",
   "author": "OpenHeart Inc.",
   "license": "UNLICENSED",
   "description": "Rendering Engine for Tavio Format 3D data",