jam-linux-arm64 0.9.2 → 0.9.3

package/bin/worker-thread.js

@@ -168858,7 +168858,7 @@ class ScriptCompiler {
 import fs3 from "node:fs";
 import path3 from "node:path";
 import vm from "node:vm";
-import { builtinModules, createRequire } from "node:module";
+import { builtinModules } from "node:module";
 import { fileURLToPath, pathToFileURL } from "node:url";
 
 // node_modules/.pnpm/@jridgewell+sourcemap-codec@1.5.5/node_modules/@jridgewell/sourcemap-codec/dist/sourcemap-codec.mjs
@@ -170632,9 +170632,6 @@ class VmModuleLoader {
   #packageEntryCache;
   #jamTestModule;
   #jamTemplateModule;
-  #nativeRequire;
-  #nativeRequireByModulePath;
-  #nativeModuleIds;
   #bareResolveCache;
   constructor(context, compiler, options) {
     this.#context = context;
@@ -170648,9 +170645,6 @@ class VmModuleLoader {
     this.#packageEntryCache = new Map;
     this.#jamTestModule = createJamTestModule();
     this.#jamTemplateModule = createJamTemplateModule();
-    this.#nativeRequire = createRequire(import.meta.url);
-    this.#nativeRequireByModulePath = new Map;
-    this.#nativeModuleIds = new Set;
     this.#bareResolveCache = new Map;
   }
   loadEntrypoint(scriptPath) {
@@ -170828,27 +170822,7 @@ ${stackBody}`;
     let mappedColumn = typeof mapped.column === "number" ? mapped.column + 1 : 1;
     return `${prefix}${mappedFile}:${mapped.line}:${mappedColumn}${suffix}`;
   }
-  dispose() {
-    let visited = new Set;
-    for (let moduleId of this.#nativeModuleIds) {
-      this.evictNativeModule(moduleId, visited);
-    }
-    this.#nativeModuleIds.clear();
-  }
-  evictNativeModule(moduleId, visited) {
-    if (!moduleId || visited.has(moduleId)) {
-      return;
-    }
-    visited.add(moduleId);
-    let cached = this.#nativeRequire.cache[moduleId];
-    if (!cached) {
-      return;
-    }
-    for (let child of cached.children || []) {
-      this.evictNativeModule(child.id, visited);
-    }
-    delete this.#nativeRequire.cache[moduleId];
-  }
+  dispose() {}
   requireFrom(specifier, modulePath, moduleDir) {
     try {
       if (specifier === "jam:test") {
@@ -171024,21 +170998,15 @@ ${stackBody}`;
       });
     }
     if (!resolved.startsWith("file://")) {
-      let nativeRequire2 = this.getNativeRequire(modulePath);
-      return nativeRequire2(specifier);
+      throw new ModuleLoaderError("resolve", `Could not resolve bare module "${specifier}" from "${modulePath}": ` + `unsupported resolution target "${resolved}".`);
     }
     let resolvedPath = fileURLToPath(resolved);
     let extension = path3.extname(resolvedPath).toLowerCase();
     if (extension === "" || SCRIPT_EXTENSIONS.includes(extension)) {
-      let loaded2 = this.loadModule(resolvedPath);
-      return loaded2;
+      let loaded = this.loadModule(resolvedPath);
+      return loaded;
     }
-    let nativeRequire = this.getNativeRequire(modulePath);
-    let loaded = nativeRequire(resolvedPath);
-    if (!resolvedPath.startsWith("node:") && path3.isAbsolute(resolvedPath)) {
-      this.#nativeModuleIds.add(resolvedPath);
-    }
-    return loaded;
+    throw new ModuleLoaderError("resolve", `Could not resolve bare module "${specifier}" from "${modulePath}": ` + `resolved file type "${extension}" is not supported.`);
   }
   resolveBareSpecifier(specifier, modulePath) {
     let cacheKey = `${modulePath}\x00${specifier}`;
@@ -171120,15 +171088,6 @@ ${stackBody}`;
   isNodeBuiltinSpecifier(specifier) {
     return NODE_BUILTINS.has(specifier);
   }
-  getNativeRequire(modulePath) {
-    let cached = this.#nativeRequireByModulePath.get(modulePath);
-    if (cached) {
-      return cached;
-    }
-    let created = createRequire(modulePath);
-    this.#nativeRequireByModulePath.set(modulePath, created);
-    return created;
-  }
   assertPathInsideRoot(targetPath, specifier, importer, attempts) {
     let absolute = path3.resolve(targetPath);
     attempts.push(absolute);
@@ -171218,7 +171177,8 @@ function extractPhpEnvValues(payload) {
 }
 function parseUrlEncodedPhpPost(rawBody) {
   let values = {};
-  let decoded = new URLSearchParams(rawBody.toString("utf8"));
+  let decoder = new TextDecoder("utf-8");
+  let decoded = new URLSearchParams(decoder.decode(rawBody));
   for (let [key, value] of decoded.entries()) {
     if (!(key in values)) {
       values[key] = value;
@@ -171358,7 +171318,7 @@ function buildRequest(message) {
   }
   let requestUrl = `${protocol}://${host}${pathWithQuery}`;
   let bodyBytes = message.body instanceof Uint8Array ? message.body : new Uint8Array(0);
-  let rawBody = Buffer.from(bodyBytes.buffer, bodyBytes.byteOffset, bodyBytes.byteLength);
+  let rawBody = bodyBytes;
   let requestBody;
   if (bodyBytes.byteLength > 0 && method !== "GET" && method !== "HEAD") {
     requestBody = bodyBytes;
@@ -171401,6 +171361,22 @@ function nextFormDataBoundary() {
 function escapeFormDataString(value) {
   return String(value).replaceAll("\\", "\\\\").replaceAll('"', "\\\"");
 }
+function decodeBase64ToBytes(base64Value) {
+  let normalized = String(base64Value || "").trim();
+  if (normalized === "") {
+    return new Uint8Array(0);
+  }
+  let binary = atob(normalized);
+  let bytes = new Uint8Array(binary.length);
+  for (let i = 0;i < binary.length; i += 1) {
+    bytes[i] = binary.charCodeAt(i) & 255;
+  }
+  return bytes;
+}
+function encodeUtf8(value) {
+  let encoder = new TextEncoder;
+  return encoder.encode(value);
+}
 function encodeFormDataBody(formData, boundary) {
   let lines = [];
   for (let [name, value] of formData.entries()) {
@@ -171425,7 +171401,7 @@ function encodeFormDataBody(formData, boundary) {
 `);
   }
   lines.push(`--${boundary}--`);
-  return Buffer.from(lines.join(""), "utf8");
+  return encodeUtf8(lines.join(""));
 }
 function isAbsoluteURL(value) {
   if (typeof value !== "string") {
@@ -171477,7 +171453,7 @@ function buildFetchStubResponse(stub) {
   }
   let body;
   if (typeof stub.bodyBase64 === "string" && stub.bodyBase64.trim() !== "") {
-    body = Buffer.from(stub.bodyBase64, "base64");
+    body = decodeBase64ToBytes(stub.bodyBase64);
   } else {
     body = String(stub.body || "");
   }
@@ -171850,8 +171826,7 @@ function createExecutionContext(payload, requestURL) {
     btoa,
     crypto: cryptoCompat,
     performance: performanceFacade,
-    structuredClone,
-    Buffer
+    structuredClone
   };
   sandbox.globalThis = sandbox;
   sandbox.global = sandbox;
@@ -171888,7 +171863,10 @@ async function executeScript(compiler, sharedResolutionCache, payload) {
     return {
       status: templateResult.status || 200,
       headers,
-      body: Buffer.from(templateResult.body)
+      response: new Response(templateResult.body, {
+        status: templateResult.status || 200,
+        headers: templateResult.headers
+      })
     };
   }
   let phpGlobals = await buildPhpGlobals(payload, builtRequest.request, builtRequest.rawBody);
@@ -171921,11 +171899,10 @@ async function executeScript(compiler, sharedResolutionCache, payload) {
       }
       headers[name].push(value);
     }
-    let body = new Uint8Array(await response.arrayBuffer());
     return {
       status: response.status || 200,
       headers,
-      body
+      response
     };
   } catch (error) {
     if (!(error instanceof ModuleLoaderError)) {
@@ -171991,6 +171968,25 @@ class SharedResolutionCache {
 var compiler = new ScriptCompiler;
 var sharedResolutionCache = new SharedResolutionCache;
 var workerThreadState = { started: false };
+function getMemoryUsageBytes() {
+  return process.memoryUsage().heapUsed;
+}
+function normalizeChunkBytes(chunk) {
+  if (chunk.byteOffset === 0 && chunk.byteLength === chunk.buffer.byteLength) {
+    return chunk;
+  }
+  return chunk.slice();
+}
+function postMessage(message, transferList = []) {
+  if (!parentPort) {
+    return;
+  }
+  if (transferList.length > 0) {
+    parentPort.postMessage(message, transferList);
+    return;
+  }
+  parentPort.postMessage(message);
+}
 function startWorkerThread() {
   if (workerThreadState.started) {
     return;
@@ -172005,24 +172001,63 @@ function startWorkerThread() {
     }
     try {
       let result = await executeScript(compiler, sharedResolutionCache, message.payload);
-      let response = {
+      let startMessage = {
+        type: "response-start",
         id: message.id,
-        ok: true,
-        result,
-        memoryUsageBytes: process.memoryUsage().heapUsed
+        status: result.status,
+        headers: result.headers,
+        memoryUsageBytes: getMemoryUsageBytes()
       };
-      parentPort.postMessage(response, [result.body.buffer]);
+      postMessage(startMessage);
+      if (!result.response.body) {
+        let endMessage2 = {
+          type: "response-end",
+          id: message.id,
+          memoryUsageBytes: getMemoryUsageBytes()
+        };
+        postMessage(endMessage2);
+        return;
+      }
+      let reader = result.response.body.getReader();
+      try {
+        while (true) {
+          let { done, value } = await reader.read();
+          if (done) {
+            break;
+          }
+          let rawChunk = value || new Uint8Array(0);
+          if (rawChunk.byteLength === 0) {
+            continue;
+          }
+          let chunk = normalizeChunkBytes(rawChunk);
+          let chunkMessage = {
+            type: "response-chunk",
+            id: message.id,
+            chunk,
+            memoryUsageBytes: getMemoryUsageBytes()
+          };
+          postMessage(chunkMessage, [chunk.buffer]);
+        }
+      } finally {
+        reader.releaseLock();
+      }
+      let endMessage = {
+        type: "response-end",
+        id: message.id,
+        memoryUsageBytes: getMemoryUsageBytes()
+      };
+      postMessage(endMessage);
     } catch (error) {
       let response = {
+        type: "response-error",
         id: message.id,
-        ok: false,
         error: {
           message: error instanceof Error ? error.message : String(error),
           stack: error instanceof Error ? error.stack : undefined
         },
-        memoryUsageBytes: process.memoryUsage().heapUsed
+        memoryUsageBytes: getMemoryUsageBytes()
       };
-      parentPort.postMessage(response);
+      postMessage(response);
     }
   });
 }

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "jam-linux-arm64",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "Linux arm64 binary for jam",
   "license": "MIT",
+  "author": "Michael Jackson <mjijackson@gmail.com>",
   "type": "module",
   "repository": {
     "type": "git",