@loaders.gl/worker-utils 4.0.0-alpha.8 → 4.0.0-beta.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.
Files changed (60) hide show
  1. package/dist/es5/lib/env-utils/version.js +17 -6
  2. package/dist/es5/lib/env-utils/version.js.map +1 -1
  3. package/dist/es5/lib/library-utils/library-utils.js +106 -43
  4. package/dist/es5/lib/library-utils/library-utils.js.map +1 -1
  5. package/dist/es5/lib/node/require-utils.node.js +78 -11
  6. package/dist/es5/lib/node/require-utils.node.js.map +1 -1
  7. package/dist/es5/lib/process-utils/child-process-proxy.js +4 -2
  8. package/dist/es5/lib/process-utils/child-process-proxy.js.map +1 -1
  9. package/dist/es5/lib/worker-api/get-worker-url.js +2 -4
  10. package/dist/es5/lib/worker-api/get-worker-url.js.map +1 -1
  11. package/dist/esm/lib/env-utils/version.js +14 -4
  12. package/dist/esm/lib/env-utils/version.js.map +1 -1
  13. package/dist/esm/lib/library-utils/library-utils.js +30 -16
  14. package/dist/esm/lib/library-utils/library-utils.js.map +1 -1
  15. package/dist/esm/lib/node/require-utils.node.js +17 -0
  16. package/dist/esm/lib/node/require-utils.node.js.map +1 -1
  17. package/dist/esm/lib/process-utils/child-process-proxy.js +4 -2
  18. package/dist/esm/lib/process-utils/child-process-proxy.js.map +1 -1
  19. package/dist/esm/lib/worker-api/get-worker-url.js +1 -3
  20. package/dist/esm/lib/worker-api/get-worker-url.js.map +1 -1
  21. package/dist/lib/env-utils/version.d.ts +6 -1
  22. package/dist/lib/env-utils/version.d.ts.map +1 -1
  23. package/dist/lib/library-utils/library-utils.d.ts +2 -2
  24. package/dist/lib/library-utils/library-utils.d.ts.map +1 -1
  25. package/dist/lib/node/require-utils.node.d.ts +12 -0
  26. package/dist/lib/node/require-utils.node.d.ts.map +1 -1
  27. package/dist/lib/process-utils/child-process-proxy.d.ts +2 -0
  28. package/dist/lib/process-utils/child-process-proxy.d.ts.map +1 -1
  29. package/dist/lib/worker-api/get-worker-url.d.ts.map +1 -1
  30. package/package.json +4 -5
  31. package/src/lib/env-utils/version.ts +25 -9
  32. package/src/lib/library-utils/library-utils.ts +42 -23
  33. package/src/lib/node/require-utils.node.ts +29 -0
  34. package/src/lib/process-utils/child-process-proxy.ts +6 -3
  35. package/src/lib/worker-api/get-worker-url.ts +1 -4
  36. package/dist/index.js +0 -59
  37. package/dist/lib/async-queue/async-queue.js +0 -87
  38. package/dist/lib/env-utils/assert.js +0 -13
  39. package/dist/lib/env-utils/globals.js +0 -32
  40. package/dist/lib/env-utils/version.js +0 -12
  41. package/dist/lib/library-utils/library-utils.js +0 -170
  42. package/dist/lib/node/require-utils.node.js +0 -60
  43. package/dist/lib/node/worker_threads-browser.js +0 -15
  44. package/dist/lib/node/worker_threads.js +0 -33
  45. package/dist/lib/process-utils/child-process-proxy.js +0 -135
  46. package/dist/lib/process-utils/process-utils.js +0 -35
  47. package/dist/lib/worker-api/create-worker.js +0 -91
  48. package/dist/lib/worker-api/get-worker-url.js +0 -59
  49. package/dist/lib/worker-api/process-on-worker.js +0 -83
  50. package/dist/lib/worker-api/validate-worker-version.js +0 -35
  51. package/dist/lib/worker-farm/worker-body.js +0 -111
  52. package/dist/lib/worker-farm/worker-farm.js +0 -89
  53. package/dist/lib/worker-farm/worker-job.js +0 -47
  54. package/dist/lib/worker-farm/worker-pool.js +0 -164
  55. package/dist/lib/worker-farm/worker-thread.js +0 -131
  56. package/dist/lib/worker-utils/get-loadable-worker-url.js +0 -72
  57. package/dist/lib/worker-utils/get-transfer-list.js +0 -87
  58. package/dist/lib/worker-utils/remove-nontransferable-options.js +0 -27
  59. package/dist/types.js +0 -2
  60. package/dist/workers/null-worker.js +0 -7
@@ -2,14 +2,7 @@
2
2
  import {global, 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
- import {VERSION as __VERSION__} from '../env-utils/version';
6
-
7
- /**
8
- * TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...
9
- * 'beta' on beta branch, 'latest' on prod branch
10
- */
11
- const LATEST = 'beta';
12
- const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : LATEST;
5
+ import {VERSION} from '../env-utils/version';
13
6
 
14
7
  const loadLibraryPromises: Record<string, Promise<any>> = {}; // promises
15
8
 
@@ -31,12 +24,12 @@ const loadLibraryPromises: Record<string, Promise<any>> = {}; // promises
31
24
  export async function loadLibrary(
32
25
  libraryUrl: string,
33
26
  moduleName: string | null = null,
34
- options: object = {}
27
+ options: object = {},
28
+ libraryName: string | null = null
35
29
  ): Promise<any> {
36
30
  if (moduleName) {
37
- libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);
31
+ libraryUrl = getLibraryUrl(libraryUrl, moduleName, options, libraryName);
38
32
  }
39
-
40
33
  // Ensure libraries are only loaded once
41
34
 
42
35
  loadLibraryPromises[libraryUrl] =
@@ -46,42 +39,48 @@ export async function loadLibrary(
46
39
  }
47
40
 
48
41
  // TODO - sort out how to resolve paths for main/worker and dev/prod
49
- export function getLibraryUrl(library: string, moduleName?: string, options?: any): string {
42
+ export function getLibraryUrl(
43
+ library: string,
44
+ moduleName?: string,
45
+ options: any = {},
46
+ libraryName: string | null = null
47
+ ): string {
50
48
  // Check if already a URL
51
- if (library.startsWith('http')) {
49
+ if (!options.useLocalLibraries && library.startsWith('http')) {
52
50
  return library;
53
51
  }
54
52
 
53
+ libraryName = libraryName || library;
54
+
55
55
  // Allow application to import and supply libraries through `options.modules`
56
56
  const modules = options.modules || {};
57
- if (modules[library]) {
58
- return modules[library];
57
+ if (modules[libraryName]) {
58
+ return modules[libraryName];
59
59
  }
60
60
 
61
61
  // Load from local files, not from CDN scripts in Node.js
62
62
  // TODO - needs to locate the modules directory when installed!
63
63
  if (!isBrowser) {
64
- return `modules/${moduleName}/dist/libs/${library}`;
64
+ return `modules/${moduleName}/dist/libs/${libraryName}`;
65
65
  }
66
66
 
67
67
  // In browser, load from external scripts
68
68
  if (options.CDN) {
69
69
  assert(options.CDN.startsWith('http'));
70
- return `${options.CDN}/${moduleName}@${VERSION}/dist/libs/${library}`;
70
+ return `${options.CDN}/${moduleName}@${VERSION}/dist/libs/${libraryName}`;
71
71
  }
72
72
 
73
73
  // TODO - loading inside workers requires paths relative to worker script location...
74
74
  if (isWorker) {
75
- return `../src/libs/${library}`;
75
+ return `../src/libs/${libraryName}`;
76
76
  }
77
77
 
78
- return `modules/${moduleName}/src/libs/${library}`;
78
+ return `modules/${moduleName}/src/libs/${libraryName}`;
79
79
  }
80
80
 
81
81
  async function loadLibraryFromFile(libraryUrl: string): Promise<any> {
82
82
  if (libraryUrl.endsWith('wasm')) {
83
- const response = await fetch(libraryUrl);
84
- return await response.arrayBuffer();
83
+ return await loadAsArrayBuffer(libraryUrl);
85
84
  }
86
85
 
87
86
  if (!isBrowser) {
@@ -99,8 +98,7 @@ async function loadLibraryFromFile(libraryUrl: string): Promise<any> {
99
98
  // return await loadScriptFromFile(libraryUrl);
100
99
  // }
101
100
 
102
- const response = await fetch(libraryUrl);
103
- const scriptSource = await response.text();
101
+ const scriptSource = await loadAsText(libraryUrl);
104
102
  return loadLibraryFromString(scriptSource, libraryUrl);
105
103
  }
106
104
 
@@ -161,3 +159,24 @@ function combineWorkerWithLibrary(worker, jsContent) {
161
159
  this.workerSourceURL = URL.createObjectURL(new Blob([body]));
162
160
  }
163
161
  */
162
+
163
+ async function loadAsArrayBuffer(url: string): Promise<ArrayBuffer> {
164
+ if (!node.readFileAsArrayBuffer || url.startsWith('http')) {
165
+ const response = await fetch(url);
166
+ return await response.arrayBuffer();
167
+ }
168
+ return await node.readFileAsArrayBuffer(url);
169
+ }
170
+
171
+ /**
172
+ * Load a file from local file system
173
+ * @param filename
174
+ * @returns
175
+ */
176
+ async function loadAsText(url: string): Promise<string> {
177
+ if (!node.readFileAsText || url.startsWith('http')) {
178
+ const response = await fetch(url);
179
+ return await response.text();
180
+ }
181
+ return await node.readFileAsText(url);
182
+ }
@@ -6,6 +6,35 @@
6
6
 
7
7
  import Module from 'module';
8
8
  import path from 'path';
9
+ import fs from 'fs';
10
+
11
+ /**
12
+ * Load a file from local file system
13
+ * @param filename
14
+ * @returns
15
+ */
16
+ export async function readFileAsArrayBuffer(filename: string): Promise<ArrayBuffer> {
17
+ if (filename.startsWith('http')) {
18
+ const response = await fetch(filename);
19
+ return await response.arrayBuffer();
20
+ }
21
+ const buffer = fs.readFileSync(filename);
22
+ return buffer.buffer;
23
+ }
24
+
25
+ /**
26
+ * Load a file from local file system
27
+ * @param filename
28
+ * @returns
29
+ */
30
+ export async function readFileAsText(filename: string): Promise<string> {
31
+ if (filename.startsWith('http')) {
32
+ const response = await fetch(filename);
33
+ return await response.text();
34
+ }
35
+ const text = fs.readFileSync(filename, 'utf8');
36
+ return text;
37
+ }
9
38
 
10
39
  // Node.js Dynamically require from file
11
40
  // Relative names are resolved relative to cwd
@@ -19,6 +19,8 @@ export type ChildProcessProxyProps = {
19
19
  wait?: number;
20
20
  /** Options passed on to Node'.js `spawn` */
21
21
  spawn?: ChildProcess.SpawnOptionsWithoutStdio;
22
+ /** Should proceed if stderr stream recieved data */
23
+ ignoreStderr?: boolean;
22
24
  /** Callback when the */
23
25
  onStart?: (proxy: ChildProcessProxy) => void;
24
26
  onSuccess?: (proxy: ChildProcessProxy) => void;
@@ -83,11 +85,12 @@ export default class ChildProcessProxy {
83
85
  childProcess.stdout.on('data', (data) => {
84
86
  console.log(data.toString());
85
87
  });
86
- // TODO - add option regarding whether stderr should be treated as data
87
88
  childProcess.stderr.on('data', (data) => {
88
89
  console.log(`Child process wrote to stderr: "${data}".`);
89
- this._clearTimeout();
90
- reject(new Error(data));
90
+ if (!props.ignoreStderr) {
91
+ this._clearTimeout();
92
+ reject(new Error(data));
93
+ }
91
94
  });
92
95
  childProcess.on('error', (error) => {
93
96
  console.log(`Child process errored with ${error}`);
@@ -3,10 +3,7 @@
3
3
  import type {WorkerObject, WorkerOptions} from '../../types';
4
4
  import {assert} from '../env-utils/assert';
5
5
  import {isBrowser} from '../env-utils/globals';
6
- import {VERSION as __VERSION__} from '../env-utils/version';
7
-
8
- const NPM_TAG = 'beta'; // 'beta', or 'latest' on release-branch
9
- const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : NPM_TAG;
6
+ import {VERSION, NPM_TAG} from '../env-utils/version';
10
7
 
11
8
  /**
12
9
  * Gets worker object's name (for debugging in Chrome thread inspector window)
package/dist/index.js DELETED
@@ -1,59 +0,0 @@
1
- "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
- Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.NullWorker = exports.ChildProcessProxy = exports.AsyncQueue = exports.loadLibrary = exports.getLibraryUrl = exports.getTransferListForWriter = exports.getTransferList = exports.validateWorkerVersion = exports.getWorkerURL = exports.createWorker = exports.canProcessOnWorker = exports.processOnWorker = exports.WorkerBody = exports.WorkerPool = exports.WorkerFarm = exports.WorkerThread = exports.WorkerJob = exports.isWorker = exports.isBrowser = exports.assert = void 0;
7
- const version_1 = require("./lib/env-utils/version");
8
- // GENERAL UTILS
9
- var assert_1 = require("./lib/env-utils/assert");
10
- Object.defineProperty(exports, "assert", { enumerable: true, get: function () { return assert_1.assert; } });
11
- var globals_1 = require("./lib/env-utils/globals");
12
- Object.defineProperty(exports, "isBrowser", { enumerable: true, get: function () { return globals_1.isBrowser; } });
13
- Object.defineProperty(exports, "isWorker", { enumerable: true, get: function () { return globals_1.isWorker; } });
14
- // WORKER UTILS - TYPES
15
- var worker_job_1 = require("./lib/worker-farm/worker-job");
16
- Object.defineProperty(exports, "WorkerJob", { enumerable: true, get: function () { return __importDefault(worker_job_1).default; } });
17
- var worker_thread_1 = require("./lib/worker-farm/worker-thread");
18
- Object.defineProperty(exports, "WorkerThread", { enumerable: true, get: function () { return __importDefault(worker_thread_1).default; } });
19
- // WORKER FARMS
20
- var worker_farm_1 = require("./lib/worker-farm/worker-farm");
21
- Object.defineProperty(exports, "WorkerFarm", { enumerable: true, get: function () { return __importDefault(worker_farm_1).default; } });
22
- var worker_pool_1 = require("./lib/worker-farm/worker-pool");
23
- Object.defineProperty(exports, "WorkerPool", { enumerable: true, get: function () { return __importDefault(worker_pool_1).default; } });
24
- var worker_body_1 = require("./lib/worker-farm/worker-body");
25
- Object.defineProperty(exports, "WorkerBody", { enumerable: true, get: function () { return __importDefault(worker_body_1).default; } });
26
- var process_on_worker_1 = require("./lib/worker-api/process-on-worker");
27
- Object.defineProperty(exports, "processOnWorker", { enumerable: true, get: function () { return process_on_worker_1.processOnWorker; } });
28
- Object.defineProperty(exports, "canProcessOnWorker", { enumerable: true, get: function () { return process_on_worker_1.canProcessOnWorker; } });
29
- var create_worker_1 = require("./lib/worker-api/create-worker");
30
- Object.defineProperty(exports, "createWorker", { enumerable: true, get: function () { return create_worker_1.createWorker; } });
31
- // WORKER UTILS - EXPORTS
32
- var get_worker_url_1 = require("./lib/worker-api/get-worker-url");
33
- Object.defineProperty(exports, "getWorkerURL", { enumerable: true, get: function () { return get_worker_url_1.getWorkerURL; } });
34
- var validate_worker_version_1 = require("./lib/worker-api/validate-worker-version");
35
- Object.defineProperty(exports, "validateWorkerVersion", { enumerable: true, get: function () { return validate_worker_version_1.validateWorkerVersion; } });
36
- var get_transfer_list_1 = require("./lib/worker-utils/get-transfer-list");
37
- Object.defineProperty(exports, "getTransferList", { enumerable: true, get: function () { return get_transfer_list_1.getTransferList; } });
38
- Object.defineProperty(exports, "getTransferListForWriter", { enumerable: true, get: function () { return get_transfer_list_1.getTransferListForWriter; } });
39
- // LIBRARY UTILS
40
- var library_utils_1 = require("./lib/library-utils/library-utils");
41
- Object.defineProperty(exports, "getLibraryUrl", { enumerable: true, get: function () { return library_utils_1.getLibraryUrl; } });
42
- Object.defineProperty(exports, "loadLibrary", { enumerable: true, get: function () { return library_utils_1.loadLibrary; } });
43
- // PARSER UTILS
44
- var async_queue_1 = require("./lib/async-queue/async-queue");
45
- Object.defineProperty(exports, "AsyncQueue", { enumerable: true, get: function () { return __importDefault(async_queue_1).default; } });
46
- // PROCESS UTILS
47
- var child_process_proxy_1 = require("./lib/process-utils/child-process-proxy");
48
- Object.defineProperty(exports, "ChildProcessProxy", { enumerable: true, get: function () { return __importDefault(child_process_proxy_1).default; } });
49
- // WORKER OBJECTS
50
- /** A null worker to test that worker processing is functional */
51
- exports.NullWorker = {
52
- id: 'null',
53
- name: 'null',
54
- module: 'worker-utils',
55
- version: version_1.VERSION,
56
- options: {
57
- null: {}
58
- }
59
- };
@@ -1,87 +0,0 @@
1
- "use strict";
2
- // From https://github.com/rauschma/async-iter-demo/tree/master/src under MIT license
3
- // http://2ality.com/2016/10/asynchronous-iteration.html
4
- Object.defineProperty(exports, "__esModule", { value: true });
5
- /**
6
- * Async Queue
7
- * - AsyncIterable: An async iterator can be
8
- * - Values can be pushed onto the queue
9
- * @example
10
- * const asyncQueue = new AsyncQueue();
11
- * setTimeout(() => asyncQueue.enqueue('tick'), 1000);
12
- * setTimeout(() => asyncQueue.enqueue(new Error('done')), 10000);
13
- * for await (const value of asyncQueue) {
14
- * console.log(value); // tick
15
- * }
16
- */
17
- class AsyncQueue {
18
- constructor() {
19
- this._values = []; // enqueues > dequeues
20
- this._settlers = []; // dequeues > enqueues
21
- this._closed = false;
22
- }
23
- /** Return an async iterator for this queue */
24
- [Symbol.asyncIterator]() {
25
- return this;
26
- }
27
- /** Push a new value - the async iterator will yield a promise resolved to this value */
28
- push(value) {
29
- return this.enqueue(value);
30
- }
31
- /**
32
- * Push a new value - the async iterator will yield a promise resolved to this value
33
- * Add an error - the async iterator will yield a promise rejected with this value
34
- */
35
- enqueue(value) {
36
- if (this._closed) {
37
- throw new Error('Closed');
38
- }
39
- if (this._settlers.length > 0) {
40
- if (this._values.length > 0) {
41
- throw new Error('Illegal internal state');
42
- }
43
- const settler = this._settlers.shift();
44
- if (value instanceof Error) {
45
- settler.reject(value);
46
- }
47
- else {
48
- settler.resolve({ value });
49
- }
50
- }
51
- else {
52
- this._values.push(value);
53
- }
54
- }
55
- /** Indicate that we not waiting for more values - The async iterator will be done */
56
- close() {
57
- while (this._settlers.length > 0) {
58
- const settler = this._settlers.shift();
59
- settler.resolve({ done: true });
60
- }
61
- this._closed = true;
62
- }
63
- // ITERATOR IMPLEMENTATION
64
- /** @returns a Promise for an IteratorResult */
65
- next() {
66
- // If values in queue, yield the first value
67
- if (this._values.length > 0) {
68
- const value = this._values.shift();
69
- if (value instanceof Error) {
70
- return Promise.reject(value);
71
- }
72
- return Promise.resolve({ done: false, value });
73
- }
74
- // If queue is closed, the iterator is done
75
- if (this._closed) {
76
- if (this._settlers.length > 0) {
77
- throw new Error('Illegal internal state');
78
- }
79
- return Promise.resolve({ done: true, value: undefined });
80
- }
81
- // Yield a promise that waits for new values to be enqueued
82
- return new Promise((resolve, reject) => {
83
- this._settlers.push({ resolve, reject });
84
- });
85
- }
86
- }
87
- exports.default = AsyncQueue;
@@ -1,13 +0,0 @@
1
- "use strict";
2
- // Replacement for the external assert method to reduce bundle size
3
- // Note: We don't use the second "message" argument in calling code,
4
- // so no need to support it here
5
- Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.assert = void 0;
7
- /** Throws an `Error` with the optional `message` if `condition` is falsy */
8
- function assert(condition, message) {
9
- if (!condition) {
10
- throw new Error(message || 'loaders.gl assertion failed.');
11
- }
12
- }
13
- exports.assert = assert;
@@ -1,32 +0,0 @@
1
- "use strict";
2
- // Purpose: include this in your module to avoids adding dependencies on
3
- // micro modules like 'global' and 'is-browser';
4
- Object.defineProperty(exports, "__esModule", { value: true });
5
- exports.nodeVersion = exports.isMobile = exports.isWorker = exports.isBrowser = exports.document = exports.global = exports.window = exports.self = void 0;
6
- /* eslint-disable no-restricted-globals */
7
- const globals = {
8
- self: typeof self !== 'undefined' && self,
9
- window: typeof window !== 'undefined' && window,
10
- global: typeof global !== 'undefined' && global,
11
- document: typeof document !== 'undefined' && document
12
- };
13
- const self_ = globals.self || globals.window || globals.global || {};
14
- exports.self = self_;
15
- const window_ = globals.window || globals.self || globals.global || {};
16
- exports.window = window_;
17
- const global_ = globals.global || globals.self || globals.window || {};
18
- exports.global = global_;
19
- const document_ = globals.document || {};
20
- exports.document = document_;
21
- /** true if running in the browser, false if running in Node.js */
22
- exports.isBrowser =
23
- // @ts-ignore process.browser
24
- typeof process !== 'object' || String(process) !== '[object process]' || process.browser;
25
- /** true if running on a worker thread */
26
- exports.isWorker = typeof importScripts === 'function';
27
- /** true if running on a mobile device */
28
- exports.isMobile = typeof window !== 'undefined' && typeof window.orientation !== 'undefined';
29
- // Extract node major version
30
- const matches = typeof process !== 'undefined' && process.version && /v([0-9]*)/.exec(process.version);
31
- /** Version of Node.js if running under Node, otherwise 0 */
32
- exports.nodeVersion = (matches && parseFloat(matches[1])) || 0;
@@ -1,12 +0,0 @@
1
- "use strict";
2
- // Version constant cannot be imported, it needs to correspond to the build version of **this** module.
3
- // __VERSION__ is injected by babel-plugin-version-inline
4
- Object.defineProperty(exports, "__esModule", { value: true });
5
- exports.VERSION = void 0;
6
- // Change to `latest` on production branches
7
- const DEFAULT_VERSION = 'beta';
8
- exports.VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : DEFAULT_VERSION;
9
- if (typeof __VERSION__ === 'undefined') {
10
- // eslint-disable-next-line
11
- console.error('loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.');
12
- }
@@ -1,170 +0,0 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
- Object.defineProperty(exports, "__esModule", { value: true });
26
- exports.getLibraryUrl = exports.loadLibrary = void 0;
27
- /* global importScripts */
28
- const globals_1 = require("../env-utils/globals");
29
- const node = __importStar(require("../node/require-utils.node"));
30
- const assert_1 = require("../env-utils/assert");
31
- const version_1 = require("../env-utils/version");
32
- /**
33
- * TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...
34
- * 'beta' on beta branch, 'latest' on prod branch
35
- */
36
- const LATEST = 'beta';
37
- const VERSION = typeof version_1.VERSION !== 'undefined' ? version_1.VERSION : LATEST;
38
- const loadLibraryPromises = {}; // promises
39
- /**
40
- * Dynamically loads a library ("module")
41
- *
42
- * - wasm library: Array buffer is returned
43
- * - js library: Parse JS is returned
44
- *
45
- * Method depends on environment
46
- * - browser - script element is created and installed on document
47
- * - worker - eval is called on global context
48
- * - node - file is required
49
- *
50
- * @param libraryUrl
51
- * @param moduleName
52
- * @param options
53
- */
54
- async function loadLibrary(libraryUrl, moduleName = null, options = {}) {
55
- if (moduleName) {
56
- libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);
57
- }
58
- // Ensure libraries are only loaded once
59
- loadLibraryPromises[libraryUrl] =
60
- // eslint-disable-next-line @typescript-eslint/no-misused-promises
61
- loadLibraryPromises[libraryUrl] || loadLibraryFromFile(libraryUrl);
62
- return await loadLibraryPromises[libraryUrl];
63
- }
64
- exports.loadLibrary = loadLibrary;
65
- // TODO - sort out how to resolve paths for main/worker and dev/prod
66
- function getLibraryUrl(library, moduleName, options) {
67
- // Check if already a URL
68
- if (library.startsWith('http')) {
69
- return library;
70
- }
71
- // Allow application to import and supply libraries through `options.modules`
72
- const modules = options.modules || {};
73
- if (modules[library]) {
74
- return modules[library];
75
- }
76
- // Load from local files, not from CDN scripts in Node.js
77
- // TODO - needs to locate the modules directory when installed!
78
- if (!globals_1.isBrowser) {
79
- return `modules/${moduleName}/dist/libs/${library}`;
80
- }
81
- // In browser, load from external scripts
82
- if (options.CDN) {
83
- (0, assert_1.assert)(options.CDN.startsWith('http'));
84
- return `${options.CDN}/${moduleName}@${VERSION}/dist/libs/${library}`;
85
- }
86
- // TODO - loading inside workers requires paths relative to worker script location...
87
- if (globals_1.isWorker) {
88
- return `../src/libs/${library}`;
89
- }
90
- return `modules/${moduleName}/src/libs/${library}`;
91
- }
92
- exports.getLibraryUrl = getLibraryUrl;
93
- async function loadLibraryFromFile(libraryUrl) {
94
- if (libraryUrl.endsWith('wasm')) {
95
- const response = await fetch(libraryUrl);
96
- return await response.arrayBuffer();
97
- }
98
- if (!globals_1.isBrowser) {
99
- try {
100
- return node && node.requireFromFile && (await node.requireFromFile(libraryUrl));
101
- }
102
- catch {
103
- return null;
104
- }
105
- }
106
- if (globals_1.isWorker) {
107
- return importScripts(libraryUrl);
108
- }
109
- // TODO - fix - should be more secure than string parsing since observes CORS
110
- // if (isBrowser) {
111
- // return await loadScriptFromFile(libraryUrl);
112
- // }
113
- const response = await fetch(libraryUrl);
114
- const scriptSource = await response.text();
115
- return loadLibraryFromString(scriptSource, libraryUrl);
116
- }
117
- /*
118
- async function loadScriptFromFile(libraryUrl) {
119
- const script = document.createElement('script');
120
- script.src = libraryUrl;
121
- return await new Promise((resolve, reject) => {
122
- script.onload = data => {
123
- resolve(data);
124
- };
125
- script.onerror = reject;
126
- });
127
- }
128
- */
129
- // TODO - Needs security audit...
130
- // - Raw eval call
131
- // - Potentially bypasses CORS
132
- // Upside is that this separates fetching and parsing
133
- // we could create a`LibraryLoader` or`ModuleLoader`
134
- function loadLibraryFromString(scriptSource, id) {
135
- if (!globals_1.isBrowser) {
136
- return node.requireFromString && node.requireFromString(scriptSource, id);
137
- }
138
- if (globals_1.isWorker) {
139
- // Use lvalue trick to make eval run in global scope
140
- eval.call(globals_1.global, scriptSource); // eslint-disable-line no-eval
141
- // https://stackoverflow.com/questions/9107240/1-evalthis-vs-evalthis-in-javascript
142
- // http://perfectionkills.com/global-eval-what-are-the-options/
143
- return null;
144
- }
145
- const script = document.createElement('script');
146
- script.id = id;
147
- // most browsers like a separate text node but some throw an error. The second method covers those.
148
- try {
149
- script.appendChild(document.createTextNode(scriptSource));
150
- }
151
- catch (e) {
152
- script.text = scriptSource;
153
- }
154
- document.body.appendChild(script);
155
- return null;
156
- }
157
- // TODO - technique for module injection into worker, from THREE.DracoLoader...
158
- /*
159
- function combineWorkerWithLibrary(worker, jsContent) {
160
- var fn = wWorker.toString();
161
- var body = [
162
- '// injected',
163
- jsContent,
164
- '',
165
- '// worker',
166
- fn.substring(fn.indexOf('{') + 1, fn.lastIndexOf('}'))
167
- ].join('\n');
168
- this.workerSourceURL = URL.createObjectURL(new Blob([body]));
169
- }
170
- */
@@ -1,60 +0,0 @@
1
- "use strict";
2
- // Fork of https://github.com/floatdrop/require-from-string/blob/master/index.js
3
- // Copyright (c) Vsevolod Strukchinsky <floatdrop@gmail.com> (github.com/floatdrop)
4
- // MIT license
5
- var __importDefault = (this && this.__importDefault) || function (mod) {
6
- return (mod && mod.__esModule) ? mod : { "default": mod };
7
- };
8
- Object.defineProperty(exports, "__esModule", { value: true });
9
- exports.requireFromString = exports.requireFromFile = void 0;
10
- // this file is not visible to webpack (it is excluded in the package.json "browser" field).
11
- const module_1 = __importDefault(require("module"));
12
- const path_1 = __importDefault(require("path"));
13
- // Node.js Dynamically require from file
14
- // Relative names are resolved relative to cwd
15
- // This indirect function is provided because webpack will try to bundle `module.require`.
16
- // this file is not visible to webpack (it is excluded in the package.json "browser" field).
17
- async function requireFromFile(filename) {
18
- if (filename.startsWith('http')) {
19
- const response = await fetch(filename);
20
- const code = await response.text();
21
- return requireFromString(code);
22
- }
23
- if (!filename.startsWith('/')) {
24
- filename = `${process.cwd()}/${filename}`;
25
- }
26
- return require(filename);
27
- }
28
- exports.requireFromFile = requireFromFile;
29
- // Dynamically require from string
30
- // - `code` - Required - Type: string - Module code.
31
- // - `filename` - Type: string - Default: '' - Optional filename.
32
- // - `options.appendPaths` Type: Array List of paths, that will be appended to module paths.
33
- // Useful, when you want to be able require modules from these paths.
34
- // - `options.prependPaths` Type: Array Same as appendPaths, but paths will be prepended.
35
- function requireFromString(code, filename = '', options) {
36
- if (typeof filename === 'object') {
37
- options = filename;
38
- filename = '';
39
- }
40
- if (typeof code !== 'string') {
41
- throw new Error(`code must be a string, not ${typeof code}`);
42
- }
43
- // @ts-ignore
44
- const paths = module_1.default._nodeModulePaths(path_1.default.dirname(filename));
45
- const parent = module.parent;
46
- // @ts-ignore
47
- const newModule = new module_1.default(filename, parent);
48
- newModule.filename = filename;
49
- newModule.paths = []
50
- .concat(options?.prependPaths || [])
51
- .concat(paths)
52
- .concat(options?.appendPaths || []);
53
- // @ts-ignore
54
- newModule._compile(code, filename);
55
- if (parent && parent.children) {
56
- parent.children.splice(parent.children.indexOf(newModule), 1);
57
- }
58
- return newModule.exports;
59
- }
60
- exports.requireFromString = requireFromString;
@@ -1,15 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.parentPort = exports.NodeWorkerType = exports.NodeWorker = exports.Worker = void 0;
4
- // Browser fills for Node.js built-in `worker_threads` module.
5
- // These fills are non-functional, and just intended to ensure that
6
- // `import 'worker_threads` doesn't break browser builds.
7
- // The replacement is done in package.json browser field
8
- class Worker {
9
- // eslint-disable-next-line @typescript-eslint/no-empty-function
10
- terminate() { }
11
- }
12
- exports.Worker = Worker;
13
- exports.NodeWorker = Worker;
14
- exports.NodeWorkerType = Worker;
15
- exports.parentPort = null;