@loaders.gl/worker-utils 3.1.0-alpha.4 → 3.1.0-alpha.5
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/index.js +19 -19
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/lib/async-queue/async-queue.js +62 -76
- package/dist/es5/lib/async-queue/async-queue.js.map +1 -1
- package/dist/es5/lib/env-utils/globals.js +10 -15
- package/dist/es5/lib/env-utils/globals.js.map +1 -1
- 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 +29 -127
- package/dist/es5/lib/library-utils/library-utils.js.map +1 -1
- package/dist/es5/lib/node/require-utils.node.js +20 -65
- package/dist/es5/lib/node/require-utils.node.js.map +1 -1
- package/dist/es5/lib/process-utils/child-process-proxy.js +90 -199
- package/dist/es5/lib/process-utils/child-process-proxy.js.map +1 -1
- package/dist/es5/lib/process-utils/process-utils.js +8 -9
- package/dist/es5/lib/process-utils/process-utils.js.map +1 -1
- package/dist/es5/lib/worker-api/create-worker.js +52 -162
- package/dist/es5/lib/worker-api/create-worker.js.map +1 -1
- package/dist/es5/lib/worker-api/get-worker-url.js +9 -10
- package/dist/es5/lib/worker-api/get-worker-url.js.map +1 -1
- package/dist/es5/lib/worker-api/process-on-worker.js +59 -130
- package/dist/es5/lib/worker-api/process-on-worker.js.map +1 -1
- package/dist/es5/lib/worker-api/validate-worker-version.js +3 -4
- package/dist/es5/lib/worker-api/validate-worker-version.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-body.js +46 -58
- package/dist/es5/lib/worker-farm/worker-body.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-farm.js +60 -99
- package/dist/es5/lib/worker-farm/worker-farm.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-job.js +28 -40
- package/dist/es5/lib/worker-farm/worker-job.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-pool.js +108 -204
- package/dist/es5/lib/worker-farm/worker-pool.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-thread.js +67 -85
- package/dist/es5/lib/worker-farm/worker-thread.js.map +1 -1
- package/dist/es5/lib/worker-utils/get-loadable-worker-url.js +4 -4
- package/dist/es5/lib/worker-utils/get-loadable-worker-url.js.map +1 -1
- package/dist/es5/lib/worker-utils/get-transfer-list.js +4 -10
- package/dist/es5/lib/worker-utils/get-transfer-list.js.map +1 -1
- package/dist/es5/lib/worker-utils/remove-nontransferable-options.js +3 -7
- package/dist/es5/lib/worker-utils/remove-nontransferable-options.js.map +1 -1
- package/dist/es5/workers/null-worker.js +3 -26
- package/dist/es5/workers/null-worker.js.map +1 -1
- package/dist/esm/lib/env-utils/version.js +2 -2
- package/dist/esm/lib/library-utils/library-utils.js +5 -5
- package/dist/esm/lib/library-utils/library-utils.js.map +1 -1
- package/dist/esm/lib/node/require-utils.node.js +2 -2
- package/dist/esm/lib/node/require-utils.node.js.map +1 -1
- package/dist/esm/lib/process-utils/child-process-proxy.js +5 -5
- package/dist/esm/lib/process-utils/child-process-proxy.js.map +1 -1
- package/dist/esm/lib/worker-api/get-worker-url.js +7 -7
- package/dist/esm/lib/worker-api/get-worker-url.js.map +1 -1
- package/dist/esm/lib/worker-api/process-on-worker.js +1 -1
- package/dist/esm/lib/worker-api/process-on-worker.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-pool.js +1 -1
- package/dist/esm/lib/worker-farm/worker-pool.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-thread.js +3 -3
- package/dist/esm/lib/worker-farm/worker-thread.js.map +1 -1
- package/dist/esm/lib/worker-utils/get-loadable-worker-url.js +1 -7
- package/dist/esm/lib/worker-utils/get-loadable-worker-url.js.map +1 -1
- package/dist/index.d.ts +19 -0
- package/dist/lib/async-queue/async-queue.d.ts +31 -0
- package/dist/lib/env-utils/assert.d.ts +2 -0
- package/dist/lib/env-utils/globals.d.ts +21 -0
- package/dist/lib/env-utils/version.d.ts +1 -0
- package/dist/lib/library-utils/library-utils.d.ts +17 -0
- package/dist/lib/node/require-utils.node.d.ts +2 -0
- package/dist/lib/process-utils/child-process-proxy.d.ts +42 -0
- package/dist/lib/process-utils/process-utils.d.ts +1 -0
- package/dist/lib/worker-api/create-worker.d.ts +8 -0
- package/dist/lib/worker-api/get-worker-url.d.ts +13 -0
- package/dist/lib/worker-api/process-on-worker.d.ts +19 -0
- package/dist/lib/worker-api/validate-worker-version.d.ts +8 -0
- package/dist/lib/worker-farm/worker-body.d.ts +15 -0
- package/dist/lib/worker-farm/worker-farm.d.ts +54 -0
- package/dist/lib/worker-farm/worker-job.d.ts +28 -0
- package/dist/lib/worker-farm/worker-pool.d.ts +74 -0
- package/dist/lib/worker-farm/worker-thread.d.ts +41 -0
- package/dist/lib/worker-utils/get-loadable-worker-url.d.ts +13 -0
- package/dist/lib/worker-utils/get-transfer-list.d.ts +9 -0
- package/dist/lib/worker-utils/remove-nontransferable-options.d.ts +5 -0
- package/dist/null-worker.js +3 -3
- package/dist/null-worker.js.map +1 -1
- package/dist/types.d.ts +55 -0
- package/dist/workers/null-worker.d.ts +1 -0
- package/package.json +4 -3
|
@@ -1,88 +1,76 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
3
|
Object.defineProperty(exports, "__esModule", {
|
|
6
4
|
value: true
|
|
7
5
|
});
|
|
8
6
|
exports.default = void 0;
|
|
9
7
|
|
|
10
|
-
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
11
|
-
|
|
12
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
13
|
-
|
|
14
8
|
var _getTransferList = require("../worker-utils/get-transfer-list");
|
|
15
9
|
|
|
16
|
-
|
|
10
|
+
const onMessageWrapperMap = new Map();
|
|
11
|
+
|
|
12
|
+
class WorkerBody {
|
|
13
|
+
static set onmessage(onMessage) {
|
|
14
|
+
self.onmessage = message => {
|
|
15
|
+
if (!isKnownMessage(message)) {
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
17
18
|
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
const {
|
|
20
|
+
type,
|
|
21
|
+
payload
|
|
22
|
+
} = message.data;
|
|
23
|
+
onMessage(type, payload);
|
|
24
|
+
};
|
|
21
25
|
}
|
|
22
26
|
|
|
23
|
-
(
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
+
static addEventListener(onMessage) {
|
|
28
|
+
let onMessageWrapper = onMessageWrapperMap.get(onMessage);
|
|
29
|
+
|
|
30
|
+
if (!onMessageWrapper) {
|
|
31
|
+
onMessageWrapper = message => {
|
|
27
32
|
if (!isKnownMessage(message)) {
|
|
28
33
|
return;
|
|
29
34
|
}
|
|
30
35
|
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
36
|
+
const {
|
|
37
|
+
type,
|
|
38
|
+
payload
|
|
39
|
+
} = message.data;
|
|
34
40
|
onMessage(type, payload);
|
|
35
41
|
};
|
|
36
42
|
}
|
|
37
|
-
}, {
|
|
38
|
-
key: "addEventListener",
|
|
39
|
-
value: function addEventListener(onMessage) {
|
|
40
|
-
var onMessageWrapper = onMessageWrapperMap.get(onMessage);
|
|
41
43
|
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
if (!isKnownMessage(message)) {
|
|
45
|
-
return;
|
|
46
|
-
}
|
|
44
|
+
self.addEventListener('message', onMessageWrapper);
|
|
45
|
+
}
|
|
47
46
|
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
}
|
|
47
|
+
static removeEventListener(onMessage) {
|
|
48
|
+
const onMessageWrapper = onMessageWrapperMap.get(onMessage);
|
|
49
|
+
onMessageWrapperMap.delete(onMessage);
|
|
50
|
+
self.removeEventListener('message', onMessageWrapper);
|
|
51
|
+
}
|
|
54
52
|
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
}, {
|
|
65
|
-
key: "postMessage",
|
|
66
|
-
value: function postMessage(type, payload) {
|
|
67
|
-
if (self) {
|
|
68
|
-
var data = {
|
|
69
|
-
source: 'loaders.gl',
|
|
70
|
-
type: type,
|
|
71
|
-
payload: payload
|
|
72
|
-
};
|
|
73
|
-
var transferList = (0, _getTransferList.getTransferList)(payload);
|
|
74
|
-
self.postMessage(data, transferList);
|
|
75
|
-
}
|
|
53
|
+
static postMessage(type, payload) {
|
|
54
|
+
if (self) {
|
|
55
|
+
const data = {
|
|
56
|
+
source: 'loaders.gl',
|
|
57
|
+
type,
|
|
58
|
+
payload
|
|
59
|
+
};
|
|
60
|
+
const transferList = (0, _getTransferList.getTransferList)(payload);
|
|
61
|
+
self.postMessage(data, transferList);
|
|
76
62
|
}
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
}
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
}
|
|
80
66
|
|
|
81
67
|
exports.default = WorkerBody;
|
|
82
68
|
|
|
83
69
|
function isKnownMessage(message) {
|
|
84
|
-
|
|
85
|
-
|
|
70
|
+
const {
|
|
71
|
+
type,
|
|
72
|
+
data
|
|
73
|
+
} = message;
|
|
86
74
|
return type === 'message' && data && typeof data.source === 'string' && data.source.startsWith('loaders.gl');
|
|
87
75
|
}
|
|
88
76
|
//# sourceMappingURL=worker-body.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/worker-farm/worker-body.ts"],"names":["onMessageWrapperMap","Map","WorkerBody","
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/worker-farm/worker-body.ts"],"names":["onMessageWrapperMap","Map","WorkerBody","onmessage","onMessage","self","message","isKnownMessage","type","payload","data","addEventListener","onMessageWrapper","get","removeEventListener","delete","postMessage","source","transferList","startsWith"],"mappings":";;;;;;;AACA;;AAEA,MAAMA,mBAAmB,GAAG,IAAIC,GAAJ,EAA5B;;AAKe,MAAMC,UAAN,CAAiB;AAIV,aAATC,SAAS,CAACC,SAAD,EAA6E;AAE/FC,IAAAA,IAAI,CAACF,SAAL,GAAkBG,OAAD,IAAa;AAC5B,UAAI,CAACC,cAAc,CAACD,OAAD,CAAnB,EAA8B;AAC5B;AACD;;AAGD,YAAM;AAACE,QAAAA,IAAD;AAAOC,QAAAA;AAAP,UAAkBH,OAAO,CAACI,IAAhC;AACAN,MAAAA,SAAS,CAACI,IAAD,EAAOC,OAAP,CAAT;AACD,KARD;AASD;;AAEsB,SAAhBE,gBAAgB,CACrBP,SADqB,EAErB;AACA,QAAIQ,gBAAgB,GAAGZ,mBAAmB,CAACa,GAApB,CAAwBT,SAAxB,CAAvB;;AAEA,QAAI,CAACQ,gBAAL,EAAuB;AACrBA,MAAAA,gBAAgB,GAAIN,OAAD,IAAa;AAC9B,YAAI,CAACC,cAAc,CAACD,OAAD,CAAnB,EAA8B;AAC5B;AACD;;AAGD,cAAM;AAACE,UAAAA,IAAD;AAAOC,UAAAA;AAAP,YAAkBH,OAAO,CAACI,IAAhC;AACAN,QAAAA,SAAS,CAACI,IAAD,EAAOC,OAAP,CAAT;AACD,OARD;AASD;;AAGDJ,IAAAA,IAAI,CAACM,gBAAL,CAAsB,SAAtB,EAAiCC,gBAAjC;AACD;;AAEyB,SAAnBE,mBAAmB,CACxBV,SADwB,EAExB;AACA,UAAMQ,gBAAgB,GAAGZ,mBAAmB,CAACa,GAApB,CAAwBT,SAAxB,CAAzB;AACAJ,IAAAA,mBAAmB,CAACe,MAApB,CAA2BX,SAA3B;AAEAC,IAAAA,IAAI,CAACS,mBAAL,CAAyB,SAAzB,EAAoCF,gBAApC;AACD;;AAOiB,SAAXI,WAAW,CAACR,IAAD,EAA0BC,OAA1B,EAA+D;AAC/E,QAAIJ,IAAJ,EAAU;AACR,YAAMK,IAAuB,GAAG;AAACO,QAAAA,MAAM,EAAE,YAAT;AAAuBT,QAAAA,IAAvB;AAA6BC,QAAAA;AAA7B,OAAhC;AACA,YAAMS,YAAY,GAAG,sCAAgBT,OAAhB,CAArB;AAGAJ,MAAAA,IAAI,CAACW,WAAL,CAAiBN,IAAjB,EAAuBQ,YAAvB;AACD;AACF;;AA5D6B;;;;AAgEhC,SAASX,cAAT,CAAwBD,OAAxB,EAAiC;AAC/B,QAAM;AAACE,IAAAA,IAAD;AAAOE,IAAAA;AAAP,MAAeJ,OAArB;AACA,SACEE,IAAI,KAAK,SAAT,IACAE,IADA,IAEA,OAAOA,IAAI,CAACO,MAAZ,KAAuB,QAFvB,IAGAP,IAAI,CAACO,MAAL,CAAYE,UAAZ,CAAuB,YAAvB,CAJF;AAMD","sourcesContent":["import type {WorkerMessageData, WorkerMessageType, WorkerMessagePayload} from '../../types';\nimport {getTransferList} from '../worker-utils/get-transfer-list';\n\nconst onMessageWrapperMap = new Map();\n\n/**\n * Type safe wrapper for worker code\n */\nexport default class WorkerBody {\n /*\n * (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n */\n static set onmessage(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any) {\n // eslint-disable-next-line no-restricted-globals\n self.onmessage = (message) => {\n if (!isKnownMessage(message)) {\n return;\n }\n\n // Confusingly the message itself also has a 'type' field which is always set to 'message'\n const {type, payload} = message.data;\n onMessage(type, payload);\n };\n }\n\n static addEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n let onMessageWrapper = onMessageWrapperMap.get(onMessage);\n\n if (!onMessageWrapper) {\n onMessageWrapper = (message) => {\n if (!isKnownMessage(message)) {\n return;\n }\n\n // Confusingly the message itself also has a 'type' field which is always set to 'message'\n const {type, payload} = message.data;\n onMessage(type, payload);\n };\n }\n\n // eslint-disable-next-line no-restricted-globals\n self.addEventListener('message', onMessageWrapper);\n }\n\n static removeEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n const onMessageWrapper = onMessageWrapperMap.get(onMessage);\n onMessageWrapperMap.delete(onMessage);\n // eslint-disable-next-line no-restricted-globals\n self.removeEventListener('message', onMessageWrapper);\n }\n\n /**\n * Send a message from a worker to creating thread (main thread)\n * @param type\n * @param payload\n */\n static postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): void {\n if (self) {\n const data: WorkerMessageData = {source: 'loaders.gl', type, payload};\n const transferList = getTransferList(payload);\n // eslint-disable-next-line no-restricted-globals\n // @ts-ignore\n self.postMessage(data, transferList);\n }\n }\n}\n\n// Filter out noise messages sent to workers\nfunction isKnownMessage(message) {\n const {type, data} = message;\n return (\n type === 'message' &&\n data &&\n typeof data.source === 'string' &&\n data.source.startsWith('loaders.gl')\n );\n}\n"],"file":"worker-body.js"}
|
|
@@ -7,127 +7,88 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
});
|
|
8
8
|
exports.default = void 0;
|
|
9
9
|
|
|
10
|
-
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
11
|
-
|
|
12
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
13
|
-
|
|
14
10
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
15
11
|
|
|
16
12
|
var _workerPool = _interopRequireDefault(require("./worker-pool"));
|
|
17
13
|
|
|
18
14
|
var _workerThread = _interopRequireDefault(require("./worker-thread"));
|
|
19
15
|
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
23
|
-
|
|
24
|
-
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
|
|
25
|
-
|
|
26
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
|
|
27
|
-
|
|
28
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
29
|
-
|
|
30
|
-
var DEFAULT_PROPS = {
|
|
16
|
+
const DEFAULT_PROPS = {
|
|
31
17
|
maxConcurrency: 3,
|
|
32
18
|
maxMobileConcurrency: 1,
|
|
33
|
-
onDebug:
|
|
19
|
+
onDebug: () => {},
|
|
34
20
|
reuseWorkers: true
|
|
35
21
|
};
|
|
36
22
|
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
23
|
+
class WorkerFarm {
|
|
24
|
+
static isSupported() {
|
|
25
|
+
return _workerThread.default.isSupported();
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
static getWorkerFarm(props = {}) {
|
|
29
|
+
WorkerFarm._workerFarm = WorkerFarm._workerFarm || new WorkerFarm({});
|
|
30
|
+
|
|
31
|
+
WorkerFarm._workerFarm.setProps(props);
|
|
32
|
+
|
|
33
|
+
return WorkerFarm._workerFarm;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
constructor(props) {
|
|
40
37
|
(0, _defineProperty2.default)(this, "props", void 0);
|
|
41
38
|
(0, _defineProperty2.default)(this, "workerPools", new Map());
|
|
42
|
-
this.props =
|
|
39
|
+
this.props = { ...DEFAULT_PROPS
|
|
40
|
+
};
|
|
43
41
|
this.setProps(props);
|
|
44
42
|
this.workerPools = new Map();
|
|
45
43
|
}
|
|
46
44
|
|
|
47
|
-
(
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
var _iterator = _createForOfIteratorHelper(this.workerPools.values()),
|
|
51
|
-
_step;
|
|
52
|
-
|
|
53
|
-
try {
|
|
54
|
-
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
55
|
-
var workerPool = _step.value;
|
|
56
|
-
workerPool.destroy();
|
|
57
|
-
}
|
|
58
|
-
} catch (err) {
|
|
59
|
-
_iterator.e(err);
|
|
60
|
-
} finally {
|
|
61
|
-
_iterator.f();
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
}, {
|
|
65
|
-
key: "setProps",
|
|
66
|
-
value: function setProps(props) {
|
|
67
|
-
this.props = _objectSpread(_objectSpread({}, this.props), props);
|
|
68
|
-
|
|
69
|
-
var _iterator2 = _createForOfIteratorHelper(this.workerPools.values()),
|
|
70
|
-
_step2;
|
|
71
|
-
|
|
72
|
-
try {
|
|
73
|
-
for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
|
|
74
|
-
var workerPool = _step2.value;
|
|
75
|
-
workerPool.setProps(this._getWorkerPoolProps());
|
|
76
|
-
}
|
|
77
|
-
} catch (err) {
|
|
78
|
-
_iterator2.e(err);
|
|
79
|
-
} finally {
|
|
80
|
-
_iterator2.f();
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
}, {
|
|
84
|
-
key: "getWorkerPool",
|
|
85
|
-
value: function getWorkerPool(options) {
|
|
86
|
-
var name = options.name,
|
|
87
|
-
source = options.source,
|
|
88
|
-
url = options.url;
|
|
89
|
-
var workerPool = this.workerPools.get(name);
|
|
90
|
-
|
|
91
|
-
if (!workerPool) {
|
|
92
|
-
workerPool = new _workerPool.default({
|
|
93
|
-
name: name,
|
|
94
|
-
source: source,
|
|
95
|
-
url: url
|
|
96
|
-
});
|
|
97
|
-
workerPool.setProps(this._getWorkerPoolProps());
|
|
98
|
-
this.workerPools.set(name, workerPool);
|
|
99
|
-
}
|
|
100
|
-
|
|
101
|
-
return workerPool;
|
|
45
|
+
destroy() {
|
|
46
|
+
for (const workerPool of this.workerPools.values()) {
|
|
47
|
+
workerPool.destroy();
|
|
102
48
|
}
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
setProps(props) {
|
|
52
|
+
this.props = { ...this.props,
|
|
53
|
+
...props
|
|
54
|
+
};
|
|
55
|
+
|
|
56
|
+
for (const workerPool of this.workerPools.values()) {
|
|
57
|
+
workerPool.setProps(this._getWorkerPoolProps());
|
|
112
58
|
}
|
|
113
|
-
}
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
getWorkerPool(options) {
|
|
62
|
+
const {
|
|
63
|
+
name,
|
|
64
|
+
source,
|
|
65
|
+
url
|
|
66
|
+
} = options;
|
|
67
|
+
let workerPool = this.workerPools.get(name);
|
|
68
|
+
|
|
69
|
+
if (!workerPool) {
|
|
70
|
+
workerPool = new _workerPool.default({
|
|
71
|
+
name,
|
|
72
|
+
source,
|
|
73
|
+
url
|
|
74
|
+
});
|
|
75
|
+
workerPool.setProps(this._getWorkerPoolProps());
|
|
76
|
+
this.workerPools.set(name, workerPool);
|
|
117
77
|
}
|
|
118
|
-
}, {
|
|
119
|
-
key: "getWorkerFarm",
|
|
120
|
-
value: function getWorkerFarm() {
|
|
121
|
-
var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
122
|
-
WorkerFarm._workerFarm = WorkerFarm._workerFarm || new WorkerFarm({});
|
|
123
78
|
|
|
124
|
-
|
|
79
|
+
return workerPool;
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
_getWorkerPoolProps() {
|
|
83
|
+
return {
|
|
84
|
+
maxConcurrency: this.props.maxConcurrency,
|
|
85
|
+
maxMobileConcurrency: this.props.maxMobileConcurrency,
|
|
86
|
+
reuseWorkers: this.props.reuseWorkers,
|
|
87
|
+
onDebug: this.props.onDebug
|
|
88
|
+
};
|
|
89
|
+
}
|
|
125
90
|
|
|
126
|
-
|
|
127
|
-
}
|
|
128
|
-
}]);
|
|
129
|
-
return WorkerFarm;
|
|
130
|
-
}();
|
|
91
|
+
}
|
|
131
92
|
|
|
132
93
|
exports.default = WorkerFarm;
|
|
133
94
|
(0, _defineProperty2.default)(WorkerFarm, "_workerFarm", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/worker-farm/worker-farm.ts"],"names":["DEFAULT_PROPS","maxConcurrency","maxMobileConcurrency","onDebug","reuseWorkers","WorkerFarm","props","
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/worker-farm/worker-farm.ts"],"names":["DEFAULT_PROPS","maxConcurrency","maxMobileConcurrency","onDebug","reuseWorkers","WorkerFarm","isSupported","WorkerThread","getWorkerFarm","props","_workerFarm","setProps","constructor","Map","workerPools","destroy","workerPool","values","_getWorkerPoolProps","getWorkerPool","options","name","source","url","get","WorkerPool","set"],"mappings":";;;;;;;;;;;AAAA;;AACA;;AAYA,MAAMA,aAA8B,GAAG;AACrCC,EAAAA,cAAc,EAAE,CADqB;AAErCC,EAAAA,oBAAoB,EAAE,CAFe;AAGrCC,EAAAA,OAAO,EAAE,MAAM,CAAE,CAHoB;AAIrCC,EAAAA,YAAY,EAAE;AAJuB,CAAvC;;AAUe,MAAMC,UAAN,CAAiB;AAOZ,SAAXC,WAAW,GAAY;AAC5B,WAAOC,sBAAaD,WAAb,EAAP;AACD;;AAGmB,SAAbE,aAAa,CAACC,KAAsB,GAAG,EAA1B,EAA0C;AAC5DJ,IAAAA,UAAU,CAACK,WAAX,GAAyBL,UAAU,CAACK,WAAX,IAA0B,IAAIL,UAAJ,CAAe,EAAf,CAAnD;;AACAA,IAAAA,UAAU,CAACK,WAAX,CAAuBC,QAAvB,CAAgCF,KAAhC;;AACA,WAAOJ,UAAU,CAACK,WAAlB;AACD;;AAGOE,EAAAA,WAAW,CAACH,KAAD,EAAyB;AAAA;AAAA,uDAjBtB,IAAII,GAAJ,EAiBsB;AAC1C,SAAKJ,KAAL,GAAa,EAAC,GAAGT;AAAJ,KAAb;AACA,SAAKW,QAAL,CAAcF,KAAd;AAEA,SAAKK,WAAL,GAAmB,IAAID,GAAJ,EAAnB;AACD;;AAMDE,EAAAA,OAAO,GAAS;AACd,SAAK,MAAMC,UAAX,IAAyB,KAAKF,WAAL,CAAiBG,MAAjB,EAAzB,EAAoD;AAClDD,MAAAA,UAAU,CAACD,OAAX;AACD;AACF;;AAMDJ,EAAAA,QAAQ,CAACF,KAAD,EAA+B;AACrC,SAAKA,KAAL,GAAa,EAAC,GAAG,KAAKA,KAAT;AAAgB,SAAGA;AAAnB,KAAb;;AAEA,SAAK,MAAMO,UAAX,IAAyB,KAAKF,WAAL,CAAiBG,MAAjB,EAAzB,EAAoD;AAClDD,MAAAA,UAAU,CAACL,QAAX,CAAoB,KAAKO,mBAAL,EAApB;AACD;AACF;;AAWDC,EAAAA,aAAa,CAACC,OAAD,EAAqE;AAChF,UAAM;AAACC,MAAAA,IAAD;AAAOC,MAAAA,MAAP;AAAeC,MAAAA;AAAf,QAAsBH,OAA5B;AACA,QAAIJ,UAAU,GAAG,KAAKF,WAAL,CAAiBU,GAAjB,CAAqBH,IAArB,CAAjB;;AACA,QAAI,CAACL,UAAL,EAAiB;AACfA,MAAAA,UAAU,GAAG,IAAIS,mBAAJ,CAAe;AAC1BJ,QAAAA,IAD0B;AAE1BC,QAAAA,MAF0B;AAG1BC,QAAAA;AAH0B,OAAf,CAAb;AAKAP,MAAAA,UAAU,CAACL,QAAX,CAAoB,KAAKO,mBAAL,EAApB;AACA,WAAKJ,WAAL,CAAiBY,GAAjB,CAAqBL,IAArB,EAA2BL,UAA3B;AACD;;AACD,WAAOA,UAAP;AACD;;AAEDE,EAAAA,mBAAmB,GAAG;AACpB,WAAO;AACLjB,MAAAA,cAAc,EAAE,KAAKQ,KAAL,CAAWR,cADtB;AAELC,MAAAA,oBAAoB,EAAE,KAAKO,KAAL,CAAWP,oBAF5B;AAGLE,MAAAA,YAAY,EAAE,KAAKK,KAAL,CAAWL,YAHpB;AAILD,MAAAA,OAAO,EAAE,KAAKM,KAAL,CAAWN;AAJf,KAAP;AAMD;;AA/E6B;;;8BAAXE,U","sourcesContent":["import WorkerPool from './worker-pool';\nimport WorkerThread from './worker-thread';\n\n/**\n * @param maxConcurrency {number} - max count of workers\n */\nexport type WorkerFarmProps = {\n maxConcurrency?: number;\n maxMobileConcurrency?: number;\n reuseWorkers?: boolean;\n onDebug?: () => void;\n};\n\nconst DEFAULT_PROPS: WorkerFarmProps = {\n maxConcurrency: 3,\n maxMobileConcurrency: 1,\n onDebug: () => {},\n reuseWorkers: true\n};\n\n/**\n * Process multiple jobs with a \"farm\" of different workers in worker pools.\n */\nexport default class WorkerFarm {\n private props: WorkerFarmProps;\n private workerPools = new Map<string, WorkerPool>();\n // singleton\n private static _workerFarm?: WorkerFarm;\n\n /** Check if Workers are supported */\n static isSupported(): boolean {\n return WorkerThread.isSupported();\n }\n\n /** Get the singleton instance of the global worker farm */\n static getWorkerFarm(props: WorkerFarmProps = {}): WorkerFarm {\n WorkerFarm._workerFarm = WorkerFarm._workerFarm || new WorkerFarm({});\n WorkerFarm._workerFarm.setProps(props);\n return WorkerFarm._workerFarm;\n }\n\n /** get global instance with WorkerFarm.getWorkerFarm() */\n private constructor(props: WorkerFarmProps) {\n this.props = {...DEFAULT_PROPS};\n this.setProps(props);\n /** @type Map<string, WorkerPool>} */\n this.workerPools = new Map();\n }\n\n /**\n * Terminate all workers in the farm\n * @note Can free up significant memory\n */\n destroy(): void {\n for (const workerPool of this.workerPools.values()) {\n workerPool.destroy();\n }\n }\n\n /**\n * Set props used when initializing worker pools\n * @param props\n */\n setProps(props: WorkerFarmProps): void {\n this.props = {...this.props, ...props};\n // Update worker pool props\n for (const workerPool of this.workerPools.values()) {\n workerPool.setProps(this._getWorkerPoolProps());\n }\n }\n\n /**\n * Returns a worker pool for the specified worker\n * @param options - only used first time for a specific worker name\n * @param options.name - the name of the worker - used to identify worker pool\n * @param options.url -\n * @param options.source -\n * @example\n * const job = WorkerFarm.getWorkerFarm().getWorkerPool({name, url}).startJob(...);\n */\n getWorkerPool(options: {name: string; source?: string; url?: string}): WorkerPool {\n const {name, source, url} = options;\n let workerPool = this.workerPools.get(name);\n if (!workerPool) {\n workerPool = new WorkerPool({\n name,\n source,\n url\n });\n workerPool.setProps(this._getWorkerPoolProps());\n this.workerPools.set(name, workerPool);\n }\n return workerPool;\n }\n\n _getWorkerPoolProps() {\n return {\n maxConcurrency: this.props.maxConcurrency,\n maxMobileConcurrency: this.props.maxMobileConcurrency,\n reuseWorkers: this.props.reuseWorkers,\n onDebug: this.props.onDebug\n };\n }\n}\n"],"file":"worker-farm.js"}
|
|
@@ -7,19 +7,12 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
});
|
|
8
8
|
exports.default = void 0;
|
|
9
9
|
|
|
10
|
-
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
11
|
-
|
|
12
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
13
|
-
|
|
14
10
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
15
11
|
|
|
16
12
|
var _assert = require("../env-utils/assert");
|
|
17
13
|
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
var _this = this;
|
|
21
|
-
|
|
22
|
-
(0, _classCallCheck2.default)(this, WorkerJob);
|
|
14
|
+
class WorkerJob {
|
|
15
|
+
constructor(jobName, workerThread) {
|
|
23
16
|
(0, _defineProperty2.default)(this, "name", void 0);
|
|
24
17
|
(0, _defineProperty2.default)(this, "workerThread", void 0);
|
|
25
18
|
(0, _defineProperty2.default)(this, "isRunning", void 0);
|
|
@@ -30,44 +23,39 @@ var WorkerJob = function () {
|
|
|
30
23
|
this.workerThread = workerThread;
|
|
31
24
|
this.isRunning = true;
|
|
32
25
|
|
|
33
|
-
this._resolve =
|
|
26
|
+
this._resolve = () => {};
|
|
34
27
|
|
|
35
|
-
this._reject =
|
|
28
|
+
this._reject = () => {};
|
|
29
|
+
|
|
30
|
+
this.result = new Promise((resolve, reject) => {
|
|
31
|
+
this._resolve = resolve;
|
|
32
|
+
this._reject = reject;
|
|
33
|
+
});
|
|
34
|
+
}
|
|
36
35
|
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
36
|
+
postMessage(type, payload) {
|
|
37
|
+
this.workerThread.postMessage({
|
|
38
|
+
source: 'loaders.gl',
|
|
39
|
+
type,
|
|
40
|
+
payload
|
|
40
41
|
});
|
|
41
42
|
}
|
|
42
43
|
|
|
43
|
-
(
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
payload: payload
|
|
50
|
-
});
|
|
51
|
-
}
|
|
52
|
-
}, {
|
|
53
|
-
key: "done",
|
|
54
|
-
value: function done(value) {
|
|
55
|
-
(0, _assert.assert)(this.isRunning);
|
|
56
|
-
this.isRunning = false;
|
|
44
|
+
done(value) {
|
|
45
|
+
(0, _assert.assert)(this.isRunning);
|
|
46
|
+
this.isRunning = false;
|
|
47
|
+
|
|
48
|
+
this._resolve(value);
|
|
49
|
+
}
|
|
57
50
|
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
this.isRunning = false;
|
|
51
|
+
error(error) {
|
|
52
|
+
(0, _assert.assert)(this.isRunning);
|
|
53
|
+
this.isRunning = false;
|
|
54
|
+
|
|
55
|
+
this._reject(error);
|
|
56
|
+
}
|
|
65
57
|
|
|
66
|
-
|
|
67
|
-
}
|
|
68
|
-
}]);
|
|
69
|
-
return WorkerJob;
|
|
70
|
-
}();
|
|
58
|
+
}
|
|
71
59
|
|
|
72
60
|
exports.default = WorkerJob;
|
|
73
61
|
//# sourceMappingURL=worker-job.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/worker-farm/worker-job.ts"],"names":["WorkerJob","jobName","workerThread","name","isRunning","_resolve","_reject","result","Promise","resolve","reject","type","payload","
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/worker-farm/worker-job.ts"],"names":["WorkerJob","constructor","jobName","workerThread","name","isRunning","_resolve","_reject","result","Promise","resolve","reject","postMessage","type","payload","source","done","value","error"],"mappings":";;;;;;;;;;;AAEA;;AAKe,MAAMA,SAAN,CAAgB;AAU7BC,EAAAA,WAAW,CAACC,OAAD,EAAkBC,YAAlB,EAA8C;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACvD,SAAKC,IAAL,GAAYF,OAAZ;AACA,SAAKC,YAAL,GAAoBA,YAApB;AACA,SAAKE,SAAL,GAAiB,IAAjB;;AACA,SAAKC,QAAL,GAAgB,MAAM,CAAE,CAAxB;;AACA,SAAKC,OAAL,GAAe,MAAM,CAAE,CAAvB;;AACA,SAAKC,MAAL,GAAc,IAAIC,OAAJ,CAAY,CAACC,OAAD,EAAUC,MAAV,KAAqB;AAC7C,WAAKL,QAAL,GAAgBI,OAAhB;AACA,WAAKH,OAAL,GAAeI,MAAf;AACD,KAHa,CAAd;AAID;;AAMDC,EAAAA,WAAW,CAACC,IAAD,EAA0BC,OAA1B,EAA+D;AACxE,SAAKX,YAAL,CAAkBS,WAAlB,CAA8B;AAC5BG,MAAAA,MAAM,EAAE,YADoB;AAE5BF,MAAAA,IAF4B;AAG5BC,MAAAA;AAH4B,KAA9B;AAKD;;AAKDE,EAAAA,IAAI,CAACC,KAAD,EAAc;AAChB,wBAAO,KAAKZ,SAAZ;AACA,SAAKA,SAAL,GAAiB,KAAjB;;AACA,SAAKC,QAAL,CAAcW,KAAd;AACD;;AAKDC,EAAAA,KAAK,CAACA,KAAD,EAAc;AACjB,wBAAO,KAAKb,SAAZ;AACA,SAAKA,SAAL,GAAiB,KAAjB;;AACA,SAAKE,OAAL,CAAaW,KAAb;AACD;;AAlD4B","sourcesContent":["import type {WorkerMessageType, WorkerMessagePayload} from '../../types';\nimport WorkerThread from './worker-thread';\nimport {assert} from '../env-utils/assert';\n\n/**\n * Represents one Job handled by a WorkerPool or WorkerFarm\n */\nexport default class WorkerJob {\n readonly name: string;\n readonly workerThread: WorkerThread;\n isRunning: boolean;\n /** Promise that resolves when Job is done */\n readonly result: Promise<any>;\n\n private _resolve: (value: any) => void;\n private _reject: (reason?: any) => void;\n\n constructor(jobName: string, workerThread: WorkerThread) {\n this.name = jobName;\n this.workerThread = workerThread;\n this.isRunning = true;\n this._resolve = () => {};\n this._reject = () => {};\n this.result = new Promise((resolve, reject) => {\n this._resolve = resolve;\n this._reject = reject;\n });\n }\n\n /**\n * Send a message to the job's worker thread\n * @param data any data structure, ideally consisting mostly of transferrable objects\n */\n postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): void {\n this.workerThread.postMessage({\n source: 'loaders.gl', // Lets worker ignore unrelated messages\n type,\n payload\n });\n }\n\n /**\n * Call to resolve the `result` Promise with the supplied value\n */\n done(value): void {\n assert(this.isRunning);\n this.isRunning = false;\n this._resolve(value);\n }\n\n /**\n * Call to reject the `result` Promise with the supplied error\n */\n error(error): void {\n assert(this.isRunning);\n this.isRunning = false;\n this._reject(error);\n }\n}\n"],"file":"worker-job.js"}
|