diff options
author | Eugene Ostroukhov <eostroukhov@google.com> | 2018-09-08 19:45:10 -0700 |
---|---|---|
committer | Eugene Ostroukhov <eostroukhov@google.com> | 2018-09-17 09:49:53 -0700 |
commit | ab5f789e3f3f726702b86bc7b9661895780d4d12 (patch) | |
tree | 3c0e365e048ac7e3b0263c4dba86f59b8798e77a /lib | |
parent | ab35194cb0297a85de5384b529f2cc03293d93bb (diff) | |
download | android-node-v8-ab5f789e3f3f726702b86bc7b9661895780d4d12.tar.gz android-node-v8-ab5f789e3f3f726702b86bc7b9661895780d4d12.tar.bz2 android-node-v8-ab5f789e3f3f726702b86bc7b9661895780d4d12.zip |
inspector: enable Inspector JS API in workers
PR-URL: https://github.com/nodejs/node/pull/22769
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/inspector.js | 2 | ||||
-rw-r--r-- | lib/internal/util/inspector.js | 4 | ||||
-rw-r--r-- | lib/internal/worker.js | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/inspector.js b/lib/inspector.js index 8827158757..6988eccf82 100644 --- a/lib/inspector.js +++ b/lib/inspector.js @@ -14,7 +14,7 @@ const util = require('util'); const { Connection, open, url } = process.binding('inspector'); const { originalConsole } = require('internal/process/per_thread'); -if (!Connection || !require('internal/worker').isMainThread) +if (!Connection) throw new ERR_INSPECTOR_NOT_AVAILABLE(); const connectionSymbol = Symbol('connectionProperty'); diff --git a/lib/internal/util/inspector.js b/lib/internal/util/inspector.js index 3dd73415de..634d330233 100644 --- a/lib/internal/util/inspector.js +++ b/lib/internal/util/inspector.js @@ -1,8 +1,6 @@ 'use strict'; -// TODO(addaleax): Figure out how to integrate the inspector with workers. -const hasInspector = process.config.variables.v8_enable_inspector === 1 && - require('internal/worker').isMainThread; +const hasInspector = process.config.variables.v8_enable_inspector === 1; const inspector = hasInspector ? require('inspector') : undefined; let session; diff --git a/lib/internal/worker.js b/lib/internal/worker.js index 402fc30b59..4f797dd9e0 100644 --- a/lib/internal/worker.js +++ b/lib/internal/worker.js @@ -17,6 +17,7 @@ const { MessagePort, MessageChannel } = internalBinding('messaging'); const { handle_onclose } = internalBinding('symbols'); const { clearAsyncIdStack } = require('internal/async_hooks'); const { serializeError, deserializeError } = require('internal/error-serdes'); +const { pathToFileURL } = require('url'); util.inherits(MessagePort, EventEmitter); @@ -257,8 +258,9 @@ class Worker extends EventEmitter { } } + const url = options.eval ? null : pathToFileURL(filename); // Set up the C++ handle for the worker, as well as some internal wiring. - this[kHandle] = new WorkerImpl(); + this[kHandle] = new WorkerImpl(url); this[kHandle].onexit = (code) => this[kOnExit](code); this[kPort] = this[kHandle].messagePort; this[kPort].on('message', (data) => this[kOnMessage](data)); |