agent-web-os 0.4.0 → 0.4.1

package/dist/node.js

@@ -4,7 +4,7 @@ import {
   attachBrowserBashSessionRuntimeAdapter,
   createBrowserBashSession,
   posixPath
-} from "./chunk-ZZTRZYH2.js";
+} from "./chunk-KBWDWVKH.js";
 import {
   ESBUILD_WASM_BINARY_CDN,
   ESBUILD_WASM_BROWSER_CDN,
@@ -14565,21 +14565,22 @@ ${importMap}`);
 
 // src/server-bridge.ts
 var globalBridge = null;
+var almostnodeModule = null;
 var almostnodePromise = null;
-function loadAlmostnode() {
-  if (!almostnodePromise) {
-    almostnodePromise = import("./server-bridge-DZUJDQIT.js");
-  }
-  return almostnodePromise;
-}
 async function getServerBridge() {
+  if (!almostnodeModule) {
+    if (!almostnodePromise) {
+      almostnodePromise = import("./server-bridge-DZUJDQIT.js");
+    }
+    almostnodeModule = await almostnodePromise;
+  }
   if (!globalBridge) {
-    const mod = await loadAlmostnode();
-    globalBridge = mod.getServerBridge();
+    globalBridge = almostnodeModule.getServerBridge();
   }
   return globalBridge;
 }
 function resetServerBridge() {
+  almostnodeModule?.resetServerBridge();
   globalBridge = null;
 }
 
@@ -15092,11 +15093,7 @@ var AlmostNodeSession = class {
     const cacheKey = `${root}\0${specifier}`;
     const cached = this.resolveBarePkgEntryCache.get(cacheKey);
     if (cached !== void 0) return cached;
-    const result = this._resolveBarePkgEntry(specifier, root);
-    this.resolveBarePkgEntryCache.set(cacheKey, result);
-    return result;
-  }
-  _resolveBarePkgEntry(specifier, root) {
+    let result = null;
     let pkgName;
     let subPath;
     if (specifier.startsWith("@")) {
@@ -15126,38 +15123,56 @@ var AlmostNodeSession = class {
       if (pkgJson?.exports && typeof pkgJson.exports === "object") {
         const exportsMap = pkgJson.exports;
         const entry = this.resolveExportsEntry(exportsMap, `./${subPath}`) ?? this.resolveWildcardExports(exportsMap, subPath);
-        if (entry) return `/node_modules/${pkgName}/${stripDotSlash(entry)}`;
-      }
-      const candidates = [
-        `/node_modules/${pkgName}/${subPath}`,
-        `/node_modules/${pkgName}/${subPath}.js`,
-        `/node_modules/${pkgName}/${subPath}.mjs`,
-        `/node_modules/${pkgName}/${subPath}/index.js`,
-        `/node_modules/${pkgName}/${subPath}/index.mjs`
-      ];
-      for (const candidate of candidates) {
-        if (this.vfs.existsSync(`${root}${candidate}`)) return candidate;
+        if (entry) {
+          result = `/node_modules/${pkgName}/${stripDotSlash(entry)}`;
+        }
+      }
+      if (!result) {
+        const candidates = [
+          `/node_modules/${pkgName}/${subPath}`,
+          `/node_modules/${pkgName}/${subPath}.js`,
+          `/node_modules/${pkgName}/${subPath}.mjs`,
+          `/node_modules/${pkgName}/${subPath}/index.js`,
+          `/node_modules/${pkgName}/${subPath}/index.mjs`
+        ];
+        for (const candidate of candidates) {
+          if (this.vfs.existsSync(`${root}${candidate}`)) {
+            result = candidate;
+            break;
+          }
+        }
       }
-      return `/node_modules/${pkgName}/${subPath}`;
+      result ??= `/node_modules/${pkgName}/${subPath}`;
+      this.resolveBarePkgEntryCache.set(cacheKey, result);
+      return result;
     }
     if (pkgJson?.exports && typeof pkgJson.exports === "object") {
       const entry = this.resolveExportsEntry(pkgJson.exports, ".");
-      if (entry) return `/node_modules/${pkgName}/${stripDotSlash(entry)}`;
+      if (entry) {
+        result = `/node_modules/${pkgName}/${stripDotSlash(entry)}`;
+      }
     }
-    if (typeof pkgJson?.module === "string") {
-      return `/node_modules/${pkgName}/${stripDotSlash(pkgJson.module)}`;
+    if (!result && typeof pkgJson?.module === "string") {
+      result = `/node_modules/${pkgName}/${stripDotSlash(pkgJson.module)}`;
     }
-    if (typeof pkgJson?.main === "string") {
-      return `/node_modules/${pkgName}/${stripDotSlash(pkgJson.main)}`;
+    if (!result && typeof pkgJson?.main === "string") {
+      result = `/node_modules/${pkgName}/${stripDotSlash(pkgJson.main)}`;
     }
-    const fallbacks = [
-      `/node_modules/${pkgName}/index.js`,
-      `/node_modules/${pkgName}/index.mjs`
-    ];
-    for (const fb of fallbacks) {
-      if (this.vfs.existsSync(`${root}${fb}`)) return fb;
+    if (!result) {
+      const fallbacks = [
+        `/node_modules/${pkgName}/index.js`,
+        `/node_modules/${pkgName}/index.mjs`
+      ];
+      for (const fallbackPath of fallbacks) {
+        if (this.vfs.existsSync(`${root}${fallbackPath}`)) {
+          result = fallbackPath;
+          break;
+        }
+      }
     }
-    return `/node_modules/${pkgName}/index.js`;
+    result ??= `/node_modules/${pkgName}/index.js`;
+    this.resolveBarePkgEntryCache.set(cacheKey, result);
+    return result;
   }
   resolveExportsEntry(exports, key) {
     const entry = exports[key];
@@ -16677,6 +16692,8 @@ async function enableNode(session) {
     return session;
   }
   const almostNodeSession = new AlmostNodeSession(session.fs);
+  const executeNode = almostNodeSession.executeNode.bind(almostNodeSession);
+  const executeNpm = almostNodeSession.executeNpm.bind(almostNodeSession);
   almostNodeSession.setBinCommandRegistrar((name, handler) => {
     session.bash.registerCommand(Dx(name, handler));
   });
@@ -16687,10 +16704,10 @@ async function enableNode(session) {
     dispose: () => almostNodeSession.dispose()
   });
   session.bash.registerCommand(
-    Dx("node", async (args, ctx) => almostNodeSession.executeNode(args, ctx))
+    Dx("node", executeNode)
   );
   session.bash.registerCommand(
-    Dx("npm", async (args, ctx) => almostNodeSession.executeNpm(args, ctx))
+    Dx("npm", executeNpm)
   );
   enabledNodeSessions.add(session);
   return session;