@loaders.gl/i3s 4.0.0 → 4.0.2

package/dist/i3s-content-worker.js

@@ -102,7 +102,7 @@
         );
         globalThis._loadersgl_.version = NPM_TAG;
       } else {
-        globalThis._loadersgl_.version = "4.0.0";
+        globalThis._loadersgl_.version = "4.0.2";
       }
     }
     return globalThis._loadersgl_.version;
@@ -602,61 +602,69 @@
   __publicField(WorkerFarm, "_workerFarm");
 
   // ../worker-utils/src/lib/worker-farm/worker-body.ts
-  function getParentPort() {
+  async function getParentPort() {
     let parentPort;
     try {
       eval("globalThis.parentPort = require('worker_threads').parentPort");
       parentPort = globalThis.parentPort;
     } catch {
+      try {
+        eval("globalThis.workerThreadsPromise = import('worker_threads')");
+        const workerThreads = await globalThis.workerThreadsPromise;
+        parentPort = workerThreads.parentPort;
+      } catch (error) {
+        console.error(error.message);
+      }
     }
     return parentPort;
   }
   var onMessageWrapperMap = /* @__PURE__ */ new Map();
   var WorkerBody = class {
     /** Check that we are actually in a worker thread */
-    static inWorkerThread() {
-      return typeof self !== "undefined" || Boolean(getParentPort());
+    static async inWorkerThread() {
+      return typeof self !== "undefined" || Boolean(await getParentPort());
     }
     /*
      * (type: WorkerMessageType, payload: WorkerMessagePayload) => any
      */
     static set onmessage(onMessage2) {
-      function handleMessage(message) {
-        const parentPort3 = getParentPort();
-        const { type, payload } = parentPort3 ? message : message.data;
+      async function handleMessage(message) {
+        const parentPort2 = await getParentPort();
+        const { type, payload } = parentPort2 ? message : message.data;
         onMessage2(type, payload);
       }
-      const parentPort2 = getParentPort();
-      if (parentPort2) {
-        parentPort2.on("message", handleMessage);
-        parentPort2.on("exit", () => console.debug("Node worker closing"));
-      } else {
-        globalThis.onmessage = handleMessage;
-      }
+      getParentPort().then((parentPort2) => {
+        if (parentPort2) {
+          parentPort2.on("message", handleMessage);
+          parentPort2.on("exit", () => console.debug("Node worker closing"));
+        } else {
+          globalThis.onmessage = handleMessage;
+        }
+      });
     }
-    static addEventListener(onMessage2) {
+    static async addEventListener(onMessage2) {
       let onMessageWrapper = onMessageWrapperMap.get(onMessage2);
       if (!onMessageWrapper) {
-        onMessageWrapper = (message) => {
+        onMessageWrapper = async (message) => {
           if (!isKnownMessage(message)) {
             return;
           }
-          const parentPort3 = getParentPort();
+          const parentPort3 = await getParentPort();
           const { type, payload } = parentPort3 ? message : message.data;
           onMessage2(type, payload);
         };
       }
-      const parentPort2 = getParentPort();
+      const parentPort2 = await getParentPort();
       if (parentPort2) {
         console.error("not implemented");
       } else {
         globalThis.addEventListener("message", onMessageWrapper);
       }
     }
-    static removeEventListener(onMessage2) {
+    static async removeEventListener(onMessage2) {
       const onMessageWrapper = onMessageWrapperMap.get(onMessage2);
       onMessageWrapperMap.delete(onMessage2);
-      const parentPort2 = getParentPort();
+      const parentPort2 = await getParentPort();
       if (parentPort2) {
         console.error("not implemented");
       } else {
@@ -668,10 +676,10 @@
      * @param type
      * @param payload
      */
-    static postMessage(type, payload) {
+    static async postMessage(type, payload) {
       const data = { source: "loaders.gl", type, payload };
       const transferList = getTransferList(payload);
-      const parentPort2 = getParentPort();
+      const parentPort2 = await getParentPort();
       if (parentPort2) {
         parentPort2.postMessage(data, transferList);
       } else {
@@ -693,7 +701,11 @@
       url = options.workerUrl;
     }
     if (options._workerType === "test") {
-      url = `modules/${worker.module}/dist/${workerFile}`;
+      if (isBrowser2) {
+        url = `modules/${worker.module}/dist/${workerFile}`;
+      } else {
+        url = `modules/${worker.module}/src/workers/${worker.id}-worker-node.ts`;
+      }
     }
     if (!url) {
       let version = worker.version;
@@ -786,14 +798,14 @@
     return null;
   }
   async function loadAsArrayBuffer(url) {
-    if (!void 0 || url.startsWith("http")) {
+    if (isBrowser2 || !void 0 || url.startsWith("http")) {
       const response = await fetch(url);
       return await response.arrayBuffer();
     }
     return await (void 0)(url);
   }
   async function loadAsText(url) {
-    if (!void 0 || url.startsWith("http")) {
+    if (isBrowser2 || !void 0 || url.startsWith("http")) {
       const response = await fetch(url);
       return await response.text();
     }
@@ -802,8 +814,8 @@
 
   // ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
   var requestId = 0;
-  function createLoaderWorker(loader) {
-    if (!WorkerBody.inWorkerThread()) {
+  async function createLoaderWorker(loader) {
+    if (!await WorkerBody.inWorkerThread()) {
       return;
     }
     WorkerBody.onmessage = async (type, payload) => {
@@ -1343,7 +1355,7 @@
     try {
       const contentType = response.headers.get("Content-Type");
       let text = response.statusText;
-      if (contentType.includes("application/json")) {
+      if (contentType?.includes("application/json")) {
         text += ` ${await response.text()}`;
       }
       message += text;
@@ -1435,7 +1447,7 @@
   var navigator_ = globalThis.navigator || {};
 
   // ../../node_modules/@probe.gl/log/node_modules/@probe.gl/env/dist/utils/globals.js
-  var VERSION2 = true ? "4.0.0" : "untranspiled source";
+  var VERSION2 = true ? "4.0.2" : "untranspiled source";
   var isBrowser4 = isBrowser3();
 
   // ../../node_modules/@probe.gl/log/dist/utils/local-storage.js
@@ -5226,7 +5238,7 @@
   _defineProperty(Ellipsoid, "WGS84", new Ellipsoid(WGS84_RADIUS_X, WGS84_RADIUS_Y, WGS84_RADIUS_Z));
 
   // ../images/src/lib/utils/version.ts
-  var VERSION3 = true ? "4.0.0" : "latest";
+  var VERSION3 = true ? "4.0.2" : "latest";
 
   // ../images/src/lib/category-api/image-type.ts
   var parseImageNode = globalThis.loaders?.parseImageNode;
@@ -5629,7 +5641,7 @@
   };
 
   // ../draco/src/lib/utils/version.ts
-  var VERSION4 = true ? "4.0.0" : "latest";
+  var VERSION4 = true ? "4.0.2" : "latest";
 
   // ../draco/src/draco-loader.ts
   var DEFAULT_DRACO_OPTIONS = {
@@ -6310,7 +6322,7 @@
   }
 
   // ../textures/src/lib/utils/version.ts
-  var VERSION5 = true ? "4.0.0" : "beta";
+  var VERSION5 = true ? "4.0.2" : "beta";
 
   // ../textures/src/lib/parsers/basis-module-loader.ts
   var BASIS_EXTERNAL_LIBRARIES = {
@@ -7838,7 +7850,7 @@
   }
 
   // src/i3s-content-loader.ts
-  var VERSION6 = true ? "4.0.0" : "beta";
+  var VERSION6 = true ? "4.0.2" : "beta";
   var I3SContentLoader = {
     name: "I3S Content (Indexed Scene Layers)",
     id: "i3s-content",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/i3s",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "i3s .",
   "license": "MIT",
   "type": "module",
@@ -41,20 +41,20 @@
     "build-worker-node": "esbuild src/workers/i3s-content-worker-node.ts --outfile=dist/i3s-content-worker-node.js --platform=node --target=node16 --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/compression": "4.0.0",
-    "@loaders.gl/crypto": "4.0.0",
-    "@loaders.gl/draco": "4.0.0",
-    "@loaders.gl/images": "4.0.0",
-    "@loaders.gl/loader-utils": "4.0.0",
-    "@loaders.gl/schema": "4.0.0",
-    "@loaders.gl/textures": "4.0.0",
-    "@loaders.gl/tiles": "4.0.0",
+    "@loaders.gl/compression": "4.0.2",
+    "@loaders.gl/crypto": "4.0.2",
+    "@loaders.gl/draco": "4.0.2",
+    "@loaders.gl/images": "4.0.2",
+    "@loaders.gl/loader-utils": "4.0.2",
+    "@loaders.gl/schema": "4.0.2",
+    "@loaders.gl/textures": "4.0.2",
+    "@loaders.gl/tiles": "4.0.2",
     "@math.gl/core": "^4.0.0",
     "@math.gl/culling": "^4.0.0",
     "@math.gl/geospatial": "^4.0.0"
   },
   "peerDependencies": {
-    "@loaders.gl/core": "4.0.0-beta.6"
+    "@loaders.gl/core": "^4.0.0"
   },
-  "gitHead": "9b4211dc0ecd4134a1638ac0a29c5ea9008fd971"
+  "gitHead": "471058d109d5652f28c32c1f296fd632f9a5c806"
 }