@fastly/expressly 1.0.0-alpha.9 → 1.0.0-beta.2

package/dist/lib/routing/error-middleware.d.ts

@@ -1,6 +1,6 @@
 import { EReq } from "./request";
 import { ERes } from "./response";
-export declare type ErrorMiddlewareCallback = (err: Error, req: EReq, res: ERes) => Promise<any>;
+export type ErrorMiddlewareCallback = (err: Error, req: EReq, res: ERes) => Promise<any>;
 export declare class ErrorMiddleware {
     private matchFn;
     private callback;

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

@@ -30,5 +30,5 @@ export declare const ERequest: {
         }, value?: string | string[]): void;
     };
 } & typeof ERequestBase;
-export declare type EReq = InstanceType<typeof ERequest>;
+export type EReq = InstanceType<typeof ERequest>;
 export {};

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

@@ -2,11 +2,7 @@ import { addCommonMethods } from "../common";
 import { CookieMap } from "./cookie-map";
 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/request-handler.d.ts

@@ -1,6 +1,6 @@
 import { EReq } from "./request";
 import { ERes } from "./response";
-export declare type RequestHandlerCallback = (req: EReq, res: ERes) => Promise<any>;
+export type RequestHandlerCallback = (req: EReq, res: ERes) => Promise<any>;
 export declare class RequestHandler {
     private matchFn;
     private callback;

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

@@ -33,5 +33,5 @@ export declare const EResponse: {
         }, value?: string | string[]): void;
     };
 } & typeof EResponseBase;
-export declare type ERes = InstanceType<typeof EResponse>;
+export type ERes = InstanceType<typeof EResponse>;
 export {};

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

@@ -25,7 +25,7 @@ class EResponseBase {
     clearCookie(key, options = {}) {
         if (this.hasEnded)
             return;
-        this.cookie(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) {

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)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastly/expressly",
-  "version": "1.0.0-alpha.9",
+  "version": "1.0.0-beta.2",
   "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",
@@ -24,26 +24,25 @@
     "router"
   ],
   "engines": {
-    "node": "^16"
+    "node": ">=16.0.0"
   },
   "author": "oss@fastly.com",
   "license": "MIT",
   "devDependencies": {
     "@types/node": "^17.0.40",
-    "auto": "^10.37.1",
-    "husky": "^8.0.1",
-    "nodemon": "^2.0.18",
-    "prettier": "^2.7.1",
+    "auto": "^10.37.6",
+    "husky": "^8.0.2",
+    "prettier": "^2.8.1",
     "pretty-quick": "^3.1.3",
-    "ts-loader": "^9.3.1",
-    "typescript": "^4.7.4",
-    "webpack": "^5.73.0",
-    "webpack-cli": "^4.10.0"
+    "ts-loader": "^9.4.2",
+    "typescript": "^4.9.4",
+    "webpack": "^5.75.0",
+    "webpack-cli": "^5.0.1"
   },
   "dependencies": {
-    "@fastly/js-compute": "^0.3.0",
+    "@fastly/js-compute": "^0.7.0",
     "cookie": "^0.5.0",
-    "core-js": "^3.23.3",
+    "core-js": "^3.26.1",
     "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"
+  ]
 }