@fastly/expressly 1.0.0-alpha.8 → 1.0.0-alpha.9

package/dist/lib/routing/request/index.js

@@ -1,7 +1,5 @@
 import { addCommonMethods } from "../common";
 import { CookieMap } from "./cookie-map";
-// Will extend Request correctly after https://github.com/fastly/js-compute-runtime/pull/116 is merged
-// See: https://github.com/fastly/js-compute-runtime/issues/113
 class ERequestBase extends Request {
     constructor(config, event) {
         super(event.request, {

package/dist/lib/routing/response/cookie-map.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="@fastly/js-compute" />
+export declare class CookieMap extends Map {
+    private headers;
+    constructor(headers: Headers);
+    clear(): void;
+    set(key: string, value: string): this;
+    delete(key: string): boolean;
+    private serialize;
+}

package/dist/lib/routing/response/cookie-map.js

@@ -0,0 +1,37 @@
+import cookie from "cookie";
+export class CookieMap extends Map {
+    constructor(headers) {
+        super();
+        this.headers = headers;
+        if (Boolean(this.headers.get("Cookie"))) {
+            for (const [key, value] of Object.entries(cookie.parse(this.headers.get("Cookie")))) {
+                if (typeof value === "string") {
+                    super.set(key, value);
+                }
+            }
+        }
+    }
+    clear() {
+        this.headers.delete("Cookie");
+        super.clear();
+    }
+    set(key, value) {
+        super.set(key, value);
+        this.serialize();
+        return this;
+    }
+    delete(key) {
+        const deleteResult = super.delete(key);
+        this.serialize();
+        return deleteResult;
+    }
+    serialize() {
+        if (this.size) {
+            const cookies = [];
+            for (const [key, value] of this.entries()) {
+                cookies.push(cookie.serialize(key, value));
+            }
+            this.headers.set("Cookie", cookies.join("; "));
+        }
+    }
+}

package/dist/lib/routing/response/headers.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="@fastly/js-compute" />
+export declare class EHeaders extends Headers {
+    cookies: Map<string, string>;
+    constructor();
+    private setCookie;
+    set(name: string, value: string): void;
+    append(name: string, value: string): void;
+    delete(name: string): void;
+}

package/dist/lib/routing/response/headers.js

@@ -0,0 +1,29 @@
+export class EHeaders extends Headers {
+    constructor() {
+        super();
+        this.cookies = new Map();
+    }
+    setCookie(value) {
+        const [cookieName] = value.split("=");
+        this.cookies.set(cookieName, value);
+    }
+    set(name, value) {
+        if (/^Set-Cookie$/i.test(name)) {
+            this.cookies.clear();
+            this.setCookie(value);
+        }
+        super.set(name, value);
+    }
+    append(name, value) {
+        if (/^Set-Cookie$/i.test(name)) {
+            this.setCookie(value);
+        }
+        super.append(name, value);
+    }
+    delete(name) {
+        if (/^Set-Cookie$/i.test(name)) {
+            this.cookies.clear();
+        }
+        super.delete(name);
+    }
+}

package/dist/lib/routing/response/index.d.ts

@@ -1,9 +1,10 @@
 /// <reference types="@fastly/js-compute" />
 import { SurrogateKeys } from "./surrogate-keys";
+import { EHeaders } from "./headers";
 import { CookieOptions, EConfig } from "..";
 declare class EResponseBase {
     private config;
-    headers: Headers;
+    headers: EHeaders;
     status: number;
     body: BodyInit;
     hasEnded: boolean;

package/dist/lib/routing/response/index.js

@@ -2,17 +2,15 @@ import cookie from "cookie";
 import { addCommonMethods } from "../common";
 import { statusText } from "./status-codes";
 import { SurrogateKeys } from "./surrogate-keys";
-// TODO: extends Response
-// See: https://github.com/fastly/js-compute-runtime/issues/113
+import { EHeaders } from "./headers";
 class EResponseBase {
     constructor(config) {
         this.config = config;
-        this.headers = new Headers();
+        this.headers = new EHeaders();
         this.status = 0;
         this.body = null;
         this.hasEnded = false;
         this.surrogateKeys = new SurrogateKeys(this.headers);
-        // super();
     }
     // Header helpers.
     vary(field) {
@@ -27,7 +25,7 @@ class EResponseBase {
     clearCookie(key, options = {}) {
         if (this.hasEnded)
             return;
-        this.headers.append("Set-Cookie", cookie.serialize(key, "", { ...options, expires: "Thu, 01 Jan 1970 00:00:00 GMT" }));
+        this.cookie(key, "", { ...options, expires: "Thu, 01 Jan 1970 00:00:00 GMT" });
     }
     // Response lifecycle methods.
     send(response) {

package/dist/lib/routing/router.js

@@ -154,13 +154,16 @@ export class Router {
         };
     }
     static serializeResponse(res) {
-        // Default to 200 / 204 if no status was set by middleware / route handler.
-        if (res.status === 0) {
-            res.status = Boolean(res.body) ? 200 : 204;
-        }
-        return new Response(res.body, {
+        const response = new Response(res.body, {
             headers: res.headers,
-            status: res.status,
+            // Default to 200 / 204 if no status was set by middleware / route handler.
+            status: res.status ? res.status : Boolean(res.body) ? 200 : 204,
         });
+        if (res.headers.cookies.size) {
+            // Loop cookies manually to work around this issue: https://github.com/fastly/js-compute-runtime/issues/47
+            response.headers.delete("Set-Cookie");
+            res.headers.cookies.forEach((c) => response.headers.append("Set-Cookie", c));
+        }
+        return response;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastly/expressly",
-  "version": "1.0.0-alpha.8",
+  "version": "1.0.0-alpha.9",
   "description": "Express-style router for Fastly's Compute@Edge.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",