@ricsam/isolate-daemon 0.1.9 → 0.1.11

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/isolate-daemon",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "type": "commonjs"
 }

package/dist/mjs/connection.mjs

@@ -1,5 +1,6 @@
 // packages/isolate-daemon/src/connection.ts
 import { randomUUID } from "node:crypto";
+import path from "node:path";
 import ivm from "isolated-vm";
 import {
   createFrameParser,
@@ -8,6 +9,7 @@ import {
   ErrorCode,
   STREAM_CHUNK_SIZE,
   STREAM_DEFAULT_CREDIT,
+  normalizeEntryFilename,
   marshalValue,
   unmarshalValue
 } from "@ricsam/isolate-protocol";
@@ -406,7 +408,7 @@ async function handleCreateRuntime(message, connection, state) {
         }
       },
       fs: {
-        getDirectory: async (path) => {
+        getDirectory: async (path2) => {
           const conn = callbackContext.connection;
           if (!conn) {
             throw new Error("FS callbacks not available");
@@ -415,7 +417,7 @@ async function handleCreateRuntime(message, connection, state) {
             connection: conn,
             callbackContext,
             invokeClientCallback,
-            basePath: path
+            basePath: path2
           });
         }
       }
@@ -439,6 +441,7 @@ async function handleCreateRuntime(message, connection, state) {
     if (moduleLoaderCallback) {
       instance.moduleLoaderCallbackId = moduleLoaderCallback.callbackId;
       instance.moduleCache = new Map;
+      instance.moduleToFilename = new Map;
     }
     if (customCallbacks) {
       await setupCustomFunctions(runtime.context, customCallbacks, connection, instance);
@@ -504,7 +507,7 @@ async function handleCreateRuntime(message, connection, state) {
         console: playwrightCallbacks.console,
         onEvent: (event) => {
           if (event.type === "browserConsoleLog" && playwrightCallbacks.onBrowserConsoleLogCallbackId) {
-            const promise = invokeClientCallback(connection, playwrightCallbacks.onBrowserConsoleLogCallbackId, [{ level: event.level, args: event.args, timestamp: event.timestamp }]).catch(() => {});
+            const promise = invokeClientCallback(connection, playwrightCallbacks.onBrowserConsoleLogCallbackId, [{ level: event.level, stdout: event.stdout, timestamp: event.timestamp }]).catch(() => {});
             pendingCallbacks.push(promise);
           } else if (event.type === "networkRequest" && playwrightCallbacks.onNetworkRequestCallbackId) {
             const promise = invokeClientCallback(connection, playwrightCallbacks.onNetworkRequestCallbackId, [event]).catch(() => {});
@@ -583,10 +586,12 @@ async function handleEval(message, connection, state) {
   }
   instance.lastActivity = Date.now();
   try {
+    const filename = normalizeEntryFilename(message.filename);
     const mod = await instance.runtime.isolate.compileModule(message.code, {
-      filename: message.filename ?? "<eval>"
+      filename
     });
     if (instance.moduleLoaderCallbackId) {
+      instance.moduleToFilename?.set(mod, filename);
       const resolver = createModuleResolver(instance, connection);
       await mod.instantiate(instance.runtime.context, resolver);
     } else {
@@ -1354,17 +1359,22 @@ async function setupCustomFunctions(context, customCallbacks, connection, instan
   }
 }
 function createModuleResolver(instance, connection) {
-  return async (specifier, _referrer) => {
+  return async (specifier, referrer) => {
     const cached = instance.moduleCache?.get(specifier);
     if (cached)
       return cached;
     if (!instance.moduleLoaderCallbackId) {
       throw new Error(`Module not found: ${specifier}`);
     }
-    const code = await invokeClientCallback(connection, instance.moduleLoaderCallbackId, [specifier]);
+    const importerPath = instance.moduleToFilename?.get(referrer) ?? "<unknown>";
+    const importerResolveDir = path.posix.dirname(importerPath);
+    const result = await invokeClientCallback(connection, instance.moduleLoaderCallbackId, [specifier, { path: importerPath, resolveDir: importerResolveDir }]);
+    const { code, resolveDir } = result;
     const mod = await instance.runtime.isolate.compileModule(code, {
       filename: specifier
     });
+    const resolvedPath = path.posix.join(resolveDir, path.posix.basename(specifier));
+    instance.moduleToFilename?.set(mod, resolvedPath);
     const resolver = createModuleResolver(instance, connection);
     await mod.instantiate(instance.runtime.context, resolver);
     instance.moduleCache?.set(specifier, mod);
@@ -1785,4 +1795,4 @@ export {
   handleConnection
 };
 
-//# debugId=9E949C5B88C72B2F64756E2164756E21
+//# debugId=E68FD11623EE904064756E2164756E21