edge.libx.js 0.1.9 → 0.2.0

package/build/main.d.ts

@@ -1,2 +1,2 @@
 export { RouterWrapper } from "./modules/RouterWrapper";
-export { initCors as cors } from "./modules/cors";
+export * as cors from "./modules/cors";

package/build/main.js

@@ -1,8 +1,40 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cors = exports.RouterWrapper = void 0;
 var RouterWrapper_1 = require("./modules/RouterWrapper");
 Object.defineProperty(exports, "RouterWrapper", { enumerable: true, get: function () { return RouterWrapper_1.RouterWrapper; } });
-var cors_1 = require("./modules/cors");
-Object.defineProperty(exports, "cors", { enumerable: true, get: function () { return cors_1.initCors; } });
+exports.cors = __importStar(require("./modules/cors"));
 //# sourceMappingURL=main.js.map

package/build/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;AAAA,yDAAwD;AAA/C,8GAAA,aAAa,OAAA;AACtB,uCAAkD;AAAzC,4FAAA,QAAQ,OAAQ","sourcesContent":["export { RouterWrapper } from \"./modules/RouterWrapper\";\nexport { initCors as cors } from \"./modules/cors\";"]}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAwD;AAA/C,8GAAA,aAAa,OAAA;AACtB,uDAAuC","sourcesContent":["export { RouterWrapper } from \"./modules/RouterWrapper\";\nexport * as cors from \"./modules/cors\";"]}

package/build/modules/RouterWrapper.d.ts

@@ -1,17 +1,17 @@
-import { RouterType, IRequest } from 'itty-router';
+import { RouterType, cors, IRequest } from 'itty-router';
 type BaseRouterInitializer = (string: any) => {
     base: string;
     router: RouterType<IRequest, any[]>;
 };
+type CorsOptions = Parameters<typeof cors>[0];
 export declare class RouterWrapper<TCtx = any> {
     base: string;
     router: RouterType<Request, [], any>;
-    private static cors;
-    private static preflight;
-    private static corsify;
-    constructor(base: string, router: RouterType<Request, [], any>);
-    private static tryCors;
-    static getNew(base: string): RouterWrapper<any>;
+    private cors;
+    private preflight;
+    private corsify;
+    constructor(base: string, router: RouterType<Request, [], any>, corsOptions?: CorsOptions);
+    static getNew(base: string, corsOptions?: CorsOptions): RouterWrapper<any>;
     static errorHandler(error: any): Response;
     registerRoute(newBase: string, baseRouterInitializer: BaseRouterInitializer): RouterType<Request, [], any>;
     fetchHandler(request: IRequest, ctx: TCtx): Promise<Response>;

package/build/modules/RouterWrapper.js

@@ -1,38 +1,38 @@
 "use strict";
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RouterWrapper = void 0;
 const essentials_js_1 = require("libx.js/build/bundles/essentials.js");
 const itty_router_1 = require("itty-router");
 const server_1 = require("@whatwg-node/server");
 class RouterWrapper {
-    constructor(base, router) {
+    constructor(base, router, corsOptions) {
         this.base = base;
         this.router = router;
+        this.cors = (0, itty_router_1.cors)(corsOptions !== null && corsOptions !== void 0 ? corsOptions : {
+            origin: '*',
+            allowMethods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS', 'PATCH'],
+            allowHeaders: ['Content-Type', 'Authorization'],
+            exposeHeaders: ['Content-Type', 'Authorization'],
+        });
+        this.preflight = this.cors.preflight;
+        this.corsify = this.cors.corsify;
     }
-    static tryCors(response, request) {
-        try {
-            return this.corsify(response, request);
-        }
-        catch (err) {
-            essentials_js_1.libx.log.w('tryCors: failed to perform CORS', err);
-        }
-    }
-    static getNew(base) {
+    static getNew(base, corsOptions) {
+        const temp = new RouterWrapper(base, (0, itty_router_1.Router)({ base }), corsOptions);
         const router = (0, itty_router_1.Router)({
             base,
-            before: [this.preflight],
-            catch: this.errorHandler,
+            before: [temp.preflight],
+            catch: RouterWrapper.errorHandler,
         });
         router.all('*', itty_router_1.withParams);
-        return new _a(base, router);
+        return new RouterWrapper(base, router, corsOptions);
     }
     static errorHandler(error) {
-        var _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e;
         const isObject = essentials_js_1.libx.isObject(error);
-        const errMessage = (_b = error === null || error === void 0 ? void 0 : error.message) !== null && _b !== void 0 ? _b : error;
+        const errMessage = (_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : error;
         const msg = 'Error: ' + (!isObject ? (errMessage !== null && errMessage !== void 0 ? errMessage : 'Server Error') : JSON.stringify(error));
-        const status = parseInt((_e = (_d = (_c = error === null || error === void 0 ? void 0 : error.status) !== null && _c !== void 0 ? _c : error === null || error === void 0 ? void 0 : error.statusCode) !== null && _d !== void 0 ? _d : error === null || error === void 0 ? void 0 : error.code) !== null && _e !== void 0 ? _e : (_f = error === null || error === void 0 ? void 0 : error.error) === null || _f === void 0 ? void 0 : _f.code) || 500;
+        const status = parseInt((_d = (_c = (_b = error === null || error === void 0 ? void 0 : error.status) !== null && _b !== void 0 ? _b : error === null || error === void 0 ? void 0 : error.statusCode) !== null && _c !== void 0 ? _c : error === null || error === void 0 ? void 0 : error.code) !== null && _d !== void 0 ? _d : (_e = error === null || error === void 0 ? void 0 : error.error) === null || _e === void 0 ? void 0 : _e.code) || 500;
         console.error('Server error: ', error, status);
         return new Response(msg, { status });
     }
@@ -43,7 +43,10 @@ class RouterWrapper {
     }
     ;
     fetchHandler(request, ctx) {
-        return this.router.fetch(request, ctx).then(itty_router_1.json).catch(_a.errorHandler);
+        return this.router.fetch(request, ctx)
+            .then(itty_router_1.json)
+            .catch(RouterWrapper.errorHandler)
+            .then((res) => this.corsify(res, request));
     }
     catchNotFound() {
         this.router.all('*', () => (0, itty_router_1.error)(404));
@@ -54,8 +57,4 @@ class RouterWrapper {
     }
 }
 exports.RouterWrapper = RouterWrapper;
-_a = RouterWrapper;
-RouterWrapper.cors = (0, itty_router_1.cors)({ origin: ['*'], allowMethods: ['POST'] });
-RouterWrapper.preflight = _a.cors.preflight;
-RouterWrapper.corsify = _a.cors.corsify;
 //# sourceMappingURL=RouterWrapper.js.map

package/build/modules/RouterWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"RouterWrapper.js","sourceRoot":"","sources":["../../src/modules/RouterWrapper.ts"],"names":[],"mappings":";;;;AAAA,uEAA2D;AAC3D,6CAAwH;AACxH,gDAA0D;AAI1D,MAAa,aAAa;IAKzB,YAA0B,IAAY,EAAS,MAAoC;QAAzD,SAAI,GAAJ,IAAI,CAAQ;QAAS,WAAM,GAAN,MAAM,CAA8B;IAEnF,CAAC;IAEO,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO;QACvC,IAAI,CAAC;YACJ,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACL,oBAAI,CAAC,GAAG,CAAC,CAAC,CAAC,iCAAiC,EAAE,GAAG,CAAC,CAAC;QACvD,CAAC;IACR,CAAC;IAEM,MAAM,CAAC,MAAM,CAAC,IAAY;QAChC,MAAM,MAAM,GAAG,IAAA,oBAAM,EAAC;YACZ,IAAI;YACJ,MAAM,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;YACxB,KAAK,EAAE,IAAI,CAAC,YAAY;SAE3B,CAAC,CAAC;QACT,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,wBAAU,CAAC,CAAC;QAK5B,OAAO,IAAI,EAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IAGM,MAAM,CAAC,YAAY,CAAC,KAAK;;QAC/B,MAAM,QAAQ,GAAG,oBAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACtC,MAAM,UAAU,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,mCAAI,KAAK,CAAC;QAC3C,MAAM,GAAG,GAAG,SAAS,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QAC7F,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAA,MAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,mCAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,mCAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,mCAAI,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,KAAK,0CAAE,IAAI,CAAC,IAAI,GAAG,CAAC;QACxG,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QAC/C,OAAO,IAAI,QAAQ,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;IACrC,CAAC;IAEM,aAAa,CAAC,OAAe,EAAE,qBAA4C;QACjF,MAAM,KAAK,GAAG,qBAAqB,CAAC,GAAG,IAAI,CAAC,IAAI,GAAG,OAAO,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,GAAG,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IAAA,CAAC;IAEK,YAAY,CAAC,OAAiB,EAAE,GAAS;QAE/C,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,kBAAI,CAAC,CAAC,KAAK,CAAC,EAAa,CAAC,YAAY,CAAC,CAAC;IACrF,CAAC;IAEM,aAAa;QACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,IAAA,mBAAK,EAAC,GAAG,CAAC,CAAC,CAAC;IACxC,CAAC;IAEM,mBAAmB;QACzB,MAAM,UAAU,GAAG,IAAA,4BAAmB,EAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACrE,OAAO,UAAU,CAAC;IACnB,CAAC;;AA5DF,sCA6DC;;AA5De,kBAAI,GAAG,IAAA,kBAAI,EAAC,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,AAAlD,CAAmD;AACvD,uBAAS,GAAG,EAAI,CAAC,IAAI,CAAC,SAAS,AAAtB,CAAuB;AAChC,qBAAO,GAAG,EAAI,CAAC,IAAI,CAAC,OAAO,AAApB,CAAqB","sourcesContent":["import { libx } from 'libx.js/build/bundles/essentials.js';\nimport { Route, Router, RouterType, error, json, cors, withParams, IRequest, text, ResponseHandler } from 'itty-router';\nimport { createServerAdapter } from '@whatwg-node/server';\n\ntype BaseRouterInitializer = (string) => { base: string; router: RouterType<IRequest, any[]> };\n\nexport class RouterWrapper<TCtx = any> {\n\tprivate static cors = cors({ origin: ['*'], allowMethods: ['POST'] });\n\tprivate static preflight = this.cors.preflight;\n\tprivate static corsify = this.cors.corsify;\n\n\tpublic constructor(public base: string, public router: RouterType<Request, [], any>) {\n\n\t}\n\n\tprivate static tryCors(response, request): Response {\n\t\ttry {\n\t\t\treturn this.corsify(response, request);\n\t\t} catch (err) {\n            libx.log.w('tryCors: failed to perform CORS', err);\n        }\n\t}\n\n\tpublic static getNew(base: string) {\n\t\tconst router = Router({\n            base,\n            before: [this.preflight],\n            catch: this.errorHandler,\n            // finally: [this.tryCors],\n        });\n\t\trouter.all('*', withParams);\n\t\t// router.finally.push(this.corsify);\n\n\t\t// router.all('*', () => error(404));\n\n\t\treturn new RouterWrapper(base, router);\n\t}\n\n\n\tpublic static errorHandler(error) {\n\t\tconst isObject = libx.isObject(error);\n\t\tconst errMessage = error?.message ?? error;\n\t\tconst msg = 'Error: ' + (!isObject ? (errMessage ?? 'Server Error') : JSON.stringify(error));\n\t\tconst status = parseInt(error?.status ?? error?.statusCode ?? error?.code ?? error?.error?.code) || 500;\n\t\tconsole.error('Server error: ', error, status);\n\t\treturn new Response(msg, { status })\n\t}\n\n\tpublic registerRoute(newBase: string, baseRouterInitializer: BaseRouterInitializer) {\n\t\tconst route = baseRouterInitializer(`${this.base}${newBase}`);\n\t\tthis.router.all(newBase + '/*', route.router.fetch);\n\t\treturn this.router;\n\t};\n\n\tpublic fetchHandler(request: IRequest, ctx: TCtx) {\n\t\t// return this.router.fetch(request, ctx).then(json).then(RouterWrapper.corsify).catch(this.errorHandler);\n\t\treturn this.router.fetch(request, ctx).then(json).catch(RouterWrapper.errorHandler);\n\t}\n\n\tpublic catchNotFound() {\n\t\tthis.router.all('*', () => error(404));\n\t}\n\n\tpublic createServerAdapter() {\n\t\tconst ittyServer = createServerAdapter(this.fetchHandler.bind(this));\n\t\treturn ittyServer;\n\t}\n}"]}
+{"version":3,"file":"RouterWrapper.js","sourceRoot":"","sources":["../../src/modules/RouterWrapper.ts"],"names":[],"mappings":";;;AAAA,uEAA2D;AAC3D,6CAAwH;AACxH,gDAA0D;AAK1D,MAAa,aAAa;IAKzB,YACQ,IAAY,EACZ,MAAoC,EAC3C,WAAyB;QAFlB,SAAI,GAAJ,IAAI,CAAQ;QACZ,WAAM,GAAN,MAAM,CAA8B;QAG3C,IAAI,CAAC,IAAI,GAAG,IAAA,kBAAI,EAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI;YAC/B,MAAM,EAAE,GAAG;YACX,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC;YAClE,YAAY,EAAE,CAAC,cAAc,EAAE,eAAe,CAAC;YAC/C,aAAa,EAAE,CAAC,cAAc,EAAE,eAAe,CAAC;SAChD,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;QACrC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;IAClC,CAAC;IAEM,MAAM,CAAC,MAAM,CAAC,IAAY,EAAE,WAAyB;QAC3D,MAAM,IAAI,GAAG,IAAI,aAAa,CAAC,IAAI,EAAE,IAAA,oBAAM,EAAC,EAAE,IAAI,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,IAAA,oBAAM,EAAC;YACrB,IAAI;YACJ,MAAM,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;YACxB,KAAK,EAAE,aAAa,CAAC,YAAY;SACjC,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,wBAAU,CAAC,CAAC;QAC5B,OAAO,IAAI,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IACrD,CAAC;IAEM,MAAM,CAAC,YAAY,CAAC,KAAK;;QAC/B,MAAM,QAAQ,GAAG,oBAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACtC,MAAM,UAAU,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,mCAAI,KAAK,CAAC;QAC3C,MAAM,GAAG,GAAG,SAAS,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QAC7F,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAA,MAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,mCAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,mCAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,mCAAI,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,KAAK,0CAAE,IAAI,CAAC,IAAI,GAAG,CAAC;QACxG,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QAC/C,OAAO,IAAI,QAAQ,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;IACrC,CAAC;IAEM,aAAa,CAAC,OAAe,EAAE,qBAA4C;QACjF,MAAM,KAAK,GAAG,qBAAqB,CAAC,GAAG,IAAI,CAAC,IAAI,GAAG,OAAO,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,GAAG,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IAAA,CAAC;IAEK,YAAY,CAAC,OAAiB,EAAE,GAAS;QAC/C,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC;aACpC,IAAI,CAAC,kBAAI,CAAC;aACV,KAAK,CAAC,aAAa,CAAC,YAAY,CAAC;aACjC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7C,CAAC;IAEM,aAAa;QACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,IAAA,mBAAK,EAAC,GAAG,CAAC,CAAC,CAAC;IACxC,CAAC;IAEM,mBAAmB;QACzB,MAAM,UAAU,GAAG,IAAA,4BAAmB,EAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACrE,OAAO,UAAU,CAAC;IACnB,CAAC;CACD;AA7DD,sCA6DC","sourcesContent":["import { libx } from 'libx.js/build/bundles/essentials.js';\nimport { Route, Router, RouterType, error, json, cors, withParams, IRequest, text, ResponseHandler } from 'itty-router';\nimport { createServerAdapter } from '@whatwg-node/server';\n\ntype BaseRouterInitializer = (string) => { base: string; router: RouterType<IRequest, any[]> };\ntype CorsOptions = Parameters<typeof cors>[0];\n\nexport class RouterWrapper<TCtx = any> {\n\tprivate cors: ReturnType<typeof cors>;\n\tprivate preflight: (request: Request) => Response | Promise<Response>;\n\tprivate corsify: (response: Response, request: Request) => Response | Promise<Response>;\n\n\tpublic constructor(\n\t\tpublic base: string,\n\t\tpublic router: RouterType<Request, [], any>,\n\t\tcorsOptions?: CorsOptions\n\t) {\n\t\tthis.cors = cors(corsOptions ?? {\n\t\t\torigin: '*',\n\t\t\tallowMethods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS', 'PATCH'],\n\t\t\tallowHeaders: ['Content-Type', 'Authorization'],\n\t\t\texposeHeaders: ['Content-Type', 'Authorization'],\n\t\t});\n\t\tthis.preflight = this.cors.preflight;\n\t\tthis.corsify = this.cors.corsify;\n\t}\n\n\tpublic static getNew(base: string, corsOptions?: CorsOptions) {\n\t\tconst temp = new RouterWrapper(base, Router({ base }), corsOptions);\n\t\tconst router = Router({\n\t\t\tbase,\n\t\t\tbefore: [temp.preflight],\n\t\t\tcatch: RouterWrapper.errorHandler,\n\t\t});\n\t\trouter.all('*', withParams);\n\t\treturn new RouterWrapper(base, router, corsOptions);\n\t}\n\n\tpublic static errorHandler(error) {\n\t\tconst isObject = libx.isObject(error);\n\t\tconst errMessage = error?.message ?? error;\n\t\tconst msg = 'Error: ' + (!isObject ? (errMessage ?? 'Server Error') : JSON.stringify(error));\n\t\tconst status = parseInt(error?.status ?? error?.statusCode ?? error?.code ?? error?.error?.code) || 500;\n\t\tconsole.error('Server error: ', error, status);\n\t\treturn new Response(msg, { status })\n\t}\n\n\tpublic registerRoute(newBase: string, baseRouterInitializer: BaseRouterInitializer) {\n\t\tconst route = baseRouterInitializer(`${this.base}${newBase}`);\n\t\tthis.router.all(newBase + '/*', route.router.fetch);\n\t\treturn this.router;\n\t};\n\n\tpublic fetchHandler(request: IRequest, ctx: TCtx) {\n\t\treturn this.router.fetch(request, ctx)\n\t\t\t.then(json)\n\t\t\t.catch(RouterWrapper.errorHandler)\n\t\t\t.then((res) => this.corsify(res, request));\n\t}\n\n\tpublic catchNotFound() {\n\t\tthis.router.all('*', () => error(404));\n\t}\n\n\tpublic createServerAdapter() {\n\t\tconst ittyServer = createServerAdapter(this.fetchHandler.bind(this));\n\t\treturn ittyServer;\n\t}\n}"]}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "edge.libx.js",
-    "version": "0.1.9",
+    "version": "0.2.0",
     "main": "build/main.js",
     "license": "MIT",
     "author": "Elya Livshitz",

package/src/main.ts

@@ -1,2 +1,2 @@
 export { RouterWrapper } from "./modules/RouterWrapper";
-export { initCors as cors } from "./modules/cors";
+export * as cors from "./modules/cors";

package/src/modules/RouterWrapper.ts

@@ -3,40 +3,39 @@ import { Route, Router, RouterType, error, json, cors, withParams, IRequest, tex
 import { createServerAdapter } from '@whatwg-node/server';
 
 type BaseRouterInitializer = (string) => { base: string; router: RouterType<IRequest, any[]> };
+type CorsOptions = Parameters<typeof cors>[0];
 
 export class RouterWrapper<TCtx = any> {
-	private static cors = cors({ origin: ['*'], allowMethods: ['POST'] });
-	private static preflight = this.cors.preflight;
-	private static corsify = this.cors.corsify;
+	private cors: ReturnType<typeof cors>;
+	private preflight: (request: Request) => Response | Promise<Response>;
+	private corsify: (response: Response, request: Request) => Response | Promise<Response>;
 
-	public constructor(public base: string, public router: RouterType<Request, [], any>) {
-
-	}
-
-	private static tryCors(response, request): Response {
-		try {
-			return this.corsify(response, request);
-		} catch (err) {
-            libx.log.w('tryCors: failed to perform CORS', err);
-        }
+	public constructor(
+		public base: string,
+		public router: RouterType<Request, [], any>,
+		corsOptions?: CorsOptions
+	) {
+		this.cors = cors(corsOptions ?? {
+			origin: '*',
+			allowMethods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS', 'PATCH'],
+			allowHeaders: ['Content-Type', 'Authorization'],
+			exposeHeaders: ['Content-Type', 'Authorization'],
+		});
+		this.preflight = this.cors.preflight;
+		this.corsify = this.cors.corsify;
 	}
 
-	public static getNew(base: string) {
+	public static getNew(base: string, corsOptions?: CorsOptions) {
+		const temp = new RouterWrapper(base, Router({ base }), corsOptions);
 		const router = Router({
-            base,
-            before: [this.preflight],
-            catch: this.errorHandler,
-            // finally: [this.tryCors],
-        });
+			base,
+			before: [temp.preflight],
+			catch: RouterWrapper.errorHandler,
+		});
 		router.all('*', withParams);
-		// router.finally.push(this.corsify);
-
-		// router.all('*', () => error(404));
-
-		return new RouterWrapper(base, router);
+		return new RouterWrapper(base, router, corsOptions);
 	}
 
-
 	public static errorHandler(error) {
 		const isObject = libx.isObject(error);
 		const errMessage = error?.message ?? error;
@@ -53,8 +52,10 @@ export class RouterWrapper<TCtx = any> {
 	};
 
 	public fetchHandler(request: IRequest, ctx: TCtx) {
-		// return this.router.fetch(request, ctx).then(json).then(RouterWrapper.corsify).catch(this.errorHandler);
-		return this.router.fetch(request, ctx).then(json).catch(RouterWrapper.errorHandler);
+		return this.router.fetch(request, ctx)
+			.then(json)
+			.catch(RouterWrapper.errorHandler)
+			.then((res) => this.corsify(res, request));
 	}
 
 	public catchNotFound() {