@gcoredev/fastedge-test 0.2.1 → 0.2.3

package/dist/lib/test-framework/index.js

@@ -1,3 +1,4 @@
+import { createRequire as __cr } from 'node:module'; const require = __cr(import.meta.url);
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -19288,7 +19289,13 @@ var HostFunctions = class {
   pendingHttpCall = null;
   httpCallResponse = null;
   streamClosed = false;
-  // Local response state (from proxy_send_local_response / send_http_response)
+  // Local response state (from proxy_send_local_response / send_http_response).
+  // `headers` carries the additional headers passed as the 4th argument of
+  // `send_http_response`; ProxyWasmRunner merges these into finalResponse at
+  // the short-circuit points so they reach the caller alongside any headers
+  // accumulated via stream_context.headers.response.add() in the same hook.
+  // Stored as tuples to preserve order and duplicate-name semantics (e.g. for
+  // multi-value Set-Cookie additions).
   localResponse = null;
   // FastEdge extensions
   secretStore;
@@ -19638,12 +19645,13 @@ var HostFunctions = class {
         );
         const statusText = this.memory.readString(statusCodePtr, statusCodeLen);
         const body = this.memory.readBytes(bodyPtr, bodyLen);
+        let headers = [];
         if (headerPairsLen > 0) {
           const headerBytes = this.memory.readBytes(headerPairsPtr, headerPairsLen);
-          const headers = HeaderManager.deserializeBinary(headerBytes);
-          this.logDebug(`send_local_response headers (not merged): ${JSON.stringify(headers)}`);
+          headers = HeaderManager.deserializeBinaryToTuples(headerBytes);
+          this.logDebug(`send_local_response headers: ${JSON.stringify(headers)}`);
         }
-        this.localResponse = { statusCode, statusText, body };
+        this.localResponse = { statusCode, statusText, body, headers };
         this.logs.push({
           level: 1,
           message: `local_response status=${statusCode} ${statusText} bodyLen=${body.byteLength} grpc=${grpcStatus}`
@@ -20437,14 +20445,15 @@ var ProxyWasmRunner = class {
       const local = this.hostFunctions.getLocalResponse();
       const responseHeaders2 = results.onRequestHeaders.output.response.headers;
       this.hostFunctions.resetLocalResponse();
-      const contentType2 = HeaderManager.firstValue(responseHeaders2["content-type"]) || "text/plain";
+      const mergedHeaders = local.headers.length > 0 ? HeaderManager.appendMerge(responseHeaders2, HeaderManager.tuplesToRecord(local.headers)) : responseHeaders2;
+      const contentType2 = HeaderManager.firstValue(mergedHeaders["content-type"]) || "text/plain";
       const { body, isBase64: isBase642 } = encodeLocalResponseBody(local.body, contentType2);
       return {
         hookResults: results,
         finalResponse: {
           status: local.statusCode,
           statusText: local.statusText,
-          headers: responseHeaders2,
+          headers: mergedHeaders,
           body,
           contentType: contentType2,
           isBase64: isBase642
@@ -20480,14 +20489,15 @@ var ProxyWasmRunner = class {
       const local = this.hostFunctions.getLocalResponse();
       const responseHeaders2 = results.onRequestBody.output.response.headers;
       this.hostFunctions.resetLocalResponse();
-      const contentType2 = HeaderManager.firstValue(responseHeaders2["content-type"]) || "text/plain";
+      const mergedHeaders = local.headers.length > 0 ? HeaderManager.appendMerge(responseHeaders2, HeaderManager.tuplesToRecord(local.headers)) : responseHeaders2;
+      const contentType2 = HeaderManager.firstValue(mergedHeaders["content-type"]) || "text/plain";
       const { body, isBase64: isBase642 } = encodeLocalResponseBody(local.body, contentType2);
       return {
         hookResults: results,
         finalResponse: {
           status: local.statusCode,
           statusText: local.statusText,
-          headers: responseHeaders2,
+          headers: mergedHeaders,
           body,
           contentType: contentType2,
           isBase64: isBase642
@@ -20657,16 +20667,17 @@ var ProxyWasmRunner = class {
       }
       if (results.onResponseHeaders.returnCode === 1 && this.hostFunctions.hasLocalResponse()) {
         const local = this.hostFunctions.getLocalResponse();
-        const headers = results.onResponseHeaders.output.response.headers;
+        const responseHeaders2 = results.onResponseHeaders.output.response.headers;
         this.hostFunctions.resetLocalResponse();
-        const contentType2 = HeaderManager.firstValue(headers["content-type"]) || "text/plain";
+        const mergedHeaders = local.headers.length > 0 ? HeaderManager.appendMerge(responseHeaders2, HeaderManager.tuplesToRecord(local.headers)) : responseHeaders2;
+        const contentType2 = HeaderManager.firstValue(mergedHeaders["content-type"]) || "text/plain";
         const { body, isBase64: isBase642 } = encodeLocalResponseBody(local.body, contentType2);
         return {
           hookResults: results,
           finalResponse: {
             status: local.statusCode,
             statusText: local.statusText,
-            headers,
+            headers: mergedHeaders,
             body,
             contentType: contentType2,
             isBase64: isBase642
@@ -20700,16 +20711,17 @@ var ProxyWasmRunner = class {
       }
       if (results.onResponseBody.returnCode === 1 && this.hostFunctions.hasLocalResponse()) {
         const local = this.hostFunctions.getLocalResponse();
-        const headers = results.onResponseBody.output.response.headers;
+        const responseHeaders2 = results.onResponseBody.output.response.headers;
         this.hostFunctions.resetLocalResponse();
-        const contentType2 = HeaderManager.firstValue(headers["content-type"]) || "text/plain";
+        const mergedHeaders = local.headers.length > 0 ? HeaderManager.appendMerge(responseHeaders2, HeaderManager.tuplesToRecord(local.headers)) : responseHeaders2;
+        const contentType2 = HeaderManager.firstValue(mergedHeaders["content-type"]) || "text/plain";
         const { body, isBase64: isBase642 } = encodeLocalResponseBody(local.body, contentType2);
         return {
           hookResults: results,
           finalResponse: {
             status: local.statusCode,
             statusText: local.statusText,
-            headers,
+            headers: mergedHeaders,
             body,
             contentType: contentType2,
             isBase64: isBase642
@@ -21084,7 +21096,9 @@ var ProxyWasmRunner = class {
     }
   }
   createImports() {
-    const wasi = new WASI({ version: "preview1", env: this.dictionary.getAll() });
+    const dictEnv = this.dictionary.getAll();
+    const wasiEnv = Object.keys(dictEnv).length === 0 ? { __FASTEDGE_RUNNER__: "1" } : dictEnv;
+    const wasi = new WASI({ version: "preview1", env: wasiEnv });
     const wasiImport = wasi.wasiImport;
     return {
       env: this.hostFunctions.createImports(),
@@ -21241,7 +21255,7 @@ import { spawn, execSync as execSync2 } from "child_process";
 
 // server/utils/fastedge-cli.ts
 import { execSync } from "child_process";
-import { existsSync, chmodSync } from "fs";
+import { existsSync, chmodSync, readFileSync } from "fs";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
 import os from "os";
@@ -21258,19 +21272,37 @@ function getCliBinaryName() {
       throw new Error(`Unsupported platform: ${os.platform()}`);
   }
 }
-function getBundledCliPaths() {
+function getPackageRoot(startDir = _currentDir) {
+  let dir = startDir;
+  while (true) {
+    const pkgPath = join(dir, "package.json");
+    if (existsSync(pkgPath)) {
+      try {
+        const pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
+        if (pkg.name === "@gcoredev/fastedge-test") return dir;
+      } catch {
+      }
+    }
+    const parent = dirname(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
+function getBundledCliPaths(startDir = _currentDir) {
   const binaryName = getCliBinaryName();
-  return [
-    // Installed npm package: dist/lib/index.js → dist/fastedge-cli/
-    join(_currentDir, "..", "fastedge-cli", binaryName),
-    // Production: bundled server at dist/server.js → dist/fastedge-cli/
-    join(_currentDir, "fastedge-cli", binaryName),
-    // Development/Tests: running from source
-    // _currentDir might be server/utils/, so go up to project root
-    join(_currentDir, "..", "..", "fastedge-run", binaryName),
-    // Alternative: if _currentDir is already at project root
-    join(_currentDir, "fastedge-run", binaryName)
-  ];
+  const candidates = [];
+  const root = getPackageRoot(startDir);
+  if (root) {
+    candidates.push(
+      join(root, "dist", "fastedge-cli", binaryName),
+      join(root, "fastedge-run", binaryName)
+    );
+  }
+  candidates.push(
+    join(startDir, "fastedge-cli", binaryName),
+    join(startDir, "..", "fastedge-cli", binaryName)
+  );
+  return candidates;
 }
 function ensureExecutable(binaryPath) {
   if (process.platform !== "win32") {
@@ -21308,7 +21340,7 @@ async function findFastEdgeRunCli() {
   } catch (error) {
   }
   throw new Error(
-    "fastedge-run CLI not found in any of these locations:\n  1. FASTEDGE_RUN_PATH environment variable\n  2. Bundled binary in fastedge-cli/ (project root)\n  3. System PATH\n\nTo fix this:\n  - Set FASTEDGE_RUN_PATH environment variable, or\n  - Install fastedge-run in PATH: cargo install fastedge-run, or\n  - Place the binary in fastedge-cli/ at project root (platform-specific filename)"
+    "fastedge-run CLI not found in any of these locations:\n  1. FASTEDGE_RUN_PATH environment variable\n  2. Bundled inside the @gcoredev/fastedge-test package (dist/fastedge-cli/<binary> when installed, fastedge-run/<binary> in the source tree)\n  3. System PATH (which/where fastedge-run)\n\nTo fix this:\n  - Set FASTEDGE_RUN_PATH to a fastedge-run binary you have locally, or\n  - Install fastedge-run in PATH: cargo install fastedge-run, or\n  - Reinstall @gcoredev/fastedge-test to restore the bundled binary (or, when developing this repo, place the platform binary in fastedge-run/)"
   );
 }
 

package/dist/lib/utils/fastedge-cli.d.ts

@@ -3,9 +3,44 @@
  *
  * Discovers the FastEdge-run CLI binary in the following order:
  * 1. FASTEDGE_RUN_PATH environment variable
- * 2. Bundled binary in server/fastedge-cli/ (platform-specific)
+ * 2. Bundled binary inside the @gcoredev/fastedge-test package, anchored on
+ *    the package root (see getPackageRoot):
+ *      • dist/fastedge-cli/<binary>   — published npm layout
+ *      • fastedge-run/<binary>        — in-repo source/dev layout
  * 3. PATH (using 'which' or 'where' command)
  */
+/**
+ * Walk up from `startDir` until a package.json with name "@gcoredev/fastedge-test"
+ * is found. Anchoring on the package name (rather than hardcoded depths or an
+ * unbounded walk) keeps the search robust across bundle layouts and avoids
+ * climbing into a sibling package in workspace/monorepo installs.
+ *
+ * `startDir` defaults to the directory of this file (resolved at module load).
+ * It is overridable for tests so the resolver can be exercised against
+ * synthetic package layouts.
+ */
+export declare function getPackageRoot(startDir?: string): string | null;
+/**
+ * Get possible bundled CLI paths.
+ *
+ * Two resolution modes, both contribute candidates:
+ *
+ *  1. **Package-root anchored** (primary) — when a `@gcoredev/fastedge-test`
+ *     package.json can be located via `getPackageRoot`, candidates resolve
+ *     against it: the published npm layout (`dist/fastedge-cli/`) and the
+ *     in-repo source layout (`fastedge-run/`).
+ *
+ *  2. **startDir-relative fallback** — covers bundle layouts that ship
+ *     without our package.json available nearby. Notably the VSCode extension
+ *     copies `dist/server.js` and `dist/fastedge-cli/` into its own tree, so
+ *     the walker can't anchor on our package root. The fallback lets the
+ *     server bundle locate the sibling `fastedge-cli/` directory directly.
+ *
+ * `findFastEdgeRunCli` filters by existence, so listing extra candidates is
+ * safe — the first one that actually exists wins. `startDir` is overridable
+ * for tests.
+ */
+export declare function getBundledCliPaths(startDir?: string): string[];
 /**
  * Find the FastEdge-run CLI binary
  * @returns The absolute path to the fastedge-run binary