@loaders.gl/worker-utils 3.1.0 → 3.1.1
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/es5/lib/env-utils/version.js +3 -3
- package/dist/es5/lib/env-utils/version.js.map +1 -1
- package/dist/es5/lib/library-utils/library-utils.js +23 -17
- package/dist/es5/lib/library-utils/library-utils.js.map +1 -1
- package/dist/es5/lib/worker-api/get-worker-url.js +2 -2
- package/dist/es5/lib/worker-api/get-worker-url.js.map +1 -1
- package/dist/esm/lib/env-utils/version.js +3 -3
- package/dist/esm/lib/env-utils/version.js.map +1 -1
- package/dist/esm/lib/library-utils/library-utils.js +7 -3
- package/dist/esm/lib/library-utils/library-utils.js.map +1 -1
- package/dist/esm/lib/worker-api/get-worker-url.js +2 -2
- package/dist/esm/lib/worker-api/get-worker-url.js.map +1 -1
- package/dist/lib/env-utils/version.js +1 -1
- package/dist/lib/library-utils/library-utils.js +7 -2
- package/dist/lib/worker-api/get-worker-url.js +1 -1
- package/package.json +2 -2
- package/src/lib/env-utils/version.ts +1 -1
- package/src/lib/library-utils/library-utils.ts +6 -2
- package/src/lib/worker-api/get-worker-url.ts +1 -1
|
@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.VERSION = void 0;
|
|
7
|
-
var DEFAULT_VERSION = '
|
|
8
|
-
var VERSION = typeof "3.1.
|
|
7
|
+
var DEFAULT_VERSION = 'latest';
|
|
8
|
+
var VERSION = typeof "3.1.1" !== 'undefined' ? "3.1.1" : DEFAULT_VERSION;
|
|
9
9
|
exports.VERSION = VERSION;
|
|
10
10
|
|
|
11
|
-
if (typeof "3.1.
|
|
11
|
+
if (typeof "3.1.1" === 'undefined') {
|
|
12
12
|
console.error('loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.');
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=version.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/env-utils/version.ts"],"names":["DEFAULT_VERSION","VERSION","console","error"],"mappings":";;;;;;AAIA,IAAMA,eAAe,GAAG,
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/env-utils/version.ts"],"names":["DEFAULT_VERSION","VERSION","console","error"],"mappings":";;;;;;AAIA,IAAMA,eAAe,GAAG,QAAxB;AAEO,IAAMC,OAAO,GAAG,mBAAuB,WAAvB,aAAmDD,eAAnE;;;AACP,IAAI,mBAAuB,WAA3B,EAAwC;AAEtCE,EAAAA,OAAO,CAACC,KAAR,CACE,iIADF;AAGD","sourcesContent":["// Version constant cannot be imported, it needs to correspond to the build version of **this** module.\n// __VERSION__ is injected by babel-plugin-version-inline\n\n// Change to `latest` on production branches\nconst DEFAULT_VERSION = 'latest';\ndeclare let __VERSION__: string;\nexport const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : DEFAULT_VERSION;\nif (typeof __VERSION__ === 'undefined') {\n // eslint-disable-next-line\n console.error(\n 'loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.'\n );\n}\n"],"file":"version.js"}
|
|
@@ -26,8 +26,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
|
26
26
|
|
|
27
27
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
28
28
|
|
|
29
|
-
var LATEST = '
|
|
30
|
-
var VERSION = typeof "3.1.
|
|
29
|
+
var LATEST = 'latest';
|
|
30
|
+
var VERSION = typeof "3.1.1" !== 'undefined' ? "3.1.1" : LATEST;
|
|
31
31
|
var loadLibraryPromises = {};
|
|
32
32
|
|
|
33
33
|
function loadLibrary(_x) {
|
|
@@ -124,53 +124,59 @@ function _loadLibraryFromFile() {
|
|
|
124
124
|
|
|
125
125
|
case 7:
|
|
126
126
|
if (_globals.isBrowser) {
|
|
127
|
-
_context2.next =
|
|
127
|
+
_context2.next = 20;
|
|
128
128
|
break;
|
|
129
129
|
}
|
|
130
130
|
|
|
131
|
-
_context2.
|
|
131
|
+
_context2.prev = 8;
|
|
132
|
+
_context2.t0 = node && node.requireFromFile;
|
|
132
133
|
|
|
133
134
|
if (!_context2.t0) {
|
|
134
|
-
_context2.next =
|
|
135
|
+
_context2.next = 14;
|
|
135
136
|
break;
|
|
136
137
|
}
|
|
137
138
|
|
|
138
|
-
_context2.next =
|
|
139
|
+
_context2.next = 13;
|
|
139
140
|
return node.requireFromFile(libraryUrl);
|
|
140
141
|
|
|
141
|
-
case
|
|
142
|
+
case 13:
|
|
142
143
|
_context2.t0 = _context2.sent;
|
|
143
144
|
|
|
144
|
-
case
|
|
145
|
+
case 14:
|
|
145
146
|
return _context2.abrupt("return", _context2.t0);
|
|
146
147
|
|
|
147
|
-
case
|
|
148
|
+
case 17:
|
|
149
|
+
_context2.prev = 17;
|
|
150
|
+
_context2.t1 = _context2["catch"](8);
|
|
151
|
+
return _context2.abrupt("return", null);
|
|
152
|
+
|
|
153
|
+
case 20:
|
|
148
154
|
if (!_globals.isWorker) {
|
|
149
|
-
_context2.next =
|
|
155
|
+
_context2.next = 22;
|
|
150
156
|
break;
|
|
151
157
|
}
|
|
152
158
|
|
|
153
159
|
return _context2.abrupt("return", importScripts(libraryUrl));
|
|
154
160
|
|
|
155
|
-
case
|
|
156
|
-
_context2.next =
|
|
161
|
+
case 22:
|
|
162
|
+
_context2.next = 24;
|
|
157
163
|
return fetch(libraryUrl);
|
|
158
164
|
|
|
159
|
-
case
|
|
165
|
+
case 24:
|
|
160
166
|
response = _context2.sent;
|
|
161
|
-
_context2.next =
|
|
167
|
+
_context2.next = 27;
|
|
162
168
|
return response.text();
|
|
163
169
|
|
|
164
|
-
case
|
|
170
|
+
case 27:
|
|
165
171
|
scriptSource = _context2.sent;
|
|
166
172
|
return _context2.abrupt("return", loadLibraryFromString(scriptSource, libraryUrl));
|
|
167
173
|
|
|
168
|
-
case
|
|
174
|
+
case 29:
|
|
169
175
|
case "end":
|
|
170
176
|
return _context2.stop();
|
|
171
177
|
}
|
|
172
178
|
}
|
|
173
|
-
}, _callee2);
|
|
179
|
+
}, _callee2, null, [[8, 17]]);
|
|
174
180
|
}));
|
|
175
181
|
return _loadLibraryFromFile.apply(this, arguments);
|
|
176
182
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/library-utils/library-utils.ts"],"names":["LATEST","VERSION","loadLibraryPromises","loadLibrary","libraryUrl","moduleName","options","getLibraryUrl","loadLibraryFromFile","library","startsWith","modules","isBrowser","CDN","isWorker","endsWith","fetch","response","arrayBuffer","node","requireFromFile","importScripts","text","scriptSource","loadLibraryFromString","id","requireFromString","eval","call","global","script","document","createElement","appendChild","createTextNode","e","body"],"mappings":";;;;;;;;;;;;;;;;AACA;;AACA;;AACA;;AACA;;;;;;AAGA,IAAMA,MAAM,GAAG,
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/library-utils/library-utils.ts"],"names":["LATEST","VERSION","loadLibraryPromises","loadLibrary","libraryUrl","moduleName","options","getLibraryUrl","loadLibraryFromFile","library","startsWith","modules","isBrowser","CDN","isWorker","endsWith","fetch","response","arrayBuffer","node","requireFromFile","importScripts","text","scriptSource","loadLibraryFromString","id","requireFromString","eval","call","global","script","document","createElement","appendChild","createTextNode","e","body"],"mappings":"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","sourcesContent":["/* global importScripts */\nimport {global, isBrowser, isWorker} from '../env-utils/globals';\nimport * as node from '../node/require-utils.node';\nimport {assert} from '../env-utils/assert';\nimport {VERSION as __VERSION__} from '../env-utils/version';\n\n// TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...\nconst LATEST = 'latest';\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : LATEST;\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): Promise<any> {\n if (moduleName) {\n libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);\n }\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(library: string, moduleName?: string, options?: any): string {\n // Check if already a URL\n if (library.startsWith('http')) {\n return library;\n }\n\n // Allow application to import and supply libraries through `options.modules`\n const modules = options.modules || {};\n if (modules[library]) {\n return modules[library];\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/${library}`;\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/${library}`;\n }\n\n // TODO - loading inside workers requires paths relative to worker script location...\n if (isWorker) {\n return `../src/libs/${library}`;\n }\n\n return `modules/${moduleName}/src/libs/${library}`;\n}\n\nasync function loadLibraryFromFile(libraryUrl: string): Promise<any> {\n if (libraryUrl.endsWith('wasm')) {\n const response = await fetch(libraryUrl);\n return await response.arrayBuffer();\n }\n\n if (!isBrowser) {\n try {\n return node && node.requireFromFile && (await node.requireFromFile(libraryUrl));\n } catch {\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 response = await fetch(libraryUrl);\n const scriptSource = await response.text();\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(global, 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"],"file":"library-utils.js"}
|
|
@@ -10,8 +10,8 @@ var _assert = require("../env-utils/assert");
|
|
|
10
10
|
|
|
11
11
|
var _version = require("../env-utils/version");
|
|
12
12
|
|
|
13
|
-
var NPM_TAG = '
|
|
14
|
-
var VERSION = typeof "3.1.
|
|
13
|
+
var NPM_TAG = 'latest';
|
|
14
|
+
var VERSION = typeof "3.1.1" !== 'undefined' ? "3.1.1" : NPM_TAG;
|
|
15
15
|
|
|
16
16
|
function getWorkerName(worker) {
|
|
17
17
|
var warning = worker.version !== VERSION ? " (worker-utils@".concat(VERSION, ")") : '';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/worker-api/get-worker-url.ts"],"names":["NPM_TAG","VERSION","getWorkerName","worker","warning","version","name","getWorkerURL","options","workerOptions","id","workerFile","url","workerUrl","_workerType","module","versionTag"],"mappings":";;;;;;;;AACA;;AACA;;AAEA,IAAMA,OAAO,GAAG,
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/worker-api/get-worker-url.ts"],"names":["NPM_TAG","VERSION","getWorkerName","worker","warning","version","name","getWorkerURL","options","workerOptions","id","workerFile","url","workerUrl","_workerType","module","versionTag"],"mappings":";;;;;;;;AACA;;AACA;;AAEA,IAAMA,OAAO,GAAG,QAAhB;AACA,IAAMC,OAAO,GAAG,mBAAuB,WAAvB,aAAmDD,OAAnE;;AAKO,SAASE,aAAT,CAAuBC,MAAvB,EAAqD;AAC1D,MAAMC,OAAO,GAAGD,MAAM,CAACE,OAAP,KAAmBJ,OAAnB,4BAA+CA,OAA/C,SAA4D,EAA5E;AACA,mBAAUE,MAAM,CAACG,IAAjB,cAAyBH,MAAM,CAACE,OAAhC,SAA0CD,OAA1C;AACD;;AASM,SAASG,YAAT,CAAsBJ,MAAtB,EAAiF;AAAA,MAArCK,OAAqC,uEAAZ,EAAY;AACtF,MAAMC,aAAa,GAAGD,OAAO,CAACL,MAAM,CAACO,EAAR,CAAP,IAAsB,EAA5C;AAEA,MAAMC,UAAU,aAAMR,MAAM,CAACO,EAAb,eAAhB;AAEA,MAAIE,GAAG,GAAGH,aAAa,CAACI,SAAxB;;AAQA,MAAI,CAACD,GAAD,IAAQT,MAAM,CAACO,EAAP,KAAc,aAA1B,EAAyC;AACvCE,IAAAA,GAAG,GAAGJ,OAAO,CAACK,SAAd;AACD;;AAID,MAAIL,OAAO,CAACM,WAAR,KAAwB,MAA5B,EAAoC;AAClCF,IAAAA,GAAG,qBAAcT,MAAM,CAACY,MAArB,mBAAoCJ,UAApC,CAAH;AACD;;AAGD,MAAI,CAACC,GAAL,EAAU;AAER,QAAIP,OAAO,GAAGF,MAAM,CAACE,OAArB;;AAEA,QAAIA,OAAO,KAAK,QAAhB,EAA0B;AAExBA,MAAAA,OAAO,GAAGL,OAAV;AACD;;AACD,QAAMgB,UAAU,GAAGX,OAAO,cAAOA,OAAP,IAAmB,EAA7C;AACAO,IAAAA,GAAG,2CAAoCT,MAAM,CAACY,MAA3C,SAAoDC,UAApD,mBAAuEL,UAAvE,CAAH;AACD;;AAED,sBAAOC,GAAP;AAGA,SAAOA,GAAP;AACD","sourcesContent":["import type {WorkerObject, WorkerOptions} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {VERSION as __VERSION__} from '../env-utils/version';\n\nconst NPM_TAG = 'latest'; // Change to 'latest' on release-branch\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : NPM_TAG;\n\n/**\n * Gets worker object's name (for debugging in Chrome thread inspector window)\n */\nexport function getWorkerName(worker: WorkerObject): string {\n const warning = worker.version !== VERSION ? ` (worker-utils@${VERSION})` : '';\n return `${worker.name}@${worker.version}${warning}`;\n}\n\n/**\n * Generate a worker URL based on worker object and options\n * @returns A URL to one of the following:\n * - a published worker on unpkg CDN\n * - a local test worker\n * - a URL provided by the user in options\n */\nexport function getWorkerURL(worker: WorkerObject, options: WorkerOptions = {}): string {\n const workerOptions = options[worker.id] || {};\n\n const workerFile = `${worker.id}-worker.js`;\n\n let url = workerOptions.workerUrl;\n\n // HACK: Allow for non-nested workerUrl for the CompressionWorker.\n // For the compression worker, workerOptions is currently not nested correctly. For most loaders,\n // you'd have options within an object, i.e. `{mvt: {coordinates: ...}}` but the CompressionWorker\n // puts options at the top level, not within a `compression` key (its `id`). For this reason, the\n // above `workerOptions` will always be a string (i.e. `'gzip'`) for the CompressionWorker. To not\n // break backwards compatibility, we allow the CompressionWorker to have options at the top level.\n if (!url && worker.id === 'compression') {\n url = options.workerUrl;\n }\n\n // If URL is test, generate local loaders.gl url\n // @ts-ignore _workerType\n if (options._workerType === 'test') {\n url = `modules/${worker.module}/dist/${workerFile}`;\n }\n\n // If url override is not provided, generate a URL to published version on npm CDN unpkg.com\n if (!url) {\n // GENERATE\n let version = worker.version;\n // On master we need to load npm alpha releases published with the `beta` tag\n if (version === 'latest') {\n // throw new Error('latest worker version specified');\n version = NPM_TAG;\n }\n const versionTag = version ? `@${version}` : '';\n url = `https://unpkg.com/@loaders.gl/${worker.module}${versionTag}/dist/${workerFile}`;\n }\n\n assert(url);\n\n // Allow user to override location\n return url;\n}\n"],"file":"get-worker-url.js"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
const DEFAULT_VERSION = '
|
|
2
|
-
export const VERSION = typeof "3.1.
|
|
1
|
+
const DEFAULT_VERSION = 'latest';
|
|
2
|
+
export const VERSION = typeof "3.1.1" !== 'undefined' ? "3.1.1" : DEFAULT_VERSION;
|
|
3
3
|
|
|
4
|
-
if (typeof "3.1.
|
|
4
|
+
if (typeof "3.1.1" === 'undefined') {
|
|
5
5
|
console.error('loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.');
|
|
6
6
|
}
|
|
7
7
|
//# sourceMappingURL=version.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/env-utils/version.ts"],"names":["DEFAULT_VERSION","VERSION","console","error"],"mappings":"AAIA,MAAMA,eAAe,GAAG,
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/env-utils/version.ts"],"names":["DEFAULT_VERSION","VERSION","console","error"],"mappings":"AAIA,MAAMA,eAAe,GAAG,QAAxB;AAEA,OAAO,MAAMC,OAAO,GAAG,mBAAuB,WAAvB,aAAmDD,eAAnE;;AACP,IAAI,mBAAuB,WAA3B,EAAwC;AAEtCE,EAAAA,OAAO,CAACC,KAAR,CACE,iIADF;AAGD","sourcesContent":["// Version constant cannot be imported, it needs to correspond to the build version of **this** module.\n// __VERSION__ is injected by babel-plugin-version-inline\n\n// Change to `latest` on production branches\nconst DEFAULT_VERSION = 'latest';\ndeclare let __VERSION__: string;\nexport const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : DEFAULT_VERSION;\nif (typeof __VERSION__ === 'undefined') {\n // eslint-disable-next-line\n console.error(\n 'loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.'\n );\n}\n"],"file":"version.js"}
|
|
@@ -2,8 +2,8 @@ import { global, isBrowser, isWorker } from '../env-utils/globals';
|
|
|
2
2
|
import * as node from '../node/require-utils.node';
|
|
3
3
|
import { assert } from '../env-utils/assert';
|
|
4
4
|
import { VERSION as __VERSION__ } from '../env-utils/version';
|
|
5
|
-
const LATEST = '
|
|
6
|
-
const VERSION = typeof "3.1.
|
|
5
|
+
const LATEST = 'latest';
|
|
6
|
+
const VERSION = typeof "3.1.1" !== 'undefined' ? "3.1.1" : LATEST;
|
|
7
7
|
const loadLibraryPromises = {};
|
|
8
8
|
export async function loadLibrary(libraryUrl, moduleName = null, options = {}) {
|
|
9
9
|
if (moduleName) {
|
|
@@ -47,7 +47,11 @@ async function loadLibraryFromFile(libraryUrl) {
|
|
|
47
47
|
}
|
|
48
48
|
|
|
49
49
|
if (!isBrowser) {
|
|
50
|
-
|
|
50
|
+
try {
|
|
51
|
+
return node && node.requireFromFile && (await node.requireFromFile(libraryUrl));
|
|
52
|
+
} catch {
|
|
53
|
+
return null;
|
|
54
|
+
}
|
|
51
55
|
}
|
|
52
56
|
|
|
53
57
|
if (isWorker) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/library-utils/library-utils.ts"],"names":["global","isBrowser","isWorker","node","assert","VERSION","__VERSION__","LATEST","loadLibraryPromises","loadLibrary","libraryUrl","moduleName","options","getLibraryUrl","loadLibraryFromFile","library","startsWith","modules","CDN","endsWith","response","fetch","arrayBuffer","requireFromFile","importScripts","scriptSource","text","loadLibraryFromString","id","requireFromString","eval","call","script","document","createElement","appendChild","createTextNode","e","body"],"mappings":"AACA,SAAQA,MAAR,EAAgBC,SAAhB,EAA2BC,QAA3B,QAA0C,sBAA1C;AACA,OAAO,KAAKC,IAAZ,MAAsB,4BAAtB;AACA,SAAQC,MAAR,QAAqB,qBAArB;AACA,SAAQC,OAAO,IAAIC,WAAnB,QAAqC,sBAArC;AAGA,MAAMC,MAAM,GAAG,
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/library-utils/library-utils.ts"],"names":["global","isBrowser","isWorker","node","assert","VERSION","__VERSION__","LATEST","loadLibraryPromises","loadLibrary","libraryUrl","moduleName","options","getLibraryUrl","loadLibraryFromFile","library","startsWith","modules","CDN","endsWith","response","fetch","arrayBuffer","requireFromFile","importScripts","scriptSource","text","loadLibraryFromString","id","requireFromString","eval","call","script","document","createElement","appendChild","createTextNode","e","body"],"mappings":"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","sourcesContent":["/* global importScripts */\nimport {global, isBrowser, isWorker} from '../env-utils/globals';\nimport * as node from '../node/require-utils.node';\nimport {assert} from '../env-utils/assert';\nimport {VERSION as __VERSION__} from '../env-utils/version';\n\n// TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...\nconst LATEST = 'latest';\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : LATEST;\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): Promise<any> {\n if (moduleName) {\n libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);\n }\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(library: string, moduleName?: string, options?: any): string {\n // Check if already a URL\n if (library.startsWith('http')) {\n return library;\n }\n\n // Allow application to import and supply libraries through `options.modules`\n const modules = options.modules || {};\n if (modules[library]) {\n return modules[library];\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/${library}`;\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/${library}`;\n }\n\n // TODO - loading inside workers requires paths relative to worker script location...\n if (isWorker) {\n return `../src/libs/${library}`;\n }\n\n return `modules/${moduleName}/src/libs/${library}`;\n}\n\nasync function loadLibraryFromFile(libraryUrl: string): Promise<any> {\n if (libraryUrl.endsWith('wasm')) {\n const response = await fetch(libraryUrl);\n return await response.arrayBuffer();\n }\n\n if (!isBrowser) {\n try {\n return node && node.requireFromFile && (await node.requireFromFile(libraryUrl));\n } catch {\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 response = await fetch(libraryUrl);\n const scriptSource = await response.text();\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(global, 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"],"file":"library-utils.js"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { assert } from '../env-utils/assert';
|
|
2
2
|
import { VERSION as __VERSION__ } from '../env-utils/version';
|
|
3
|
-
const NPM_TAG = '
|
|
4
|
-
const VERSION = typeof "3.1.
|
|
3
|
+
const NPM_TAG = 'latest';
|
|
4
|
+
const VERSION = typeof "3.1.1" !== 'undefined' ? "3.1.1" : NPM_TAG;
|
|
5
5
|
export function getWorkerName(worker) {
|
|
6
6
|
const warning = worker.version !== VERSION ? " (worker-utils@".concat(VERSION, ")") : '';
|
|
7
7
|
return "".concat(worker.name, "@").concat(worker.version).concat(warning);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/worker-api/get-worker-url.ts"],"names":["assert","VERSION","__VERSION__","NPM_TAG","getWorkerName","worker","warning","version","name","getWorkerURL","options","workerOptions","id","workerFile","url","workerUrl","_workerType","module","versionTag"],"mappings":"AACA,SAAQA,MAAR,QAAqB,qBAArB;AACA,SAAQC,OAAO,IAAIC,WAAnB,QAAqC,sBAArC;AAEA,MAAMC,OAAO,GAAG,
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/worker-api/get-worker-url.ts"],"names":["assert","VERSION","__VERSION__","NPM_TAG","getWorkerName","worker","warning","version","name","getWorkerURL","options","workerOptions","id","workerFile","url","workerUrl","_workerType","module","versionTag"],"mappings":"AACA,SAAQA,MAAR,QAAqB,qBAArB;AACA,SAAQC,OAAO,IAAIC,WAAnB,QAAqC,sBAArC;AAEA,MAAMC,OAAO,GAAG,QAAhB;AACA,MAAMF,OAAO,GAAG,mBAAuB,WAAvB,aAAmDE,OAAnE;AAKA,OAAO,SAASC,aAAT,CAAuBC,MAAvB,EAAqD;AAC1D,QAAMC,OAAO,GAAGD,MAAM,CAACE,OAAP,KAAmBN,OAAnB,4BAA+CA,OAA/C,SAA4D,EAA5E;AACA,mBAAUI,MAAM,CAACG,IAAjB,cAAyBH,MAAM,CAACE,OAAhC,SAA0CD,OAA1C;AACD;AASD,OAAO,SAASG,YAAT,CAAsBJ,MAAtB,EAA4CK,OAAsB,GAAG,EAArE,EAAiF;AACtF,QAAMC,aAAa,GAAGD,OAAO,CAACL,MAAM,CAACO,EAAR,CAAP,IAAsB,EAA5C;AAEA,QAAMC,UAAU,aAAMR,MAAM,CAACO,EAAb,eAAhB;AAEA,MAAIE,GAAG,GAAGH,aAAa,CAACI,SAAxB;;AAQA,MAAI,CAACD,GAAD,IAAQT,MAAM,CAACO,EAAP,KAAc,aAA1B,EAAyC;AACvCE,IAAAA,GAAG,GAAGJ,OAAO,CAACK,SAAd;AACD;;AAID,MAAIL,OAAO,CAACM,WAAR,KAAwB,MAA5B,EAAoC;AAClCF,IAAAA,GAAG,qBAAcT,MAAM,CAACY,MAArB,mBAAoCJ,UAApC,CAAH;AACD;;AAGD,MAAI,CAACC,GAAL,EAAU;AAER,QAAIP,OAAO,GAAGF,MAAM,CAACE,OAArB;;AAEA,QAAIA,OAAO,KAAK,QAAhB,EAA0B;AAExBA,MAAAA,OAAO,GAAGJ,OAAV;AACD;;AACD,UAAMe,UAAU,GAAGX,OAAO,cAAOA,OAAP,IAAmB,EAA7C;AACAO,IAAAA,GAAG,2CAAoCT,MAAM,CAACY,MAA3C,SAAoDC,UAApD,mBAAuEL,UAAvE,CAAH;AACD;;AAEDb,EAAAA,MAAM,CAACc,GAAD,CAAN;AAGA,SAAOA,GAAP;AACD","sourcesContent":["import type {WorkerObject, WorkerOptions} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {VERSION as __VERSION__} from '../env-utils/version';\n\nconst NPM_TAG = 'latest'; // Change to 'latest' on release-branch\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : NPM_TAG;\n\n/**\n * Gets worker object's name (for debugging in Chrome thread inspector window)\n */\nexport function getWorkerName(worker: WorkerObject): string {\n const warning = worker.version !== VERSION ? ` (worker-utils@${VERSION})` : '';\n return `${worker.name}@${worker.version}${warning}`;\n}\n\n/**\n * Generate a worker URL based on worker object and options\n * @returns A URL to one of the following:\n * - a published worker on unpkg CDN\n * - a local test worker\n * - a URL provided by the user in options\n */\nexport function getWorkerURL(worker: WorkerObject, options: WorkerOptions = {}): string {\n const workerOptions = options[worker.id] || {};\n\n const workerFile = `${worker.id}-worker.js`;\n\n let url = workerOptions.workerUrl;\n\n // HACK: Allow for non-nested workerUrl for the CompressionWorker.\n // For the compression worker, workerOptions is currently not nested correctly. For most loaders,\n // you'd have options within an object, i.e. `{mvt: {coordinates: ...}}` but the CompressionWorker\n // puts options at the top level, not within a `compression` key (its `id`). For this reason, the\n // above `workerOptions` will always be a string (i.e. `'gzip'`) for the CompressionWorker. To not\n // break backwards compatibility, we allow the CompressionWorker to have options at the top level.\n if (!url && worker.id === 'compression') {\n url = options.workerUrl;\n }\n\n // If URL is test, generate local loaders.gl url\n // @ts-ignore _workerType\n if (options._workerType === 'test') {\n url = `modules/${worker.module}/dist/${workerFile}`;\n }\n\n // If url override is not provided, generate a URL to published version on npm CDN unpkg.com\n if (!url) {\n // GENERATE\n let version = worker.version;\n // On master we need to load npm alpha releases published with the `beta` tag\n if (version === 'latest') {\n // throw new Error('latest worker version specified');\n version = NPM_TAG;\n }\n const versionTag = version ? `@${version}` : '';\n url = `https://unpkg.com/@loaders.gl/${worker.module}${versionTag}/dist/${workerFile}`;\n }\n\n assert(url);\n\n // Allow user to override location\n return url;\n}\n"],"file":"get-worker-url.js"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.VERSION = void 0;
|
|
6
6
|
// Change to `latest` on production branches
|
|
7
|
-
const DEFAULT_VERSION = '
|
|
7
|
+
const DEFAULT_VERSION = 'latest';
|
|
8
8
|
exports.VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : DEFAULT_VERSION;
|
|
9
9
|
if (typeof __VERSION__ === 'undefined') {
|
|
10
10
|
// eslint-disable-next-line
|
|
@@ -26,7 +26,7 @@ const node = __importStar(require("../node/require-utils.node"));
|
|
|
26
26
|
const assert_1 = require("../env-utils/assert");
|
|
27
27
|
const version_1 = require("../env-utils/version");
|
|
28
28
|
// TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...
|
|
29
|
-
const LATEST = '
|
|
29
|
+
const LATEST = 'latest';
|
|
30
30
|
const VERSION = typeof version_1.VERSION !== 'undefined' ? version_1.VERSION : LATEST;
|
|
31
31
|
const loadLibraryPromises = {}; // promises
|
|
32
32
|
/**
|
|
@@ -89,7 +89,12 @@ async function loadLibraryFromFile(libraryUrl) {
|
|
|
89
89
|
return await response.arrayBuffer();
|
|
90
90
|
}
|
|
91
91
|
if (!globals_1.isBrowser) {
|
|
92
|
-
|
|
92
|
+
try {
|
|
93
|
+
return node && node.requireFromFile && (await node.requireFromFile(libraryUrl));
|
|
94
|
+
}
|
|
95
|
+
catch {
|
|
96
|
+
return null;
|
|
97
|
+
}
|
|
93
98
|
}
|
|
94
99
|
if (globals_1.isWorker) {
|
|
95
100
|
return importScripts(libraryUrl);
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getWorkerURL = exports.getWorkerName = void 0;
|
|
4
4
|
const assert_1 = require("../env-utils/assert");
|
|
5
5
|
const version_1 = require("../env-utils/version");
|
|
6
|
-
const NPM_TAG = '
|
|
6
|
+
const NPM_TAG = 'latest'; // Change to 'latest' on release-branch
|
|
7
7
|
const VERSION = typeof version_1.VERSION !== 'undefined' ? version_1.VERSION : NPM_TAG;
|
|
8
8
|
/**
|
|
9
9
|
* Gets worker object's name (for debugging in Chrome thread inspector window)
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/worker-utils",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.1",
|
|
4
4
|
"description": "Utilities for running tasks on worker threads",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"publishConfig": {
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"dependencies": {
|
|
46
46
|
"@babel/runtime": "^7.3.1"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "ed3c238bcb68ab5a2d4ddc64319f6f4c02a20df7"
|
|
49
49
|
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// __VERSION__ is injected by babel-plugin-version-inline
|
|
3
3
|
|
|
4
4
|
// Change to `latest` on production branches
|
|
5
|
-
const DEFAULT_VERSION = '
|
|
5
|
+
const DEFAULT_VERSION = 'latest';
|
|
6
6
|
declare let __VERSION__: string;
|
|
7
7
|
export const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : DEFAULT_VERSION;
|
|
8
8
|
if (typeof __VERSION__ === 'undefined') {
|
|
@@ -5,7 +5,7 @@ import {assert} from '../env-utils/assert';
|
|
|
5
5
|
import {VERSION as __VERSION__} from '../env-utils/version';
|
|
6
6
|
|
|
7
7
|
// TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...
|
|
8
|
-
const LATEST = '
|
|
8
|
+
const LATEST = 'latest';
|
|
9
9
|
const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : LATEST;
|
|
10
10
|
|
|
11
11
|
const loadLibraryPromises: Record<string, Promise<any>> = {}; // promises
|
|
@@ -82,7 +82,11 @@ async function loadLibraryFromFile(libraryUrl: string): Promise<any> {
|
|
|
82
82
|
}
|
|
83
83
|
|
|
84
84
|
if (!isBrowser) {
|
|
85
|
-
|
|
85
|
+
try {
|
|
86
|
+
return node && node.requireFromFile && (await node.requireFromFile(libraryUrl));
|
|
87
|
+
} catch {
|
|
88
|
+
return null;
|
|
89
|
+
}
|
|
86
90
|
}
|
|
87
91
|
if (isWorker) {
|
|
88
92
|
return importScripts(libraryUrl);
|
|
@@ -2,7 +2,7 @@ import type {WorkerObject, WorkerOptions} from '../../types';
|
|
|
2
2
|
import {assert} from '../env-utils/assert';
|
|
3
3
|
import {VERSION as __VERSION__} from '../env-utils/version';
|
|
4
4
|
|
|
5
|
-
const NPM_TAG = '
|
|
5
|
+
const NPM_TAG = 'latest'; // Change to 'latest' on release-branch
|
|
6
6
|
const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : NPM_TAG;
|
|
7
7
|
|
|
8
8
|
/**
|