@atlaspack/workers 2.14.5-canary.137 → 2.14.5-canary.139

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 (51) hide show
  1. package/CHANGELOG.md +9 -0
  2. package/index.d.ts +94 -2
  3. package/lib/Handle.d.ts +19 -0
  4. package/lib/Handle.js +0 -3
  5. package/lib/Worker.d.ts +40 -0
  6. package/lib/Worker.js +7 -1
  7. package/lib/WorkerFarm.d.ts +93 -0
  8. package/lib/WorkerFarm.js +17 -7
  9. package/lib/backend.d.ts +4 -0
  10. package/lib/backend.js +5 -1
  11. package/lib/bus.d.ts +6 -0
  12. package/lib/bus.js +1 -1
  13. package/lib/child.d.ts +43 -0
  14. package/lib/child.js +11 -4
  15. package/lib/childState.d.ts +3 -0
  16. package/lib/cpuCount.d.ts +2 -0
  17. package/lib/cpuCount.js +6 -2
  18. package/lib/index.d.ts +6 -0
  19. package/lib/process/ProcessChild.d.ts +9 -0
  20. package/lib/process/ProcessChild.js +6 -1
  21. package/lib/process/ProcessWorker.d.ts +16 -0
  22. package/lib/process/ProcessWorker.js +9 -2
  23. package/lib/threads/ThreadsChild.d.ts +8 -0
  24. package/lib/threads/ThreadsChild.js +3 -0
  25. package/lib/threads/ThreadsWorker.d.ts +15 -0
  26. package/lib/threads/ThreadsWorker.js +10 -2
  27. package/lib/types.d.ts +52 -0
  28. package/lib/web/WebChild.d.ts +8 -0
  29. package/lib/web/WebChild.js +6 -1
  30. package/lib/web/WebWorker.d.ts +15 -0
  31. package/lib/web/WebWorker.js +20 -4
  32. package/package.json +15 -12
  33. package/src/{Handle.js → Handle.ts} +11 -11
  34. package/src/{Worker.js → Worker.ts} +66 -54
  35. package/src/{WorkerFarm.js → WorkerFarm.ts} +198 -141
  36. package/src/{backend.js → backend.ts} +6 -3
  37. package/src/{bus.js → bus.ts} +2 -3
  38. package/src/{child.js → child.ts} +55 -43
  39. package/src/{childState.js → childState.ts} +1 -2
  40. package/src/{cpuCount.js → cpuCount.ts} +10 -7
  41. package/src/{index.js → index.ts} +0 -1
  42. package/src/process/{ProcessChild.js → ProcessChild.ts} +5 -3
  43. package/src/process/{ProcessWorker.js → ProcessWorker.ts} +10 -7
  44. package/src/threads/{ThreadsChild.js → ThreadsChild.ts} +2 -2
  45. package/src/threads/{ThreadsWorker.js → ThreadsWorker.ts} +14 -8
  46. package/src/{types.js → types.ts} +34 -35
  47. package/src/web/{WebChild.js → WebChild.ts} +6 -2
  48. package/src/web/{WebWorker.js → WebWorker.ts} +19 -7
  49. package/test/{cpuCount.test.js → cpuCount.test.ts} +0 -1
  50. package/test/{workerfarm.test.cjs → workerfarm.test.js} +4 -2
  51. package/tsconfig.json +4 -0
package/CHANGELOG.md CHANGED
@@ -1,5 +1,14 @@
1
1
  # @atlaspack/workers
2
2
 
3
+ ## 2.14.21
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies [[`069de47`](https://github.com/atlassian-labs/atlaspack/commit/069de478e64fb5889f6f2ce023eb510782767fbd)]:
8
+ - @atlaspack/types-internal@2.16.0
9
+ - @atlaspack/profiler@2.14.18
10
+ - @atlaspack/utils@2.17.3
11
+
3
12
  ## 2.14.20
4
13
 
5
14
  ### Patch Changes
package/index.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  // eslint-disable-next-line import/no-extraneous-dependencies
2
2
  import type {FilePath} from '@atlaspack/types';
3
+ import type EventEmitter from 'events';
3
4
 
4
5
  type BackendType = 'process' | 'threads';
5
6
 
@@ -15,10 +16,101 @@ export type FarmOptions = {
15
16
  shouldTrace?: boolean;
16
17
  };
17
18
 
18
- declare class WorkerFarm {
19
- constructor(options: FarmOptions);
19
+ export class Bus extends EventEmitter {
20
+ emit(event: string, ...args: Array<any>): boolean;
21
+ }
22
+
23
+ export const bus: Bus;
20
24
 
25
+ export declare class WorkerFarm {
26
+ ending: boolean;
27
+ workerApi: {
28
+ callChild: (
29
+ childId: number,
30
+ request: HandleCallRequest,
31
+ ) => Promise<unknown>;
32
+ callMaster: (
33
+ request: CallRequest,
34
+ awaitResponse?: boolean | null | undefined,
35
+ ) => Promise<unknown>;
36
+ createReverseHandle: (fn: HandleFunction) => Handle;
37
+ getSharedReference: (ref: SharedReference) => unknown;
38
+ resolveSharedReference: (value: unknown) => undefined | SharedReference;
39
+ runHandle: (handle: Handle, args: Array<any>) => Promise<unknown>;
40
+ };
41
+ constructor(options: Partial<FarmOptions>);
42
+ createSharedReference(
43
+ value: unknown,
44
+ isCacheable?: boolean,
45
+ ): {
46
+ ref: SharedReference;
47
+ dispose(): Promise<unknown>;
48
+ };
49
+ startProfile(): Promise<void>;
50
+ endProfile(): Promise<void>;
51
+ takeHeapSnapshot(): Promise<void>;
52
+ createHandle(method: string, useMainThread?: boolean): HandleFunction;
53
+ createReverseHandle(fn: HandleFunction): Handle;
54
+ callAllWorkers(method: string, args: Array<any>): Promise<void>;
55
+ static getWorkerApi(): {
56
+ callMaster: (
57
+ request: CallRequest,
58
+ awaitResponse?: boolean | null | undefined,
59
+ ) => Promise<unknown>;
60
+ createReverseHandle: (fn: (...args: Array<any>) => unknown) => Handle;
61
+ getSharedReference: (ref: SharedReference) => unknown;
62
+ resolveSharedReference: (value: unknown) => undefined | SharedReference;
63
+ runHandle: (handle: Handle, args: Array<any>) => Promise<unknown>;
64
+ };
21
65
  end(): Promise<void>;
66
+ static isWorker(): boolean;
22
67
  }
23
68
 
24
69
  export default WorkerFarm;
70
+
71
+ export type SharedReference = number;
72
+
73
+ export type WorkerApi = {
74
+ callMaster(
75
+ arg1: CallRequest,
76
+ arg2?: boolean | null | undefined,
77
+ ): Promise<unknown>;
78
+ createReverseHandle(fn: HandleFunction): Handle;
79
+ getSharedReference(ref: SharedReference): unknown;
80
+ resolveSharedReference(value: unknown): SharedReference | null | undefined;
81
+ callChild?: (childId: number, request: HandleCallRequest) => Promise<unknown>;
82
+ };
83
+
84
+ export type HandleFunction = (...args: Array<any>) => any;
85
+
86
+ export type LocationCallRequest = {
87
+ args: ReadonlyArray<unknown>;
88
+ location: string;
89
+ method?: string;
90
+ };
91
+
92
+ export type HandleCallRequest = {
93
+ args: ReadonlyArray<unknown>;
94
+ handle: number;
95
+ };
96
+
97
+ export type CallRequest = LocationCallRequest | HandleCallRequest;
98
+
99
+ type HandleOpts = {
100
+ fn?: HandleFunction;
101
+ childId?: number | null | undefined;
102
+ id?: number;
103
+ };
104
+
105
+ export declare class Handle {
106
+ id: number;
107
+ childId: number | null | undefined;
108
+ fn: HandleFunction | null | undefined;
109
+ constructor(opts: HandleOpts);
110
+ dispose(): void;
111
+ serialize(): {
112
+ childId: number | null | undefined;
113
+ id: number;
114
+ };
115
+ static deserialize(opts: HandleOpts): Handle;
116
+ }
@@ -0,0 +1,19 @@
1
+ export type HandleFunction = (...args: Array<any>) => any;
2
+ type HandleOpts = {
3
+ fn?: HandleFunction;
4
+ childId?: number | null | undefined;
5
+ id?: number;
6
+ };
7
+ export default class Handle {
8
+ id: number;
9
+ childId: number | null | undefined;
10
+ fn: HandleFunction | null | undefined;
11
+ constructor(opts: HandleOpts);
12
+ dispose(): void;
13
+ serialize(): {
14
+ childId: number | null | undefined;
15
+ id: number;
16
+ };
17
+ static deserialize(opts: HandleOpts): Handle;
18
+ }
19
+ export {};
package/lib/Handle.js CHANGED
@@ -13,10 +13,7 @@ function _buildCache() {
13
13
  }
14
14
  var _package = _interopRequireDefault(require("../package.json"));
15
15
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
16
- // $FlowFixMe
17
16
  let HANDLE_ID = 0;
18
- // $FlowFixMe
19
-
20
17
  const handleById = new Map();
21
18
  class Handle {
22
19
  constructor(opts) {
@@ -0,0 +1,40 @@
1
+ import type { FilePath } from '@atlaspack/types-internal';
2
+ import type { BackendType, WorkerImpl, WorkerMessage } from './types';
3
+ import type { SharedReference } from './WorkerFarm';
4
+ import EventEmitter from 'events';
5
+ export type WorkerCall = {
6
+ method?: string;
7
+ handle?: number;
8
+ args: ReadonlyArray<any>;
9
+ retries: number;
10
+ skipReadyCheck?: boolean;
11
+ resolve: (result: Promise<any> | any) => void;
12
+ reject: (error?: any) => void;
13
+ };
14
+ type WorkerOpts = {
15
+ forcedKillTime: number;
16
+ backend: BackendType;
17
+ shouldPatchConsole?: boolean;
18
+ shouldTrace?: boolean;
19
+ sharedReferences: ReadonlyMap<SharedReference, unknown>;
20
+ };
21
+ export default class Worker extends EventEmitter {
22
+ readonly options: WorkerOpts;
23
+ worker: WorkerImpl;
24
+ id: number;
25
+ sentSharedReferences: Set<SharedReference>;
26
+ calls: Map<number, WorkerCall>;
27
+ exitCode: number | null | undefined;
28
+ callId: number;
29
+ ready: boolean;
30
+ stopped: boolean;
31
+ isStopping: boolean;
32
+ constructor(options: WorkerOpts);
33
+ fork(forkModule: FilePath): Promise<void>;
34
+ sendSharedReference(ref: SharedReference, value: unknown): Promise<any>;
35
+ send(data: WorkerMessage): void;
36
+ call(call: WorkerCall): void;
37
+ receive(message: WorkerMessage): void;
38
+ stop(): Promise<void>;
39
+ }
40
+ export {};
package/lib/Worker.js CHANGED
@@ -29,6 +29,8 @@ var _backend = require("./backend");
29
29
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
30
30
  let WORKER_ID = 0;
31
31
  class Worker extends _events().default {
32
+ // @ts-expect-error TS2564
33
+
32
34
  id = WORKER_ID++;
33
35
  sentSharedReferences = new Set();
34
36
  calls = new Map();
@@ -105,7 +107,9 @@ class Worker extends _events().default {
105
107
  let refsShared = new Set();
106
108
  // in case more refs are created while initial refs are sending
107
109
  while (refsShared.size < sharedRefs.size) {
108
- await Promise.all([...sharedRefs].filter(([ref]) => !refsShared.has(ref)).map(async ([ref, value]) => {
110
+ await Promise.all([...sharedRefs]
111
+ // @ts-expect-error TS2769
112
+ .filter(([ref]) => !refsShared.has(ref)).map(async ([ref, value]) => {
109
113
  await this.sendSharedReference(ref, value);
110
114
  refsShared.add(ref);
111
115
  }));
@@ -144,8 +148,10 @@ class Worker extends _events().default {
144
148
  args: call.args
145
149
  };
146
150
  if (this.ready || call.skipReadyCheck === true) {
151
+ // @ts-expect-error TS2345
147
152
  this.send(msg);
148
153
  } else {
154
+ // @ts-expect-error TS2345
149
155
  this.once('ready', () => this.send(msg));
150
156
  }
151
157
  }
@@ -0,0 +1,93 @@
1
+ import type { ErrorWithCode, FilePath } from '@atlaspack/types-internal';
2
+ import type { CallRequest, HandleCallRequest, WorkerRequest, BackendType } from './types';
3
+ import type { HandleFunction } from './Handle';
4
+ import EventEmitter from 'events';
5
+ import Worker, { WorkerCall } from './Worker';
6
+ import Handle from './Handle';
7
+ import { SamplingProfiler } from '@atlaspack/profiler';
8
+ export type SharedReference = number;
9
+ export type FarmOptions = {
10
+ maxConcurrentWorkers: number;
11
+ maxConcurrentCallsPerWorker: number;
12
+ forcedKillTime: number;
13
+ useLocalWorker: boolean;
14
+ warmWorkers: boolean;
15
+ workerPath?: FilePath;
16
+ backend: BackendType;
17
+ shouldPatchConsole?: boolean;
18
+ shouldTrace?: boolean;
19
+ };
20
+ type WorkerModule = {
21
+ readonly [key: string]: (...args: Array<unknown>) => Promise<unknown>;
22
+ };
23
+ export type WorkerApi = {
24
+ callMaster(arg1: CallRequest, arg2?: boolean | null | undefined): Promise<unknown>;
25
+ createReverseHandle(fn: HandleFunction): Handle;
26
+ getSharedReference(ref: SharedReference): unknown;
27
+ resolveSharedReference(value: unknown): SharedReference | null | undefined;
28
+ callChild?: (childId: number, request: HandleCallRequest) => Promise<unknown>;
29
+ };
30
+ export { Handle };
31
+ /**
32
+ * workerPath should always be defined inside farmOptions
33
+ */
34
+ export default class WorkerFarm extends EventEmitter {
35
+ callQueue: Array<WorkerCall>;
36
+ ending: boolean;
37
+ localWorker: WorkerModule;
38
+ localWorkerInit: Promise<undefined> | null | undefined;
39
+ options: FarmOptions;
40
+ run: HandleFunction;
41
+ warmWorkers: number;
42
+ readyWorkers: number;
43
+ workers: Map<number, Worker>;
44
+ handles: Map<number, Handle>;
45
+ sharedReferences: Map<SharedReference, unknown>;
46
+ sharedReferencesByValue: Map<unknown, SharedReference>;
47
+ serializedSharedReferences: Map<SharedReference, ArrayBuffer | null | undefined>;
48
+ profiler: SamplingProfiler | null | undefined;
49
+ constructor(farmOptions?: Partial<FarmOptions>);
50
+ workerApi: {
51
+ callChild: (childId: number, request: HandleCallRequest) => Promise<unknown>;
52
+ callMaster: (request: CallRequest, awaitResponse?: boolean | null | undefined) => Promise<unknown>;
53
+ createReverseHandle: (fn: HandleFunction) => Handle;
54
+ getSharedReference: (ref: SharedReference) => unknown;
55
+ resolveSharedReference: (value: unknown) => undefined | SharedReference;
56
+ runHandle: (handle: Handle, args: Array<any>) => Promise<unknown>;
57
+ };
58
+ warmupWorker(method: string, args: Array<any>): void;
59
+ shouldStartRemoteWorkers(): boolean;
60
+ createHandle(method: string, useMainThread?: boolean): HandleFunction;
61
+ onError(error: ErrorWithCode, worker: Worker): undefined | Promise<undefined>;
62
+ startChild(): void;
63
+ stopWorker(worker: Worker): Promise<void>;
64
+ processQueue(): void;
65
+ callWorker(worker: Worker, call: WorkerCall): Promise<void>;
66
+ processRequest(data: {
67
+ location: FilePath;
68
+ } & Partial<WorkerRequest>, worker?: Worker): Promise<string | null | undefined>;
69
+ addCall(method: string, args: Array<any>): Promise<any>;
70
+ end(): Promise<void>;
71
+ startMaxWorkers(): void;
72
+ shouldUseRemoteWorkers(): boolean;
73
+ createReverseHandle(fn: HandleFunction): Handle;
74
+ createSharedReference(value: unknown, isCacheable?: boolean): {
75
+ ref: SharedReference;
76
+ dispose(): Promise<unknown>;
77
+ };
78
+ getSerializedSharedReference(ref: SharedReference): ArrayBuffer;
79
+ startProfile(): Promise<void>;
80
+ endProfile(): Promise<void>;
81
+ callAllWorkers(method: string, args: Array<any>): Promise<void>;
82
+ takeHeapSnapshot(): Promise<void>;
83
+ static getNumWorkers(): number;
84
+ static isWorker(): boolean;
85
+ static getWorkerApi(): {
86
+ callMaster: (request: CallRequest, awaitResponse?: boolean | null | undefined) => Promise<unknown>;
87
+ createReverseHandle: (fn: (...args: Array<any>) => unknown) => Handle;
88
+ getSharedReference: (ref: SharedReference) => unknown;
89
+ resolveSharedReference: (value: unknown) => undefined | SharedReference;
90
+ runHandle: (handle: Handle, args: Array<any>) => Promise<unknown>;
91
+ };
92
+ static getConcurrentCallsPerWorker(defaultValue?: number): number;
93
+ }
package/lib/WorkerFarm.js CHANGED
@@ -108,9 +108,9 @@ class WorkerFarm extends _events().default {
108
108
  if (!this.options.workerPath) {
109
109
  throw new Error('Please provide a worker path!');
110
110
  }
111
-
112
- // $FlowFixMe
113
111
  this.localWorker = require(this.options.workerPath);
112
+
113
+ // @ts-expect-error TS2322
114
114
  this.localWorkerInit = this.localWorker.childInit != null ? this.localWorker.childInit() : null;
115
115
  this.run = this.createHandle('run');
116
116
 
@@ -127,9 +127,9 @@ class WorkerFarm extends _events().default {
127
127
  }
128
128
  workerApi = {
129
129
  callMaster: async (request, awaitResponse = true) => {
130
- // $FlowFixMe
131
130
  let result = await this.processRequest({
132
131
  ...request,
132
+ // @ts-expect-error TS2322
133
133
  awaitResponse
134
134
  });
135
135
  return (0, _buildCache().deserialize)((0, _buildCache().serialize)(result));
@@ -203,6 +203,7 @@ class WorkerFarm extends _events().default {
203
203
  onError(error, worker) {
204
204
  // Handle ipc errors
205
205
  if (error.code === 'ERR_IPC_CHANNEL_CLOSED') {
206
+ // @ts-expect-error TS2322
206
207
  return this.stopWorker(worker);
207
208
  } else {
208
209
  _logger().default.error(error, '@atlaspack/workers');
@@ -261,6 +262,7 @@ class WorkerFarm extends _events().default {
261
262
  continue;
262
263
  }
263
264
  if (worker.calls.size < this.options.maxConcurrentCallsPerWorker) {
265
+ // @ts-expect-error TS2345
264
266
  this.callWorker(worker, this.callQueue.shift());
265
267
  }
266
268
  }
@@ -287,7 +289,7 @@ class WorkerFarm extends _events().default {
287
289
  var _this$handles$get;
288
290
  mod = (0, _nullthrows().default)((_this$handles$get = this.handles.get(handleId)) === null || _this$handles$get === void 0 ? void 0 : _this$handles$get.fn);
289
291
  } else if (location) {
290
- // $FlowFixMe
292
+ // @ts-expect-error TS2339
291
293
  if (process.browser) {
292
294
  if (location === '@atlaspack/workers/bus') {
293
295
  mod = bus;
@@ -295,7 +297,6 @@ class WorkerFarm extends _events().default {
295
297
  throw new Error('No dynamic require possible: ' + location);
296
298
  }
297
299
  } else {
298
- // $FlowFixMe this must be dynamic
299
300
  mod = require(location);
300
301
  }
301
302
  } else {
@@ -316,6 +317,7 @@ class WorkerFarm extends _events().default {
316
317
  let result;
317
318
  if (method == null) {
318
319
  try {
320
+ // @ts-expect-error TS2488
319
321
  result = responseFromContent(await mod(...args));
320
322
  } catch (e) {
321
323
  result = errorResponseFromError(e);
@@ -326,7 +328,6 @@ class WorkerFarm extends _events().default {
326
328
  mod = mod.default;
327
329
  }
328
330
  try {
329
- // $FlowFixMe
330
331
  result = responseFromContent(await mod[method](...args));
331
332
  } catch (e) {
332
333
  result = errorResponseFromError(e);
@@ -435,8 +436,11 @@ class WorkerFarm extends _events().default {
435
436
  // If the reference was created with the isCacheable option set to false,
436
437
  // serializedSharedReferences will contain `null` as the value.
437
438
  if (cached !== null) {
439
+ // @ts-expect-error TS2345
438
440
  this.serializedSharedReferences.set(ref, buf);
439
441
  }
442
+
443
+ // @ts-expect-error TS2322
440
444
  return buf;
441
445
  }
442
446
  async startProfile() {
@@ -481,6 +485,7 @@ class WorkerFarm extends _events().default {
481
485
  let filename = `profile-${getTimeId()}.trace`;
482
486
  let stream = trace.pipe(_fs().default.createWriteStream(filename));
483
487
  for (let profile of profiles) {
488
+ // @ts-expect-error TS2345
484
489
  trace.addCPUProfile(names.shift(), profile);
485
490
  }
486
491
  trace.flush();
@@ -489,6 +494,7 @@ class WorkerFarm extends _events().default {
489
494
  });
490
495
  _logger().default.info({
491
496
  origin: '@atlaspack/workers',
497
+ // @ts-expect-error TS2345
492
498
  message: (0, _diagnostic().md)`Wrote profile to ${filename}`
493
499
  });
494
500
  }
@@ -523,6 +529,7 @@ class WorkerFarm extends _events().default {
523
529
  })));
524
530
  _logger().default.info({
525
531
  origin: '@atlaspack/workers',
532
+ // @ts-expect-error TS2345
526
533
  message: (0, _diagnostic().md)`Wrote heap snapshots to the following paths:\n${snapshotPaths.join('\n')}`
527
534
  });
528
535
  } catch {
@@ -543,7 +550,10 @@ class WorkerFarm extends _events().default {
543
550
  return _childState.child.workerApi;
544
551
  }
545
552
  static getConcurrentCallsPerWorker(defaultValue = DEFAULT_MAX_CONCURRENT_CALLS) {
546
- return parseInt(process.env.ATLASPACK_MAX_CONCURRENT_CALLS, 10) || defaultValue;
553
+ return (
554
+ // @ts-expect-error TS2345
555
+ parseInt(process.env.ATLASPACK_MAX_CONCURRENT_CALLS, 10) || defaultValue
556
+ );
547
557
  }
548
558
  }
549
559
  exports.default = WorkerFarm;
@@ -0,0 +1,4 @@
1
+ import type { BackendType, WorkerImpl } from './types';
2
+ export type Class<T> = new (...args: any[]) => T;
3
+ export declare function detectBackend(): BackendType;
4
+ export declare function getWorkerBackend(backend: BackendType): Class<WorkerImpl>;
package/lib/backend.js CHANGED
@@ -5,8 +5,12 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.detectBackend = detectBackend;
7
7
  exports.getWorkerBackend = getWorkerBackend;
8
+ // flow-to-ts helpers
9
+
10
+ // /flow-to-ts helpers
11
+
8
12
  function detectBackend() {
9
- // $FlowFixMe
13
+ // @ts-expect-error TS2339
10
14
  if (process.browser) return 'web';
11
15
  switch (process.env.ATLASPACK_WORKER_BACKEND) {
12
16
  case 'threads':
package/lib/bus.d.ts ADDED
@@ -0,0 +1,6 @@
1
+ import EventEmitter from 'events';
2
+ declare class Bus extends EventEmitter {
3
+ emit(event: string, ...args: Array<any>): boolean;
4
+ }
5
+ declare const _default: Bus;
6
+ export default _default;
package/lib/bus.js CHANGED
@@ -17,7 +17,7 @@ class Bus extends _events().default {
17
17
  emit(event, ...args) {
18
18
  if (_childState.child) {
19
19
  _childState.child.workerApi.callMaster({
20
- // $FlowFixMe
20
+ // @ts-expect-error TS2339
21
21
  location: process.browser ? '@atlaspack/workers/bus' : __filename,
22
22
  method: 'emit',
23
23
  args: [event, ...args]
package/lib/child.d.ts ADDED
@@ -0,0 +1,43 @@
1
+ import type { CallRequest, WorkerMessage, WorkerRequest, WorkerResponse, ChildImpl } from './types';
2
+ import type { Async, IDisposable } from '@atlaspack/types-internal';
3
+ import type { SharedReference } from './WorkerFarm';
4
+ import { SamplingProfiler } from '@atlaspack/profiler';
5
+ export type Class<T> = new (...args: any[]) => T;
6
+ type ChildCall = WorkerRequest & {
7
+ resolve: (result: Promise<any> | any) => void;
8
+ reject: (error?: any) => void;
9
+ };
10
+ export declare class Child {
11
+ callQueue: Array<ChildCall>;
12
+ childId: number | null | undefined;
13
+ maxConcurrentCalls: number;
14
+ module: any | null | undefined;
15
+ responseId: number;
16
+ responseQueue: Map<number, ChildCall>;
17
+ loggerDisposable: IDisposable;
18
+ tracerDisposable: IDisposable;
19
+ child: ChildImpl;
20
+ profiler: SamplingProfiler | null | undefined;
21
+ handles: Map<number, Handle>;
22
+ sharedReferences: Map<SharedReference, unknown>;
23
+ sharedReferencesByValue: Map<unknown, SharedReference>;
24
+ constructor(ChildBackend: Class<ChildImpl>);
25
+ workerApi: {
26
+ callMaster: (request: CallRequest, awaitResponse?: boolean | null | undefined) => Promise<unknown>;
27
+ createReverseHandle: (fn: (...args: Array<any>) => unknown) => Handle;
28
+ getSharedReference: (ref: SharedReference) => unknown;
29
+ resolveSharedReference: (value: unknown) => undefined | SharedReference;
30
+ runHandle: (handle: Handle, args: Array<any>) => Promise<unknown>;
31
+ };
32
+ messageListener(message: WorkerMessage): Async<void>;
33
+ send(data: WorkerMessage): void;
34
+ childInit(module: string, childId: number): Promise<void>;
35
+ handleRequest(data: WorkerRequest): Promise<void>;
36
+ handleResponse(data: WorkerResponse): void;
37
+ addCall(request: CallRequest, awaitResponse?: boolean | null): Promise<unknown>;
38
+ sendRequest(call: ChildCall): void;
39
+ processQueue(): void;
40
+ handleEnd(): void;
41
+ createReverseHandle(fn: (...args: Array<any>) => unknown): Handle;
42
+ }
43
+ export {};
package/lib/child.js CHANGED
@@ -51,6 +51,9 @@ var _Handle2 = _interopRequireDefault(require("./Handle"));
51
51
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
52
52
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
53
53
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
54
+ // flow-to-ts helpers
55
+
56
+ // /flow-to-ts helpers
54
57
  // The import of './Handle' should really be imported eagerly (with @babel/plugin-transform-modules-commonjs's lazy mode).
55
58
  const Handle = _Handle2.default;
56
59
  class Child {
@@ -58,6 +61,7 @@ class Child {
58
61
  maxConcurrentCalls = 10;
59
62
  responseId = 0;
60
63
  responseQueue = new Map();
64
+ // @ts-expect-error TS2749
61
65
  handles = new Map();
62
66
  sharedReferences = new Map();
63
67
  sharedReferencesByValue = new Map();
@@ -78,7 +82,9 @@ class Child {
78
82
  }
79
83
  workerApi = {
80
84
  callMaster: (request, awaitResponse = true) => this.addCall(request, awaitResponse),
85
+ // @ts-expect-error TS2749
81
86
  createReverseHandle: fn => this.createReverseHandle(fn),
87
+ // @ts-expect-error TS2749
82
88
  runHandle: (handle, args) => this.workerApi.callMaster({
83
89
  handle: handle.id,
84
90
  args
@@ -97,7 +103,6 @@ class Child {
97
103
  this.child.send(data);
98
104
  }
99
105
  async childInit(module, childId) {
100
- // $FlowFixMe
101
106
  this.module = require(module);
102
107
  this.childId = childId;
103
108
  if (this.module.childInit != null) {
@@ -189,7 +194,7 @@ class Child {
189
194
  } else {
190
195
  try {
191
196
  result = responseFromContent(
192
- // $FlowFixMe
197
+ // @ts-expect-error TS2538
193
198
  await this.module[method](this.workerApi, ...args));
194
199
  } catch (e) {
195
200
  result = errorResponseFromError(e);
@@ -222,12 +227,11 @@ class Child {
222
227
 
223
228
  // Keep in mind to make sure responses to these calls are JSON.Stringify safe
224
229
  addCall(request, awaitResponse = true) {
225
- // $FlowFixMe
226
230
  let call = {
227
231
  ...request,
228
232
  type: 'request',
229
233
  child: this.childId,
230
- // $FlowFixMe Added in Flow 0.121.0 upgrade in #4381
234
+ // @ts-expect-error TS2322
231
235
  awaitResponse,
232
236
  resolve: () => {},
233
237
  reject: () => {}
@@ -265,6 +269,7 @@ class Child {
265
269
  return;
266
270
  }
267
271
  if (this.responseQueue.size < this.maxConcurrentCalls) {
272
+ // @ts-expect-error TS2345
268
273
  this.sendRequest(this.callQueue.shift());
269
274
  }
270
275
  }
@@ -272,6 +277,8 @@ class Child {
272
277
  this.loggerDisposable.dispose();
273
278
  this.tracerDisposable.dispose();
274
279
  }
280
+
281
+ // @ts-expect-error TS2749
275
282
  createReverseHandle(fn) {
276
283
  let handle = new Handle({
277
284
  fn,
@@ -0,0 +1,3 @@
1
+ import type { Child } from './child';
2
+ export declare let child: Child | null | undefined;
3
+ export declare function setChild(c: Child): void;
@@ -0,0 +1,2 @@
1
+ export declare function detectRealCores(): number;
2
+ export default function getCores(bypassCache?: boolean): number;
package/lib/cpuCount.js CHANGED
@@ -50,18 +50,22 @@ function detectRealCores() {
50
50
  }
51
51
  return amount;
52
52
  }
53
+
54
+ // @ts-expect-error TS7034
53
55
  let cores;
54
56
  function getCores(bypassCache = false) {
55
57
  // Do not re-run commands if we already have the count...
58
+ // @ts-expect-error TS7005
56
59
  if (cores && !bypassCache) {
57
60
  return cores;
58
61
  }
59
62
 
60
- // $FlowFixMe
63
+ // @ts-expect-error TS2339
61
64
  if (process.browser) {
62
- // eslint-disable-next-line no-undef
63
65
  cores = navigator.hardwareConcurrency / 2;
64
66
  }
67
+
68
+ // @ts-expect-error TS7005
65
69
  if (!cores) {
66
70
  try {
67
71
  cores = detectRealCores();
package/lib/index.d.ts ADDED
@@ -0,0 +1,6 @@
1
+ import WorkerFarm from './WorkerFarm';
2
+ import bus from './bus';
3
+ export default WorkerFarm;
4
+ export { bus };
5
+ export { Handle } from './WorkerFarm';
6
+ export type { WorkerApi, FarmOptions, SharedReference } from './WorkerFarm';
@@ -0,0 +1,9 @@
1
+ import type { ChildImpl, MessageHandler, ExitHandler, WorkerMessage } from '../types';
2
+ export default class ProcessChild implements ChildImpl {
3
+ onMessage: MessageHandler;
4
+ onExit: ExitHandler;
5
+ constructor(onMessage: MessageHandler, onExit: ExitHandler);
6
+ handleMessage(data: string): void;
7
+ send(data: WorkerMessage): void;
8
+ stop(): void;
9
+ }