@loaders.gl/worker-utils 4.4.0-alpha.2 → 4.4.0

package/dist/index.cjs

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __export = (target, all) => {
@@ -18,14 +16,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -46,6 +36,7 @@ __export(dist_exports, {
   assert: () => assert,
   canProcessOnWorker: () => canProcessOnWorker,
   createWorker: () => createWorker,
+  extractLoadLibraryOptions: () => extractLoadLibraryOptions,
   getLibraryUrl: () => getLibraryUrl,
   getTransferList: () => getTransferList,
   getTransferListForWriter: () => getTransferListForWriter,
@@ -69,8 +60,9 @@ function getVersion() {
     if (false) {
       console.warn("loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.");
       globalThis._loadersgl_.version = NPM_TAG;
+      warningIssued = true;
     } else {
-      globalThis._loadersgl_.version = "4.4.0-alpha.1";
+      globalThis._loadersgl_.version = "4.4.0";
     }
   }
   return globalThis._loadersgl_.version;
@@ -342,7 +334,8 @@ var WorkerThread = class {
     if (this.url) {
       const absolute = this.url.includes(":/") || this.url.startsWith("/");
       const url = absolute ? this.url : `./${this.url}`;
-      worker = new NodeWorker(url, { eval: false });
+      const type = this.url.endsWith(".ts") || this.url.endsWith(".mjs") ? "module" : "commonjs";
+      worker = new NodeWorker(url, { eval: false, type });
     } else if (this.source) {
       worker = new NodeWorker(this.source, { eval: true });
     } else {
@@ -672,13 +665,15 @@ function getWorkerName(worker) {
   return `${worker.name}@${worker.version}${warning}`;
 }
 function getWorkerURL(worker, options2 = {}) {
+  var _a;
   const workerOptions = options2[worker.id] || {};
   const workerFile = isBrowser ? `${worker.id}-worker.js` : `${worker.id}-worker-node.js`;
   let url = workerOptions.workerUrl;
   if (!url && worker.id === "compression") {
     url = options2.workerUrl;
   }
-  if (options2._workerType === "test") {
+  const workerType = options2._workerType || ((_a = options2 == null ? void 0 : options2.core) == null ? void 0 : _a._workerType);
+  if (workerType === "test") {
     if (isBrowser) {
       url = `modules/${worker.module}/dist/${workerFile}`;
     } else {
@@ -905,6 +900,17 @@ function validateWorkerVersion(worker, coreVersion = VERSION) {
 
 // dist/lib/library-utils/library-utils.js
 var loadLibraryPromises = {};
+function extractLoadLibraryOptions(options2 = {}) {
+  var _a, _b;
+  const useLocalLibraries = options2.useLocalLibraries ?? ((_a = options2.core) == null ? void 0 : _a.useLocalLibraries);
+  const CDN = options2.CDN ?? ((_b = options2.core) == null ? void 0 : _b.CDN);
+  const modules = options2.modules;
+  return {
+    ...useLocalLibraries !== void 0 ? { useLocalLibraries } : {},
+    ...CDN !== void 0 ? { CDN } : {},
+    ...modules !== void 0 ? { modules } : {}
+  };
+}
 async function loadLibrary(libraryUrl, moduleName = null, options2 = {}, libraryName = null) {
   if (moduleName) {
     libraryUrl = getLibraryUrl(libraryUrl, moduleName, options2, libraryName);
@@ -914,6 +920,9 @@ async function loadLibrary(libraryUrl, moduleName = null, options2 = {}, library
   return await loadLibraryPromises[libraryUrl];
 }
 function getLibraryUrl(library, moduleName, options2 = {}, libraryName = null) {
+  if (options2 == null ? void 0 : options2.core) {
+    throw new Error("loadLibrary: options.core must be pre-normalized");
+  }
   if (!options2.useLocalLibraries && library.startsWith("http")) {
     return library;
   }
@@ -939,10 +948,20 @@ async function loadLibraryFromFile(libraryUrl) {
     return await loadAsArrayBuffer(libraryUrl);
   }
   if (!isBrowser) {
+    const { requireFromFile } = globalThis.loaders || {};
     try {
-      const { requireFromFile } = globalThis.loaders || {};
-      return await (requireFromFile == null ? void 0 : requireFromFile(libraryUrl));
+      const result = await (requireFromFile == null ? void 0 : requireFromFile(libraryUrl));
+      if (result || !libraryUrl.includes("/dist/libs/")) {
+        return result;
+      }
+      return await (requireFromFile == null ? void 0 : requireFromFile(libraryUrl.replace("/dist/libs/", "/src/libs/")));
     } catch (error) {
+      if (libraryUrl.includes("/dist/libs/")) {
+        try {
+          return await (requireFromFile == null ? void 0 : requireFromFile(libraryUrl.replace("/dist/libs/", "/src/libs/")));
+        } catch {
+        }
+      }
       console.error(error);
       return null;
     }
@@ -978,7 +997,14 @@ async function loadAsArrayBuffer(url) {
     const response = await fetch(url);
     return await response.arrayBuffer();
   }
-  return await readFileAsArrayBuffer(url);
+  try {
+    return await readFileAsArrayBuffer(url);
+  } catch {
+    if (url.includes("/dist/libs/")) {
+      return await readFileAsArrayBuffer(url.replace("/dist/libs/", "/src/libs/"));
+    }
+    throw new Error(`Failed to load ArrayBuffer from ${url}`);
+  }
 }
 async function loadAsText(url) {
   const { readFileAsText } = globalThis.loaders || {};
@@ -986,135 +1012,29 @@ async function loadAsText(url) {
     const response = await fetch(url);
     return await response.text();
   }
-  return await readFileAsText(url);
-}
-
-// dist/lib/process-utils/child-process-proxy.js
-var ChildProcess2 = __toESM(require("child_process"), 1);
-
-// dist/lib/process-utils/process-utils.js
-var import_child_process = __toESM(require("child_process"), 1);
-function getAvailablePort(defaultPort = 3e3) {
-  return new Promise((resolve) => {
-    import_child_process.default.exec("lsof -i -P -n | grep LISTEN", (error, stdout) => {
-      if (error) {
-        resolve(defaultPort);
-        return;
-      }
-      const portsInUse = [];
-      const regex = /:(\d+) \(LISTEN\)/;
-      stdout.split("\n").forEach((line) => {
-        const match = regex.exec(line);
-        if (match) {
-          portsInUse.push(Number(match[1]));
-        }
-      });
-      let port = defaultPort;
-      while (portsInUse.includes(port)) {
-        port++;
-      }
-      resolve(port);
-    });
-  });
+  try {
+    return await readFileAsText(url);
+  } catch {
+    if (url.includes("/dist/libs/")) {
+      return await readFileAsText(url.replace("/dist/libs/", "/src/libs/"));
+    }
+    throw new Error(`Failed to load text from ${url}`);
+  }
 }
 
-// dist/lib/process-utils/child-process-proxy.js
-var DEFAULT_PROPS2 = {
-  command: "",
-  arguments: [],
-  port: 5e3,
-  autoPort: true,
-  wait: 2e3,
-  onSuccess: (processProxy) => {
-    console.log(`Started ${processProxy.props.command}`);
-  }
-};
+// dist/lib/process-utils/child-process-proxy.browser.js
 var ChildProcessProxy = class {
-  id;
-  props = { ...DEFAULT_PROPS2 };
-  childProcess = null;
-  port = 0;
-  successTimer;
-  // NodeJS.Timeout;
-  // constructor(props?: {id?: string});
-  constructor({ id = "browser-driver" } = {}) {
-    this.id = id;
-  }
-  /** Starts a child process with the provided props */
+  constructor() {
+    throw new Error("ChildProcessProxy is not available in browser environments");
+  }
   async start(props) {
-    props = { ...DEFAULT_PROPS2, ...props };
-    this.props = props;
-    const args = [...props.arguments];
-    this.port = Number(props.port);
-    if (props.portArg) {
-      if (props.autoPort) {
-        this.port = await getAvailablePort(props.port);
-      }
-      args.push(props.portArg, String(this.port));
-    }
-    return await new Promise((resolve, reject) => {
-      try {
-        this._setTimeout(() => {
-          if (props.onSuccess) {
-            props.onSuccess(this);
-          }
-          resolve({});
-        });
-        console.log(`Spawning ${props.command} ${props.arguments.join(" ")}`);
-        const childProcess = ChildProcess2.spawn(props.command, args, props.spawn);
-        this.childProcess = childProcess;
-        childProcess.stdout.on("data", (data) => {
-          console.log(data.toString());
-        });
-        childProcess.stderr.on("data", (data) => {
-          console.log(`Child process wrote to stderr: "${data}".`);
-          if (!props.ignoreStderr) {
-            this._clearTimeout();
-            reject(new Error(data));
-          }
-        });
-        childProcess.on("error", (error) => {
-          console.log(`Child process errored with ${error}`);
-          this._clearTimeout();
-          reject(error);
-        });
-        childProcess.on("close", (code) => {
-          console.log(`Child process exited with ${code}`);
-          this.childProcess = null;
-          this._clearTimeout();
-          resolve({});
-        });
-      } catch (error) {
-        reject(error);
-      }
-    });
+    return await Promise.resolve({});
   }
-  /** Stops a running child process */
   async stop() {
-    if (this.childProcess) {
-      this.childProcess.kill();
-      this.childProcess = null;
-    }
-  }
-  /** Exits this process */
-  async exit(statusCode = 0) {
-    try {
-      await this.stop();
-      process.exit(statusCode);
-    } catch (error) {
-      console.error(error.message || error);
-      process.exit(1);
-    }
+    return await Promise.resolve();
   }
-  _setTimeout(callback) {
-    if (Number(this.props.wait) > 0) {
-      this.successTimer = setTimeout(callback, this.props.wait);
-    }
-  }
-  _clearTimeout() {
-    if (this.successTimer) {
-      clearTimeout(this.successTimer);
-    }
+  async exit() {
+    return await Promise.resolve();
   }
 };