@ricsam/isolate-daemon 0.1.9 → 0.1.11

package/dist/cjs/connection.cjs

@@ -46,6 +46,7 @@ __export(exports_connection, {
 });
 module.exports = __toCommonJS(exports_connection);
 var import_node_crypto = require("node:crypto");
+var import_node_path = __toESM(require("node:path"));
 var import_isolated_vm = __toESM(require("isolated-vm"));
 var import_isolate_protocol = require("@ricsam/isolate-protocol");
 var import_callback_fs_handler = require("./callback-fs-handler.cjs");
@@ -434,7 +435,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");
@@ -443,7 +444,7 @@ async function handleCreateRuntime(message, connection, state) {
             connection: conn,
             callbackContext,
             invokeClientCallback,
-            basePath: path
+            basePath: path2
           });
         }
       }
@@ -467,6 +468,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);
@@ -532,7 +534,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(() => {});
@@ -611,10 +613,12 @@ async function handleEval(message, connection, state) {
   }
   instance.lastActivity = Date.now();
   try {
+    const filename = import_isolate_protocol.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 {
@@ -1382,17 +1386,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 = import_node_path.default.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 = import_node_path.default.posix.join(resolveDir, import_node_path.default.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);
@@ -1810,4 +1819,4 @@ async function handleClearCollectedData(message, connection, state) {
   }
 }
 
-//# debugId=84B93499BFC7626064756E2164756E21
+//# debugId=6F23033E4A4DC7E564756E2164756E21