@parcel/workers 2.0.0-nightly.1298 → 2.0.0-nightly.1303

package/index.d.ts

@@ -3,14 +3,15 @@ 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,
+  maxConcurrentWorkers: number;
+  maxConcurrentCallsPerWorker: number;
+  forcedKillTime: number;
+  useLocalWorker: boolean;
+  warmWorkers: boolean;
+  workerPath?: FilePath;
+  backend: BackendType;
+  shouldPatchConsole?: boolean;
+  shouldTrace?: boolean;
 };
 
 declare class WorkerFarm {
@@ -19,4 +20,4 @@ declare class WorkerFarm {
   end(): Promise<void>;
 }
 
-export default WorkerFarm; 
+export default WorkerFarm;

package/lib/Worker.js

@@ -107,7 +107,8 @@ class Worker extends _events().default {
       this.call({
         method: 'childInit',
         args: [forkModule, {
-          shouldPatchConsole: !!this.options.shouldPatchConsole
+          shouldPatchConsole: !!this.options.shouldPatchConsole,
+          shouldTrace: !!this.options.shouldTrace
         }],
         retries: 0,
         skipReadyCheck: true,

package/lib/WorkerFarm.js

@@ -71,9 +71,15 @@ var _childState = require("./childState");
 
 var _backend = require("./backend");
 
-var _Profiler = _interopRequireDefault(require("./Profiler"));
+function _profiler() {
+  const data = require("@parcel/profiler");
 
-var _Trace = _interopRequireDefault(require("./Trace"));
+  _profiler = function () {
+    return data;
+  };
+
+  return data;
+}
 
 function _fs() {
   const data = _interopRequireDefault(require("fs"));
@@ -247,6 +253,7 @@ class WorkerFarm extends _events().default {
       forcedKillTime: this.options.forcedKillTime,
       backend: this.options.backend,
       shouldPatchConsole: this.options.shouldPatchConsole,
+      shouldTrace: this.options.shouldTrace,
       sharedReferences: this.sharedReferences
     });
     worker.fork((0, _nullthrows().default)(this.options.workerPath));
@@ -512,7 +519,7 @@ class WorkerFarm extends _events().default {
       }));
     }
 
-    this.profiler = new _Profiler.default();
+    this.profiler = new (_profiler().SamplingProfiler)();
     promises.push(this.profiler.startProfiling());
     await Promise.all(promises);
   }
@@ -540,7 +547,7 @@ class WorkerFarm extends _events().default {
     }
 
     var profiles = await Promise.all(promises);
-    let trace = new _Trace.default();
+    let trace = new (_profiler().Trace)();
     let filename = `profile-${getTimeId()}.trace`;
     let stream = trace.pipe(_fs().default.createWriteStream(filename));
 

package/lib/child.js

@@ -57,7 +57,15 @@ function _core() {
 
 var _bus = _interopRequireDefault(require("./bus"));
 
-var _Profiler = _interopRequireDefault(require("./Profiler"));
+function _profiler() {
+  const data = require("@parcel/profiler");
+
+  _profiler = function () {
+    return data;
+  };
+
+  return data;
+}
 
 var _Handle2 = _interopRequireDefault(require("./Handle"));
 
@@ -87,6 +95,10 @@ class Child {
 
     this.loggerDisposable = _logger().default.onLog(event => {
       _bus.default.emit('logEvent', event);
+    }); // .. and do the same for trace events
+
+    this.tracerDisposable = _profiler().tracer.onTrace(event => {
+      _bus.default.emit('traceEvent', event);
     });
   }
 
@@ -169,12 +181,16 @@ class Child {
           (0, _logger().unpatchConsole)();
         }
 
+        if (childOptions.shouldTrace) {
+          _profiler().tracer.enable();
+        }
+
         result = responseFromContent(await this.childInit(moduleName, child));
       } catch (e) {
         result = errorResponseFromError(e);
       }
     } else if (method === 'startProfile') {
-      this.profiler = new _Profiler.default();
+      this.profiler = new (_profiler().SamplingProfiler)();
 
       try {
         result = responseFromContent(await this.profiler.startProfiling());
@@ -305,6 +321,7 @@ class Child {
 
   handleEnd() {
     this.loggerDisposable.dispose();
+    this.tracerDisposable.dispose();
   }
 
   createReverseHandle(fn) {

package/lib/index.js

@@ -41,6 +41,16 @@ function _logger() {
 
 var _bus = _interopRequireDefault(require("./bus"));
 
+function _profiler() {
+  const data = require("@parcel/profiler");
+
+  _profiler = function () {
+    return data;
+  };
+
+  return data;
+}
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -81,6 +91,11 @@ if (!_WorkerFarm.default.isWorker()) {
       default:
         throw new Error('Unknown log level');
     }
+  }); // Forward all trace events originating from workers into the main process
+
+
+  _bus.default.on('traceEvent', e => {
+    _profiler().tracer.trace(e);
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/workers",
-  "version": "2.0.0-nightly.1298+eb76826da",
+  "version": "2.0.0-nightly.1303+cd4336412",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "MIT",
   "publishConfig": {
@@ -21,20 +21,20 @@
     "node": ">= 12.0.0"
   },
   "dependencies": {
-    "@parcel/diagnostic": "2.0.0-nightly.1298+eb76826da",
-    "@parcel/logger": "2.0.0-nightly.1298+eb76826da",
-    "@parcel/types": "2.0.0-nightly.1298+eb76826da",
-    "@parcel/utils": "2.0.0-nightly.1298+eb76826da",
-    "chrome-trace-event": "^1.0.2",
+    "@parcel/diagnostic": "2.0.0-nightly.1303+cd4336412",
+    "@parcel/logger": "2.0.0-nightly.1303+cd4336412",
+    "@parcel/profiler": "2.8.4-nightly.2926+cd4336412",
+    "@parcel/types": "2.0.0-nightly.1303+cd4336412",
+    "@parcel/utils": "2.0.0-nightly.1303+cd4336412",
     "nullthrows": "^1.1.1"
   },
   "peerDependencies": {
-    "@parcel/core": "2.0.0-nightly.1296+eb76826da"
+    "@parcel/core": "2.0.0-nightly.1301+cd4336412"
   },
   "browser": {
     "./src/cpuCount.js": false,
     "./src/process/ProcessWorker.js": false,
     "./src/threads/ThreadsWorker.js": false
   },
-  "gitHead": "eb76826da305db1e5668bb9b0c1cb5dbe0951a4c"
+  "gitHead": "cd4336412242b6d6da40ef6cba8e7ac99c72b090"
 }

package/src/Worker.js

@@ -23,6 +23,7 @@ type WorkerOpts = {|
   forcedKillTime: number,
   backend: BackendType,
   shouldPatchConsole?: boolean,
+  shouldTrace?: boolean,
   sharedReferences: $ReadOnlyMap<SharedReference, mixed>,
 |};
 
@@ -108,6 +109,7 @@ export default class Worker extends EventEmitter {
           forkModule,
           {
             shouldPatchConsole: !!this.options.shouldPatchConsole,
+            shouldTrace: !!this.options.shouldTrace,
           },
         ],
         retries: 0,

package/src/WorkerFarm.js

@@ -26,8 +26,7 @@ import cpuCount from './cpuCount';
 import Handle from './Handle';
 import {child} from './childState';
 import {detectBackend} from './backend';
-import Profiler from './Profiler';
-import Trace from './Trace';
+import {SamplingProfiler, Trace} from '@parcel/profiler';
 import fs from 'fs';
 import logger from '@parcel/logger';
 
@@ -44,6 +43,7 @@ export type FarmOptions = {|
   workerPath?: FilePath,
   backend: BackendType,
   shouldPatchConsole?: boolean,
+  shouldTrace?: boolean,
 |};
 
 type WorkerModule = {|
@@ -77,7 +77,7 @@ export default class WorkerFarm extends EventEmitter {
   sharedReferences: Map<SharedReference, mixed> = new Map();
   sharedReferencesByValue: Map<mixed, SharedReference> = new Map();
   serializedSharedReferences: Map<SharedReference, ?ArrayBuffer> = new Map();
-  profiler: ?Profiler;
+  profiler: ?SamplingProfiler;
 
   constructor(farmOptions: $Shape<FarmOptions> = {}) {
     super();
@@ -239,6 +239,7 @@ export default class WorkerFarm extends EventEmitter {
       forcedKillTime: this.options.forcedKillTime,
       backend: this.options.backend,
       shouldPatchConsole: this.options.shouldPatchConsole,
+      shouldTrace: this.options.shouldTrace,
       sharedReferences: this.sharedReferences,
     });
 
@@ -516,7 +517,7 @@ export default class WorkerFarm extends EventEmitter {
       );
     }
 
-    this.profiler = new Profiler();
+    this.profiler = new SamplingProfiler();
 
     promises.push(this.profiler.startProfiling());
     await Promise.all(promises);

package/src/child.js

@@ -18,7 +18,7 @@ import Logger, {patchConsole, unpatchConsole} from '@parcel/logger';
 import ThrowableDiagnostic, {anyToDiagnostic} from '@parcel/diagnostic';
 import {deserialize} from '@parcel/core';
 import bus from './bus';
-import Profiler from './Profiler';
+import {SamplingProfiler, tracer} from '@parcel/profiler';
 import _Handle from './Handle';
 
 // The import of './Handle' should really be imported eagerly (with @babel/plugin-transform-modules-commonjs's lazy mode).
@@ -37,8 +37,9 @@ export class Child {
   responseId: number = 0;
   responseQueue: Map<number, ChildCall> = new Map();
   loggerDisposable: IDisposable;
+  tracerDisposable: IDisposable;
   child: ChildImpl;
-  profiler: ?Profiler;
+  profiler: ?SamplingProfiler;
   handles: Map<number, Handle> = new Map();
   sharedReferences: Map<SharedReference, mixed> = new Map();
   sharedReferencesByValue: Map<mixed, SharedReference> = new Map();
@@ -56,6 +57,10 @@ export class Child {
     this.loggerDisposable = Logger.onLog(event => {
       bus.emit('logEvent', event);
     });
+    // .. and do the same for trace events
+    this.tracerDisposable = tracer.onTrace(event => {
+      bus.emit('traceEvent', event);
+    });
   }
 
   workerApi: {|
@@ -141,12 +146,16 @@ export class Child {
           unpatchConsole();
         }
 
+        if (childOptions.shouldTrace) {
+          tracer.enable();
+        }
+
         result = responseFromContent(await this.childInit(moduleName, child));
       } catch (e) {
         result = errorResponseFromError(e);
       }
     } else if (method === 'startProfile') {
-      this.profiler = new Profiler();
+      this.profiler = new SamplingProfiler();
       try {
         result = responseFromContent(await this.profiler.startProfiling());
       } catch (e) {
@@ -289,6 +298,7 @@ export class Child {
 
   handleEnd(): void {
     this.loggerDisposable.dispose();
+    this.tracerDisposable.dispose();
   }
 
   createReverseHandle(fn: (...args: Array<any>) => mixed): Handle {

package/src/index.js

@@ -1,9 +1,10 @@
 // @flow
-import type {LogEvent} from '@parcel/types';
+import type {TraceEvent, LogEvent} from '@parcel/types';
 import invariant from 'assert';
 import WorkerFarm from './WorkerFarm';
 import Logger from '@parcel/logger';
 import bus from './bus';
+import {tracer} from '@parcel/profiler';
 
 if (!WorkerFarm.isWorker()) {
   // Forward all logger events originating from workers into the main process
@@ -29,6 +30,11 @@ if (!WorkerFarm.isWorker()) {
         throw new Error('Unknown log level');
     }
   });
+
+  // Forward all trace events originating from workers into the main process
+  bus.on('traceEvent', (e: TraceEvent) => {
+    tracer.trace(e);
+  });
 }
 
 export default WorkerFarm;

package/lib/Profiler.js

@@ -1,80 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-function _assert() {
-  const data = _interopRequireDefault(require("assert"));
-
-  _assert = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _diagnostic() {
-  const data = _interopRequireDefault(require("@parcel/diagnostic"));
-
-  _diagnostic = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class Profiler {
-  startProfiling() {
-    let inspector;
-
-    try {
-      inspector = require('inspector');
-    } catch (err) {
-      throw new (_diagnostic().default)({
-        diagnostic: {
-          message: `The inspector module isn't available`,
-          origin: '@parcel/workers',
-          hints: ['Disable build profiling']
-        }
-      });
-    }
-
-    this.session = new inspector.Session();
-    this.session.connect();
-    return Promise.all([this.sendCommand('Profiler.setSamplingInterval', {
-      interval: 100
-    }), this.sendCommand('Profiler.enable'), this.sendCommand('Profiler.start')]);
-  }
-
-  sendCommand(method, params) {
-    (0, _assert().default)(this.session != null);
-    return new Promise((resolve, reject) => {
-      this.session.post(method, params, (err, params) => {
-        if (err == null) {
-          resolve(params);
-        } else {
-          reject(err);
-        }
-      });
-    });
-  }
-
-  destroy() {
-    if (this.session != null) {
-      this.session.disconnect();
-    }
-  }
-
-  async stopProfiling() {
-    let res = await this.sendCommand('Profiler.stop');
-    this.destroy();
-    return res.profile;
-  }
-
-}
-
-exports.default = Profiler;

package/lib/Trace.js

@@ -1,131 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-function _chromeTraceEvent() {
-  const data = require("chrome-trace-event");
-
-  _chromeTraceEvent = function () {
-    return data;
-  };
-
-  return data;
-}
-
-class Trace {
-  constructor() {
-    this.tracer = new (_chromeTraceEvent().Tracer)();
-    this.tid = 0;
-    this.eventId = 0;
-  }
-
-  getEventId() {
-    return this.eventId++;
-  }
-
-  init(ts) {
-    this.tracer.instantEvent({
-      name: 'TracingStartedInPage',
-      id: this.getEventId(),
-      ts,
-      cat: ['disabled-by-default-devtools.timeline'],
-      args: {
-        data: {
-          sessionId: '-1',
-          page: '0xfff',
-          frames: [{
-            frame: '0xfff',
-            url: 'parcel',
-            name: ''
-          }]
-        }
-      }
-    });
-    this.tracer.instantEvent({
-      name: 'TracingStartedInBrowser',
-      id: this.getEventId(),
-      ts,
-      cat: ['disabled-by-default-devtools.timeline'],
-      args: {
-        data: {
-          sessionId: '-1'
-        }
-      }
-    });
-  }
-
-  addCPUProfile(name, profile) {
-    if (this.eventId === 0) {
-      this.init(profile.startTime);
-    }
-
-    const trace = this.tracer;
-    const tid = this.tid;
-    this.tid++;
-    const cpuStartTime = profile.startTime;
-    const cpuEndTime = profile.endTime;
-    trace.instantEvent({
-      tid,
-      id: this.getEventId(),
-      cat: ['toplevel'],
-      name: 'TaskQueueManager::ProcessTaskFromWorkQueue',
-      args: {
-        src_file: '../../ipc/ipc_moji_bootstrap.cc',
-        src_func: 'Accept'
-      },
-      ts: cpuStartTime
-    });
-    trace.completeEvent({
-      tid,
-      name: 'EvaluateScript',
-      id: this.getEventId(),
-      cat: ['devtools.timeline'],
-      ts: cpuStartTime,
-      dur: cpuEndTime - cpuStartTime,
-      args: {
-        data: {
-          url: 'parcel',
-          lineNumber: 1,
-          columnNumber: 1,
-          frame: '0xFFF'
-        }
-      }
-    });
-    trace.instantEvent({
-      tid,
-      ts: 0,
-      ph: 'M',
-      cat: ['__metadata'],
-      name: 'thread_name',
-      args: {
-        name
-      }
-    });
-    trace.instantEvent({
-      tid,
-      name: 'CpuProfile',
-      id: this.getEventId(),
-      cat: ['disabled-by-default-devtools.timeline'],
-      ts: cpuEndTime,
-      args: {
-        data: {
-          cpuProfile: profile
-        }
-      }
-    });
-  }
-
-  pipe(writable) {
-    return this.tracer.pipe(writable);
-  }
-
-  flush() {
-    this.tracer.push(null);
-  }
-
-}
-
-exports.default = Trace;

package/src/Profiler.js

@@ -1,93 +0,0 @@
-// @flow
-import type {Session} from 'inspector';
-import invariant from 'assert';
-import ThrowableDiagnostic from '@parcel/diagnostic';
-
-// https://chromedevtools.github.io/devtools-protocol/tot/Profiler#type-Profile
-export type Profile = {|
-  nodes: Array<ProfileNode>,
-  startTime: number,
-  endTime: number,
-  samples?: Array<number>,
-  timeDeltas?: Array<number>,
-|};
-
-// https://chromedevtools.github.io/devtools-protocol/tot/Profiler#type-ProfileNode
-type ProfileNode = {|
-  id: number,
-  callFrame: CallFrame,
-  hitCount?: number,
-  children?: Array<number>,
-  deoptReason?: string,
-  positionTicks?: PositionTickInfo,
-|};
-
-// https://chromedevtools.github.io/devtools-protocol/tot/Runtime#type-CallFrame
-type CallFrame = {|
-  functionName: string,
-  scriptId: string,
-  url: string,
-  lineNumber: string,
-  columnNumber: string,
-|};
-
-// https://chromedevtools.github.io/devtools-protocol/tot/Profiler#type-PositionTickInfo
-type PositionTickInfo = {|
-  line: number,
-  ticks: number,
-|};
-
-export default class Profiler {
-  session: Session;
-
-  startProfiling(): Promise<mixed> {
-    let inspector;
-    try {
-      inspector = require('inspector');
-    } catch (err) {
-      throw new ThrowableDiagnostic({
-        diagnostic: {
-          message: `The inspector module isn't available`,
-          origin: '@parcel/workers',
-          hints: ['Disable build profiling'],
-        },
-      });
-    }
-
-    this.session = new inspector.Session();
-    this.session.connect();
-
-    return Promise.all([
-      this.sendCommand('Profiler.setSamplingInterval', {
-        interval: 100,
-      }),
-      this.sendCommand('Profiler.enable'),
-      this.sendCommand('Profiler.start'),
-    ]);
-  }
-
-  sendCommand(method: string, params: mixed): Promise<{profile: Profile, ...}> {
-    invariant(this.session != null);
-    return new Promise((resolve, reject) => {
-      this.session.post(method, params, (err, params) => {
-        if (err == null) {
-          resolve(params);
-        } else {
-          reject(err);
-        }
-      });
-    });
-  }
-
-  destroy() {
-    if (this.session != null) {
-      this.session.disconnect();
-    }
-  }
-
-  async stopProfiling(): Promise<Profile> {
-    let res = await this.sendCommand('Profiler.stop');
-    this.destroy();
-    return res.profile;
-  }
-}

package/src/Trace.js

@@ -1,125 +0,0 @@
-// @flow
-import type {Profile} from './Profiler';
-import type {Writable} from 'stream';
-import {Tracer} from 'chrome-trace-event';
-
-export default class Trace {
-  tracer: Tracer;
-  tid: number;
-  eventId: number;
-
-  constructor() {
-    this.tracer = new Tracer();
-    this.tid = 0;
-    this.eventId = 0;
-  }
-
-  getEventId(): number {
-    return this.eventId++;
-  }
-
-  init(ts: number) {
-    this.tracer.instantEvent({
-      name: 'TracingStartedInPage',
-      id: this.getEventId(),
-      ts,
-      cat: ['disabled-by-default-devtools.timeline'],
-      args: {
-        data: {
-          sessionId: '-1',
-          page: '0xfff',
-          frames: [
-            {
-              frame: '0xfff',
-              url: 'parcel',
-              name: '',
-            },
-          ],
-        },
-      },
-    });
-
-    this.tracer.instantEvent({
-      name: 'TracingStartedInBrowser',
-      id: this.getEventId(),
-      ts,
-      cat: ['disabled-by-default-devtools.timeline'],
-      args: {
-        data: {
-          sessionId: '-1',
-        },
-      },
-    });
-  }
-
-  addCPUProfile(name: string, profile: Profile) {
-    if (this.eventId === 0) {
-      this.init(profile.startTime);
-    }
-    const trace = this.tracer;
-    const tid = this.tid;
-    this.tid++;
-
-    const cpuStartTime = profile.startTime;
-    const cpuEndTime = profile.endTime;
-
-    trace.instantEvent({
-      tid,
-      id: this.getEventId(),
-      cat: ['toplevel'],
-      name: 'TaskQueueManager::ProcessTaskFromWorkQueue',
-      args: {
-        src_file: '../../ipc/ipc_moji_bootstrap.cc',
-        src_func: 'Accept',
-      },
-      ts: cpuStartTime,
-    });
-
-    trace.completeEvent({
-      tid,
-      name: 'EvaluateScript',
-      id: this.getEventId(),
-      cat: ['devtools.timeline'],
-      ts: cpuStartTime,
-      dur: cpuEndTime - cpuStartTime,
-      args: {
-        data: {
-          url: 'parcel',
-          lineNumber: 1,
-          columnNumber: 1,
-          frame: '0xFFF',
-        },
-      },
-    });
-
-    trace.instantEvent({
-      tid,
-      ts: 0,
-      ph: 'M',
-      cat: ['__metadata'],
-      name: 'thread_name',
-      args: {name},
-    });
-
-    trace.instantEvent({
-      tid,
-      name: 'CpuProfile',
-      id: this.getEventId(),
-      cat: ['disabled-by-default-devtools.timeline'],
-      ts: cpuEndTime,
-      args: {
-        data: {
-          cpuProfile: profile,
-        },
-      },
-    });
-  }
-
-  pipe(writable: Writable): stream$Writable {
-    return this.tracer.pipe(writable);
-  }
-
-  flush() {
-    this.tracer.push(null);
-  }
-}