bare-worker 4.1.0 → 4.1.2

package/lib/worker-thread.js

@@ -1,26 +1,54 @@
-const Thread = require('bare-thread')
 const Channel = require('bare-channel')
 const Module = require('bare-module')
-const MessagePort = require('./message-port')
-const worker = require('..')
+const Bundle = require('bare-bundle')
 
-const { source, channel: handle, workerData, preloads } = Thread.self.data
+const { source, channel: handle, workerData, preloads } = Bare.Thread.self.data
 
-const channel = Channel.from(handle, { interfaces: [MessagePort] })
+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, 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
 
 Bare.on('newListener', onnewlistener)
   .on('removeListener', onremovelistener)
   .on('uncaughtException', onerror)
   .on('unhandledRejection', onerror)
 
-worker.parentPort = new MessagePort(channel)
-worker.parentPort._online()
-
-worker.workerData = workerData
-
-for (const [entry, source] of preloads) Module.load(new URL(entry), source)
+for (const [entry, source] of preloads) Module.load(new URL(entry), source, { cache })
 
-Module.load(new URL('bare:/worker.bundle'), source)
+Module.load(new URL('bare:/worker.bundle'), bundle, { cache })
 
 function onnewlistener(name, fn) {
   if (fn === onremovelistener || fn === onerror) return
@@ -43,7 +71,7 @@ function onremovelistener(name, fn) {
 }
 
 async function onerror(error) {
-  await worker.parentPort._error(error)
+  await Worker.parentPort._error(error)
 
   Bare.exitCode = 1
 }

package/package.json

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