bare-worker 4.1.4 → 4.1.6

package/index.js

@@ -1,18 +1,22 @@
 const Thread = require('bare-thread')
 const Channel = require('bare-channel')
 const WorkerState = require('./lib/worker-state')
+const MessageChannel = require('./lib/message-channel')
+const MessagePort = require('./lib/message-port')
 const constants = require('./lib/constants')
-const preloads = require('./lib/preloads')
 
-let MessageChannel
-let MessagePort
+const preloads = new Map()
+
+let parentPort = null
+let workerData = null
 
 if (WorkerState.parent) {
-  MessageChannel = WorkerState.parent.MessageChannel
-  MessagePort = WorkerState.parent.MessagePort
-} else {
-  MessageChannel = require('./lib/message-channel')
-  MessagePort = require('./lib/message-port')
+  for (const [entry, source] of WorkerState.parent.preloads) {
+    preloads.set(entry, source)
+  }
+
+  parentPort = WorkerState.parent.port
+  workerData = WorkerState.parent.data
 }
 
 const worker = Thread.prepare(require.resolve('./lib/worker-thread'), { shared: true })
@@ -79,16 +83,11 @@ exports.Worker = exports
 exports.MessageChannel = MessageChannel
 exports.MessagePort = MessagePort
 
+exports.parentPort = parentPort
+exports.workerData = workerData
+
 exports.isMainThread = Thread.isMainThread
 
 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/message-channel.js

@@ -1,4 +1,5 @@
 const Channel = require('bare-channel')
+const WorkerState = require('./worker-state')
 const MessagePort = require('./message-port')
 
 module.exports = class MessageChannel {
@@ -9,3 +10,5 @@ module.exports = class MessageChannel {
     this.port2 = new MessagePort(channel)
   }
 }
+
+if (WorkerState.parent) module.exports = WorkerState.parent.MessageChannel

package/lib/message-port.js

@@ -1,5 +1,6 @@
 const EventEmitter = require('bare-events')
 const Channel = require('bare-channel')
+const WorkerState = require('./worker-state')
 const constants = require('./constants')
 const errors = require('./errors')
 
@@ -214,6 +215,8 @@ module.exports = exports = class MessagePort extends EventEmitter {
   static _ports = new Set()
 }
 
+if (WorkerState.parent) module.exports = WorkerState.parent.MessagePort
+
 Bare.on('beforeExit', (exitCode) => {
   for (const port of exports._ports) port._beforeExit(exitCode)
 })

package/lib/worker-thread.js

@@ -10,7 +10,13 @@ Bare.on('newListener', onnewlistener)
 
 const cache = Object.create(null)
 
-for (const [entry, source] of state.preloads) Module.load(new URL(entry), source, { cache })
+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'), state.source, { cache })
 

package/package.json

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

package/lib/preloads.js

@@ -1,17 +0,0 @@
-const Thread = require('bare-thread')
-
-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) {
-    preloads.set(entry, source)
-  }
-}
-
-module.exports = preloads