@loaders.gl/worker-utils 4.0.0-beta.3 → 4.0.0-beta.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.cjs
CHANGED
|
@@ -948,7 +948,7 @@ function loadLibraryFromString(scriptSource, id) {
|
|
|
948
948
|
return void 0 && (void 0)(scriptSource, id);
|
|
949
949
|
}
|
|
950
950
|
if (isWorker) {
|
|
951
|
-
eval.call(
|
|
951
|
+
eval.call(globalThis, scriptSource);
|
|
952
952
|
return null;
|
|
953
953
|
}
|
|
954
954
|
const script = document.createElement("script");
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { isBrowser, isWorker } from "../env-utils/globals.js";
|
|
2
2
|
import * as node from "../node/require-utils.node.js";
|
|
3
3
|
import { assert } from "../env-utils/assert.js";
|
|
4
4
|
import { VERSION } from "../env-utils/version.js";
|
|
@@ -59,7 +59,7 @@ function loadLibraryFromString(scriptSource, id) {
|
|
|
59
59
|
return node.requireFromString && node.requireFromString(scriptSource, id);
|
|
60
60
|
}
|
|
61
61
|
if (isWorker) {
|
|
62
|
-
eval.call(
|
|
62
|
+
eval.call(globalThis, scriptSource);
|
|
63
63
|
return null;
|
|
64
64
|
}
|
|
65
65
|
const script = document.createElement('script');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library-utils.js","names":["
|
|
1
|
+
{"version":3,"file":"library-utils.js","names":["isBrowser","isWorker","node","assert","VERSION","loadLibraryPromises","loadLibrary","libraryUrl","moduleName","arguments","length","undefined","options","libraryName","getLibraryUrl","loadLibraryFromFile","library","useLocalLibraries","startsWith","modules","CDN","endsWith","loadAsArrayBuffer","requireFromFile","error","console","importScripts","scriptSource","loadAsText","loadLibraryFromString","id","requireFromString","eval","call","globalThis","script","document","createElement","appendChild","createTextNode","e","text","body","url","readFileAsArrayBuffer","response","fetch","arrayBuffer","readFileAsText"],"sources":["../../../src/lib/library-utils/library-utils.ts"],"sourcesContent":["/* global importScripts */\nimport {isBrowser, isWorker} from '../env-utils/globals';\nimport * as node from '../node/require-utils.node';\nimport {assert} from '../env-utils/assert';\nimport {VERSION} from '../env-utils/version';\n\nconst loadLibraryPromises: Record<string, Promise<any>> = {}; // promises\n\n/**\n * Dynamically loads a library (\"module\")\n *\n * - wasm library: Array buffer is returned\n * - js library: Parse JS is returned\n *\n * Method depends on environment\n * - browser - script element is created and installed on document\n * - worker - eval is called on global context\n * - node - file is required\n *\n * @param libraryUrl\n * @param moduleName\n * @param options\n */\nexport async function loadLibrary(\n libraryUrl: string,\n moduleName: string | null = null,\n options: object = {},\n libraryName: string | null = null\n): Promise<any> {\n if (moduleName) {\n libraryUrl = getLibraryUrl(libraryUrl, moduleName, options, libraryName);\n }\n // Ensure libraries are only loaded once\n\n loadLibraryPromises[libraryUrl] =\n // eslint-disable-next-line @typescript-eslint/no-misused-promises\n loadLibraryPromises[libraryUrl] || loadLibraryFromFile(libraryUrl);\n return await loadLibraryPromises[libraryUrl];\n}\n\n// TODO - sort out how to resolve paths for main/worker and dev/prod\nexport function getLibraryUrl(\n library: string,\n moduleName?: string,\n options: any = {},\n libraryName: string | null = null\n): string {\n // Check if already a URL\n if (!options.useLocalLibraries && library.startsWith('http')) {\n return library;\n }\n\n libraryName = libraryName || library;\n\n // Allow application to import and supply libraries through `options.modules`\n const modules = options.modules || {};\n if (modules[libraryName]) {\n return modules[libraryName];\n }\n\n // Load from local files, not from CDN scripts in Node.js\n // TODO - needs to locate the modules directory when installed!\n if (!isBrowser) {\n return `modules/${moduleName}/dist/libs/${libraryName}`;\n }\n\n // In browser, load from external scripts\n if (options.CDN) {\n assert(options.CDN.startsWith('http'));\n return `${options.CDN}/${moduleName}@${VERSION}/dist/libs/${libraryName}`;\n }\n\n // TODO - loading inside workers requires paths relative to worker script location...\n if (isWorker) {\n return `../src/libs/${libraryName}`;\n }\n\n return `modules/${moduleName}/src/libs/${libraryName}`;\n}\n\nasync function loadLibraryFromFile(libraryUrl: string): Promise<any> {\n if (libraryUrl.endsWith('wasm')) {\n return await loadAsArrayBuffer(libraryUrl);\n }\n\n if (!isBrowser) {\n // TODO - Node doesn't yet support dynamic import from https URLs\n // try {\n // return await import(libraryUrl);\n // } catch (error) {\n // console.error(error);\n // }\n try {\n return node && node.requireFromFile && (await node.requireFromFile(libraryUrl));\n } catch (error) {\n console.error(error); // eslint-disable-line no-console\n return null;\n }\n }\n if (isWorker) {\n return importScripts(libraryUrl);\n }\n // TODO - fix - should be more secure than string parsing since observes CORS\n // if (isBrowser) {\n // return await loadScriptFromFile(libraryUrl);\n // }\n\n const scriptSource = await loadAsText(libraryUrl);\n return loadLibraryFromString(scriptSource, libraryUrl);\n}\n\n/*\nasync function loadScriptFromFile(libraryUrl) {\n const script = document.createElement('script');\n script.src = libraryUrl;\n return await new Promise((resolve, reject) => {\n script.onload = data => {\n resolve(data);\n };\n script.onerror = reject;\n });\n}\n*/\n\n// TODO - Needs security audit...\n// - Raw eval call\n// - Potentially bypasses CORS\n// Upside is that this separates fetching and parsing\n// we could create a`LibraryLoader` or`ModuleLoader`\nfunction loadLibraryFromString(scriptSource: string, id: string): null | any {\n if (!isBrowser) {\n return node.requireFromString && node.requireFromString(scriptSource, id);\n }\n\n if (isWorker) {\n // Use lvalue trick to make eval run in global scope\n eval.call(globalThis, scriptSource); // eslint-disable-line no-eval\n // https://stackoverflow.com/questions/9107240/1-evalthis-vs-evalthis-in-javascript\n // http://perfectionkills.com/global-eval-what-are-the-options/\n return null;\n }\n\n const script = document.createElement('script');\n script.id = id;\n // most browsers like a separate text node but some throw an error. The second method covers those.\n try {\n script.appendChild(document.createTextNode(scriptSource));\n } catch (e) {\n script.text = scriptSource;\n }\n document.body.appendChild(script);\n return null;\n}\n\n// TODO - technique for module injection into worker, from THREE.DracoLoader...\n/*\nfunction combineWorkerWithLibrary(worker, jsContent) {\n var fn = wWorker.toString();\n var body = [\n '// injected',\n jsContent,\n '',\n '// worker',\n fn.substring(fn.indexOf('{') + 1, fn.lastIndexOf('}'))\n ].join('\\n');\n this.workerSourceURL = URL.createObjectURL(new Blob([body]));\n}\n*/\n\nasync function loadAsArrayBuffer(url: string): Promise<ArrayBuffer> {\n if (!node.readFileAsArrayBuffer || url.startsWith('http')) {\n const response = await fetch(url);\n return await response.arrayBuffer();\n }\n return await node.readFileAsArrayBuffer(url);\n}\n\n/**\n * Load a file from local file system\n * @param filename\n * @returns\n */\nasync function loadAsText(url: string): Promise<string> {\n if (!node.readFileAsText || url.startsWith('http')) {\n const response = await fetch(url);\n return await response.text();\n }\n return await node.readFileAsText(url);\n}\n"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/worker-utils",
|
|
3
|
-
"version": "4.0.0-beta.
|
|
3
|
+
"version": "4.0.0-beta.4",
|
|
4
4
|
"description": "Utilities for running tasks on worker threads",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -55,5 +55,5 @@
|
|
|
55
55
|
"dependencies": {
|
|
56
56
|
"@babel/runtime": "^7.3.1"
|
|
57
57
|
},
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "848c20b474532d301f2c3f8d4e1fb9bf262b86d4"
|
|
59
59
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/* global importScripts */
|
|
2
|
-
import {
|
|
2
|
+
import {isBrowser, isWorker} from '../env-utils/globals';
|
|
3
3
|
import * as node from '../node/require-utils.node';
|
|
4
4
|
import {assert} from '../env-utils/assert';
|
|
5
5
|
import {VERSION} from '../env-utils/version';
|
|
@@ -134,7 +134,7 @@ function loadLibraryFromString(scriptSource: string, id: string): null | any {
|
|
|
134
134
|
|
|
135
135
|
if (isWorker) {
|
|
136
136
|
// Use lvalue trick to make eval run in global scope
|
|
137
|
-
eval.call(
|
|
137
|
+
eval.call(globalThis, scriptSource); // eslint-disable-line no-eval
|
|
138
138
|
// https://stackoverflow.com/questions/9107240/1-evalthis-vs-evalthis-in-javascript
|
|
139
139
|
// http://perfectionkills.com/global-eval-what-are-the-options/
|
|
140
140
|
return null;
|