@volter/tabnode 0.5.5 → 0.5.6

package/dist/assets/{runtime-worker-iInsmIAS.js → runtime-worker-Bt4uLPDa.js}

@@ -74067,7 +74067,7 @@ function transformDynamicImportsRegex(code2) {
   return code2.replace(new RegExp("(?<![.$\\w#])import\\s*\\(", "g"), "__dynamicImport(");
 }
 function __substrateRewriteDynamicImportsInScript(code2) {
-  if (!new RegExp("(?<![.$\\w#])import\\s*\\(").test(code2)) return code2;
+  if (!new RegExp("(?<![.$\\w#])(?:import|eval)\\s*\\(").test(code2)) return code2;
   let ast;
   try {
     ast = parse3(code2, { ecmaVersion: "latest", sourceType: "script", allowReturnOutsideFunction: true, allowHashBang: true, allowAwaitOutsideFunction: true });
@@ -74076,14 +74076,30 @@ function __substrateRewriteDynamicImportsInScript(code2) {
   }
   const replacements = [];
   walkAst(ast, (node) => {
-    if (node.type === "ImportExpression") replacements.push([node.start, node.start + 6]);
+    if (node.type === "ImportExpression") replacements.push([node.start, node.start + 6, "__dynamicImport"]);
+    collectDirectEval(node, replacements);
   });
   if (replacements.length === 0) return code2;
-  replacements.sort((a, b) => b[0] - a[0]);
+  return applyReplacements(code2, replacements);
+}
+function collectDirectEval(node, replacements) {
+  var _a3, _b3;
+  if (node.type !== "CallExpression" || node.optional || ((_a3 = node.callee) == null ? void 0 : _a3.type) !== "Identifier" || node.callee.name !== "eval") return;
+  const source = (_b3 = node.arguments) == null ? void 0 : _b3[0];
+  if (!source || source.type === "SpreadElement") return;
+  replacements.push([source.start, source.start, "__substrateEvalSource("]);
+  replacements.push([source.end, source.end, ")"]);
+}
+function applyReplacements(code2, replacements) {
+  replacements.sort((a, b) => b[0] - a[0] || b[1] - a[1]);
   let out = code2;
-  for (const [start, end] of replacements) out = out.slice(0, start) + "__dynamicImport" + out.slice(end);
+  for (const [start, end, text] of replacements) out = out.slice(0, start) + text + out.slice(end);
   return out;
 }
+Object.defineProperty(globalThis, "__substrateEvalSource", {
+  configurable: true,
+  value: (source) => typeof source === "string" ? __substrateRewriteDynamicImportsInScript(source) : source
+});
 function transformEsmToCjs(code2, filename) {
   const maybeEsm = __substrateHasEsmSyntax(code2);
   if (!maybeEsm) return __substrateRewriteDynamicImportsInScript(code2);
@@ -74107,17 +74123,14 @@ function transformEsmToCjsAst(code2, filename) {
     if (node.type === "ImportExpression") {
       deepReplacements.push([node.start, node.start + 6, "__dynamicImport"]);
     }
+    collectDirectEval(node, deepReplacements);
   });
   const hasImportDecl = ast.body.some((n8) => n8.type === "ImportDeclaration");
   const hasExportDecl = ast.body.some((n8) => {
     var _a3;
     return (_a3 = n8.type) == null ? void 0 : _a3.startsWith("Export");
   });
-  let transformed = code2;
-  deepReplacements.sort((a, b) => b[0] - a[0]);
-  for (const [start, end, replacement] of deepReplacements) {
-    transformed = transformed.slice(0, start) + replacement + transformed.slice(end);
-  }
+  let transformed = applyReplacements(code2, deepReplacements);
   if (hasImportDecl || hasExportDecl) {
     transformed = transformEsmToCjsSimple(transformed);
     if (hasExportDecl) {

package/dist/index.mjs

@@ -33760,7 +33760,7 @@ function transformDynamicImportsRegex(code2) {
   return code2.replace(new RegExp("(?<![.$\\w#])import\\s*\\(", "g"), "__dynamicImport(");
 }
 function __substrateRewriteDynamicImportsInScript(code2) {
-  if (!new RegExp("(?<![.$\\w#])import\\s*\\(").test(code2)) return code2;
+  if (!new RegExp("(?<![.$\\w#])(?:import|eval)\\s*\\(").test(code2)) return code2;
   let ast;
   try {
     ast = parse3(code2, { ecmaVersion: "latest", sourceType: "script", allowReturnOutsideFunction: true, allowHashBang: true, allowAwaitOutsideFunction: true });
@@ -33769,14 +33769,30 @@ function __substrateRewriteDynamicImportsInScript(code2) {
   }
   const replacements = [];
   walkAst(ast, (node) => {
-    if (node.type === "ImportExpression") replacements.push([node.start, node.start + 6]);
+    if (node.type === "ImportExpression") replacements.push([node.start, node.start + 6, "__dynamicImport"]);
+    collectDirectEval(node, replacements);
   });
   if (replacements.length === 0) return code2;
-  replacements.sort((a, b) => b[0] - a[0]);
+  return applyReplacements(code2, replacements);
+}
+function collectDirectEval(node, replacements) {
+  var _a2, _b2;
+  if (node.type !== "CallExpression" || node.optional || ((_a2 = node.callee) == null ? void 0 : _a2.type) !== "Identifier" || node.callee.name !== "eval") return;
+  const source = (_b2 = node.arguments) == null ? void 0 : _b2[0];
+  if (!source || source.type === "SpreadElement") return;
+  replacements.push([source.start, source.start, "__substrateEvalSource("]);
+  replacements.push([source.end, source.end, ")"]);
+}
+function applyReplacements(code2, replacements) {
+  replacements.sort((a, b) => b[0] - a[0] || b[1] - a[1]);
   let out = code2;
-  for (const [start, end] of replacements) out = out.slice(0, start) + "__dynamicImport" + out.slice(end);
+  for (const [start, end, text] of replacements) out = out.slice(0, start) + text + out.slice(end);
   return out;
 }
+Object.defineProperty(globalThis, "__substrateEvalSource", {
+  configurable: true,
+  value: (source) => typeof source === "string" ? __substrateRewriteDynamicImportsInScript(source) : source
+});
 function transformEsmToCjs(code2, filename) {
   const maybeEsm = __substrateHasEsmSyntax(code2);
   if (!maybeEsm) return __substrateRewriteDynamicImportsInScript(code2);
@@ -33800,17 +33816,14 @@ function transformEsmToCjsAst(code2, filename) {
     if (node.type === "ImportExpression") {
       deepReplacements.push([node.start, node.start + 6, "__dynamicImport"]);
     }
+    collectDirectEval(node, deepReplacements);
   });
   const hasImportDecl = ast.body.some((n) => n.type === "ImportDeclaration");
   const hasExportDecl = ast.body.some((n) => {
     var _a2;
     return (_a2 = n.type) == null ? void 0 : _a2.startsWith("Export");
   });
-  let transformed = code2;
-  deepReplacements.sort((a, b) => b[0] - a[0]);
-  for (const [start, end, replacement] of deepReplacements) {
-    transformed = transformed.slice(0, start) + replacement + transformed.slice(end);
-  }
+  let transformed = applyReplacements(code2, deepReplacements);
   if (hasImportDecl || hasExportDecl) {
     transformed = transformEsmToCjsSimple(transformed);
     if (hasExportDecl) {
@@ -35655,7 +35668,7 @@ class WorkerRuntime {
     this.worker = new Worker(
       new URL(
         /* @vite-ignore */
-        "/assets/runtime-worker-iInsmIAS.js",
+        "/assets/runtime-worker-Bt4uLPDa.js",
         import.meta.url
       ),
       { type: "module" }
@@ -38023,7 +38036,11 @@ function resetServerBridge() {
 }
 const scopes = /* @__PURE__ */ new WeakMap();
 class NativeStreamScope {
-  constructor(limits, emit2) {
+  /**
+   * `ownerPid` names the process whose worker this scope serves: a listener
+   * it opens is that process's socket, as the container's /proc shows it.
+   */
+  constructor(limits, emit2, ownerPid) {
     __publicField(this, "entries", /* @__PURE__ */ new Map());
     __publicField(this, "descriptors", /* @__PURE__ */ new Map());
     __publicField(this, "writes", /* @__PURE__ */ new Map());
@@ -38033,6 +38050,7 @@ class NativeStreamScope {
     __publicField(this, "disposed", false);
     __publicField(this, "limits");
     this.emit = emit2;
+    this.ownerPid = ownerPid;
     if ([limits.maxHandles, limits.maxReadChunkBytes, limits.maxQueuedBytes, limits.maxQueuedHandles, limits.maxPendingWriteBytes].some((value) => !Number.isSafeInteger(value) || value < 1) || limits.maxReadChunkBytes > 2147483647 || limits.maxReadChunkBytes > limits.maxQueuedBytes || limits.maxReadChunkBytes > limits.maxPendingWriteBytes) throw new Error("Invalid native stream resource limits.");
     this.limits = Object.freeze({ ...limits });
   }
@@ -38317,6 +38335,10 @@ class NativeStreamScope {
     if (failures.length) throw new AggregateError(failures, "Native stream scope cleanup failed.");
   }
 }
+function nativeStreamOwnerPid(handle) {
+  var _a2, _b2;
+  return (_b2 = (_a2 = scopes.get(handle)) == null ? void 0 : _a2.ownerPid) == null ? void 0 : _b2.call(_a2);
+}
 let __nextRunName = 1;
 function createContainer(options) {
   const vfs2 = options && options.vfs || new VirtualFS();
@@ -38374,7 +38396,8 @@ function createContainer(options) {
     portPid: (port) => {
       var _a2;
       const listener = listenerOnPort(port);
-      return listener ? (_a2 = runPid(ownerOf(listener))) == null ? void 0 : _a2.pid : void 0;
+      if (!listener) return void 0;
+      return ((_a2 = runPid(ownerOf(listener))) == null ? void 0 : _a2.pid) ?? nativeStreamOwnerPid(listener);
     },
     /**
      * Deliver a signal to the named run as another process's `kill(pid)` does:

package/dist/native-stream-owner.d.ts

@@ -94,6 +94,7 @@ export interface NativeStreamTransport {
  */
 export declare class NativeStreamScope {
     private readonly emit;
+    readonly ownerPid?: (() => number | undefined) | undefined;
     private readonly entries;
     private readonly descriptors;
     private readonly writes;
@@ -102,7 +103,11 @@ export declare class NativeStreamScope {
     private pendingWriteBytes;
     private disposed;
     private readonly limits;
-    constructor(limits: NativeStreamLimits, emit: (event: NativeStreamEvent) => void);
+    /**
+     * `ownerPid` names the process whose worker this scope serves: a listener
+     * it opens is that process's socket, as the container's /proc shows it.
+     */
+    constructor(limits: NativeStreamLimits, emit: (event: NativeStreamEvent) => void, ownerPid?: (() => number | undefined) | undefined);
     private entry;
     private publish;
     private claim;
@@ -119,3 +124,5 @@ export declare class NativeStreamScope {
     private close;
     dispose(): void;
 }
+/** The process a handle opened for another worker's process belongs to, where a scope holds it. */
+export declare function nativeStreamOwnerPid(handle: object): number | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/tabnode",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "description": "Node's own library, in a browser tab.",
   "type": "module",
   "license": "MIT",

package/src/index.ts

@@ -56,6 +56,7 @@ import { runCommand, registerRunStreams, releaseRunStreams, sendStdin } from './
 import { Server as NetServer, __releaseOwnedHandles, type Socket as NetSocket } from './node-lib/net-module';
 import { __adoptHandle, ownerOf, type OwnedHandle } from './node-lib/binding/handles';
 import { listenerOnPort } from './node-lib/binding/tcp_wrap';
+import { nativeStreamOwnerPid } from './native-stream-owner';
 
 import { __currentProcessToken, __runFor, __signalOwnedProcess, __stopOwnedProcess, runPid, processByPid } from './process-tokens';
 export { runPid, processByPid };
@@ -215,7 +216,9 @@ export function createContainer(options?: ContainerOptions): {
     processPorts: (token: string): number[] => __ownedServerPorts(token),
     portPid: (port: number): number | undefined => {
       const listener = listenerOnPort(port);
-      return listener ? runPid(ownerOf(listener as unknown as OwnedHandle))?.pid : undefined;
+      if (!listener) return undefined;
+      // a guest's own listener, or one this engine holds for another worker's process
+      return runPid(ownerOf(listener as unknown as OwnedHandle))?.pid ?? nativeStreamOwnerPid(listener);
     },
     /**
      * Deliver a signal to the named run as another process's `kill(pid)` does:

package/src/native-stream-owner.ts

@@ -56,7 +56,11 @@ export class NativeStreamScope {
   private disposed = false;
   private readonly limits: Readonly<NativeStreamLimits>;
 
-  constructor(limits: NativeStreamLimits, private readonly emit: (event: NativeStreamEvent) => void) {
+  /**
+   * `ownerPid` names the process whose worker this scope serves: a listener
+   * it opens is that process's socket, as the container's /proc shows it.
+   */
+  constructor(limits: NativeStreamLimits, private readonly emit: (event: NativeStreamEvent) => void, readonly ownerPid?: () => number | undefined) {
     if ([limits.maxHandles, limits.maxReadChunkBytes, limits.maxQueuedBytes, limits.maxQueuedHandles, limits.maxPendingWriteBytes].some(value => !Number.isSafeInteger(value) || value < 1)
       || limits.maxReadChunkBytes > 0x7fffffff
       || limits.maxReadChunkBytes > limits.maxQueuedBytes
@@ -315,3 +319,8 @@ export class NativeStreamScope {
     if (failures.length) throw new AggregateError(failures, 'Native stream scope cleanup failed.');
   }
 }
+
+/** The process a handle opened for another worker's process belongs to, where a scope holds it. */
+export function nativeStreamOwnerPid(handle: object): number | undefined {
+  return scopes.get(handle as NativeHandle)?.ownerPid?.();
+}

package/src/runtime.ts

@@ -343,23 +343,49 @@ function transformDynamicImportsRegex(code: string): string {
  * saw no import at all.
  */
 function __substrateRewriteDynamicImportsInScript(code: string): string {
-  if (!/(?<![.$\w#])import\s*\(/.test(code)) return code;
+  if (!/(?<![.$\w#])(?:import|eval)\s*\(/.test(code)) return code;
   let ast;
   try {
     ast = acorn.parse(code, { ecmaVersion: "latest", sourceType: "script", allowReturnOutsideFunction: true, allowHashBang: true, allowAwaitOutsideFunction: true });
   } catch {
     return code;
   }
-  const replacements: Array<[number, number]> = [];
+  const replacements: Array<[number, number, string]> = [];
   walkAst(ast, (node: any) => {
-    if (node.type === "ImportExpression") replacements.push([node.start, node.start + 6]);
+    if (node.type === "ImportExpression") replacements.push([node.start, node.start + 6, "__dynamicImport"]);
+    collectDirectEval(node, replacements);
   });
   if (replacements.length === 0) return code;
-  replacements.sort((a, b) => b[0] - a[0]);
+  return applyReplacements(code, replacements);
+}
+
+/**
+ * A direct `eval` runs source the module builds at run time, and Node runs an
+ * `import()` in it through the module's loader: Playwright loads an ES config
+ * with ``eval(`import(${url})`)``. The call stays a direct eval, so the
+ * source keeps the module's scope, `__dynamicImport` included; only the
+ * source it is given is rewritten the way the module's own was.
+ */
+function collectDirectEval(node: any, replacements: Array<[number, number, string]>): void {
+  if (node.type !== "CallExpression" || node.optional || node.callee?.type !== "Identifier" || node.callee.name !== "eval") return;
+  const source = node.arguments?.[0];
+  if (!source || source.type === "SpreadElement") return;
+  replacements.push([source.start, source.start, "__substrateEvalSource("]);
+  replacements.push([source.end, source.end, ")"]);
+}
+
+/** Applies insertions and replacements from the end, so earlier offsets hold. */
+function applyReplacements(code: string, replacements: Array<[number, number, string]>): string {
+  replacements.sort((a, b) => b[0] - a[0] || b[1] - a[1]);
   let out = code;
-  for (const [start, end] of replacements) out = out.slice(0, start) + "__dynamicImport" + out.slice(end);
+  for (const [start, end, text] of replacements) out = out.slice(0, start) + text + out.slice(end);
   return out;
 }
+
+Object.defineProperty(globalThis, "__substrateEvalSource", {
+  configurable: true,
+  value: (source: unknown): unknown => typeof source === "string" ? __substrateRewriteDynamicImportsInScript(source) : source,
+});
 function transformEsmToCjs(code: string, filename: string): string {
   // Quick check: does the code have any ESM-like patterns?
   const maybeEsm = __substrateHasEsmSyntax(code);
@@ -401,6 +427,7 @@ function transformEsmToCjsAst(code: string, filename: string): string {
       // Replace just the 'import' keyword, preserving the (...) part
       deepReplacements.push([node.start, node.start + 6, '__dynamicImport']);
     }
+    collectDirectEval(node, deepReplacements);
   });
 
   // Check for actual import/export declarations
@@ -408,11 +435,7 @@ function transformEsmToCjsAst(code: string, filename: string): string {
   const hasExportDecl = ast.body.some((n: any) => n.type?.startsWith('Export'));
 
   // Apply deep replacements from end to start (preserves earlier positions)
-  let transformed = code;
-  deepReplacements.sort((a, b) => b[0] - a[0]);
-  for (const [start, end, replacement] of deepReplacements) {
-    transformed = transformed.slice(0, start) + replacement + transformed.slice(end);
-  }
+  let transformed = applyReplacements(code, deepReplacements);
 
   // Transform import/export declarations (re-parses the modified code)
   if (hasImportDecl || hasExportDecl) {