@fastly/expressly 1.0.0-alpha.8 → 1.0.0-beta.1

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

@@ -1,14 +1,8 @@
 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, {
-            headers: event.request.headers,
-            method: event.request.method,
-            body: event.request.body,
-        });
+        super(event.request);
         this.config = config;
         this.event = event;
         this.params = {};

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: new Date("Thu, 01 Jan 1970 00:00:00 GMT") });
     }
     // Response lifecycle methods.
     send(response) {
@@ -62,6 +60,9 @@ class EResponseBase {
     end(body) {
         if (this.hasEnded)
             return;
+        // if(typeof body !== "string") {
+        //   body = body.toString()
+        // }
         this.send(body);
     }
     // Send a HTTP status code response and end the response process.

package/dist/lib/routing/router.js

@@ -16,6 +16,38 @@ const defaultErrorHandler = (auto405) => async (err, req, res) => {
     console.error(err);
     res.withStatus(500).json({ error: err.message });
 };
+/**
+ * Handles preflight requests from trusted origins configured by the user when initializing a router.
+ * Note that the wildcard value "*" will fail if the request is sent with credentials (see: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin#directives)
+ * @param autoCorsPreflight the object containing CORS preflight option of trustedOrigins, an array of trusted origins.
+ * @returns 200 if the preflight request succeeds, 403 if it fails
+ */
+const preflightHandler = (autoCorsPreflight) => async (req, res) => {
+    if (autoCorsPreflight.trustedOrigins.length === 0) {
+        return res.sendStatus(403);
+    }
+    let originHeaderValue = null;
+    if (autoCorsPreflight.trustedOrigins.length === 1 && autoCorsPreflight.trustedOrigins[0] === "*") {
+        originHeaderValue = "*";
+    }
+    else if (req.headers.has("origin")) {
+        const origin = req.headers.get("origin").toLowerCase();
+        if (autoCorsPreflight.trustedOrigins.some((trustedOrigin) => trustedOrigin.toLowerCase() === origin)) {
+            originHeaderValue = origin;
+        }
+    }
+    if (!originHeaderValue) {
+        return res.sendStatus(403);
+    }
+    if (req.headers.has("access-control-request-method")) {
+        res.headers.set("access-control-allow-methods", req.headers.get("access-control-request-method"));
+    }
+    if (req.headers.has("access-control-request-headers")) {
+        res.headers.set("access-control-allow-headers", req.headers.get("access-control-request-headers"));
+    }
+    res.headers.set("access-control-allow-origin", originHeaderValue);
+    return res.sendStatus(200);
+};
 export class Router {
     constructor(config) {
         this.requestHandlers = [];
@@ -24,12 +56,15 @@ export class Router {
             parseCookie: true,
             auto405: true,
             extractRequestParameters: true,
-            autoContentType: false
+            autoContentType: false,
         };
         this.config = {
             ...this.config,
             ...config
         };
+        if (this.config.autoCorsPreflight) {
+            this.options("*", preflightHandler(this.config.autoCorsPreflight));
+        }
     }
     listen() {
         addEventListener("fetch", (event) => event.respondWith(this.handler(event)));
@@ -154,13 +189,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-beta.1",
   "description": "Express-style router for Fastly's Compute@Edge.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,7 +14,7 @@
   "scripts": {
     "build": "tsc",
     "prepublish": "tsc",
-    "dev": "nodemon --exec \"tsc\""
+    "dev": "tsc --watch"
   },
   "keywords": [
     "fastly",
@@ -30,20 +30,19 @@
   "license": "MIT",
   "devDependencies": {
     "@types/node": "^17.0.40",
-    "auto": "^10.37.1",
+    "auto": "^10.37.6",
     "husky": "^8.0.1",
-    "nodemon": "^2.0.18",
     "prettier": "^2.7.1",
     "pretty-quick": "^3.1.3",
-    "ts-loader": "^9.3.1",
-    "typescript": "^4.7.4",
-    "webpack": "^5.73.0",
+    "ts-loader": "^9.4.1",
+    "typescript": "^4.8.4",
+    "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0"
   },
   "dependencies": {
-    "@fastly/js-compute": "^0.3.0",
+    "@fastly/js-compute": "^0.5.4",
     "cookie": "^0.5.0",
-    "core-js": "^3.23.3",
+    "core-js": "^3.25.5",
     "path-to-regexp": "^6.2.1"
   },
   "auto": {

package/tsconfig.json

@@ -16,5 +16,8 @@
     "forceConsistentCasingInFileNames": true,
     "declaration": true
   },
-  "exclude": ["dist/", ".dora", "docs/"]
+  "exclude": ["node_modules"],
+  "include": [
+    "src/**/*.ts"
+  ]
 }