@loaders.gl/worker-utils 3.1.3 → 4.0.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/index.js +25 -57
- package/dist/index.js.map +1 -0
- package/dist/lib/async-queue/async-queue.js +91 -81
- package/dist/lib/async-queue/async-queue.js.map +1 -0
- package/dist/lib/env-utils/assert.js +5 -12
- package/dist/lib/env-utils/assert.js.map +1 -0
- package/dist/lib/env-utils/globals.js +10 -25
- package/dist/lib/env-utils/globals.js.map +1 -0
- package/dist/lib/env-utils/version.js +6 -11
- package/dist/lib/env-utils/version.js.map +1 -0
- package/dist/lib/library-utils/library-utils.js +80 -155
- package/dist/lib/library-utils/library-utils.js.map +1 -0
- package/dist/lib/node/require-utils.node.js +41 -58
- package/dist/lib/node/require-utils.node.js.map +1 -0
- package/dist/lib/process-utils/child-process-proxy.js +113 -122
- package/dist/lib/process-utils/child-process-proxy.js.map +1 -0
- package/dist/lib/process-utils/process-utils.js +27 -33
- package/dist/lib/process-utils/process-utils.js.map +1 -0
- package/dist/lib/worker-api/create-worker.js +92 -85
- package/dist/lib/worker-api/create-worker.js.map +1 -0
- package/dist/lib/worker-api/get-worker-url.js +33 -54
- package/dist/lib/worker-api/get-worker-url.js.map +1 -0
- package/dist/lib/worker-api/process-on-worker.js +71 -75
- package/dist/lib/worker-api/process-on-worker.js.map +1 -0
- package/dist/lib/worker-api/validate-worker-version.js +18 -32
- package/dist/lib/worker-api/validate-worker-version.js.map +1 -0
- package/dist/lib/worker-farm/worker-body.js +58 -60
- package/dist/{es5/lib → lib}/worker-farm/worker-body.js.map +1 -1
- package/dist/lib/worker-farm/worker-farm.js +77 -82
- package/dist/lib/worker-farm/worker-farm.js.map +1 -0
- package/dist/lib/worker-farm/worker-job.js +53 -46
- package/dist/lib/worker-farm/worker-job.js.map +1 -0
- package/dist/lib/worker-farm/worker-pool.js +148 -142
- package/dist/lib/worker-farm/worker-pool.js.map +1 -0
- package/dist/lib/worker-farm/worker-thread.js +102 -92
- package/dist/lib/worker-farm/worker-thread.js.map +1 -0
- package/dist/lib/worker-utils/get-loadable-worker-url.js +33 -65
- package/dist/lib/worker-utils/get-loadable-worker-url.js.map +1 -0
- package/dist/lib/worker-utils/get-transfer-list.js +36 -57
- package/dist/lib/worker-utils/get-transfer-list.js.map +1 -0
- package/dist/lib/worker-utils/remove-nontransferable-options.js +19 -31
- package/dist/lib/worker-utils/remove-nontransferable-options.js.map +1 -0
- package/dist/types.js +2 -2
- package/dist/{es5/types.js.map → types.js.map} +0 -0
- package/dist/workers/null-worker.js +4 -6
- package/dist/workers/null-worker.js.map +1 -0
- package/package.json +5 -5
- package/src/lib/env-utils/version.ts +1 -1
- package/src/lib/library-utils/library-utils.ts +1 -1
- package/src/lib/worker-api/get-worker-url.ts +1 -1
- package/dist/es5/index.js +0 -160
- package/dist/es5/index.js.map +0 -1
- package/dist/es5/lib/async-queue/async-queue.js +0 -120
- package/dist/es5/lib/async-queue/async-queue.js.map +0 -1
- package/dist/es5/lib/env-utils/assert.js +0 -13
- package/dist/es5/lib/env-utils/assert.js.map +0 -1
- package/dist/es5/lib/env-utils/globals.js +0 -35
- package/dist/es5/lib/env-utils/globals.js.map +0 -1
- package/dist/es5/lib/env-utils/version.js +0 -14
- package/dist/es5/lib/env-utils/version.js.map +0 -1
- package/dist/es5/lib/library-utils/library-utils.js +0 -206
- package/dist/es5/lib/library-utils/library-utils.js.map +0 -1
- package/dist/es5/lib/node/require-utils.node.js +0 -96
- package/dist/es5/lib/node/require-utils.node.js.map +0 -1
- package/dist/es5/lib/process-utils/child-process-proxy.js +0 -245
- package/dist/es5/lib/process-utils/child-process-proxy.js.map +0 -1
- package/dist/es5/lib/process-utils/process-utils.js +0 -40
- package/dist/es5/lib/process-utils/process-utils.js.map +0 -1
- package/dist/es5/lib/worker-api/create-worker.js +0 -229
- package/dist/es5/lib/worker-api/create-worker.js.map +0 -1
- package/dist/es5/lib/worker-api/get-worker-url.js +0 -49
- package/dist/es5/lib/worker-api/get-worker-url.js.map +0 -1
- package/dist/es5/lib/worker-api/process-on-worker.js +0 -162
- package/dist/es5/lib/worker-api/process-on-worker.js.map +0 -1
- package/dist/es5/lib/worker-api/validate-worker-version.js +0 -31
- package/dist/es5/lib/worker-api/validate-worker-version.js.map +0 -1
- package/dist/es5/lib/worker-farm/worker-body.js +0 -88
- package/dist/es5/lib/worker-farm/worker-farm.js +0 -134
- package/dist/es5/lib/worker-farm/worker-farm.js.map +0 -1
- package/dist/es5/lib/worker-farm/worker-job.js +0 -73
- package/dist/es5/lib/worker-farm/worker-job.js.map +0 -1
- package/dist/es5/lib/worker-farm/worker-pool.js +0 -256
- package/dist/es5/lib/worker-farm/worker-pool.js.map +0 -1
- package/dist/es5/lib/worker-farm/worker-thread.js +0 -129
- package/dist/es5/lib/worker-farm/worker-thread.js.map +0 -1
- package/dist/es5/lib/worker-utils/get-loadable-worker-url.js +0 -51
- package/dist/es5/lib/worker-utils/get-loadable-worker-url.js.map +0 -1
- package/dist/es5/lib/worker-utils/get-transfer-list.js +0 -53
- package/dist/es5/lib/worker-utils/get-transfer-list.js.map +0 -1
- package/dist/es5/lib/worker-utils/remove-nontransferable-options.js +0 -34
- package/dist/es5/lib/worker-utils/remove-nontransferable-options.js.map +0 -1
- package/dist/es5/types.js +0 -2
- package/dist/es5/workers/null-worker.js +0 -31
- package/dist/es5/workers/null-worker.js.map +0 -1
- package/dist/esm/index.js +0 -26
- package/dist/esm/index.js.map +0 -1
- package/dist/esm/lib/async-queue/async-queue.js +0 -97
- package/dist/esm/lib/async-queue/async-queue.js.map +0 -1
- package/dist/esm/lib/env-utils/assert.js +0 -6
- package/dist/esm/lib/env-utils/assert.js.map +0 -1
- package/dist/esm/lib/env-utils/globals.js +0 -17
- package/dist/esm/lib/env-utils/globals.js.map +0 -1
- package/dist/esm/lib/env-utils/version.js +0 -7
- package/dist/esm/lib/env-utils/version.js.map +0 -1
- package/dist/esm/lib/library-utils/library-utils.js +0 -88
- package/dist/esm/lib/library-utils/library-utils.js.map +0 -1
- package/dist/esm/lib/node/require-utils.node.js +0 -43
- package/dist/esm/lib/node/require-utils.node.js.map +0 -1
- package/dist/esm/lib/process-utils/child-process-proxy.js +0 -122
- package/dist/esm/lib/process-utils/child-process-proxy.js.map +0 -1
- package/dist/esm/lib/process-utils/process-utils.js +0 -29
- package/dist/esm/lib/process-utils/process-utils.js.map +0 -1
- package/dist/esm/lib/worker-api/create-worker.js +0 -99
- package/dist/esm/lib/worker-api/create-worker.js.map +0 -1
- package/dist/esm/lib/worker-api/get-worker-url.js +0 -36
- package/dist/esm/lib/worker-api/get-worker-url.js.map +0 -1
- package/dist/esm/lib/worker-api/process-on-worker.js +0 -75
- package/dist/esm/lib/worker-api/process-on-worker.js.map +0 -1
- package/dist/esm/lib/worker-api/validate-worker-version.js +0 -21
- package/dist/esm/lib/worker-api/validate-worker-version.js.map +0 -1
- package/dist/esm/lib/worker-farm/worker-body.js +0 -65
- package/dist/esm/lib/worker-farm/worker-body.js.map +0 -1
- package/dist/esm/lib/worker-farm/worker-farm.js +0 -83
- package/dist/esm/lib/worker-farm/worker-farm.js.map +0 -1
- package/dist/esm/lib/worker-farm/worker-job.js +0 -54
- package/dist/esm/lib/worker-farm/worker-job.js.map +0 -1
- package/dist/esm/lib/worker-farm/worker-pool.js +0 -157
- package/dist/esm/lib/worker-farm/worker-pool.js.map +0 -1
- package/dist/esm/lib/worker-farm/worker-thread.js +0 -105
- package/dist/esm/lib/worker-farm/worker-thread.js.map +0 -1
- package/dist/esm/lib/worker-utils/get-loadable-worker-url.js +0 -42
- package/dist/esm/lib/worker-utils/get-loadable-worker-url.js.map +0 -1
- package/dist/esm/lib/worker-utils/get-transfer-list.js +0 -40
- package/dist/esm/lib/worker-utils/get-transfer-list.js.map +0 -1
- package/dist/esm/lib/worker-utils/remove-nontransferable-options.js +0 -23
- package/dist/esm/lib/worker-utils/remove-nontransferable-options.js.map +0 -1
- package/dist/esm/types.js +0 -2
- package/dist/esm/types.js.map +0 -1
- package/dist/esm/workers/null-worker.js +0 -5
- package/dist/esm/workers/null-worker.js.map +0 -1
|
@@ -1,35 +1,29 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
});
|
|
27
|
-
let port = defaultPort;
|
|
28
|
-
while (portsInUse.includes(port)) {
|
|
29
|
-
port++;
|
|
30
|
-
}
|
|
31
|
-
resolve(port);
|
|
32
|
-
});
|
|
1
|
+
import ChildProcess from 'child_process';
|
|
2
|
+
export function getAvailablePort(defaultPort = 3000) {
|
|
3
|
+
return new Promise(resolve => {
|
|
4
|
+
ChildProcess.exec('lsof -i -P -n | grep LISTEN', (error, stdout) => {
|
|
5
|
+
if (error) {
|
|
6
|
+
resolve(defaultPort);
|
|
7
|
+
return;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
const portsInUse = [];
|
|
11
|
+
const regex = /:(\d+) \(LISTEN\)/;
|
|
12
|
+
stdout.split('\n').forEach(line => {
|
|
13
|
+
const match = regex.exec(line);
|
|
14
|
+
|
|
15
|
+
if (match) {
|
|
16
|
+
portsInUse.push(Number(match[1]));
|
|
17
|
+
}
|
|
18
|
+
});
|
|
19
|
+
let port = defaultPort;
|
|
20
|
+
|
|
21
|
+
while (portsInUse.includes(port)) {
|
|
22
|
+
port++;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
resolve(port);
|
|
33
26
|
});
|
|
27
|
+
});
|
|
34
28
|
}
|
|
35
|
-
|
|
29
|
+
//# sourceMappingURL=process-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/lib/process-utils/process-utils.ts"],"names":["ChildProcess","getAvailablePort","defaultPort","Promise","resolve","exec","error","stdout","portsInUse","regex","split","forEach","line","match","push","Number","port","includes"],"mappings":"AAAA,OAAOA,YAAP,MAAyB,eAAzB;AAIA,OAAO,SAASC,gBAAT,CAA0BC,WAAmB,GAAG,IAAhD,EAAuE;AAC5E,SAAO,IAAIC,OAAJ,CAAaC,OAAD,IAAa;AAE9BJ,IAAAA,YAAY,CAACK,IAAb,CAAkB,6BAAlB,EAAiD,CAACC,KAAD,EAAQC,MAAR,KAAmB;AAClE,UAAID,KAAJ,EAAW;AAETF,QAAAA,OAAO,CAACF,WAAD,CAAP;AACA;AACD;;AAED,YAAMM,UAAoB,GAAG,EAA7B;AACA,YAAMC,KAAK,GAAG,mBAAd;AACAF,MAAAA,MAAM,CAACG,KAAP,CAAa,IAAb,EAAmBC,OAAnB,CAA4BC,IAAD,IAAU;AACnC,cAAMC,KAAK,GAAGJ,KAAK,CAACJ,IAAN,CAAWO,IAAX,CAAd;;AACA,YAAIC,KAAJ,EAAW;AACTL,UAAAA,UAAU,CAACM,IAAX,CAAgBC,MAAM,CAACF,KAAK,CAAC,CAAD,CAAN,CAAtB;AACD;AACF,OALD;AAMA,UAAIG,IAAI,GAAGd,WAAX;;AACA,aAAOM,UAAU,CAACS,QAAX,CAAoBD,IAApB,CAAP,EAAkC;AAChCA,QAAAA,IAAI;AACL;;AACDZ,MAAAA,OAAO,CAACY,IAAD,CAAP;AACD,KApBD;AAqBD,GAvBM,CAAP;AAwBD","sourcesContent":["import ChildProcess from 'child_process';\n\n// Get an available port\n// Works on Unix systems\nexport function getAvailablePort(defaultPort: number = 3000): Promise<number> {\n return new Promise((resolve) => {\n // Get a list of all ports in use\n ChildProcess.exec('lsof -i -P -n | grep LISTEN', (error, stdout) => {\n if (error) {\n // likely no permission, e.g. CI\n resolve(defaultPort);\n return;\n }\n\n const portsInUse: number[] = [];\n const regex = /:(\\d+) \\(LISTEN\\)/;\n stdout.split('\\n').forEach((line) => {\n const match = regex.exec(line);\n if (match) {\n portsInUse.push(Number(match[1]));\n }\n });\n let port = defaultPort;\n while (portsInUse.includes(port)) {\n port++;\n }\n resolve(port);\n });\n });\n}\n"],"file":"process-utils.js"}
|
|
@@ -1,92 +1,99 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.createWorker = void 0;
|
|
7
|
-
const async_queue_1 = __importDefault(require("../async-queue/async-queue"));
|
|
8
|
-
const worker_body_1 = __importDefault(require("../worker-farm/worker-body"));
|
|
9
|
-
// import {validateWorkerVersion} from './validate-worker-version.js';
|
|
10
|
-
/** Counter for jobs */
|
|
1
|
+
import AsyncQueue from '../async-queue/async-queue';
|
|
2
|
+
import WorkerBody from '../worker-farm/worker-body';
|
|
11
3
|
let requestId = 0;
|
|
12
4
|
let inputBatches;
|
|
13
5
|
let options;
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
6
|
+
export function createWorker(process, processInBatches) {
|
|
7
|
+
if (typeof self === 'undefined') {
|
|
8
|
+
return;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
const context = {
|
|
12
|
+
process: processOnMainThread
|
|
13
|
+
};
|
|
14
|
+
|
|
15
|
+
WorkerBody.onmessage = async (type, payload) => {
|
|
16
|
+
try {
|
|
17
|
+
switch (type) {
|
|
18
|
+
case 'process':
|
|
19
|
+
if (!process) {
|
|
20
|
+
throw new Error('Worker does not support atomic processing');
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
const result = await process(payload.input, payload.options || {}, context);
|
|
24
|
+
WorkerBody.postMessage('done', {
|
|
25
|
+
result
|
|
26
|
+
});
|
|
27
|
+
break;
|
|
28
|
+
|
|
29
|
+
case 'process-in-batches':
|
|
30
|
+
if (!processInBatches) {
|
|
31
|
+
throw new Error('Worker does not support batched processing');
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
inputBatches = new AsyncQueue();
|
|
35
|
+
options = payload.options || {};
|
|
36
|
+
const resultIterator = processInBatches(inputBatches, options, context);
|
|
37
|
+
|
|
38
|
+
for await (const batch of resultIterator) {
|
|
39
|
+
WorkerBody.postMessage('output-batch', {
|
|
40
|
+
result: batch
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
WorkerBody.postMessage('done', {});
|
|
45
|
+
break;
|
|
46
|
+
|
|
47
|
+
case 'input-batch':
|
|
48
|
+
inputBatches.push(payload.input);
|
|
49
|
+
break;
|
|
50
|
+
|
|
51
|
+
case 'input-done':
|
|
52
|
+
inputBatches.close();
|
|
53
|
+
break;
|
|
54
|
+
|
|
55
|
+
default:
|
|
56
|
+
}
|
|
57
|
+
} catch (error) {
|
|
58
|
+
const message = error instanceof Error ? error.message : '';
|
|
59
|
+
WorkerBody.postMessage('error', {
|
|
60
|
+
error: message
|
|
61
|
+
});
|
|
21
62
|
}
|
|
22
|
-
|
|
23
|
-
process: processOnMainThread
|
|
24
|
-
};
|
|
25
|
-
// eslint-disable-next-line complexity
|
|
26
|
-
worker_body_1.default.onmessage = async (type, payload) => {
|
|
27
|
-
try {
|
|
28
|
-
switch (type) {
|
|
29
|
-
case 'process':
|
|
30
|
-
if (!process) {
|
|
31
|
-
throw new Error('Worker does not support atomic processing');
|
|
32
|
-
}
|
|
33
|
-
const result = await process(payload.input, payload.options || {}, context);
|
|
34
|
-
worker_body_1.default.postMessage('done', { result });
|
|
35
|
-
break;
|
|
36
|
-
case 'process-in-batches':
|
|
37
|
-
if (!processInBatches) {
|
|
38
|
-
throw new Error('Worker does not support batched processing');
|
|
39
|
-
}
|
|
40
|
-
inputBatches = new async_queue_1.default();
|
|
41
|
-
options = payload.options || {};
|
|
42
|
-
const resultIterator = processInBatches(inputBatches, options, context);
|
|
43
|
-
for await (const batch of resultIterator) {
|
|
44
|
-
worker_body_1.default.postMessage('output-batch', { result: batch });
|
|
45
|
-
}
|
|
46
|
-
worker_body_1.default.postMessage('done', {});
|
|
47
|
-
break;
|
|
48
|
-
case 'input-batch':
|
|
49
|
-
inputBatches.push(payload.input);
|
|
50
|
-
break;
|
|
51
|
-
case 'input-done':
|
|
52
|
-
inputBatches.close();
|
|
53
|
-
break;
|
|
54
|
-
default:
|
|
55
|
-
}
|
|
56
|
-
}
|
|
57
|
-
catch (error) {
|
|
58
|
-
const message = error instanceof Error ? error.message : '';
|
|
59
|
-
worker_body_1.default.postMessage('error', { error: message });
|
|
60
|
-
}
|
|
61
|
-
};
|
|
63
|
+
};
|
|
62
64
|
}
|
|
63
|
-
|
|
65
|
+
|
|
64
66
|
function processOnMainThread(arrayBuffer, options = {}) {
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
67
|
+
return new Promise((resolve, reject) => {
|
|
68
|
+
const id = requestId++;
|
|
69
|
+
|
|
70
|
+
const onMessage = (type, payload) => {
|
|
71
|
+
if (payload.id !== id) {
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
switch (type) {
|
|
76
|
+
case 'done':
|
|
77
|
+
WorkerBody.removeEventListener(onMessage);
|
|
78
|
+
resolve(payload.result);
|
|
79
|
+
break;
|
|
80
|
+
|
|
81
|
+
case 'error':
|
|
82
|
+
WorkerBody.removeEventListener(onMessage);
|
|
83
|
+
reject(payload.error);
|
|
84
|
+
break;
|
|
85
|
+
|
|
86
|
+
default:
|
|
87
|
+
}
|
|
88
|
+
};
|
|
89
|
+
|
|
90
|
+
WorkerBody.addEventListener(onMessage);
|
|
91
|
+
const payload = {
|
|
92
|
+
id,
|
|
93
|
+
input: arrayBuffer,
|
|
94
|
+
options
|
|
95
|
+
};
|
|
96
|
+
WorkerBody.postMessage('process', payload);
|
|
97
|
+
});
|
|
92
98
|
}
|
|
99
|
+
//# sourceMappingURL=create-worker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/lib/worker-api/create-worker.ts"],"names":["AsyncQueue","WorkerBody","requestId","inputBatches","options","createWorker","process","processInBatches","self","context","processOnMainThread","onmessage","type","payload","Error","result","input","postMessage","resultIterator","batch","push","close","error","message","arrayBuffer","Promise","resolve","reject","id","onMessage","removeEventListener","addEventListener"],"mappings":"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","sourcesContent":["import type {\n WorkerMessageType,\n WorkerMessagePayload,\n WorkerContext,\n Process,\n ProcessInBatches\n} from '../../types';\nimport AsyncQueue from '../async-queue/async-queue';\nimport WorkerBody from '../worker-farm/worker-body';\n// import {validateWorkerVersion} from './validate-worker-version';\n\n/** Counter for jobs */\nlet requestId = 0;\nlet inputBatches: AsyncQueue<any>;\nlet options: {[key: string]: any};\n\nexport type ProcessOnMainThread = (\n data: any,\n options?: {[key: string]: any},\n context?: WorkerContext\n) => any;\n\n/**\n * Set up a WebWorkerGlobalScope to talk with the main thread\n */\nexport function createWorker(process: Process, processInBatches?: ProcessInBatches): void {\n // Check that we are actually in a worker thread\n if (typeof self === 'undefined') {\n return;\n }\n\n const context: WorkerContext = {\n process: processOnMainThread\n };\n\n // eslint-disable-next-line complexity\n WorkerBody.onmessage = async (type: WorkerMessageType, payload: WorkerMessagePayload) => {\n try {\n switch (type) {\n case 'process':\n if (!process) {\n throw new Error('Worker does not support atomic processing');\n }\n const result = await process(payload.input, payload.options || {}, context);\n WorkerBody.postMessage('done', {result});\n break;\n\n case 'process-in-batches':\n if (!processInBatches) {\n throw new Error('Worker does not support batched processing');\n }\n inputBatches = new AsyncQueue<any>();\n options = payload.options || {};\n const resultIterator = processInBatches(inputBatches, options, context);\n for await (const batch of resultIterator) {\n WorkerBody.postMessage('output-batch', {result: batch});\n }\n WorkerBody.postMessage('done', {});\n break;\n\n case 'input-batch':\n inputBatches.push(payload.input);\n break;\n\n case 'input-done':\n inputBatches.close();\n break;\n\n default:\n }\n } catch (error) {\n const message = error instanceof Error ? error.message : '';\n WorkerBody.postMessage('error', {error: message});\n }\n };\n}\n\nfunction processOnMainThread(arrayBuffer: ArrayBuffer, options = {}) {\n return new Promise((resolve, reject) => {\n const id = requestId++;\n\n /**\n */\n const onMessage = (type: string, payload: WorkerMessagePayload) => {\n if (payload.id !== id) {\n // not ours\n return;\n }\n\n switch (type) {\n case 'done':\n WorkerBody.removeEventListener(onMessage);\n resolve(payload.result);\n break;\n\n case 'error':\n WorkerBody.removeEventListener(onMessage);\n reject(payload.error);\n break;\n\n default:\n // ignore\n }\n };\n\n WorkerBody.addEventListener(onMessage);\n\n // Ask the main thread to decode data\n const payload = {id, input: arrayBuffer, options};\n WorkerBody.postMessage('process', payload);\n });\n}\n"],"file":"create-worker.js"}
|
|
@@ -1,57 +1,36 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const
|
|
5
|
-
|
|
6
|
-
const
|
|
7
|
-
|
|
8
|
-
/**
|
|
9
|
-
* Gets worker object's name (for debugging in Chrome thread inspector window)
|
|
10
|
-
*/
|
|
11
|
-
function getWorkerName(worker) {
|
|
12
|
-
const warning = worker.version !== VERSION ? ` (worker-utils@${VERSION})` : '';
|
|
13
|
-
return `${worker.name}@${worker.version}${warning}`;
|
|
1
|
+
import { assert } from '../env-utils/assert';
|
|
2
|
+
import { VERSION as __VERSION__ } from '../env-utils/version';
|
|
3
|
+
const NPM_TAG = 'beta';
|
|
4
|
+
const VERSION = typeof "4.0.0-alpha.5" !== 'undefined' ? "4.0.0-alpha.5" : NPM_TAG;
|
|
5
|
+
export function getWorkerName(worker) {
|
|
6
|
+
const warning = worker.version !== VERSION ? " (worker-utils@".concat(VERSION, ")") : '';
|
|
7
|
+
return "".concat(worker.name, "@").concat(worker.version).concat(warning);
|
|
14
8
|
}
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
if (!url && worker.id === 'compression') {
|
|
34
|
-
url = options.workerUrl;
|
|
9
|
+
export function getWorkerURL(worker, options = {}) {
|
|
10
|
+
const workerOptions = options[worker.id] || {};
|
|
11
|
+
const workerFile = "".concat(worker.id, "-worker.js");
|
|
12
|
+
let url = workerOptions.workerUrl;
|
|
13
|
+
|
|
14
|
+
if (!url && worker.id === 'compression') {
|
|
15
|
+
url = options.workerUrl;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
if (options._workerType === 'test') {
|
|
19
|
+
url = "modules/".concat(worker.module, "/dist/").concat(workerFile);
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
if (!url) {
|
|
23
|
+
let version = worker.version;
|
|
24
|
+
|
|
25
|
+
if (version === 'latest') {
|
|
26
|
+
version = NPM_TAG;
|
|
35
27
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
// GENERATE
|
|
44
|
-
let version = worker.version;
|
|
45
|
-
// On master we need to load npm alpha releases published with the `beta` tag
|
|
46
|
-
if (version === 'latest') {
|
|
47
|
-
// throw new Error('latest worker version specified');
|
|
48
|
-
version = NPM_TAG;
|
|
49
|
-
}
|
|
50
|
-
const versionTag = version ? `@${version}` : '';
|
|
51
|
-
url = `https://unpkg.com/@loaders.gl/${worker.module}${versionTag}/dist/${workerFile}`;
|
|
52
|
-
}
|
|
53
|
-
(0, assert_1.assert)(url);
|
|
54
|
-
// Allow user to override location
|
|
55
|
-
return url;
|
|
28
|
+
|
|
29
|
+
const versionTag = version ? "@".concat(version) : '';
|
|
30
|
+
url = "https://unpkg.com/@loaders.gl/".concat(worker.module).concat(versionTag, "/dist/").concat(workerFile);
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
assert(url);
|
|
34
|
+
return url;
|
|
56
35
|
}
|
|
57
|
-
|
|
36
|
+
//# sourceMappingURL=get-worker-url.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/lib/worker-api/get-worker-url.ts"],"names":["assert","VERSION","__VERSION__","NPM_TAG","getWorkerName","worker","warning","version","name","getWorkerURL","options","workerOptions","id","workerFile","url","workerUrl","_workerType","module","versionTag"],"mappings":"AACA,SAAQA,MAAR,QAAqB,qBAArB;AACA,SAAQC,OAAO,IAAIC,WAAnB,QAAqC,sBAArC;AAEA,MAAMC,OAAO,GAAG,MAAhB;AACA,MAAMF,OAAO,GAAG,2BAAuB,WAAvB,qBAAmDE,OAAnE;AAKA,OAAO,SAASC,aAAT,CAAuBC,MAAvB,EAAqD;AAC1D,QAAMC,OAAO,GAAGD,MAAM,CAACE,OAAP,KAAmBN,OAAnB,4BAA+CA,OAA/C,SAA4D,EAA5E;AACA,mBAAUI,MAAM,CAACG,IAAjB,cAAyBH,MAAM,CAACE,OAAhC,SAA0CD,OAA1C;AACD;AASD,OAAO,SAASG,YAAT,CAAsBJ,MAAtB,EAA4CK,OAAsB,GAAG,EAArE,EAAiF;AACtF,QAAMC,aAAa,GAAGD,OAAO,CAACL,MAAM,CAACO,EAAR,CAAP,IAAsB,EAA5C;AAEA,QAAMC,UAAU,aAAMR,MAAM,CAACO,EAAb,eAAhB;AAEA,MAAIE,GAAG,GAAGH,aAAa,CAACI,SAAxB;;AAQA,MAAI,CAACD,GAAD,IAAQT,MAAM,CAACO,EAAP,KAAc,aAA1B,EAAyC;AACvCE,IAAAA,GAAG,GAAGJ,OAAO,CAACK,SAAd;AACD;;AAID,MAAIL,OAAO,CAACM,WAAR,KAAwB,MAA5B,EAAoC;AAClCF,IAAAA,GAAG,qBAAcT,MAAM,CAACY,MAArB,mBAAoCJ,UAApC,CAAH;AACD;;AAGD,MAAI,CAACC,GAAL,EAAU;AAER,QAAIP,OAAO,GAAGF,MAAM,CAACE,OAArB;;AAEA,QAAIA,OAAO,KAAK,QAAhB,EAA0B;AAExBA,MAAAA,OAAO,GAAGJ,OAAV;AACD;;AACD,UAAMe,UAAU,GAAGX,OAAO,cAAOA,OAAP,IAAmB,EAA7C;AACAO,IAAAA,GAAG,2CAAoCT,MAAM,CAACY,MAA3C,SAAoDC,UAApD,mBAAuEL,UAAvE,CAAH;AACD;;AAEDb,EAAAA,MAAM,CAACc,GAAD,CAAN;AAGA,SAAOA,GAAP;AACD","sourcesContent":["import type {WorkerObject, WorkerOptions} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {VERSION as __VERSION__} from '../env-utils/version';\n\nconst NPM_TAG = 'beta'; // Change to 'latest' on release-branch\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : NPM_TAG;\n\n/**\n * Gets worker object's name (for debugging in Chrome thread inspector window)\n */\nexport function getWorkerName(worker: WorkerObject): string {\n const warning = worker.version !== VERSION ? ` (worker-utils@${VERSION})` : '';\n return `${worker.name}@${worker.version}${warning}`;\n}\n\n/**\n * Generate a worker URL based on worker object and options\n * @returns A URL to one of the following:\n * - a published worker on unpkg CDN\n * - a local test worker\n * - a URL provided by the user in options\n */\nexport function getWorkerURL(worker: WorkerObject, options: WorkerOptions = {}): string {\n const workerOptions = options[worker.id] || {};\n\n const workerFile = `${worker.id}-worker.js`;\n\n let url = workerOptions.workerUrl;\n\n // HACK: Allow for non-nested workerUrl for the CompressionWorker.\n // For the compression worker, workerOptions is currently not nested correctly. For most loaders,\n // you'd have options within an object, i.e. `{mvt: {coordinates: ...}}` but the CompressionWorker\n // puts options at the top level, not within a `compression` key (its `id`). For this reason, the\n // above `workerOptions` will always be a string (i.e. `'gzip'`) for the CompressionWorker. To not\n // break backwards compatibility, we allow the CompressionWorker to have options at the top level.\n if (!url && worker.id === 'compression') {\n url = options.workerUrl;\n }\n\n // If URL is test, generate local loaders.gl url\n // @ts-ignore _workerType\n if (options._workerType === 'test') {\n url = `modules/${worker.module}/dist/${workerFile}`;\n }\n\n // If url override is not provided, generate a URL to published version on npm CDN unpkg.com\n if (!url) {\n // GENERATE\n let version = worker.version;\n // On master we need to load npm alpha releases published with the `beta` tag\n if (version === 'latest') {\n // throw new Error('latest worker version specified');\n version = NPM_TAG;\n }\n const versionTag = version ? `@${version}` : '';\n url = `https://unpkg.com/@loaders.gl/${worker.module}${versionTag}/dist/${workerFile}`;\n }\n\n assert(url);\n\n // Allow user to override location\n return url;\n}\n"],"file":"get-worker-url.js"}
|
|
@@ -1,79 +1,75 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
/**
|
|
11
|
-
* Determines if we can parse with worker
|
|
12
|
-
* @param loader
|
|
13
|
-
* @param data
|
|
14
|
-
* @param options
|
|
15
|
-
*/
|
|
16
|
-
function canProcessOnWorker(worker, options) {
|
|
17
|
-
if (!worker_farm_1.default.isSupported()) {
|
|
18
|
-
return false;
|
|
19
|
-
}
|
|
20
|
-
return worker.worker && options?.worker;
|
|
1
|
+
import WorkerFarm from '../worker-farm/worker-farm';
|
|
2
|
+
import { removeNontransferableOptions } from '../worker-utils/remove-nontransferable-options';
|
|
3
|
+
import { getWorkerURL, getWorkerName } from './get-worker-url';
|
|
4
|
+
export function canProcessOnWorker(worker, options) {
|
|
5
|
+
if (!WorkerFarm.isSupported()) {
|
|
6
|
+
return false;
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
return worker.worker && (options === null || options === void 0 ? void 0 : options.worker);
|
|
21
10
|
}
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
job.postMessage('process', { input: data, options: transferableOptions });
|
|
40
|
-
const result = await job.result;
|
|
41
|
-
return result.result;
|
|
11
|
+
export async function processOnWorker(worker, data, options = {}, context = {}) {
|
|
12
|
+
const name = getWorkerName(worker);
|
|
13
|
+
const url = getWorkerURL(worker, options);
|
|
14
|
+
const workerFarm = WorkerFarm.getWorkerFarm(options);
|
|
15
|
+
const workerPool = workerFarm.getWorkerPool({
|
|
16
|
+
name,
|
|
17
|
+
url
|
|
18
|
+
});
|
|
19
|
+
const jobName = options.jobName || worker.name;
|
|
20
|
+
const job = await workerPool.startJob(jobName, onMessage.bind(null, context));
|
|
21
|
+
const transferableOptions = removeNontransferableOptions(options);
|
|
22
|
+
job.postMessage('process', {
|
|
23
|
+
input: data,
|
|
24
|
+
options: transferableOptions
|
|
25
|
+
});
|
|
26
|
+
const result = await job.result;
|
|
27
|
+
return result.result;
|
|
42
28
|
}
|
|
43
|
-
|
|
44
|
-
/**
|
|
45
|
-
* Job completes when we receive the result
|
|
46
|
-
* @param job
|
|
47
|
-
* @param message
|
|
48
|
-
*/
|
|
29
|
+
|
|
49
30
|
async function onMessage(context, job, type, payload) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
31
|
+
switch (type) {
|
|
32
|
+
case 'done':
|
|
33
|
+
job.done(payload);
|
|
34
|
+
break;
|
|
35
|
+
|
|
36
|
+
case 'error':
|
|
37
|
+
job.error(new Error(payload.error));
|
|
38
|
+
break;
|
|
39
|
+
|
|
40
|
+
case 'process':
|
|
41
|
+
const {
|
|
42
|
+
id,
|
|
43
|
+
input,
|
|
44
|
+
options
|
|
45
|
+
} = payload;
|
|
46
|
+
|
|
47
|
+
try {
|
|
48
|
+
if (!context.process) {
|
|
49
|
+
job.postMessage('error', {
|
|
50
|
+
id,
|
|
51
|
+
error: 'Worker not set up to process on main thread'
|
|
52
|
+
});
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
const result = await context.process(input, options);
|
|
57
|
+
job.postMessage('done', {
|
|
58
|
+
id,
|
|
59
|
+
result
|
|
60
|
+
});
|
|
61
|
+
} catch (error) {
|
|
62
|
+
const message = error instanceof Error ? error.message : 'unknown error';
|
|
63
|
+
job.postMessage('error', {
|
|
64
|
+
id,
|
|
65
|
+
error: message
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
break;
|
|
70
|
+
|
|
71
|
+
default:
|
|
72
|
+
console.warn("process-on-worker: unknown message ".concat(type));
|
|
73
|
+
}
|
|
79
74
|
}
|
|
75
|
+
//# sourceMappingURL=process-on-worker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/lib/worker-api/process-on-worker.ts"],"names":["WorkerFarm","removeNontransferableOptions","getWorkerURL","getWorkerName","canProcessOnWorker","worker","options","isSupported","processOnWorker","data","context","name","url","workerFarm","getWorkerFarm","workerPool","getWorkerPool","jobName","job","startJob","onMessage","bind","transferableOptions","postMessage","input","result","type","payload","done","error","Error","id","process","message","console","warn"],"mappings":"AAQA,OAAOA,UAAP,MAAuB,4BAAvB;AACA,SAAQC,4BAAR,QAA2C,gDAA3C;AACA,SAAQC,YAAR,EAAsBC,aAAtB,QAA0C,kBAA1C;AAaA,OAAO,SAASC,kBAAT,CAA4BC,MAA5B,EAAkDC,OAAlD,EAA2E;AAChF,MAAI,CAACN,UAAU,CAACO,WAAX,EAAL,EAA+B;AAC7B,WAAO,KAAP;AACD;;AAED,SAAOF,MAAM,CAACA,MAAP,KAAiBC,OAAjB,aAAiBA,OAAjB,uBAAiBA,OAAO,CAAED,MAA1B,CAAP;AACD;AAOD,OAAO,eAAeG,eAAf,CACLH,MADK,EAELI,IAFK,EAGLH,OAA+B,GAAG,EAH7B,EAILI,OAAsB,GAAG,EAJpB,EAKS;AACd,QAAMC,IAAI,GAAGR,aAAa,CAACE,MAAD,CAA1B;AACA,QAAMO,GAAG,GAAGV,YAAY,CAACG,MAAD,EAASC,OAAT,CAAxB;AAEA,QAAMO,UAAU,GAAGb,UAAU,CAACc,aAAX,CAAyBR,OAAzB,CAAnB;AACA,QAAMS,UAAU,GAAGF,UAAU,CAACG,aAAX,CAAyB;AAACL,IAAAA,IAAD;AAAOC,IAAAA;AAAP,GAAzB,CAAnB;AAEA,QAAMK,OAAO,GAAGX,OAAO,CAACW,OAAR,IAAmBZ,MAAM,CAACM,IAA1C;AACA,QAAMO,GAAG,GAAG,MAAMH,UAAU,CAACI,QAAX,CAChBF,OADgB,EAGhBG,SAAS,CAACC,IAAV,CAAe,IAAf,EAAqBX,OAArB,CAHgB,CAAlB;AAOA,QAAMY,mBAAmB,GAAGrB,4BAA4B,CAACK,OAAD,CAAxD;AACAY,EAAAA,GAAG,CAACK,WAAJ,CAAgB,SAAhB,EAA2B;AAACC,IAAAA,KAAK,EAAEf,IAAR;AAAcH,IAAAA,OAAO,EAAEgB;AAAvB,GAA3B;AAEA,QAAMG,MAAM,GAAG,MAAMP,GAAG,CAACO,MAAzB;AACA,SAAOA,MAAM,CAACA,MAAd;AACD;;AAOD,eAAeL,SAAf,CACEV,OADF,EAEEQ,GAFF,EAGEQ,IAHF,EAIEC,OAJF,EAKE;AACA,UAAQD,IAAR;AACE,SAAK,MAAL;AAEER,MAAAA,GAAG,CAACU,IAAJ,CAASD,OAAT;AACA;;AAEF,SAAK,OAAL;AAEET,MAAAA,GAAG,CAACW,KAAJ,CAAU,IAAIC,KAAJ,CAAUH,OAAO,CAACE,KAAlB,CAAV;AACA;;AAEF,SAAK,SAAL;AAEE,YAAM;AAACE,QAAAA,EAAD;AAAKP,QAAAA,KAAL;AAAYlB,QAAAA;AAAZ,UAAuBqB,OAA7B;;AACA,UAAI;AACF,YAAI,CAACjB,OAAO,CAACsB,OAAb,EAAsB;AACpBd,UAAAA,GAAG,CAACK,WAAJ,CAAgB,OAAhB,EAAyB;AAACQ,YAAAA,EAAD;AAAKF,YAAAA,KAAK,EAAE;AAAZ,WAAzB;AACA;AACD;;AACD,cAAMJ,MAAM,GAAG,MAAMf,OAAO,CAACsB,OAAR,CAAgBR,KAAhB,EAAuBlB,OAAvB,CAArB;AACAY,QAAAA,GAAG,CAACK,WAAJ,CAAgB,MAAhB,EAAwB;AAACQ,UAAAA,EAAD;AAAKN,UAAAA;AAAL,SAAxB;AACD,OAPD,CAOE,OAAOI,KAAP,EAAc;AACd,cAAMI,OAAO,GAAGJ,KAAK,YAAYC,KAAjB,GAAyBD,KAAK,CAACI,OAA/B,GAAyC,eAAzD;AACAf,QAAAA,GAAG,CAACK,WAAJ,CAAgB,OAAhB,EAAyB;AAACQ,UAAAA,EAAD;AAAKF,UAAAA,KAAK,EAAEI;AAAZ,SAAzB;AACD;;AACD;;AAEF;AAEEC,MAAAA,OAAO,CAACC,IAAR,8CAAmDT,IAAnD;AA7BJ;AA+BD","sourcesContent":["import type {\n WorkerObject,\n WorkerOptions,\n WorkerContext,\n WorkerMessageType,\n WorkerMessagePayload\n} from '../../types';\nimport type WorkerJob from '../worker-farm/worker-job';\nimport WorkerFarm from '../worker-farm/worker-farm';\nimport {removeNontransferableOptions} from '../worker-utils/remove-nontransferable-options';\nimport {getWorkerURL, getWorkerName} from './get-worker-url';\n\ntype ProcessOnWorkerOptions = WorkerOptions & {\n jobName?: string;\n [key: string]: any;\n};\n\n/**\n * Determines if we can parse with worker\n * @param loader\n * @param data\n * @param options\n */\nexport function canProcessOnWorker(worker: WorkerObject, options?: WorkerOptions) {\n if (!WorkerFarm.isSupported()) {\n return false;\n }\n\n return worker.worker && options?.worker;\n}\n\n/**\n * This function expects that the worker thread sends certain messages,\n * Creating such a worker can be automated if the worker is wrapper by a call to\n * createWorker in @loaders.gl/worker-utils.\n */\nexport async function processOnWorker(\n worker: WorkerObject,\n data: any,\n options: ProcessOnWorkerOptions = {},\n context: WorkerContext = {}\n): Promise<any> {\n const name = getWorkerName(worker);\n const url = getWorkerURL(worker, options);\n\n const workerFarm = WorkerFarm.getWorkerFarm(options);\n const workerPool = workerFarm.getWorkerPool({name, url});\n\n const jobName = options.jobName || worker.name;\n const job = await workerPool.startJob(\n jobName,\n // eslint-disable-next-line\n onMessage.bind(null, context)\n );\n\n // Kick off the processing in the worker\n const transferableOptions = removeNontransferableOptions(options);\n job.postMessage('process', {input: data, options: transferableOptions});\n\n const result = await job.result;\n return result.result;\n}\n\n/**\n * Job completes when we receive the result\n * @param job\n * @param message\n */\nasync function onMessage(\n context: WorkerContext,\n job: WorkerJob,\n type: WorkerMessageType,\n payload: WorkerMessagePayload\n) {\n switch (type) {\n case 'done':\n // Worker is done\n job.done(payload);\n break;\n\n case 'error':\n // Worker encountered an error\n job.error(new Error(payload.error));\n break;\n\n case 'process':\n // Worker is asking for us (main thread) to process something\n const {id, input, options} = payload;\n try {\n if (!context.process) {\n job.postMessage('error', {id, error: 'Worker not set up to process on main thread'});\n return;\n }\n const result = await context.process(input, options);\n job.postMessage('done', {id, result});\n } catch (error) {\n const message = error instanceof Error ? error.message : 'unknown error';\n job.postMessage('error', {id, error: message});\n }\n break;\n\n default:\n // eslint-disable-next-line\n console.warn(`process-on-worker: unknown message ${type}`);\n }\n}\n"],"file":"process-on-worker.js"}
|
|
@@ -1,35 +1,21 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
function validateWorkerVersion(worker, coreVersion = version_1.VERSION) {
|
|
13
|
-
(0, assert_1.assert)(worker, 'no worker provided');
|
|
14
|
-
const workerVersion = worker.version;
|
|
15
|
-
if (!coreVersion || !workerVersion) {
|
|
16
|
-
return false;
|
|
17
|
-
}
|
|
18
|
-
// TODO enable when fix the __version__ injection
|
|
19
|
-
// const coreVersions = parseVersion(coreVersion);
|
|
20
|
-
// const workerVersions = parseVersion(workerVersion);
|
|
21
|
-
// assert(
|
|
22
|
-
// coreVersion.major === workerVersion.major && coreVersion.minor <= workerVersion.minor,
|
|
23
|
-
// `worker: ${worker.name} is not compatible. ${coreVersion.major}.${
|
|
24
|
-
// coreVersion.minor
|
|
25
|
-
// }+ is required.`
|
|
26
|
-
// );
|
|
27
|
-
return true;
|
|
1
|
+
import { assert } from '../env-utils/assert';
|
|
2
|
+
import { VERSION } from '../env-utils/version';
|
|
3
|
+
export function validateWorkerVersion(worker, coreVersion = VERSION) {
|
|
4
|
+
assert(worker, 'no worker provided');
|
|
5
|
+
const workerVersion = worker.version;
|
|
6
|
+
|
|
7
|
+
if (!coreVersion || !workerVersion) {
|
|
8
|
+
return false;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
return true;
|
|
28
12
|
}
|
|
29
|
-
|
|
30
|
-
// @ts-ignore
|
|
31
|
-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
13
|
+
|
|
32
14
|
function parseVersion(version) {
|
|
33
|
-
|
|
34
|
-
|
|
15
|
+
const parts = version.split('.').map(Number);
|
|
16
|
+
return {
|
|
17
|
+
major: parts[0],
|
|
18
|
+
minor: parts[1]
|
|
19
|
+
};
|
|
35
20
|
}
|
|
21
|
+
//# sourceMappingURL=validate-worker-version.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/lib/worker-api/validate-worker-version.ts"],"names":["assert","VERSION","validateWorkerVersion","worker","coreVersion","workerVersion","version","parseVersion","parts","split","map","Number","major","minor"],"mappings":"AACA,SAAQA,MAAR,QAAqB,qBAArB;AACA,SAAQC,OAAR,QAAsB,sBAAtB;AAQA,OAAO,SAASC,qBAAT,CACLC,MADK,EAELC,WAAmB,GAAGH,OAFjB,EAGI;AACTD,EAAAA,MAAM,CAACG,MAAD,EAAS,oBAAT,CAAN;AAEA,QAAME,aAAa,GAAGF,MAAM,CAACG,OAA7B;;AACA,MAAI,CAACF,WAAD,IAAgB,CAACC,aAArB,EAAoC;AAClC,WAAO,KAAP;AACD;;AAYD,SAAO,IAAP;AACD;;AAID,SAASE,YAAT,CAAsBD,OAAtB,EAA+B;AAC7B,QAAME,KAAK,GAAGF,OAAO,CAACG,KAAR,CAAc,GAAd,EAAmBC,GAAnB,CAAuBC,MAAvB,CAAd;AACA,SAAO;AAACC,IAAAA,KAAK,EAAEJ,KAAK,CAAC,CAAD,CAAb;AAAkBK,IAAAA,KAAK,EAAEL,KAAK,CAAC,CAAD;AAA9B,GAAP;AACD","sourcesContent":["import type {WorkerObject} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {VERSION} from '../env-utils/version';\n\n/**\n * Check if worker is compatible with this library version\n * @param worker\n * @param libVersion\n * @returns `true` if the two versions are compatible\n */\nexport function validateWorkerVersion(\n worker: WorkerObject,\n coreVersion: string = VERSION\n): boolean {\n assert(worker, 'no worker provided');\n\n const workerVersion = worker.version;\n if (!coreVersion || !workerVersion) {\n return false;\n }\n\n // TODO enable when fix the __version__ injection\n // const coreVersions = parseVersion(coreVersion);\n // const workerVersions = parseVersion(workerVersion);\n // assert(\n // coreVersion.major === workerVersion.major && coreVersion.minor <= workerVersion.minor,\n // `worker: ${worker.name} is not compatible. ${coreVersion.major}.${\n // coreVersion.minor\n // }+ is required.`\n // );\n\n return true;\n}\n\n// @ts-ignore\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nfunction parseVersion(version) {\n const parts = version.split('.').map(Number);\n return {major: parts[0], minor: parts[1]};\n}\n"],"file":"validate-worker-version.js"}
|