almostnode 0.2.4 → 0.2.5

package/dist/__sw__.js

@@ -1,7 +1,7 @@
 /**
  * Service Worker for Mini WebContainers
  * Intercepts fetch requests and routes them to virtual servers
- * Version: 12 - add COEP/COOP headers for iframe embedding
+ * Version: 13 - redirect navigation requests from virtual context to include prefix
  */
 
 // Communication port with main thread
@@ -212,6 +212,28 @@ self.addEventListener('fetch', (event) => {
   const match = url.pathname.match(/^\/__virtual__\/(\d+)(\/.*)?$/);
 
   if (!match) {
+    // Not a virtual request - but check if it's a navigation from a virtual context
+    // This handles plain <a href="/about"> links that should stay within the virtual server
+    if (event.request.mode === 'navigate') {
+      const referer = event.request.referrer;
+      if (referer) {
+        try {
+          const refererUrl = new URL(referer);
+          const refererMatch = refererUrl.pathname.match(/^\/__virtual__\/(\d+)/);
+          if (refererMatch) {
+            // User clicked a link from within a virtual server context
+            // Redirect to include the virtual prefix
+            const virtualPrefix = refererMatch[0];
+            const redirectUrl = url.origin + virtualPrefix + url.pathname + url.search;
+            console.log('[SW] Redirecting navigation from virtual context:', url.pathname, '->', redirectUrl);
+            event.respondWith(Response.redirect(redirectUrl, 302));
+            return;
+          }
+        } catch (e) {
+          // Invalid referer URL, ignore
+        }
+      }
+    }
     // Not a virtual request, let it pass through
     return;
   }

package/dist/assets/{runtime-worker-D9x_Ddwz.js → runtime-worker-B8_LZkBX.js}

@@ -396,7 +396,8 @@
         constructor(){
             this.root = {
                 type: "directory",
-                children: new Map()
+                children: new Map(),
+                mtime: Date.now()
             };
         }
         on(event, listener) {
@@ -509,7 +510,8 @@
             const content = typeof data === "string" ? this.encoder.encode(data) : data;
             parent.children.set(basename, {
                 type: "file",
-                content
+                content,
+                mtime: Date.now()
             });
             if (emitEvent) {
                 this.notifyWatchers(normalized, existed ? "change" : "rename");
@@ -570,7 +572,8 @@
                 if (!child) {
                     child = {
                         type: "directory",
-                        children: new Map()
+                        children: new Map(),
+                        mtime: Date.now()
                     };
                     current.children.set(segment, child);
                 } else if (child.type !== "directory") {
@@ -588,8 +591,8 @@
             if (!node) {
                 throw createNodeError("ENOENT", "stat", path);
             }
-            const now = Date.now();
             const size = node.type === "file" ? node.content?.length || 0 : 0;
+            const mtime = node.mtime;
             return {
                 isFile: ()=>node.type === "file",
                 isDirectory: ()=>node.type === "directory",
@@ -600,14 +603,14 @@
                 isSocket: ()=>false,
                 size,
                 mode: node.type === "directory" ? 493 : 420,
-                mtime: new Date(now),
-                atime: new Date(now),
-                ctime: new Date(now),
-                birthtime: new Date(now),
-                mtimeMs: now,
-                atimeMs: now,
-                ctimeMs: now,
-                birthtimeMs: now,
+                mtime: new Date(mtime),
+                atime: new Date(mtime),
+                ctime: new Date(mtime),
+                birthtime: new Date(mtime),
+                mtimeMs: mtime,
+                atimeMs: mtime,
+                ctimeMs: mtime,
+                birthtimeMs: mtime,
                 nlink: 1,
                 uid: 1e3,
                 gid: 1e3,
@@ -661,7 +664,8 @@
             }
             parent.children.set(basename, {
                 type: "directory",
-                children: new Map()
+                children: new Map(),
+                mtime: Date.now()
             });
         }
         readdirSync(path) {
@@ -942,6 +946,14 @@
             };
         }
     }
+    function simpleHash(str) {
+        let hash = 0;
+        for(let i = 0; i < str.length; i++){
+            hash = (hash << 5) - hash + str.charCodeAt(i);
+            hash |= 0;
+        }
+        return hash.toString(36);
+    }
     class Dirent {
         name;
         _isDirectory;
@@ -59633,7 +59645,23 @@ sys	0m0.000s
         "@sentry/node": sentryShim,
         "@sentry/core": sentryShim
     };
-    function createRequire(vfs, fsShim, process, currentDir, moduleCache, options) {
+    function createRequire(vfs, fsShim, process, currentDir, moduleCache, options, processedCodeCache) {
+        const resolutionCache = new Map();
+        const packageJsonCache = new Map();
+        const getParsedPackageJson = (pkgPath)=>{
+            if (packageJsonCache.has(pkgPath)) {
+                return packageJsonCache.get(pkgPath);
+            }
+            try {
+                const content = vfs.readFileSync(pkgPath, "utf8");
+                const parsed = JSON.parse(content);
+                packageJsonCache.set(pkgPath, parsed);
+                return parsed;
+            } catch  {
+                packageJsonCache.set(pkgPath, null);
+                return null;
+            }
+        };
         const resolveModule = (id, fromDir)=>{
             if (id.startsWith("node:")) {
                 id = id.slice(5);
@@ -59641,15 +59669,25 @@ sys	0m0.000s
             if (builtinModules[id] || id === "fs" || id === "process" || id === "url" || id === "querystring" || id === "util") {
                 return id;
             }
+            const cacheKey = `${fromDir}|${id}`;
+            const cached = resolutionCache.get(cacheKey);
+            if (cached !== void 0) {
+                if (cached === null) {
+                    throw new Error(`Cannot find module '${id}'`);
+                }
+                return cached;
+            }
             if (id.startsWith("./") || id.startsWith("../") || id.startsWith("/")) {
                 const resolved = id.startsWith("/") ? id : resolve$2(fromDir, id);
                 if (vfs.existsSync(resolved)) {
                     const stats = vfs.statSync(resolved);
                     if (stats.isFile()) {
+                        resolutionCache.set(cacheKey, resolved);
                         return resolved;
                     }
                     const indexPath = join$1(resolved, "index.js");
                     if (vfs.existsSync(indexPath)) {
+                        resolutionCache.set(cacheKey, indexPath);
                         return indexPath;
                     }
                 }
@@ -59660,9 +59698,11 @@ sys	0m0.000s
                 for (const ext of extensions){
                     const withExt = resolved + ext;
                     if (vfs.existsSync(withExt)) {
+                        resolutionCache.set(cacheKey, withExt);
                         return withExt;
                     }
                 }
+                resolutionCache.set(cacheKey, null);
                 throw new Error(`Cannot find module '${id}' from '${fromDir}'`);
             }
             const tryResolveFile = (basePath)=>{
@@ -59697,9 +59737,8 @@ sys	0m0.000s
                 const pkgName = parts[0].startsWith("@") && parts.length > 1 ? `${parts[0]}/${parts[1]}` : parts[0];
                 const pkgRoot = join$1(nodeModulesDir, pkgName);
                 const pkgPath = join$1(pkgRoot, "package.json");
-                if (vfs.existsSync(pkgPath)) {
-                    const pkgContent = vfs.readFileSync(pkgPath, "utf8");
-                    const pkg = JSON.parse(pkgContent);
+                const pkg = getParsedPackageJson(pkgPath);
+                if (pkg) {
                     if (pkg.exports) {
                         try {
                             const resolved2 = s(pkg, moduleId, {
@@ -59726,11 +59765,18 @@ sys	0m0.000s
             while(searchDir !== "/"){
                 const nodeModulesDir = join$1(searchDir, "node_modules");
                 const resolved = tryResolveFromNodeModules(nodeModulesDir, id);
-                if (resolved) return resolved;
+                if (resolved) {
+                    resolutionCache.set(cacheKey, resolved);
+                    return resolved;
+                }
                 searchDir = dirname(searchDir);
             }
             const rootResolved = tryResolveFromNodeModules("/node_modules", id);
-            if (rootResolved) return rootResolved;
+            if (rootResolved) {
+                resolutionCache.set(cacheKey, rootResolved);
+                return rootResolved;
+            }
+            resolutionCache.set(cacheKey, null);
             throw new Error(`Cannot find module '${id}'`);
         };
         const loadModule = (resolvedPath)=>{
@@ -59752,19 +59798,25 @@ sys	0m0.000s
                 module.loaded = true;
                 return module;
             }
-            let code = vfs.readFileSync(resolvedPath, "utf8");
+            const rawCode = vfs.readFileSync(resolvedPath, "utf8");
             const dirname$1 = dirname(resolvedPath);
-            const isCjsFile = resolvedPath.endsWith(".cjs");
-            const isAlreadyBundledCjs = code.startsWith('"use strict";\nvar __') || code.startsWith("'use strict';\nvar __");
-            const hasEsmImport = /\bimport\s+[\w{*'"]/m.test(code);
-            const hasEsmExport = /\bexport\s+(?:default|const|let|var|function|class|{|\*)/m.test(code);
-            if (!isCjsFile && !isAlreadyBundledCjs) {
-                if (resolvedPath.endsWith(".mjs") || resolvedPath.includes("/esm/") || hasEsmImport || hasEsmExport) {
-                    code = transformEsmToCjs(code, resolvedPath);
-                }
-            }
-            code = transformDynamicImports(code);
-            const moduleRequire = createRequire(vfs, fsShim, process, dirname$1, moduleCache, options);
+            const codeCacheKey = `${resolvedPath}|${simpleHash(rawCode)}`;
+            let code = processedCodeCache?.get(codeCacheKey);
+            if (!code) {
+                code = rawCode;
+                const isCjsFile = resolvedPath.endsWith(".cjs");
+                const isAlreadyBundledCjs = code.startsWith('"use strict";\nvar __') || code.startsWith("'use strict';\nvar __");
+                const hasEsmImport = /\bimport\s+[\w{*'"]/m.test(code);
+                const hasEsmExport = /\bexport\s+(?:default|const|let|var|function|class|{|\*)/m.test(code);
+                if (!isCjsFile && !isAlreadyBundledCjs) {
+                    if (resolvedPath.endsWith(".mjs") || resolvedPath.includes("/esm/") || hasEsmImport || hasEsmExport) {
+                        code = transformEsmToCjs(code, resolvedPath);
+                    }
+                }
+                code = transformDynamicImports(code);
+                processedCodeCache?.set(codeCacheKey, code);
+            }
+            const moduleRequire = createRequire(vfs, fsShim, process, dirname$1, moduleCache, options, processedCodeCache);
             moduleRequire.cache = moduleCache;
             const consoleWrapper = createConsoleWrapper(options.onConsole);
             try {
@@ -59935,6 +59987,7 @@ ${code}
         process;
         moduleCache = {};
         options;
+        processedCodeCache = new Map();
         constructor(vfs2, options2 = {}){
             this.vfs = vfs2;
             this.process = createProcess({
@@ -60016,7 +60069,7 @@ ${code}
         execute(code, filename = "/index.js") {
             const dirname$1 = dirname(filename);
             this.vfs.writeFileSync(filename, code);
-            const require = createRequire(this.vfs, this.fsShim, this.process, dirname$1, this.moduleCache, this.options);
+            const require = createRequire(this.vfs, this.fsShim, this.process, dirname$1, this.moduleCache, this.options, this.processedCodeCache);
             const module = {
                 id: filename,
                 filename,