bare-worker 4.1.3 → 4.1.5

package/index.js

@@ -1,10 +1,20 @@
 const Thread = require('bare-thread')
 const Channel = require('bare-channel')
-const MessageChannel = require('./lib/message-channel')
-const MessagePort = require('./lib/message-port')
+const WorkerState = require('./lib/worker-state')
 const constants = require('./lib/constants')
 const preloads = require('./lib/preloads')
 
+let MessageChannel
+let MessagePort
+
+if (WorkerState.parent) {
+  MessageChannel = WorkerState.parent.MessageChannel
+  MessagePort = WorkerState.parent.MessagePort
+} else {
+  MessageChannel = require('./lib/message-channel')
+  MessagePort = require('./lib/message-port')
+}
+
 const worker = Thread.prepare(require.resolve('./lib/worker-thread'), { shared: true })
 
 module.exports = exports = class Worker extends MessagePort {
@@ -21,7 +31,7 @@ module.exports = exports = class Worker extends MessagePort {
       data: {
         source: Thread.prepare(entry, { shared: true }),
         channel: channel.handle,
-        workerData,
+        data: workerData,
         preloads
       }
     })
@@ -71,10 +81,14 @@ exports.MessagePort = MessagePort
 
 exports.isMainThread = Thread.isMainThread
 
-exports.parentPort = null
-
-exports.workerData = null
-
 exports.preload = function preload(entry) {
   preloads.set(entry, Thread.prepare(entry, { shared: true }))
 }
+
+if (WorkerState.parent) {
+  exports.parentPort = WorkerState.parent.port
+  exports.workerData = WorkerState.parent.data
+} else {
+  exports.parentPort = null
+  exports.workerData = null
+}

package/lib/preloads.js

@@ -1,15 +1,9 @@
-const Thread = require('bare-thread')
+const WorkerState = require('./worker-state')
 
 const preloads = new Map()
 
-if (
-  Thread.self &&
-  typeof Thread.self.data === 'object' &&
-  Thread.self.data !== null &&
-  typeof Thread.self.data.preloads === 'object' &&
-  Thread.self.data.preloads !== null
-) {
-  for (const [entry, source] of Thread.self.data.preloads) {
+if (WorkerState.parent) {
+  for (const [entry, source] of WorkerState.parent.preloads) {
     preloads.set(entry, source)
   }
 }

package/lib/worker-state.js

@@ -0,0 +1,51 @@
+const Channel = require('bare-channel')
+const MessageChannel = require('./message-channel')
+const MessagePort = require('./message-port')
+
+const state = Symbol.for('bare.worker.state')
+const kind = Symbol.for('bare.worker.state.kind')
+
+class WorkerState {
+  static get [kind]() {
+    return 0 // Compatibility version
+  }
+
+  constructor() {
+    const { source, preloads, data, channel: handle } = Bare.Thread.self.data
+
+    this.source = source
+    this.preloads = preloads
+    this.data = Bare.Thread.self.data = data
+
+    const channel = Channel.from(handle, { interfaces: [MessagePort] })
+
+    this.port = new MessagePort(channel)
+    this.port._online()
+
+    global[state] = this
+  }
+
+  get [kind]() {
+    return WorkerState[kind]
+  }
+
+  get MessageChannel() {
+    return MessageChannel
+  }
+
+  get MessagePort() {
+    return MessagePort
+  }
+}
+
+module.exports = exports = WorkerState
+
+if (
+  typeof global[state] === 'object' &&
+  global[state] !== null &&
+  global[state][kind] === WorkerState[kind]
+) {
+  exports.parent = global[state]
+} else {
+  exports.parent = null
+}

package/lib/worker-thread.js

@@ -1,54 +1,24 @@
-const Channel = require('bare-channel')
 const Module = require('bare-module')
-const Bundle = require('bare-bundle')
+const WorkerState = require('./worker-state')
 
-const { source, channel: handle, workerData, preloads } = Bare.Thread.self.data
-
-const bundle = Bundle.from(source)
-
-const protocol = module.protocol.extend({
-  postresolve(context, url) {
-    return bundle.exists(url.href) ? url : context.postresolve(url)
-  },
-
-  exists(context, url, type) {
-    return bundle.exists(url.href) || context.exists(url, type)
-  },
-
-  read(context, url) {
-    return bundle.read(url.href) || context.read(url)
-  }
-})
-
-const { main, imports, resolutions } = bundle
-
-const cache = Object.create(null)
-
-let Worker
-
-try {
-  const resolved = Module.resolve('bare-worker', new URL(main), { protocol, imports, resolutions })
-
-  Worker = Module.load(resolved, { protocol, imports, resolutions, cache }).exports
-} catch {
-  Worker = require('..')
-}
-
-const channel = Channel.from(handle, { interfaces: [Worker.MessagePort] })
-
-Worker.parentPort = new Worker.MessagePort(channel)
-Worker.parentPort._online()
-
-Worker.workerData = Bare.Thread.self.data = workerData
+const state = new WorkerState()
 
 Bare.on('newListener', onnewlistener)
   .on('removeListener', onremovelistener)
   .on('uncaughtException', onerror)
   .on('unhandledRejection', onerror)
 
-for (const [entry, source] of preloads) Module.load(new URL(entry), source, { cache })
+const cache = Object.create(null)
+
+for (const [, source] of state.preloads) {
+  Module.load(
+    new URL(`bare:/worker/preload-${Math.random().toString(16).slice(2)}.bundle`),
+    source,
+    { cache }
+  )
+}
 
-Module.load(new URL('bare:/worker.bundle'), bundle, { cache })
+Module.load(new URL('bare:/worker.bundle'), state.source, { cache })
 
 function onnewlistener(name, fn) {
   if (fn === onremovelistener || fn === onerror) return
@@ -71,7 +41,7 @@ function onremovelistener(name, fn) {
 }
 
 async function onerror(error) {
-  await Worker.parentPort._error(error)
+  await state.port._error(error)
 
   Bare.exitCode = 1
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-worker",
-  "version": "4.1.3",
+  "version": "4.1.5",
   "description": "Higher-level worker threads for JavaScript",
   "exports": {
     ".": "./index.js",