@parcel/workers 2.0.0-nightly.150 → 2.0.0-nightly.1500

package/src/Handle.js

@@ -1,20 +1,16 @@
-// @flow
-
-import type {WorkerApi} from './';
-
+// @flow strict-local
 import {registerSerializableClass} from '@parcel/core';
-
-import {child} from './childState';
+// $FlowFixMe
 import packageJson from '../package.json';
 
 let HANDLE_ID = 0;
-
+// $FlowFixMe
 export type HandleFunction = (...args: Array<any>) => any;
 
 type HandleOpts = {|
-  fn: HandleFunction,
+  fn?: HandleFunction,
   childId?: ?number,
-  workerApi: WorkerApi,
+  id?: number,
 |};
 
 const handleById: Map<number, Handle> = new Map();
@@ -22,14 +18,12 @@ const handleById: Map<number, Handle> = new Map();
 export default class Handle {
   id: number;
   childId: ?number;
-  fn: HandleFunction;
-  workerApi: WorkerApi;
+  fn: ?HandleFunction;
 
   constructor(opts: HandleOpts) {
-    this.id = ++HANDLE_ID;
+    this.id = opts.id ?? ++HANDLE_ID;
     this.fn = opts.fn;
     this.childId = opts.childId;
-    this.workerApi = opts.workerApi;
     handleById.set(this.id, this);
   }
 
@@ -37,38 +31,15 @@ export default class Handle {
     handleById.delete(this.id);
   }
 
-  serialize() {
+  serialize(): {|childId: ?number, id: number|} {
     return {
       id: this.id,
       childId: this.childId,
     };
   }
 
-  static deserialize(opts: {|id: number, childId?: number|}) {
-    return function(...args: Array<mixed>) {
-      let workerApi;
-      if (child) {
-        workerApi = child.workerApi;
-      } else {
-        let handle = handleById.get(opts.id);
-        if (!handle) {
-          throw new Error(
-            'Corresponding Handle was not found. It may have been disposed.',
-          );
-        }
-        workerApi = handle.workerApi;
-      }
-
-      if (opts.childId != null && child) {
-        throw new Error('Cannot call another child from a child');
-      }
-
-      if (opts.childId != null && workerApi.callChild) {
-        return workerApi.callChild(opts.childId, {handle: opts.id, args});
-      }
-
-      return workerApi.callMaster({handle: opts.id, args}, true);
-    };
+  static deserialize(opts: HandleOpts): Handle {
+    return new Handle(opts);
   }
 }
 

package/src/Worker.js

@@ -1,8 +1,10 @@
 // @flow
 
 import type {FilePath} from '@parcel/types';
-import type {WorkerMessage, WorkerImpl, BackendType} from './types';
+import type {BackendType, WorkerImpl, WorkerMessage} from './types';
+import type {SharedReference} from './WorkerFarm';
 
+import nullthrows from 'nullthrows';
 import EventEmitter from 'events';
 import ThrowableDiagnostic from '@parcel/diagnostic';
 import {getWorkerBackend} from './backend';
@@ -12,6 +14,7 @@ export type WorkerCall = {|
   handle?: number,
   args: $ReadOnlyArray<any>,
   retries: number,
+  skipReadyCheck?: boolean,
   resolve: (result: Promise<any> | any) => void,
   reject: (error: any) => void,
 |};
@@ -19,7 +22,9 @@ export type WorkerCall = {|
 type WorkerOpts = {|
   forcedKillTime: number,
   backend: BackendType,
-  patchConsole?: boolean,
+  shouldPatchConsole?: boolean,
+  shouldTrace?: boolean,
+  sharedReferences: $ReadOnlyMap<SharedReference, mixed>,
 |};
 
 let WORKER_ID = 0;
@@ -27,14 +32,15 @@ export default class Worker extends EventEmitter {
   +options: WorkerOpts;
   worker: WorkerImpl;
   id: number = WORKER_ID++;
+  sentSharedReferences: Set<SharedReference> = new Set();
 
   calls: Map<number, WorkerCall> = new Map();
-  exitCode = null;
-  callId = 0;
+  exitCode: ?number = null;
+  callId: number = 0;
 
-  ready = false;
-  stopped = false;
-  isStopping = false;
+  ready: boolean = false;
+  stopped: boolean = false;
+  isStopping: boolean = false;
 
   constructor(options: WorkerOpts) {
     super();
@@ -42,18 +48,49 @@ export default class Worker extends EventEmitter {
   }
 
   async fork(forkModule: FilePath) {
-    let filteredArgs = process.execArgv.filter(
-      v => !/^--(debug|inspect)/.test(v),
-    );
-
-    for (let i = 0; i < filteredArgs.length; i++) {
-      let arg = filteredArgs[i];
-      if (
-        (arg === '-r' || arg === '--require') &&
-        filteredArgs[i + 1] === '@parcel/register'
-      ) {
-        filteredArgs.splice(i, 2);
-        i--;
+    let filteredArgs = [];
+    if (process.execArgv) {
+      filteredArgs = process.execArgv.filter(
+        v =>
+          !/^--(debug|inspect|no-opt|max-old-space-size=|max-semi-space-size=|expose-gc)/.test(
+            v,
+          ),
+      );
+
+      for (let i = 0; i < filteredArgs.length; i++) {
+        let arg = filteredArgs[i];
+        let isArgWithParam =
+          ((arg === '-r' || arg === '--require') &&
+            filteredArgs[i + 1] === '@parcel/register') ||
+          arg === '--title';
+        if (isArgWithParam) {
+          filteredArgs.splice(i, 2);
+          i--;
+        }
+      }
+    }
+
+    // Workaround for https://github.com/nodejs/node/issues/29117
+    if (process.env.NODE_OPTIONS) {
+      // arg parsing logic adapted from https://stackoverflow.com/a/46946420/2352201
+      let opts = [''];
+      let quote = false;
+      for (let c of nullthrows(process.env.NODE_OPTIONS.match(/.|^$/g))) {
+        if (c === '"') {
+          quote = !quote;
+        } else if (!quote && c === ' ') {
+          opts.push('');
+        } else {
+          opts[opts.length - 1] += c.replace(/\\(.)/, '$1');
+        }
+      }
+
+      for (let i = 0; i < opts.length; i++) {
+        let opt = opts[i];
+        if (opt === '-r' || opt === '--require') {
+          filteredArgs.push(opt, opts[i + 1]);
+          i++;
+        }
       }
     }
 
@@ -77,19 +114,49 @@ export default class Worker extends EventEmitter {
         args: [
           forkModule,
           {
-            patchConsole: !!this.options.patchConsole,
+            shouldPatchConsole: !!this.options.shouldPatchConsole,
+            shouldTrace: !!this.options.shouldTrace,
           },
         ],
         retries: 0,
+        skipReadyCheck: true,
         resolve,
         reject,
       });
     });
 
+    let sharedRefs = this.options.sharedReferences;
+    let refsShared = new Set();
+    // in case more refs are created while initial refs are sending
+    while (refsShared.size < sharedRefs.size) {
+      await Promise.all(
+        [...sharedRefs]
+          .filter(([ref]) => !refsShared.has(ref))
+          .map(async ([ref, value]) => {
+            await this.sendSharedReference(ref, value);
+            refsShared.add(ref);
+          }),
+      );
+    }
+
     this.ready = true;
     this.emit('ready');
   }
 
+  sendSharedReference(ref: SharedReference, value: mixed): Promise<any> {
+    this.sentSharedReferences.add(ref);
+    return new Promise((resolve, reject) => {
+      this.call({
+        method: 'createSharedReference',
+        args: [ref, value],
+        resolve,
+        reject,
+        retries: 0,
+        skipReadyCheck: true,
+      });
+    });
+  }
+
   send(data: WorkerMessage): void {
     this.worker.send(data);
   }
@@ -102,14 +169,20 @@ export default class Worker extends EventEmitter {
     let idx = this.callId++;
     this.calls.set(idx, call);
 
-    this.send({
+    let msg = {
       type: 'request',
       idx: idx,
       child: this.id,
       handle: call.handle,
       method: call.method,
       args: call.args,
-    });
+    };
+
+    if (this.ready || call.skipReadyCheck === true) {
+      this.send(msg);
+    } else {
+      this.once('ready', () => this.send(msg));
+    }
   }
 
   receive(message: WorkerMessage): void {