memory-extract 0.1.3 → 0.1.4

package/package.json

@@ -2,7 +2,7 @@
   "name": "memory-extract",
   "description": "Tool for embedding data into PNG images",
   "license": "MIT",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "author": "semigarden",
   "repository": {
     "type": "git",

package/tools/play.mjs

@@ -153,7 +153,7 @@ const playMemoryPng = async (input, label = input) => {
             filePaths,
             playMode.entry
         );
-        const openUrl = new URL(playMode.entry, baseUrl).href;
+        const openUrl = baseUrl;
 
         await runServerSession({
             input,

package/tools/playMemoryServer.mjs

@@ -16,6 +16,15 @@ export const normalizeUrlPath = (pathname) => {
 export const urlPathToManifestPath = (urlPath) =>
     urlPath === "/" ? "" : urlPath.slice(1);
 
+export const resolveEntryMountPrefix = (entryPath) => {
+    const slash = entryPath.lastIndexOf("/");
+    if (slash <= 0) {
+        return "";
+    }
+
+    return entryPath.slice(0, slash + 1);
+};
+
 const hrefForEntry = (urlPath, name, isDirectory) => {
     const base = urlPath === "/" ? "" : urlPath;
     const href = `${base}/${name}${isDirectory ? "/" : ""}`.replace(/\/+/g, "/");
@@ -30,14 +39,12 @@ export const resolveManifestPathForUrl = (urlPath, manifestPaths, entryPath = ""
         return direct;
     }
 
-    const entryDir = entryPath.includes("/")
-        ? entryPath.slice(0, entryPath.lastIndexOf("/"))
-        : "";
+    const mountPrefix = resolveEntryMountPrefix(entryPath);
 
-    if (direct && entryDir) {
-        const joined = `${entryDir}/${direct}`.replace(/\/+/g, "/");
-        if (manifestSet.has(joined)) {
-            return joined;
+    if (direct && mountPrefix) {
+        const mounted = `${mountPrefix}${direct}`.replace(/\/+/g, "/");
+        if (manifestSet.has(mounted)) {
+            return mounted;
         }
     }
 
@@ -68,27 +75,51 @@ const serveManifestFile = (response, manifest, fileBytes, manifestPath) => {
     response.end(body);
 };
 
+const isHtmlEntryPath = (entryPath) =>
+    entryPath.endsWith(".html") || entryPath.endsWith(".htm");
+
 export const createMemoryPlayHandler = (manifest, fileBytes, filePaths, entryPath) => {
     const manifestPaths = filePaths ?? listManifestFiles(manifest);
+    const mountPrefix = resolveEntryMountPrefix(entryPath);
 
     return (request, response) => {
         try {
             const url = new URL(request.url ?? "/", "http://localhost");
             const urlPath = normalizeUrlPath(url.pathname);
 
+            if (mountPrefix) {
+                const mountRoot = `/${mountPrefix.replace(/\/$/, "")}`;
+
+                if (urlPath === mountRoot || urlPath.startsWith(`${mountRoot}/`)) {
+                    const relative =
+                        urlPath === mountRoot ? "/" : urlPath.slice(mountRoot.length);
+                    response.writeHead(302, {
+                        Location: relative.startsWith("/") ? relative : `/${relative}`,
+                    });
+                    response.end();
+                    return;
+                }
+            }
+
+            let manifestPath = null;
+
             if (urlPath === "/") {
-                response.writeHead(302, {
-                    Location: `/${entryPath}`,
-                });
-                response.end();
-                return;
+                manifestPath = entryPath;
+            } else {
+                manifestPath = resolveManifestPathForUrl(
+                    urlPath,
+                    manifestPaths,
+                    entryPath
+                );
             }
 
-            const manifestPath = resolveManifestPathForUrl(
-                urlPath,
-                manifestPaths,
-                entryPath
-            );
+            if (
+                !manifestPath &&
+                isHtmlEntryPath(entryPath) &&
+                request.method === "GET"
+            ) {
+                manifestPath = entryPath;
+            }
 
             if (!manifestPath) {
                 response.writeHead(404, { "Content-Type": "text/plain; charset=utf-8" });