@cfworker/web 1.9.0 → 1.11.0

package/dist/accepts.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@cloudflare/workers-types" />
 export declare class Accepts {
     private readonly headers;
     private _type;

package/dist/accepts.js

@@ -7,13 +7,12 @@ const parseAcceptLanguage = preferredLanguages;
 const parseAcceptEncoding = preferredEncodings;
 const parseAcceptCharset = preferredCharsets;
 export class Accepts {
-    headers;
-    _type = undefined;
-    _language = undefined;
-    _encoding = undefined;
-    _charset = undefined;
     constructor(headers) {
         this.headers = headers;
+        this._type = undefined;
+        this._language = undefined;
+        this._encoding = undefined;
+        this._charset = undefined;
     }
     type(...values) {
         if (!this._type) {

package/dist/application.js

@@ -4,7 +4,9 @@ import { HttpError } from './http-error.js';
 import { composeMiddleware } from './middleware.js';
 const resolved = Promise.resolve();
 export class Application {
-    middleware = [];
+    constructor() {
+        this.middleware = [];
+    }
     use(middleware) {
         this.middleware.push(middleware);
         return this;
@@ -26,12 +28,12 @@ export class Application {
             return context.res.create();
         }
         catch (err) {
-            console.error(err);
+            console.error(err?.stack ?? err);
             if (err instanceof HttpError) {
                 return err.toResponse();
             }
             const status = 500;
-            const statusText = statuses[500];
+            const statusText = statuses.message[500];
             const headers = { 'content-type': 'text/plain' };
             return new Response(statusText, { status, statusText, headers });
         }

package/dist/context.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@cloudflare/workers-types" />
 import { Cookies } from './cookies.js';
 import { Req } from './req.js';
 import { ResponseBuilder } from './response-builder.js';

package/dist/context.js

@@ -2,13 +2,6 @@ import { Cookies } from './cookies.js';
 import { Req } from './req.js';
 import { ResponseBuilder } from './response-builder.js';
 export class Context {
-    event;
-    req;
-    res;
-    cookies;
-    respondWith;
-    responded;
-    state;
     constructor(event) {
         this.event = event;
         const request = event.request;

package/dist/cookies.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@cloudflare/workers-types" />
 import { CookieSerializeOptions } from 'cookie';
 export declare class Cookies {
     private readonly responseHeaders;

package/dist/cookies.js

@@ -1,8 +1,6 @@
 import { parse as parseCookie, serialize as serializeCookie } from 'cookie';
 const noCookies = Object.create(null);
 export class Cookies {
-    responseHeaders;
-    requestCookies;
     constructor(requestHeaders, responseHeaders) {
         this.responseHeaders = responseHeaders;
         const cookie = requestHeaders.get('cookie');

package/dist/http-error.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@cloudflare/workers-types" />
 export declare class HttpError extends Error {
     readonly status: number;
     readonly statusText: string;

package/dist/http-error.js

@@ -1,10 +1,7 @@
 import statuses from 'statuses';
 export class HttpError extends Error {
-    status;
-    statusText;
-    body;
     constructor(status, body) {
-        const statusText = statuses[statuses(status)];
+        const statusText = statuses.message[status];
         super(statusText);
         this.name = this.constructor.name;
         if (typeof Error.captureStackTrace === 'function') {

package/dist/middleware.d.ts

@@ -1,4 +1,3 @@
-import compose, { Middleware as GenericMiddleware } from 'koa-compose';
 import { Context } from './context.js';
-export declare type Middleware = GenericMiddleware<Context>;
-export declare const composeMiddleware: typeof compose;
+export declare type Middleware = (context: Context, next: () => Promise<void>) => Promise<void> | void;
+export declare function composeMiddleware(middleware: Middleware[]): Middleware;

package/dist/middleware.js

@@ -1,2 +1,28 @@
-import compose from 'koa-compose';
-export const composeMiddleware = compose;
+export function composeMiddleware(middleware) {
+    if (!Array.isArray(middleware))
+        throw new TypeError('Middleware stack must be an array!');
+    for (const fn of middleware) {
+        if (typeof fn !== 'function')
+            throw new TypeError('Middleware must be composed of functions!');
+    }
+    return function (context, next) {
+        let index = -1;
+        return dispatch(0);
+        function dispatch(i) {
+            if (i <= index)
+                return Promise.reject(new Error('next() called multiple times'));
+            index = i;
+            let fn = middleware[i];
+            if (i === middleware.length)
+                fn = next;
+            if (!fn)
+                return Promise.resolve();
+            try {
+                return Promise.resolve(fn(context, dispatch.bind(null, i + 1)));
+            }
+            catch (err) {
+                return Promise.reject(err);
+            }
+        }
+    };
+}

package/dist/req.d.ts

@@ -1,4 +1,5 @@
-import { Reviver } from 'secure-json-parse';
+/// <reference types="@cloudflare/workers-types" />
+import { Reviver } from 'secure-json-parse/index.js';
 import { Accepts } from './accepts.js';
 export declare class Req {
     readonly raw: Request;

package/dist/req.js

@@ -1,13 +1,6 @@
-import { safeParse } from 'secure-json-parse';
+import { safeParse } from 'secure-json-parse/index.js';
 import { Accepts } from './accepts.js';
 export class Req {
-    raw;
-    method;
-    url;
-    headers;
-    params;
-    accepts;
-    body;
     constructor(request) {
         this.raw = request;
         this.method = request.method;
@@ -19,11 +12,6 @@ export class Req {
     }
 }
 export class ReqBody {
-    request;
-    _arrayBuffer;
-    _formData;
-    _json;
-    _text;
     constructor(request) {
         this.request = request;
     }

package/dist/response-builder.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@cloudflare/workers-types" />
 export declare type ExtendedBodyInit = BodyInit | boolean | Date | number | object | null;
 export declare class ResponseBuilder {
     readonly headers: Headers;

package/dist/response-builder.js

@@ -1,11 +1,13 @@
 import statuses from 'statuses';
 export class ResponseBuilder {
-    headers = new Headers();
-    _status = 404;
-    _explicitStatus = false;
-    _implicitType = false;
-    _body = null;
-    _stringifyBody = false;
+    constructor() {
+        this.headers = new Headers();
+        this._status = 404;
+        this._explicitStatus = false;
+        this._implicitType = false;
+        this._body = null;
+        this._stringifyBody = false;
+    }
     get status() {
         return this._status;
     }
@@ -17,7 +19,7 @@ export class ResponseBuilder {
         }
     }
     get statusText() {
-        return statuses[this._status];
+        return statuses.message[this._status];
     }
     get body() {
         return this._body;
@@ -129,5 +131,3 @@ export class ResponseBuilder {
         return new Response(body, { status, statusText, headers });
     }
 }
-const Blob = self.Blob || class {
-};

package/dist/router.js

@@ -33,10 +33,17 @@ export const defaultRouterOptions = {
     pathToRegExpOptions: { strict: true }
 };
 export class Router {
-    options;
-    routes;
     constructor(options = defaultRouterOptions) {
         this.options = options;
+        this.middleware = async (ctx, next) => {
+            const resolved = this.resolve(ctx);
+            if (resolved) {
+                await resolved.middleware(ctx, next);
+            }
+            else {
+                await next();
+            }
+        };
         this.routes = [];
     }
     get(pathname, ...middleware) {
@@ -67,15 +74,6 @@ export class Router {
         const opts = this.options.pathToRegExpOptions;
         return this.compose([Path(pathname, opts)], ...middleware);
     }
-    middleware = async (ctx, next) => {
-        const resolved = this.resolve(ctx);
-        if (resolved) {
-            await resolved.middleware(ctx, next);
-        }
-        else {
-            await next();
-        }
-    };
     compose(conditions, ...middleware) {
         this.routes.push({
             conditions,

package/dist/validate.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@cloudflare/workers-types" />
 import { OutputUnit, Schema } from '@cfworker/json-schema';
 import { Middleware } from './middleware.js';
 export interface RequestSchemas {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cfworker/web",
-  "version": "1.9.0",
+  "version": "1.11.0",
   "description": "Web framework for Cloudflare Workers and service workers, inspired by Koa and fastify",
   "keywords": [
     "middleware",
@@ -34,31 +34,27 @@
     "test": "cfworker test test/**/*.spec.ts --nocheck"
   },
   "dependencies": {
-    "@cfworker/json-schema": "^1.9.0",
-    "@cfworker/worker-types": "^1.9.0",
-    "@cloudflare/workers-types": "^2.1.0",
-    "@types/cookie": "^0.4.0",
+    "@cfworker/json-schema": "^1.11.0",
+    "@cfworker/worker-types": "^1.11.0",
+    "@cloudflare/workers-types": "^3.2.0",
+    "@types/cookie": "^0.4.1",
     "@types/html-escaper": "^3.0.0",
-    "@types/json-pointer": "^1.0.30",
-    "@types/koa-compose": "^3.2.5",
-    "@types/secure-json-parse": "^1.0.2",
-    "@types/statuses": "^1.5.0",
+    "@types/json-pointer": "^1.0.31",
+    "@types/statuses": "^2.0.0",
     "cookie": "^0.4.1",
     "html-escaper": "^3.0.3",
-    "koa-compose": "^4.1.0",
     "negotiator": "^0.6.2",
     "path-to-regexp": "^6.2.0",
-    "secure-json-parse": "^2.3.2",
-    "statuses": "^1.5.0"
+    "secure-json-parse": "^2.4.0",
+    "statuses": "^2.0.1"
   },
   "devDependencies": {
-    "@cfworker/dev": "^1.9.0",
-    "@types/chai": "^4.2.16",
-    "@types/mocha": "^8.2.2",
+    "@cfworker/dev": "^1.11.0",
+    "@types/chai": "^4.2.22",
+    "@types/mocha": "^9.0.0",
     "chai": "^4.3.4",
     "json-pointer": "^0.6.1",
-    "mocha": "^8.3.2",
-    "typescript": "^4.4.3"
-  },
-  "gitHead": "d333ff940566a7acc384ab791d8b73bed2a9a211"
+    "mocha": "^9.1.3",
+    "typescript": "^4.5.2"
+  }
 }

package/src/application.ts

@@ -33,14 +33,14 @@ export class Application {
       await middleware(context, () => resolved);
       return context.res.create();
     } catch (err) {
-      console.error(err);
+      console.error((err as any)?.stack ?? err);
 
       if (err instanceof HttpError) {
         return err.toResponse();
       }
 
       const status = 500;
-      const statusText = statuses[500]!;
+      const statusText = statuses.message[500];
       const headers = { 'content-type': 'text/plain' };
       return new Response(statusText, { status, statusText, headers });
     }

package/src/declarations.d.ts

@@ -0,0 +1,2 @@
+// secure-json-parse's types rely on node's Buffer
+type Buffer = never;

package/src/http-error.ts

@@ -6,7 +6,7 @@ export class HttpError extends Error {
   public readonly body: string | object;
 
   constructor(status: number, body: string | object) {
-    const statusText = statuses[statuses(status)]!;
+    const statusText = statuses.message[status]!;
 
     super(statusText);
 

package/src/middleware.ts

@@ -1,6 +1,34 @@
-import compose, { Middleware as GenericMiddleware } from 'koa-compose';
 import { Context } from './context.js';
 
-export type Middleware = GenericMiddleware<Context>;
+export type Middleware = (
+  context: Context,
+  next: () => Promise<void>
+) => Promise<void> | void;
 
-export const composeMiddleware = compose;
+export function composeMiddleware(middleware: Middleware[]): Middleware {
+  if (!Array.isArray(middleware))
+    throw new TypeError('Middleware stack must be an array!');
+  for (const fn of middleware) {
+    if (typeof fn !== 'function')
+      throw new TypeError('Middleware must be composed of functions!');
+  }
+
+  return function (context, next) {
+    // last called middleware #
+    let index = -1;
+    return dispatch(0);
+    function dispatch(i: number): Promise<void> {
+      if (i <= index)
+        return Promise.reject(new Error('next() called multiple times'));
+      index = i;
+      let fn = middleware[i];
+      if (i === middleware.length) fn = next;
+      if (!fn) return Promise.resolve();
+      try {
+        return Promise.resolve(fn(context, dispatch.bind(null, i + 1)));
+      } catch (err) {
+        return Promise.reject(err);
+      }
+    }
+  };
+}

package/src/req.ts

@@ -1,4 +1,4 @@
-import { Reviver, safeParse } from 'secure-json-parse';
+import { Reviver, safeParse } from 'secure-json-parse/index.js';
 import { Accepts } from './accepts.js';
 
 export class Req {

package/src/response-builder.ts

@@ -28,7 +28,7 @@ export class ResponseBuilder {
   }
 
   get statusText() {
-    return statuses[this._status]!;
+    return statuses.message[this._status]!;
   }
 
   get body() {
@@ -156,6 +156,3 @@ export class ResponseBuilder {
     return new Response(body, { status, statusText, headers });
   }
 }
-
-// Cloudflare workers do not define the Blob class.
-const Blob = self.Blob || ((class {} as any) as Blob);

package/src/validate.ts

@@ -30,7 +30,7 @@ const hasBody: Record<string, true> = {
 
 function middlewareFactory(
   schemas: RequestSchemas,
-  parser: RequestParser = toObject,
+  parser: RequestParser = toObject as RequestParser,
   lookup = Object.create(null)
 ): Middleware {
   const {

package/tsconfig.json

@@ -1,12 +1,18 @@
 {
   "extends": "../../tsconfig-base",
   "compilerOptions": {
-    "target": "esnext",
-    "lib": ["esnext", "webworker"],
-    "types": ["@cfworker/worker-types", "@cloudflare/workers-types"],
+    "target": "ES2021",
+    "lib": ["esnext"],
+    "types": [
+      "chai",
+      "mocha",
+      "@cfworker/worker-types",
+      "@cloudflare/workers-types"
+    ],
     "outDir": "dist",
     "rootDir": "./src"
   },
+
   "include": ["src"],
   "references": [{ "path": "../json-schema" }]
 }

package/LICENSE.md

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 Jeremy Danyow
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.