react-x11 2.22.12 → 2.22.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-x11",
-  "version": "2.22.12",
+  "version": "2.22.13",
   "description": "react renderer with X11 as a target",
   "main": "./src/index.js",
   "files": [

package/src/cocoa/main.js

@@ -17,6 +17,11 @@
 // import's). Anywhere else it does nothing, so one command line serves
 // every platform: on Linux the entry runs as it would without it, and so
 // does a Worker the app starts itself (it inherits this `--import`).
+//
+// Of the checks it skips, it keeps one: a `<Frame>` pane stays where it is.
+// The host forks the pane with the node flags it started with, this
+// `--import` among them, and a pane on a worker has no IPC channel to its
+// host (src/cocoa/relaunch.js, `relaunchVeto`).
 import { isMainThread, workerData } from 'node:worker_threads';
 
 import { loadNative } from './native.js';
@@ -24,7 +29,11 @@ import { bootstrapWorker, relaunch } from './relaunch.js';
 
 if (!isMainThread && workerData?.reactX11State) {
   bootstrapWorker(workerData.reactX11State);
-} else if (isMainThread && process.platform === 'darwin') {
+} else if (
+  isMainThread &&
+  process.platform === 'darwin' &&
+  process.env.REACT_X11_FRAME !== '1'
+) {
   const entry = process.argv[1];
   if (!entry) {
     throw new Error(

package/src/cocoa/relaunch.js

@@ -67,6 +67,13 @@ export function relaunchVeto({
   if (env.REACT_X11_BACKEND && env.REACT_X11_BACKEND !== 'cocoa') {
     return `REACT_X11_BACKEND=${env.REACT_X11_BACKEND}`;
   }
+  // A `<Frame>` pane (REACT_X11_FRAME is what the host sets on the fork)
+  // has no AppKit for the main thread to keep — its pixels reach the host
+  // through shared IOSurfaces (src/cocoa/panewindow.js) — and its entry
+  // talks to the host over the IPC channel fork() sets up, which is the
+  // main thread's: on a worker there is no `process.send`, and the pane
+  // exited as it started (src/frame/child.js).
+  if (env.REACT_X11_FRAME === '1') return 'a <Frame> pane';
   // a REPL, `node -e`, or an entry that is not a file a worker can load
   if (!entry) return 'no entry script';
   // a single executable carries its entry inside the binary, where a worker

package/src/frame/child.js

@@ -4,12 +4,20 @@
 // `process`. Kept import-light and JSX-free on purpose: it runs before
 // anything decided what loaders this process has.
 
+import { isMainThread } from 'node:worker_threads';
+
 import { runFrameChild } from './childmain.js';
 
 if (typeof process.send !== 'function') {
   console.error(
-    'react-x11: frame/child.js is the entry a <Frame> forks — it needs the ' +
-      'IPC channel fork() sets up, and cannot be run directly.',
+    isMainThread
+      ? 'react-x11: frame/child.js is the entry a <Frame> forks — it needs ' +
+          'the IPC channel fork() sets up, and cannot be run directly.'
+      : // the channel is the main thread's, and something moved the pane
+        // off it (src/cocoa/relaunch.js keeps a pane where it is)
+        'react-x11: frame/child.js is running on a worker thread, which ' +
+          'has no IPC channel — a <Frame> pane has to stay on the main ' +
+          'thread of its process.',
   );
   process.exit(1);
 }