bare-worker 4.1.8 → 4.1.9

package/lib/message-channel.js

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

package/lib/message-port.js

@@ -1,6 +1,5 @@
 const EventEmitter = require('bare-events')
 const Channel = require('bare-channel')
-const WorkerState = require('./worker-state')
 const constants = require('./constants')
 const errors = require('./errors')
 
@@ -219,8 +218,6 @@ 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-state.js

@@ -1,17 +1,25 @@
 const Channel = require('bare-channel')
+const MessagePort = require('./message-port')
 
 const state = Symbol.for('bare.worker.state')
 const kind = Symbol.for('bare.worker.state.kind')
 
-class WorkerState {
+module.exports = class WorkerState {
   static get [kind]() {
     return 0 // Compatibility version
   }
 
-  constructor() {
-    this._MessageChannel = require('./message-channel')
-    this._MessagePort = require('./message-port')
+  static get parent() {
+    const parent = global[state]
+
+    if (typeof parent === 'object' && parent !== null && parent[kind] === WorkerState[kind]) {
+      return parent
+    }
+
+    return null
+  }
 
+  constructor() {
     const { source, preloads, data, environmentData, channel: handle } = Bare.Thread.self.data
 
     this.source = source
@@ -19,9 +27,9 @@ class WorkerState {
     this.data = Bare.Thread.self.data = data
     this.environmentData = environmentData
 
-    const channel = Channel.from(handle, { interfaces: [this._MessagePort] })
+    const channel = Channel.from(handle, { interfaces: [MessagePort] })
 
-    this.port = new this._MessagePort(channel)
+    this.port = new MessagePort(channel)
     this.port._online()
 
     global[state] = this
@@ -30,24 +38,4 @@ class WorkerState {
   get [kind]() {
     return WorkerState[kind]
   }
-
-  get MessageChannel() {
-    return this._MessageChannel
-  }
-
-  get MessagePort() {
-    return this._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

@@ -8,17 +8,11 @@ Bare.on('newListener', onnewlistener)
   .on('uncaughtException', onerror)
   .on('unhandledRejection', onerror)
 
-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/preload-${Math.random().toString(16).slice(2)}.bundle`), source)
 }
 
-Module.load(new URL('bare:/worker.bundle'), state.source, { cache })
+Module.load(new URL('bare:/worker.bundle'), state.source)
 
 function onnewlistener(name, fn) {
   if (fn === onremovelistener || fn === onerror) return

package/package.json

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