@loaders.gl/core 3.1.6 → 3.2.0-alpha.1

package/dist/null-worker.js

@@ -35,16 +35,33 @@
   }
 
   // ../worker-utils/src/lib/worker-farm/worker-body.ts
+  function getParentPort() {
+    let parentPort;
+    try {
+      eval("globalThis.parentPort = require('worker_threads').parentPort");
+      parentPort = globalThis.parentPort;
+    } catch {
+    }
+    return parentPort;
+  }
   var onMessageWrapperMap = new Map();
   var WorkerBody = class {
+    static inWorkerThread() {
+      return typeof self !== "undefined" || Boolean(getParentPort());
+    }
     static set onmessage(onMessage) {
-      self.onmessage = (message) => {
-        if (!isKnownMessage(message)) {
-          return;
-        }
-        const { type, payload } = message.data;
+      function handleMessage(message) {
+        const parentPort3 = getParentPort();
+        const { type, payload } = parentPort3 ? message : message.data;
         onMessage(type, payload);
-      };
+      }
+      const parentPort2 = getParentPort();
+      if (parentPort2) {
+        parentPort2.on("message", handleMessage);
+        parentPort2.on("exit", () => console.debug("Node worker closing"));
+      } else {
+        globalThis.onmessage = handleMessage;
+      }
     }
     static addEventListener(onMessage) {
       let onMessageWrapper = onMessageWrapperMap.get(onMessage);
@@ -53,22 +70,36 @@
           if (!isKnownMessage(message)) {
             return;
           }
-          const { type, payload } = message.data;
+          const parentPort3 = getParentPort();
+          const { type, payload } = parentPort3 ? message : message.data;
           onMessage(type, payload);
         };
       }
-      self.addEventListener("message", onMessageWrapper);
+      const parentPort2 = getParentPort();
+      if (parentPort2) {
+        console.error("not implemented");
+      } else {
+        globalThis.addEventListener("message", onMessageWrapper);
+      }
     }
     static removeEventListener(onMessage) {
       const onMessageWrapper = onMessageWrapperMap.get(onMessage);
       onMessageWrapperMap.delete(onMessage);
-      self.removeEventListener("message", onMessageWrapper);
+      const parentPort2 = getParentPort();
+      if (parentPort2) {
+        console.error("not implemented");
+      } else {
+        globalThis.removeEventListener("message", onMessageWrapper);
+      }
     }
     static postMessage(type, payload) {
-      if (self) {
-        const data = { source: "loaders.gl", type, payload };
-        const transferList = getTransferList(payload);
-        self.postMessage(data, transferList);
+      const data = { source: "loaders.gl", type, payload };
+      const transferList = getTransferList(payload);
+      const parentPort2 = getParentPort();
+      if (parentPort2) {
+        parentPort2.postMessage(data, transferList);
+      } else {
+        globalThis.postMessage(data, transferList);
       }
     }
   };
@@ -80,7 +111,7 @@
   // ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
   var requestId = 0;
   function createLoaderWorker(loader) {
-    if (typeof self === "undefined") {
+    if (!WorkerBody.inWorkerThread()) {
       return;
     }
     WorkerBody.onmessage = async (type, payload) => {
@@ -152,7 +183,7 @@
   }
 
   // src/null-loader.ts
-  var VERSION = true ? "3.1.6" : "latest";
+  var VERSION = true ? "3.2.0-alpha.1" : "latest";
   var NullLoader = {
     name: "Null loader",
     id: "null",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/core",
-  "version": "3.1.6",
+  "version": "3.2.0-alpha.1",
   "description": "Framework-independent loaders for 3D graphics formats",
   "license": "MIT",
   "publishConfig": {
@@ -25,6 +25,8 @@
     "fs": false,
     "stream": false,
     "./src/iterators/make-stream/make-node-stream.ts": "./src/iterators/make-stream/make-dom-stream.ts",
+    "./src/iterators/make-stream/make-node-stream.js": "./src/iterators/make-stream/make-dom-stream.js",
+    "./dist/iterators/make-stream/make-node-stream.js": "./dist/iterators/make-stream/make-dom-stream.js",
     "./dist/es5/iterators/make-stream/make-node-stream.js": "./dist/es5/iterators/make-stream/make-dom-stream.js",
     "./dist/esm/iterators/make-stream/make-node-stream.js": "./dist/esm/iterators/make-stream/make-dom-stream.js"
   },
@@ -40,9 +42,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.3.1",
-    "@loaders.gl/loader-utils": "3.1.6",
-    "@loaders.gl/worker-utils": "3.1.6",
+    "@loaders.gl/loader-utils": "3.2.0-alpha.1",
+    "@loaders.gl/worker-utils": "3.2.0-alpha.1",
+    "@probe.gl/log": "^3.5.0",
     "probe.gl": "^3.4.0"
   },
-  "gitHead": "4fe0724b942697a95ff3eb3af47b7a7c18556c52"
+  "gitHead": "423a2815092b08dcf93ad5b7dc2940b167305afe"
 }

package/src/lib/api/select-loader.ts

@@ -1,6 +1,7 @@
 import type {LoaderContext, LoaderOptions, Loader} from '@loaders.gl/loader-utils';
 import {compareArrayBuffers, path} from '@loaders.gl/loader-utils';
 import {normalizeLoader} from '../loader-utils/normalize-loader';
+import {log} from '../utils/log';
 import {getResourceUrlAndType} from '../utils/resource-utils';
 import {getRegisteredLoaders} from './register-loaders';
 import {isBlob} from '../../javascript-utils/is-type';
@@ -103,6 +104,7 @@ export function selectLoaderSync(
 }
 
 /** Implements loaders selection logic */
+// eslint-disable-next-line complexity
 function selectLoaderInternal(
   data: Response | Blob | ArrayBuffer | string,
   loaders: Loader[],
@@ -114,19 +116,33 @@ function selectLoaderInternal(
   const testUrl = url || context?.url;
 
   let loader: Loader | null = null;
+  let reason: string = '';
 
   // if options.mimeType is supplied, it takes precedence
   if (options?.mimeType) {
     loader = findLoaderByMIMEType(loaders, options?.mimeType);
+    reason = `match forced by supplied MIME type ${options?.mimeType}`;
   }
+
   // Look up loader by url
   loader = loader || findLoaderByUrl(loaders, testUrl);
+  reason = reason || (loader ? `matched url ${testUrl}` : '');
+
   // Look up loader by mime type
   loader = loader || findLoaderByMIMEType(loaders, type);
+  reason = reason || (loader ? `matched MIME type ${type}` : '');
+
   // Look for loader via initial bytes (Note: not always accessible (e.g. Response, stream, async iterator)
   loader = loader || findLoaderByInitialBytes(loaders, data);
+  reason = reason || (loader ? `matched initial data ${getFirstCharacters(data)}` : '');
+
   // Look up loader by fallback mime type
   loader = loader || findLoaderByMIMEType(loaders, options?.fallbackMimeType);
+  reason = reason || (loader ? `matched fallback MIME type ${type}` : '');
+
+  if (reason) {
+    log.log(1, `selectLoader selected ${loader?.name}: ${reason}.`);
+  }
 
   return loader;
 }

package/src/lib/init.ts

@@ -1,10 +1,17 @@
+// loaders.gl, MIT license
+import {log} from './utils/log';
+
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
 const version = typeof __VERSION__ !== 'undefined' ? __VERSION__ : '';
 
 // @ts-ignore
-globalThis.loaders = Object.assign(globalThis.loaders || {}, {
-  VERSION: version
-});
+if (!globalThis.loaders) {
+  log.log(1, `loaders.gl ${version}`)();
 
+  globalThis.loaders = Object.assign(globalThis.loaders || {}, {
+    VERSION: version,
+    log
+  });
+}
 // @ts-ignore
 export default globalThis.loaders;

package/src/lib/loader-utils/option-defaults.ts

@@ -1,4 +1,5 @@
 import type {LoaderOptions} from '@loaders.gl/loader-utils';
+import {isBrowser} from '@loaders.gl/loader-utils';
 import {ConsoleLog} from './loggers';
 
 export const DEFAULT_LOADER_OPTIONS: LoaderOptions = {
@@ -12,7 +13,8 @@ export const DEFAULT_LOADER_OPTIONS: LoaderOptions = {
   worker: true, // By default, use worker if provided by loader.
   maxConcurrency: 3, // How many worker instances should be created for each loader.
   maxMobileConcurrency: 1, // How many worker instances should be created for each loader on mobile devices.
-  reuseWorkers: true, // By default reuse workers,
+  reuseWorkers: isBrowser, // By default reuse workers in browser (Node.js refuses to terminate if browsers are running)
+  _nodeWorkers: false, // By default do not support node workers
   _workerType: '', // 'test' to use locally generated workers
 
   limit: 0,

package/src/lib/utils/log.ts

@@ -0,0 +1,4 @@
+// loaders.gl, MIT license
+import {Log} from '@probe.gl/log';
+
+export const log = new Log({id: 'loaders.gl'});