@fastly/expressly 1.0.0-alpha.4 → 1.0.0-alpha.7

package/README.md

@@ -17,11 +17,11 @@ First, head over to [developer.fastly.com](https://developer.fastly.com) to get
 Install expressly from the [npm registry](https://www.npmjs.com/package/@fastly/expressly):
 
 ```shell
-npm i @fastly/expressly@1.0.0-alpha.4
+npm i @fastly/expressly
 ```
 
 ```shell
-yarn add @fastly/expressly@1.0.0-alpha.4
+yarn add @fastly/expressly
 ```
 
 ### Your first expressly app

package/dist/lib/routing/common.d.ts

@@ -1,11 +1,11 @@
-/// <reference types="@fastly/js-compute" />
-export declare class ECommonObject {
-    headers: Headers;
-    set(headerNameOrObject: string | {
-        [key: string]: string;
-    }, value?: string): void;
-    private appendHeader;
-    append(headerNameOrObject: string | {
-        [key: string]: string | string[];
-    }, value?: string | string[]): void;
-}
+export declare function addCommonMethods<T extends new (...args: any[]) => any>(Base: T): {
+    new (...args: any[]): {
+        [x: string]: any;
+        set(headerNameOrObject: string | {
+            [key: string]: string;
+        }, value?: string): void;
+        append(headerNameOrObject: string | {
+            [key: string]: string | string[];
+        }, value?: string | string[]): void;
+    };
+} & T;

package/dist/lib/routing/common.js

@@ -1,36 +1,35 @@
-export class ECommonObject {
-    constructor() {
-        this.headers = new Headers();
-    }
-    // Header helpers.
-    set(headerNameOrObject, value) {
-        if (typeof headerNameOrObject === "string") {
-            this.headers.set(headerNameOrObject, value);
+export function addCommonMethods(Base) {
+    return class extends Base {
+        // Header helpers.
+        set(headerNameOrObject, value) {
+            if (typeof headerNameOrObject === "string") {
+                this.headers.set(headerNameOrObject, value);
+            }
+            else {
+                Object.keys(headerNameOrObject).forEach((headerName) => {
+                    this.headers.set(headerName, headerNameOrObject[headerName]);
+                });
+            }
         }
-        else {
-            Object.keys(headerNameOrObject).forEach((headerName) => {
-                this.headers.set(headerName, headerNameOrObject[headerName]);
-            });
+        append(headerNameOrObject, value) {
+            const appendHeader = (headerName, headerValue) => {
+                if (typeof headerValue === "string") {
+                    this.headers.append(headerName, headerValue);
+                }
+                else if (Array.isArray(headerValue)) {
+                    headerValue.forEach((v) => {
+                        this.headers.append(headerName, v);
+                    });
+                }
+            };
+            if (typeof headerNameOrObject === "string") {
+                appendHeader(headerNameOrObject, value);
+            }
+            else {
+                Object.keys(headerNameOrObject).forEach((headerName) => {
+                    appendHeader(headerName, headerNameOrObject[headerName]);
+                });
+            }
         }
-    }
-    appendHeader(headerName, headerValue) {
-        if (typeof headerValue === "string") {
-            this.headers.append(headerName, headerValue);
-        }
-        else if (Array.isArray(headerValue)) {
-            headerValue.forEach((v) => {
-                this.headers.append(headerName, v);
-            });
-        }
-    }
-    append(headerNameOrObject, value) {
-        if (typeof headerNameOrObject === "string") {
-            this.appendHeader(headerNameOrObject, value);
-        }
-        else {
-            Object.keys(headerNameOrObject).forEach((headerName) => {
-                this.appendHeader(headerName, headerNameOrObject[headerName]);
-            });
-        }
-    }
+    };
 }

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

@@ -1,10 +1,10 @@
-import { ERequest } from "./request";
-import { EResponse } from "./response";
-export declare type ErrorMiddlewareCallback = (err: Error, req: ERequest, res: EResponse) => Promise<any>;
+import { EReq } from "./request";
+import { ERes } from "./response";
+export declare type ErrorMiddlewareCallback = (err: Error, req: EReq, res: ERes) => Promise<any>;
 export declare class ErrorMiddleware {
     private matchFn;
     private callback;
     constructor(matchFn: Function, callback: ErrorMiddlewareCallback);
-    check(event: ERequest): 0 | 404 | string[];
-    run(err: Error, req: ERequest, res: EResponse): Promise<any>;
+    check(event: EReq): 0 | 404 | string[];
+    run(err: Error, req: EReq, res: ERes): Promise<any>;
 }

package/dist/lib/routing/mixin.d.ts

@@ -0,0 +1 @@
+export declare function applyMixins(derivedConstructor: any, baseConstructors: any[]): void;

package/dist/lib/routing/mixin.js

@@ -0,0 +1,9 @@
+export function applyMixins(derivedConstructor, baseConstructors) {
+    baseConstructors.forEach(baseConstructor => {
+        Object.getOwnPropertyNames(baseConstructor.prototype).forEach(name => {
+            if (name !== 'constructor') {
+                derivedConstructor.prototype[name] = baseConstructor.prototype[name];
+            }
+        });
+    });
+}

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

@@ -1,12 +1,10 @@
 /// <reference types="@fastly/js-compute" />
 import { CookieMap } from "./cookie-map";
 import { EConfig } from "..";
-export declare class ERequest extends Request {
+declare class ERequestBase extends Request {
     private config;
-    private event;
+    private readonly event;
     readonly clientInfo: ClientInfo;
-    readonly method: string;
-    headers: Headers;
     urlObj: URL;
     query: URLSearchParams;
     params: {
@@ -20,11 +18,17 @@ export declare class ERequest extends Request {
     get secure(): boolean;
     get subdomains(): Array<string>;
     get hostname(): string;
-    set(headerNameOrObject: string | {
-        [key: string]: string;
-    }, value?: string): void;
-    private appendHeader;
-    append(headerNameOrObject: string | {
-        [key: string]: string | string[];
-    }, value?: string | string[]): void;
 }
+export declare const ERequest: {
+    new (...args: any[]): {
+        [x: string]: any;
+        set(headerNameOrObject: string | {
+            [key: string]: string;
+        }, value?: string): void;
+        append(headerNameOrObject: string | {
+            [key: string]: string | string[];
+        }, value?: string | string[]): void;
+    };
+} & typeof ERequestBase;
+export declare type EReq = InstanceType<typeof ERequest>;
+export {};

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

@@ -1,23 +1,31 @@
+import { addCommonMethods } from "../common";
 import { CookieMap } from "./cookie-map";
-export class ERequest extends Request {
+// 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);
+        super(event.request, {
+            headers: event.request.headers,
+            method: event.request.method,
+            body: event.request.body,
+        });
         this.config = config;
         this.event = event;
         this.params = {};
-        this.clientInfo = event.client;
-        this.urlObj = new URL(event.request.url);
+        this.clientInfo = this.event.client;
+        this.urlObj = new URL(this.url);
         this.query = this.urlObj.searchParams;
+        Object.defineProperty(this, 'url', {
+            get() {
+                return this.urlObj.toString();
+            }
+        });
         // Parse cookies.
         if (this.config.parseCookie) {
             this.cookies = new CookieMap(this.headers);
         }
     }
     // Express-like URL helpers.
-    // get url(): string {
-    //   console.log("custom getter");
-    //   return this.urlObj.toString();
-    // }
     get path() {
         return this.urlObj.pathname;
     }
@@ -36,35 +44,5 @@ export class ERequest extends Request {
     get hostname() {
         return this.urlObj.hostname;
     }
-    // Header helpers.
-    set(headerNameOrObject, value) {
-        if (typeof headerNameOrObject === "string") {
-            this.headers.set(headerNameOrObject, value);
-        }
-        else {
-            Object.keys(headerNameOrObject).forEach((headerName) => {
-                this.headers.set(headerName, headerNameOrObject[headerName]);
-            });
-        }
-    }
-    appendHeader(headerName, headerValue) {
-        if (typeof headerValue === "string") {
-            this.headers.append(headerName, headerValue);
-        }
-        else if (Array.isArray(headerValue)) {
-            headerValue.forEach((v) => {
-                this.headers.append(headerName, v);
-            });
-        }
-    }
-    append(headerNameOrObject, value) {
-        if (typeof headerNameOrObject === "string") {
-            this.appendHeader(headerNameOrObject, value);
-        }
-        else {
-            Object.keys(headerNameOrObject).forEach((headerName) => {
-                this.appendHeader(headerName, headerNameOrObject[headerName]);
-            });
-        }
-    }
 }
+export const ERequest = addCommonMethods(ERequestBase);

package/dist/lib/routing/request/request-url.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/request/request-url.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/request-handler.d.ts

@@ -1,10 +1,10 @@
-import { ERequest } from "./request";
-import { EResponse } from "./response";
-export declare type RequestHandlerCallback = (req: ERequest, res: EResponse) => Promise<any>;
+import { EReq } from "./request";
+import { ERes } from "./response";
+export declare type RequestHandlerCallback = (req: EReq, res: ERes) => Promise<any>;
 export declare class RequestHandler {
     private matchFn;
     private callback;
     constructor(matchFn: Function, callback: RequestHandlerCallback);
-    check(event: ERequest): 0 | 404 | string[];
-    run(req: ERequest, res: EResponse): Promise<any>;
+    check(event: EReq): 0 | 404 | string[];
+    run(req: EReq, res: ERes): Promise<any>;
 }

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

@@ -1,8 +1,7 @@
 /// <reference types="@fastly/js-compute" />
-import { ECommonObject } from "../common";
 import { SurrogateKeys } from "./surrogate-keys";
 import { CookieOptions, EConfig } from "..";
-export declare class EResponse extends ECommonObject {
+declare class EResponseBase {
     private config;
     headers: Headers;
     status: number;
@@ -22,3 +21,16 @@ export declare class EResponse extends ECommonObject {
     text(data: string): void;
     html(data: string, charset?: string): void;
 }
+export declare const EResponse: {
+    new (...args: any[]): {
+        [x: string]: any;
+        set(headerNameOrObject: string | {
+            [key: string]: string;
+        }, value?: string): void;
+        append(headerNameOrObject: string | {
+            [key: string]: string | string[];
+        }, value?: string | string[]): void;
+    };
+} & typeof EResponseBase;
+export declare type ERes = InstanceType<typeof EResponse>;
+export {};

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

@@ -1,16 +1,18 @@
 import cookie from "cookie";
-import { ECommonObject } from "../common";
+import { addCommonMethods } from "../common";
 import { statusText } from "./status-codes";
 import { SurrogateKeys } from "./surrogate-keys";
-export class EResponse extends ECommonObject {
+// TODO: extends Response
+// See: https://github.com/fastly/js-compute-runtime/issues/113
+class EResponseBase {
     constructor(config) {
-        super();
         this.config = config;
         this.headers = new Headers();
         this.status = 0;
         this.body = null;
         this.hasEnded = false;
         this.surrogateKeys = new SurrogateKeys(this.headers);
+        // super();
     }
     // Header helpers.
     vary(field) {
@@ -33,8 +35,10 @@ export class EResponse extends ECommonObject {
             return;
         if (response instanceof Response) {
             this.body = response.body;
-            this.headers = response.headers;
-            this.status = response.status;
+            // Append, rather than overwrite headers.
+            response.headers.forEach((value, key) => this.headers.append(key, value));
+            // Do not overwrite user-defined status.
+            this.status = this.status || response.status;
         }
         else {
             this.body = response;
@@ -99,3 +103,4 @@ export class EResponse extends ECommonObject {
         this.send(data);
     }
 }
+export const EResponse = addCommonMethods(EResponseBase);

package/dist/lib/routing/router.js

@@ -13,7 +13,8 @@ const defaultErrorHandler = (auto405) => async (err, req, res) => {
         res.headers.set("Allow", err.allow);
         return res.sendStatus(405);
     }
-    res.withStatus(500).json({ error: err });
+    console.error(err);
+    res.withStatus(500).json({ error: err.message });
 };
 export class Router {
     constructor(config) {

package/package.json

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