fix(node:worker_threads): ensure threadId property is exposed on worker_threads instance (#6521)

* fix: ensure threadId property is exposed on worker_threads instance

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

* fix: rename lazy worker_threads module properties

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

* fix: add getter for threadId

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

* test: improve worker_threads UTs

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

* test: fix lazy loading

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

* test: fix worker_threads test

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

* fix: return the worker threadId

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

* test: refine worker_threads expectation on threadId

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

---------

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

6 files changed, 75 insertions, 15 deletions

diff --git a/packages/bun-types/globals.d.ts b/packages/bun-types/globals.d.ts
index 207f4608a..57dd4aafa 100644
--- a/packages/bun-types/globals.d.ts
+++ b/packages/bun-types/globals.d.ts
@@ -546,6 +546,12 @@ interface Worker extends EventTarget, AbstractWorker {
    */
   unref(): void;
 
+  /**
+   * An integer identifier for the referenced thread. Inside the worker thread,
+   * it is available as `require('node:worker_threads').threadId`.
+   * This value is unique for each `Worker` instance inside a single process.
+   * @since v10.5.0
+   */
   threadId: number;
 }
 
diff --git a/src/js/node/worker_threads.ts b/src/js/node/worker_threads.ts
index f1f15b64e..df9b5bdf4 100644
--- a/src/js/node/worker_threads.ts
+++ b/src/js/node/worker_threads.ts
@@ -224,6 +224,10 @@ class Worker extends EventEmitter {
     this.#worker.addEventListener("open", this.#onOpen.bind(this));
   }
 
+  get threadId() {
+    return this.#worker.threadId;
+  }
+
   ref() {
     this.#worker.ref();
   }
@@ -261,7 +265,7 @@ class Worker extends EventEmitter {
   }
 
   terminate() {
-    var onExitPromise = this.#onExitPromise;
+    const onExitPromise = this.#onExitPromise;
     if (onExitPromise) {
       return $isPromise(onExitPromise) ? onExitPromise : Promise.resolve(onExitPromise);
     }
diff --git a/src/js/out/InternalModuleRegistryConstants.h b/src/js/out/InternalModuleRegistryConstants.h
index 9e6d75558..cc9dbbbea 100644
--- a/src/js/out/InternalModuleRegistryConstants.h
+++ b/src/js/out/InternalModuleRegistryConstants.h
@@ -214,7 +214,7 @@ static constexpr ASCIILiteral NodeWasiCode = "(function (){\"use strict\";// src
 //
 
 //
-static constexpr ASCIILiteral NodeWorkerThreadsCode = "(function (){\"use strict\";// src/js/out/tmp/node/worker_threads.ts\nvar emitWarning = function(type, message) {\n  if (emittedWarnings.has(type))\n    return;\n  emittedWarnings.add(type), console.warn(\"[bun] Warning:\", message);\n}, injectFakeEmitter = function(Class) {\n  function messageEventHandler(event) {\n    return event.data;\n  }\n  function errorEventHandler(event) {\n    return event.error;\n  }\n  const wrappedListener = Symbol(\"wrappedListener\");\n  function wrapped(run, listener) {\n    const callback = function(event) {\n      return listener(run(event));\n    };\n    return listener[wrappedListener] = callback, callback;\n  }\n  function functionForEventType(event, listener) {\n    switch (event) {\n      case \"error\":\n      case \"messageerror\":\n        return wrapped(errorEventHandler, listener);\n      default:\n        return wrapped(messageEventHandler, listener);\n    }\n  }\n  Class.prototype.on = function(event, listener) {\n    return this.addEventListener(event, functionForEventType(event, listener)), this;\n  }, Class.prototype.off = function(event, listener) {\n    if (listener)\n      this.removeEventListener(event, listener[wrappedListener] || listener);\n    else\n      this.removeEventListener(event);\n    return this;\n  }, Class.prototype.once = function(event, listener) {\n    return this.addEventListener(event, functionForEventType(event, listener), { once: !0 }), this;\n  };\n  function EventClass(eventName) {\n    if (eventName === \"error\" || eventName === \"messageerror\")\n      return ErrorEvent;\n    return MessageEvent;\n  }\n  Class.prototype.emit = function(event, ...args) {\n    return this.dispatchEvent(new (EventClass(event))(event, ...args)), this;\n  }, Class.prototype.prependListener = Class.prototype.on, Class.prototype.prependOnceListener = Class.prototype.once;\n}, receiveMessageOnPort = function(port) {\n  let res = _receiveMessageOnPort(port);\n  if (!res)\n    return @undefined;\n  return {\n    message: res\n  };\n}, fakeParentPort = function() {\n  const fake = Object.create(MessagePort.prototype);\n  return Object.defineProperty(fake, \"onmessage\", {\n    get() {\n      return self.onmessage;\n    },\n    set(value) {\n      self.onmessage = value;\n    }\n  }), Object.defineProperty(fake, \"onmessageerror\", {\n    get() {\n      return self.onmessageerror;\n    },\n    set(value) {\n    }\n  }), Object.defineProperty(fake, \"postMessage\", {\n    value(...args) {\n      return self.postMessage(...args);\n    }\n  }), Object.defineProperty(fake, \"close\", {\n    value() {\n      return process.exit(0);\n    }\n  }), Object.defineProperty(fake, \"start\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"unref\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"ref\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"hasRef\", {\n    value() {\n      return !1;\n    }\n  }), Object.defineProperty(fake, \"setEncoding\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"addEventListener\", {\n    value: self.addEventListener.bind(self)\n  }), Object.defineProperty(fake, \"removeEventListener\", {\n    value: self.removeEventListener.bind(self)\n  }), fake;\n}, getEnvironmentData = function() {\n  return process.env;\n}, setEnvironmentData = function(env) {\n  process.env = env;\n}, markAsUntransferable = function() {\n  throwNotImplemented(\"worker_threads.markAsUntransferable\");\n}, moveMessagePortToContext = function() {\n  throwNotImplemented(\"worker_threads.moveMessagePortToContext\");\n}, $, EventEmitter = @getInternalField(@internalModuleRegistry, 20) || @createInternalModuleById(20), { throwNotImplemented } = @getInternalField(@internalModuleRegistry, 6) || @createInternalModuleById(6), { MessageChannel, BroadcastChannel, Worker: WebWorker } = globalThis, SHARE_ENV = Symbol(\"nodejs.worker_threads.SHARE_ENV\"), isMainThread = Bun.isMainThread, [_workerData, _threadId, _receiveMessageOnPort] = @lazy(\"worker_threads\"), emittedWarnings = new Set, _MessagePort = globalThis.MessagePort;\ninjectFakeEmitter(_MessagePort);\nvar MessagePort = _MessagePort, resourceLimits = {}, workerData = _workerData, threadId = _threadId, parentPort = isMainThread \? null : fakeParentPort(), unsupportedOptions = [\n  \"eval\",\n  \"argv\",\n  \"execArgv\",\n  \"stdin\",\n  \"stdout\",\n  \"stderr\",\n  \"trackedUnmanagedFds\",\n  \"resourceLimits\"\n];\n\nclass Worker extends EventEmitter {\n  #worker;\n  #performance;\n  #onExitPromise = @undefined;\n  constructor(filename, options = {}) {\n    super();\n    for (let key of unsupportedOptions)\n      if (key in options)\n        emitWarning(\"option.\" + key, `worker_threads.Worker option \"${key}\" is not implemented.`);\n    this.#worker = new WebWorker(filename, options), this.#worker.addEventListener(\"close\", this.#onClose.bind(this)), this.#worker.addEventListener(\"error\", this.#onError.bind(this)), this.#worker.addEventListener(\"message\", this.#onMessage.bind(this)), this.#worker.addEventListener(\"messageerror\", this.#onMessageError.bind(this)), this.#worker.addEventListener(\"open\", this.#onOpen.bind(this));\n  }\n  ref() {\n    this.#worker.ref();\n  }\n  unref() {\n    this.#worker.unref();\n  }\n  get stdin() {\n    return null;\n  }\n  get stdout() {\n    return null;\n  }\n  get stderr() {\n    return null;\n  }\n  get performance() {\n    return this.#performance \?\?= {\n      eventLoopUtilization() {\n        return emitWarning(\"performance\", \"worker_threads.Worker.performance is not implemented.\"), {\n          idle: 0,\n          active: 0,\n          utilization: 0\n        };\n      }\n    };\n  }\n  terminate() {\n    var onExitPromise = this.#onExitPromise;\n    if (onExitPromise)\n      return @isPromise(onExitPromise) \? onExitPromise : @Promise.resolve(onExitPromise);\n    const { resolve, promise } = @Promise.withResolvers();\n    return this.#worker.addEventListener(\"close\", (event) => {\n      resolve(event.code);\n    }, { once: !0 }), this.#worker.terminate(), this.#onExitPromise = promise;\n  }\n  postMessage(...args) {\n    return this.#worker.postMessage(...args);\n  }\n  #onClose(e) {\n    this.#onExitPromise = e.code, this.emit(\"exit\", e.code);\n  }\n  #onError(error) {\n    this.emit(\"error\", error);\n  }\n  #onMessage(event) {\n    this.emit(\"message\", event.data);\n  }\n  #onMessageError(event) {\n    this.emit(\"messageerror\", event.error \?\? event.data \?\? event);\n  }\n  #onOpen() {\n    this.emit(\"online\");\n  }\n  async getHeapSnapshot() {\n    throwNotImplemented(\"worker_threads.Worker.getHeapSnapshot\");\n  }\n}\n$ = {\n  Worker,\n  workerData,\n  parentPort,\n  resourceLimits,\n  isMainThread,\n  MessageChannel,\n  BroadcastChannel,\n  MessagePort,\n  getEnvironmentData,\n  setEnvironmentData,\n  getHeapSnapshot() {\n    return {};\n  },\n  markAsUntransferable,\n  moveMessagePortToContext,\n  receiveMessageOnPort,\n  SHARE_ENV,\n  threadId\n};\nreturn $})\n"_s;
+static constexpr ASCIILiteral NodeWorkerThreadsCode = "(function (){\"use strict\";// src/js/out/tmp/node/worker_threads.ts\nvar emitWarning = function(type, message) {\n  if (emittedWarnings.has(type))\n    return;\n  emittedWarnings.add(type), console.warn(\"[bun] Warning:\", message);\n}, injectFakeEmitter = function(Class) {\n  function messageEventHandler(event) {\n    return event.data;\n  }\n  function errorEventHandler(event) {\n    return event.error;\n  }\n  const wrappedListener = Symbol(\"wrappedListener\");\n  function wrapped(run, listener) {\n    const callback = function(event) {\n      return listener(run(event));\n    };\n    return listener[wrappedListener] = callback, callback;\n  }\n  function functionForEventType(event, listener) {\n    switch (event) {\n      case \"error\":\n      case \"messageerror\":\n        return wrapped(errorEventHandler, listener);\n      default:\n        return wrapped(messageEventHandler, listener);\n    }\n  }\n  Class.prototype.on = function(event, listener) {\n    return this.addEventListener(event, functionForEventType(event, listener)), this;\n  }, Class.prototype.off = function(event, listener) {\n    if (listener)\n      this.removeEventListener(event, listener[wrappedListener] || listener);\n    else\n      this.removeEventListener(event);\n    return this;\n  }, Class.prototype.once = function(event, listener) {\n    return this.addEventListener(event, functionForEventType(event, listener), { once: !0 }), this;\n  };\n  function EventClass(eventName) {\n    if (eventName === \"error\" || eventName === \"messageerror\")\n      return ErrorEvent;\n    return MessageEvent;\n  }\n  Class.prototype.emit = function(event, ...args) {\n    return this.dispatchEvent(new (EventClass(event))(event, ...args)), this;\n  }, Class.prototype.prependListener = Class.prototype.on, Class.prototype.prependOnceListener = Class.prototype.once;\n}, receiveMessageOnPort = function(port) {\n  let res = _receiveMessageOnPort(port);\n  if (!res)\n    return @undefined;\n  return {\n    message: res\n  };\n}, fakeParentPort = function() {\n  const fake = Object.create(MessagePort.prototype);\n  return Object.defineProperty(fake, \"onmessage\", {\n    get() {\n      return self.onmessage;\n    },\n    set(value) {\n      self.onmessage = value;\n    }\n  }), Object.defineProperty(fake, \"onmessageerror\", {\n    get() {\n      return self.onmessageerror;\n    },\n    set(value) {\n    }\n  }), Object.defineProperty(fake, \"postMessage\", {\n    value(...args) {\n      return self.postMessage(...args);\n    }\n  }), Object.defineProperty(fake, \"close\", {\n    value() {\n      return process.exit(0);\n    }\n  }), Object.defineProperty(fake, \"start\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"unref\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"ref\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"hasRef\", {\n    value() {\n      return !1;\n    }\n  }), Object.defineProperty(fake, \"setEncoding\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"addEventListener\", {\n    value: self.addEventListener.bind(self)\n  }), Object.defineProperty(fake, \"removeEventListener\", {\n    value: self.removeEventListener.bind(self)\n  }), fake;\n}, getEnvironmentData = function() {\n  return process.env;\n}, setEnvironmentData = function(env) {\n  process.env = env;\n}, markAsUntransferable = function() {\n  throwNotImplemented(\"worker_threads.markAsUntransferable\");\n}, moveMessagePortToContext = function() {\n  throwNotImplemented(\"worker_threads.moveMessagePortToContext\");\n}, $, EventEmitter = @getInternalField(@internalModuleRegistry, 20) || @createInternalModuleById(20), { throwNotImplemented } = @getInternalField(@internalModuleRegistry, 6) || @createInternalModuleById(6), { MessageChannel, BroadcastChannel, Worker: WebWorker } = globalThis, SHARE_ENV = Symbol(\"nodejs.worker_threads.SHARE_ENV\"), isMainThread = Bun.isMainThread, [_workerData, _threadId, _receiveMessageOnPort] = @lazy(\"worker_threads\"), emittedWarnings = new Set, _MessagePort = globalThis.MessagePort;\ninjectFakeEmitter(_MessagePort);\nvar MessagePort = _MessagePort, resourceLimits = {}, workerData = _workerData, threadId = _threadId, parentPort = isMainThread \? null : fakeParentPort(), unsupportedOptions = [\n  \"eval\",\n  \"argv\",\n  \"execArgv\",\n  \"stdin\",\n  \"stdout\",\n  \"stderr\",\n  \"trackedUnmanagedFds\",\n  \"resourceLimits\"\n];\n\nclass Worker extends EventEmitter {\n  #worker;\n  #performance;\n  #onExitPromise = @undefined;\n  constructor(filename, options = {}) {\n    super();\n    for (let key of unsupportedOptions)\n      if (key in options)\n        emitWarning(\"option.\" + key, `worker_threads.Worker option \"${key}\" is not implemented.`);\n    this.#worker = new WebWorker(filename, options), this.#worker.addEventListener(\"close\", this.#onClose.bind(this)), this.#worker.addEventListener(\"error\", this.#onError.bind(this)), this.#worker.addEventListener(\"message\", this.#onMessage.bind(this)), this.#worker.addEventListener(\"messageerror\", this.#onMessageError.bind(this)), this.#worker.addEventListener(\"open\", this.#onOpen.bind(this));\n  }\n  get threadId() {\n    return this.#worker.threadId;\n  }\n  ref() {\n    this.#worker.ref();\n  }\n  unref() {\n    this.#worker.unref();\n  }\n  get stdin() {\n    return null;\n  }\n  get stdout() {\n    return null;\n  }\n  get stderr() {\n    return null;\n  }\n  get performance() {\n    return this.#performance \?\?= {\n      eventLoopUtilization() {\n        return emitWarning(\"performance\", \"worker_threads.Worker.performance is not implemented.\"), {\n          idle: 0,\n          active: 0,\n          utilization: 0\n        };\n      }\n    };\n  }\n  terminate() {\n    const onExitPromise = this.#onExitPromise;\n    if (onExitPromise)\n      return @isPromise(onExitPromise) \? onExitPromise : @Promise.resolve(onExitPromise);\n    const { resolve, promise } = @Promise.withResolvers();\n    return this.#worker.addEventListener(\"close\", (event) => {\n      resolve(event.code);\n    }, { once: !0 }), this.#worker.terminate(), this.#onExitPromise = promise;\n  }\n  postMessage(...args) {\n    return this.#worker.postMessage(...args);\n  }\n  #onClose(e) {\n    this.#onExitPromise = e.code, this.emit(\"exit\", e.code);\n  }\n  #onError(error) {\n    this.emit(\"error\", error);\n  }\n  #onMessage(event) {\n    this.emit(\"message\", event.data);\n  }\n  #onMessageError(event) {\n    this.emit(\"messageerror\", event.error \?\? event.data \?\? event);\n  }\n  #onOpen() {\n    this.emit(\"online\");\n  }\n  async getHeapSnapshot() {\n    throwNotImplemented(\"worker_threads.Worker.getHeapSnapshot\");\n  }\n}\n$ = {\n  Worker,\n  workerData,\n  parentPort,\n  resourceLimits,\n  isMainThread,\n  MessageChannel,\n  BroadcastChannel,\n  MessagePort,\n  getEnvironmentData,\n  setEnvironmentData,\n  getHeapSnapshot() {\n    return {};\n  },\n  markAsUntransferable,\n  moveMessagePortToContext,\n  receiveMessageOnPort,\n  SHARE_ENV,\n  threadId\n};\nreturn $})\n"_s;
 //
 
 //
@@ -463,7 +463,7 @@ static constexpr ASCIILiteral NodeWasiCode = "(function (){\"use strict\";// src
 //
 
 //
-static constexpr ASCIILiteral NodeWorkerThreadsCode = "(function (){\"use strict\";// src/js/out/tmp/node/worker_threads.ts\nvar emitWarning = function(type, message) {\n  if (emittedWarnings.has(type))\n    return;\n  emittedWarnings.add(type), console.warn(\"[bun] Warning:\", message);\n}, injectFakeEmitter = function(Class) {\n  function messageEventHandler(event) {\n    return event.data;\n  }\n  function errorEventHandler(event) {\n    return event.error;\n  }\n  const wrappedListener = Symbol(\"wrappedListener\");\n  function wrapped(run, listener) {\n    const callback = function(event) {\n      return listener(run(event));\n    };\n    return listener[wrappedListener] = callback, callback;\n  }\n  function functionForEventType(event, listener) {\n    switch (event) {\n      case \"error\":\n      case \"messageerror\":\n        return wrapped(errorEventHandler, listener);\n      default:\n        return wrapped(messageEventHandler, listener);\n    }\n  }\n  Class.prototype.on = function(event, listener) {\n    return this.addEventListener(event, functionForEventType(event, listener)), this;\n  }, Class.prototype.off = function(event, listener) {\n    if (listener)\n      this.removeEventListener(event, listener[wrappedListener] || listener);\n    else\n      this.removeEventListener(event);\n    return this;\n  }, Class.prototype.once = function(event, listener) {\n    return this.addEventListener(event, functionForEventType(event, listener), { once: !0 }), this;\n  };\n  function EventClass(eventName) {\n    if (eventName === \"error\" || eventName === \"messageerror\")\n      return ErrorEvent;\n    return MessageEvent;\n  }\n  Class.prototype.emit = function(event, ...args) {\n    return this.dispatchEvent(new (EventClass(event))(event, ...args)), this;\n  }, Class.prototype.prependListener = Class.prototype.on, Class.prototype.prependOnceListener = Class.prototype.once;\n}, receiveMessageOnPort = function(port) {\n  let res = _receiveMessageOnPort(port);\n  if (!res)\n    return @undefined;\n  return {\n    message: res\n  };\n}, fakeParentPort = function() {\n  const fake = Object.create(MessagePort.prototype);\n  return Object.defineProperty(fake, \"onmessage\", {\n    get() {\n      return self.onmessage;\n    },\n    set(value) {\n      self.onmessage = value;\n    }\n  }), Object.defineProperty(fake, \"onmessageerror\", {\n    get() {\n      return self.onmessageerror;\n    },\n    set(value) {\n    }\n  }), Object.defineProperty(fake, \"postMessage\", {\n    value(...args) {\n      return self.postMessage(...args);\n    }\n  }), Object.defineProperty(fake, \"close\", {\n    value() {\n      return process.exit(0);\n    }\n  }), Object.defineProperty(fake, \"start\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"unref\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"ref\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"hasRef\", {\n    value() {\n      return !1;\n    }\n  }), Object.defineProperty(fake, \"setEncoding\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"addEventListener\", {\n    value: self.addEventListener.bind(self)\n  }), Object.defineProperty(fake, \"removeEventListener\", {\n    value: self.removeEventListener.bind(self)\n  }), fake;\n}, getEnvironmentData = function() {\n  return process.env;\n}, setEnvironmentData = function(env) {\n  process.env = env;\n}, markAsUntransferable = function() {\n  throwNotImplemented(\"worker_threads.markAsUntransferable\");\n}, moveMessagePortToContext = function() {\n  throwNotImplemented(\"worker_threads.moveMessagePortToContext\");\n}, $, EventEmitter = @getInternalField(@internalModuleRegistry, 20) || @createInternalModuleById(20), { throwNotImplemented } = @getInternalField(@internalModuleRegistry, 6) || @createInternalModuleById(6), { MessageChannel, BroadcastChannel, Worker: WebWorker } = globalThis, SHARE_ENV = Symbol(\"nodejs.worker_threads.SHARE_ENV\"), isMainThread = Bun.isMainThread, [_workerData, _threadId, _receiveMessageOnPort] = @lazy(\"worker_threads\"), emittedWarnings = new Set, _MessagePort = globalThis.MessagePort;\ninjectFakeEmitter(_MessagePort);\nvar MessagePort = _MessagePort, resourceLimits = {}, workerData = _workerData, threadId = _threadId, parentPort = isMainThread \? null : fakeParentPort(), unsupportedOptions = [\n  \"eval\",\n  \"argv\",\n  \"execArgv\",\n  \"stdin\",\n  \"stdout\",\n  \"stderr\",\n  \"trackedUnmanagedFds\",\n  \"resourceLimits\"\n];\n\nclass Worker extends EventEmitter {\n  #worker;\n  #performance;\n  #onExitPromise = @undefined;\n  constructor(filename, options = {}) {\n    super();\n    for (let key of unsupportedOptions)\n      if (key in options)\n        emitWarning(\"option.\" + key, `worker_threads.Worker option \"${key}\" is not implemented.`);\n    this.#worker = new WebWorker(filename, options), this.#worker.addEventListener(\"close\", this.#onClose.bind(this)), this.#worker.addEventListener(\"error\", this.#onError.bind(this)), this.#worker.addEventListener(\"message\", this.#onMessage.bind(this)), this.#worker.addEventListener(\"messageerror\", this.#onMessageError.bind(this)), this.#worker.addEventListener(\"open\", this.#onOpen.bind(this));\n  }\n  ref() {\n    this.#worker.ref();\n  }\n  unref() {\n    this.#worker.unref();\n  }\n  get stdin() {\n    return null;\n  }\n  get stdout() {\n    return null;\n  }\n  get stderr() {\n    return null;\n  }\n  get performance() {\n    return this.#performance \?\?= {\n      eventLoopUtilization() {\n        return emitWarning(\"performance\", \"worker_threads.Worker.performance is not implemented.\"), {\n          idle: 0,\n          active: 0,\n          utilization: 0\n        };\n      }\n    };\n  }\n  terminate() {\n    var onExitPromise = this.#onExitPromise;\n    if (onExitPromise)\n      return @isPromise(onExitPromise) \? onExitPromise : @Promise.resolve(onExitPromise);\n    const { resolve, promise } = @Promise.withResolvers();\n    return this.#worker.addEventListener(\"close\", (event) => {\n      resolve(event.code);\n    }, { once: !0 }), this.#worker.terminate(), this.#onExitPromise = promise;\n  }\n  postMessage(...args) {\n    return this.#worker.postMessage(...args);\n  }\n  #onClose(e) {\n    this.#onExitPromise = e.code, this.emit(\"exit\", e.code);\n  }\n  #onError(error) {\n    this.emit(\"error\", error);\n  }\n  #onMessage(event) {\n    this.emit(\"message\", event.data);\n  }\n  #onMessageError(event) {\n    this.emit(\"messageerror\", event.error \?\? event.data \?\? event);\n  }\n  #onOpen() {\n    this.emit(\"online\");\n  }\n  async getHeapSnapshot() {\n    throwNotImplemented(\"worker_threads.Worker.getHeapSnapshot\");\n  }\n}\n$ = {\n  Worker,\n  workerData,\n  parentPort,\n  resourceLimits,\n  isMainThread,\n  MessageChannel,\n  BroadcastChannel,\n  MessagePort,\n  getEnvironmentData,\n  setEnvironmentData,\n  getHeapSnapshot() {\n    return {};\n  },\n  markAsUntransferable,\n  moveMessagePortToContext,\n  receiveMessageOnPort,\n  SHARE_ENV,\n  threadId\n};\nreturn $})\n"_s;
+static constexpr ASCIILiteral NodeWorkerThreadsCode = "(function (){\"use strict\";// src/js/out/tmp/node/worker_threads.ts\nvar emitWarning = function(type, message) {\n  if (emittedWarnings.has(type))\n    return;\n  emittedWarnings.add(type), console.warn(\"[bun] Warning:\", message);\n}, injectFakeEmitter = function(Class) {\n  function messageEventHandler(event) {\n    return event.data;\n  }\n  function errorEventHandler(event) {\n    return event.error;\n  }\n  const wrappedListener = Symbol(\"wrappedListener\");\n  function wrapped(run, listener) {\n    const callback = function(event) {\n      return listener(run(event));\n    };\n    return listener[wrappedListener] = callback, callback;\n  }\n  function functionForEventType(event, listener) {\n    switch (event) {\n      case \"error\":\n      case \"messageerror\":\n        return wrapped(errorEventHandler, listener);\n      default:\n        return wrapped(messageEventHandler, listener);\n    }\n  }\n  Class.prototype.on = function(event, listener) {\n    return this.addEventListener(event, functionForEventType(event, listener)), this;\n  }, Class.prototype.off = function(event, listener) {\n    if (listener)\n      this.removeEventListener(event, listener[wrappedListener] || listener);\n    else\n      this.removeEventListener(event);\n    return this;\n  }, Class.prototype.once = function(event, listener) {\n    return this.addEventListener(event, functionForEventType(event, listener), { once: !0 }), this;\n  };\n  function EventClass(eventName) {\n    if (eventName === \"error\" || eventName === \"messageerror\")\n      return ErrorEvent;\n    return MessageEvent;\n  }\n  Class.prototype.emit = function(event, ...args) {\n    return this.dispatchEvent(new (EventClass(event))(event, ...args)), this;\n  }, Class.prototype.prependListener = Class.prototype.on, Class.prototype.prependOnceListener = Class.prototype.once;\n}, receiveMessageOnPort = function(port) {\n  let res = _receiveMessageOnPort(port);\n  if (!res)\n    return @undefined;\n  return {\n    message: res\n  };\n}, fakeParentPort = function() {\n  const fake = Object.create(MessagePort.prototype);\n  return Object.defineProperty(fake, \"onmessage\", {\n    get() {\n      return self.onmessage;\n    },\n    set(value) {\n      self.onmessage = value;\n    }\n  }), Object.defineProperty(fake, \"onmessageerror\", {\n    get() {\n      return self.onmessageerror;\n    },\n    set(value) {\n    }\n  }), Object.defineProperty(fake, \"postMessage\", {\n    value(...args) {\n      return self.postMessage(...args);\n    }\n  }), Object.defineProperty(fake, \"close\", {\n    value() {\n      return process.exit(0);\n    }\n  }), Object.defineProperty(fake, \"start\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"unref\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"ref\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"hasRef\", {\n    value() {\n      return !1;\n    }\n  }), Object.defineProperty(fake, \"setEncoding\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"addEventListener\", {\n    value: self.addEventListener.bind(self)\n  }), Object.defineProperty(fake, \"removeEventListener\", {\n    value: self.removeEventListener.bind(self)\n  }), fake;\n}, getEnvironmentData = function() {\n  return process.env;\n}, setEnvironmentData = function(env) {\n  process.env = env;\n}, markAsUntransferable = function() {\n  throwNotImplemented(\"worker_threads.markAsUntransferable\");\n}, moveMessagePortToContext = function() {\n  throwNotImplemented(\"worker_threads.moveMessagePortToContext\");\n}, $, EventEmitter = @getInternalField(@internalModuleRegistry, 20) || @createInternalModuleById(20), { throwNotImplemented } = @getInternalField(@internalModuleRegistry, 6) || @createInternalModuleById(6), { MessageChannel, BroadcastChannel, Worker: WebWorker } = globalThis, SHARE_ENV = Symbol(\"nodejs.worker_threads.SHARE_ENV\"), isMainThread = Bun.isMainThread, [_workerData, _threadId, _receiveMessageOnPort] = @lazy(\"worker_threads\"), emittedWarnings = new Set, _MessagePort = globalThis.MessagePort;\ninjectFakeEmitter(_MessagePort);\nvar MessagePort = _MessagePort, resourceLimits = {}, workerData = _workerData, threadId = _threadId, parentPort = isMainThread \? null : fakeParentPort(), unsupportedOptions = [\n  \"eval\",\n  \"argv\",\n  \"execArgv\",\n  \"stdin\",\n  \"stdout\",\n  \"stderr\",\n  \"trackedUnmanagedFds\",\n  \"resourceLimits\"\n];\n\nclass Worker extends EventEmitter {\n  #worker;\n  #performance;\n  #onExitPromise = @undefined;\n  constructor(filename, options = {}) {\n    super();\n    for (let key of unsupportedOptions)\n      if (key in options)\n        emitWarning(\"option.\" + key, `worker_threads.Worker option \"${key}\" is not implemented.`);\n    this.#worker = new WebWorker(filename, options), this.#worker.addEventListener(\"close\", this.#onClose.bind(this)), this.#worker.addEventListener(\"error\", this.#onError.bind(this)), this.#worker.addEventListener(\"message\", this.#onMessage.bind(this)), this.#worker.addEventListener(\"messageerror\", this.#onMessageError.bind(this)), this.#worker.addEventListener(\"open\", this.#onOpen.bind(this));\n  }\n  get threadId() {\n    return this.#worker.threadId;\n  }\n  ref() {\n    this.#worker.ref();\n  }\n  unref() {\n    this.#worker.unref();\n  }\n  get stdin() {\n    return null;\n  }\n  get stdout() {\n    return null;\n  }\n  get stderr() {\n    return null;\n  }\n  get performance() {\n    return this.#performance \?\?= {\n      eventLoopUtilization() {\n        return emitWarning(\"performance\", \"worker_threads.Worker.performance is not implemented.\"), {\n          idle: 0,\n          active: 0,\n          utilization: 0\n        };\n      }\n    };\n  }\n  terminate() {\n    const onExitPromise = this.#onExitPromise;\n    if (onExitPromise)\n      return @isPromise(onExitPromise) \? onExitPromise : @Promise.resolve(onExitPromise);\n    const { resolve, promise } = @Promise.withResolvers();\n    return this.#worker.addEventListener(\"close\", (event) => {\n      resolve(event.code);\n    }, { once: !0 }), this.#worker.terminate(), this.#onExitPromise = promise;\n  }\n  postMessage(...args) {\n    return this.#worker.postMessage(...args);\n  }\n  #onClose(e) {\n    this.#onExitPromise = e.code, this.emit(\"exit\", e.code);\n  }\n  #onError(error) {\n    this.emit(\"error\", error);\n  }\n  #onMessage(event) {\n    this.emit(\"message\", event.data);\n  }\n  #onMessageError(event) {\n    this.emit(\"messageerror\", event.error \?\? event.data \?\? event);\n  }\n  #onOpen() {\n    this.emit(\"online\");\n  }\n  async getHeapSnapshot() {\n    throwNotImplemented(\"worker_threads.Worker.getHeapSnapshot\");\n  }\n}\n$ = {\n  Worker,\n  workerData,\n  parentPort,\n  resourceLimits,\n  isMainThread,\n  MessageChannel,\n  BroadcastChannel,\n  MessagePort,\n  getEnvironmentData,\n  setEnvironmentData,\n  getHeapSnapshot() {\n    return {};\n  },\n  markAsUntransferable,\n  moveMessagePortToContext,\n  receiveMessageOnPort,\n  SHARE_ENV,\n  threadId\n};\nreturn $})\n"_s;
 //
 
 //
@@ -713,7 +713,7 @@ static constexpr ASCIILiteral NodeWasiCode = "(function (){\"use strict\";// src
 //
 
 //
-static constexpr ASCIILiteral NodeWorkerThreadsCode = "(function (){\"use strict\";// src/js/out/tmp/node/worker_threads.ts\nvar emitWarning = function(type, message) {\n  if (emittedWarnings.has(type))\n    return;\n  emittedWarnings.add(type), console.warn(\"[bun] Warning:\", message);\n}, injectFakeEmitter = function(Class) {\n  function messageEventHandler(event) {\n    return event.data;\n  }\n  function errorEventHandler(event) {\n    return event.error;\n  }\n  const wrappedListener = Symbol(\"wrappedListener\");\n  function wrapped(run, listener) {\n    const callback = function(event) {\n      return listener(run(event));\n    };\n    return listener[wrappedListener] = callback, callback;\n  }\n  function functionForEventType(event, listener) {\n    switch (event) {\n      case \"error\":\n      case \"messageerror\":\n        return wrapped(errorEventHandler, listener);\n      default:\n        return wrapped(messageEventHandler, listener);\n    }\n  }\n  Class.prototype.on = function(event, listener) {\n    return this.addEventListener(event, functionForEventType(event, listener)), this;\n  }, Class.prototype.off = function(event, listener) {\n    if (listener)\n      this.removeEventListener(event, listener[wrappedListener] || listener);\n    else\n      this.removeEventListener(event);\n    return this;\n  }, Class.prototype.once = function(event, listener) {\n    return this.addEventListener(event, functionForEventType(event, listener), { once: !0 }), this;\n  };\n  function EventClass(eventName) {\n    if (eventName === \"error\" || eventName === \"messageerror\")\n      return ErrorEvent;\n    return MessageEvent;\n  }\n  Class.prototype.emit = function(event, ...args) {\n    return this.dispatchEvent(new (EventClass(event))(event, ...args)), this;\n  }, Class.prototype.prependListener = Class.prototype.on, Class.prototype.prependOnceListener = Class.prototype.once;\n}, receiveMessageOnPort = function(port) {\n  let res = _receiveMessageOnPort(port);\n  if (!res)\n    return @undefined;\n  return {\n    message: res\n  };\n}, fakeParentPort = function() {\n  const fake = Object.create(MessagePort.prototype);\n  return Object.defineProperty(fake, \"onmessage\", {\n    get() {\n      return self.onmessage;\n    },\n    set(value) {\n      self.onmessage = value;\n    }\n  }), Object.defineProperty(fake, \"onmessageerror\", {\n    get() {\n      return self.onmessageerror;\n    },\n    set(value) {\n    }\n  }), Object.defineProperty(fake, \"postMessage\", {\n    value(...args) {\n      return self.postMessage(...args);\n    }\n  }), Object.defineProperty(fake, \"close\", {\n    value() {\n      return process.exit(0);\n    }\n  }), Object.defineProperty(fake, \"start\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"unref\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"ref\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"hasRef\", {\n    value() {\n      return !1;\n    }\n  }), Object.defineProperty(fake, \"setEncoding\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"addEventListener\", {\n    value: self.addEventListener.bind(self)\n  }), Object.defineProperty(fake, \"removeEventListener\", {\n    value: self.removeEventListener.bind(self)\n  }), fake;\n}, getEnvironmentData = function() {\n  return process.env;\n}, setEnvironmentData = function(env) {\n  process.env = env;\n}, markAsUntransferable = function() {\n  throwNotImplemented(\"worker_threads.markAsUntransferable\");\n}, moveMessagePortToContext = function() {\n  throwNotImplemented(\"worker_threads.moveMessagePortToContext\");\n}, $, EventEmitter = @getInternalField(@internalModuleRegistry, 20) || @createInternalModuleById(20), { throwNotImplemented } = @getInternalField(@internalModuleRegistry, 6) || @createInternalModuleById(6), { MessageChannel, BroadcastChannel, Worker: WebWorker } = globalThis, SHARE_ENV = Symbol(\"nodejs.worker_threads.SHARE_ENV\"), isMainThread = Bun.isMainThread, [_workerData, _threadId, _receiveMessageOnPort] = @lazy(\"worker_threads\"), emittedWarnings = new Set, _MessagePort = globalThis.MessagePort;\ninjectFakeEmitter(_MessagePort);\nvar MessagePort = _MessagePort, resourceLimits = {}, workerData = _workerData, threadId = _threadId, parentPort = isMainThread \? null : fakeParentPort(), unsupportedOptions = [\n  \"eval\",\n  \"argv\",\n  \"execArgv\",\n  \"stdin\",\n  \"stdout\",\n  \"stderr\",\n  \"trackedUnmanagedFds\",\n  \"resourceLimits\"\n];\n\nclass Worker extends EventEmitter {\n  #worker;\n  #performance;\n  #onExitPromise = @undefined;\n  constructor(filename, options = {}) {\n    super();\n    for (let key of unsupportedOptions)\n      if (key in options)\n        emitWarning(\"option.\" + key, `worker_threads.Worker option \"${key}\" is not implemented.`);\n    this.#worker = new WebWorker(filename, options), this.#worker.addEventListener(\"close\", this.#onClose.bind(this)), this.#worker.addEventListener(\"error\", this.#onError.bind(this)), this.#worker.addEventListener(\"message\", this.#onMessage.bind(this)), this.#worker.addEventListener(\"messageerror\", this.#onMessageError.bind(this)), this.#worker.addEventListener(\"open\", this.#onOpen.bind(this));\n  }\n  ref() {\n    this.#worker.ref();\n  }\n  unref() {\n    this.#worker.unref();\n  }\n  get stdin() {\n    return null;\n  }\n  get stdout() {\n    return null;\n  }\n  get stderr() {\n    return null;\n  }\n  get performance() {\n    return this.#performance \?\?= {\n      eventLoopUtilization() {\n        return emitWarning(\"performance\", \"worker_threads.Worker.performance is not implemented.\"), {\n          idle: 0,\n          active: 0,\n          utilization: 0\n        };\n      }\n    };\n  }\n  terminate() {\n    var onExitPromise = this.#onExitPromise;\n    if (onExitPromise)\n      return @isPromise(onExitPromise) \? onExitPromise : @Promise.resolve(onExitPromise);\n    const { resolve, promise } = @Promise.withResolvers();\n    return this.#worker.addEventListener(\"close\", (event) => {\n      resolve(event.code);\n    }, { once: !0 }), this.#worker.terminate(), this.#onExitPromise = promise;\n  }\n  postMessage(...args) {\n    return this.#worker.postMessage(...args);\n  }\n  #onClose(e) {\n    this.#onExitPromise = e.code, this.emit(\"exit\", e.code);\n  }\n  #onError(error) {\n    this.emit(\"error\", error);\n  }\n  #onMessage(event) {\n    this.emit(\"message\", event.data);\n  }\n  #onMessageError(event) {\n    this.emit(\"messageerror\", event.error \?\? event.data \?\? event);\n  }\n  #onOpen() {\n    this.emit(\"online\");\n  }\n  async getHeapSnapshot() {\n    throwNotImplemented(\"worker_threads.Worker.getHeapSnapshot\");\n  }\n}\n$ = {\n  Worker,\n  workerData,\n  parentPort,\n  resourceLimits,\n  isMainThread,\n  MessageChannel,\n  BroadcastChannel,\n  MessagePort,\n  getEnvironmentData,\n  setEnvironmentData,\n  getHeapSnapshot() {\n    return {};\n  },\n  markAsUntransferable,\n  moveMessagePortToContext,\n  receiveMessageOnPort,\n  SHARE_ENV,\n  threadId\n};\nreturn $})\n"_s;
+static constexpr ASCIILiteral NodeWorkerThreadsCode = "(function (){\"use strict\";// src/js/out/tmp/node/worker_threads.ts\nvar emitWarning = function(type, message) {\n  if (emittedWarnings.has(type))\n    return;\n  emittedWarnings.add(type), console.warn(\"[bun] Warning:\", message);\n}, injectFakeEmitter = function(Class) {\n  function messageEventHandler(event) {\n    return event.data;\n  }\n  function errorEventHandler(event) {\n    return event.error;\n  }\n  const wrappedListener = Symbol(\"wrappedListener\");\n  function wrapped(run, listener) {\n    const callback = function(event) {\n      return listener(run(event));\n    };\n    return listener[wrappedListener] = callback, callback;\n  }\n  function functionForEventType(event, listener) {\n    switch (event) {\n      case \"error\":\n      case \"messageerror\":\n        return wrapped(errorEventHandler, listener);\n      default:\n        return wrapped(messageEventHandler, listener);\n    }\n  }\n  Class.prototype.on = function(event, listener) {\n    return this.addEventListener(event, functionForEventType(event, listener)), this;\n  }, Class.prototype.off = function(event, listener) {\n    if (listener)\n      this.removeEventListener(event, listener[wrappedListener] || listener);\n    else\n      this.removeEventListener(event);\n    return this;\n  }, Class.prototype.once = function(event, listener) {\n    return this.addEventListener(event, functionForEventType(event, listener), { once: !0 }), this;\n  };\n  function EventClass(eventName) {\n    if (eventName === \"error\" || eventName === \"messageerror\")\n      return ErrorEvent;\n    return MessageEvent;\n  }\n  Class.prototype.emit = function(event, ...args) {\n    return this.dispatchEvent(new (EventClass(event))(event, ...args)), this;\n  }, Class.prototype.prependListener = Class.prototype.on, Class.prototype.prependOnceListener = Class.prototype.once;\n}, receiveMessageOnPort = function(port) {\n  let res = _receiveMessageOnPort(port);\n  if (!res)\n    return @undefined;\n  return {\n    message: res\n  };\n}, fakeParentPort = function() {\n  const fake = Object.create(MessagePort.prototype);\n  return Object.defineProperty(fake, \"onmessage\", {\n    get() {\n      return self.onmessage;\n    },\n    set(value) {\n      self.onmessage = value;\n    }\n  }), Object.defineProperty(fake, \"onmessageerror\", {\n    get() {\n      return self.onmessageerror;\n    },\n    set(value) {\n    }\n  }), Object.defineProperty(fake, \"postMessage\", {\n    value(...args) {\n      return self.postMessage(...args);\n    }\n  }), Object.defineProperty(fake, \"close\", {\n    value() {\n      return process.exit(0);\n    }\n  }), Object.defineProperty(fake, \"start\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"unref\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"ref\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"hasRef\", {\n    value() {\n      return !1;\n    }\n  }), Object.defineProperty(fake, \"setEncoding\", {\n    value() {\n    }\n  }), Object.defineProperty(fake, \"addEventListener\", {\n    value: self.addEventListener.bind(self)\n  }), Object.defineProperty(fake, \"removeEventListener\", {\n    value: self.removeEventListener.bind(self)\n  }), fake;\n}, getEnvironmentData = function() {\n  return process.env;\n}, setEnvironmentData = function(env) {\n  process.env = env;\n}, markAsUntransferable = function() {\n  throwNotImplemented(\"worker_threads.markAsUntransferable\");\n}, moveMessagePortToContext = function() {\n  throwNotImplemented(\"worker_threads.moveMessagePortToContext\");\n}, $, EventEmitter = @getInternalField(@internalModuleRegistry, 20) || @createInternalModuleById(20), { throwNotImplemented } = @getInternalField(@internalModuleRegistry, 6) || @createInternalModuleById(6), { MessageChannel, BroadcastChannel, Worker: WebWorker } = globalThis, SHARE_ENV = Symbol(\"nodejs.worker_threads.SHARE_ENV\"), isMainThread = Bun.isMainThread, [_workerData, _threadId, _receiveMessageOnPort] = @lazy(\"worker_threads\"), emittedWarnings = new Set, _MessagePort = globalThis.MessagePort;\ninjectFakeEmitter(_MessagePort);\nvar MessagePort = _MessagePort, resourceLimits = {}, workerData = _workerData, threadId = _threadId, parentPort = isMainThread \? null : fakeParentPort(), unsupportedOptions = [\n  \"eval\",\n  \"argv\",\n  \"execArgv\",\n  \"stdin\",\n  \"stdout\",\n  \"stderr\",\n  \"trackedUnmanagedFds\",\n  \"resourceLimits\"\n];\n\nclass Worker extends EventEmitter {\n  #worker;\n  #performance;\n  #onExitPromise = @undefined;\n  constructor(filename, options = {}) {\n    super();\n    for (let key of unsupportedOptions)\n      if (key in options)\n        emitWarning(\"option.\" + key, `worker_threads.Worker option \"${key}\" is not implemented.`);\n    this.#worker = new WebWorker(filename, options), this.#worker.addEventListener(\"close\", this.#onClose.bind(this)), this.#worker.addEventListener(\"error\", this.#onError.bind(this)), this.#worker.addEventListener(\"message\", this.#onMessage.bind(this)), this.#worker.addEventListener(\"messageerror\", this.#onMessageError.bind(this)), this.#worker.addEventListener(\"open\", this.#onOpen.bind(this));\n  }\n  get threadId() {\n    return this.#worker.threadId;\n  }\n  ref() {\n    this.#worker.ref();\n  }\n  unref() {\n    this.#worker.unref();\n  }\n  get stdin() {\n    return null;\n  }\n  get stdout() {\n    return null;\n  }\n  get stderr() {\n    return null;\n  }\n  get performance() {\n    return this.#performance \?\?= {\n      eventLoopUtilization() {\n        return emitWarning(\"performance\", \"worker_threads.Worker.performance is not implemented.\"), {\n          idle: 0,\n          active: 0,\n          utilization: 0\n        };\n      }\n    };\n  }\n  terminate() {\n    const onExitPromise = this.#onExitPromise;\n    if (onExitPromise)\n      return @isPromise(onExitPromise) \? onExitPromise : @Promise.resolve(onExitPromise);\n    const { resolve, promise } = @Promise.withResolvers();\n    return this.#worker.addEventListener(\"close\", (event) => {\n      resolve(event.code);\n    }, { once: !0 }), this.#worker.terminate(), this.#onExitPromise = promise;\n  }\n  postMessage(...args) {\n    return this.#worker.postMessage(...args);\n  }\n  #onClose(e) {\n    this.#onExitPromise = e.code, this.emit(\"exit\", e.code);\n  }\n  #onError(error) {\n    this.emit(\"error\", error);\n  }\n  #onMessage(event) {\n    this.emit(\"message\", event.data);\n  }\n  #onMessageError(event) {\n    this.emit(\"messageerror\", event.error \?\? event.data \?\? event);\n  }\n  #onOpen() {\n    this.emit(\"online\");\n  }\n  async getHeapSnapshot() {\n    throwNotImplemented(\"worker_threads.Worker.getHeapSnapshot\");\n  }\n}\n$ = {\n  Worker,\n  workerData,\n  parentPort,\n  resourceLimits,\n  isMainThread,\n  MessageChannel,\n  BroadcastChannel,\n  MessagePort,\n  getEnvironmentData,\n  setEnvironmentData,\n  getHeapSnapshot() {\n    return {};\n  },\n  markAsUntransferable,\n  moveMessagePortToContext,\n  receiveMessageOnPort,\n  SHARE_ENV,\n  threadId\n};\nreturn $})\n"_s;
 //
 
 //
diff --git a/src/js/private.d.ts b/src/js/private.d.ts
index 77f4d5536..762449333 100644
--- a/src/js/private.d.ts
+++ b/src/js/private.d.ts
@@ -193,12 +193,7 @@ interface BunLazyModules {
     cleanupLater: () => void;
     setAsyncHooksEnabled: (enabled: boolean) => void;
   };
-  "worker_threads": [
-    //
-    workerData: any,
-    threadId: number,
-    _receiveMessageOnPort: (port: MessagePort) => any,
-  ];
+  "worker_threads": [workerData: any, threadId: number, _receiveMessageOnPort: (port: MessagePort) => any];
   "tty": {
     ttySetMode: (fd: number, mode: number) => number;
     isatty: (fd: number) => boolean;
diff --git a/test/js/node/worker_threads/worker_threads.test.ts b/test/js/node/worker_threads/worker_threads.test.ts
index ae88add17..86cbaa208 100644
--- a/test/js/node/worker_threads/worker_threads.test.ts
+++ b/test/js/node/worker_threads/worker_threads.test.ts
@@ -16,7 +16,7 @@ import {
   MessagePort,
   Worker,
 } from "worker_threads";
-test("all properties are present", () => {
+test("all worker_threads module properties are present", () => {
   expect(wt).toHaveProperty("getEnvironmentData");
   expect(wt).toHaveProperty("isMainThread");
   expect(wt).toHaveProperty("markAsUntransferable");
@@ -42,7 +42,7 @@ test("all properties are present", () => {
   expect(resourceLimits).toBeDefined();
   expect(SHARE_ENV).toBeDefined();
   expect(setEnvironmentData).toBeDefined();
-  expect(threadId).toBeDefined();
+  expect(threadId).toBeNumber();
   expect(workerData).toBeUndefined();
   expect(BroadcastChannel).toBeDefined();
   expect(MessageChannel).toBeDefined();
@@ -60,9 +60,64 @@ test("all properties are present", () => {
   }).toThrow("not yet implemented");
 });
 
+test("all worker_threads worker instance properties are present", () => {
+  const worker = new Worker(new URL("./worker.js", import.meta.url).href);
+  expect(worker).toHaveProperty("threadId");
+  expect(worker).toHaveProperty("ref");
+  expect(worker).toHaveProperty("unref");
+  expect(worker).toHaveProperty("stdin");
+  expect(worker).toHaveProperty("stdout");
+  expect(worker).toHaveProperty("stderr");
+  expect(worker).toHaveProperty("performance");
+  expect(worker).toHaveProperty("terminate");
+  expect(worker).toHaveProperty("postMessage");
+  expect(worker).toHaveProperty("getHeapSnapshot");
+  expect(worker).toHaveProperty("setMaxListeners");
+  expect(worker).toHaveProperty("getMaxListeners");
+  expect(worker).toHaveProperty("emit");
+  expect(worker).toHaveProperty("addListener");
+  expect(worker).toHaveProperty("on");
+  expect(worker).toHaveProperty("prependListener");
+  expect(worker).toHaveProperty("once");
+  expect(worker).toHaveProperty("prependOnceListener");
+  expect(worker).toHaveProperty("removeListener");
+  expect(worker).toHaveProperty("off");
+  expect(worker).toHaveProperty("removeAllListeners");
+  expect(worker).toHaveProperty("listeners");
+  expect(worker).toHaveProperty("rawListeners");
+  expect(worker).toHaveProperty("listenerCount");
+  expect(worker).toHaveProperty("eventNames");
+
+  expect(worker.threadId).toBeNumber();
+  expect(worker.ref).toBeFunction();
+  expect(worker.unref).toBeFunction();
+  expect(worker.stdin).toBeNull();
+  expect(worker.stdout).toBeNull();
+  expect(worker.stderr).toBeNull();
+  expect(worker.performance).toBeDefined();
+  expect(worker.terminate).toBeFunction();
+  expect(worker.postMessage).toBeFunction();
+  expect(worker.getHeapSnapshot).toBeFunction();
+  expect(worker.setMaxListeners).toBeFunction();
+  expect(worker.getMaxListeners).toBeFunction();
+  expect(worker.emit).toBeFunction();
+  expect(worker.addListener).toBeFunction();
+  expect(worker.on).toBeFunction();
+  expect(worker.prependListener).toBeFunction();
+  expect(worker.once).toBeFunction();
+  expect(worker.prependOnceListener).toBeFunction();
+  expect(worker.removeListener).toBeFunction();
+  expect(worker.off).toBeFunction();
+  expect(worker.removeAllListeners).toBeFunction();
+  expect(worker.listeners).toBeFunction();
+  expect(worker.rawListeners).toBeFunction();
+  expect(worker.listenerCount).toBeFunction();
+  expect(worker.eventNames).toBeFunction();
+});
+
 test("receiveMessageOnPort works across threads", () => {
   const { port1, port2 } = new MessageChannel();
-  var worker = new wt.Worker(new URL("./worker.js", import.meta.url).href, {
+  const worker = new Worker(new URL("./worker.js", import.meta.url).href, {
     workerData: port2,
     transferList: [port2],
   });
@@ -77,7 +132,7 @@ test("receiveMessageOnPort works across threads", () => {
 });
 
 test("receiveMessageOnPort works with FIFO", () => {
-  const { port1, port2 } = new wt.MessageChannel();
+  const { port1, port2 } = new MessageChannel();
 
   const message1 = { hello: "world" };
   const message2 = { foo: "bar" };
diff --git a/test/js/web/worker.test.ts b/test/js/web/worker.test.ts
index e1ab80487..8d7cf72d2 100644
--- a/test/js/web/worker.test.ts
+++ b/test/js/web/worker.test.ts
@@ -126,7 +126,7 @@ test("worker with event listeners doesnt close event loop", done => {
   });
 });
 
-test("worker with event listeners doesnt close event loop 2", done => {
+test("worker with event listeners doesn't close event loop 2", done => {
   const x = Bun.spawn({
     cmd: [bunExe(), path.join(import.meta.dir, "many-messages-event-loop.mjs"), "worker-fixture-many-messages2.js"],
     env: bunEnv,