@gcoredev/fastedge-test 0.2.0 → 0.2.2

package/dist/fastedge-cli/METADATA.json

@@ -1 +1 @@
-{"fastedge_run_version": "v0.15.0"}
+{"fastedge_run_version": "v0.16.7"}

package/dist/lib/index.cjs

@@ -49,13 +49,11 @@ var import_node_wasi = require("node:wasi");
 var textEncoder = new TextEncoder();
 var textDecoder = new TextDecoder();
 var MemoryManager = class {
-  constructor() {
-    this.memory = null;
-    this.instance = null;
-    this.hostAllocOffset = 0;
-    this.logCallback = null;
-    this.isInitializing = false;
-  }
+  memory = null;
+  instance = null;
+  hostAllocOffset = 0;
+  logCallback = null;
+  isInitializing = false;
   setMemory(memory) {
     this.memory = memory;
   }
@@ -218,7 +216,7 @@ var MemoryManager = class {
 
 // server/runner/HeaderManager.ts
 var textEncoder2 = new TextEncoder();
-var HeaderManager = class {
+var HeaderManager = class _HeaderManager {
   // Read a header value as a single string. For multi-valued headers (string[]) returns the first.
   // Use when callers know the header is conventionally single-valued (content-type, host, location, etc.)
   // and need to satisfy APIs that take a string.
@@ -241,7 +239,7 @@ var HeaderManager = class {
     return flat;
   }
   static normalize(headers) {
-    const normalized = {};
+    const normalized = /* @__PURE__ */ Object.create(null);
     for (const [key, value] of Object.entries(headers)) {
       const k = key.toLowerCase();
       if (Array.isArray(value)) {
@@ -252,6 +250,30 @@ var HeaderManager = class {
     }
     return normalized;
   }
+  // Append-merge two header records: for keys present in both, values are
+  // concatenated into a string[] rather than the right-hand side overwriting
+  // the left. Keys are lowercased on the way in (consistent with `normalize`).
+  //
+  // Used by the runner to combine request-phase response-header state with
+  // the origin's response headers, mirroring how Envoy serves
+  // `add_http_response_header` calls issued during onRequestHeaders /
+  // onRequestBody against the actual upstream response — both values survive
+  // as a multi-value list (preserving the proxy-wasm cross-phase pattern).
+  static appendMerge(left, right) {
+    const result = _HeaderManager.normalize(left);
+    for (const [key, value] of Object.entries(right)) {
+      const k = key.toLowerCase();
+      const incoming = Array.isArray(value) ? value.map(String) : [String(value)];
+      if (Object.hasOwn(result, k)) {
+        const existing = result[k];
+        const existingArr = Array.isArray(existing) ? existing : [existing];
+        result[k] = [...existingArr, ...incoming];
+      } else {
+        result[k] = incoming.length === 1 ? incoming[0] : incoming;
+      }
+    }
+    return result;
+  }
   static serialize(headers) {
     const pairs = Object.entries(headers);
     const numPairs = pairs.length;
@@ -430,20 +452,18 @@ var HeaderManager = class {
 
 // server/runner/PropertyResolver.ts
 var PropertyResolver = class {
-  constructor() {
-    this.properties = {};
-    this.requestHeaders = {};
-    this.requestMethod = "GET";
-    this.requestPath = "/";
-    this.requestScheme = "https";
-    this.requestUrl = "";
-    this.requestHost = "";
-    this.requestQuery = "";
-    this.requestExtension = "";
-    this.responseHeaders = {};
-    this.responseStatus = 200;
-    this.responseStatusText = "OK";
-  }
+  properties = {};
+  requestHeaders = {};
+  requestMethod = "GET";
+  requestPath = "/";
+  requestScheme = "https";
+  requestUrl = "";
+  requestHost = "";
+  requestQuery = "";
+  requestExtension = "";
+  responseHeaders = {};
+  responseStatus = 200;
+  responseStatusText = "OK";
   setProperties(properties) {
     this.properties = properties;
   }
@@ -635,6 +655,7 @@ var PropertyResolver = class {
 
 // server/fastedge-host/SecretStore.ts
 var SecretStore = class {
+  secrets;
   constructor(initialSecrets) {
     this.secrets = /* @__PURE__ */ new Map();
     if (initialSecrets) {
@@ -717,6 +738,7 @@ var SecretStore = class {
 
 // server/fastedge-host/Dictionary.ts
 var Dictionary = class {
+  data;
   constructor(initialData) {
     this.data = /* @__PURE__ */ new Map();
     if (initialData) {
@@ -884,26 +906,39 @@ function createFastEdgeHostFunctions(memory, secretStore, dictionary, logDebug)
 // server/runner/HostFunctions.ts
 var textEncoder3 = new TextEncoder();
 var HostFunctions = class {
+  memory;
+  propertyResolver;
+  propertyAccessControl;
+  getCurrentHook;
+  logs = [];
+  requestHeaders = [];
+  responseHeaders = [];
+  requestBody = "";
+  responseBody = "";
+  vmConfig = "";
+  pluginConfig = "";
+  currentContextId = 1;
+  lastHostCall = null;
+  debug = false;
+  currentLogLevel = 0 /* Trace */;
+  // Default to show all logs
+  // http_call state
+  nextTokenId = 0;
+  pendingHttpCall = null;
+  httpCallResponse = null;
+  streamClosed = false;
+  // 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;
+  dictionary;
   constructor(memory, propertyResolver, propertyAccessControl, getCurrentHook, debug = false, secretStore, dictionary) {
-    this.logs = [];
-    this.requestHeaders = [];
-    this.responseHeaders = [];
-    this.requestBody = "";
-    this.responseBody = "";
-    this.vmConfig = "";
-    this.pluginConfig = "";
-    this.currentContextId = 1;
-    this.lastHostCall = null;
-    this.debug = false;
-    this.currentLogLevel = 0 /* Trace */;
-    // Default to show all logs
-    // http_call state
-    this.nextTokenId = 0;
-    this.pendingHttpCall = null;
-    this.httpCallResponse = null;
-    this.streamClosed = false;
-    // Local response state (from proxy_send_local_response / send_http_response)
-    this.localResponse = null;
     this.memory = memory;
     this.propertyResolver = propertyResolver;
     this.propertyAccessControl = propertyAccessControl;
@@ -1248,12 +1283,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}`
@@ -1634,6 +1670,8 @@ var BUILT_IN_PROPERTIES = [
   }
 ];
 var PropertyAccessControl = class {
+  builtInProperties;
+  customProperties;
   constructor() {
     this.builtInProperties = /* @__PURE__ */ new Map();
     this.customProperties = /* @__PURE__ */ new Map();
@@ -1851,21 +1889,28 @@ var textEncoder4 = new TextEncoder();
 var BUILTIN_URL = "http://fastedge-builtin.debug";
 var BUILTIN_SHORTHAND = "built-in";
 var ProxyWasmRunner = class {
+  module = null;
+  // Compiled module (reused)
+  instance = null;
+  // Current instance (transient per hook)
+  memory;
+  propertyResolver;
+  propertyAccessControl;
+  currentHook = null;
+  hostFunctions;
+  logs = [];
+  rootContextId = 1;
+  nextContextId = 2;
+  currentContextId = 1;
+  isInitializing = false;
+  debug = process.env.PROXY_RUNNER_DEBUG === "1";
+  stateManager = null;
+  secretStore;
+  dictionary;
+  dotenvEnabled = true;
+  // Default to enabled
+  dotenvPath = ".";
   constructor(fastEdgeConfig, dotenvEnabled = true) {
-    this.module = null;
-    // Compiled module (reused)
-    this.instance = null;
-    this.currentHook = null;
-    this.logs = [];
-    this.rootContextId = 1;
-    this.nextContextId = 2;
-    this.currentContextId = 1;
-    this.isInitializing = false;
-    this.debug = process.env.PROXY_RUNNER_DEBUG === "1";
-    this.stateManager = null;
-    this.dotenvEnabled = true;
-    // Default to enabled
-    this.dotenvPath = ".";
     this.memory = new MemoryManager();
     this.propertyResolver = new PropertyResolver();
     this.propertyAccessControl = new PropertyAccessControl();
@@ -2038,14 +2083,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
@@ -2081,14 +2127,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
@@ -2218,6 +2265,14 @@ var ProxyWasmRunner = class {
           `Fetch completed: ${responseStatus} ${responseStatusText}`
         );
       }
+      const requestPhaseResponseHeaders = {
+        ...results.onRequestHeaders.output.response.headers ?? {},
+        ...results.onRequestBody.output.response.headers ?? {}
+      };
+      const mergedResponseHeaders = HeaderManager.appendMerge(
+        requestPhaseResponseHeaders,
+        responseHeaders
+      );
       const responseCall = {
         ...call,
         request: {
@@ -2226,7 +2281,7 @@ var ProxyWasmRunner = class {
           body: modifiedRequestBody
         },
         response: {
-          headers: responseHeaders,
+          headers: mergedResponseHeaders,
           body: responseBody,
           status: responseStatus,
           statusText: responseStatusText
@@ -2248,6 +2303,26 @@ var ProxyWasmRunner = class {
           "system"
         );
       }
+      if (results.onResponseHeaders.returnCode === 1 && this.hostFunctions.hasLocalResponse()) {
+        const local = this.hostFunctions.getLocalResponse();
+        const responseHeaders2 = results.onResponseHeaders.output.response.headers;
+        this.hostFunctions.resetLocalResponse();
+        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: mergedHeaders,
+            body,
+            contentType: contentType2,
+            isBase64: isBase642
+          },
+          calculatedProperties: this.propertyResolver.getCalculatedProperties()
+        };
+      }
       const headersAfterResponseHeaders = results.onResponseHeaders.output.response.headers;
       const propertiesAfterResponseHeaders = results.onResponseHeaders.properties;
       this.logDebug(
@@ -2272,6 +2347,26 @@ var ProxyWasmRunner = class {
           "system"
         );
       }
+      if (results.onResponseBody.returnCode === 1 && this.hostFunctions.hasLocalResponse()) {
+        const local = this.hostFunctions.getLocalResponse();
+        const responseHeaders2 = results.onResponseBody.output.response.headers;
+        this.hostFunctions.resetLocalResponse();
+        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: mergedHeaders,
+            body,
+            contentType: contentType2,
+            isBase64: isBase642
+          },
+          calculatedProperties: this.propertyResolver.getCalculatedProperties()
+        };
+      }
       const finalHeaders = results.onResponseBody.output.response.headers;
       const finalBody = results.onResponseBody.output.response.body;
       this.logDebug(`Final response body length: ${finalBody.length}`);
@@ -2639,7 +2734,9 @@ var ProxyWasmRunner = class {
     }
   }
   createImports() {
-    const wasi = new import_node_wasi.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 import_node_wasi.WASI({ version: "preview1", env: wasiEnv });
     const wasiImport = wasi.wasiImport;
     return {
       env: this.hostFunctions.createImports(),
@@ -2748,7 +2845,7 @@ var ProxyWasmRunner = class {
   /**
    * Not supported for Proxy-WASM (HTTP WASM only)
    */
-  async execute(request) {
+  async execute(_request) {
     throw new Error(
       "execute() is not supported for Proxy-WASM. Use callHook() or callFullFlow() instead."
     );
@@ -2912,21 +3009,22 @@ async function isLegacySyncWasm(bufferOrPath) {
 
 // server/runner/HttpWasmRunner.ts
 var HttpWasmRunner = class {
+  process = null;
+  port = null;
+  cliPath = null;
+  tempWasmPath = null;
+  currentWasmPath = null;
+  // resolved path used when spawning
+  logs = [];
+  stateManager = null;
+  portManager;
+  dotenvEnabled = true;
+  dotenvPath = null;
+  /** Pinned ports bypass PortManager allocation and must not be released back to it. */
+  isPinnedPort = false;
+  /** @deprecated Legacy sync support — remove when #[fastedge::http] is retired */
+  isLegacySync = false;
   constructor(portManager, dotenvEnabled = true) {
-    this.process = null;
-    this.port = null;
-    this.cliPath = null;
-    this.tempWasmPath = null;
-    this.currentWasmPath = null;
-    // resolved path used when spawning
-    this.logs = [];
-    this.stateManager = null;
-    this.dotenvEnabled = true;
-    this.dotenvPath = null;
-    /** Pinned ports bypass PortManager allocation and must not be released back to it. */
-    this.isPinnedPort = false;
-    /** @deprecated Legacy sync support — remove when #[fastedge::http] is retired */
-    this.isLegacySync = false;
     this.portManager = portManager;
     this.dotenvEnabled = dotenvEnabled;
   }
@@ -3326,12 +3424,10 @@ function parseFetchHeaders(headers) {
 // server/runner/PortManager.ts
 var import_net = require("net");
 var PortManager = class {
-  constructor() {
-    this.minPort = 8100;
-    this.maxPort = 8199;
-    this.allocatedPorts = /* @__PURE__ */ new Set();
-    this.lastAllocatedPort = this.minPort - 1;
-  }
+  minPort = 8100;
+  maxPort = 8199;
+  allocatedPorts = /* @__PURE__ */ new Set();
+  lastAllocatedPort = this.minPort - 1;
   /**
    * Check whether a port is actually free at the OS level.
    * This is necessary when multiple server processes run simultaneously —
@@ -3391,6 +3487,7 @@ var PortManager = class {
 
 // server/runner/WasmRunnerFactory.ts
 var WasmRunnerFactory = class {
+  portManager;
   constructor() {
     this.portManager = new PortManager();
   }