@gjsify/worker_threads 0.4.13 → 0.4.15

package/lib/esm/message-port.js

@@ -1 +1 @@
-import"./_virtual/_rolldown/runtime.js";import{isSharedBuffer as e}from"./sab-transfer.js";import{EventEmitter as t}from"node:events";function isTransferredPortPlaceholder(e){return typeof e==`object`&&!!e&&e.__gjsifyTransferredPort===!0}var n=class MessagePort extends t{_started=!1;_closed=!1;_detached=!1;_messageQueue=[];_otherPort=null;_aeWrappers=new Map;start(){this._started||this._closed||(this._started=!0,this._drainQueue())}close(){if(this._closed)return;this._closed=!0;let e=this._otherPort;this._otherPort=null,e&&(e._otherPort=null),this.emit(`close`),this.removeAllListeners()}postMessage(t,n){if(this._closed)return;let r=this._otherPort;if(!r)return;let i=[],a=[];if(n&&n.length>0){let t=new Set;for(let r of n){if(t.has(r))throw createDataCloneError(`Transfer list contains duplicate entries`);if(t.add(r),r instanceof MessagePort){if(r===this)throw createDataCloneError(`Cannot transfer source port`);if(r._closed||r._detached)throw createDataCloneError(`MessagePort in transfer list is already detached`);a.push(r);continue}let o=Object.prototype.toString.call(r).slice(8,-1);if(o===`ArrayBuffer`){let e=r;if(e.detached===!0)throw createDataCloneError(`ArrayBuffer in transfer list is detached`);i.push(e);continue}if(o===`SharedArrayBuffer`)throw createDataCloneError(`SharedArrayBuffer cannot appear in transfer list (it is shared, not transferred)`);if(!e(r))throw createDataCloneError(`Value at index ${n.indexOf(r)} of transfer list is not transferable`)}}let o=a.slice(),s=t;a.length>0&&(s=substitutePortsWithPlaceholders(t,a));let c;try{c=structuredClone(s,{transfer:i.length>0?i:void 0})}catch(e){this.emit(`messageerror`,e instanceof Error?e:Error(`Could not clone message`));return}let l=c;if(o.length>0){let e=o.map(e=>{let t=e._otherPort,n=e._messageQueue.slice();e._messageQueue.length=0,e._otherPort=null,e._detached=!0,e._closed=!0;let r=new MessagePort;r._otherPort=t,t&&(t._otherPort=r);for(let e of n)r._messageQueue.push(e);return r});l=replacePlaceholdersWithPorts(c,e)}r._receiveMessage(l)}ref(){return this}unref(){return this}_receiveMessage(e){if(!this._closed){if(!this._started){this._messageQueue.push(e);return}this._dispatchMessage(e)}}get _hasQueuedMessages(){return this._messageQueue.length>0}_dequeueMessage(){return this._messageQueue.shift()}get _wasTransferred(){return this._detached}_drainQueue(){for(;this._messageQueue.length>0;)this._dispatchMessage(this._messageQueue.shift())}_dispatchMessage(e){Promise.resolve().then(()=>{this._closed||this.emit(`message`,e)})}addEventListener(e,t){if(t)if(e===`message`){let wrapper=e=>{t({data:e,type:`message`})};this._aeWrappers.set(t,wrapper),super.on(`message`,wrapper)}else super.on(e,t)}removeEventListener(e,t){if(t)if(e===`message`){let e=this._aeWrappers.get(t);e&&(super.off(`message`,e),this._aeWrappers.delete(t))}else super.off(e,t)}on(e,t){return super.on(e,t),e===`message`&&!this._started&&this.start(),this}addListener(e,t){return this.on(e,t)}once(e,t){return super.once(e,t),e===`message`&&!this._started&&this.start(),this}};function createDataCloneError(e){let t=globalThis.DOMException;if(typeof t==`function`){let n=new t(e,`DataCloneError`);if(n.code===void 0)try{Object.defineProperty(n,`code`,{value:25,configurable:!0})}catch{}return n}let n=Error(e);return n.name=`DataCloneError`,n.code=25,n}function substitutePortsWithPlaceholders(e,t){let r=new Map;for(let e=0;e<t.length;e++)r.set(t[e],e);function walk(e,t){if(typeof e!=`object`||!e)return e;if(e instanceof n){let t=r.get(e);return t===void 0?e:{__gjsifyTransferredPort:!0,index:t}}if(t.has(e))return t.get(e);if(Array.isArray(e)){let n=[];t.set(e,n);for(let r=0;r<e.length;r++)r in e&&(n[r]=walk(e[r],t));return n}if(Object.prototype.toString.call(e).slice(8,-1)===`Object`){let n={};t.set(e,n);for(let r of Object.keys(e))n[r]=walk(e[r],t);return n}return e}return walk(e,new Map)}function replacePlaceholdersWithPorts(e,t){function walk(e,n){if(typeof e!=`object`||!e)return e;if(isTransferredPortPlaceholder(e))return t[e.index];if(n.has(e))return n.get(e);if(Array.isArray(e)){n.set(e,e);for(let t=0;t<e.length;t++)t in e&&(e[t]=walk(e[t],n));return e}if(Object.prototype.toString.call(e).slice(8,-1)===`Object`){n.set(e,e);for(let t of Object.keys(e))e[t]=walk(e[t],n);return e}return e}return walk(e,new Map)}export{n as MessagePort};
+import"./_virtual/_rolldown/runtime.js";import{isSharedBuffer as e}from"./sab-transfer.js";import{EventEmitter as t}from"node:events";import{MessagePort as n}from"@gjsify/message-channel";function isTransferredPortPlaceholder(e){return typeof e==`object`&&!!e&&e.__gjsifyTransferredPort===!0}var r=class MessagePort extends t{_closed=!1;_detached=!1;_otherPort=null;_inner=new n;start(){if(this._closed||this._inner._started)return;let e=this._inner._queue.slice();this._inner.start();for(let t of e)this._dispatchEmit(t)}close(){if(this._closed)return;this._closed=!0;let e=this._otherPort;this._otherPort=null,e&&(e._otherPort=null),this._inner.close(),this.emit(`close`),this.removeAllListeners()}postMessage(t,n){if(this._closed)return;let r=this._otherPort;if(!r&&this._inner._transport!==null){if(n&&n.length>0)throw createDataCloneError(`transferList is not supported on cross-process MessagePort yet`);this._inner.postMessage(t);return}if(!r)return;let i=[],a=[];if(n&&n.length>0){let t=new Set;for(let r of n){if(t.has(r))throw createDataCloneError(`Transfer list contains duplicate entries`);if(t.add(r),r instanceof MessagePort){if(r===this)throw createDataCloneError(`Cannot transfer source port`);if(r._closed||r._detached)throw createDataCloneError(`MessagePort in transfer list is already detached`);a.push(r);continue}let o=Object.prototype.toString.call(r).slice(8,-1);if(o===`ArrayBuffer`){let e=r;if(e.detached===!0)throw createDataCloneError(`ArrayBuffer in transfer list is detached`);i.push(e);continue}if(o===`SharedArrayBuffer`)throw createDataCloneError(`SharedArrayBuffer cannot appear in transfer list (it is shared, not transferred)`);if(!e(r))throw createDataCloneError(`Value at index ${n.indexOf(r)} of transfer list is not transferable`)}}let o=a.slice(),s=t;a.length>0&&(s=substitutePortsWithPlaceholders(t,a));let c;try{c=structuredClone(s,{transfer:i.length>0?i:void 0})}catch(e){this.emit(`messageerror`,e instanceof Error?e:Error(`Could not clone message`));return}let l=c;if(o.length>0){let e=o.map(e=>{let t=e._otherPort;e._otherPort=null,e._detached=!0,e._closed=!0;let n=new MessagePort;return n._otherPort=t,t&&(t._otherPort=n),n});l=replacePlaceholdersWithPorts(c,e)}r._receiveMessage(l)}ref(){return this}unref(){return this}_receiveMessage(e){this._closed||(this._inner._receive(e),this._inner._started&&this._dispatchEmit(e))}get _hasQueuedMessages(){return this._inner._queue.length>0}_dequeueMessage(){return this._inner._queue.shift()}get _wasTransferred(){return this._detached}_dispatchEmit(e){Promise.resolve().then(()=>{this._closed||this.emit(`message`,e)})}addEventListener(e,t,n){if(t){if(e===`message`||e===`messageerror`){Object.getPrototypeOf(Object.getPrototypeOf(this._inner)).addEventListener.call(this._inner,e,t,n);return}super.on(e,t)}}removeEventListener(e,t,n){if(t){if(e===`message`||e===`messageerror`){Object.getPrototypeOf(Object.getPrototypeOf(this._inner)).removeEventListener.call(this._inner,e,t,n);return}super.off(e,t)}}get onmessage(){return this._inner.onmessage}set onmessage(e){if(e!==null&&!this._inner._started){let t=this._inner._queue.slice();this._inner.onmessage=e;for(let e of t)this._dispatchEmit(e)}else this._inner.onmessage=e}get onmessageerror(){return this._inner.onmessageerror}set onmessageerror(e){this._inner.onmessageerror=e}on(e,t){return super.on(e,t),e===`message`&&this.start(),this}addListener(e,t){return this.on(e,t)}once(e,t){return super.once(e,t),e===`message`&&this.start(),this}};function createDataCloneError(e){let t=globalThis.DOMException;if(typeof t==`function`){let n=new t(e,`DataCloneError`);if(n.code===void 0)try{Object.defineProperty(n,`code`,{value:25,configurable:!0})}catch{}return n}let n=Error(e);return n.name=`DataCloneError`,n.code=25,n}function substitutePortsWithPlaceholders(e,t){let n=new Map;for(let e=0;e<t.length;e++)n.set(t[e],e);function walk(e,t){if(typeof e!=`object`||!e)return e;if(e instanceof r){let t=n.get(e);return t===void 0?e:{__gjsifyTransferredPort:!0,index:t}}if(t.has(e))return t.get(e);if(Array.isArray(e)){let n=[];t.set(e,n);for(let r=0;r<e.length;r++)r in e&&(n[r]=walk(e[r],t));return n}if(Object.prototype.toString.call(e).slice(8,-1)===`Object`){let n={};t.set(e,n);for(let r of Object.keys(e))n[r]=walk(e[r],t);return n}return e}return walk(e,new Map)}function replacePlaceholdersWithPorts(e,t){function walk(e,n){if(typeof e!=`object`||!e)return e;if(isTransferredPortPlaceholder(e))return t[e.index];if(n.has(e))return n.get(e);if(Array.isArray(e)){n.set(e,e);for(let t=0;t<e.length;t++)t in e&&(e[t]=walk(e[t],n));return e}if(Object.prototype.toString.call(e).slice(8,-1)===`Object`){n.set(e,e);for(let t of Object.keys(e))e[t]=walk(e[t],n);return e}return e}return walk(e,new Map)}export{r as MessagePort};

package/lib/esm/subprocess-port-transport.js

@@ -0,0 +1,3 @@
+import"./_virtual/_rolldown/runtime.js";var SubprocessPortTransport=class{_sendLine;_registry;constructor(e,t){this._sendLine=e,this._registry=t}send(e,t){let n=JSON.stringify({__msgport:e,op:`send`,data:t})+`
+`;this._sendLine(n)}close(e){let t=JSON.stringify({__msgport:e,op:`close`})+`
+`;try{this._sendLine(t)}catch{}this._registry.delete(e)}};let e=1,t=2;function nextParentPortId(){let t=e;return e+=2,t}function nextChildPortId(){let e=t;return t+=2,e}function isCrossProcessPortPlaceholder(e){return typeof e==`object`&&!!e&&e.__gjsifyTransferredPort===!0&&typeof e.portId==`number`}export{SubprocessPortTransport,isCrossProcessPortPlaceholder,nextChildPortId,nextParentPortId};

package/lib/esm/worker.js

@@ -1,4 +1,4 @@
-import"./_virtual/_rolldown/runtime.js";import{extractSharedBuffers as e}from"./sab-transfer.js";import{EventEmitter as t}from"node:events";import n from"@girs/gio-2.0";import r from"@girs/glib-2.0";import{fdChannel as i}from"@gjsify/sab-native";let a=1;const o=new TextEncoder,s=o.encode(`import GLib from 'gi://GLib';
+import"./_virtual/_rolldown/runtime.js";import{extractSharedBuffers as e}from"./sab-transfer.js";import{MessagePort as t}from"./message-port.js";import{SubprocessPortTransport as n,nextParentPortId as r}from"./subprocess-port-transport.js";import{EventEmitter as i}from"node:events";import a from"@girs/gio-2.0";import o from"@girs/glib-2.0";import{fdChannel as s}from"@gjsify/sab-native";let c=1;const l=new TextEncoder,u=l.encode(`import GLib from 'gi://GLib';
 import Gio from 'gi://Gio';
 
 const loop = new GLib.MainLoop(null, false);
@@ -70,6 +70,9 @@ function materialise(value) {
     sabFds.delete(value.__sab);
     return makeSharedBuffer(native);
   }
+  if (isPortPlaceholder(value)) {
+    return makeChildSidePort(value.portId);
+  }
   if (Array.isArray(value)) {
     for (let i = 0; i < value.length; i++) value[i] = materialise(value[i]);
     return value;
@@ -104,6 +107,103 @@ function makeSharedBuffer(native) {
   };
 }
 
+// Cross-process MessagePort support (child side).
+//
+// When a parent's Worker.postMessage(value, [port2]) transfers a
+// MessagePort, the parent encodes the port as a placeholder
+// { __gjsifyTransferredPort: true, portId: <id> } and ships the rest of
+// the value as JSON. On this side, materialise() walks the parsed JSON
+// and substitutes each placeholder for a fresh "child-side port" — an
+// inline EventEmitter-shaped object that mirrors the worker_threads
+// MessagePort surface enough for user code (postMessage / on('message') /
+// on('close') / close()). Outbound traffic via this port travels over
+// stdout as { __msgport, op: 'send', data } JSON lines, which the parent's
+// stdout-reader routes back to the kept end via the parent-side registry.
+//
+// transferList chaining (port-in-port) is intentionally not supported
+// on the cross-process path in v1 — see STATUS.md Open TODOs.
+const childPortRegistry = new Map();
+
+function makeChildSidePort(portId) {
+  const listeners = new Map();
+  let closed = false;
+
+  function emit(ev /* , ...args */) {
+    const args = Array.prototype.slice.call(arguments, 1);
+    const fns = (listeners.get(ev) || []).slice();
+    for (const fn of fns) {
+      try { fn.apply(null, args); } catch (_) { /* swallow */ }
+    }
+  }
+
+  const port = {
+    _portId: portId,
+    /** @internal Wire-side delivery — called by the bootstrap stdin
+     *  dispatcher when it receives a {__msgport: portId, op: 'send'}
+     *  line. Schedules dispatch on a microtask so listeners fire after
+     *  the current call stack unwinds — matches in-process MessagePort
+     *  semantics. */
+    _receive(data) {
+      if (closed) return;
+      Promise.resolve().then(() => { if (!closed) emit('message', data); });
+    },
+    /** @internal Called by the dispatcher when the parent sends
+     *  {__msgport: portId, op: 'close'}. Fires the local 'close' event
+     *  and stops accepting further messages. */
+    _internalClose() {
+      if (closed) return;
+      closed = true;
+      childPortRegistry.delete(portId);
+      Promise.resolve().then(() => emit('close'));
+    },
+    on(ev, fn) {
+      if (!listeners.has(ev)) listeners.set(ev, []);
+      listeners.get(ev).push(fn);
+      return port;
+    },
+    once(ev, fn) {
+      const w = function () { port.off(ev, w); fn.apply(null, arguments); };
+      return port.on(ev, w);
+    },
+    off(ev, fn) {
+      const arr = listeners.get(ev);
+      if (arr) listeners.set(ev, arr.filter(function (f) { return f !== fn; }));
+      return port;
+    },
+    addListener(ev, fn) { return port.on(ev, fn); },
+    removeListener(ev, fn) { return port.off(ev, fn); },
+    emit(ev /* , ...args */) {
+      emit.apply(null, Array.prototype.slice.call(arguments));
+      return port;
+    },
+    postMessage(data) {
+      if (closed) return;
+      send({ __msgport: portId, op: 'send', data });
+    },
+    close() {
+      if (closed) return;
+      closed = true;
+      try { send({ __msgport: portId, op: 'close' }); } catch (_) {}
+      childPortRegistry.delete(portId);
+      Promise.resolve().then(() => emit('close'));
+    },
+    start() { /* no-op — child-side port dispatches on receive */ },
+    ref() { return port; },
+    unref() { return port; },
+    get _isCrossProcess() { return true; },
+    get constructor() { return { name: 'MessagePort' }; },
+  };
+
+  childPortRegistry.set(portId, port);
+  return port;
+}
+
+function isPortPlaceholder(value) {
+  return value !== null && typeof value === 'object'
+    && value.__gjsifyTransferredPort === true
+    && typeof value.portId === 'number';
+}
+
 // Drain SharedBuffer fds attached to the init line (workerData may carry
 // SharedBuffer instances) before materialise() runs against it.
 if (init.sabSocketFd === 3) {
@@ -157,7 +257,21 @@ function readNext() {
       const [line] = source.read_line_finish_utf8(result);
       if (line === null) { loop.quit(); return; }
       const msg = JSON.parse(line);
-      if (msg.type === 'message') {
+      if (typeof msg.__msgport === 'number') {
+        // Cross-process MessagePort traffic — route to the local child-
+        // side port from childPortRegistry by portId. Both 'send' and
+        // 'close' dispatch on a microtask inside the port's helpers, so
+        // user listeners fire after the current stdin-callback unwinds.
+        const cpPort = childPortRegistry.get(msg.__msgport);
+        if (cpPort) {
+          if (msg.op === 'send') cpPort._receive(msg.data);
+          else if (msg.op === 'close') cpPort._internalClose();
+        }
+        // Unknown portId or op silently dropped — could happen mid-close
+        // race where the parent sends a final message after the child has
+        // already torn down the local port.
+      }
+      else if (msg.type === 'message') {
         // Drain fds for any SharedBuffer placeholders BEFORE materialise.
         // recv_fd is synchronous but the sender always wrote the SCM_RIGHTS
         // messages before writing this stdin line, so they're already
@@ -190,8 +304,8 @@ try {
 }
 
 loop.run();
-`);var c=class Worker extends t{threadId;resourceLimits;_subprocess=null;_stdinPipe=null;_exited=!1;_bootstrapFile=null;_sabSocketFd=-1;_sabNextTag=0;constructor(e,t){super(),this.threadId=a++,this.resourceLimits=t?.resourceLimits||{};let c=t?.eval===!0,l=Worker._resolveFilename(e,c),u=`${r.get_tmp_dir()}/gjsify-worker-${this.threadId}-${Date.now()}.mjs`;this._bootstrapFile=n.File.new_for_path(u);try{this._bootstrapFile.replace_contents(s,null,!1,n.FileCreateFlags.REPLACE_DESTINATION,null)}catch(e){throw Error(`Failed to create worker bootstrap: ${e instanceof Error?e.message:e}`)}let d=new n.SubprocessLauncher({flags:n.SubprocessFlags.STDIN_PIPE|n.SubprocessFlags.STDOUT_PIPE|n.SubprocessFlags.STDERR_PIPE});if(t?.env&&typeof t.env==`object`)for(let[e,n]of Object.entries(t.env))d.setenv(e,String(n),!0);let f=-1;if(i){let e=i.makePair();e&&(this._sabSocketFd=e.parentFd,f=e.childFd,d.take_fd(f,3))}try{this._subprocess=d.spawnv([`gjs`,`-m`,u])}catch(e){throw this._cleanup(),Error(`Failed to spawn worker: ${e instanceof Error?e.message:e}`)}this._stdinPipe=this._subprocess.get_stdin_pipe();let p=this._subprocess.get_stdout_pipe();if(!c){let e=l.startsWith(`file://`)?l.slice(7):l;if(!n.File.new_for_path(e).query_exists(null)){this._cleanup();let t=Error(`Cannot find module '${e}'`);t.code=`ERR_MODULE_NOT_FOUND`,Promise.resolve().then(()=>{this.emit(`error`,t),this._exited=!0,this.emit(`exit`,1)});return}}let m=this._serializeWithSabTransfer(t?.workerData??null),h=JSON.stringify({threadId:this.threadId,workerData:m,eval:c,filename:c?void 0:l,code:c?l:void 0,sabSocketFd:this._sabSocketFd===-1?-1:3})+`
-`;try{this._stdinPipe.write_all(o.encode(h),null)}catch(e){throw this._cleanup(),Error(`Failed to send init data: ${e instanceof Error?e.message:e}`)}if(p){let e=n.DataInputStream.new(p);this._readMessages(e)}let g=this._subprocess.get_stderr_pipe();g&&this._readStderr(n.DataInputStream.new(g)),this._subprocess.wait_async(null,()=>{this._onExit()})}postMessage(e,t){if(!(this._exited||!this._stdinPipe))try{let t=this._serializeWithSabTransfer(e),n=JSON.stringify({type:`message`,data:t})+`
-`;this._stdinPipe.write_all(o.encode(n),null)}catch{}}_serializeWithSabTransfer(t){if(!i||this._sabSocketFd===-1)return t;let{value:n,table:r,nextTag:a}=e(t,this._sabNextTag);this._sabNextTag=a;for(let{tag:e,buffer:t}of r)if(!i.sendFd(this._sabSocketFd,t.fd,e))throw Error(`Failed to send SharedBuffer fd over worker side-channel (tag ${e})`);return n}terminate(){if(this._exited)return Promise.resolve(0);let e=new Promise(e=>{this.once(`exit`,t=>e(t))});try{if(this._stdinPipe){let e=JSON.stringify({type:`terminate`})+`
-`;this._stdinPipe.write_all(o.encode(e),null)}}catch{}return setTimeout(()=>{!this._exited&&this._subprocess&&this._subprocess.force_exit()},500),e}ref(){return this}unref(){return this}static _resolveFilename(e,t){if(t)return String(e);if(e instanceof URL)return e.href;let i=String(e);if(i.startsWith(`file://`)||i.startsWith(`http://`)||i.startsWith(`https://`))return i;if(i.startsWith(`/`))return`file://`+i;if(i.startsWith(`./`)||i.startsWith(`../`)||!i.includes(`/`)){let e=r.get_current_dir(),t=r.build_filenamev([e,i]);return`file://`+(n.File.new_for_path(t).get_path()||t)}return`file://`+i}_readMessages(e){e.read_line_async(r.PRIORITY_DEFAULT,null,(t,n)=>{try{let[t]=e.read_line_finish_utf8(n);if(t===null)return;let r=JSON.parse(t);switch(r.type){case`online`:this.emit(`online`);break;case`message`:this.emit(`message`,r.data);break;case`error`:{let e=Error(r.message);r.stack&&(e.stack=r.stack),this.emit(`error`,e);break}}this._readMessages(e)}catch{}})}_stderrChunks=[];_readStderr(e){e.read_line_async(r.PRIORITY_DEFAULT,null,(t,n)=>{try{let[t]=e.read_line_finish_utf8(n);if(t===null){if(this._stderrChunks.length>0){let e=this._stderrChunks.join(`
-`);this.listenerCount(`error`)===0&&this.emit(`error`,Error(e))}return}this._stderrChunks.push(t),this._readStderr(e)}catch{}})}_onExit(){if(this._exited)return;this._exited=!0;let e=this._subprocess?.get_if_exited()?this._subprocess.get_exit_status():1;this._cleanup(),this.emit(`exit`,e)}_cleanup(){if(this._bootstrapFile){try{this._bootstrapFile.delete(null)}catch{}this._bootstrapFile=null}if(this._stdinPipe){try{this._stdinPipe.close(null)}catch{}this._stdinPipe=null}if(this._sabSocketFd!==-1&&i?.closeFd){try{i.closeFd(this._sabSocketFd)}catch{}this._sabSocketFd=-1}this._subprocess=null}};export{c as Worker};
+`);var d=class Worker extends i{threadId;resourceLimits;_subprocess=null;_stdinPipe=null;_exited=!1;_bootstrapFile=null;_sabSocketFd=-1;_sabNextTag=0;_portRegistry=new Map;constructor(e,t){super(),this.threadId=c++,this.resourceLimits=t?.resourceLimits||{};let n=t?.eval===!0,r=Worker._resolveFilename(e,n),i=`${o.get_tmp_dir()}/gjsify-worker-${this.threadId}-${Date.now()}.mjs`;this._bootstrapFile=a.File.new_for_path(i);try{this._bootstrapFile.replace_contents(u,null,!1,a.FileCreateFlags.REPLACE_DESTINATION,null)}catch(e){throw Error(`Failed to create worker bootstrap: ${e instanceof Error?e.message:e}`)}let d=new a.SubprocessLauncher({flags:a.SubprocessFlags.STDIN_PIPE|a.SubprocessFlags.STDOUT_PIPE|a.SubprocessFlags.STDERR_PIPE});if(t?.env&&typeof t.env==`object`)for(let[e,n]of Object.entries(t.env))d.setenv(e,String(n),!0);let f=-1;if(s){let e=s.makePair();e&&(this._sabSocketFd=e.parentFd,f=e.childFd,d.take_fd(f,3))}try{this._subprocess=d.spawnv([`gjs`,`-m`,i])}catch(e){throw this._cleanup(),Error(`Failed to spawn worker: ${e instanceof Error?e.message:e}`)}this._stdinPipe=this._subprocess.get_stdin_pipe();let p=this._subprocess.get_stdout_pipe();if(!n){let e=r.startsWith(`file://`)?r.slice(7):r;if(!a.File.new_for_path(e).query_exists(null)){this._cleanup();let t=Error(`Cannot find module '${e}'`);t.code=`ERR_MODULE_NOT_FOUND`,Promise.resolve().then(()=>{this.emit(`error`,t),this._exited=!0,this.emit(`exit`,1)});return}}let m=this._serializeWithSabTransfer(t?.workerData??null),h=JSON.stringify({threadId:this.threadId,workerData:m,eval:n,filename:n?void 0:r,code:n?r:void 0,sabSocketFd:this._sabSocketFd===-1?-1:3})+`
+`;try{this._stdinPipe.write_all(l.encode(h),null)}catch(e){throw this._cleanup(),Error(`Failed to send init data: ${e instanceof Error?e.message:e}`)}if(p){let e=a.DataInputStream.new(p);this._readMessages(e)}let g=this._subprocess.get_stderr_pipe();g&&this._readStderr(a.DataInputStream.new(g)),this._subprocess.wait_async(null,()=>{this._onExit()})}postMessage(e,t){if(!(this._exited||!this._stdinPipe))try{let n=e;t&&t.length>0&&(n=this._extractCrossProcessPorts(e,t));let r=this._serializeWithSabTransfer(n),i=JSON.stringify({type:`message`,data:r})+`
+`;this._stdinPipe.write_all(l.encode(i),null)}catch{}}_writeStdinLine=e=>{if(!(this._exited||!this._stdinPipe))try{this._stdinPipe.write_all(l.encode(e),null)}catch{}};_extractCrossProcessPorts(e,i){let a=new Map;for(let e of i){if(!(e instanceof t))continue;let i=e,o=r(),s=i._otherPort;s&&(s._otherPort=null,i._otherPort=null,s._inner._portId=o,s._inner._partner=null,s._inner._transport=new n(this._writeStdinLine,this._portRegistry),this._portRegistry.set(o,s)),i._detached=!0,i._closed=!0,i._inner.close(),a.set(i,{__gjsifyTransferredPort:!0,portId:o})}if(a.size===0)return e;function walk(e,n){if(typeof e!=`object`||!e)return e;if(e instanceof t)return a.get(e)??e;if(n.has(e))return n.get(e);if(Array.isArray(e)){let t=[];n.set(e,t);for(let r=0;r<e.length;r++)r in e&&(t[r]=walk(e[r],n));return t}if(Object.prototype.toString.call(e).slice(8,-1)===`Object`){let t={};n.set(e,t);for(let r of Object.keys(e))t[r]=walk(e[r],n);return t}return e}return walk(e,new Map)}_serializeWithSabTransfer(t){if(!s||this._sabSocketFd===-1)return t;let{value:n,table:r,nextTag:i}=e(t,this._sabNextTag);this._sabNextTag=i;for(let{tag:e,buffer:t}of r)if(!s.sendFd(this._sabSocketFd,t.fd,e))throw Error(`Failed to send SharedBuffer fd over worker side-channel (tag ${e})`);return n}terminate(){if(this._exited)return Promise.resolve(0);let e=new Promise(e=>{this.once(`exit`,t=>e(t))});try{if(this._stdinPipe){let e=JSON.stringify({type:`terminate`})+`
+`;this._stdinPipe.write_all(l.encode(e),null)}}catch{}return setTimeout(()=>{!this._exited&&this._subprocess&&this._subprocess.force_exit()},500),e}ref(){return this}unref(){return this}static _resolveFilename(e,t){if(t)return String(e);if(e instanceof URL)return e.href;let n=String(e);if(n.startsWith(`file://`)||n.startsWith(`http://`)||n.startsWith(`https://`))return n;if(n.startsWith(`/`))return`file://`+n;if(n.startsWith(`./`)||n.startsWith(`../`)||!n.includes(`/`)){let e=o.get_current_dir(),t=o.build_filenamev([e,n]);return`file://`+(a.File.new_for_path(t).get_path()||t)}return`file://`+n}_readMessages(e){e.read_line_async(o.PRIORITY_DEFAULT,null,(t,n)=>{try{let[t]=e.read_line_finish_utf8(n);if(t===null)return;let r=JSON.parse(t);if(typeof r.__msgport==`number`){let t=this._portRegistry.get(r.__msgport);t&&(r.op===`send`?t._receiveMessage(r.data):r.op===`close`&&(this._portRegistry.delete(r.__msgport),t.close())),this._readMessages(e);return}switch(r.type){case`online`:this.emit(`online`);break;case`message`:this.emit(`message`,r.data);break;case`error`:{let e=Error(r.message);r.stack&&(e.stack=r.stack),this.emit(`error`,e);break}}this._readMessages(e)}catch{}})}_stderrChunks=[];_readStderr(e){e.read_line_async(o.PRIORITY_DEFAULT,null,(t,n)=>{try{let[t]=e.read_line_finish_utf8(n);if(t===null){if(this._stderrChunks.length>0){let e=this._stderrChunks.join(`
+`);this.listenerCount(`error`)===0&&this.emit(`error`,Error(e))}return}this._stderrChunks.push(t),this._readStderr(e)}catch{}})}_onExit(){if(this._exited)return;this._exited=!0;let e=this._subprocess?.get_if_exited()?this._subprocess.get_exit_status():1;this._cleanup(),this.emit(`exit`,e)}_cleanup(){if(this._bootstrapFile){try{this._bootstrapFile.delete(null)}catch{}this._bootstrapFile=null}if(this._stdinPipe){try{this._stdinPipe.close(null)}catch{}this._stdinPipe=null}if(this._sabSocketFd!==-1&&s?.closeFd){try{s.closeFd(this._sabSocketFd)}catch{}this._sabSocketFd=-1}for(let e of this._portRegistry.values())try{e._inner._closed=!0,e._inner._transport=null}catch{}this._portRegistry.clear(),this._subprocess=null}};export{d as Worker};

package/lib/types/message-port.d.ts

@@ -1,13 +1,14 @@
 import { EventEmitter } from 'node:events';
+import { MessagePort as SharedMessagePort } from '@gjsify/message-channel';
 export declare class MessagePort extends EventEmitter {
-    private _started;
     private _closed;
     private _detached;
-    private _messageQueue;
     /** @internal Linked port for in-process communication */
     _otherPort: MessagePort | null;
-    /** @internal Maps addEventListener listeners to their internal wrappers */
-    private _aeWrappers;
+    /** @internal W3C-surface delegate from `@gjsify/message-channel`. Owns the
+     *  canonical started/queue/closed state — the wrapper mirrors lifecycle
+     *  events to the EventEmitter side. */
+    _inner: SharedMessagePort;
     start(): void;
     close(): void;
     postMessage(value: unknown, transferList?: unknown[]): void;
@@ -18,15 +19,25 @@ export declare class MessagePort extends EventEmitter {
     _dequeueMessage(): unknown | undefined;
     /** @internal Has this port been transferred elsewhere? */
     get _wasTransferred(): boolean;
-    private _drainQueue;
-    private _dispatchMessage;
+    private _dispatchEmit;
     /**
-     * Web-compatible addEventListener. Wraps message data in a MessageEvent-like
-     * object `{ data, type }` before calling the listener.
-     * Requires explicit `port.start()` call (unlike `on('message')` which auto-starts).
+     * Web-compatible addEventListener. For `'message'` (and `'messageerror'`),
+     * routes through the inner shared MessagePort which dispatches a
+     * MessageEvent. For Node-only signals like `'close'`, routes to the
+     * EventEmitter side so `port.emit('close')` reaches the listener.
+     *
+     * Does NOT auto-start the port — matches Node + W3C HTML §9.4.4. Use
+     * `port.start()` explicitly, or attach via `port.on('message')` /
+     * `port.onmessage = fn` (both auto-start).
      */
-    addEventListener(type: string, listener: ((event: unknown) => void) | null): void;
-    removeEventListener(type: string, listener: ((event: unknown) => void) | null): void;
+    addEventListener(type: string, listener: any, options?: any): void;
+    removeEventListener(type: string, listener: any, options?: any): void;
+    /** W3C `onmessage` IDL attribute — delegated to the inner. Assigning a
+     *  non-null handler auto-starts both surfaces (matches W3C HTML spec). */
+    get onmessage(): any;
+    set onmessage(fn: any);
+    get onmessageerror(): any;
+    set onmessageerror(fn: any);
     on(event: string | symbol, listener: (...args: unknown[]) => void): this;
     addListener(event: string | symbol, listener: (...args: unknown[]) => void): this;
     once(event: string | symbol, listener: (...args: unknown[]) => void): this;

package/lib/types/subprocess-port-transport.d.ts

@@ -0,0 +1,43 @@
+import type { MessagePortTransport } from '@gjsify/message-channel';
+/** Function that writes one already-encoded line to the wire (e.g. parent's
+ *  `child.stdin.write(line)` or child bootstrap's `process.stdout.write(line)`). */
+export type WireWriter = (line: string) => void;
+/**
+ * Per-Worker registry of locally-resident cross-process MessagePort
+ * instances, keyed by portId. The wire-side dispatcher (stdout reader on
+ * parent, stdin reader on child) looks up the local port by portId and
+ * routes incoming `{ __msgport, op: 'send', data }` to
+ * `port._inner._receive(data)`. `op: 'close'` calls `port._inner.close()`.
+ *
+ * Parent-side: keyed by the same portId attached to the SubprocessPortTransport
+ * that the OTHER side's port writes from. Child-side bootstrap maintains its
+ * own registry with the same shape.
+ */
+export interface CrossProcessPortRegistry extends Map<number, any> {
+}
+export declare class SubprocessPortTransport implements MessagePortTransport {
+    private readonly _sendLine;
+    private readonly _registry;
+    /**
+     * @param sendLine writes a JSON-line to the wire (parent: child.stdin;
+     *                 child: process.stdout).
+     * @param registry the local registry the port is registered in; on
+     *                 `close()` we drop the entry to keep the registry from
+     *                 growing unbounded across spawn/transfer/terminate
+     *                 cycles.
+     */
+    constructor(_sendLine: WireWriter, _registry: CrossProcessPortRegistry);
+    send(portId: number, data: unknown): void;
+    close(portId: number): void;
+}
+export declare function nextParentPortId(): number;
+export declare function nextChildPortId(): number;
+/** Cross-process MessagePort placeholder. Distinct from the in-process
+ *  `{ index }` form so the receiver-side materialiser can dispatch on shape. */
+export interface CrossProcessPortPlaceholder {
+    readonly __gjsifyTransferredPort: true;
+    /** Stable id used by both sides' registries to route subsequent
+     *  `{ __msgport, op }` lines back to the right local port. */
+    readonly portId: number;
+}
+export declare function isCrossProcessPortPlaceholder(value: unknown): value is CrossProcessPortPlaceholder;

package/lib/types/worker.d.ts

@@ -27,8 +27,41 @@ export declare class Worker extends EventEmitter {
      *  to 0 at spawn; each postMessage call increments it by the number of
      *  unique SharedBuffer instances in the value tree. */
     private _sabNextTag;
+    /** Parent-side registry of cross-process MessagePort instances keyed by
+     *  the portId allocated when each port was transferred to the child.
+     *  Incoming `{ __msgport, op }` JSON lines from the child stdout look
+     *  up the kept-end port here and dispatch via the wrapper's
+     *  `_receiveMessage()` / `_inner.close()`. Cleared when the Worker
+     *  exits — `SubprocessPortTransport.close()` also removes individual
+     *  entries on lifecycle close. */
+    private _portRegistry;
     constructor(filename: string | URL, options?: WorkerOptions);
-    postMessage(value: unknown, _transferList?: unknown[]): void;
+    postMessage(value: unknown, transferList?: unknown[]): void;
+    /**
+     * Write a raw JSON line to the worker's stdin. Used by
+     * SubprocessPortTransport (via its sendLine callback) so a kept-end
+     * MessagePort's `postMessage` can travel over the same wire as
+     * `Worker.postMessage` without each port carrying a write-stream
+     * reference of its own. No-op when the worker has exited or the pipe
+     * is closed.
+     */
+    private _writeStdinLine;
+    /**
+     * Walk transferList for MessagePort entries and convert each to a
+     * cross-process port: detach the in-process partnership, assign a
+     * fresh portId, wire the kept-end's `_inner._transport`, register the
+     * kept end, and substitute every occurrence of the transferred port
+     * in the value tree with the placeholder. Returns the (possibly
+     * substituted) value tree.
+     *
+     * Validation is intentionally narrow: duplicate transfers, transfer
+     * of an already-closed port, and self-references currently surface as
+     * silently-dropped — full DataCloneError-shaped validation lives in
+     * the in-process `MessagePort.postMessage` (which Worker.postMessage
+     * does NOT call, so we accept the more permissive shape here). Bring
+     * up the same validation in a follow-up if a real bug shakes loose.
+     */
+    private _extractCrossProcessPorts;
     /**
      * Walk `value` for SharedBuffer instances, ship each fd over the
      * parent-side end of the FdChannel socketpair, return the placeholder-

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/worker_threads",
-    "version": "0.4.13",
+    "version": "0.4.15",
     "description": "Node.js worker_threads module for Gjs",
     "type": "module",
     "module": "lib/esm/index.js",
@@ -33,16 +33,17 @@
         "worker_threads"
     ],
     "devDependencies": {
-        "@gjsify/cli": "^0.4.13",
-        "@gjsify/node-globals": "^0.4.13",
-        "@gjsify/unit": "^0.4.13",
+        "@gjsify/cli": "^0.4.15",
+        "@gjsify/node-globals": "^0.4.15",
+        "@gjsify/unit": "^0.4.15",
         "@types/node": "^25.6.2",
         "typescript": "^6.0.3"
     },
     "dependencies": {
         "@girs/gio-2.0": "2.88.0-4.0.0-rc.15",
         "@girs/glib-2.0": "2.88.0-4.0.0-rc.15",
-        "@gjsify/events": "^0.4.13",
-        "@gjsify/sab-native": "^0.4.13"
+        "@gjsify/events": "^0.4.15",
+        "@gjsify/message-channel": "^0.4.15",
+        "@gjsify/sab-native": "^0.4.15"
     }
 }