@parcel/workers 2.0.0-nightly.146 → 2.0.0-nightly.1470

package/index.d.ts

@@ -0,0 +1,23 @@
+import {FilePath} from '@parcel/types';
+
+type BackendType = 'process' | 'threads';
+
+export type FarmOptions = {
+  maxConcurrentWorkers: number;
+  maxConcurrentCallsPerWorker: number;
+  forcedKillTime: number;
+  useLocalWorker: boolean;
+  warmWorkers: boolean;
+  workerPath?: FilePath;
+  backend: BackendType;
+  shouldPatchConsole?: boolean;
+  shouldTrace?: boolean;
+};
+
+declare class WorkerFarm {
+  constructor(options: FarmOptions);
+
+  end(): Promise<void>;
+}
+
+export default WorkerFarm;

package/lib/Handle.js

@@ -4,85 +4,43 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
-var _core = require("@parcel/core");
-
-var _childState = require("./childState");
-
+function _core() {
+  const data = require("@parcel/core");
+  _core = function () {
+    return data;
+  };
+  return data;
+}
 var _package = _interopRequireDefault(require("../package.json"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+// $FlowFixMe
 let HANDLE_ID = 0;
-const handleById = new Map();
+// $FlowFixMe
 
+const handleById = new Map();
 class Handle {
   constructor(opts) {
-    _defineProperty(this, "id", void 0);
-
-    _defineProperty(this, "childId", void 0);
-
-    _defineProperty(this, "fn", void 0);
-
-    _defineProperty(this, "workerApi", void 0);
-
-    this.id = ++HANDLE_ID;
+    var _opts$id;
+    this.id = (_opts$id = opts.id) !== null && _opts$id !== void 0 ? _opts$id : ++HANDLE_ID;
     this.fn = opts.fn;
     this.childId = opts.childId;
-    this.workerApi = opts.workerApi;
     handleById.set(this.id, this);
   }
-
   dispose() {
     handleById.delete(this.id);
   }
-
   serialize() {
     return {
       id: this.id,
       childId: this.childId
     };
   }
-
   static deserialize(opts) {
-    return function (...args) {
-      let workerApi;
-
-      if (_childState.child) {
-        workerApi = _childState.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 && _childState.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);
-    };
+    return new Handle(opts);
   }
+}
 
-} // Register the Handle as a serializable class so that it will properly be deserialized
+// Register the Handle as a serializable class so that it will properly be deserialized
 // by anything that uses WorkerFarm.
-
-
 exports.default = Handle;
-(0, _core.registerSerializableClass)(`${_package.default.version}:Handle`, Handle);
+(0, _core().registerSerializableClass)(`${_package.default.version}:Handle`, Handle);

package/lib/Worker.js

@@ -4,144 +4,185 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
-var _events = _interopRequireDefault(require("events"));
-
-var _diagnostic = _interopRequireDefault(require("@parcel/diagnostic"));
-
+function _nullthrows() {
+  const data = _interopRequireDefault(require("nullthrows"));
+  _nullthrows = function () {
+    return data;
+  };
+  return data;
+}
+function _events() {
+  const data = _interopRequireDefault(require("events"));
+  _events = function () {
+    return data;
+  };
+  return data;
+}
+function _diagnostic() {
+  const data = _interopRequireDefault(require("@parcel/diagnostic"));
+  _diagnostic = function () {
+    return data;
+  };
+  return data;
+}
 var _backend = require("./backend");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 let WORKER_ID = 0;
-
-class Worker extends _events.default {
+class Worker extends _events().default {
+  id = WORKER_ID++;
+  sentSharedReferences = new Set();
+  calls = new Map();
+  exitCode = null;
+  callId = 0;
+  ready = false;
+  stopped = false;
+  isStopping = false;
   constructor(options) {
     super();
-
-    _defineProperty(this, "options", void 0);
-
-    _defineProperty(this, "worker", void 0);
-
-    _defineProperty(this, "id", WORKER_ID++);
-
-    _defineProperty(this, "calls", new Map());
-
-    _defineProperty(this, "exitCode", null);
-
-    _defineProperty(this, "callId", 0);
-
-    _defineProperty(this, "ready", false);
-
-    _defineProperty(this, "stopped", false);
-
-    _defineProperty(this, "isStopping", false);
-
     this.options = options;
   }
-
   async fork(forkModule) {
-    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--;
+        }
       }
     }
 
-    let WorkerBackend = (0, _backend.getWorkerBackend)(this.options.backend);
-    this.worker = new WorkerBackend(filteredArgs, data => this.receive(data), err => {
-      this.emit('error', err);
-    }, code => {
+    // 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 (0, _nullthrows().default)(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++;
+        }
+      }
+    }
+    let onMessage = data => this.receive(data);
+    let onExit = code => {
       this.exitCode = code;
       this.emit('exit', code);
-    });
+    };
+    let onError = err => {
+      this.emit('error', err);
+    };
+    let WorkerBackend = (0, _backend.getWorkerBackend)(this.options.backend);
+    this.worker = new WorkerBackend(filteredArgs, onMessage, onError, onExit);
     await this.worker.start();
     await new Promise((resolve, reject) => {
       this.call({
         method: 'childInit',
         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, value) {
+    this.sentSharedReferences.add(ref);
+    return new Promise((resolve, reject) => {
+      this.call({
+        method: 'createSharedReference',
+        args: [ref, value],
+        resolve,
+        reject,
+        retries: 0,
+        skipReadyCheck: true
+      });
+    });
+  }
   send(data) {
     this.worker.send(data);
   }
-
   call(call) {
     if (this.stopped || this.isStopping) {
       return;
     }
-
     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) {
     if (this.stopped || this.isStopping) {
       return;
     }
-
     if (message.type === 'request') {
       this.emit('request', message);
     } else if (message.type === 'response') {
       let idx = message.idx;
-
       if (idx == null) {
         return;
       }
-
       let call = this.calls.get(idx);
-
       if (!call) {
         // Return for unknown calls, these might accur if a third party process uses workers
         return;
       }
-
       if (message.contentType === 'error') {
-        call.reject(new _diagnostic.default({
+        call.reject(new (_diagnostic().default)({
           diagnostic: message.content
         }));
       } else {
         call.resolve(message.content);
       }
-
       this.calls.delete(idx);
       this.emit('response', message);
     }
   }
-
   async stop() {
     if (!this.stopped) {
       this.stopped = true;
-
       if (this.worker) {
         await this.worker.stop();
       }
     }
   }
-
 }
-
 exports.default = Worker;