@loaders.gl/worker-utils 3.3.0-alpha.9 → 3.4.0-alpha.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 (33) hide show
  1. package/dist/es5/lib/env-utils/version.js +2 -2
  2. package/dist/es5/lib/library-utils/library-utils.js +1 -1
  3. package/dist/es5/lib/node/worker_threads-browser.js +14 -6
  4. package/dist/es5/lib/node/worker_threads-browser.js.map +1 -1
  5. package/dist/es5/lib/node/worker_threads.js +15 -4
  6. package/dist/es5/lib/node/worker_threads.js.map +1 -1
  7. package/dist/es5/lib/worker-api/get-worker-url.js +1 -1
  8. package/dist/es5/lib/worker-farm/worker-thread.js +4 -3
  9. package/dist/es5/lib/worker-farm/worker-thread.js.map +1 -1
  10. package/dist/esm/lib/env-utils/version.js +2 -2
  11. package/dist/esm/lib/library-utils/library-utils.js +1 -1
  12. package/dist/esm/lib/node/worker_threads-browser.js +5 -1
  13. package/dist/esm/lib/node/worker_threads-browser.js.map +1 -1
  14. package/dist/esm/lib/node/worker_threads.js +4 -0
  15. package/dist/esm/lib/node/worker_threads.js.map +1 -1
  16. package/dist/esm/lib/worker-api/get-worker-url.js +1 -1
  17. package/dist/esm/lib/worker-farm/worker-thread.js +2 -1
  18. package/dist/esm/lib/worker-farm/worker-thread.js.map +1 -1
  19. package/dist/lib/node/worker_threads-browser.d.ts +5 -2
  20. package/dist/lib/node/worker_threads-browser.d.ts.map +1 -1
  21. package/dist/lib/node/worker_threads-browser.js +5 -1
  22. package/dist/lib/node/worker_threads.d.ts +4 -1
  23. package/dist/lib/node/worker_threads.d.ts.map +1 -1
  24. package/dist/lib/node/worker_threads.js +16 -0
  25. package/dist/lib/worker-api/create-worker.js +1 -1
  26. package/dist/lib/worker-farm/worker-thread.d.ts +3 -4
  27. package/dist/lib/worker-farm/worker-thread.d.ts.map +1 -1
  28. package/dist/lib/worker-farm/worker-thread.js +4 -3
  29. package/package.json +3 -3
  30. package/src/lib/node/{worker_threads-browser.js → worker_threads-browser.ts} +7 -1
  31. package/src/lib/node/worker_threads.ts +6 -0
  32. package/src/lib/worker-farm/worker-thread.ts +6 -4
  33. package/src/lib/node/worker_threads.js +0 -1
@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.VERSION = void 0;
7
7
 
8
8
  var DEFAULT_VERSION = 'beta';
9
- var VERSION = typeof "3.3.0-alpha.9" !== 'undefined' ? "3.3.0-alpha.9" : DEFAULT_VERSION;
9
+ var VERSION = typeof "3.4.0-alpha.1" !== 'undefined' ? "3.4.0-alpha.1" : DEFAULT_VERSION;
10
10
  exports.VERSION = VERSION;
11
- if (typeof "3.3.0-alpha.9" === 'undefined') {
11
+ if (typeof "3.4.0-alpha.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
@@ -17,7 +17,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
17
17
  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; }
18
18
 
19
19
  var LATEST = 'beta';
20
- var VERSION = typeof "3.3.0-alpha.9" !== 'undefined' ? "3.3.0-alpha.9" : LATEST;
20
+ var VERSION = typeof "3.4.0-alpha.1" !== 'undefined' ? "3.4.0-alpha.1" : LATEST;
21
21
  var loadLibraryPromises = {};
22
22
 
23
23
  function loadLibrary(_x) {
@@ -4,13 +4,21 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.parentPort = exports.Worker = void 0;
8
- var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
7
+ exports.parentPort = exports.Worker = exports.NodeWorkerType = exports.NodeWorker = void 0;
9
8
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
10
- var Worker = (0, _createClass2.default)(function Worker() {
11
- (0, _classCallCheck2.default)(this, Worker);
12
- });
13
- exports.Worker = Worker;
9
+ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
10
+ var Worker = function () {
11
+ function Worker() {
12
+ (0, _classCallCheck2.default)(this, Worker);
13
+ }
14
+ (0, _createClass2.default)(Worker, [{
15
+ key: "terminate",
16
+ value:
17
+ function terminate() {}
18
+ }]);
19
+ return Worker;
20
+ }();
21
+ exports.NodeWorkerType = exports.NodeWorker = exports.Worker = Worker;
14
22
  var parentPort = null;
15
23
  exports.parentPort = parentPort;
16
24
  //# sourceMappingURL=worker_threads-browser.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"worker_threads-browser.js","names":["Worker","parentPort"],"sources":["../../../../src/lib/node/worker_threads-browser.js"],"sourcesContent":["// Browser fills for Node.js built-in `worker_threads` module.\n// These fills are non-functional, and just intended to ensure that\n// `import 'worker_threads` doesn't break browser builds.\n// The replacement is done in package.json browser field\nexport class Worker {}\n\nexport const parentPort = null;\n"],"mappings":";;;;;;;;;IAIaA,MAAM;EAAA;AAAA;AAAA;AAEZ,IAAMC,UAAU,GAAG,IAAI;AAAC"}
1
+ {"version":3,"file":"worker_threads-browser.js","names":["Worker","parentPort"],"sources":["../../../../src/lib/node/worker_threads-browser.ts"],"sourcesContent":["// Browser fills for Node.js built-in `worker_threads` module.\n// These fills are non-functional, and just intended to ensure that\n// `import 'worker_threads` doesn't break browser builds.\n// The replacement is done in package.json browser field\nexport class Worker {\n // eslint-disable-next-line @typescript-eslint/no-empty-function\n terminate() {}\n}\n\nexport {Worker as NodeWorker};\nexport {Worker as NodeWorkerType};\n\nexport const parentPort = null;\n"],"mappings":";;;;;;;;;IAIaA,MAAM;EAAA;IAAA;EAAA;EAAA;IAAA;IAAA;IAEjB,qBAAY,CAAC;EAAC;EAAA;AAAA;AAAA;AAMT,IAAMC,UAAU,GAAG,IAAI;AAAC"}
@@ -1,17 +1,28 @@
1
1
  "use strict";
2
2
 
3
+ var _typeof = require("@babel/runtime/helpers/typeof");
3
4
  Object.defineProperty(exports, "__esModule", {
4
5
  value: true
5
6
  });
6
- var _worker_threads = require("worker_threads");
7
- Object.keys(_worker_threads).forEach(function (key) {
7
+ var _exportNames = {
8
+ NodeWorker: true
9
+ };
10
+ exports.NodeWorker = void 0;
11
+ var WorkerThreads = _interopRequireWildcard(require("worker_threads"));
12
+ Object.keys(WorkerThreads).forEach(function (key) {
8
13
  if (key === "default" || key === "__esModule") return;
9
- if (key in exports && exports[key] === _worker_threads[key]) return;
14
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
15
+ if (key in exports && exports[key] === WorkerThreads[key]) return;
10
16
  Object.defineProperty(exports, key, {
11
17
  enumerable: true,
12
18
  get: function get() {
13
- return _worker_threads[key];
19
+ return WorkerThreads[key];
14
20
  }
15
21
  });
16
22
  });
23
+ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
24
+ 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; }
25
+
26
+ var NodeWorker = WorkerThreads.Worker;
27
+ exports.NodeWorker = NodeWorker;
17
28
  //# sourceMappingURL=worker_threads.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"worker_threads.js","names":[],"sources":["../../../../src/lib/node/worker_threads.js"],"sourcesContent":["export * from 'worker_threads';\n"],"mappings":";;;;;AAAA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA"}
1
+ {"version":3,"file":"worker_threads.js","names":["NodeWorker","WorkerThreads","Worker"],"sources":["../../../../src/lib/node/worker_threads.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport * as WorkerThreads from 'worker_threads';\nexport * from 'worker_threads';\nexport const NodeWorker = WorkerThreads.Worker;\nexport type NodeWorkerType = WorkerThreads.Worker;\n"],"mappings":";;;;;;;;;;AAEA;AACA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AAA+B;AAAA;;AACxB,IAAMA,UAAU,GAAGC,aAAa,CAACC,MAAM;AAAC"}
@@ -8,7 +8,7 @@ exports.getWorkerURL = getWorkerURL;
8
8
  var _assert = require("../env-utils/assert");
9
9
  var _version = require("../env-utils/version");
10
10
  var NPM_TAG = 'beta';
11
- var VERSION = typeof "3.3.0-alpha.9" !== 'undefined' ? "3.3.0-alpha.9" : NPM_TAG;
11
+ var VERSION = typeof "3.4.0-alpha.1" !== 'undefined' ? "3.4.0-alpha.1" : NPM_TAG;
12
12
 
13
13
  function getWorkerName(worker) {
14
14
  var warning = worker.version !== VERSION ? " (worker-utils@".concat(VERSION, ")") : '';
@@ -13,6 +13,7 @@ var _globals = require("../env-utils/globals");
13
13
  var _assert = require("../env-utils/assert");
14
14
  var _getLoadableWorkerUrl = require("../worker-utils/get-loadable-worker-url");
15
15
  var _getTransferList = require("../worker-utils/get-transfer-list");
16
+
16
17
  var NOOP = function NOOP() {};
17
18
  var WorkerThread = function () {
18
19
  function WorkerThread(props) {
@@ -118,11 +119,11 @@ var WorkerThread = function () {
118
119
  if (this.url) {
119
120
  var absolute = this.url.includes(':/') || this.url.startsWith('/');
120
121
  var url = absolute ? this.url : "./".concat(this.url);
121
- worker = new _worker_threads.Worker(url, {
122
+ worker = new _worker_threads.NodeWorker(url, {
122
123
  eval: false
123
124
  });
124
125
  } else if (this.source) {
125
- worker = new _worker_threads.Worker(this.source, {
126
+ worker = new _worker_threads.NodeWorker(this.source, {
126
127
  eval: true
127
128
  });
128
129
  } else {
@@ -142,7 +143,7 @@ var WorkerThread = function () {
142
143
  key: "isSupported",
143
144
  value:
144
145
  function isSupported() {
145
- return typeof Worker !== 'undefined' && _globals.isBrowser || typeof _worker_threads.Worker !== 'undefined' && !_globals.isBrowser;
146
+ return typeof Worker !== 'undefined' && _globals.isBrowser || typeof _worker_threads.NodeWorker !== 'undefined' && !_globals.isBrowser;
146
147
  }
147
148
  }]);
148
149
  return WorkerThread;
@@ -1 +1 @@
1
- {"version":3,"file":"worker-thread.js","names":["NOOP","WorkerThread","props","name","source","url","assert","onMessage","onError","error","console","log","worker","isBrowser","_createBrowserWorker","_createNodeWorker","terminate","terminated","Boolean","data","transferList","getTransferList","postMessage","event","message","lineno","colno","Error","_loadableURL","getLoadableWorkerURL","Worker","onmessage","onerror","_getErrorFromErrorEvent","onmessageerror","absolute","includes","startsWith","NodeWorker","eval","on","code"],"sources":["../../../../src/lib/worker-farm/worker-thread.ts"],"sourcesContent":["import {Worker as NodeWorker} from '../node/worker_threads';\nimport {isBrowser} from '../env-utils/globals';\nimport {assert} from '../env-utils/assert';\nimport {getLoadableWorkerURL} from '../worker-utils/get-loadable-worker-url';\nimport {getTransferList} from '../worker-utils/get-transfer-list';\n\nconst NOOP = () => {};\n\nexport type WorkerThreadProps = {\n name: string;\n source?: string;\n url?: string;\n};\n\n/**\n * Represents one worker thread\n */\nexport default class WorkerThread {\n readonly name: string;\n readonly source: string | undefined;\n readonly url: string | undefined;\n terminated: boolean = false;\n worker: Worker | NodeWorker;\n onMessage: (message: any) => void;\n onError: (error: Error) => void;\n\n private _loadableURL: string = '';\n\n /** Checks if workers are supported on this platform */\n static isSupported(): boolean {\n return (\n (typeof Worker !== 'undefined' && isBrowser) ||\n (typeof NodeWorker !== 'undefined' && !isBrowser)\n );\n }\n\n constructor(props: WorkerThreadProps) {\n const {name, source, url} = props;\n assert(source || url); // Either source or url must be defined\n this.name = name;\n this.source = source;\n this.url = url;\n this.onMessage = NOOP;\n this.onError = (error) => console.log(error); // eslint-disable-line\n\n this.worker = isBrowser ? this._createBrowserWorker() : this._createNodeWorker();\n }\n\n /**\n * Terminate this worker thread\n * @note Can free up significant memory\n */\n destroy(): void {\n this.onMessage = NOOP;\n this.onError = NOOP;\n this.worker.terminate(); // eslint-disable-line @typescript-eslint/no-floating-promises\n this.terminated = true;\n }\n\n get isRunning() {\n return Boolean(this.onMessage);\n }\n\n /**\n * Send a message to this worker thread\n * @param data any data structure, ideally consisting mostly of transferrable objects\n * @param transferList If not supplied, calculated automatically by traversing data\n */\n postMessage(data: any, transferList?: any[]): void {\n transferList = transferList || getTransferList(data);\n // @ts-ignore\n this.worker.postMessage(data, transferList);\n }\n\n // PRIVATE\n\n /**\n * Generate a standard Error from an ErrorEvent\n * @param event\n */\n _getErrorFromErrorEvent(event: ErrorEvent): Error {\n // Note Error object does not have the expected fields if loading failed completely\n // https://developer.mozilla.org/en-US/docs/Web/API/Worker#Event_handlers\n // https://developer.mozilla.org/en-US/docs/Web/API/ErrorEvent\n let message = 'Failed to load ';\n message += `worker ${this.name} from ${this.url}. `;\n if (event.message) {\n message += `${event.message} in `;\n }\n // const hasFilename = event.filename && !event.filename.startsWith('blob:');\n // message += hasFilename ? event.filename : this.source.slice(0, 100);\n if (event.lineno) {\n message += `:${event.lineno}:${event.colno}`;\n }\n return new Error(message);\n }\n\n /**\n * Creates a worker thread on the browser\n */\n _createBrowserWorker(): Worker {\n this._loadableURL = getLoadableWorkerURL({source: this.source, url: this.url});\n const worker = new Worker(this._loadableURL, {name: this.name});\n\n worker.onmessage = (event) => {\n if (!event.data) {\n this.onError(new Error('No data received'));\n } else {\n this.onMessage(event.data);\n }\n };\n // This callback represents an uncaught exception in the worker thread\n worker.onerror = (error: ErrorEvent): void => {\n this.onError(this._getErrorFromErrorEvent(error));\n this.terminated = true;\n };\n // TODO - not clear when this would be called, for now just log in case it happens\n worker.onmessageerror = (event) => console.error(event); // eslint-disable-line\n\n return worker;\n }\n\n /**\n * Creates a worker thread in node.js\n * @todo https://nodejs.org/api/async_hooks.html#async-resource-worker-pool\n */\n _createNodeWorker(): NodeWorker {\n let worker: NodeWorker;\n if (this.url) {\n // Make sure relative URLs start with './'\n const absolute = this.url.includes(':/') || this.url.startsWith('/');\n const url = absolute ? this.url : `./${this.url}`;\n // console.log('Starting work from', url);\n worker = new NodeWorker(url, {eval: false});\n } else if (this.source) {\n worker = new NodeWorker(this.source, {eval: true});\n } else {\n throw new Error('no worker');\n }\n worker.on('message', (data) => {\n // console.error('message', data);\n this.onMessage(data);\n });\n worker.on('error', (error) => {\n // console.error('error', error);\n this.onError(error);\n });\n worker.on('exit', (code) => {\n // console.error('exit', code);\n });\n return worker;\n }\n}\n"],"mappings":";;;;;;;;;;AAAA;AACA;AACA;AACA;AACA;AAEA,IAAMA,IAAI,GAAG,SAAPA,IAAI,GAAS,CAAC,CAAC;AAAC,IAWDC,YAAY;EAmB/B,sBAAYC,KAAwB,EAAE;IAAA;IAAA;IAAA;IAAA;IAAA,kDAfhB,KAAK;IAAA;IAAA;IAAA;IAAA,oDAKI,EAAE;IAW/B,IAAOC,IAAI,GAAiBD,KAAK,CAA1BC,IAAI;MAAEC,MAAM,GAASF,KAAK,CAApBE,MAAM;MAAEC,GAAG,GAAIH,KAAK,CAAZG,GAAG;IACxB,IAAAC,cAAM,EAACF,MAAM,IAAIC,GAAG,CAAC;IACrB,IAAI,CAACF,IAAI,GAAGA,IAAI;IAChB,IAAI,CAACC,MAAM,GAAGA,MAAM;IACpB,IAAI,CAACC,GAAG,GAAGA,GAAG;IACd,IAAI,CAACE,SAAS,GAAGP,IAAI;IACrB,IAAI,CAACQ,OAAO,GAAG,UAACC,KAAK;MAAA,OAAKC,OAAO,CAACC,GAAG,CAACF,KAAK,CAAC;IAAA;;IAE5C,IAAI,CAACG,MAAM,GAAGC,kBAAS,GAAG,IAAI,CAACC,oBAAoB,EAAE,GAAG,IAAI,CAACC,iBAAiB,EAAE;EAClF;;EAAC;IAAA;IAAA;IAMD,mBAAgB;MACd,IAAI,CAACR,SAAS,GAAGP,IAAI;MACrB,IAAI,CAACQ,OAAO,GAAGR,IAAI;MACnB,IAAI,CAACY,MAAM,CAACI,SAAS,EAAE;MACvB,IAAI,CAACC,UAAU,GAAG,IAAI;IACxB;EAAC;IAAA;IAAA,KAED,eAAgB;MACd,OAAOC,OAAO,CAAC,IAAI,CAACX,SAAS,CAAC;IAChC;;EAAC;IAAA;IAAA;IAOD,qBAAYY,IAAS,EAAEC,YAAoB,EAAQ;MACjDA,YAAY,GAAGA,YAAY,IAAI,IAAAC,gCAAe,EAACF,IAAI,CAAC;MAEpD,IAAI,CAACP,MAAM,CAACU,WAAW,CAACH,IAAI,EAAEC,YAAY,CAAC;IAC7C;;EAAC;IAAA;IAAA;;IAQD,iCAAwBG,KAAiB,EAAS;MAIhD,IAAIC,OAAO,GAAG,iBAAiB;MAC/BA,OAAO,qBAAc,IAAI,CAACrB,IAAI,mBAAS,IAAI,CAACE,GAAG,OAAI;MACnD,IAAIkB,KAAK,CAACC,OAAO,EAAE;QACjBA,OAAO,cAAOD,KAAK,CAACC,OAAO,SAAM;MACnC;MAGA,IAAID,KAAK,CAACE,MAAM,EAAE;QAChBD,OAAO,eAAQD,KAAK,CAACE,MAAM,cAAIF,KAAK,CAACG,KAAK,CAAE;MAC9C;MACA,OAAO,IAAIC,KAAK,CAACH,OAAO,CAAC;IAC3B;;EAAC;IAAA;IAAA;IAKD,gCAA+B;MAAA;MAC7B,IAAI,CAACI,YAAY,GAAG,IAAAC,0CAAoB,EAAC;QAACzB,MAAM,EAAE,IAAI,CAACA,MAAM;QAAEC,GAAG,EAAE,IAAI,CAACA;MAAG,CAAC,CAAC;MAC9E,IAAMO,MAAM,GAAG,IAAIkB,MAAM,CAAC,IAAI,CAACF,YAAY,EAAE;QAACzB,IAAI,EAAE,IAAI,CAACA;MAAI,CAAC,CAAC;MAE/DS,MAAM,CAACmB,SAAS,GAAG,UAACR,KAAK,EAAK;QAC5B,IAAI,CAACA,KAAK,CAACJ,IAAI,EAAE;UACf,KAAI,CAACX,OAAO,CAAC,IAAImB,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAC7C,CAAC,MAAM;UACL,KAAI,CAACpB,SAAS,CAACgB,KAAK,CAACJ,IAAI,CAAC;QAC5B;MACF,CAAC;MAEDP,MAAM,CAACoB,OAAO,GAAG,UAACvB,KAAiB,EAAW;QAC5C,KAAI,CAACD,OAAO,CAAC,KAAI,CAACyB,uBAAuB,CAACxB,KAAK,CAAC,CAAC;QACjD,KAAI,CAACQ,UAAU,GAAG,IAAI;MACxB,CAAC;MAEDL,MAAM,CAACsB,cAAc,GAAG,UAACX,KAAK;QAAA,OAAKb,OAAO,CAACD,KAAK,CAACc,KAAK,CAAC;MAAA;;MAEvD,OAAOX,MAAM;IACf;;EAAC;IAAA;IAAA;IAMD,6BAAgC;MAAA;MAC9B,IAAIA,MAAkB;MACtB,IAAI,IAAI,CAACP,GAAG,EAAE;QAEZ,IAAM8B,QAAQ,GAAG,IAAI,CAAC9B,GAAG,CAAC+B,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC/B,GAAG,CAACgC,UAAU,CAAC,GAAG,CAAC;QACpE,IAAMhC,GAAG,GAAG8B,QAAQ,GAAG,IAAI,CAAC9B,GAAG,eAAQ,IAAI,CAACA,GAAG,CAAE;QAEjDO,MAAM,GAAG,IAAI0B,sBAAU,CAACjC,GAAG,EAAE;UAACkC,IAAI,EAAE;QAAK,CAAC,CAAC;MAC7C,CAAC,MAAM,IAAI,IAAI,CAACnC,MAAM,EAAE;QACtBQ,MAAM,GAAG,IAAI0B,sBAAU,CAAC,IAAI,CAAClC,MAAM,EAAE;UAACmC,IAAI,EAAE;QAAI,CAAC,CAAC;MACpD,CAAC,MAAM;QACL,MAAM,IAAIZ,KAAK,CAAC,WAAW,CAAC;MAC9B;MACAf,MAAM,CAAC4B,EAAE,CAAC,SAAS,EAAE,UAACrB,IAAI,EAAK;QAE7B,MAAI,CAACZ,SAAS,CAACY,IAAI,CAAC;MACtB,CAAC,CAAC;MACFP,MAAM,CAAC4B,EAAE,CAAC,OAAO,EAAE,UAAC/B,KAAK,EAAK;QAE5B,MAAI,CAACD,OAAO,CAACC,KAAK,CAAC;MACrB,CAAC,CAAC;MACFG,MAAM,CAAC4B,EAAE,CAAC,MAAM,EAAE,UAACC,IAAI,EAAK;MAE5B,CAAC,CAAC;MACF,OAAO7B,MAAM;IACf;EAAC;IAAA;IAAA;IA1HD,uBAA8B;MAC5B,OACG,OAAOkB,MAAM,KAAK,WAAW,IAAIjB,kBAAS,IAC1C,OAAOyB,sBAAU,KAAK,WAAW,IAAI,CAACzB,kBAAU;IAErD;EAAC;EAAA;AAAA;AAAA"}
1
+ {"version":3,"file":"worker-thread.js","names":["NOOP","WorkerThread","props","name","source","url","assert","onMessage","onError","error","console","log","worker","isBrowser","_createBrowserWorker","_createNodeWorker","terminate","terminated","Boolean","data","transferList","getTransferList","postMessage","event","message","lineno","colno","Error","_loadableURL","getLoadableWorkerURL","Worker","onmessage","onerror","_getErrorFromErrorEvent","onmessageerror","absolute","includes","startsWith","NodeWorker","eval","on","code"],"sources":["../../../../src/lib/worker-farm/worker-thread.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport {NodeWorker, NodeWorkerType} from '../node/worker_threads';\nimport {isBrowser} from '../env-utils/globals';\nimport {assert} from '../env-utils/assert';\nimport {getLoadableWorkerURL} from '../worker-utils/get-loadable-worker-url';\nimport {getTransferList} from '../worker-utils/get-transfer-list';\n\nconst NOOP = () => {};\n\nexport type WorkerThreadProps = {\n name: string;\n source?: string;\n url?: string;\n};\n\n/**\n * Represents one worker thread\n */\nexport default class WorkerThread {\n readonly name: string;\n readonly source: string | undefined;\n readonly url: string | undefined;\n terminated: boolean = false;\n worker: Worker | NodeWorkerType;\n onMessage: (message: any) => void;\n onError: (error: Error) => void;\n\n private _loadableURL: string = '';\n\n /** Checks if workers are supported on this platform */\n static isSupported(): boolean {\n return (\n (typeof Worker !== 'undefined' && isBrowser) ||\n (typeof NodeWorker !== 'undefined' && !isBrowser)\n );\n }\n\n constructor(props: WorkerThreadProps) {\n const {name, source, url} = props;\n assert(source || url); // Either source or url must be defined\n this.name = name;\n this.source = source;\n this.url = url;\n this.onMessage = NOOP;\n this.onError = (error) => console.log(error); // eslint-disable-line\n\n this.worker = isBrowser ? this._createBrowserWorker() : this._createNodeWorker();\n }\n\n /**\n * Terminate this worker thread\n * @note Can free up significant memory\n */\n destroy(): void {\n this.onMessage = NOOP;\n this.onError = NOOP;\n this.worker.terminate(); // eslint-disable-line @typescript-eslint/no-floating-promises\n this.terminated = true;\n }\n\n get isRunning() {\n return Boolean(this.onMessage);\n }\n\n /**\n * Send a message to this worker thread\n * @param data any data structure, ideally consisting mostly of transferrable objects\n * @param transferList If not supplied, calculated automatically by traversing data\n */\n postMessage(data: any, transferList?: any[]): void {\n transferList = transferList || getTransferList(data);\n // @ts-ignore\n this.worker.postMessage(data, transferList);\n }\n\n // PRIVATE\n\n /**\n * Generate a standard Error from an ErrorEvent\n * @param event\n */\n _getErrorFromErrorEvent(event: ErrorEvent): Error {\n // Note Error object does not have the expected fields if loading failed completely\n // https://developer.mozilla.org/en-US/docs/Web/API/Worker#Event_handlers\n // https://developer.mozilla.org/en-US/docs/Web/API/ErrorEvent\n let message = 'Failed to load ';\n message += `worker ${this.name} from ${this.url}. `;\n if (event.message) {\n message += `${event.message} in `;\n }\n // const hasFilename = event.filename && !event.filename.startsWith('blob:');\n // message += hasFilename ? event.filename : this.source.slice(0, 100);\n if (event.lineno) {\n message += `:${event.lineno}:${event.colno}`;\n }\n return new Error(message);\n }\n\n /**\n * Creates a worker thread on the browser\n */\n _createBrowserWorker(): Worker {\n this._loadableURL = getLoadableWorkerURL({source: this.source, url: this.url});\n const worker = new Worker(this._loadableURL, {name: this.name});\n\n worker.onmessage = (event) => {\n if (!event.data) {\n this.onError(new Error('No data received'));\n } else {\n this.onMessage(event.data);\n }\n };\n // This callback represents an uncaught exception in the worker thread\n worker.onerror = (error: ErrorEvent): void => {\n this.onError(this._getErrorFromErrorEvent(error));\n this.terminated = true;\n };\n // TODO - not clear when this would be called, for now just log in case it happens\n worker.onmessageerror = (event) => console.error(event); // eslint-disable-line\n\n return worker;\n }\n\n /**\n * Creates a worker thread in node.js\n * @todo https://nodejs.org/api/async_hooks.html#async-resource-worker-pool\n */\n _createNodeWorker(): NodeWorkerType {\n let worker: NodeWorkerType;\n if (this.url) {\n // Make sure relative URLs start with './'\n const absolute = this.url.includes(':/') || this.url.startsWith('/');\n const url = absolute ? this.url : `./${this.url}`;\n // console.log('Starting work from', url);\n worker = new NodeWorker(url, {eval: false});\n } else if (this.source) {\n worker = new NodeWorker(this.source, {eval: true});\n } else {\n throw new Error('no worker');\n }\n worker.on('message', (data) => {\n // console.error('message', data);\n this.onMessage(data);\n });\n worker.on('error', (error) => {\n // console.error('error', error);\n this.onError(error);\n });\n worker.on('exit', (code) => {\n // console.error('exit', code);\n });\n return worker;\n }\n}\n"],"mappings":"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"}
@@ -1,8 +1,8 @@
1
1
 
2
2
 
3
3
  const DEFAULT_VERSION = 'beta';
4
- export const VERSION = typeof "3.3.0-alpha.9" !== 'undefined' ? "3.3.0-alpha.9" : DEFAULT_VERSION;
5
- if (typeof "3.3.0-alpha.9" === 'undefined') {
4
+ export const VERSION = typeof "3.4.0-alpha.1" !== 'undefined' ? "3.4.0-alpha.1" : DEFAULT_VERSION;
5
+ if (typeof "3.4.0-alpha.1" === 'undefined') {
6
6
  console.error('loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.');
7
7
  }
8
8
  //# sourceMappingURL=version.js.map
@@ -5,7 +5,7 @@ import { assert } from '../env-utils/assert';
5
5
  import { VERSION as __VERSION__ } from '../env-utils/version';
6
6
 
7
7
  const LATEST = 'beta';
8
- const VERSION = typeof "3.3.0-alpha.9" !== 'undefined' ? "3.3.0-alpha.9" : LATEST;
8
+ const VERSION = typeof "3.4.0-alpha.1" !== 'undefined' ? "3.4.0-alpha.1" : LATEST;
9
9
  const loadLibraryPromises = {};
10
10
 
11
11
  export async function loadLibrary(libraryUrl) {
@@ -1,4 +1,8 @@
1
1
 
2
- export class Worker {}
2
+ export class Worker {
3
+ terminate() {}
4
+ }
5
+ export { Worker as NodeWorker };
6
+ export { Worker as NodeWorkerType };
3
7
  export const parentPort = null;
4
8
  //# sourceMappingURL=worker_threads-browser.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"worker_threads-browser.js","names":["Worker","parentPort"],"sources":["../../../../src/lib/node/worker_threads-browser.js"],"sourcesContent":["// Browser fills for Node.js built-in `worker_threads` module.\n// These fills are non-functional, and just intended to ensure that\n// `import 'worker_threads` doesn't break browser builds.\n// The replacement is done in package.json browser field\nexport class Worker {}\n\nexport const parentPort = null;\n"],"mappings":";AAIA,OAAO,MAAMA,MAAM,CAAC;AAEpB,OAAO,MAAMC,UAAU,GAAG,IAAI"}
1
+ {"version":3,"file":"worker_threads-browser.js","names":["Worker","terminate","NodeWorker","NodeWorkerType","parentPort"],"sources":["../../../../src/lib/node/worker_threads-browser.ts"],"sourcesContent":["// Browser fills for Node.js built-in `worker_threads` module.\n// These fills are non-functional, and just intended to ensure that\n// `import 'worker_threads` doesn't break browser builds.\n// The replacement is done in package.json browser field\nexport class Worker {\n // eslint-disable-next-line @typescript-eslint/no-empty-function\n terminate() {}\n}\n\nexport {Worker as NodeWorker};\nexport {Worker as NodeWorkerType};\n\nexport const parentPort = null;\n"],"mappings":";AAIA,OAAO,MAAMA,MAAM,CAAC;EAElBC,SAAS,GAAG,CAAC;AACf;AAEA,SAAQD,MAAM,IAAIE,UAAU;AAC5B,SAAQF,MAAM,IAAIG,cAAc;AAEhC,OAAO,MAAMC,UAAU,GAAG,IAAI"}
@@ -1,2 +1,6 @@
1
+
2
+
3
+ import * as WorkerThreads from 'worker_threads';
1
4
  export * from 'worker_threads';
5
+ export const NodeWorker = WorkerThreads.Worker;
2
6
  //# sourceMappingURL=worker_threads.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"worker_threads.js","names":[],"sources":["../../../../src/lib/node/worker_threads.js"],"sourcesContent":["export * from 'worker_threads';\n"],"mappings":"AAAA,cAAc,gBAAgB"}
1
+ {"version":3,"file":"worker_threads.js","names":["WorkerThreads","NodeWorker","Worker"],"sources":["../../../../src/lib/node/worker_threads.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport * as WorkerThreads from 'worker_threads';\nexport * from 'worker_threads';\nexport const NodeWorker = WorkerThreads.Worker;\nexport type NodeWorkerType = WorkerThreads.Worker;\n"],"mappings":";;AAEA,OAAO,KAAKA,aAAa,MAAM,gBAAgB;AAC/C,cAAc,gBAAgB;AAC9B,OAAO,MAAMC,UAAU,GAAGD,aAAa,CAACE,MAAM"}
@@ -1,7 +1,7 @@
1
1
  import { assert } from '../env-utils/assert';
2
2
  import { VERSION as __VERSION__ } from '../env-utils/version';
3
3
  const NPM_TAG = 'beta';
4
- const VERSION = typeof "3.3.0-alpha.9" !== 'undefined' ? "3.3.0-alpha.9" : NPM_TAG;
4
+ const VERSION = typeof "3.4.0-alpha.1" !== 'undefined' ? "3.4.0-alpha.1" : NPM_TAG;
5
5
 
6
6
  export function getWorkerName(worker) {
7
7
  const warning = worker.version !== VERSION ? " (worker-utils@".concat(VERSION, ")") : '';
@@ -1,5 +1,6 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
2
- import { Worker as NodeWorker } from '../node/worker_threads';
2
+
3
+ import { NodeWorker } from '../node/worker_threads';
3
4
  import { isBrowser } from '../env-utils/globals';
4
5
  import { assert } from '../env-utils/assert';
5
6
  import { getLoadableWorkerURL } from '../worker-utils/get-loadable-worker-url';
@@ -1 +1 @@
1
- {"version":3,"file":"worker-thread.js","names":["Worker","NodeWorker","isBrowser","assert","getLoadableWorkerURL","getTransferList","NOOP","WorkerThread","isSupported","constructor","props","name","source","url","onMessage","onError","error","console","log","worker","_createBrowserWorker","_createNodeWorker","destroy","terminate","terminated","isRunning","Boolean","postMessage","data","transferList","_getErrorFromErrorEvent","event","message","lineno","colno","Error","_loadableURL","onmessage","onerror","onmessageerror","absolute","includes","startsWith","eval","on","code"],"sources":["../../../../src/lib/worker-farm/worker-thread.ts"],"sourcesContent":["import {Worker as NodeWorker} from '../node/worker_threads';\nimport {isBrowser} from '../env-utils/globals';\nimport {assert} from '../env-utils/assert';\nimport {getLoadableWorkerURL} from '../worker-utils/get-loadable-worker-url';\nimport {getTransferList} from '../worker-utils/get-transfer-list';\n\nconst NOOP = () => {};\n\nexport type WorkerThreadProps = {\n name: string;\n source?: string;\n url?: string;\n};\n\n/**\n * Represents one worker thread\n */\nexport default class WorkerThread {\n readonly name: string;\n readonly source: string | undefined;\n readonly url: string | undefined;\n terminated: boolean = false;\n worker: Worker | NodeWorker;\n onMessage: (message: any) => void;\n onError: (error: Error) => void;\n\n private _loadableURL: string = '';\n\n /** Checks if workers are supported on this platform */\n static isSupported(): boolean {\n return (\n (typeof Worker !== 'undefined' && isBrowser) ||\n (typeof NodeWorker !== 'undefined' && !isBrowser)\n );\n }\n\n constructor(props: WorkerThreadProps) {\n const {name, source, url} = props;\n assert(source || url); // Either source or url must be defined\n this.name = name;\n this.source = source;\n this.url = url;\n this.onMessage = NOOP;\n this.onError = (error) => console.log(error); // eslint-disable-line\n\n this.worker = isBrowser ? this._createBrowserWorker() : this._createNodeWorker();\n }\n\n /**\n * Terminate this worker thread\n * @note Can free up significant memory\n */\n destroy(): void {\n this.onMessage = NOOP;\n this.onError = NOOP;\n this.worker.terminate(); // eslint-disable-line @typescript-eslint/no-floating-promises\n this.terminated = true;\n }\n\n get isRunning() {\n return Boolean(this.onMessage);\n }\n\n /**\n * Send a message to this worker thread\n * @param data any data structure, ideally consisting mostly of transferrable objects\n * @param transferList If not supplied, calculated automatically by traversing data\n */\n postMessage(data: any, transferList?: any[]): void {\n transferList = transferList || getTransferList(data);\n // @ts-ignore\n this.worker.postMessage(data, transferList);\n }\n\n // PRIVATE\n\n /**\n * Generate a standard Error from an ErrorEvent\n * @param event\n */\n _getErrorFromErrorEvent(event: ErrorEvent): Error {\n // Note Error object does not have the expected fields if loading failed completely\n // https://developer.mozilla.org/en-US/docs/Web/API/Worker#Event_handlers\n // https://developer.mozilla.org/en-US/docs/Web/API/ErrorEvent\n let message = 'Failed to load ';\n message += `worker ${this.name} from ${this.url}. `;\n if (event.message) {\n message += `${event.message} in `;\n }\n // const hasFilename = event.filename && !event.filename.startsWith('blob:');\n // message += hasFilename ? event.filename : this.source.slice(0, 100);\n if (event.lineno) {\n message += `:${event.lineno}:${event.colno}`;\n }\n return new Error(message);\n }\n\n /**\n * Creates a worker thread on the browser\n */\n _createBrowserWorker(): Worker {\n this._loadableURL = getLoadableWorkerURL({source: this.source, url: this.url});\n const worker = new Worker(this._loadableURL, {name: this.name});\n\n worker.onmessage = (event) => {\n if (!event.data) {\n this.onError(new Error('No data received'));\n } else {\n this.onMessage(event.data);\n }\n };\n // This callback represents an uncaught exception in the worker thread\n worker.onerror = (error: ErrorEvent): void => {\n this.onError(this._getErrorFromErrorEvent(error));\n this.terminated = true;\n };\n // TODO - not clear when this would be called, for now just log in case it happens\n worker.onmessageerror = (event) => console.error(event); // eslint-disable-line\n\n return worker;\n }\n\n /**\n * Creates a worker thread in node.js\n * @todo https://nodejs.org/api/async_hooks.html#async-resource-worker-pool\n */\n _createNodeWorker(): NodeWorker {\n let worker: NodeWorker;\n if (this.url) {\n // Make sure relative URLs start with './'\n const absolute = this.url.includes(':/') || this.url.startsWith('/');\n const url = absolute ? this.url : `./${this.url}`;\n // console.log('Starting work from', url);\n worker = new NodeWorker(url, {eval: false});\n } else if (this.source) {\n worker = new NodeWorker(this.source, {eval: true});\n } else {\n throw new Error('no worker');\n }\n worker.on('message', (data) => {\n // console.error('message', data);\n this.onMessage(data);\n });\n worker.on('error', (error) => {\n // console.error('error', error);\n this.onError(error);\n });\n worker.on('exit', (code) => {\n // console.error('exit', code);\n });\n return worker;\n }\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"worker-thread.js","names":["NodeWorker","isBrowser","assert","getLoadableWorkerURL","getTransferList","NOOP","WorkerThread","isSupported","Worker","constructor","props","name","source","url","onMessage","onError","error","console","log","worker","_createBrowserWorker","_createNodeWorker","destroy","terminate","terminated","isRunning","Boolean","postMessage","data","transferList","_getErrorFromErrorEvent","event","message","lineno","colno","Error","_loadableURL","onmessage","onerror","onmessageerror","absolute","includes","startsWith","eval","on","code"],"sources":["../../../../src/lib/worker-farm/worker-thread.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport {NodeWorker, NodeWorkerType} from '../node/worker_threads';\nimport {isBrowser} from '../env-utils/globals';\nimport {assert} from '../env-utils/assert';\nimport {getLoadableWorkerURL} from '../worker-utils/get-loadable-worker-url';\nimport {getTransferList} from '../worker-utils/get-transfer-list';\n\nconst NOOP = () => {};\n\nexport type WorkerThreadProps = {\n name: string;\n source?: string;\n url?: string;\n};\n\n/**\n * Represents one worker thread\n */\nexport default class WorkerThread {\n readonly name: string;\n readonly source: string | undefined;\n readonly url: string | undefined;\n terminated: boolean = false;\n worker: Worker | NodeWorkerType;\n onMessage: (message: any) => void;\n onError: (error: Error) => void;\n\n private _loadableURL: string = '';\n\n /** Checks if workers are supported on this platform */\n static isSupported(): boolean {\n return (\n (typeof Worker !== 'undefined' && isBrowser) ||\n (typeof NodeWorker !== 'undefined' && !isBrowser)\n );\n }\n\n constructor(props: WorkerThreadProps) {\n const {name, source, url} = props;\n assert(source || url); // Either source or url must be defined\n this.name = name;\n this.source = source;\n this.url = url;\n this.onMessage = NOOP;\n this.onError = (error) => console.log(error); // eslint-disable-line\n\n this.worker = isBrowser ? this._createBrowserWorker() : this._createNodeWorker();\n }\n\n /**\n * Terminate this worker thread\n * @note Can free up significant memory\n */\n destroy(): void {\n this.onMessage = NOOP;\n this.onError = NOOP;\n this.worker.terminate(); // eslint-disable-line @typescript-eslint/no-floating-promises\n this.terminated = true;\n }\n\n get isRunning() {\n return Boolean(this.onMessage);\n }\n\n /**\n * Send a message to this worker thread\n * @param data any data structure, ideally consisting mostly of transferrable objects\n * @param transferList If not supplied, calculated automatically by traversing data\n */\n postMessage(data: any, transferList?: any[]): void {\n transferList = transferList || getTransferList(data);\n // @ts-ignore\n this.worker.postMessage(data, transferList);\n }\n\n // PRIVATE\n\n /**\n * Generate a standard Error from an ErrorEvent\n * @param event\n */\n _getErrorFromErrorEvent(event: ErrorEvent): Error {\n // Note Error object does not have the expected fields if loading failed completely\n // https://developer.mozilla.org/en-US/docs/Web/API/Worker#Event_handlers\n // https://developer.mozilla.org/en-US/docs/Web/API/ErrorEvent\n let message = 'Failed to load ';\n message += `worker ${this.name} from ${this.url}. `;\n if (event.message) {\n message += `${event.message} in `;\n }\n // const hasFilename = event.filename && !event.filename.startsWith('blob:');\n // message += hasFilename ? event.filename : this.source.slice(0, 100);\n if (event.lineno) {\n message += `:${event.lineno}:${event.colno}`;\n }\n return new Error(message);\n }\n\n /**\n * Creates a worker thread on the browser\n */\n _createBrowserWorker(): Worker {\n this._loadableURL = getLoadableWorkerURL({source: this.source, url: this.url});\n const worker = new Worker(this._loadableURL, {name: this.name});\n\n worker.onmessage = (event) => {\n if (!event.data) {\n this.onError(new Error('No data received'));\n } else {\n this.onMessage(event.data);\n }\n };\n // This callback represents an uncaught exception in the worker thread\n worker.onerror = (error: ErrorEvent): void => {\n this.onError(this._getErrorFromErrorEvent(error));\n this.terminated = true;\n };\n // TODO - not clear when this would be called, for now just log in case it happens\n worker.onmessageerror = (event) => console.error(event); // eslint-disable-line\n\n return worker;\n }\n\n /**\n * Creates a worker thread in node.js\n * @todo https://nodejs.org/api/async_hooks.html#async-resource-worker-pool\n */\n _createNodeWorker(): NodeWorkerType {\n let worker: NodeWorkerType;\n if (this.url) {\n // Make sure relative URLs start with './'\n const absolute = this.url.includes(':/') || this.url.startsWith('/');\n const url = absolute ? this.url : `./${this.url}`;\n // console.log('Starting work from', url);\n worker = new NodeWorker(url, {eval: false});\n } else if (this.source) {\n worker = new NodeWorker(this.source, {eval: true});\n } else {\n throw new Error('no worker');\n }\n worker.on('message', (data) => {\n // console.error('message', data);\n this.onMessage(data);\n });\n worker.on('error', (error) => {\n // console.error('error', error);\n this.onError(error);\n });\n worker.on('exit', (code) => {\n // console.error('exit', code);\n });\n return worker;\n }\n}\n"],"mappings":"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"}
@@ -1,4 +1,7 @@
1
- export class Worker {
1
+ export declare class Worker {
2
+ terminate(): void;
2
3
  }
3
- export const parentPort: null;
4
+ export { Worker as NodeWorker };
5
+ export { Worker as NodeWorkerType };
6
+ export declare const parentPort: null;
4
7
  //# sourceMappingURL=worker_threads-browser.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"worker_threads-browser.d.ts","sourceRoot":"","sources":["../../../src/lib/node/worker_threads-browser.js"],"names":[],"mappings":"AAIA;CAAsB;AAEtB,8BAA+B"}
1
+ {"version":3,"file":"worker_threads-browser.d.ts","sourceRoot":"","sources":["../../../src/lib/node/worker_threads-browser.ts"],"names":[],"mappings":"AAIA,qBAAa,MAAM;IAEjB,SAAS;CACV;AAED,OAAO,EAAC,MAAM,IAAI,UAAU,EAAC,CAAC;AAC9B,OAAO,EAAC,MAAM,IAAI,cAAc,EAAC,CAAC;AAElC,eAAO,MAAM,UAAU,MAAO,CAAC"}
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.parentPort = exports.Worker = void 0;
3
+ exports.parentPort = exports.NodeWorkerType = exports.NodeWorker = exports.Worker = void 0;
4
4
  // Browser fills for Node.js built-in `worker_threads` module.
5
5
  // These fills are non-functional, and just intended to ensure that
6
6
  // `import 'worker_threads` doesn't break browser builds.
7
7
  // The replacement is done in package.json browser field
8
8
  class Worker {
9
+ // eslint-disable-next-line @typescript-eslint/no-empty-function
10
+ terminate() { }
9
11
  }
10
12
  exports.Worker = Worker;
13
+ exports.NodeWorker = Worker;
14
+ exports.NodeWorkerType = Worker;
11
15
  exports.parentPort = null;
@@ -1,3 +1,6 @@
1
1
  /// <reference types="node" />
2
- export * from "worker_threads";
2
+ import * as WorkerThreads from 'worker_threads';
3
+ export * from 'worker_threads';
4
+ export declare const NodeWorker: typeof WorkerThreads.Worker;
5
+ export type NodeWorkerType = WorkerThreads.Worker;
3
6
  //# sourceMappingURL=worker_threads.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"worker_threads.d.ts","sourceRoot":"","sources":["../../../src/lib/node/worker_threads.js"],"names":[],"mappings":""}
1
+ {"version":3,"file":"worker_threads.d.ts","sourceRoot":"","sources":["../../../src/lib/node/worker_threads.ts"],"names":[],"mappings":";AAEA,OAAO,KAAK,aAAa,MAAM,gBAAgB,CAAC;AAChD,cAAc,gBAAgB,CAAC;AAC/B,eAAO,MAAM,UAAU,6BAAuB,CAAC;AAC/C,MAAM,MAAM,cAAc,GAAG,aAAa,CAAC,MAAM,CAAC"}
@@ -1,4 +1,5 @@
1
1
  "use strict";
2
+ // loaders.gl, MIT license
2
3
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
4
  if (k2 === undefined) k2 = k;
4
5
  var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -10,8 +11,23 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
10
11
  if (k2 === undefined) k2 = k;
11
12
  o[k2] = m[k];
12
13
  }));
14
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
15
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
16
+ }) : function(o, v) {
17
+ o["default"] = v;
18
+ });
19
+ var __importStar = (this && this.__importStar) || function (mod) {
20
+ if (mod && mod.__esModule) return mod;
21
+ var result = {};
22
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
23
+ __setModuleDefault(result, mod);
24
+ return result;
25
+ };
13
26
  var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
27
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
28
  };
16
29
  Object.defineProperty(exports, "__esModule", { value: true });
30
+ exports.NodeWorker = void 0;
31
+ const WorkerThreads = __importStar(require("worker_threads"));
17
32
  __exportStar(require("worker_threads"), exports);
33
+ exports.NodeWorker = WorkerThreads.Worker;
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.createWorker = void 0;
7
7
  const async_queue_1 = __importDefault(require("../async-queue/async-queue"));
8
8
  const worker_body_1 = __importDefault(require("../worker-farm/worker-body"));
9
- // import {validateWorkerVersion} from './validate-worker-version.js';
9
+ // import {validateWorkerVersion} from './validate-worker-version';
10
10
  /** Counter for jobs */
11
11
  let requestId = 0;
12
12
  let inputBatches;
@@ -1,5 +1,4 @@
1
- /// <reference types="node" />
2
- import { Worker as NodeWorker } from '../node/worker_threads';
1
+ import { NodeWorkerType } from '../node/worker_threads';
3
2
  export type WorkerThreadProps = {
4
3
  name: string;
5
4
  source?: string;
@@ -13,7 +12,7 @@ export default class WorkerThread {
13
12
  readonly source: string | undefined;
14
13
  readonly url: string | undefined;
15
14
  terminated: boolean;
16
- worker: Worker | NodeWorker;
15
+ worker: Worker | NodeWorkerType;
17
16
  onMessage: (message: any) => void;
18
17
  onError: (error: Error) => void;
19
18
  private _loadableURL;
@@ -45,6 +44,6 @@ export default class WorkerThread {
45
44
  * Creates a worker thread in node.js
46
45
  * @todo https://nodejs.org/api/async_hooks.html#async-resource-worker-pool
47
46
  */
48
- _createNodeWorker(): NodeWorker;
47
+ _createNodeWorker(): NodeWorkerType;
49
48
  }
50
49
  //# sourceMappingURL=worker-thread.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"worker-thread.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-thread.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAQ5D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,OAAO,CAAS;IAC5B,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC;IAC5B,SAAS,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAC;IAClC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAEhC,OAAO,CAAC,YAAY,CAAc;IAElC,uDAAuD;IACvD,MAAM,CAAC,WAAW,IAAI,OAAO;gBAOjB,KAAK,EAAE,iBAAiB;IAYpC;;;OAGG;IACH,OAAO,IAAI,IAAI;IAOf,IAAI,SAAS,YAEZ;IAED;;;;OAIG;IACH,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI;IAQlD;;;OAGG;IACH,uBAAuB,CAAC,KAAK,EAAE,UAAU,GAAG,KAAK;IAiBjD;;OAEG;IACH,oBAAoB,IAAI,MAAM;IAsB9B;;;OAGG;IACH,iBAAiB,IAAI,UAAU;CA0BhC"}
1
+ {"version":3,"file":"worker-thread.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-thread.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,cAAc,EAAC,MAAM,wBAAwB,CAAC;AAQlE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,OAAO,CAAS;IAC5B,MAAM,EAAE,MAAM,GAAG,cAAc,CAAC;IAChC,SAAS,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAC;IAClC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAEhC,OAAO,CAAC,YAAY,CAAc;IAElC,uDAAuD;IACvD,MAAM,CAAC,WAAW,IAAI,OAAO;gBAOjB,KAAK,EAAE,iBAAiB;IAYpC;;;OAGG;IACH,OAAO,IAAI,IAAI;IAOf,IAAI,SAAS,YAEZ;IAED;;;;OAIG;IACH,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI;IAQlD;;;OAGG;IACH,uBAAuB,CAAC,KAAK,EAAE,UAAU,GAAG,KAAK;IAiBjD;;OAEG;IACH,oBAAoB,IAAI,MAAM;IAsB9B;;;OAGG;IACH,iBAAiB,IAAI,cAAc;CA0BpC"}
@@ -1,4 +1,5 @@
1
1
  "use strict";
2
+ // loaders.gl, MIT license
2
3
  Object.defineProperty(exports, "__esModule", { value: true });
3
4
  const worker_threads_1 = require("../node/worker_threads");
4
5
  const globals_1 = require("../env-utils/globals");
@@ -13,7 +14,7 @@ class WorkerThread {
13
14
  /** Checks if workers are supported on this platform */
14
15
  static isSupported() {
15
16
  return ((typeof Worker !== 'undefined' && globals_1.isBrowser) ||
16
- (typeof worker_threads_1.Worker !== 'undefined' && !globals_1.isBrowser));
17
+ (typeof worker_threads_1.NodeWorker !== 'undefined' && !globals_1.isBrowser));
17
18
  }
18
19
  constructor(props) {
19
20
  this.terminated = false;
@@ -105,10 +106,10 @@ class WorkerThread {
105
106
  const absolute = this.url.includes(':/') || this.url.startsWith('/');
106
107
  const url = absolute ? this.url : `./${this.url}`;
107
108
  // console.log('Starting work from', url);
108
- worker = new worker_threads_1.Worker(url, { eval: false });
109
+ worker = new worker_threads_1.NodeWorker(url, { eval: false });
109
110
  }
110
111
  else if (this.source) {
111
- worker = new worker_threads_1.Worker(this.source, { eval: true });
112
+ worker = new worker_threads_1.NodeWorker(this.source, { eval: true });
112
113
  }
113
114
  else {
114
115
  throw new Error('no worker');
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@loaders.gl/worker-utils",
3
- "version": "3.3.0-alpha.9",
3
+ "version": "3.4.0-alpha.1",
4
4
  "description": "Utilities for running tasks on worker threads",
5
5
  "license": "MIT",
6
6
  "publishConfig": {
@@ -27,7 +27,7 @@
27
27
  "browser": {
28
28
  "child_process": false,
29
29
  "fs": false,
30
- "./src/lib/node/worker_threads.js": "./src/lib/node/worker_threads-browser.js",
30
+ "./src/lib/node/worker_threads.ts": "./src/lib/node/worker_threads-browser.ts",
31
31
  "./dist/lib/node/worker_threads.js": "./dist/lib/node/worker_threads-browser.js",
32
32
  "./dist/es5/lib/node/worker_threads.js": "./dist/es5/lib/node/worker_threads-browser.js",
33
33
  "./dist/esm/lib/node/worker_threads.js": "./dist/esm/lib/node/worker_threads-browser.js",
@@ -49,5 +49,5 @@
49
49
  "dependencies": {
50
50
  "@babel/runtime": "^7.3.1"
51
51
  },
52
- "gitHead": "c95a4ff72512668a93d9041ce8636bac09333fd5"
52
+ "gitHead": "4085b0323050e4361614471319a1fb4729547bbf"
53
53
  }
@@ -2,6 +2,12 @@
2
2
  // These fills are non-functional, and just intended to ensure that
3
3
  // `import 'worker_threads` doesn't break browser builds.
4
4
  // The replacement is done in package.json browser field
5
- export class Worker {}
5
+ export class Worker {
6
+ // eslint-disable-next-line @typescript-eslint/no-empty-function
7
+ terminate() {}
8
+ }
9
+
10
+ export {Worker as NodeWorker};
11
+ export {Worker as NodeWorkerType};
6
12
 
7
13
  export const parentPort = null;
@@ -0,0 +1,6 @@
1
+ // loaders.gl, MIT license
2
+
3
+ import * as WorkerThreads from 'worker_threads';
4
+ export * from 'worker_threads';
5
+ export const NodeWorker = WorkerThreads.Worker;
6
+ export type NodeWorkerType = WorkerThreads.Worker;
@@ -1,4 +1,6 @@
1
- import {Worker as NodeWorker} from '../node/worker_threads';
1
+ // loaders.gl, MIT license
2
+
3
+ import {NodeWorker, NodeWorkerType} from '../node/worker_threads';
2
4
  import {isBrowser} from '../env-utils/globals';
3
5
  import {assert} from '../env-utils/assert';
4
6
  import {getLoadableWorkerURL} from '../worker-utils/get-loadable-worker-url';
@@ -20,7 +22,7 @@ export default class WorkerThread {
20
22
  readonly source: string | undefined;
21
23
  readonly url: string | undefined;
22
24
  terminated: boolean = false;
23
- worker: Worker | NodeWorker;
25
+ worker: Worker | NodeWorkerType;
24
26
  onMessage: (message: any) => void;
25
27
  onError: (error: Error) => void;
26
28
 
@@ -124,8 +126,8 @@ export default class WorkerThread {
124
126
  * Creates a worker thread in node.js
125
127
  * @todo https://nodejs.org/api/async_hooks.html#async-resource-worker-pool
126
128
  */
127
- _createNodeWorker(): NodeWorker {
128
- let worker: NodeWorker;
129
+ _createNodeWorker(): NodeWorkerType {
130
+ let worker: NodeWorkerType;
129
131
  if (this.url) {
130
132
  // Make sure relative URLs start with './'
131
133
  const absolute = this.url.includes(':/') || this.url.startsWith('/');
@@ -1 +0,0 @@
1
- export * from 'worker_threads';