diff --git a/.gitignore b/.gitignore index 2d2b47d..76fb2e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .idea -node_modules \ No newline at end of file +node_modules +dist \ No newline at end of file diff --git a/dist/Application.d.ts b/dist/Application.d.ts deleted file mode 100644 index 6e32dfe..0000000 --- a/dist/Application.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -import WebSocketListener from "./WebSocketListener"; -import ApplicationComponent from "./ApplicationComponent"; -import Controller from "./Controller"; -export default abstract class Application { - private readonly version; - private readonly controllers; - private readonly webSocketListeners; - private readonly components; - private ready; - protected constructor(version: string); - protected abstract init(): Promise; - protected use(thing: Controller | WebSocketListener | ApplicationComponent): void; - start(): Promise; - stop(): Promise; - private routes; - getWebSocketListeners(): { - [p: string]: WebSocketListener; - }; - isReady(): boolean; -} diff --git a/dist/Application.js b/dist/Application.js deleted file mode 100644 index 2552ede..0000000 --- a/dist/Application.js +++ /dev/null @@ -1,140 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -import express from 'express'; -import { BadRequestError, HttpError, NotFoundHttpError, ServerError, ServiceUnavailableHttpError } from "./HttpError"; -import { lib } from "nunjucks"; -import Logger from "./Logger"; -import WebSocketListener from "./WebSocketListener"; -var TemplateError = lib.TemplateError; -import Controller from "./Controller"; -export default class Application { - constructor(version) { - this.controllers = []; - this.webSocketListeners = {}; - this.components = []; - this.ready = false; - this.version = version; - } - use(thing) { - if (thing instanceof Controller) { - this.controllers.push(thing); - } - else if (thing instanceof WebSocketListener) { - const path = thing.path(); - this.webSocketListeners[path] = thing; - Logger.info(`Added websocket listener on ${path}`); - } - else { - this.components.push(thing); - } - } - start() { - return __awaiter(this, void 0, void 0, function* () { - Logger.info(`${this.constructor.name} v${this.version} - hi`); - process.once('SIGINT', () => { - this.stop().catch(console.error); - }); - // Register all components and alike - yield this.init(); - // Init express - const app = express(); - const router = express.Router({}); - app.use(router); - // Error handler - app.use((err, req, res, next) => { - if (res.headersSent) { - return next(err); - } - let errorID; - let logStr = `${req.method} ${req.originalUrl} - `; - if (err instanceof BadRequestError || err instanceof ServiceUnavailableHttpError) { - logStr += `${err.errorCode} ${err.name}`; - errorID = Logger.silentError(err, logStr); - } - else { - errorID = Logger.error(err, logStr + `500 Internal Error`, err); - } - let httpError; - if (err instanceof HttpError) { - httpError = err; - } - else if (err instanceof TemplateError && err.cause instanceof HttpError) { - httpError = err.cause; - } - else { - httpError = new ServerError('Internal server error.', err); - } - res.status(httpError.errorCode); - res.format({ - html: () => { - res.render('errors/' + httpError.errorCode + '.njk', { - error_code: httpError.errorCode, - error_message: httpError.message, - error_instructions: httpError.instructions, - error_id: errorID, - }); - }, - json: () => { - res.json({ - status: 'error', - code: httpError.errorCode, - message: httpError.message, - instructions: httpError.instructions, - error_id: errorID, - }); - }, - default: () => { - res.type('txt').send(`${httpError.errorCode} - ${httpError.message}\n\n${httpError.instructions}\n\nError ID: ${errorID}`); - } - }); - }); - // Start all components - for (const component of this.components) { - yield component.start(app, router); - } - // Routes - this.routes(router); - this.ready = true; - }); - } - stop() { - return __awaiter(this, void 0, void 0, function* () { - Logger.info('Stopping application...'); - for (const component of this.components) { - yield component.stop(); - } - Logger.info(`${this.constructor.name} v${this.version} - bye`); - }); - } - routes(rootRouter) { - for (const controller of this.controllers) { - if (controller.hasGlobalHandlers()) { - controller.setupGlobalHandlers(rootRouter); - Logger.info(`Registered global middlewares for controller ${controller.constructor.name}`); - } - } - for (const controller of this.controllers) { - const router = express.Router(); - controller.setupRoutes(router); - rootRouter.use(controller.getRoutesPrefix(), router); - Logger.info(`> Registered routes for controller ${controller.constructor.name}`); - } - rootRouter.use((req) => { - throw new NotFoundHttpError('page', req.originalUrl); - }); - } - getWebSocketListeners() { - return this.webSocketListeners; - } - isReady() { - return this.ready; - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Application.js","sourceRoot":"./","sources":["Application.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,OAAkD,MAAM,SAAS,CAAC;AACzE,OAAO,EACH,eAAe,EACf,SAAS,EACT,iBAAiB,EACjB,WAAW,EACX,2BAA2B,EAC9B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAC,GAAG,EAAC,MAAM,UAAU,CAAC;AAC7B,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AAEpD,IAAO,aAAa,GAAG,GAAG,CAAC,aAAa,CAAC;AACzC,OAAO,UAAU,MAAM,cAAc,CAAC;AAEtC,MAAM,CAAC,OAAO,OAAgB,WAAW;IAQrC,YAAsB,OAAe;QANpB,gBAAW,GAAiB,EAAE,CAAC;QAC/B,uBAAkB,GAAuC,EAAE,CAAC;QAC5D,eAAU,GAAgC,EAAE,CAAC;QAEtD,UAAK,GAAY,KAAK,CAAC;QAG3B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAIS,GAAG,CAAC,KAAiE;QAC3E,IAAI,KAAK,YAAY,UAAU,EAAE;YAC7B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAChC;aAAM,IAAI,KAAK,YAAY,iBAAiB,EAAE;YAC3C,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;YACtC,MAAM,CAAC,IAAI,CAAC,+BAA+B,IAAI,EAAE,CAAC,CAAC;SACtD;aAAM;YACH,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAC/B;IACL,CAAC;IAEY,KAAK;;YACd,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,IAAI,CAAC,OAAO,OAAO,CAAC,CAAC;YAC9D,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;gBACxB,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC;YAEH,oCAAoC;YACpC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YAElB,eAAe;YACf,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;YACtB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAClC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAEhB,gBAAgB;YAChB,GAAG,CAAC,GAAG,CAAC,CAAC,GAAQ,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;gBAClE,IAAI,GAAG,CAAC,WAAW,EAAE;oBACjB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;iBACpB;gBAED,IAAI,OAAe,CAAC;gBAEpB,IAAI,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,WAAW,KAAK,CAAC;gBACnD,IAAI,GAAG,YAAY,eAAe,IAAI,GAAG,YAAY,2BAA2B,EAAE;oBAC9E,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;oBACzC,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;iBAC7C;qBAAM;oBACH,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,EAAE,GAAG,CAAC,CAAC;iBACnE;gBAED,IAAI,SAAoB,CAAC;gBAEzB,IAAI,GAAG,YAAY,SAAS,EAAE;oBAC1B,SAAS,GAAG,GAAG,CAAC;iBACnB;qBAAM,IAAI,GAAG,YAAY,aAAa,IAAI,GAAG,CAAC,KAAK,YAAY,SAAS,EAAE;oBACvE,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC;iBACzB;qBAAM;oBACH,SAAS,GAAG,IAAI,WAAW,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;iBAC9D;gBAED,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;gBAChC,GAAG,CAAC,MAAM,CAAC;oBACP,IAAI,EAAE,GAAG,EAAE;wBACP,GAAG,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,GAAG,MAAM,EAAE;4BACjD,UAAU,EAAE,SAAS,CAAC,SAAS;4BAC/B,aAAa,EAAE,SAAS,CAAC,OAAO;4BAChC,kBAAkB,EAAE,SAAS,CAAC,YAAY;4BAC1C,QAAQ,EAAE,OAAO;yBACpB,CAAC,CAAC;oBACP,CAAC;oBACD,IAAI,EAAE,GAAG,EAAE;wBACP,GAAG,CAAC,IAAI,CAAC;4BACL,MAAM,EAAE,OAAO;4BACf,IAAI,EAAE,SAAS,CAAC,SAAS;4BACzB,OAAO,EAAE,SAAS,CAAC,OAAO;4BAC1B,YAAY,EAAE,SAAS,CAAC,YAAY;4BACpC,QAAQ,EAAE,OAAO;yBACpB,CAAC,CAAC;oBACP,CAAC;oBACD,OAAO,EAAE,GAAG,EAAE;wBACV,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,SAAS,MAAM,SAAS,CAAC,OAAO,OAAO,SAAS,CAAC,YAAY,iBAAiB,OAAO,EAAE,CAAC,CAAC;oBAC/H,CAAC;iBACJ,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;YAEH,uBAAuB;YACvB,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;gBACrC,MAAM,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;aACtC;YAED,SAAS;YACT,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAEpB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QACtB,CAAC;KAAA;IAEK,IAAI;;YACN,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;YAEvC,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;gBACrC,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;aAC1B;YAED,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,IAAI,CAAC,OAAO,QAAQ,CAAC,CAAC;QACnE,CAAC;KAAA;IAEO,MAAM,CAAC,UAAkB;QAC7B,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,WAAW,EAAE;YACvC,IAAI,UAAU,CAAC,iBAAiB,EAAE,EAAE;gBAChC,UAAU,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;gBAE3C,MAAM,CAAC,IAAI,CAAC,gDAAgD,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;aAC9F;SACJ;QAED,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,WAAW,EAAE;YACvC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;YAChC,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAC/B,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,eAAe,EAAE,EAAE,MAAM,CAAC,CAAC;YAErD,MAAM,CAAC,IAAI,CAAC,sCAAsC,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;SACpF;QAED,UAAU,CAAC,GAAG,CAAC,CAAC,GAAY,EAAE,EAAE;YAC5B,MAAM,IAAI,iBAAiB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,qBAAqB;QACxB,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACnC,CAAC;IAEM,OAAO;QACV,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;CACJ","sourcesContent":["import express, {NextFunction, Request, Response, Router} from 'express';\nimport {\n    BadRequestError,\n    HttpError,\n    NotFoundHttpError,\n    ServerError,\n    ServiceUnavailableHttpError\n} from \"./HttpError\";\nimport {lib} from \"nunjucks\";\nimport Logger from \"./Logger\";\nimport WebSocketListener from \"./WebSocketListener\";\nimport ApplicationComponent from \"./ApplicationComponent\";\nimport TemplateError = lib.TemplateError;\nimport Controller from \"./Controller\";\n\nexport default abstract class Application {\n    private readonly version: string;\n    private readonly controllers: Controller[] = [];\n    private readonly webSocketListeners: { [p: string]: WebSocketListener } = {};\n    private readonly components: ApplicationComponent<any>[] = [];\n\n    private ready: boolean = false;\n\n    protected constructor(version: string) {\n        this.version = version;\n    }\n\n    protected abstract async init(): Promise<void>;\n\n    protected use(thing: Controller | WebSocketListener | ApplicationComponent<any>) {\n        if (thing instanceof Controller) {\n            this.controllers.push(thing);\n        } else if (thing instanceof WebSocketListener) {\n            const path = thing.path();\n            this.webSocketListeners[path] = thing;\n            Logger.info(`Added websocket listener on ${path}`);\n        } else {\n            this.components.push(thing);\n        }\n    }\n\n    public async start(): Promise<void> {\n        Logger.info(`${this.constructor.name} v${this.version} - hi`);\n        process.once('SIGINT', () => {\n            this.stop().catch(console.error);\n        });\n\n        // Register all components and alike\n        await this.init();\n\n        // Init express\n        const app = express();\n        const router = express.Router({});\n        app.use(router);\n\n        // Error handler\n        app.use((err: any, req: Request, res: Response, next: NextFunction) => {\n            if (res.headersSent) {\n                return next(err);\n            }\n\n            let errorID: string;\n\n            let logStr = `${req.method} ${req.originalUrl} - `;\n            if (err instanceof BadRequestError || err instanceof ServiceUnavailableHttpError) {\n                logStr += `${err.errorCode} ${err.name}`;\n                errorID = Logger.silentError(err, logStr);\n            } else {\n                errorID = Logger.error(err, logStr + `500 Internal Error`, err);\n            }\n\n            let httpError: HttpError;\n\n            if (err instanceof HttpError) {\n                httpError = err;\n            } else if (err instanceof TemplateError && err.cause instanceof HttpError) {\n                httpError = err.cause;\n            } else {\n                httpError = new ServerError('Internal server error.', err);\n            }\n\n            res.status(httpError.errorCode);\n            res.format({\n                html: () => {\n                    res.render('errors/' + httpError.errorCode + '.njk', {\n                        error_code: httpError.errorCode,\n                        error_message: httpError.message,\n                        error_instructions: httpError.instructions,\n                        error_id: errorID,\n                    });\n                },\n                json: () => {\n                    res.json({\n                        status: 'error',\n                        code: httpError.errorCode,\n                        message: httpError.message,\n                        instructions: httpError.instructions,\n                        error_id: errorID,\n                    });\n                },\n                default: () => {\n                    res.type('txt').send(`${httpError.errorCode} - ${httpError.message}\\n\\n${httpError.instructions}\\n\\nError ID: ${errorID}`);\n                }\n            });\n        });\n\n        // Start all components\n        for (const component of this.components) {\n            await component.start(app, router);\n        }\n\n        // Routes\n        this.routes(router);\n\n        this.ready = true;\n    }\n\n    async stop(): Promise<void> {\n        Logger.info('Stopping application...');\n\n        for (const component of this.components) {\n            await component.stop();\n        }\n\n        Logger.info(`${this.constructor.name} v${this.version} - bye`);\n    }\n\n    private routes(rootRouter: Router) {\n        for (const controller of this.controllers) {\n            if (controller.hasGlobalHandlers()) {\n                controller.setupGlobalHandlers(rootRouter);\n\n                Logger.info(`Registered global middlewares for controller ${controller.constructor.name}`);\n            }\n        }\n\n        for (const controller of this.controllers) {\n            const router = express.Router();\n            controller.setupRoutes(router);\n            rootRouter.use(controller.getRoutesPrefix(), router);\n\n            Logger.info(`> Registered routes for controller ${controller.constructor.name}`);\n        }\n\n        rootRouter.use((req: Request) => {\n            throw new NotFoundHttpError('page', req.originalUrl);\n        });\n    }\n\n    public getWebSocketListeners(): { [p: string]: WebSocketListener } {\n        return this.webSocketListeners;\n    }\n\n    public isReady(): boolean {\n        return this.ready;\n    }\n}"]} \ No newline at end of file diff --git a/dist/ApplicationComponent.d.ts b/dist/ApplicationComponent.d.ts deleted file mode 100644 index 3b7d47a..0000000 --- a/dist/ApplicationComponent.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Express, Router } from "express"; -export default abstract class ApplicationComponent { - private val?; - abstract start(app: Express, router: Router): Promise; - abstract stop(): Promise; - protected export(val: T): void; - import(): T; - protected prepare(name: string, prepare: () => Promise): Promise; - protected close(thingName: string, thing: any, fn: Function): Promise; -} diff --git a/dist/ApplicationComponent.js b/dist/ApplicationComponent.js deleted file mode 100644 index f102212..0000000 --- a/dist/ApplicationComponent.js +++ /dev/null @@ -1,55 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -import Logger from "./Logger"; -import { sleep } from "./Utils"; -export default class ApplicationComponent { - export(val) { - this.val = val; - } - import() { - if (!this.val) - throw 'Cannot import if nothing was exported.'; - return this.val; - } - prepare(name, prepare) { - return __awaiter(this, void 0, void 0, function* () { - let err; - do { - try { - yield prepare(); - err = null; - } - catch (e) { - err = e; - Logger.error(err, `${name} failed to prepare; retrying in 5s...`); - yield sleep(5000); - } - } while (err); - Logger.info(`${name} ready!`); - }); - } - close(thingName, thing, fn) { - return __awaiter(this, void 0, void 0, function* () { - try { - yield new Promise((resolve, reject) => fn.call(thing, (err) => { - if (err) - reject(err); - else - resolve(); - })); - Logger.info(`${thingName} closed.`); - } - catch (e) { - Logger.error(e, `An error occurred while closing the ${thingName}.`); - } - }); - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwbGljYXRpb25Db21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiLi8iLCJzb3VyY2VzIjpbIkFwcGxpY2F0aW9uQ29tcG9uZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUNBLE9BQU8sTUFBTSxNQUFNLFVBQVUsQ0FBQztBQUM5QixPQUFPLEVBQUMsS0FBSyxFQUFDLE1BQU0sU0FBUyxDQUFDO0FBRTlCLE1BQU0sQ0FBQyxPQUFPLE9BQWdCLG9CQUFvQjtJQU9wQyxNQUFNLENBQUMsR0FBTTtRQUNuQixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztJQUNuQixDQUFDO0lBRU0sTUFBTTtRQUNULElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRztZQUFFLE1BQU0sd0NBQXdDLENBQUM7UUFDOUQsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDO0lBQ3BCLENBQUM7SUFFZSxPQUFPLENBQUMsSUFBWSxFQUFFLE9BQTRCOztZQUM5RCxJQUFJLEdBQUcsQ0FBQztZQUNSLEdBQUc7Z0JBQ0MsSUFBSTtvQkFDQSxNQUFNLE9BQU8sRUFBRSxDQUFDO29CQUNoQixHQUFHLEdBQUcsSUFBSSxDQUFDO2lCQUNkO2dCQUFDLE9BQU8sQ0FBQyxFQUFFO29CQUNSLEdBQUcsR0FBRyxDQUFDLENBQUM7b0JBQ1IsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsR0FBRyxJQUFJLHVDQUF1QyxDQUFDLENBQUE7b0JBQ2pFLE1BQU0sS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO2lCQUNyQjthQUNKLFFBQVEsR0FBRyxFQUFFO1lBQ2QsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLElBQUksU0FBUyxDQUFDLENBQUM7UUFDbEMsQ0FBQztLQUFBO0lBRWUsS0FBSyxDQUFDLFNBQWlCLEVBQUUsS0FBVSxFQUFFLEVBQVk7O1lBQzdELElBQUk7Z0JBQ0EsTUFBTSxJQUFJLE9BQU8sQ0FBQyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUMsR0FBUSxFQUFFLEVBQUU7b0JBQy9ELElBQUksR0FBRzt3QkFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7O3dCQUNoQixPQUFPLEVBQUUsQ0FBQztnQkFDbkIsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFFSixNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsU0FBUyxVQUFVLENBQUMsQ0FBQzthQUN2QztZQUFDLE9BQU8sQ0FBQyxFQUFFO2dCQUNSLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLHVDQUF1QyxTQUFTLEdBQUcsQ0FBQyxDQUFDO2FBQ3hFO1FBQ0wsQ0FBQztLQUFBO0NBQ0oiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge0V4cHJlc3MsIFJvdXRlcn0gZnJvbSBcImV4cHJlc3NcIjtcbmltcG9ydCBMb2dnZXIgZnJvbSBcIi4vTG9nZ2VyXCI7XG5pbXBvcnQge3NsZWVwfSBmcm9tIFwiLi9VdGlsc1wiO1xuXG5leHBvcnQgZGVmYXVsdCBhYnN0cmFjdCBjbGFzcyBBcHBsaWNhdGlvbkNvbXBvbmVudDxUPiB7XG4gICAgcHJpdmF0ZSB2YWw/OiBUO1xuXG4gICAgcHVibGljIGFic3RyYWN0IGFzeW5jIHN0YXJ0KGFwcDogRXhwcmVzcywgcm91dGVyOiBSb3V0ZXIpOiBQcm9taXNlPHZvaWQ+O1xuXG4gICAgcHVibGljIGFic3RyYWN0IGFzeW5jIHN0b3AoKTogUHJvbWlzZTx2b2lkPjtcblxuICAgIHByb3RlY3RlZCBleHBvcnQodmFsOiBUKSB7XG4gICAgICAgIHRoaXMudmFsID0gdmFsO1xuICAgIH1cblxuICAgIHB1YmxpYyBpbXBvcnQoKTogVCB7XG4gICAgICAgIGlmICghdGhpcy52YWwpIHRocm93ICdDYW5ub3QgaW1wb3J0IGlmIG5vdGhpbmcgd2FzIGV4cG9ydGVkLic7XG4gICAgICAgIHJldHVybiB0aGlzLnZhbDtcbiAgICB9XG5cbiAgICBwcm90ZWN0ZWQgYXN5bmMgcHJlcGFyZShuYW1lOiBzdHJpbmcsIHByZXBhcmU6ICgpID0+IFByb21pc2U8dm9pZD4pOiBQcm9taXNlPHZvaWQ+IHtcbiAgICAgICAgbGV0IGVycjtcbiAgICAgICAgZG8ge1xuICAgICAgICAgICAgdHJ5IHtcbiAgICAgICAgICAgICAgICBhd2FpdCBwcmVwYXJlKCk7XG4gICAgICAgICAgICAgICAgZXJyID0gbnVsbDtcbiAgICAgICAgICAgIH0gY2F0Y2ggKGUpIHtcbiAgICAgICAgICAgICAgICBlcnIgPSBlO1xuICAgICAgICAgICAgICAgIExvZ2dlci5lcnJvcihlcnIsIGAke25hbWV9IGZhaWxlZCB0byBwcmVwYXJlOyByZXRyeWluZyBpbiA1cy4uLmApXG4gICAgICAgICAgICAgICAgYXdhaXQgc2xlZXAoNTAwMCk7XG4gICAgICAgICAgICB9XG4gICAgICAgIH0gd2hpbGUgKGVycik7XG4gICAgICAgIExvZ2dlci5pbmZvKGAke25hbWV9IHJlYWR5IWApO1xuICAgIH1cblxuICAgIHByb3RlY3RlZCBhc3luYyBjbG9zZSh0aGluZ05hbWU6IHN0cmluZywgdGhpbmc6IGFueSwgZm46IEZ1bmN0aW9uKTogUHJvbWlzZTx2b2lkPiB7XG4gICAgICAgIHRyeSB7XG4gICAgICAgICAgICBhd2FpdCBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiBmbi5jYWxsKHRoaW5nLCAoZXJyOiBhbnkpID0+IHtcbiAgICAgICAgICAgICAgICBpZiAoZXJyKSByZWplY3QoZXJyKTtcbiAgICAgICAgICAgICAgICBlbHNlIHJlc29sdmUoKTtcbiAgICAgICAgICAgIH0pKTtcblxuICAgICAgICAgICAgTG9nZ2VyLmluZm8oYCR7dGhpbmdOYW1lfSBjbG9zZWQuYCk7XG4gICAgICAgIH0gY2F0Y2ggKGUpIHtcbiAgICAgICAgICAgIExvZ2dlci5lcnJvcihlLCBgQW4gZXJyb3Igb2NjdXJyZWQgd2hpbGUgY2xvc2luZyB0aGUgJHt0aGluZ05hbWV9LmApO1xuICAgICAgICB9XG4gICAgfVxufSJdfQ== \ No newline at end of file diff --git a/dist/Controller.d.ts b/dist/Controller.d.ts deleted file mode 100644 index af0b6df..0000000 --- a/dist/Controller.d.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { RequestHandler, Router } from "express"; -import { PathParams } from "express-serve-static-core"; -export default abstract class Controller { - private static readonly routes; - static route(route: string, params?: RouteParams, absolute?: boolean): string; - private router?; - getGlobalHandlers(): RequestHandler[]; - hasGlobalHandlers(): boolean; - setupGlobalHandlers(router: Router): void; - getRoutesPrefix(): string; - abstract routes(): void; - setupRoutes(router: Router): void; - protected use(handler: RequestHandler): void; - protected get(path: PathParams, handler: RequestHandler, routeName?: string, ...middlewares: RequestHandler[]): void; - protected post(path: PathParams, handler: RequestHandler, routeName?: string, ...middlewares: RequestHandler[]): void; - private wrap; - private registerRoutes; -} -export declare type RouteParams = { - [p: string]: string; -} | string[] | string | number; diff --git a/dist/Controller.js b/dist/Controller.js deleted file mode 100644 index a605402..0000000 --- a/dist/Controller.js +++ /dev/null @@ -1,104 +0,0 @@ -import config from "config"; -import Logger from "./Logger"; -export default class Controller { - static route(route, params = [], absolute = false) { - let path = this.routes[route]; - if (path === undefined) - throw new Error(`Unknown route for name ${route}.`); - if (typeof params === 'string' || typeof params === 'number') { - path = path.replace(/:[a-zA-Z_-]+\??/, '' + params); - } - else if (Array.isArray(params)) { - let i = 0; - for (const match of path.matchAll(/:[a-zA-Z_-]+\??/)) { - if (match.length > 0) { - path = path.replace(match[0], typeof params[i] !== 'undefined' ? params[i] : ''); - } - i++; - } - path = path.replace(/\/+/, '/'); - } - else { - for (const key in params) { - if (params.hasOwnProperty(key)) { - path = path.replace(new RegExp(`:${key}\\??`), params[key]); - } - } - } - return `${absolute ? config.get('public_url') : ''}${path}`; - } - getGlobalHandlers() { - return []; - } - hasGlobalHandlers() { - return this.getGlobalHandlers().length > 0; - } - setupGlobalHandlers(router) { - for (const globalHandler of this.getGlobalHandlers()) { - router.use(this.wrap(globalHandler)); - } - } - getRoutesPrefix() { - return '/'; - } - setupRoutes(router) { - this.router = router; - this.routes(); - } - use(handler) { - var _a; - (_a = this.router) === null || _a === void 0 ? void 0 : _a.use(this.wrap(handler)); - } - get(path, handler, routeName, ...middlewares) { - var _a, _b; - this.registerRoutes(path, handler, routeName); - for (const middleware of middlewares) { - (_a = this.router) === null || _a === void 0 ? void 0 : _a.get(path, this.wrap(middleware)); - } - (_b = this.router) === null || _b === void 0 ? void 0 : _b.get(path, this.wrap(handler)); - } - post(path, handler, routeName, ...middlewares) { - var _a, _b; - this.registerRoutes(path, handler, routeName); - for (const middleware of middlewares) { - (_a = this.router) === null || _a === void 0 ? void 0 : _a.post(path, this.wrap(middleware)); - } - (_b = this.router) === null || _b === void 0 ? void 0 : _b.post(path, this.wrap(handler)); - } - wrap(handler) { - return (req, res, next) => { - const promise = handler.call(this, req, res, next); - if (promise instanceof Promise) { - promise.catch(err => next(err)); - } - }; - } - registerRoutes(path, handler, routeName) { - if (typeof routeName !== 'string') { - routeName = handler.name - .replace(/(?:^|\.?)([A-Z])/g, (x, y) => '_' + y.toLowerCase()) - .replace(/(^_|get_|post_)/g, ''); - } - if (routeName.length === 0) - return; - let routePath = null; - if (path instanceof Array && path.length > 0) { - path = path[0]; - } - if (typeof path === 'string') { - const prefix = this.getRoutesPrefix(); - routePath = (prefix !== '/' ? prefix : '') + path; - } - if (!Controller.routes[routeName]) { - if (typeof routePath === 'string') { - Logger.info(`Route ${routeName} has path ${routePath}`); - Controller.routes[routeName] = routePath; - } - else { - Logger.warn(`Cannot assign path to route ${routeName}.`); - } - } - } -} -Controller.routes = {}; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Controller.js","sourceRoot":"./","sources":["Controller.ts"],"names":[],"mappings":"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","sourcesContent":["import {RequestHandler, Router} from \"express\";\nimport {PathParams} from \"express-serve-static-core\";\nimport config from \"config\";\nimport Logger from \"./Logger\";\n\nexport default abstract class Controller {\n    private static readonly routes: { [p: string]: string } = {};\n\n    public static route(route: string, params: RouteParams = [], absolute: boolean = false): string {\n        let path = this.routes[route];\n        if (path === undefined) throw new Error(`Unknown route for name ${route}.`);\n\n        if (typeof params === 'string' || typeof params === 'number') {\n            path = path.replace(/:[a-zA-Z_-]+\\??/, '' + params);\n        } else if (Array.isArray(params)) {\n            let i = 0;\n            for (const match of path.matchAll(/:[a-zA-Z_-]+\\??/)) {\n                if (match.length > 0) {\n                    path = path.replace(match[0], typeof params[i] !== 'undefined' ? params[i] : '');\n                }\n                i++;\n            }\n            path = path.replace(/\\/+/, '/');\n        } else {\n            for (const key in params) {\n                if (params.hasOwnProperty(key)) {\n                    path = path.replace(new RegExp(`:${key}\\\\??`), params[key]);\n                }\n            }\n        }\n\n        return `${absolute ? config.get<string>('public_url') : ''}${path}`;\n    }\n\n    private router?: Router;\n\n    public getGlobalHandlers(): RequestHandler[] {\n        return [];\n    }\n\n    public hasGlobalHandlers(): boolean {\n        return this.getGlobalHandlers().length > 0;\n    }\n\n    public setupGlobalHandlers(router: Router): void {\n        for (const globalHandler of this.getGlobalHandlers()) {\n            router.use(this.wrap(globalHandler));\n        }\n    }\n\n    public getRoutesPrefix(): string {\n        return '/';\n    }\n\n    public abstract routes(): void;\n\n    public setupRoutes(router: Router): void {\n        this.router = router;\n        this.routes();\n    }\n\n    protected use(handler: RequestHandler) {\n        this.router?.use(this.wrap(handler));\n    }\n\n    protected get(path: PathParams, handler: RequestHandler, routeName?: string, ...middlewares: RequestHandler[]) {\n        this.registerRoutes(path, handler, routeName);\n        for (const middleware of middlewares) {\n            this.router?.get(path, this.wrap(middleware));\n        }\n        this.router?.get(path, this.wrap(handler));\n    }\n\n    protected post(path: PathParams, handler: RequestHandler, routeName?: string, ...middlewares: RequestHandler[]) {\n        this.registerRoutes(path, handler, routeName);\n        for (const middleware of middlewares) {\n            this.router?.post(path, this.wrap(middleware));\n        }\n        this.router?.post(path, this.wrap(handler));\n    }\n\n    private wrap(handler: RequestHandler): RequestHandler {\n        return (req, res, next) => {\n            const promise = handler.call(this, req, res, next);\n            if (promise instanceof Promise) {\n                promise.catch(err => next(err));\n            }\n        };\n    }\n\n    private registerRoutes(path: PathParams, handler: RequestHandler, routeName?: string) {\n        if (typeof routeName !== 'string') {\n            routeName = handler.name\n                .replace(/(?:^|\\.?)([A-Z])/g, (x, y) => '_' + y.toLowerCase())\n                .replace(/(^_|get_|post_)/g, '');\n        }\n\n        if (routeName.length === 0) return;\n\n        let routePath = null;\n        if (path instanceof Array && path.length > 0) {\n            path = path[0];\n        }\n        if (typeof path === 'string') {\n            const prefix = this.getRoutesPrefix();\n            routePath = (prefix !== '/' ? prefix : '') + path;\n        }\n\n        if (!Controller.routes[routeName]) {\n            if (typeof routePath === 'string') {\n                Logger.info(`Route ${routeName} has path ${routePath}`);\n                Controller.routes[routeName] = routePath;\n            } else {\n                Logger.warn(`Cannot assign path to route ${routeName}.`);\n            }\n        }\n    }\n}\n\nexport type RouteParams = { [p: string]: string } | string[] | string | number;"]} \ No newline at end of file diff --git a/dist/HttpError.d.ts b/dist/HttpError.d.ts deleted file mode 100644 index b6e6831..0000000 --- a/dist/HttpError.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { WrappingError } from "./Utils"; -export declare abstract class HttpError extends WrappingError { - readonly instructions: string; - constructor(message: string, instructions: string, cause?: Error); - get name(): string; - abstract get errorCode(): number; -} -export declare class BadRequestError extends HttpError { - readonly url: string; - constructor(message: string, instructions: string, url: string, cause?: Error); - get errorCode(): number; -} -export declare class ForbiddenHttpError extends BadRequestError { - constructor(thing: string, url: string, cause?: Error); - get errorCode(): number; -} -export declare class NotFoundHttpError extends BadRequestError { - constructor(thing: string, url: string, cause?: Error); - get errorCode(): number; -} -export declare class ServerError extends HttpError { - constructor(message: string, cause?: Error); - get errorCode(): number; -} -export declare class ServiceUnavailableHttpError extends ServerError { - constructor(message: string, cause?: Error); - get errorCode(): number; -} diff --git a/dist/HttpError.js b/dist/HttpError.js deleted file mode 100644 index 26efec1..0000000 --- a/dist/HttpError.js +++ /dev/null @@ -1,52 +0,0 @@ -import { WrappingError } from "./Utils"; -export class HttpError extends WrappingError { - constructor(message, instructions, cause) { - super(message, cause); - this.instructions = instructions; - } - get name() { - return this.constructor.name; - } -} -export class BadRequestError extends HttpError { - constructor(message, instructions, url, cause) { - super(message, instructions, cause); - this.url = url; - } - get errorCode() { - return 400; - } -} -export class ForbiddenHttpError extends BadRequestError { - constructor(thing, url, cause) { - super(`You don't have access to this ${thing}.`, `${url} doesn't belong to *you*.`, url, cause); - } - get errorCode() { - return 403; - } -} -export class NotFoundHttpError extends BadRequestError { - constructor(thing, url, cause) { - super(`${thing.charAt(0).toUpperCase()}${thing.substr(1)} not found.`, `${url} doesn't exist or was deleted.`, url, cause); - } - get errorCode() { - return 404; - } -} -export class ServerError extends HttpError { - constructor(message, cause) { - super(message, `Maybe you should contact us; see instructions below.`, cause); - } - get errorCode() { - return 500; - } -} -export class ServiceUnavailableHttpError extends ServerError { - constructor(message, cause) { - super(message, cause); - } - get errorCode() { - return 503; - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSHR0cEVycm9yLmpzIiwic291cmNlUm9vdCI6Ii4vIiwic291cmNlcyI6WyJIdHRwRXJyb3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFDLGFBQWEsRUFBQyxNQUFNLFNBQVMsQ0FBQztBQUV0QyxNQUFNLE9BQWdCLFNBQVUsU0FBUSxhQUFhO0lBR2pELFlBQVksT0FBZSxFQUFFLFlBQW9CLEVBQUUsS0FBYTtRQUM1RCxLQUFLLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQ3RCLElBQUksQ0FBQyxZQUFZLEdBQUcsWUFBWSxDQUFDO0lBQ3JDLENBQUM7SUFFRCxJQUFJLElBQUk7UUFDSixPQUFPLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDO0lBQ2pDLENBQUM7Q0FHSjtBQUVELE1BQU0sT0FBTyxlQUFnQixTQUFRLFNBQVM7SUFHMUMsWUFBWSxPQUFlLEVBQUUsWUFBb0IsRUFBRSxHQUFXLEVBQUUsS0FBYTtRQUN6RSxLQUFLLENBQUMsT0FBTyxFQUFFLFlBQVksRUFBRSxLQUFLLENBQUMsQ0FBQztRQUNwQyxJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztJQUNuQixDQUFDO0lBRUQsSUFBSSxTQUFTO1FBQ1QsT0FBTyxHQUFHLENBQUM7SUFDZixDQUFDO0NBQ0o7QUFFRCxNQUFNLE9BQU8sa0JBQW1CLFNBQVEsZUFBZTtJQUNuRCxZQUFZLEtBQWEsRUFBRSxHQUFXLEVBQUUsS0FBYTtRQUNqRCxLQUFLLENBQ0QsaUNBQWlDLEtBQUssR0FBRyxFQUN6QyxHQUFHLEdBQUcsMkJBQTJCLEVBQ2pDLEdBQUcsRUFDSCxLQUFLLENBQ1IsQ0FBQztJQUNOLENBQUM7SUFFRCxJQUFJLFNBQVM7UUFDVCxPQUFPLEdBQUcsQ0FBQztJQUNmLENBQUM7Q0FDSjtBQUVELE1BQU0sT0FBTyxpQkFBa0IsU0FBUSxlQUFlO0lBQ2xELFlBQVksS0FBYSxFQUFFLEdBQVcsRUFBRSxLQUFhO1FBQ2pELEtBQUssQ0FDRCxHQUFHLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxFQUFFLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsYUFBYSxFQUMvRCxHQUFHLEdBQUcsZ0NBQWdDLEVBQ3RDLEdBQUcsRUFDSCxLQUFLLENBQ1IsQ0FBQztJQUNOLENBQUM7SUFFRCxJQUFJLFNBQVM7UUFDVCxPQUFPLEdBQUcsQ0FBQztJQUNmLENBQUM7Q0FDSjtBQUVELE1BQU0sT0FBTyxXQUFZLFNBQVEsU0FBUztJQUN0QyxZQUFZLE9BQWUsRUFBRSxLQUFhO1FBQ3RDLEtBQUssQ0FBQyxPQUFPLEVBQUUsc0RBQXNELEVBQUUsS0FBSyxDQUFDLENBQUM7SUFDbEYsQ0FBQztJQUVELElBQUksU0FBUztRQUNULE9BQU8sR0FBRyxDQUFDO0lBQ2YsQ0FBQztDQUNKO0FBRUQsTUFBTSxPQUFPLDJCQUE0QixTQUFRLFdBQVc7SUFDeEQsWUFBWSxPQUFlLEVBQUUsS0FBYTtRQUN0QyxLQUFLLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQzFCLENBQUM7SUFFRCxJQUFJLFNBQVM7UUFDVCxPQUFPLEdBQUcsQ0FBQztJQUNmLENBQUM7Q0FDSiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7V3JhcHBpbmdFcnJvcn0gZnJvbSBcIi4vVXRpbHNcIjtcblxuZXhwb3J0IGFic3RyYWN0IGNsYXNzIEh0dHBFcnJvciBleHRlbmRzIFdyYXBwaW5nRXJyb3Ige1xuICAgIHB1YmxpYyByZWFkb25seSBpbnN0cnVjdGlvbnM6IHN0cmluZztcblxuICAgIGNvbnN0cnVjdG9yKG1lc3NhZ2U6IHN0cmluZywgaW5zdHJ1Y3Rpb25zOiBzdHJpbmcsIGNhdXNlPzogRXJyb3IpIHtcbiAgICAgICAgc3VwZXIobWVzc2FnZSwgY2F1c2UpO1xuICAgICAgICB0aGlzLmluc3RydWN0aW9ucyA9IGluc3RydWN0aW9ucztcbiAgICB9XG5cbiAgICBnZXQgbmFtZSgpOiBzdHJpbmcge1xuICAgICAgICByZXR1cm4gdGhpcy5jb25zdHJ1Y3Rvci5uYW1lO1xuICAgIH1cblxuICAgIGFic3RyYWN0IGdldCBlcnJvckNvZGUoKTogbnVtYmVyO1xufVxuXG5leHBvcnQgY2xhc3MgQmFkUmVxdWVzdEVycm9yIGV4dGVuZHMgSHR0cEVycm9yIHtcbiAgICBwdWJsaWMgcmVhZG9ubHkgdXJsOiBzdHJpbmc7XG5cbiAgICBjb25zdHJ1Y3RvcihtZXNzYWdlOiBzdHJpbmcsIGluc3RydWN0aW9uczogc3RyaW5nLCB1cmw6IHN0cmluZywgY2F1c2U/OiBFcnJvcikge1xuICAgICAgICBzdXBlcihtZXNzYWdlLCBpbnN0cnVjdGlvbnMsIGNhdXNlKTtcbiAgICAgICAgdGhpcy51cmwgPSB1cmw7XG4gICAgfVxuXG4gICAgZ2V0IGVycm9yQ29kZSgpOiBudW1iZXIge1xuICAgICAgICByZXR1cm4gNDAwO1xuICAgIH1cbn1cblxuZXhwb3J0IGNsYXNzIEZvcmJpZGRlbkh0dHBFcnJvciBleHRlbmRzIEJhZFJlcXVlc3RFcnJvciB7XG4gICAgY29uc3RydWN0b3IodGhpbmc6IHN0cmluZywgdXJsOiBzdHJpbmcsIGNhdXNlPzogRXJyb3IpIHtcbiAgICAgICAgc3VwZXIoXG4gICAgICAgICAgICBgWW91IGRvbid0IGhhdmUgYWNjZXNzIHRvIHRoaXMgJHt0aGluZ30uYCxcbiAgICAgICAgICAgIGAke3VybH0gZG9lc24ndCBiZWxvbmcgdG8gKnlvdSouYCxcbiAgICAgICAgICAgIHVybCxcbiAgICAgICAgICAgIGNhdXNlXG4gICAgICAgICk7XG4gICAgfVxuXG4gICAgZ2V0IGVycm9yQ29kZSgpOiBudW1iZXIge1xuICAgICAgICByZXR1cm4gNDAzO1xuICAgIH1cbn1cblxuZXhwb3J0IGNsYXNzIE5vdEZvdW5kSHR0cEVycm9yIGV4dGVuZHMgQmFkUmVxdWVzdEVycm9yIHtcbiAgICBjb25zdHJ1Y3Rvcih0aGluZzogc3RyaW5nLCB1cmw6IHN0cmluZywgY2F1c2U/OiBFcnJvcikge1xuICAgICAgICBzdXBlcihcbiAgICAgICAgICAgIGAke3RoaW5nLmNoYXJBdCgwKS50b1VwcGVyQ2FzZSgpfSR7dGhpbmcuc3Vic3RyKDEpfSBub3QgZm91bmQuYCxcbiAgICAgICAgICAgIGAke3VybH0gZG9lc24ndCBleGlzdCBvciB3YXMgZGVsZXRlZC5gLFxuICAgICAgICAgICAgdXJsLFxuICAgICAgICAgICAgY2F1c2VcbiAgICAgICAgKTtcbiAgICB9XG5cbiAgICBnZXQgZXJyb3JDb2RlKCk6IG51bWJlciB7XG4gICAgICAgIHJldHVybiA0MDQ7XG4gICAgfVxufVxuXG5leHBvcnQgY2xhc3MgU2VydmVyRXJyb3IgZXh0ZW5kcyBIdHRwRXJyb3Ige1xuICAgIGNvbnN0cnVjdG9yKG1lc3NhZ2U6IHN0cmluZywgY2F1c2U/OiBFcnJvcikge1xuICAgICAgICBzdXBlcihtZXNzYWdlLCBgTWF5YmUgeW91IHNob3VsZCBjb250YWN0IHVzOyBzZWUgaW5zdHJ1Y3Rpb25zIGJlbG93LmAsIGNhdXNlKTtcbiAgICB9XG5cbiAgICBnZXQgZXJyb3JDb2RlKCk6IG51bWJlciB7XG4gICAgICAgIHJldHVybiA1MDA7XG4gICAgfVxufVxuXG5leHBvcnQgY2xhc3MgU2VydmljZVVuYXZhaWxhYmxlSHR0cEVycm9yIGV4dGVuZHMgU2VydmVyRXJyb3Ige1xuICAgIGNvbnN0cnVjdG9yKG1lc3NhZ2U6IHN0cmluZywgY2F1c2U/OiBFcnJvcikge1xuICAgICAgICBzdXBlcihtZXNzYWdlLCBjYXVzZSk7XG4gICAgfVxuXG4gICAgZ2V0IGVycm9yQ29kZSgpOiBudW1iZXIge1xuICAgICAgICByZXR1cm4gNTAzO1xuICAgIH1cbn0iXX0= \ No newline at end of file diff --git a/dist/Logger.d.ts b/dist/Logger.d.ts deleted file mode 100644 index 755ec36..0000000 --- a/dist/Logger.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -export default class Logger { - static silentError(error: Error, ...message: any[]): string; - static error(error: Error, ...message: any[]): string; - static warn(...message: any[]): void; - static info(...message: any[]): void; - static debug(...message: any[]): void; - static dev(...message: any[]): void; - private static log; - private constructor(); -} -export declare enum LogLevel { - ERROR = 0, - WARN = 1, - INFO = 2, - DEBUG = 3, - DEV = 4 -} -export declare type LogLevelKeys = keyof typeof LogLevel; diff --git a/dist/Logger.js b/dist/Logger.js deleted file mode 100644 index b9bef78..0000000 --- a/dist/Logger.js +++ /dev/null @@ -1,111 +0,0 @@ -import config from "config"; -import { v4 as uuid } from "uuid"; -import Log from "./models/Log"; -const LOG_LEVEL = config.get('log_level'); -const DB_LOG_LEVEL = config.get('db_log_level'); -export default class Logger { - static silentError(error, ...message) { - return this.log('ERROR', message, error, true) || ''; - } - static error(error, ...message) { - return this.log('ERROR', message, error) || ''; - } - static warn(...message) { - this.log('WARN', message); - } - static info(...message) { - this.log('INFO', message); - } - static debug(...message) { - this.log('DEBUG', message); - } - static dev(...message) { - this.log('DEV', message); - } - static log(level, message, error, silent = false) { - const levelIndex = LogLevel[level]; - if (levelIndex <= LogLevel[LOG_LEVEL]) { - if (error) { - if (levelIndex > LogLevel.ERROR) - this.warn(`Wrong log level ${level} with attached error.`); - } - else { - if (levelIndex <= LogLevel.ERROR) - this.warn(`No error attached with log level ${level}.`); - } - const computedMsg = message.map(v => { - if (typeof v === 'string') { - return v; - } - else { - return JSON.stringify(v, (key, value) => { - if (value instanceof Object) { - if (value.type === 'Buffer') { - return `Buffer<${Buffer.from(value.data).toString('hex')}>`; - } - else if (value !== v) { - return `[object Object]`; - } - } - if (typeof value === 'string' && value.length > 96) { - return value.substr(0, 96) + '...'; - } - return value; - }, 4); - } - }).join(' '); - const log = new Log({}); - log.setLevel(level); - log.message = computedMsg; - log.setError(error); - let logID = Buffer.alloc(16); - uuid({}, logID); - log.setLogID(logID); - let output = `[${level}] `; - let pad = output.length; - if (levelIndex <= LogLevel[DB_LOG_LEVEL]) - output += `${log.getLogID()} - `; - output += computedMsg.replace(/\n/g, '\n' + ' '.repeat(pad)); - switch (level) { - case "ERROR": - if (silent || !error) { - console.error(output); - } - else { - console.error(output, error); - } - break; - case "WARN": - console.warn(output); - break; - case "INFO": - console.info(output); - break; - case "DEBUG": - case "DEV": - console.debug(output); - break; - } - if (levelIndex <= LogLevel[DB_LOG_LEVEL]) { - log.save().catch(err => { - if (!silent && err.message.indexOf('ECONNREFUSED') < 0) { - console.error({ save_err: err, error }); - } - }); - } - return log.getLogID(); - } - return null; - } - constructor() { - } -} -export var LogLevel; -(function (LogLevel) { - LogLevel[LogLevel["ERROR"] = 0] = "ERROR"; - LogLevel[LogLevel["WARN"] = 1] = "WARN"; - LogLevel[LogLevel["INFO"] = 2] = "INFO"; - LogLevel[LogLevel["DEBUG"] = 3] = "DEBUG"; - LogLevel[LogLevel["DEV"] = 4] = "DEV"; -})(LogLevel || (LogLevel = {})); -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Logger.js","sourceRoot":"./","sources":["Logger.ts"],"names":[],"mappings":"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","sourcesContent":["import config from \"config\";\nimport {v4 as uuid} from \"uuid\";\nimport Log from \"./models/Log\";\n\nconst LOG_LEVEL: LogLevelKeys = <LogLevelKeys>config.get<string>('log_level');\nconst DB_LOG_LEVEL: LogLevelKeys = <LogLevelKeys>config.get<string>('db_log_level');\n\nexport default class Logger {\n    public static silentError(error: Error, ...message: any[]): string {\n        return this.log('ERROR', message, error, true) || '';\n    }\n\n    public static error(error: Error, ...message: any[]): string {\n        return this.log('ERROR', message, error) || '';\n    }\n\n    public static warn(...message: any[]) {\n        this.log('WARN', message);\n    }\n\n    public static info(...message: any[]) {\n        this.log('INFO', message);\n    }\n\n    public static debug(...message: any[]) {\n        this.log('DEBUG', message);\n    }\n\n    public static dev(...message: any[]) {\n        this.log('DEV', message);\n    }\n\n    private static log(level: LogLevelKeys, message: any[], error?: Error, silent: boolean = false): string | null {\n        const levelIndex = LogLevel[level];\n        if (levelIndex <= LogLevel[LOG_LEVEL]) {\n            if (error) {\n                if (levelIndex > LogLevel.ERROR) this.warn(`Wrong log level ${level} with attached error.`);\n            } else {\n                if (levelIndex <= LogLevel.ERROR) this.warn(`No error attached with log level ${level}.`);\n            }\n\n            const computedMsg = message.map(v => {\n                if (typeof v === 'string') {\n                    return v;\n                } else {\n                    return JSON.stringify(v, (key: string, value: any) => {\n                        if (value instanceof Object) {\n                            if (value.type === 'Buffer') {\n                                return `Buffer<${Buffer.from(value.data).toString('hex')}>`;\n                            } else if (value !== v) {\n                                return `[object Object]`;\n                            }\n                        }\n                        if (typeof value === 'string' && value.length > 96) {\n                            return value.substr(0, 96) + '...';\n                        }\n                        return value;\n                    }, 4);\n                }\n            }).join(' ');\n\n            const log = new Log({});\n            log.setLevel(level);\n            log.message = computedMsg;\n            log.setError(error);\n\n            let logID = Buffer.alloc(16);\n            uuid({}, logID);\n            log.setLogID(logID);\n\n\n            let output = `[${level}] `;\n            let pad = output.length;\n            if (levelIndex <= LogLevel[DB_LOG_LEVEL]) output += `${log.getLogID()} - `;\n            output += computedMsg.replace(/\\n/g, '\\n' + ' '.repeat(pad));\n\n            switch (level) {\n                case \"ERROR\":\n                    if (silent || !error) {\n                        console.error(output);\n                    } else {\n                        console.error(output, error);\n                    }\n                    break;\n                case \"WARN\":\n                    console.warn(output);\n                    break;\n                case \"INFO\":\n                    console.info(output);\n                    break;\n                case \"DEBUG\":\n                case \"DEV\":\n                    console.debug(output);\n                    break;\n            }\n\n            if (levelIndex <= LogLevel[DB_LOG_LEVEL]) {\n                log.save().catch(err => {\n                    if (!silent && err.message.indexOf('ECONNREFUSED') < 0) {\n                        console.error({save_err: err, error});\n                    }\n                });\n            }\n            return log.getLogID();\n        }\n        return null;\n    }\n\n    private constructor() {\n    }\n}\n\nexport enum LogLevel {\n    ERROR,\n    WARN,\n    INFO,\n    DEBUG,\n    DEV,\n}\n\nexport type LogLevelKeys = keyof typeof LogLevel;\n"]} \ No newline at end of file diff --git a/dist/Mail.d.ts b/dist/Mail.d.ts deleted file mode 100644 index 04bc02c..0000000 --- a/dist/Mail.d.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { SentMessageInfo } from "nodemailer"; -export declare function mailRoute(template: string): string; -export default class Mail { - private static transporter; - private static getTransporter; - static prepare(): Promise; - static end(): void; - static parse(template: string, data: any, textOnly: boolean): string; - private readonly template; - private readonly options; - private readonly data; - constructor(template: MailTemplate, data?: { - [p: string]: any; - }); - private verifyData; - send(...to: string[]): Promise; -} -export declare class MailTemplate { - private readonly _template; - private readonly subject; - constructor(template: string, subject: (data: any) => string); - get template(): string; - getSubject(data: any): string; -} diff --git a/dist/Mail.js b/dist/Mail.js deleted file mode 100644 index d10f620..0000000 --- a/dist/Mail.js +++ /dev/null @@ -1,122 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -import nodemailer from "nodemailer"; -import config from "config"; -import nunjucks from 'nunjucks'; -import * as util from "util"; -import { WrappingError } from "./Utils"; -import mjml2html from "mjml"; -import * as querystring from "querystring"; -import Logger from "./Logger"; -export function mailRoute(template) { - return `/mail/${template}`; -} -export default class Mail { - constructor(template, data = {}) { - this.options = {}; - this.template = template; - this.data = data; - this.options.subject = this.template.getSubject(data); - this.verifyData(); - } - static getTransporter() { - if (!this.transporter) - throw new MailError('Mail system was not prepared.'); - return this.transporter; - } - static prepare() { - return __awaiter(this, void 0, void 0, function* () { - const transporter = nodemailer.createTransport({ - host: config.get('mail.host'), - port: config.get('mail.port'), - secure: config.get('mail.secure'), - auth: { - user: config.get('mail.username'), - pass: config.get('mail.password'), - }, - tls: { - rejectUnauthorized: !config.get('mail.allow_invalid_tls') - } - }); - try { - yield util.promisify(transporter.verify)(); - this.transporter = transporter; - } - catch (e) { - throw new MailError('Connection to mail service unsuccessful.', e); - } - Logger.info(`Mail ready to be distributed via ${config.get('mail.host')}:${config.get('mail.port')}`); - }); - } - static end() { - this.transporter.close(); - } - static parse(template, data, textOnly) { - data.text = textOnly; - const nunjucksResult = nunjucks.render(template, data); - if (textOnly) - return nunjucksResult; - const mjmlResult = mjml2html(nunjucksResult, {}); - if (mjmlResult.errors.length > 0) { - throw new MailError(`Error while parsing mail template ${template}: ${JSON.stringify(mjmlResult.errors, null, 4)}`); - } - return mjmlResult.html; - } - verifyData() { - for (const forbiddenField of [ - 'to', - ]) { - if (this.data[forbiddenField] !== undefined) { - throw new MailError(`Can't use reserved data.${forbiddenField}.`); - } - } - } - send(...to) { - return __awaiter(this, void 0, void 0, function* () { - const results = []; - for (const destEmail of to) { - // Reset options - this.options.html = this.options.text = undefined; - // Set options - this.options.to = destEmail; - // Set data - this.data.mail_subject = this.options.subject; - this.data.mail_to = this.options.to; - this.data.mail_link = `${config.get('public_url')}${mailRoute(this.template.template)}?${querystring.stringify(this.data)}`; - // Log - Logger.dev('Send mail', this.options); - // Render email - this.options.html = Mail.parse('mails/' + this.template.template + '.mjml.njk', this.data, false); - this.options.text = Mail.parse('mails/' + this.template.template + '.mjml.njk', this.data, true); - // Send email - results.push(yield Mail.getTransporter().sendMail(this.options)); - } - return results; - }); - } -} -export class MailTemplate { - constructor(template, subject) { - this._template = template; - this.subject = subject; - } - get template() { - return this._template; - } - getSubject(data) { - return 'Watch My Stream - ' + this.subject(data); - } -} -class MailError extends WrappingError { - constructor(message = 'An error occurred while sending mail.', cause) { - super(message, cause); - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Mail.js","sourceRoot":"./","sources":["Mail.ts"],"names":[],"mappings":"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","sourcesContent":["import nodemailer, {SentMessageInfo, Transporter} from \"nodemailer\";\nimport config from \"config\";\nimport {Options} from \"nodemailer/lib/mailer\";\nimport nunjucks from 'nunjucks';\nimport * as util from \"util\";\nimport {WrappingError} from \"./Utils\";\nimport mjml2html from \"mjml\";\nimport * as querystring from \"querystring\";\nimport Logger from \"./Logger\";\n\nexport function mailRoute(template: string): string {\n    return `/mail/${template}`;\n}\n\nexport default class Mail {\n    private static transporter: Transporter;\n\n    private static getTransporter(): Transporter {\n        if (!this.transporter) throw new MailError('Mail system was not prepared.');\n        return this.transporter;\n    }\n\n    public static async prepare(): Promise<void> {\n        const transporter = nodemailer.createTransport({\n            host: config.get('mail.host'),\n            port: config.get('mail.port'),\n            secure: config.get('mail.secure'),\n            auth: {\n                user: config.get('mail.username'),\n                pass: config.get('mail.password'),\n            },\n            tls: {\n                rejectUnauthorized: !config.get('mail.allow_invalid_tls')\n            }\n        });\n\n        try {\n            await util.promisify(transporter.verify)();\n            this.transporter = transporter;\n        } catch (e) {\n            throw new MailError('Connection to mail service unsuccessful.', e);\n        }\n\n        Logger.info(`Mail ready to be distributed via ${config.get('mail.host')}:${config.get('mail.port')}`);\n    }\n\n    public static end() {\n        this.transporter.close();\n    }\n\n    public static parse(template: string, data: any, textOnly: boolean): string {\n        data.text = textOnly;\n        const nunjucksResult = nunjucks.render(template, data);\n        if (textOnly) return nunjucksResult;\n\n        const mjmlResult = mjml2html(nunjucksResult, {});\n\n        if (mjmlResult.errors.length > 0) {\n            throw new MailError(`Error while parsing mail template ${template}: ${JSON.stringify(mjmlResult.errors, null, 4)}`);\n        }\n\n        return mjmlResult.html;\n    }\n\n    private readonly template: MailTemplate;\n    private readonly options: Options = {};\n    private readonly data: { [p: string]: any };\n\n    constructor(template: MailTemplate, data: { [p: string]: any } = {}) {\n        this.template = template;\n        this.data = data;\n        this.options.subject = this.template.getSubject(data);\n\n        this.verifyData();\n    }\n\n    private verifyData() {\n        for (const forbiddenField of [\n            'to',\n        ]) {\n            if (this.data[forbiddenField] !== undefined) {\n                throw new MailError(`Can't use reserved data.${forbiddenField}.`);\n            }\n        }\n    }\n\n    public async send(...to: string[]): Promise<SentMessageInfo[]> {\n        const results = [];\n\n        for (const destEmail of to) {\n            // Reset options\n            this.options.html = this.options.text = undefined;\n\n            // Set options\n            this.options.to = destEmail;\n\n            // Set data\n            this.data.mail_subject = this.options.subject;\n            this.data.mail_to = this.options.to;\n            this.data.mail_link = `${config.get<string>('public_url')}${mailRoute(this.template.template)}?${querystring.stringify(this.data)}`;\n\n            // Log\n            Logger.dev('Send mail', this.options);\n\n            // Render email\n            this.options.html = Mail.parse('mails/' + this.template.template + '.mjml.njk', this.data, false);\n            this.options.text = Mail.parse('mails/' + this.template.template + '.mjml.njk', this.data, true);\n\n            // Send email\n            results.push(await Mail.getTransporter().sendMail(this.options));\n        }\n\n        return results;\n    }\n}\n\nexport class MailTemplate {\n    private readonly _template: string;\n    private readonly subject: (data: any) => string;\n\n    constructor(template: string, subject: (data: any) => string) {\n        this._template = template;\n        this.subject = subject;\n    }\n\n    public get template(): string {\n        return this._template;\n    }\n\n    public getSubject(data: any): string {\n        return 'Watch My Stream - ' + this.subject(data);\n    }\n}\n\nclass MailError extends WrappingError {\n    constructor(message: string = 'An error occurred while sending mail.', cause?: Error) {\n        super(message, cause);\n    }\n}"]} \ No newline at end of file diff --git a/dist/Pagination.d.ts b/dist/Pagination.d.ts deleted file mode 100644 index ee6c5c7..0000000 --- a/dist/Pagination.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import Model from "./db/Model"; -export default class Pagination { - private readonly models; - readonly page: number; - readonly perPage: number; - readonly totalCount: number; - constructor(models: T[], page: number, perPage: number, totalCount: number); - hasPrevious(): boolean; - hasNext(): boolean; -} diff --git a/dist/Pagination.js b/dist/Pagination.js deleted file mode 100644 index 42e59b8..0000000 --- a/dist/Pagination.js +++ /dev/null @@ -1,15 +0,0 @@ -export default class Pagination { - constructor(models, page, perPage, totalCount) { - this.models = models; - this.page = page; - this.perPage = perPage; - this.totalCount = totalCount; - } - hasPrevious() { - return this.page > 1; - } - hasNext() { - return this.models.length >= this.perPage && this.page * this.perPage < this.totalCount; - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFnaW5hdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIuLyIsInNvdXJjZXMiOlsiUGFnaW5hdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxNQUFNLENBQUMsT0FBTyxPQUFPLFVBQVU7SUFNM0IsWUFBWSxNQUFXLEVBQUUsSUFBWSxFQUFFLE9BQWUsRUFBRSxVQUFrQjtRQUN0RSxJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQztRQUNyQixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztRQUNqQixJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQztRQUN2QixJQUFJLENBQUMsVUFBVSxHQUFHLFVBQVUsQ0FBQztJQUNqQyxDQUFDO0lBRU0sV0FBVztRQUNkLE9BQU8sSUFBSSxDQUFDLElBQUksR0FBRyxDQUFDLENBQUM7SUFDekIsQ0FBQztJQUVNLE9BQU87UUFDVixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxJQUFJLElBQUksQ0FBQyxPQUFPLElBQUksSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUM7SUFDNUYsQ0FBQztDQUVKIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IE1vZGVsIGZyb20gXCIuL2RiL01vZGVsXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIFBhZ2luYXRpb248VCBleHRlbmRzIE1vZGVsPiB7XG4gICAgcHJpdmF0ZSByZWFkb25seSBtb2RlbHM6IFRbXTtcbiAgICBwdWJsaWMgcmVhZG9ubHkgcGFnZTogbnVtYmVyO1xuICAgIHB1YmxpYyByZWFkb25seSBwZXJQYWdlOiBudW1iZXI7XG4gICAgcHVibGljIHJlYWRvbmx5IHRvdGFsQ291bnQ6IG51bWJlcjtcblxuICAgIGNvbnN0cnVjdG9yKG1vZGVsczogVFtdLCBwYWdlOiBudW1iZXIsIHBlclBhZ2U6IG51bWJlciwgdG90YWxDb3VudDogbnVtYmVyKSB7XG4gICAgICAgIHRoaXMubW9kZWxzID0gbW9kZWxzO1xuICAgICAgICB0aGlzLnBhZ2UgPSBwYWdlO1xuICAgICAgICB0aGlzLnBlclBhZ2UgPSBwZXJQYWdlO1xuICAgICAgICB0aGlzLnRvdGFsQ291bnQgPSB0b3RhbENvdW50O1xuICAgIH1cblxuICAgIHB1YmxpYyBoYXNQcmV2aW91cygpOiBib29sZWFuIHtcbiAgICAgICAgcmV0dXJuIHRoaXMucGFnZSA+IDE7XG4gICAgfVxuXG4gICAgcHVibGljIGhhc05leHQoKTogYm9vbGVhbiB7XG4gICAgICAgIHJldHVybiB0aGlzLm1vZGVscy5sZW5ndGggPj0gdGhpcy5wZXJQYWdlICYmIHRoaXMucGFnZSAqIHRoaXMucGVyUGFnZSA8IHRoaXMudG90YWxDb3VudDtcbiAgICB9XG5cbn0iXX0= \ No newline at end of file diff --git a/dist/Utils.d.ts b/dist/Utils.d.ts deleted file mode 100644 index 7d7c2b4..0000000 --- a/dist/Utils.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -export declare function sleep(ms: number): Promise; -export declare abstract class WrappingError extends Error { - readonly cause?: Error; - protected constructor(message: string, cause?: Error); - get name(): string; -} -export declare function cryptoRandomDictionary(size: number, dictionary: string): string; diff --git a/dist/Utils.js b/dist/Utils.js deleted file mode 100644 index 18b3e25..0000000 --- a/dist/Utils.js +++ /dev/null @@ -1,38 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -import * as crypto from "crypto"; -export function sleep(ms) { - return __awaiter(this, void 0, void 0, function* () { - return yield new Promise(resolve => { - setTimeout(() => resolve(), ms); - }); - }); -} -export class WrappingError extends Error { - constructor(message, cause) { - super(message); - this.cause = cause; - if (cause !== undefined) { - this.stack = (this.stack || '') + `\n> Caused by: ${cause.stack}`; - } - } - get name() { - return this.constructor.name; - } -} -export function cryptoRandomDictionary(size, dictionary) { - const randomBytes = crypto.randomBytes(size); - const output = new Array(size); - for (let i = 0; i < size; i++) { - output[i] = dictionary[Math.floor((randomBytes[i] / 255) * dictionary.length)]; - } - return output.join(''); -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXRpbHMuanMiLCJzb3VyY2VSb290IjoiLi8iLCJzb3VyY2VzIjpbIlV0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sS0FBSyxNQUFNLE1BQU0sUUFBUSxDQUFDO0FBRWpDLE1BQU0sVUFBZ0IsS0FBSyxDQUFDLEVBQVU7O1FBQ2xDLE9BQU8sTUFBTSxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsRUFBRTtZQUMvQixVQUFVLENBQUMsR0FBRyxFQUFFLENBQUMsT0FBTyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDcEMsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDO0NBQUE7QUFFRCxNQUFNLE9BQWdCLGFBQWMsU0FBUSxLQUFLO0lBRzdDLFlBQXNCLE9BQWUsRUFBRSxLQUFhO1FBQ2hELEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNmLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBRW5CLElBQUksS0FBSyxLQUFLLFNBQVMsRUFBRTtZQUNyQixJQUFJLENBQUMsS0FBSyxHQUFHLENBQUMsSUFBSSxDQUFDLEtBQUssSUFBSSxFQUFFLENBQUMsR0FBRyxrQkFBa0IsS0FBSyxDQUFDLEtBQUssRUFBRSxDQUFDO1NBQ3JFO0lBQ0wsQ0FBQztJQUVELElBQUksSUFBSTtRQUNKLE9BQU8sSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUM7SUFDakMsQ0FBQztDQUNKO0FBRUQsTUFBTSxVQUFVLHNCQUFzQixDQUFDLElBQVksRUFBRSxVQUFrQjtJQUNuRSxNQUFNLFdBQVcsR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzdDLE1BQU0sTUFBTSxHQUFHLElBQUksS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRS9CLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxJQUFJLEVBQUUsQ0FBQyxFQUFFLEVBQUU7UUFDM0IsTUFBTSxDQUFDLENBQUMsQ0FBQyxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxHQUFHLEdBQUcsQ0FBQyxHQUFHLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO0tBQ2xGO0lBRUQsT0FBTyxNQUFNLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0FBQzNCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgKiBhcyBjcnlwdG8gZnJvbSBcImNyeXB0b1wiO1xuXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gc2xlZXAobXM6IG51bWJlcik6IFByb21pc2U8dm9pZD4ge1xuICAgIHJldHVybiBhd2FpdCBuZXcgUHJvbWlzZShyZXNvbHZlID0+IHtcbiAgICAgICAgc2V0VGltZW91dCgoKSA9PiByZXNvbHZlKCksIG1zKTtcbiAgICB9KTtcbn1cblxuZXhwb3J0IGFic3RyYWN0IGNsYXNzIFdyYXBwaW5nRXJyb3IgZXh0ZW5kcyBFcnJvciB7XG4gICAgcHVibGljIHJlYWRvbmx5IGNhdXNlPzogRXJyb3I7XG5cbiAgICBwcm90ZWN0ZWQgY29uc3RydWN0b3IobWVzc2FnZTogc3RyaW5nLCBjYXVzZT86IEVycm9yKSB7XG4gICAgICAgIHN1cGVyKG1lc3NhZ2UpO1xuICAgICAgICB0aGlzLmNhdXNlID0gY2F1c2U7XG5cbiAgICAgICAgaWYgKGNhdXNlICE9PSB1bmRlZmluZWQpIHtcbiAgICAgICAgICAgIHRoaXMuc3RhY2sgPSAodGhpcy5zdGFjayB8fCAnJykgKyBgXFxuPiBDYXVzZWQgYnk6ICR7Y2F1c2Uuc3RhY2t9YDtcbiAgICAgICAgfVxuICAgIH1cblxuICAgIGdldCBuYW1lKCk6IHN0cmluZyB7XG4gICAgICAgIHJldHVybiB0aGlzLmNvbnN0cnVjdG9yLm5hbWU7XG4gICAgfVxufVxuXG5leHBvcnQgZnVuY3Rpb24gY3J5cHRvUmFuZG9tRGljdGlvbmFyeShzaXplOiBudW1iZXIsIGRpY3Rpb25hcnk6IHN0cmluZyk6IHN0cmluZyB7XG4gICAgY29uc3QgcmFuZG9tQnl0ZXMgPSBjcnlwdG8ucmFuZG9tQnl0ZXMoc2l6ZSk7XG4gICAgY29uc3Qgb3V0cHV0ID0gbmV3IEFycmF5KHNpemUpO1xuXG4gICAgZm9yIChsZXQgaSA9IDA7IGkgPCBzaXplOyBpKyspIHtcbiAgICAgICAgb3V0cHV0W2ldID0gZGljdGlvbmFyeVtNYXRoLmZsb29yKChyYW5kb21CeXRlc1tpXSAvIDI1NSkgKiBkaWN0aW9uYXJ5Lmxlbmd0aCldO1xuICAgIH1cblxuICAgIHJldHVybiBvdXRwdXQuam9pbignJyk7XG59Il19 \ No newline at end of file diff --git a/dist/WebSocketListener.d.ts b/dist/WebSocketListener.d.ts deleted file mode 100644 index 0610621..0000000 --- a/dist/WebSocketListener.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/// -/// -import WebSocket from "ws"; -import { IncomingMessage } from "http"; -export default abstract class WebSocketListener { - abstract path(): string; - abstract handle(socket: WebSocket, request: IncomingMessage, session: Express.SessionData): Promise; -} diff --git a/dist/WebSocketListener.js b/dist/WebSocketListener.js deleted file mode 100644 index 03ed92d..0000000 --- a/dist/WebSocketListener.js +++ /dev/null @@ -1,3 +0,0 @@ -export default class WebSocketListener { -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiV2ViU29ja2V0TGlzdGVuZXIuanMiLCJzb3VyY2VSb290IjoiLi8iLCJzb3VyY2VzIjpbIldlYlNvY2tldExpc3RlbmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE1BQU0sQ0FBQyxPQUFPLE9BQWdCLGlCQUFpQjtDQUk5QyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBXZWJTb2NrZXQgZnJvbSBcIndzXCI7XG5pbXBvcnQge0luY29taW5nTWVzc2FnZX0gZnJvbSBcImh0dHBcIjtcblxuZXhwb3J0IGRlZmF1bHQgYWJzdHJhY3QgY2xhc3MgV2ViU29ja2V0TGlzdGVuZXIge1xuICAgIHB1YmxpYyBhYnN0cmFjdCBwYXRoKCk6IHN0cmluZztcblxuICAgIHB1YmxpYyBhYnN0cmFjdCBhc3luYyBoYW5kbGUoc29ja2V0OiBXZWJTb2NrZXQsIHJlcXVlc3Q6IEluY29taW5nTWVzc2FnZSwgc2Vzc2lvbjogRXhwcmVzcy5TZXNzaW9uRGF0YSk6IFByb21pc2U8dm9pZD47XG59Il19 \ No newline at end of file diff --git a/dist/components/CsrfProtectionComponent.d.ts b/dist/components/CsrfProtectionComponent.d.ts deleted file mode 100644 index 9d9dd67..0000000 --- a/dist/components/CsrfProtectionComponent.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import ApplicationComponent from "../ApplicationComponent"; -import { Express, Router } from "express"; -export default class CsrfProtectionComponent extends ApplicationComponent { - start(app: Express, router: Router): Promise; - stop(): Promise; -} diff --git a/dist/components/CsrfProtectionComponent.js b/dist/components/CsrfProtectionComponent.js deleted file mode 100644 index 54d2ee1..0000000 --- a/dist/components/CsrfProtectionComponent.js +++ /dev/null @@ -1,57 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -import ApplicationComponent from "../ApplicationComponent"; -import crypto from "crypto"; -import { BadRequestError } from "../HttpError"; -export default class CsrfProtectionComponent extends ApplicationComponent { - start(app, router) { - return __awaiter(this, void 0, void 0, function* () { - router.use((req, res, next) => { - if (!req.session) { - throw new Error('Session is unavailable.'); - } - res.locals.getCSRFToken = () => { - if (typeof req.session.csrf !== 'string') { - req.session.csrf = crypto.randomBytes(64).toString('base64'); - } - return req.session.csrf; - }; - if (!['GET', 'HEAD', 'OPTIONS'].find(s => s === req.method)) { - if (req.session.csrf === undefined) { - throw new InvalidCsrfTokenError(req.baseUrl, `You weren't assigned any CSRF token.`); - } - else if (req.body.csrf === undefined) { - throw new InvalidCsrfTokenError(req.baseUrl, `You didn't provide any CSRF token.`); - } - else if (req.session.csrf !== req.body.csrf) { - throw new InvalidCsrfTokenError(req.baseUrl, `Tokens don't match.`); - } - } - next(); - }); - }); - } - stop() { - return __awaiter(this, void 0, void 0, function* () { - }); - } -} -class InvalidCsrfTokenError extends BadRequestError { - constructor(url, details, cause) { - super(`Invalid CSRF token`, `${details} We can't process this request. Please try again.`, url, cause); - } - get name() { - return 'Invalid CSRF Token'; - } - get errorCode() { - return 401; - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3NyZlByb3RlY3Rpb25Db21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiLi8iLCJzb3VyY2VzIjpbImNvbXBvbmVudHMvQ3NyZlByb3RlY3Rpb25Db21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsT0FBTyxvQkFBb0IsTUFBTSx5QkFBeUIsQ0FBQztBQUUzRCxPQUFPLE1BQU0sTUFBTSxRQUFRLENBQUM7QUFDNUIsT0FBTyxFQUFDLGVBQWUsRUFBQyxNQUFNLGNBQWMsQ0FBQztBQUU3QyxNQUFNLENBQUMsT0FBTyxPQUFPLHVCQUF3QixTQUFRLG9CQUEwQjtJQUM5RCxLQUFLLENBQUMsR0FBWSxFQUFFLE1BQWM7O1lBQzNDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFLElBQUksRUFBRSxFQUFFO2dCQUMxQixJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRTtvQkFDZCxNQUFNLElBQUksS0FBSyxDQUFDLHlCQUF5QixDQUFDLENBQUM7aUJBQzlDO2dCQUVELEdBQUcsQ0FBQyxNQUFNLENBQUMsWUFBWSxHQUFHLEdBQUcsRUFBRTtvQkFDM0IsSUFBSSxPQUFPLEdBQUcsQ0FBQyxPQUFRLENBQUMsSUFBSSxLQUFLLFFBQVEsRUFBRTt3QkFDdkMsR0FBRyxDQUFDLE9BQVEsQ0FBQyxJQUFJLEdBQUcsTUFBTSxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUM7cUJBQ2pFO29CQUNELE9BQU8sR0FBRyxDQUFDLE9BQVEsQ0FBQyxJQUFJLENBQUM7Z0JBQzdCLENBQUMsQ0FBQztnQkFFRixJQUFJLENBQUMsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLFNBQVMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUU7b0JBQ3pELElBQUksR0FBRyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEtBQUssU0FBUyxFQUFFO3dCQUNoQyxNQUFNLElBQUkscUJBQXFCLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxzQ0FBc0MsQ0FBQyxDQUFDO3FCQUN4Rjt5QkFBTSxJQUFJLEdBQUcsQ0FBQyxJQUFJLENBQUMsSUFBSSxLQUFLLFNBQVMsRUFBRTt3QkFDcEMsTUFBTSxJQUFJLHFCQUFxQixDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsb0NBQW9DLENBQUMsQ0FBQztxQkFDdEY7eUJBQU0sSUFBSSxHQUFHLENBQUMsT0FBTyxDQUFDLElBQUksS0FBSyxHQUFHLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRTt3QkFDM0MsTUFBTSxJQUFJLHFCQUFxQixDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUscUJBQXFCLENBQUMsQ0FBQztxQkFDdkU7aUJBQ0o7Z0JBQ0QsSUFBSSxFQUFFLENBQUM7WUFDWCxDQUFDLENBQUMsQ0FBQztRQUNQLENBQUM7S0FBQTtJQUVZLElBQUk7O1FBQ2pCLENBQUM7S0FBQTtDQUNKO0FBRUQsTUFBTSxxQkFBc0IsU0FBUSxlQUFlO0lBQy9DLFlBQVksR0FBVyxFQUFFLE9BQWUsRUFBRSxLQUFhO1FBQ25ELEtBQUssQ0FDRCxvQkFBb0IsRUFDcEIsR0FBRyxPQUFPLG1EQUFtRCxFQUM3RCxHQUFHLEVBQ0gsS0FBSyxDQUNSLENBQUM7SUFDTixDQUFDO0lBRUQsSUFBSSxJQUFJO1FBQ0osT0FBTyxvQkFBb0IsQ0FBQztJQUNoQyxDQUFDO0lBRUQsSUFBSSxTQUFTO1FBQ1QsT0FBTyxHQUFHLENBQUM7SUFDZixDQUFDO0NBQ0oiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgQXBwbGljYXRpb25Db21wb25lbnQgZnJvbSBcIi4uL0FwcGxpY2F0aW9uQ29tcG9uZW50XCI7XG5pbXBvcnQge0V4cHJlc3MsIFJvdXRlcn0gZnJvbSBcImV4cHJlc3NcIjtcbmltcG9ydCBjcnlwdG8gZnJvbSBcImNyeXB0b1wiO1xuaW1wb3J0IHtCYWRSZXF1ZXN0RXJyb3J9IGZyb20gXCIuLi9IdHRwRXJyb3JcIjtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgQ3NyZlByb3RlY3Rpb25Db21wb25lbnQgZXh0ZW5kcyBBcHBsaWNhdGlvbkNvbXBvbmVudDx2b2lkPiB7XG4gICAgcHVibGljIGFzeW5jIHN0YXJ0KGFwcDogRXhwcmVzcywgcm91dGVyOiBSb3V0ZXIpOiBQcm9taXNlPHZvaWQ+IHtcbiAgICAgICAgcm91dGVyLnVzZSgocmVxLCByZXMsIG5leHQpID0+IHtcbiAgICAgICAgICAgIGlmICghcmVxLnNlc3Npb24pIHtcbiAgICAgICAgICAgICAgICB0aHJvdyBuZXcgRXJyb3IoJ1Nlc3Npb24gaXMgdW5hdmFpbGFibGUuJyk7XG4gICAgICAgICAgICB9XG5cbiAgICAgICAgICAgIHJlcy5sb2NhbHMuZ2V0Q1NSRlRva2VuID0gKCkgPT4ge1xuICAgICAgICAgICAgICAgIGlmICh0eXBlb2YgcmVxLnNlc3Npb24hLmNzcmYgIT09ICdzdHJpbmcnKSB7XG4gICAgICAgICAgICAgICAgICAgIHJlcS5zZXNzaW9uIS5jc3JmID0gY3J5cHRvLnJhbmRvbUJ5dGVzKDY0KS50b1N0cmluZygnYmFzZTY0Jyk7XG4gICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgICAgIHJldHVybiByZXEuc2Vzc2lvbiEuY3NyZjtcbiAgICAgICAgICAgIH07XG5cbiAgICAgICAgICAgIGlmICghWydHRVQnLCAnSEVBRCcsICdPUFRJT05TJ10uZmluZChzID0+IHMgPT09IHJlcS5tZXRob2QpKSB7XG4gICAgICAgICAgICAgICAgaWYgKHJlcS5zZXNzaW9uLmNzcmYgPT09IHVuZGVmaW5lZCkge1xuICAgICAgICAgICAgICAgICAgICB0aHJvdyBuZXcgSW52YWxpZENzcmZUb2tlbkVycm9yKHJlcS5iYXNlVXJsLCBgWW91IHdlcmVuJ3QgYXNzaWduZWQgYW55IENTUkYgdG9rZW4uYCk7XG4gICAgICAgICAgICAgICAgfSBlbHNlIGlmIChyZXEuYm9keS5jc3JmID09PSB1bmRlZmluZWQpIHtcbiAgICAgICAgICAgICAgICAgICAgdGhyb3cgbmV3IEludmFsaWRDc3JmVG9rZW5FcnJvcihyZXEuYmFzZVVybCwgYFlvdSBkaWRuJ3QgcHJvdmlkZSBhbnkgQ1NSRiB0b2tlbi5gKTtcbiAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKHJlcS5zZXNzaW9uLmNzcmYgIT09IHJlcS5ib2R5LmNzcmYpIHtcbiAgICAgICAgICAgICAgICAgICAgdGhyb3cgbmV3IEludmFsaWRDc3JmVG9rZW5FcnJvcihyZXEuYmFzZVVybCwgYFRva2VucyBkb24ndCBtYXRjaC5gKTtcbiAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICB9XG4gICAgICAgICAgICBuZXh0KCk7XG4gICAgICAgIH0pO1xuICAgIH1cblxuICAgIHB1YmxpYyBhc3luYyBzdG9wKCk6IFByb21pc2U8dm9pZD4ge1xuICAgIH1cbn1cblxuY2xhc3MgSW52YWxpZENzcmZUb2tlbkVycm9yIGV4dGVuZHMgQmFkUmVxdWVzdEVycm9yIHtcbiAgICBjb25zdHJ1Y3Rvcih1cmw6IHN0cmluZywgZGV0YWlsczogc3RyaW5nLCBjYXVzZT86IEVycm9yKSB7XG4gICAgICAgIHN1cGVyKFxuICAgICAgICAgICAgYEludmFsaWQgQ1NSRiB0b2tlbmAsXG4gICAgICAgICAgICBgJHtkZXRhaWxzfSBXZSBjYW4ndCBwcm9jZXNzIHRoaXMgcmVxdWVzdC4gUGxlYXNlIHRyeSBhZ2Fpbi5gLFxuICAgICAgICAgICAgdXJsLFxuICAgICAgICAgICAgY2F1c2VcbiAgICAgICAgKTtcbiAgICB9XG5cbiAgICBnZXQgbmFtZSgpOiBzdHJpbmcge1xuICAgICAgICByZXR1cm4gJ0ludmFsaWQgQ1NSRiBUb2tlbic7XG4gICAgfVxuXG4gICAgZ2V0IGVycm9yQ29kZSgpOiBudW1iZXIge1xuICAgICAgICByZXR1cm4gNDAxO1xuICAgIH1cbn1cbiJdfQ== \ No newline at end of file diff --git a/dist/components/ExpressAppComponent.d.ts b/dist/components/ExpressAppComponent.d.ts deleted file mode 100644 index 08f55bb..0000000 --- a/dist/components/ExpressAppComponent.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -/// -import ApplicationComponent from "../ApplicationComponent"; -import { Express, Router } from "express"; -import { Server } from "http"; -export default class ExpressAppComponent extends ApplicationComponent { - private readonly port; - private server?; - constructor(port: number); - start(app: Express, router: Router): Promise; - stop(): Promise; - getServer(): Server; -} diff --git a/dist/components/ExpressAppComponent.js b/dist/components/ExpressAppComponent.js deleted file mode 100644 index 63a63db..0000000 --- a/dist/components/ExpressAppComponent.js +++ /dev/null @@ -1,45 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -import ApplicationComponent from "../ApplicationComponent"; -import express from "express"; -import Logger from "../Logger"; -export default class ExpressAppComponent extends ApplicationComponent { - constructor(port) { - super(); - this.port = port; - } - start(app, router) { - return __awaiter(this, void 0, void 0, function* () { - this.server = app.listen(this.port, 'localhost', () => { - Logger.info(`Web server running on localhost:${this.port}.`); - }); - router.use(express.json()); - router.use(express.urlencoded()); - router.use((req, res, next) => { - req.models = {}; - req.modelCollections = {}; - next(); - }); - }); - } - stop() { - return __awaiter(this, void 0, void 0, function* () { - if (this.server) { - yield this.close('Webserver', this.server, this.server.close); - } - }); - } - getServer() { - if (!this.server) - throw 'Server was not initialized.'; - return this.server; - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXhwcmVzc0FwcENvbXBvbmVudC5qcyIsInNvdXJjZVJvb3QiOiIuLyIsInNvdXJjZXMiOlsiY29tcG9uZW50cy9FeHByZXNzQXBwQ29tcG9uZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sb0JBQW9CLE1BQU0seUJBQXlCLENBQUM7QUFDM0QsT0FBTyxPQUEwQixNQUFNLFNBQVMsQ0FBQztBQUNqRCxPQUFPLE1BQU0sTUFBTSxXQUFXLENBQUM7QUFHL0IsTUFBTSxDQUFDLE9BQU8sT0FBTyxtQkFBb0IsU0FBUSxvQkFBMEI7SUFJdkUsWUFBWSxJQUFZO1FBQ3BCLEtBQUssRUFBRSxDQUFDO1FBQ1IsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7SUFDckIsQ0FBQztJQUVZLEtBQUssQ0FBQyxHQUFZLEVBQUUsTUFBYzs7WUFDM0MsSUFBSSxDQUFDLE1BQU0sR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsV0FBVyxFQUFFLEdBQUcsRUFBRTtnQkFDbEQsTUFBTSxDQUFDLElBQUksQ0FBQyxtQ0FBbUMsSUFBSSxDQUFDLElBQUksR0FBRyxDQUFDLENBQUM7WUFDakUsQ0FBQyxDQUFDLENBQUM7WUFFSCxNQUFNLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO1lBQzNCLE1BQU0sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxDQUFDLENBQUM7WUFFakMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFFLEVBQUU7Z0JBQzFCLEdBQUcsQ0FBQyxNQUFNLEdBQUcsRUFBRSxDQUFDO2dCQUNoQixHQUFHLENBQUMsZ0JBQWdCLEdBQUcsRUFBRSxDQUFDO2dCQUMxQixJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1AsQ0FBQztLQUFBO0lBRVksSUFBSTs7WUFDYixJQUFJLElBQUksQ0FBQyxNQUFNLEVBQUU7Z0JBQ2IsTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLFdBQVcsRUFBRSxJQUFJLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7YUFDakU7UUFDTCxDQUFDO0tBQUE7SUFFTSxTQUFTO1FBQ1osSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNO1lBQUUsTUFBTSw2QkFBNkIsQ0FBQztRQUN0RCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUM7SUFDdkIsQ0FBQztDQUNKIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IEFwcGxpY2F0aW9uQ29tcG9uZW50IGZyb20gXCIuLi9BcHBsaWNhdGlvbkNvbXBvbmVudFwiO1xuaW1wb3J0IGV4cHJlc3MsIHtFeHByZXNzLCBSb3V0ZXJ9IGZyb20gXCJleHByZXNzXCI7XG5pbXBvcnQgTG9nZ2VyIGZyb20gXCIuLi9Mb2dnZXJcIjtcbmltcG9ydCB7U2VydmVyfSBmcm9tIFwiaHR0cFwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBFeHByZXNzQXBwQ29tcG9uZW50IGV4dGVuZHMgQXBwbGljYXRpb25Db21wb25lbnQ8dm9pZD4ge1xuICAgIHByaXZhdGUgcmVhZG9ubHkgcG9ydDogbnVtYmVyO1xuICAgIHByaXZhdGUgc2VydmVyPzogU2VydmVyO1xuXG4gICAgY29uc3RydWN0b3IocG9ydDogbnVtYmVyKSB7XG4gICAgICAgIHN1cGVyKCk7XG4gICAgICAgIHRoaXMucG9ydCA9IHBvcnQ7XG4gICAgfVxuXG4gICAgcHVibGljIGFzeW5jIHN0YXJ0KGFwcDogRXhwcmVzcywgcm91dGVyOiBSb3V0ZXIpOiBQcm9taXNlPHZvaWQ+IHtcbiAgICAgICAgdGhpcy5zZXJ2ZXIgPSBhcHAubGlzdGVuKHRoaXMucG9ydCwgJ2xvY2FsaG9zdCcsICgpID0+IHtcbiAgICAgICAgICAgIExvZ2dlci5pbmZvKGBXZWIgc2VydmVyIHJ1bm5pbmcgb24gbG9jYWxob3N0OiR7dGhpcy5wb3J0fS5gKTtcbiAgICAgICAgfSk7XG5cbiAgICAgICAgcm91dGVyLnVzZShleHByZXNzLmpzb24oKSk7XG4gICAgICAgIHJvdXRlci51c2UoZXhwcmVzcy51cmxlbmNvZGVkKCkpO1xuXG4gICAgICAgIHJvdXRlci51c2UoKHJlcSwgcmVzLCBuZXh0KSA9PiB7XG4gICAgICAgICAgICByZXEubW9kZWxzID0ge307XG4gICAgICAgICAgICByZXEubW9kZWxDb2xsZWN0aW9ucyA9IHt9O1xuICAgICAgICAgICAgbmV4dCgpO1xuICAgICAgICB9KTtcbiAgICB9XG5cbiAgICBwdWJsaWMgYXN5bmMgc3RvcCgpOiBQcm9taXNlPHZvaWQ+IHtcbiAgICAgICAgaWYgKHRoaXMuc2VydmVyKSB7XG4gICAgICAgICAgICBhd2FpdCB0aGlzLmNsb3NlKCdXZWJzZXJ2ZXInLCB0aGlzLnNlcnZlciwgdGhpcy5zZXJ2ZXIuY2xvc2UpO1xuICAgICAgICB9XG4gICAgfVxuXG4gICAgcHVibGljIGdldFNlcnZlcigpOiBTZXJ2ZXIge1xuICAgICAgICBpZiAoIXRoaXMuc2VydmVyKSB0aHJvdyAnU2VydmVyIHdhcyBub3QgaW5pdGlhbGl6ZWQuJztcbiAgICAgICAgcmV0dXJuIHRoaXMuc2VydmVyO1xuICAgIH1cbn0iXX0= \ No newline at end of file diff --git a/dist/components/FormHelperComponent.d.ts b/dist/components/FormHelperComponent.d.ts deleted file mode 100644 index 2d69e20..0000000 --- a/dist/components/FormHelperComponent.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import ApplicationComponent from "../ApplicationComponent"; -import { Express, Router } from "express"; -export default class FormHelperComponent extends ApplicationComponent { - start(app: Express, router: Router): Promise; - stop(): Promise; -} diff --git a/dist/components/FormHelperComponent.js b/dist/components/FormHelperComponent.js deleted file mode 100644 index 3e207cd..0000000 --- a/dist/components/FormHelperComponent.js +++ /dev/null @@ -1,52 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -import ApplicationComponent from "../ApplicationComponent"; -export default class FormHelperComponent extends ApplicationComponent { - start(app, router) { - return __awaiter(this, void 0, void 0, function* () { - router.use((req, res, next) => { - if (!req.session) { - throw new Error('Session is unavailable.'); - } - res.locals.query = req.query; - let _validation = null; - res.locals.validation = () => { - if (!_validation) { - const v = req.flash('validation'); - _validation = v.length > 0 ? v[0] : null; - } - return _validation; - }; - let _previousFormData = null; - res.locals.previousFormData = () => { - if (!_previousFormData) { - const v = req.flash('previousFormData'); - _previousFormData = v.length > 0 ? v[0] : null; - } - return _previousFormData; - }; - next(); - }); - router.use((req, res, next) => { - if (['GET', 'POST'].find(m => m === req.method)) { - if (typeof req.body === 'object') { - req.flash('previousFormData', req.body); - } - } - next(); - }); - }); - } - stop() { - return __awaiter(this, void 0, void 0, function* () { - }); - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRm9ybUhlbHBlckNvbXBvbmVudC5qcyIsInNvdXJjZVJvb3QiOiIuLyIsInNvdXJjZXMiOlsiY29tcG9uZW50cy9Gb3JtSGVscGVyQ29tcG9uZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sb0JBQW9CLE1BQU0seUJBQXlCLENBQUM7QUFHM0QsTUFBTSxDQUFDLE9BQU8sT0FBTyxtQkFBb0IsU0FBUSxvQkFBMEI7SUFDMUQsS0FBSyxDQUFDLEdBQVksRUFBRSxNQUFjOztZQUMzQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsRUFBRTtnQkFDMUIsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUU7b0JBQ2QsTUFBTSxJQUFJLEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO2lCQUM5QztnQkFFRCxHQUFHLENBQUMsTUFBTSxDQUFDLEtBQUssR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDO2dCQUU3QixJQUFJLFdBQVcsR0FBUSxJQUFJLENBQUM7Z0JBQzVCLEdBQUcsQ0FBQyxNQUFNLENBQUMsVUFBVSxHQUFHLEdBQUcsRUFBRTtvQkFDekIsSUFBSSxDQUFDLFdBQVcsRUFBRTt3QkFDZCxNQUFNLENBQUMsR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxDQUFDO3dCQUNsQyxXQUFXLEdBQUcsQ0FBQyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO3FCQUM1QztvQkFFRCxPQUFPLFdBQVcsQ0FBQztnQkFDdkIsQ0FBQyxDQUFBO2dCQUVELElBQUksaUJBQWlCLEdBQVEsSUFBSSxDQUFDO2dCQUNsQyxHQUFHLENBQUMsTUFBTSxDQUFDLGdCQUFnQixHQUFHLEdBQUcsRUFBRTtvQkFDL0IsSUFBSSxDQUFDLGlCQUFpQixFQUFFO3dCQUNwQixNQUFNLENBQUMsR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLGtCQUFrQixDQUFDLENBQUM7d0JBQ3hDLGlCQUFpQixHQUFHLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztxQkFDbkQ7b0JBRUQsT0FBTyxpQkFBaUIsQ0FBQztnQkFDN0IsQ0FBQyxDQUFDO2dCQUNGLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxDQUFDLENBQUM7WUFFSCxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsRUFBRTtnQkFDMUIsSUFBSSxDQUFDLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEtBQUssR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFO29CQUM3QyxJQUFJLE9BQU8sR0FBRyxDQUFDLElBQUksS0FBSyxRQUFRLEVBQUU7d0JBQzlCLEdBQUcsQ0FBQyxLQUFLLENBQUMsa0JBQWtCLEVBQUUsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO3FCQUMzQztpQkFDSjtnQkFDRCxJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1AsQ0FBQztLQUFBO0lBRVksSUFBSTs7UUFDakIsQ0FBQztLQUFBO0NBRUoiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgQXBwbGljYXRpb25Db21wb25lbnQgZnJvbSBcIi4uL0FwcGxpY2F0aW9uQ29tcG9uZW50XCI7XG5pbXBvcnQge0V4cHJlc3MsIFJvdXRlcn0gZnJvbSBcImV4cHJlc3NcIjtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgRm9ybUhlbHBlckNvbXBvbmVudCBleHRlbmRzIEFwcGxpY2F0aW9uQ29tcG9uZW50PHZvaWQ+IHtcbiAgICBwdWJsaWMgYXN5bmMgc3RhcnQoYXBwOiBFeHByZXNzLCByb3V0ZXI6IFJvdXRlcik6IFByb21pc2U8dm9pZD4ge1xuICAgICAgICByb3V0ZXIudXNlKChyZXEsIHJlcywgbmV4dCkgPT4ge1xuICAgICAgICAgICAgaWYgKCFyZXEuc2Vzc2lvbikge1xuICAgICAgICAgICAgICAgIHRocm93IG5ldyBFcnJvcignU2Vzc2lvbiBpcyB1bmF2YWlsYWJsZS4nKTtcbiAgICAgICAgICAgIH1cblxuICAgICAgICAgICAgcmVzLmxvY2Fscy5xdWVyeSA9IHJlcS5xdWVyeTtcblxuICAgICAgICAgICAgbGV0IF92YWxpZGF0aW9uOiBhbnkgPSBudWxsO1xuICAgICAgICAgICAgcmVzLmxvY2Fscy52YWxpZGF0aW9uID0gKCkgPT4ge1xuICAgICAgICAgICAgICAgIGlmICghX3ZhbGlkYXRpb24pIHtcbiAgICAgICAgICAgICAgICAgICAgY29uc3QgdiA9IHJlcS5mbGFzaCgndmFsaWRhdGlvbicpO1xuICAgICAgICAgICAgICAgICAgICBfdmFsaWRhdGlvbiA9IHYubGVuZ3RoID4gMCA/IHZbMF0gOiBudWxsO1xuICAgICAgICAgICAgICAgIH1cblxuICAgICAgICAgICAgICAgIHJldHVybiBfdmFsaWRhdGlvbjtcbiAgICAgICAgICAgIH1cblxuICAgICAgICAgICAgbGV0IF9wcmV2aW91c0Zvcm1EYXRhOiBhbnkgPSBudWxsO1xuICAgICAgICAgICAgcmVzLmxvY2Fscy5wcmV2aW91c0Zvcm1EYXRhID0gKCkgPT4ge1xuICAgICAgICAgICAgICAgIGlmICghX3ByZXZpb3VzRm9ybURhdGEpIHtcbiAgICAgICAgICAgICAgICAgICAgY29uc3QgdiA9IHJlcS5mbGFzaCgncHJldmlvdXNGb3JtRGF0YScpO1xuICAgICAgICAgICAgICAgICAgICBfcHJldmlvdXNGb3JtRGF0YSA9IHYubGVuZ3RoID4gMCA/IHYgWzBdIDogbnVsbDtcbiAgICAgICAgICAgICAgICB9XG5cbiAgICAgICAgICAgICAgICByZXR1cm4gX3ByZXZpb3VzRm9ybURhdGE7XG4gICAgICAgICAgICB9O1xuICAgICAgICAgICAgbmV4dCgpO1xuICAgICAgICB9KTtcblxuICAgICAgICByb3V0ZXIudXNlKChyZXEsIHJlcywgbmV4dCkgPT4ge1xuICAgICAgICAgICAgaWYgKFsnR0VUJywgJ1BPU1QnXS5maW5kKG0gPT4gbSA9PT0gcmVxLm1ldGhvZCkpIHtcbiAgICAgICAgICAgICAgICBpZiAodHlwZW9mIHJlcS5ib2R5ID09PSAnb2JqZWN0Jykge1xuICAgICAgICAgICAgICAgICAgICByZXEuZmxhc2goJ3ByZXZpb3VzRm9ybURhdGEnLCByZXEuYm9keSk7XG4gICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgfVxuICAgICAgICAgICAgbmV4dCgpO1xuICAgICAgICB9KTtcbiAgICB9XG5cbiAgICBwdWJsaWMgYXN5bmMgc3RvcCgpOiBQcm9taXNlPHZvaWQ+IHtcbiAgICB9XG5cbn0iXX0= \ No newline at end of file diff --git a/dist/components/LogRequestsComponent.d.ts b/dist/components/LogRequestsComponent.d.ts deleted file mode 100644 index c043dc4..0000000 --- a/dist/components/LogRequestsComponent.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import ApplicationComponent from "../ApplicationComponent"; -import { Express, Router } from "express"; -export default class LogRequestsComponent extends ApplicationComponent { - start(app: Express, router: Router): Promise; - stop(): Promise; -} diff --git a/dist/components/LogRequestsComponent.js b/dist/components/LogRequestsComponent.js deleted file mode 100644 index 2d5ea22..0000000 --- a/dist/components/LogRequestsComponent.js +++ /dev/null @@ -1,31 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -import ApplicationComponent from "../ApplicationComponent"; -import onFinished from "on-finished"; -import Logger from "../Logger"; -export default class LogRequestsComponent extends ApplicationComponent { - start(app, router) { - return __awaiter(this, void 0, void 0, function* () { - router.use((req, res, next) => { - onFinished(res, (err) => { - if (!err) { - Logger.info(`${req.method} ${req.originalUrl} - ${res.statusCode}`); - } - }); - next(); - }); - }); - } - stop() { - return __awaiter(this, void 0, void 0, function* () { - }); - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nUmVxdWVzdHNDb21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiLi8iLCJzb3VyY2VzIjpbImNvbXBvbmVudHMvTG9nUmVxdWVzdHNDb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsT0FBTyxvQkFBb0IsTUFBTSx5QkFBeUIsQ0FBQztBQUMzRCxPQUFPLFVBQVUsTUFBTSxhQUFhLENBQUM7QUFDckMsT0FBTyxNQUFNLE1BQU0sV0FBVyxDQUFDO0FBRy9CLE1BQU0sQ0FBQyxPQUFPLE9BQU8sb0JBQXFCLFNBQVEsb0JBQTBCO0lBQzNELEtBQUssQ0FBQyxHQUFZLEVBQUUsTUFBYzs7WUFDM0MsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFFLEVBQUU7Z0JBQzFCLFVBQVUsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxHQUFHLEVBQUUsRUFBRTtvQkFDcEIsSUFBSSxDQUFDLEdBQUcsRUFBRTt3QkFDTixNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsR0FBRyxDQUFDLE1BQU0sSUFBSSxHQUFHLENBQUMsV0FBVyxNQUFNLEdBQUcsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFDO3FCQUN2RTtnQkFDTCxDQUFDLENBQUMsQ0FBQztnQkFDSCxJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1AsQ0FBQztLQUFBO0lBRVksSUFBSTs7UUFDakIsQ0FBQztLQUFBO0NBRUoiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgQXBwbGljYXRpb25Db21wb25lbnQgZnJvbSBcIi4uL0FwcGxpY2F0aW9uQ29tcG9uZW50XCI7XG5pbXBvcnQgb25GaW5pc2hlZCBmcm9tIFwib24tZmluaXNoZWRcIjtcbmltcG9ydCBMb2dnZXIgZnJvbSBcIi4uL0xvZ2dlclwiO1xuaW1wb3J0IHtFeHByZXNzLCBSb3V0ZXJ9IGZyb20gXCJleHByZXNzXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIExvZ1JlcXVlc3RzQ29tcG9uZW50IGV4dGVuZHMgQXBwbGljYXRpb25Db21wb25lbnQ8dm9pZD4ge1xuICAgIHB1YmxpYyBhc3luYyBzdGFydChhcHA6IEV4cHJlc3MsIHJvdXRlcjogUm91dGVyKTogUHJvbWlzZTx2b2lkPiB7XG4gICAgICAgIHJvdXRlci51c2UoKHJlcSwgcmVzLCBuZXh0KSA9PiB7XG4gICAgICAgICAgICBvbkZpbmlzaGVkKHJlcywgKGVycikgPT4ge1xuICAgICAgICAgICAgICAgIGlmICghZXJyKSB7XG4gICAgICAgICAgICAgICAgICAgIExvZ2dlci5pbmZvKGAke3JlcS5tZXRob2R9ICR7cmVxLm9yaWdpbmFsVXJsfSAtICR7cmVzLnN0YXR1c0NvZGV9YCk7XG4gICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgfSk7XG4gICAgICAgICAgICBuZXh0KCk7XG4gICAgICAgIH0pO1xuICAgIH1cblxuICAgIHB1YmxpYyBhc3luYyBzdG9wKCk6IFByb21pc2U8dm9pZD4ge1xuICAgIH1cblxufSJdfQ== \ No newline at end of file diff --git a/dist/components/MailComponent.d.ts b/dist/components/MailComponent.d.ts deleted file mode 100644 index d708d33..0000000 --- a/dist/components/MailComponent.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import ApplicationComponent from "../ApplicationComponent"; -import { Express, Router } from "express"; -export default class MailComponent extends ApplicationComponent { - start(app: Express, router: Router): Promise; - stop(): Promise; -} diff --git a/dist/components/MailComponent.js b/dist/components/MailComponent.js deleted file mode 100644 index 1cd2a88..0000000 --- a/dist/components/MailComponent.js +++ /dev/null @@ -1,24 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -import ApplicationComponent from "../ApplicationComponent"; -import Mail from "../Mail"; -export default class MailComponent extends ApplicationComponent { - start(app, router) { - return __awaiter(this, void 0, void 0, function* () { - yield this.prepare('Mail connection', () => Mail.prepare()); - }); - } - stop() { - return __awaiter(this, void 0, void 0, function* () { - Mail.end(); - }); - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWFpbENvbXBvbmVudC5qcyIsInNvdXJjZVJvb3QiOiIuLyIsInNvdXJjZXMiOlsiY29tcG9uZW50cy9NYWlsQ29tcG9uZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sb0JBQW9CLE1BQU0seUJBQXlCLENBQUM7QUFFM0QsT0FBTyxJQUFJLE1BQU0sU0FBUyxDQUFDO0FBRTNCLE1BQU0sQ0FBQyxPQUFPLE9BQU8sYUFBYyxTQUFRLG9CQUEwQjtJQUNwRCxLQUFLLENBQUMsR0FBWSxFQUFFLE1BQWM7O1lBQzNDLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxpQkFBaUIsRUFBRSxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztRQUNoRSxDQUFDO0tBQUE7SUFFWSxJQUFJOztZQUNiLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUNmLENBQUM7S0FBQTtDQUVKIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IEFwcGxpY2F0aW9uQ29tcG9uZW50IGZyb20gXCIuLi9BcHBsaWNhdGlvbkNvbXBvbmVudFwiO1xuaW1wb3J0IHtFeHByZXNzLCBSb3V0ZXJ9IGZyb20gXCJleHByZXNzXCI7XG5pbXBvcnQgTWFpbCBmcm9tIFwiLi4vTWFpbFwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBNYWlsQ29tcG9uZW50IGV4dGVuZHMgQXBwbGljYXRpb25Db21wb25lbnQ8dm9pZD4ge1xuICAgIHB1YmxpYyBhc3luYyBzdGFydChhcHA6IEV4cHJlc3MsIHJvdXRlcjogUm91dGVyKTogUHJvbWlzZTx2b2lkPiB7XG4gICAgICAgIGF3YWl0IHRoaXMucHJlcGFyZSgnTWFpbCBjb25uZWN0aW9uJywgKCkgPT4gTWFpbC5wcmVwYXJlKCkpO1xuICAgIH1cblxuICAgIHB1YmxpYyBhc3luYyBzdG9wKCk6IFByb21pc2U8dm9pZD4ge1xuICAgICAgICBNYWlsLmVuZCgpO1xuICAgIH1cblxufSJdfQ== \ No newline at end of file diff --git a/dist/components/MaintenanceComponent.d.ts b/dist/components/MaintenanceComponent.d.ts deleted file mode 100644 index 01fc5a7..0000000 --- a/dist/components/MaintenanceComponent.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import ApplicationComponent from "../ApplicationComponent"; -import { Express, Router } from "express"; -import Application from "../Application"; -export default class MaintenanceComponent extends ApplicationComponent { - private readonly application; - private readonly canServe; - constructor(application: Application, canServe: () => boolean); - start(app: Express, router: Router): Promise; - stop(): Promise; -} diff --git a/dist/components/MaintenanceComponent.js b/dist/components/MaintenanceComponent.js deleted file mode 100644 index b590313..0000000 --- a/dist/components/MaintenanceComponent.js +++ /dev/null @@ -1,42 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -import ApplicationComponent from "../ApplicationComponent"; -import { ServiceUnavailableHttpError } from "../HttpError"; -export default class MaintenanceComponent extends ApplicationComponent { - constructor(application, canServe) { - super(); - this.application = application; - this.canServe = canServe; - } - start(app, router) { - return __awaiter(this, void 0, void 0, function* () { - router.use((req, res, next) => { - if (res.headersSent) { - return next(); - } - if (!this.application.isReady()) { - res.header({ 'Retry-After': 60 }); - res.locals.refresh_after = 5; - throw new ServiceUnavailableHttpError('Watch My Stream is readying up. Please wait a few seconds...'); - } - if (!this.canServe()) { - res.locals.refresh_after = 30; - throw new ServiceUnavailableHttpError('Watch My Stream is unavailable due to failure of dependent services.'); - } - next(); - }); - }); - } - stop() { - return __awaiter(this, void 0, void 0, function* () { - }); - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWFpbnRlbmFuY2VDb21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiLi8iLCJzb3VyY2VzIjpbImNvbXBvbmVudHMvTWFpbnRlbmFuY2VDb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsT0FBTyxvQkFBb0IsTUFBTSx5QkFBeUIsQ0FBQztBQUUzRCxPQUFPLEVBQUMsMkJBQTJCLEVBQUMsTUFBTSxjQUFjLENBQUM7QUFHekQsTUFBTSxDQUFDLE9BQU8sT0FBTyxvQkFBcUIsU0FBUSxvQkFBMEI7SUFJeEUsWUFBWSxXQUF3QixFQUFFLFFBQXVCO1FBQ3pELEtBQUssRUFBRSxDQUFDO1FBQ1IsSUFBSSxDQUFDLFdBQVcsR0FBRyxXQUFXLENBQUM7UUFDL0IsSUFBSSxDQUFDLFFBQVEsR0FBRyxRQUFRLENBQUM7SUFDN0IsQ0FBQztJQUVZLEtBQUssQ0FBQyxHQUFZLEVBQUUsTUFBYzs7WUFDM0MsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQVksRUFBRSxHQUFhLEVBQUUsSUFBa0IsRUFBRSxFQUFFO2dCQUMzRCxJQUFJLEdBQUcsQ0FBQyxXQUFXLEVBQUU7b0JBQ2pCLE9BQU8sSUFBSSxFQUFFLENBQUM7aUJBQ2pCO2dCQUVELElBQUksQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sRUFBRSxFQUFFO29CQUM3QixHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUMsYUFBYSxFQUFFLEVBQUUsRUFBQyxDQUFDLENBQUM7b0JBQ2hDLEdBQUcsQ0FBQyxNQUFNLENBQUMsYUFBYSxHQUFHLENBQUMsQ0FBQztvQkFDN0IsTUFBTSxJQUFJLDJCQUEyQixDQUFDLDhEQUE4RCxDQUFDLENBQUM7aUJBQ3pHO2dCQUVELElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLEVBQUU7b0JBQ2xCLEdBQUcsQ0FBQyxNQUFNLENBQUMsYUFBYSxHQUFHLEVBQUUsQ0FBQztvQkFDOUIsTUFBTSxJQUFJLDJCQUEyQixDQUFDLHNFQUFzRSxDQUFDLENBQUM7aUJBQ2pIO2dCQUVELElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDUCxDQUFDO0tBQUE7SUFFWSxJQUFJOztRQUNqQixDQUFDO0tBQUE7Q0FFSiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBBcHBsaWNhdGlvbkNvbXBvbmVudCBmcm9tIFwiLi4vQXBwbGljYXRpb25Db21wb25lbnRcIjtcbmltcG9ydCB7RXhwcmVzcywgTmV4dEZ1bmN0aW9uLCBSZXF1ZXN0LCBSZXNwb25zZSwgUm91dGVyfSBmcm9tIFwiZXhwcmVzc1wiO1xuaW1wb3J0IHtTZXJ2aWNlVW5hdmFpbGFibGVIdHRwRXJyb3J9IGZyb20gXCIuLi9IdHRwRXJyb3JcIjtcbmltcG9ydCBBcHBsaWNhdGlvbiBmcm9tIFwiLi4vQXBwbGljYXRpb25cIjtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgTWFpbnRlbmFuY2VDb21wb25lbnQgZXh0ZW5kcyBBcHBsaWNhdGlvbkNvbXBvbmVudDx2b2lkPiB7XG4gICAgcHJpdmF0ZSByZWFkb25seSBhcHBsaWNhdGlvbjogQXBwbGljYXRpb247XG4gICAgcHJpdmF0ZSByZWFkb25seSBjYW5TZXJ2ZTogKCkgPT4gYm9vbGVhbjtcblxuICAgIGNvbnN0cnVjdG9yKGFwcGxpY2F0aW9uOiBBcHBsaWNhdGlvbiwgY2FuU2VydmU6ICgpID0+IGJvb2xlYW4pIHtcbiAgICAgICAgc3VwZXIoKTtcbiAgICAgICAgdGhpcy5hcHBsaWNhdGlvbiA9IGFwcGxpY2F0aW9uO1xuICAgICAgICB0aGlzLmNhblNlcnZlID0gY2FuU2VydmU7XG4gICAgfVxuXG4gICAgcHVibGljIGFzeW5jIHN0YXJ0KGFwcDogRXhwcmVzcywgcm91dGVyOiBSb3V0ZXIpOiBQcm9taXNlPHZvaWQ+IHtcbiAgICAgICAgcm91dGVyLnVzZSgocmVxOiBSZXF1ZXN0LCByZXM6IFJlc3BvbnNlLCBuZXh0OiBOZXh0RnVuY3Rpb24pID0+IHtcbiAgICAgICAgICAgIGlmIChyZXMuaGVhZGVyc1NlbnQpIHtcbiAgICAgICAgICAgICAgICByZXR1cm4gbmV4dCgpO1xuICAgICAgICAgICAgfVxuXG4gICAgICAgICAgICBpZiAoIXRoaXMuYXBwbGljYXRpb24uaXNSZWFkeSgpKSB7XG4gICAgICAgICAgICAgICAgcmVzLmhlYWRlcih7J1JldHJ5LUFmdGVyJzogNjB9KTtcbiAgICAgICAgICAgICAgICByZXMubG9jYWxzLnJlZnJlc2hfYWZ0ZXIgPSA1O1xuICAgICAgICAgICAgICAgIHRocm93IG5ldyBTZXJ2aWNlVW5hdmFpbGFibGVIdHRwRXJyb3IoJ1dhdGNoIE15IFN0cmVhbSBpcyByZWFkeWluZyB1cC4gUGxlYXNlIHdhaXQgYSBmZXcgc2Vjb25kcy4uLicpO1xuICAgICAgICAgICAgfVxuXG4gICAgICAgICAgICBpZiAoIXRoaXMuY2FuU2VydmUoKSkge1xuICAgICAgICAgICAgICAgIHJlcy5sb2NhbHMucmVmcmVzaF9hZnRlciA9IDMwO1xuICAgICAgICAgICAgICAgIHRocm93IG5ldyBTZXJ2aWNlVW5hdmFpbGFibGVIdHRwRXJyb3IoJ1dhdGNoIE15IFN0cmVhbSBpcyB1bmF2YWlsYWJsZSBkdWUgdG8gZmFpbHVyZSBvZiBkZXBlbmRlbnQgc2VydmljZXMuJyk7XG4gICAgICAgICAgICB9XG5cbiAgICAgICAgICAgIG5leHQoKTtcbiAgICAgICAgfSk7XG4gICAgfVxuXG4gICAgcHVibGljIGFzeW5jIHN0b3AoKTogUHJvbWlzZTx2b2lkPiB7XG4gICAgfVxuXG59Il19 \ No newline at end of file diff --git a/dist/components/MysqlComponent.d.ts b/dist/components/MysqlComponent.d.ts deleted file mode 100644 index 2b1fd92..0000000 --- a/dist/components/MysqlComponent.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import ApplicationComponent from "../ApplicationComponent"; -import { Express, Router } from "express"; -export default class MysqlComponent extends ApplicationComponent { - start(app: Express, router: Router): Promise; - stop(): Promise; - canServe(): boolean; -} diff --git a/dist/components/MysqlComponent.js b/dist/components/MysqlComponent.js deleted file mode 100644 index 7c7816d..0000000 --- a/dist/components/MysqlComponent.js +++ /dev/null @@ -1,27 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -import ApplicationComponent from "../ApplicationComponent"; -import MysqlConnectionManager from "../db/MysqlConnectionManager"; -export default class MysqlComponent extends ApplicationComponent { - start(app, router) { - return __awaiter(this, void 0, void 0, function* () { - yield this.prepare('Mysql connection', () => MysqlConnectionManager.prepare()); - }); - } - stop() { - return __awaiter(this, void 0, void 0, function* () { - yield MysqlConnectionManager.endPool(); - }); - } - canServe() { - return MysqlConnectionManager.pool !== undefined; - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTXlzcWxDb21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiLi8iLCJzb3VyY2VzIjpbImNvbXBvbmVudHMvTXlzcWxDb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsT0FBTyxvQkFBb0IsTUFBTSx5QkFBeUIsQ0FBQztBQUUzRCxPQUFPLHNCQUFzQixNQUFNLDhCQUE4QixDQUFDO0FBRWxFLE1BQU0sQ0FBQyxPQUFPLE9BQU8sY0FBZSxTQUFRLG9CQUEwQjtJQUNyRCxLQUFLLENBQUMsR0FBWSxFQUFFLE1BQWM7O1lBQzNDLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxrQkFBa0IsRUFBRSxHQUFHLEVBQUUsQ0FBQyxzQkFBc0IsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO1FBQ25GLENBQUM7S0FBQTtJQUVZLElBQUk7O1lBQ2IsTUFBTSxzQkFBc0IsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUMzQyxDQUFDO0tBQUE7SUFFTSxRQUFRO1FBQ1gsT0FBTyxzQkFBc0IsQ0FBQyxJQUFJLEtBQUssU0FBUyxDQUFDO0lBQ3JELENBQUM7Q0FFSiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBBcHBsaWNhdGlvbkNvbXBvbmVudCBmcm9tIFwiLi4vQXBwbGljYXRpb25Db21wb25lbnRcIjtcbmltcG9ydCB7RXhwcmVzcywgUm91dGVyfSBmcm9tIFwiZXhwcmVzc1wiO1xuaW1wb3J0IE15c3FsQ29ubmVjdGlvbk1hbmFnZXIgZnJvbSBcIi4uL2RiL015c3FsQ29ubmVjdGlvbk1hbmFnZXJcIjtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgTXlzcWxDb21wb25lbnQgZXh0ZW5kcyBBcHBsaWNhdGlvbkNvbXBvbmVudDx2b2lkPiB7XG4gICAgcHVibGljIGFzeW5jIHN0YXJ0KGFwcDogRXhwcmVzcywgcm91dGVyOiBSb3V0ZXIpOiBQcm9taXNlPHZvaWQ+IHtcbiAgICAgICAgYXdhaXQgdGhpcy5wcmVwYXJlKCdNeXNxbCBjb25uZWN0aW9uJywgKCkgPT4gTXlzcWxDb25uZWN0aW9uTWFuYWdlci5wcmVwYXJlKCkpO1xuICAgIH1cblxuICAgIHB1YmxpYyBhc3luYyBzdG9wKCk6IFByb21pc2U8dm9pZD4ge1xuICAgICAgICBhd2FpdCBNeXNxbENvbm5lY3Rpb25NYW5hZ2VyLmVuZFBvb2woKTtcbiAgICB9XG5cbiAgICBwdWJsaWMgY2FuU2VydmUoKTogYm9vbGVhbiB7XG4gICAgICAgIHJldHVybiBNeXNxbENvbm5lY3Rpb25NYW5hZ2VyLnBvb2wgIT09IHVuZGVmaW5lZDtcbiAgICB9XG5cbn0iXX0= \ No newline at end of file diff --git a/dist/components/RedirectBackComponent.d.ts b/dist/components/RedirectBackComponent.d.ts deleted file mode 100644 index 1958ecb..0000000 --- a/dist/components/RedirectBackComponent.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import ApplicationComponent from "../ApplicationComponent"; -import { Express, Router } from "express"; -export default class RedirectBackComponent extends ApplicationComponent { - start(app: Express, router: Router): Promise; - stop(): Promise; -} diff --git a/dist/components/RedirectBackComponent.js b/dist/components/RedirectBackComponent.js deleted file mode 100644 index 20364e0..0000000 --- a/dist/components/RedirectBackComponent.js +++ /dev/null @@ -1,52 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -import ApplicationComponent from "../ApplicationComponent"; -import onFinished from "on-finished"; -import Logger from "../Logger"; -import { ServerError } from "../HttpError"; -export default class RedirectBackComponent extends ApplicationComponent { - start(app, router) { - return __awaiter(this, void 0, void 0, function* () { - router.use((req, res, next) => { - if (!req.session) { - throw new Error('Session is unavailable.'); - } - onFinished(res, (err) => { - if (!err && res.statusCode === 200) { - req.session.previousUrl = req.originalUrl; - Logger.debug('Prev url set to', req.session.previousUrl); - req.session.save((err) => { - if (err) { - Logger.error(err, 'Error while saving session'); - } - }); - } - }); - res.redirectBack = (defaultUrl) => { - if (req.session && typeof req.session.previousUrl === 'string') { - res.redirect(req.session.previousUrl); - } - else if (typeof defaultUrl === 'string') { - res.redirect(defaultUrl); - } - else { - throw new ServerError('There is no previous url and no default redirection url was provided.'); - } - }; - next(); - }); - }); - } - stop() { - return __awaiter(this, void 0, void 0, function* () { - }); - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVkaXJlY3RCYWNrQ29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6Ii4vIiwic291cmNlcyI6WyJjb21wb25lbnRzL1JlZGlyZWN0QmFja0NvbXBvbmVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLG9CQUFvQixNQUFNLHlCQUF5QixDQUFDO0FBRTNELE9BQU8sVUFBVSxNQUFNLGFBQWEsQ0FBQztBQUNyQyxPQUFPLE1BQU0sTUFBTSxXQUFXLENBQUM7QUFDL0IsT0FBTyxFQUFDLFdBQVcsRUFBQyxNQUFNLGNBQWMsQ0FBQztBQUV6QyxNQUFNLENBQUMsT0FBTyxPQUFPLHFCQUFzQixTQUFRLG9CQUEwQjtJQUM1RCxLQUFLLENBQUMsR0FBWSxFQUFFLE1BQWM7O1lBQzNDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFLElBQUksRUFBRSxFQUFFO2dCQUMxQixJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRTtvQkFDZCxNQUFNLElBQUksS0FBSyxDQUFDLHlCQUF5QixDQUFDLENBQUM7aUJBQzlDO2dCQUVELFVBQVUsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxHQUFHLEVBQUUsRUFBRTtvQkFDcEIsSUFBSSxDQUFDLEdBQUcsSUFBSSxHQUFHLENBQUMsVUFBVSxLQUFLLEdBQUcsRUFBRTt3QkFDaEMsR0FBRyxDQUFDLE9BQVEsQ0FBQyxXQUFXLEdBQUcsR0FBRyxDQUFDLFdBQVcsQ0FBQzt3QkFDM0MsTUFBTSxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsRUFBRSxHQUFHLENBQUMsT0FBUSxDQUFDLFdBQVcsQ0FBQyxDQUFDO3dCQUMxRCxHQUFHLENBQUMsT0FBUSxDQUFDLElBQUksQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFOzRCQUN0QixJQUFJLEdBQUcsRUFBRTtnQ0FDTCxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSw0QkFBNEIsQ0FBQyxDQUFDOzZCQUNuRDt3QkFDTCxDQUFDLENBQUMsQ0FBQztxQkFDTjtnQkFDTCxDQUFDLENBQUMsQ0FBQztnQkFFSCxHQUFHLENBQUMsWUFBWSxHQUFHLENBQUMsVUFBbUIsRUFBRSxFQUFFO29CQUN2QyxJQUFJLEdBQUcsQ0FBQyxPQUFPLElBQUksT0FBTyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsS0FBSyxRQUFRLEVBQUU7d0JBQzVELEdBQUcsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztxQkFDekM7eUJBQU0sSUFBSSxPQUFPLFVBQVUsS0FBSyxRQUFRLEVBQUU7d0JBQ3ZDLEdBQUcsQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLENBQUM7cUJBQzVCO3lCQUFNO3dCQUNILE1BQU0sSUFBSSxXQUFXLENBQUMsdUVBQXVFLENBQUMsQ0FBQztxQkFDbEc7Z0JBQ0wsQ0FBQyxDQUFDO2dCQUVGLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDUCxDQUFDO0tBQUE7SUFFWSxJQUFJOztRQUNqQixDQUFDO0tBQUE7Q0FFSiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBBcHBsaWNhdGlvbkNvbXBvbmVudCBmcm9tIFwiLi4vQXBwbGljYXRpb25Db21wb25lbnRcIjtcbmltcG9ydCB7RXhwcmVzcywgUm91dGVyfSBmcm9tIFwiZXhwcmVzc1wiO1xuaW1wb3J0IG9uRmluaXNoZWQgZnJvbSBcIm9uLWZpbmlzaGVkXCI7XG5pbXBvcnQgTG9nZ2VyIGZyb20gXCIuLi9Mb2dnZXJcIjtcbmltcG9ydCB7U2VydmVyRXJyb3J9IGZyb20gXCIuLi9IdHRwRXJyb3JcIjtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgUmVkaXJlY3RCYWNrQ29tcG9uZW50IGV4dGVuZHMgQXBwbGljYXRpb25Db21wb25lbnQ8dm9pZD4ge1xuICAgIHB1YmxpYyBhc3luYyBzdGFydChhcHA6IEV4cHJlc3MsIHJvdXRlcjogUm91dGVyKTogUHJvbWlzZTx2b2lkPiB7XG4gICAgICAgIHJvdXRlci51c2UoKHJlcSwgcmVzLCBuZXh0KSA9PiB7XG4gICAgICAgICAgICBpZiAoIXJlcS5zZXNzaW9uKSB7XG4gICAgICAgICAgICAgICAgdGhyb3cgbmV3IEVycm9yKCdTZXNzaW9uIGlzIHVuYXZhaWxhYmxlLicpO1xuICAgICAgICAgICAgfVxuXG4gICAgICAgICAgICBvbkZpbmlzaGVkKHJlcywgKGVycikgPT4ge1xuICAgICAgICAgICAgICAgIGlmICghZXJyICYmIHJlcy5zdGF0dXNDb2RlID09PSAyMDApIHtcbiAgICAgICAgICAgICAgICAgICAgcmVxLnNlc3Npb24hLnByZXZpb3VzVXJsID0gcmVxLm9yaWdpbmFsVXJsO1xuICAgICAgICAgICAgICAgICAgICBMb2dnZXIuZGVidWcoJ1ByZXYgdXJsIHNldCB0bycsIHJlcS5zZXNzaW9uIS5wcmV2aW91c1VybCk7XG4gICAgICAgICAgICAgICAgICAgIHJlcS5zZXNzaW9uIS5zYXZlKChlcnIpID0+IHtcbiAgICAgICAgICAgICAgICAgICAgICAgIGlmIChlcnIpIHtcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICBMb2dnZXIuZXJyb3IoZXJyLCAnRXJyb3Igd2hpbGUgc2F2aW5nIHNlc3Npb24nKTtcbiAgICAgICAgICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgICAgICAgICAgfSk7XG4gICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgfSk7XG5cbiAgICAgICAgICAgIHJlcy5yZWRpcmVjdEJhY2sgPSAoZGVmYXVsdFVybD86IHN0cmluZykgPT4ge1xuICAgICAgICAgICAgICAgIGlmIChyZXEuc2Vzc2lvbiAmJiB0eXBlb2YgcmVxLnNlc3Npb24ucHJldmlvdXNVcmwgPT09ICdzdHJpbmcnKSB7XG4gICAgICAgICAgICAgICAgICAgIHJlcy5yZWRpcmVjdChyZXEuc2Vzc2lvbi5wcmV2aW91c1VybCk7XG4gICAgICAgICAgICAgICAgfSBlbHNlIGlmICh0eXBlb2YgZGVmYXVsdFVybCA9PT0gJ3N0cmluZycpIHtcbiAgICAgICAgICAgICAgICAgICAgcmVzLnJlZGlyZWN0KGRlZmF1bHRVcmwpO1xuICAgICAgICAgICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICAgICAgICAgIHRocm93IG5ldyBTZXJ2ZXJFcnJvcignVGhlcmUgaXMgbm8gcHJldmlvdXMgdXJsIGFuZCBubyBkZWZhdWx0IHJlZGlyZWN0aW9uIHVybCB3YXMgcHJvdmlkZWQuJyk7XG4gICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgfTtcblxuICAgICAgICAgICAgbmV4dCgpO1xuICAgICAgICB9KTtcbiAgICB9XG5cbiAgICBwdWJsaWMgYXN5bmMgc3RvcCgpOiBQcm9taXNlPHZvaWQ+IHtcbiAgICB9XG5cbn0iXX0= \ No newline at end of file diff --git a/dist/components/RedisComponent.d.ts b/dist/components/RedisComponent.d.ts deleted file mode 100644 index 4e16e68..0000000 --- a/dist/components/RedisComponent.d.ts +++ /dev/null @@ -1,11 +0,0 @@ -import ApplicationComponent from "../ApplicationComponent"; -import { Express, Router } from "express"; -import { Store } from "express-session"; -export default class RedisComponent extends ApplicationComponent { - private redisClient?; - private store?; - start(app: Express, router: Router): Promise; - stop(): Promise; - getStore(): Store; - canServe(): boolean; -} diff --git a/dist/components/RedisComponent.js b/dist/components/RedisComponent.js deleted file mode 100644 index a6a9d5f..0000000 --- a/dist/components/RedisComponent.js +++ /dev/null @@ -1,46 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -import ApplicationComponent from "../ApplicationComponent"; -import redis from "redis"; -import config from "config"; -import Logger from "../Logger"; -import session from "express-session"; -import connect_redis from "connect-redis"; -const RedisStore = connect_redis(session); -export default class RedisComponent extends ApplicationComponent { - start(app, router) { - return __awaiter(this, void 0, void 0, function* () { - this.redisClient = redis.createClient(config.get('redis.port'), config.get('redis.host'), {}); - this.redisClient.on('error', (err) => { - Logger.error(err, 'An error occurred with redis.'); - }); - this.store = new RedisStore({ - client: this.redisClient, - prefix: 'wms-sess:', - }); - }); - } - stop() { - return __awaiter(this, void 0, void 0, function* () { - if (this.redisClient) { - yield this.close('Redis connection', this.redisClient, this.redisClient.quit); - } - }); - } - getStore() { - if (!this.store) - throw `Redis store was not initialized.`; - return this.store; - } - canServe() { - return this.redisClient !== undefined && this.redisClient.connected; - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVkaXNDb21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiLi8iLCJzb3VyY2VzIjpbImNvbXBvbmVudHMvUmVkaXNDb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsT0FBTyxvQkFBb0IsTUFBTSx5QkFBeUIsQ0FBQztBQUUzRCxPQUFPLEtBQW9CLE1BQU0sT0FBTyxDQUFDO0FBQ3pDLE9BQU8sTUFBTSxNQUFNLFFBQVEsQ0FBQztBQUM1QixPQUFPLE1BQU0sTUFBTSxXQUFXLENBQUM7QUFDL0IsT0FBTyxPQUFnQixNQUFNLGlCQUFpQixDQUFDO0FBQy9DLE9BQU8sYUFBYSxNQUFNLGVBQWUsQ0FBQztBQUUxQyxNQUFNLFVBQVUsR0FBRyxhQUFhLENBQUMsT0FBTyxDQUFDLENBQUM7QUFFMUMsTUFBTSxDQUFDLE9BQU8sT0FBTyxjQUFlLFNBQVEsb0JBQTBCO0lBSXJELEtBQUssQ0FBQyxHQUFZLEVBQUUsTUFBYzs7WUFDM0MsSUFBSSxDQUFDLFdBQVcsR0FBRyxLQUFLLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztZQUM5RixJQUFJLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxHQUFRLEVBQUUsRUFBRTtnQkFDdEMsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsK0JBQStCLENBQUMsQ0FBQztZQUN2RCxDQUFDLENBQUMsQ0FBQztZQUNILElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxVQUFVLENBQUM7Z0JBQ3hCLE1BQU0sRUFBRSxJQUFJLENBQUMsV0FBVztnQkFDeEIsTUFBTSxFQUFFLFdBQVc7YUFDdEIsQ0FBQyxDQUFDO1FBQ1AsQ0FBQztLQUFBO0lBRVksSUFBSTs7WUFDYixJQUFJLElBQUksQ0FBQyxXQUFXLEVBQUU7Z0JBQ2xCLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxrQkFBa0IsRUFBRSxJQUFJLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLENBQUM7YUFDakY7UUFDTCxDQUFDO0tBQUE7SUFFTSxRQUFRO1FBQ1gsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLO1lBQUUsTUFBTSxrQ0FBa0MsQ0FBQztRQUMxRCxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUM7SUFDdEIsQ0FBQztJQUVNLFFBQVE7UUFDWCxPQUFPLElBQUksQ0FBQyxXQUFXLEtBQUssU0FBUyxJQUFJLElBQUksQ0FBQyxXQUFXLENBQUMsU0FBUyxDQUFDO0lBQ3hFLENBQUM7Q0FDSiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBBcHBsaWNhdGlvbkNvbXBvbmVudCBmcm9tIFwiLi4vQXBwbGljYXRpb25Db21wb25lbnRcIjtcbmltcG9ydCB7RXhwcmVzcywgUm91dGVyfSBmcm9tIFwiZXhwcmVzc1wiO1xuaW1wb3J0IHJlZGlzLCB7UmVkaXNDbGllbnR9IGZyb20gXCJyZWRpc1wiO1xuaW1wb3J0IGNvbmZpZyBmcm9tIFwiY29uZmlnXCI7XG5pbXBvcnQgTG9nZ2VyIGZyb20gXCIuLi9Mb2dnZXJcIjtcbmltcG9ydCBzZXNzaW9uLCB7U3RvcmV9IGZyb20gXCJleHByZXNzLXNlc3Npb25cIjtcbmltcG9ydCBjb25uZWN0X3JlZGlzIGZyb20gXCJjb25uZWN0LXJlZGlzXCI7XG5cbmNvbnN0IFJlZGlzU3RvcmUgPSBjb25uZWN0X3JlZGlzKHNlc3Npb24pO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBSZWRpc0NvbXBvbmVudCBleHRlbmRzIEFwcGxpY2F0aW9uQ29tcG9uZW50PHZvaWQ+IHtcbiAgICBwcml2YXRlIHJlZGlzQ2xpZW50PzogUmVkaXNDbGllbnQ7XG4gICAgcHJpdmF0ZSBzdG9yZT86IFN0b3JlO1xuXG4gICAgcHVibGljIGFzeW5jIHN0YXJ0KGFwcDogRXhwcmVzcywgcm91dGVyOiBSb3V0ZXIpOiBQcm9taXNlPHZvaWQ+IHtcbiAgICAgICAgdGhpcy5yZWRpc0NsaWVudCA9IHJlZGlzLmNyZWF0ZUNsaWVudChjb25maWcuZ2V0KCdyZWRpcy5wb3J0JyksIGNvbmZpZy5nZXQoJ3JlZGlzLmhvc3QnKSwge30pO1xuICAgICAgICB0aGlzLnJlZGlzQ2xpZW50Lm9uKCdlcnJvcicsIChlcnI6IGFueSkgPT4ge1xuICAgICAgICAgICAgTG9nZ2VyLmVycm9yKGVyciwgJ0FuIGVycm9yIG9jY3VycmVkIHdpdGggcmVkaXMuJyk7XG4gICAgICAgIH0pO1xuICAgICAgICB0aGlzLnN0b3JlID0gbmV3IFJlZGlzU3RvcmUoe1xuICAgICAgICAgICAgY2xpZW50OiB0aGlzLnJlZGlzQ2xpZW50LFxuICAgICAgICAgICAgcHJlZml4OiAnd21zLXNlc3M6JyxcbiAgICAgICAgfSk7XG4gICAgfVxuXG4gICAgcHVibGljIGFzeW5jIHN0b3AoKTogUHJvbWlzZTx2b2lkPiB7XG4gICAgICAgIGlmICh0aGlzLnJlZGlzQ2xpZW50KSB7XG4gICAgICAgICAgICBhd2FpdCB0aGlzLmNsb3NlKCdSZWRpcyBjb25uZWN0aW9uJywgdGhpcy5yZWRpc0NsaWVudCwgdGhpcy5yZWRpc0NsaWVudC5xdWl0KTtcbiAgICAgICAgfVxuICAgIH1cblxuICAgIHB1YmxpYyBnZXRTdG9yZSgpOiBTdG9yZSB7XG4gICAgICAgIGlmICghdGhpcy5zdG9yZSkgdGhyb3cgYFJlZGlzIHN0b3JlIHdhcyBub3QgaW5pdGlhbGl6ZWQuYDtcbiAgICAgICAgcmV0dXJuIHRoaXMuc3RvcmU7XG4gICAgfVxuXG4gICAgcHVibGljIGNhblNlcnZlKCk6IGJvb2xlYW4ge1xuICAgICAgICByZXR1cm4gdGhpcy5yZWRpc0NsaWVudCAhPT0gdW5kZWZpbmVkICYmIHRoaXMucmVkaXNDbGllbnQuY29ubmVjdGVkO1xuICAgIH1cbn0iXX0= \ No newline at end of file diff --git a/dist/components/ServeStaticDirectoryComponent.d.ts b/dist/components/ServeStaticDirectoryComponent.d.ts deleted file mode 100644 index ca770b3..0000000 --- a/dist/components/ServeStaticDirectoryComponent.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import ApplicationComponent from "../ApplicationComponent"; -import { Express, Router } from "express"; -import { PathParams } from "express-serve-static-core"; -export default class ServeStaticDirectoryComponent extends ApplicationComponent { - private readonly root; - private readonly path?; - constructor(root: string, routePath?: PathParams); - start(app: Express, router: Router): Promise; - stop(): Promise; -} diff --git a/dist/components/ServeStaticDirectoryComponent.js b/dist/components/ServeStaticDirectoryComponent.js deleted file mode 100644 index 2ead032..0000000 --- a/dist/components/ServeStaticDirectoryComponent.js +++ /dev/null @@ -1,33 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -import ApplicationComponent from "../ApplicationComponent"; -import express from "express"; -export default class ServeStaticDirectoryComponent extends ApplicationComponent { - constructor(root, routePath) { - super(); - this.root = root; - this.path = routePath; - } - start(app, router) { - return __awaiter(this, void 0, void 0, function* () { - if (typeof this.path !== 'undefined') { - router.use(this.path, express.static(this.root, { maxAge: 1000 * 3600 * 72 })); - } - else { - router.use(express.static(this.root, { maxAge: 1000 * 3600 * 72 })); - } - }); - } - stop() { - return __awaiter(this, void 0, void 0, function* () { - }); - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VydmVTdGF0aWNEaXJlY3RvcnlDb21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiLi8iLCJzb3VyY2VzIjpbImNvbXBvbmVudHMvU2VydmVTdGF0aWNEaXJlY3RvcnlDb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsT0FBTyxvQkFBb0IsTUFBTSx5QkFBeUIsQ0FBQztBQUMzRCxPQUFPLE9BQTBCLE1BQU0sU0FBUyxDQUFDO0FBR2pELE1BQU0sQ0FBQyxPQUFPLE9BQU8sNkJBQThCLFNBQVEsb0JBQTBCO0lBSWpGLFlBQVksSUFBWSxFQUFFLFNBQXNCO1FBQzVDLEtBQUssRUFBRSxDQUFDO1FBQ1IsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7UUFDakIsSUFBSSxDQUFDLElBQUksR0FBRyxTQUFTLENBQUM7SUFDMUIsQ0FBQztJQUVZLEtBQUssQ0FBQyxHQUFZLEVBQUUsTUFBYzs7WUFDM0MsSUFBSSxPQUFPLElBQUksQ0FBQyxJQUFJLEtBQUssV0FBVyxFQUFFO2dCQUNsQyxNQUFNLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLEVBQUMsTUFBTSxFQUFFLElBQUksR0FBRyxJQUFJLEdBQUcsRUFBRSxFQUFDLENBQUMsQ0FBQyxDQUFDO2FBQ2hGO2lCQUFNO2dCQUNILE1BQU0sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLEVBQUMsTUFBTSxFQUFFLElBQUksR0FBRyxJQUFJLEdBQUcsRUFBRSxFQUFDLENBQUMsQ0FBQyxDQUFDO2FBQ3JFO1FBQ0wsQ0FBQztLQUFBO0lBRVksSUFBSTs7UUFDakIsQ0FBQztLQUFBO0NBRUoiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgQXBwbGljYXRpb25Db21wb25lbnQgZnJvbSBcIi4uL0FwcGxpY2F0aW9uQ29tcG9uZW50XCI7XG5pbXBvcnQgZXhwcmVzcywge0V4cHJlc3MsIFJvdXRlcn0gZnJvbSBcImV4cHJlc3NcIjtcbmltcG9ydCB7UGF0aFBhcmFtc30gZnJvbSBcImV4cHJlc3Mtc2VydmUtc3RhdGljLWNvcmVcIjtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgU2VydmVTdGF0aWNEaXJlY3RvcnlDb21wb25lbnQgZXh0ZW5kcyBBcHBsaWNhdGlvbkNvbXBvbmVudDx2b2lkPiB7XG4gICAgcHJpdmF0ZSByZWFkb25seSByb290OiBzdHJpbmc7XG4gICAgcHJpdmF0ZSByZWFkb25seSBwYXRoPzogUGF0aFBhcmFtcztcblxuICAgIGNvbnN0cnVjdG9yKHJvb3Q6IHN0cmluZywgcm91dGVQYXRoPzogUGF0aFBhcmFtcykge1xuICAgICAgICBzdXBlcigpO1xuICAgICAgICB0aGlzLnJvb3QgPSByb290O1xuICAgICAgICB0aGlzLnBhdGggPSByb3V0ZVBhdGg7XG4gICAgfVxuXG4gICAgcHVibGljIGFzeW5jIHN0YXJ0KGFwcDogRXhwcmVzcywgcm91dGVyOiBSb3V0ZXIpOiBQcm9taXNlPHZvaWQ+IHtcbiAgICAgICAgaWYgKHR5cGVvZiB0aGlzLnBhdGggIT09ICd1bmRlZmluZWQnKSB7XG4gICAgICAgICAgICByb3V0ZXIudXNlKHRoaXMucGF0aCwgZXhwcmVzcy5zdGF0aWModGhpcy5yb290LCB7bWF4QWdlOiAxMDAwICogMzYwMCAqIDcyfSkpO1xuICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgICAgcm91dGVyLnVzZShleHByZXNzLnN0YXRpYyh0aGlzLnJvb3QsIHttYXhBZ2U6IDEwMDAgKiAzNjAwICogNzJ9KSk7XG4gICAgICAgIH1cbiAgICB9XG5cbiAgICBwdWJsaWMgYXN5bmMgc3RvcCgpOiBQcm9taXNlPHZvaWQ+IHtcbiAgICB9XG5cbn0iXX0= \ No newline at end of file diff --git a/dist/components/SessionComponent.d.ts b/dist/components/SessionComponent.d.ts deleted file mode 100644 index f2966f4..0000000 --- a/dist/components/SessionComponent.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import ApplicationComponent from "../ApplicationComponent"; -import RedisComponent from "./RedisComponent"; -import { Express, Router } from "express"; -export default class SessionComponent extends ApplicationComponent { - private readonly storeComponent; - constructor(storeComponent: RedisComponent); - start(app: Express, router: Router): Promise; - stop(): Promise; -} diff --git a/dist/components/SessionComponent.js b/dist/components/SessionComponent.js deleted file mode 100644 index 591bbdf..0000000 --- a/dist/components/SessionComponent.js +++ /dev/null @@ -1,59 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -import ApplicationComponent from "../ApplicationComponent"; -import session from "express-session"; -import config from "config"; -import flash from "connect-flash"; -export default class SessionComponent extends ApplicationComponent { - constructor(storeComponent) { - super(); - this.storeComponent = storeComponent; - } - start(app, router) { - return __awaiter(this, void 0, void 0, function* () { - router.use(session({ - saveUninitialized: true, - secret: config.get('session.secret'), - store: this.storeComponent.getStore(), - resave: true, - cookie: { - httpOnly: true, - secure: config.get('session.cookie.secure'), - }, - rolling: true, - })); - router.use(flash()); - router.use((req, res, next) => { - if (!req.session) { - throw new Error('Session is unavailable.'); - } - res.locals.session = req.session; - let _flash = null; - res.locals.flash = () => { - if (!_flash) { - _flash = { - info: req.flash('info'), - success: req.flash('success'), - warning: req.flash('warning'), - error: req.flash('error'), - }; - } - return _flash; - }; - next(); - }); - }); - } - stop() { - return __awaiter(this, void 0, void 0, function* () { - }); - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2Vzc2lvbkNvbXBvbmVudC5qcyIsInNvdXJjZVJvb3QiOiIuLyIsInNvdXJjZXMiOlsiY29tcG9uZW50cy9TZXNzaW9uQ29tcG9uZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sb0JBQW9CLE1BQU0seUJBQXlCLENBQUM7QUFDM0QsT0FBTyxPQUFPLE1BQU0saUJBQWlCLENBQUM7QUFDdEMsT0FBTyxNQUFNLE1BQU0sUUFBUSxDQUFDO0FBRTVCLE9BQU8sS0FBSyxNQUFNLGVBQWUsQ0FBQztBQUdsQyxNQUFNLENBQUMsT0FBTyxPQUFPLGdCQUFpQixTQUFRLG9CQUEwQjtJQUlwRSxZQUFtQixjQUE4QjtRQUM3QyxLQUFLLEVBQUUsQ0FBQztRQUNSLElBQUksQ0FBQyxjQUFjLEdBQUcsY0FBYyxDQUFDO0lBQ3pDLENBQUM7SUFFWSxLQUFLLENBQUMsR0FBWSxFQUFFLE1BQWM7O1lBQzNDLE1BQU0sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDO2dCQUNmLGlCQUFpQixFQUFFLElBQUk7Z0JBQ3ZCLE1BQU0sRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDO2dCQUNwQyxLQUFLLEVBQUUsSUFBSSxDQUFDLGNBQWMsQ0FBQyxRQUFRLEVBQUU7Z0JBQ3JDLE1BQU0sRUFBRSxJQUFJO2dCQUNaLE1BQU0sRUFBRTtvQkFDSixRQUFRLEVBQUUsSUFBSTtvQkFDZCxNQUFNLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyx1QkFBdUIsQ0FBQztpQkFDOUM7Z0JBQ0QsT0FBTyxFQUFFLElBQUk7YUFDaEIsQ0FBQyxDQUFDLENBQUM7WUFFSixNQUFNLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUM7WUFFcEIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFFLEVBQUU7Z0JBQzFCLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFO29CQUNkLE1BQU0sSUFBSSxLQUFLLENBQUMseUJBQXlCLENBQUMsQ0FBQztpQkFDOUM7Z0JBRUQsR0FBRyxDQUFDLE1BQU0sQ0FBQyxPQUFPLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQztnQkFFakMsSUFBSSxNQUFNLEdBQVEsSUFBSSxDQUFDO2dCQUN2QixHQUFHLENBQUMsTUFBTSxDQUFDLEtBQUssR0FBRyxHQUFHLEVBQUU7b0JBQ3BCLElBQUksQ0FBQyxNQUFNLEVBQUU7d0JBQ1QsTUFBTSxHQUFHOzRCQUNMLElBQUksRUFBRSxHQUFHLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQzs0QkFDdkIsT0FBTyxFQUFFLEdBQUcsQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDOzRCQUM3QixPQUFPLEVBQUUsR0FBRyxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUM7NEJBQzdCLEtBQUssRUFBRSxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQzt5QkFDNUIsQ0FBQztxQkFDTDtvQkFDRCxPQUFPLE1BQU0sQ0FBQztnQkFDbEIsQ0FBQyxDQUFDO2dCQUNGLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDUCxDQUFDO0tBQUE7SUFFWSxJQUFJOztRQUNqQixDQUFDO0tBQUE7Q0FDSiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBBcHBsaWNhdGlvbkNvbXBvbmVudCBmcm9tIFwiLi4vQXBwbGljYXRpb25Db21wb25lbnRcIjtcbmltcG9ydCBzZXNzaW9uIGZyb20gXCJleHByZXNzLXNlc3Npb25cIjtcbmltcG9ydCBjb25maWcgZnJvbSBcImNvbmZpZ1wiO1xuaW1wb3J0IFJlZGlzQ29tcG9uZW50IGZyb20gXCIuL1JlZGlzQ29tcG9uZW50XCI7XG5pbXBvcnQgZmxhc2ggZnJvbSBcImNvbm5lY3QtZmxhc2hcIjtcbmltcG9ydCB7RXhwcmVzcywgUm91dGVyfSBmcm9tIFwiZXhwcmVzc1wiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBTZXNzaW9uQ29tcG9uZW50IGV4dGVuZHMgQXBwbGljYXRpb25Db21wb25lbnQ8dm9pZD4ge1xuICAgIHByaXZhdGUgcmVhZG9ubHkgc3RvcmVDb21wb25lbnQ6IFJlZGlzQ29tcG9uZW50O1xuXG5cbiAgICBwdWJsaWMgY29uc3RydWN0b3Ioc3RvcmVDb21wb25lbnQ6IFJlZGlzQ29tcG9uZW50KSB7XG4gICAgICAgIHN1cGVyKCk7XG4gICAgICAgIHRoaXMuc3RvcmVDb21wb25lbnQgPSBzdG9yZUNvbXBvbmVudDtcbiAgICB9XG5cbiAgICBwdWJsaWMgYXN5bmMgc3RhcnQoYXBwOiBFeHByZXNzLCByb3V0ZXI6IFJvdXRlcik6IFByb21pc2U8dm9pZD4ge1xuICAgICAgICByb3V0ZXIudXNlKHNlc3Npb24oe1xuICAgICAgICAgICAgc2F2ZVVuaW5pdGlhbGl6ZWQ6IHRydWUsXG4gICAgICAgICAgICBzZWNyZXQ6IGNvbmZpZy5nZXQoJ3Nlc3Npb24uc2VjcmV0JyksXG4gICAgICAgICAgICBzdG9yZTogdGhpcy5zdG9yZUNvbXBvbmVudC5nZXRTdG9yZSgpLFxuICAgICAgICAgICAgcmVzYXZlOiB0cnVlLFxuICAgICAgICAgICAgY29va2llOiB7XG4gICAgICAgICAgICAgICAgaHR0cE9ubHk6IHRydWUsXG4gICAgICAgICAgICAgICAgc2VjdXJlOiBjb25maWcuZ2V0KCdzZXNzaW9uLmNvb2tpZS5zZWN1cmUnKSxcbiAgICAgICAgICAgIH0sXG4gICAgICAgICAgICByb2xsaW5nOiB0cnVlLFxuICAgICAgICB9KSk7XG5cbiAgICAgICAgcm91dGVyLnVzZShmbGFzaCgpKTtcblxuICAgICAgICByb3V0ZXIudXNlKChyZXEsIHJlcywgbmV4dCkgPT4ge1xuICAgICAgICAgICAgaWYgKCFyZXEuc2Vzc2lvbikge1xuICAgICAgICAgICAgICAgIHRocm93IG5ldyBFcnJvcignU2Vzc2lvbiBpcyB1bmF2YWlsYWJsZS4nKTtcbiAgICAgICAgICAgIH1cblxuICAgICAgICAgICAgcmVzLmxvY2Fscy5zZXNzaW9uID0gcmVxLnNlc3Npb247XG5cbiAgICAgICAgICAgIGxldCBfZmxhc2g6IGFueSA9IG51bGw7XG4gICAgICAgICAgICByZXMubG9jYWxzLmZsYXNoID0gKCkgPT4ge1xuICAgICAgICAgICAgICAgIGlmICghX2ZsYXNoKSB7XG4gICAgICAgICAgICAgICAgICAgIF9mbGFzaCA9IHtcbiAgICAgICAgICAgICAgICAgICAgICAgIGluZm86IHJlcS5mbGFzaCgnaW5mbycpLFxuICAgICAgICAgICAgICAgICAgICAgICAgc3VjY2VzczogcmVxLmZsYXNoKCdzdWNjZXNzJyksXG4gICAgICAgICAgICAgICAgICAgICAgICB3YXJuaW5nOiByZXEuZmxhc2goJ3dhcm5pbmcnKSxcbiAgICAgICAgICAgICAgICAgICAgICAgIGVycm9yOiByZXEuZmxhc2goJ2Vycm9yJyksXG4gICAgICAgICAgICAgICAgICAgIH07XG4gICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgICAgIHJldHVybiBfZmxhc2g7XG4gICAgICAgICAgICB9O1xuICAgICAgICAgICAgbmV4dCgpO1xuICAgICAgICB9KTtcbiAgICB9XG5cbiAgICBwdWJsaWMgYXN5bmMgc3RvcCgpOiBQcm9taXNlPHZvaWQ+IHtcbiAgICB9XG59Il19 \ No newline at end of file diff --git a/dist/components/WebSocketServerComponent.d.ts b/dist/components/WebSocketServerComponent.d.ts deleted file mode 100644 index 1393d47..0000000 --- a/dist/components/WebSocketServerComponent.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -import ApplicationComponent from "../ApplicationComponent"; -import { Express, Router } from "express"; -import ExpressAppComponent from "./ExpressAppComponent"; -import Application from "../Application"; -import RedisComponent from "./RedisComponent"; -export default class WebSocketServerComponent extends ApplicationComponent { - private readonly application; - private readonly expressAppComponent; - private readonly storeComponent; - private wss?; - constructor(application: Application, expressAppComponent: ExpressAppComponent, storeComponent: RedisComponent); - start(app: Express, router: Router): Promise; - stop(): Promise; -} diff --git a/dist/components/WebSocketServerComponent.js b/dist/components/WebSocketServerComponent.js deleted file mode 100644 index ccd0926..0000000 --- a/dist/components/WebSocketServerComponent.js +++ /dev/null @@ -1,73 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -import ApplicationComponent from "../ApplicationComponent"; -import { Server as WebSocketServer } from "ws"; -import Logger from "../Logger"; -import cookie from "cookie"; -import cookieParser from "cookie-parser"; -import config from "config"; -export default class WebSocketServerComponent extends ApplicationComponent { - constructor(application, expressAppComponent, storeComponent) { - super(); - this.expressAppComponent = expressAppComponent; - this.application = application; - this.storeComponent = storeComponent; - } - start(app, router) { - return __awaiter(this, void 0, void 0, function* () { - const listeners = this.application.getWebSocketListeners(); - this.wss = new WebSocketServer({ - server: this.expressAppComponent.getServer(), - }, () => { - Logger.info(`Websocket server started over webserver.`); - }).on('error', (err) => { - Logger.error(err, 'An error occurred in the websocket server.'); - }).on('connection', (socket, request) => { - const listener = request.url ? listeners[request.url] : null; - if (!listener) { - socket.close(1002, `Path not found ${request.url}`); - return; - } - else if (!request.headers.cookie) { - socket.close(1002, `Can't process request without cookies.`); - return; - } - Logger.debug(`Websocket on ${request.url}`); - const cookies = cookie.parse(request.headers.cookie); - const sid = cookieParser.signedCookie(cookies['connect.sid'], config.get('session.secret')); - if (!sid) { - socket.close(1002); - return; - } - const store = this.storeComponent.getStore(); - store.get(sid, (err, session) => { - if (err || !session) { - Logger.error(err, 'Error while initializing session in websocket.'); - socket.close(1011); - return; - } - session.id = sid; - store.createSession(request, session); - listener.handle(socket, request, session).catch(err => { - Logger.error(err, 'Error in websocket listener.'); - }); - }); - }); - }); - } - stop() { - return __awaiter(this, void 0, void 0, function* () { - if (this.wss) { - yield this.close('WebSocket server', this.wss, this.wss.close); - } - }); - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiV2ViU29ja2V0U2VydmVyQ29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6Ii4vIiwic291cmNlcyI6WyJjb21wb25lbnRzL1dlYlNvY2tldFNlcnZlckNvbXBvbmVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLG9CQUFvQixNQUFNLHlCQUF5QixDQUFDO0FBRTNELE9BQWtCLEVBQUMsTUFBTSxJQUFJLGVBQWUsRUFBQyxNQUFNLElBQUksQ0FBQztBQUN4RCxPQUFPLE1BQU0sTUFBTSxXQUFXLENBQUM7QUFDL0IsT0FBTyxNQUFNLE1BQU0sUUFBUSxDQUFDO0FBQzVCLE9BQU8sWUFBWSxNQUFNLGVBQWUsQ0FBQztBQUN6QyxPQUFPLE1BQU0sTUFBTSxRQUFRLENBQUM7QUFNNUIsTUFBTSxDQUFDLE9BQU8sT0FBTyx3QkFBeUIsU0FBUSxvQkFBMEI7SUFPNUUsWUFBWSxXQUF3QixFQUFFLG1CQUF3QyxFQUFFLGNBQThCO1FBQzFHLEtBQUssRUFBRSxDQUFDO1FBQ1IsSUFBSSxDQUFDLG1CQUFtQixHQUFHLG1CQUFtQixDQUFDO1FBQy9DLElBQUksQ0FBQyxXQUFXLEdBQUcsV0FBVyxDQUFDO1FBQy9CLElBQUksQ0FBQyxjQUFjLEdBQUcsY0FBYyxDQUFDO0lBQ3pDLENBQUM7SUFFWSxLQUFLLENBQUMsR0FBWSxFQUFFLE1BQWM7O1lBQzNDLE1BQU0sU0FBUyxHQUF1QyxJQUFJLENBQUMsV0FBVyxDQUFDLHFCQUFxQixFQUFFLENBQUM7WUFDL0YsSUFBSSxDQUFDLEdBQUcsR0FBRyxJQUFJLGVBQWUsQ0FBQztnQkFDM0IsTUFBTSxFQUFFLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxTQUFTLEVBQUU7YUFDL0MsRUFBRSxHQUFHLEVBQUU7Z0JBQ0osTUFBTSxDQUFDLElBQUksQ0FBQywwQ0FBMEMsQ0FBQyxDQUFDO1lBQzVELENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxHQUFHLEVBQUUsRUFBRTtnQkFDbkIsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsNENBQTRDLENBQUMsQ0FBQztZQUNwRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsWUFBWSxFQUFFLENBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxFQUFFO2dCQUNwQyxNQUFNLFFBQVEsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUM7Z0JBRTdELElBQUksQ0FBQyxRQUFRLEVBQUU7b0JBQ1gsTUFBTSxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsa0JBQWtCLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDO29CQUNwRCxPQUFPO2lCQUNWO3FCQUFNLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRTtvQkFDaEMsTUFBTSxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsd0NBQXdDLENBQUMsQ0FBQztvQkFDN0QsT0FBTztpQkFDVjtnQkFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLGdCQUFnQixPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQztnQkFFNUMsTUFBTSxPQUFPLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO2dCQUNyRCxNQUFNLEdBQUcsR0FBRyxZQUFZLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxhQUFhLENBQUMsRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQztnQkFFNUYsSUFBSSxDQUFDLEdBQUcsRUFBRTtvQkFDTixNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO29CQUNuQixPQUFPO2lCQUNWO2dCQUVELE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxjQUFjLENBQUMsUUFBUSxFQUFFLENBQUM7Z0JBQzdDLEtBQUssQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUMsR0FBRyxFQUFFLE9BQU8sRUFBRSxFQUFFO29CQUM1QixJQUFJLEdBQUcsSUFBSSxDQUFDLE9BQU8sRUFBRTt3QkFDakIsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsZ0RBQWdELENBQUMsQ0FBQzt3QkFDcEUsTUFBTSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQzt3QkFDbkIsT0FBTztxQkFDVjtvQkFFRCxPQUFPLENBQUMsRUFBRSxHQUFHLEdBQUcsQ0FBQztvQkFFakIsS0FBSyxDQUFDLGFBQWEsQ0FBVSxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7b0JBQy9DLFFBQVEsQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxPQUFPLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUU7d0JBQ2xELE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLDhCQUE4QixDQUFDLENBQUM7b0JBQ3RELENBQUMsQ0FBQyxDQUFDO2dCQUNQLENBQUMsQ0FBQyxDQUFDO1lBQ1AsQ0FBQyxDQUFDLENBQUM7UUFDUCxDQUFDO0tBQUE7SUFFWSxJQUFJOztZQUNiLElBQUksSUFBSSxDQUFDLEdBQUcsRUFBRTtnQkFDVixNQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsa0JBQWtCLEVBQUUsSUFBSSxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDO2FBQ2xFO1FBQ0wsQ0FBQztLQUFBO0NBQ0oiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgQXBwbGljYXRpb25Db21wb25lbnQgZnJvbSBcIi4uL0FwcGxpY2F0aW9uQ29tcG9uZW50XCI7XG5pbXBvcnQge0V4cHJlc3MsIFJlcXVlc3QsIFJvdXRlcn0gZnJvbSBcImV4cHJlc3NcIjtcbmltcG9ydCBXZWJTb2NrZXQsIHtTZXJ2ZXIgYXMgV2ViU29ja2V0U2VydmVyfSBmcm9tIFwid3NcIjtcbmltcG9ydCBMb2dnZXIgZnJvbSBcIi4uL0xvZ2dlclwiO1xuaW1wb3J0IGNvb2tpZSBmcm9tIFwiY29va2llXCI7XG5pbXBvcnQgY29va2llUGFyc2VyIGZyb20gXCJjb29raWUtcGFyc2VyXCI7XG5pbXBvcnQgY29uZmlnIGZyb20gXCJjb25maWdcIjtcbmltcG9ydCBFeHByZXNzQXBwQ29tcG9uZW50IGZyb20gXCIuL0V4cHJlc3NBcHBDb21wb25lbnRcIjtcbmltcG9ydCBBcHBsaWNhdGlvbiBmcm9tIFwiLi4vQXBwbGljYXRpb25cIjtcbmltcG9ydCBSZWRpc0NvbXBvbmVudCBmcm9tIFwiLi9SZWRpc0NvbXBvbmVudFwiO1xuaW1wb3J0IFdlYlNvY2tldExpc3RlbmVyIGZyb20gXCIuLi9XZWJTb2NrZXRMaXN0ZW5lclwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBXZWJTb2NrZXRTZXJ2ZXJDb21wb25lbnQgZXh0ZW5kcyBBcHBsaWNhdGlvbkNvbXBvbmVudDx2b2lkPiB7XG4gICAgcHJpdmF0ZSByZWFkb25seSBhcHBsaWNhdGlvbjogQXBwbGljYXRpb247XG4gICAgcHJpdmF0ZSByZWFkb25seSBleHByZXNzQXBwQ29tcG9uZW50OiBFeHByZXNzQXBwQ29tcG9uZW50O1xuICAgIHByaXZhdGUgcmVhZG9ubHkgc3RvcmVDb21wb25lbnQ6IFJlZGlzQ29tcG9uZW50O1xuXG4gICAgcHJpdmF0ZSB3c3M/OiBXZWJTb2NrZXQuU2VydmVyO1xuXG4gICAgY29uc3RydWN0b3IoYXBwbGljYXRpb246IEFwcGxpY2F0aW9uLCBleHByZXNzQXBwQ29tcG9uZW50OiBFeHByZXNzQXBwQ29tcG9uZW50LCBzdG9yZUNvbXBvbmVudDogUmVkaXNDb21wb25lbnQpIHtcbiAgICAgICAgc3VwZXIoKTtcbiAgICAgICAgdGhpcy5leHByZXNzQXBwQ29tcG9uZW50ID0gZXhwcmVzc0FwcENvbXBvbmVudDtcbiAgICAgICAgdGhpcy5hcHBsaWNhdGlvbiA9IGFwcGxpY2F0aW9uO1xuICAgICAgICB0aGlzLnN0b3JlQ29tcG9uZW50ID0gc3RvcmVDb21wb25lbnQ7XG4gICAgfVxuXG4gICAgcHVibGljIGFzeW5jIHN0YXJ0KGFwcDogRXhwcmVzcywgcm91dGVyOiBSb3V0ZXIpOiBQcm9taXNlPHZvaWQ+IHtcbiAgICAgICAgY29uc3QgbGlzdGVuZXJzOiB7IFtwOiBzdHJpbmddOiBXZWJTb2NrZXRMaXN0ZW5lciB9ID0gdGhpcy5hcHBsaWNhdGlvbi5nZXRXZWJTb2NrZXRMaXN0ZW5lcnMoKTtcbiAgICAgICAgdGhpcy53c3MgPSBuZXcgV2ViU29ja2V0U2VydmVyKHtcbiAgICAgICAgICAgIHNlcnZlcjogdGhpcy5leHByZXNzQXBwQ29tcG9uZW50LmdldFNlcnZlcigpLFxuICAgICAgICB9LCAoKSA9PiB7XG4gICAgICAgICAgICBMb2dnZXIuaW5mbyhgV2Vic29ja2V0IHNlcnZlciBzdGFydGVkIG92ZXIgd2Vic2VydmVyLmApO1xuICAgICAgICB9KS5vbignZXJyb3InLCAoZXJyKSA9PiB7XG4gICAgICAgICAgICBMb2dnZXIuZXJyb3IoZXJyLCAnQW4gZXJyb3Igb2NjdXJyZWQgaW4gdGhlIHdlYnNvY2tldCBzZXJ2ZXIuJyk7XG4gICAgICAgIH0pLm9uKCdjb25uZWN0aW9uJywgKHNvY2tldCwgcmVxdWVzdCkgPT4ge1xuICAgICAgICAgICAgY29uc3QgbGlzdGVuZXIgPSByZXF1ZXN0LnVybCA/IGxpc3RlbmVyc1tyZXF1ZXN0LnVybF0gOiBudWxsO1xuXG4gICAgICAgICAgICBpZiAoIWxpc3RlbmVyKSB7XG4gICAgICAgICAgICAgICAgc29ja2V0LmNsb3NlKDEwMDIsIGBQYXRoIG5vdCBmb3VuZCAke3JlcXVlc3QudXJsfWApO1xuICAgICAgICAgICAgICAgIHJldHVybjtcbiAgICAgICAgICAgIH0gZWxzZSBpZiAoIXJlcXVlc3QuaGVhZGVycy5jb29raWUpIHtcbiAgICAgICAgICAgICAgICBzb2NrZXQuY2xvc2UoMTAwMiwgYENhbid0IHByb2Nlc3MgcmVxdWVzdCB3aXRob3V0IGNvb2tpZXMuYCk7XG4gICAgICAgICAgICAgICAgcmV0dXJuO1xuICAgICAgICAgICAgfVxuXG4gICAgICAgICAgICBMb2dnZXIuZGVidWcoYFdlYnNvY2tldCBvbiAke3JlcXVlc3QudXJsfWApO1xuXG4gICAgICAgICAgICBjb25zdCBjb29raWVzID0gY29va2llLnBhcnNlKHJlcXVlc3QuaGVhZGVycy5jb29raWUpO1xuICAgICAgICAgICAgY29uc3Qgc2lkID0gY29va2llUGFyc2VyLnNpZ25lZENvb2tpZShjb29raWVzWydjb25uZWN0LnNpZCddLCBjb25maWcuZ2V0KCdzZXNzaW9uLnNlY3JldCcpKTtcblxuICAgICAgICAgICAgaWYgKCFzaWQpIHtcbiAgICAgICAgICAgICAgICBzb2NrZXQuY2xvc2UoMTAwMik7XG4gICAgICAgICAgICAgICAgcmV0dXJuO1xuICAgICAgICAgICAgfVxuXG4gICAgICAgICAgICBjb25zdCBzdG9yZSA9IHRoaXMuc3RvcmVDb21wb25lbnQuZ2V0U3RvcmUoKTtcbiAgICAgICAgICAgIHN0b3JlLmdldChzaWQsIChlcnIsIHNlc3Npb24pID0+IHtcbiAgICAgICAgICAgICAgICBpZiAoZXJyIHx8ICFzZXNzaW9uKSB7XG4gICAgICAgICAgICAgICAgICAgIExvZ2dlci5lcnJvcihlcnIsICdFcnJvciB3aGlsZSBpbml0aWFsaXppbmcgc2Vzc2lvbiBpbiB3ZWJzb2NrZXQuJyk7XG4gICAgICAgICAgICAgICAgICAgIHNvY2tldC5jbG9zZSgxMDExKTtcbiAgICAgICAgICAgICAgICAgICAgcmV0dXJuO1xuICAgICAgICAgICAgICAgIH1cblxuICAgICAgICAgICAgICAgIHNlc3Npb24uaWQgPSBzaWQ7XG5cbiAgICAgICAgICAgICAgICBzdG9yZS5jcmVhdGVTZXNzaW9uKDxSZXF1ZXN0PnJlcXVlc3QsIHNlc3Npb24pO1xuICAgICAgICAgICAgICAgIGxpc3RlbmVyLmhhbmRsZShzb2NrZXQsIHJlcXVlc3QsIHNlc3Npb24pLmNhdGNoKGVyciA9PiB7XG4gICAgICAgICAgICAgICAgICAgIExvZ2dlci5lcnJvcihlcnIsICdFcnJvciBpbiB3ZWJzb2NrZXQgbGlzdGVuZXIuJyk7XG4gICAgICAgICAgICAgICAgfSk7XG4gICAgICAgICAgICB9KTtcbiAgICAgICAgfSk7XG4gICAgfVxuXG4gICAgcHVibGljIGFzeW5jIHN0b3AoKTogUHJvbWlzZTx2b2lkPiB7XG4gICAgICAgIGlmICh0aGlzLndzcykge1xuICAgICAgICAgICAgYXdhaXQgdGhpcy5jbG9zZSgnV2ViU29ja2V0IHNlcnZlcicsIHRoaXMud3NzLCB0aGlzLndzcy5jbG9zZSk7XG4gICAgICAgIH1cbiAgICB9XG59Il19 \ No newline at end of file diff --git a/dist/db/Migration.d.ts b/dist/db/Migration.d.ts deleted file mode 100644 index 9a8bc39..0000000 --- a/dist/db/Migration.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -export default abstract class Migration { - readonly version: number; - constructor(version: number); - shouldRun(currentVersion: number): Promise; - abstract install(): Promise; - abstract rollback(): Promise; -} diff --git a/dist/db/Migration.js b/dist/db/Migration.js deleted file mode 100644 index a96fbf1..0000000 --- a/dist/db/Migration.js +++ /dev/null @@ -1,20 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -export default class Migration { - constructor(version) { - this.version = version; - } - shouldRun(currentVersion) { - return __awaiter(this, void 0, void 0, function* () { - return this.version > currentVersion; - }); - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWlncmF0aW9uLmpzIiwic291cmNlUm9vdCI6Ii4vIiwic291cmNlcyI6WyJkYi9NaWdyYXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsTUFBTSxDQUFDLE9BQU8sT0FBZ0IsU0FBUztJQUduQyxZQUFZLE9BQWU7UUFDdkIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7SUFDM0IsQ0FBQztJQUVLLFNBQVMsQ0FBQyxjQUFzQjs7WUFDbEMsT0FBTyxJQUFJLENBQUMsT0FBTyxHQUFHLGNBQWMsQ0FBQztRQUN6QyxDQUFDO0tBQUE7Q0FLSiIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBkZWZhdWx0IGFic3RyYWN0IGNsYXNzIE1pZ3JhdGlvbiB7XG4gICAgcHVibGljIHJlYWRvbmx5IHZlcnNpb246IG51bWJlcjtcblxuICAgIGNvbnN0cnVjdG9yKHZlcnNpb246IG51bWJlcikge1xuICAgICAgICB0aGlzLnZlcnNpb24gPSB2ZXJzaW9uO1xuICAgIH1cblxuICAgIGFzeW5jIHNob3VsZFJ1bihjdXJyZW50VmVyc2lvbjogbnVtYmVyKTogUHJvbWlzZTxib29sZWFuPiB7XG4gICAgICAgIHJldHVybiB0aGlzLnZlcnNpb24gPiBjdXJyZW50VmVyc2lvbjtcbiAgICB9XG5cbiAgICBhYnN0cmFjdCBhc3luYyBpbnN0YWxsKCk6IFByb21pc2U8dm9pZD47XG5cbiAgICBhYnN0cmFjdCBhc3luYyByb2xsYmFjaygpOiBQcm9taXNlPHZvaWQ+O1xufSJdfQ== \ No newline at end of file diff --git a/dist/db/Model.d.ts b/dist/db/Model.d.ts deleted file mode 100644 index 4f61055..0000000 --- a/dist/db/Model.d.ts +++ /dev/null @@ -1,58 +0,0 @@ -import Validator from "./Validator"; -import { Connection } from "mysql"; -import Query from "./Query"; -import { Request } from "express"; -export default abstract class Model { - static getById(id: number): Promise; - static paginate(request: Request, perPage?: number): Promise; - protected static select(...fields: string[]): Query; - protected static update(data: { - [key: string]: any; - }): Query; - protected static delete(): Query; - protected static models(query: Query): Promise; - static loadRelation(models: T[], relation: string, model: Function, localField: string): Promise; - private static getFactory; - protected readonly properties: ModelProperty[]; - private readonly relations; - id?: number; - [key: string]: any; - constructor(data: any); - protected abstract defineProperties(): void; - protected defineProperty(name: string, validator?: Validator | RegExp): void; - private updateWithData; - protected beforeSave(exists: boolean, connection: Connection): Promise; - protected afterSave(): Promise; - save(connection?: Connection, postHook?: (callback: () => Promise) => void): Promise; - private saveTransaction; - static get table(): string; - get table(): string; - exists(): Promise; - delete(): Promise; - validate(onlyFormat?: boolean, connection?: Connection): Promise; - private cache; - protected relation(name: string): T | null; -} -export interface ModelFactory { - (data: any): T; -} -declare class ModelProperty { - readonly name: string; - private readonly validator; - private val?; - constructor(name: string, validator: Validator); - validate(onlyFormat: boolean, connection?: Connection): Promise; - get value(): T | undefined; - set value(val: T | undefined); -} -export declare class ModelCache { - private static readonly caches; - static cache(instance: Model): void; - static forget(instance: Model): void; - static all(table: string): { - [key: number]: Model; - } | undefined; - static get(table: string, id: number): Model | undefined; -} -export declare const EMAIL_REGEX: RegExp; -export {}; diff --git a/dist/db/Model.js b/dist/db/Model.js deleted file mode 100644 index cfa3221..0000000 --- a/dist/db/Model.js +++ /dev/null @@ -1,291 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -import MysqlConnectionManager, { query } from "./MysqlConnectionManager"; -import Validator from "./Validator"; -import Query from "./Query"; -import Pagination from "../Pagination"; -export default class Model { - constructor(data) { - this.properties = []; - this.relations = {}; - this.defineProperty('id', new Validator()); - this.defineProperties(); - this.updateWithData(data); - } - static getById(id) { - return __awaiter(this, void 0, void 0, function* () { - const cachedModel = ModelCache.get(this.table, id); - if ((cachedModel === null || cachedModel === void 0 ? void 0 : cachedModel.constructor) === this) { - return cachedModel; - } - const models = yield this.models(this.select().where('id', id).first()); - return models.length > 0 ? models[0] : null; - }); - } - static paginate(request, perPage = 20) { - return __awaiter(this, void 0, void 0, function* () { - let page = request.params.page ? parseInt(request.params.page) : 1; - let query = this.select().limit(perPage, (page - 1) * perPage).withTotalRowCount(); - if (request.params.sortBy) { - const dir = request.params.sortDirection; - query = query.sortBy(request.params.sortBy, dir === 'ASC' || dir === 'DESC' ? dir : undefined); - } - else { - query = query.sortBy('id'); - } - const models = yield this.models(query); - // @ts-ignore - models.pagination = new Pagination(models, page, perPage, models.totalCount); - return models; - }); - } - static select(...fields) { - return Query.select(this.table, ...fields); - } - static update(data) { - return Query.update(this.table, data); - } - static delete() { - return Query.delete(this.table); - } - static models(query) { - return __awaiter(this, void 0, void 0, function* () { - const results = yield query.execute(); - const models = []; - const factory = this.getFactory(); - for (const result of results.results) { - const cachedModel = ModelCache.get(this.table, result.id); - if (cachedModel && cachedModel.constructor === this) { - cachedModel.updateWithData(result); - models.push(cachedModel); - } - else { - models.push(factory(result)); - } - } - // @ts-ignore - models.totalCount = results.foundRows; - return models; - }); - } - static loadRelation(models, relation, model, localField) { - return __awaiter(this, void 0, void 0, function* () { - const loadMap = {}; - const ids = models.map(m => { - m.relations[relation] = null; - if (m[localField]) - loadMap[m[localField]] = v => m.relations[relation] = v; - return m[localField]; - }).filter(id => id); - for (const v of yield model.models(model.select().whereIn('id', ids))) { - loadMap[v.id](v); - } - }); - } - static getFactory(factory) { - if (factory === undefined) { - factory = this.FACTORY; - if (factory === undefined) - factory = data => new this(data); - } - return factory; - } - defineProperty(name, validator) { - if (validator === undefined) - validator = new Validator(); - if (validator instanceof RegExp) { - const regexp = validator; - validator = new Validator().regexp(regexp); - } - const prop = new ModelProperty(name, validator); - this.properties.push(prop); - Object.defineProperty(this, name, { - get: () => prop.value, - set: (value) => prop.value = value, - }); - } - updateWithData(data) { - this.id = data['id']; - for (const prop of this.properties) { - if (data[prop.name] !== undefined) { - this[prop.name] = data[prop.name]; - } - } - } - beforeSave(exists, connection) { - return __awaiter(this, void 0, void 0, function* () { - }); - } - afterSave() { - return __awaiter(this, void 0, void 0, function* () { - }); - } - save(connection, postHook) { - return __awaiter(this, void 0, void 0, function* () { - yield this.validate(false, connection); - const exists = yield this.exists(); - let needs_full_update = false; - if (connection) { - needs_full_update = yield this.saveTransaction(connection, exists, needs_full_update); - } - else { - needs_full_update = yield MysqlConnectionManager.wrapTransaction((connection) => __awaiter(this, void 0, void 0, function* () { return this.saveTransaction(connection, exists, needs_full_update); })); - } - const callback = () => __awaiter(this, void 0, void 0, function* () { - if (needs_full_update) { - this.updateWithData((yield this.constructor.select().where('id', this.id).first().execute()).results[0]); - } - if (!exists) { - this.cache(); - } - yield this.afterSave(); - }); - if (connection) { - postHook(callback); - } - else { - yield callback(); - } - }); - } - saveTransaction(connection, exists, needs_full_update) { - return __awaiter(this, void 0, void 0, function* () { - // Before save - yield this.beforeSave(exists, connection); - if (exists && this.hasOwnProperty('updated_at')) { - this.updated_at = new Date(); - } - const props = []; - const values = []; - if (exists) { - for (const prop of this.properties) { - if (prop.value !== undefined) { - props.push(prop.name + '=?'); - values.push(prop.value); - } - else { - needs_full_update = true; - } - } - values.push(this.id); - yield query(`UPDATE ${this.table} SET ${props.join(',')} WHERE id=?`, values, connection); - } - else { - const props_holders = []; - for (const prop of this.properties) { - if (prop.value !== undefined) { - props.push(prop.name); - props_holders.push('?'); - values.push(prop.value); - } - else { - needs_full_update = true; - } - } - const result = yield query(`INSERT INTO ${this.table} (${props.join(', ')}) VALUES(${props_holders.join(', ')})`, values, connection); - this.id = result.other.insertId; - } - return needs_full_update; - }); - } - static get table() { - return this.name - .replace(/(?:^|\.?)([A-Z])/g, (x, y) => '_' + y.toLowerCase()) - .replace(/^_/, '') - + 's'; - } - get table() { - // @ts-ignore - return this.constructor.table; - } - exists() { - return __awaiter(this, void 0, void 0, function* () { - if (!this.id) - return false; - const result = yield query(`SELECT 1 FROM ${this.table} WHERE id=? LIMIT 1`, [ - this.id, - ]); - return result.results.length > 0; - }); - } - delete() { - return __awaiter(this, void 0, void 0, function* () { - if (!(yield this.exists())) - throw new Error('This model instance doesn\'t exist in DB.'); - yield query(`DELETE FROM ${this.table} WHERE id=?`, [ - this.id, - ]); - ModelCache.forget(this); - this.id = undefined; - }); - } - validate(onlyFormat = false, connection) { - return __awaiter(this, void 0, void 0, function* () { - return yield Promise.all(this.properties.map(prop => prop.validate(onlyFormat, connection))); - }); - } - cache() { - ModelCache.cache(this); - } - relation(name) { - if (this.relations[name] === undefined) - throw new Error('Model not loaded'); - return this.relations[name]; - } -} -class ModelProperty { - constructor(name, validator) { - this.name = name; - this.validator = validator; - } - validate(onlyFormat, connection) { - return __awaiter(this, void 0, void 0, function* () { - return yield this.validator.execute(this.name, this.value, onlyFormat, connection); - }); - } - get value() { - return this.val; - } - set value(val) { - this.val = val; - } -} -export class ModelCache { - static cache(instance) { - if (instance.id === undefined) - throw new Error('Cannot cache an instance with an undefined id.'); - let tableCache = this.caches[instance.table]; - if (!tableCache) - tableCache = this.caches[instance.table] = {}; - if (!tableCache[instance.id]) - tableCache[instance.id] = instance; - } - static forget(instance) { - if (instance.id === undefined) - throw new Error('Cannot forget an instance with an undefined id.'); - let tableCache = this.caches[instance.table]; - if (!tableCache) - return; - if (tableCache[instance.id]) - delete tableCache[instance.id]; - } - static all(table) { - return this.caches[table]; - } - static get(table, id) { - const tableCache = this.all(table); - if (!tableCache) - return undefined; - return tableCache[id]; - } -} -ModelCache.caches = {}; -export const EMAIL_REGEX = /^[a-zA-Z0-9.!#$%&'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+$/; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Model.js","sourceRoot":"./","sources":["db/Model.ts"],"names":[],"mappings":"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","sourcesContent":["import MysqlConnectionManager, {query} from \"./MysqlConnectionManager\";\nimport Validator from \"./Validator\";\nimport {Connection} from \"mysql\";\nimport Query from \"./Query\";\nimport {Request} from \"express\";\nimport Pagination from \"../Pagination\";\n\nexport default abstract class Model {\n    public static async getById<T extends Model>(id: number): Promise<T | null> {\n        const cachedModel = ModelCache.get(this.table, id);\n        if (cachedModel?.constructor === this) {\n            return <T>cachedModel;\n        }\n\n        const models = await this.models<T>(this.select().where('id', id).first());\n        return models.length > 0 ? models[0] : null;\n    }\n\n    public static async paginate<T extends Model>(request: Request, perPage: number = 20): Promise<T[]> {\n        let page = request.params.page ? parseInt(request.params.page) : 1;\n        let query: Query = this.select().limit(perPage, (page - 1) * perPage).withTotalRowCount();\n        if (request.params.sortBy) {\n            const dir = request.params.sortDirection;\n            query = query.sortBy(request.params.sortBy, dir === 'ASC' || dir === 'DESC' ? dir : undefined);\n        } else {\n            query = query.sortBy('id');\n        }\n        const models = await this.models<T>(query);\n        // @ts-ignore\n        models.pagination = new Pagination(models, page, perPage, models.totalCount);\n        return models;\n    }\n\n    protected static select(...fields: string[]): Query {\n        return Query.select(this.table, ...fields);\n    }\n\n    protected static update(data: { [key: string]: any }): Query {\n        return Query.update(this.table, data);\n    }\n\n    protected static delete(): Query {\n        return Query.delete(this.table);\n    }\n\n    protected static async models<T extends Model>(query: Query): Promise<T[]> {\n        const results = await query.execute();\n        const models: T[] = [];\n        const factory = this.getFactory<T>();\n        for (const result of results.results) {\n            const cachedModel = ModelCache.get(this.table, result.id);\n            if (cachedModel && cachedModel.constructor === this) {\n                cachedModel.updateWithData(result);\n                models.push(<T>cachedModel);\n            } else {\n                models.push(factory(result));\n            }\n        }\n        // @ts-ignore\n        models.totalCount = results.foundRows;\n        return models;\n    }\n\n    public static async loadRelation<T extends Model>(models: T[], relation: string, model: Function, localField: string) {\n        const loadMap: { [p: number]: (model: T) => void } = {};\n        const ids = models.map(m => {\n            m.relations[relation] = null;\n            if (m[localField]) loadMap[m[localField]] = v => m.relations[relation] = v;\n            return m[localField];\n        }).filter(id => id);\n        for (const v of await (<any>model).models((<any>model).select().whereIn('id', ids))) {\n            loadMap[v.id!](v);\n        }\n    }\n\n    private static getFactory<T extends Model>(factory?: ModelFactory<T>): ModelFactory<T> {\n        if (factory === undefined) {\n            factory = (<any>this).FACTORY;\n            if (factory === undefined) factory = data => new (<any>this)(data);\n        }\n        return factory;\n    }\n\n\n    protected readonly properties: ModelProperty<any>[] = [];\n    private readonly relations: { [p: string]: (Model | null) } = {};\n    public id?: number;\n\n    [key: string]: any;\n\n    public constructor(data: any) {\n        this.defineProperty<number>('id', new Validator());\n        this.defineProperties();\n        this.updateWithData(data);\n    }\n\n    protected abstract defineProperties(): void;\n\n    protected defineProperty<T>(name: string, validator?: Validator<T> | RegExp) {\n        if (validator === undefined) validator = new Validator();\n        if (validator instanceof RegExp) {\n            const regexp = validator;\n            validator = new Validator().regexp(regexp);\n        }\n\n        const prop = new ModelProperty<T>(name, validator);\n        this.properties.push(prop);\n        Object.defineProperty(this, name, {\n            get: () => prop.value,\n            set: (value: T) => prop.value = value,\n        });\n    }\n\n    private updateWithData(data: any) {\n        this.id = data['id'];\n\n        for (const prop of this.properties) {\n            if (data[prop.name] !== undefined) {\n                this[prop.name] = data[prop.name];\n            }\n        }\n    }\n\n    protected async beforeSave(exists: boolean, connection: Connection): Promise<void> {\n    }\n\n    protected async afterSave(): Promise<void> {\n    }\n\n    public async save(connection?: Connection, postHook?: (callback: () => Promise<void>) => void): Promise<void> {\n        await this.validate(false, connection);\n\n        const exists = await this.exists();\n        let needs_full_update = false;\n\n        if (connection) {\n            needs_full_update = await this.saveTransaction(connection, exists, needs_full_update);\n        } else {\n            needs_full_update = await MysqlConnectionManager.wrapTransaction(async connection => this.saveTransaction(connection, exists, needs_full_update));\n        }\n\n        const callback = async () => {\n            if (needs_full_update) {\n                this.updateWithData((await (<Model><unknown>this.constructor).select().where('id', this.id!).first().execute()).results[0]);\n            }\n\n            if (!exists) {\n                this.cache();\n            }\n\n            await this.afterSave();\n        };\n\n        if (connection) {\n            postHook!(callback);\n        } else {\n            await callback();\n        }\n    }\n\n    private async saveTransaction(connection: Connection, exists: boolean, needs_full_update: boolean): Promise<boolean> {\n        // Before save\n        await this.beforeSave(exists, connection);\n        if (exists && this.hasOwnProperty('updated_at')) {\n            this.updated_at = new Date();\n        }\n\n        const props = [];\n        const values = [];\n\n        if (exists) {\n            for (const prop of this.properties) {\n                if (prop.value !== undefined) {\n                    props.push(prop.name + '=?');\n                    values.push(prop.value);\n                } else {\n                    needs_full_update = true;\n                }\n            }\n            values.push(this.id);\n            await query(`UPDATE ${this.table} SET ${props.join(',')} WHERE id=?`, values, connection);\n        } else {\n            const props_holders = [];\n            for (const prop of this.properties) {\n                if (prop.value !== undefined) {\n                    props.push(prop.name);\n                    props_holders.push('?');\n                    values.push(prop.value);\n                } else {\n                    needs_full_update = true;\n                }\n            }\n            const result = await query(`INSERT INTO ${this.table} (${props.join(', ')}) VALUES(${props_holders.join(', ')})`, values, connection);\n\n            this.id = result.other.insertId;\n        }\n\n        return needs_full_update;\n    }\n\n    public static get table(): string {\n        return this.name\n                .replace(/(?:^|\\.?)([A-Z])/g, (x, y) => '_' + y.toLowerCase())\n                .replace(/^_/, '')\n            + 's';\n    }\n\n    public get table(): string {\n        // @ts-ignore\n        return this.constructor.table;\n    }\n\n    public async exists(): Promise<boolean> {\n        if (!this.id) return false;\n\n        const result = await query(`SELECT 1 FROM ${this.table} WHERE id=? LIMIT 1`, [\n            this.id,\n        ]);\n        return result.results.length > 0;\n    }\n\n    public async delete(): Promise<void> {\n        if (!(await this.exists())) throw new Error('This model instance doesn\\'t exist in DB.');\n\n        await query(`DELETE FROM ${this.table} WHERE id=?`, [\n            this.id,\n        ]);\n        ModelCache.forget(this);\n        this.id = undefined;\n    }\n\n    public async validate(onlyFormat: boolean = false, connection?: Connection): Promise<void[]> {\n        return await Promise.all(this.properties.map(prop => prop.validate(onlyFormat, connection)));\n    }\n\n    private cache() {\n        ModelCache.cache(this);\n    }\n\n    protected relation<T extends Model>(name: string): T | null {\n        if (this.relations[name] === undefined) throw new Error('Model not loaded');\n        return <T | null>this.relations[name];\n    }\n}\n\nexport interface ModelFactory<T extends Model> {\n    (data: any): T;\n}\n\nclass ModelProperty<T> {\n    public readonly name: string;\n    private readonly validator: Validator<T>;\n    private val?: T;\n\n    constructor(name: string, validator: Validator<T>) {\n        this.name = name;\n        this.validator = validator;\n    }\n\n    public async validate(onlyFormat: boolean, connection?: Connection): Promise<void> {\n        return await this.validator.execute(this.name, this.value, onlyFormat, connection);\n    }\n\n    public get value(): T | undefined {\n        return this.val;\n    }\n\n    public set value(val: T | undefined) {\n        this.val = val;\n    }\n}\n\nexport class ModelCache {\n    private static readonly caches: {\n        [key: string]: {\n            [key: number]: Model\n        }\n    } = {};\n\n    public static cache(instance: Model) {\n        if (instance.id === undefined) throw new Error('Cannot cache an instance with an undefined id.');\n\n        let tableCache = this.caches[instance.table];\n        if (!tableCache) tableCache = this.caches[instance.table] = {};\n\n        if (!tableCache[instance.id]) tableCache[instance.id] = instance;\n    }\n\n    public static forget(instance: Model) {\n        if (instance.id === undefined) throw new Error('Cannot forget an instance with an undefined id.');\n\n        let tableCache = this.caches[instance.table];\n        if (!tableCache) return;\n\n        if (tableCache[instance.id]) delete tableCache[instance.id];\n    }\n\n    public static all(table: string): {\n        [key: number]: Model\n    } | undefined {\n        return this.caches[table];\n    }\n\n    public static get(table: string, id: number): Model | undefined {\n        const tableCache = this.all(table);\n        if (!tableCache) return undefined;\n        return tableCache[id];\n    }\n}\n\nexport const EMAIL_REGEX = /^[a-zA-Z0-9.!#$%&'*+\\\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+$/;"]} \ No newline at end of file diff --git a/dist/db/MysqlConnectionManager.d.ts b/dist/db/MysqlConnectionManager.d.ts deleted file mode 100644 index bc6eef0..0000000 --- a/dist/db/MysqlConnectionManager.d.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Connection, FieldInfo, Pool } from 'mysql'; -import Migration from "./Migration"; -export interface QueryResult { - readonly results: any[]; - readonly fields: FieldInfo[]; - readonly other?: any; - foundRows?: number; -} -export declare function query(queryString: string, values?: any, connection?: Connection): Promise; -export default class MysqlConnectionManager { - private static currentPool?; - private static databaseReady; - private static readonly migrations; - static registerMigration(migration: (version: number) => Migration): void; - static prepare(): Promise; - static get pool(): Pool; - private static createPool; - static endPool(): Promise; - static query(queryString: string, values?: any, connection?: Connection): Promise; - static wrapTransaction(transaction: (connection: Connection) => Promise): Promise; - private static rejectAndRollback; - private static handleMigrations; -} diff --git a/dist/db/MysqlConnectionManager.js b/dist/db/MysqlConnectionManager.js deleted file mode 100644 index 3353b4b..0000000 --- a/dist/db/MysqlConnectionManager.js +++ /dev/null @@ -1,168 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -import mysql from 'mysql'; -import config from 'config'; -import Logger from "../Logger"; -export function query(queryString, values, connection) { - return __awaiter(this, void 0, void 0, function* () { - return yield MysqlConnectionManager.query(queryString, values, connection); - }); -} -export default class MysqlConnectionManager { - static registerMigration(migration) { - this.migrations.push(migration(this.migrations.length + 1)); - } - static prepare() { - return __awaiter(this, void 0, void 0, function* () { - if (config.get('mysql.create_database_automatically') === true) { - const dbName = config.get('mysql.database'); - Logger.info(`Creating database ${dbName}...`); - const connection = mysql.createConnection({ - host: config.get('mysql.host'), - user: config.get('mysql.user'), - password: config.get('mysql.password'), - }); - yield new Promise((resolve, reject) => { - connection.query(`CREATE DATABASE IF NOT EXISTS ${dbName}`, (error) => { - if (error !== null) { - reject(error); - } - else { - resolve(); - } - }); - }); - connection.end(); - Logger.info(`Database ${dbName} created!`); - } - this.databaseReady = true; - yield this.handleMigrations(); - }); - } - static get pool() { - if (this.currentPool === undefined) { - this.currentPool = this.createPool(); - } - return this.currentPool; - } - static createPool() { - return mysql.createPool({ - connectionLimit: config.get('mysql.connectionLimit'), - host: config.get('mysql.host'), - user: config.get('mysql.user'), - password: config.get('mysql.password'), - database: config.get('mysql.database'), - }); - } - static endPool() { - return __awaiter(this, void 0, void 0, function* () { - return new Promise(resolve => { - if (this.currentPool !== undefined) { - this.currentPool.end(() => { - Logger.info('Mysql connection pool ended.'); - resolve(); - }); - this.currentPool = undefined; - } - else { - resolve(); - } - }); - }); - } - static query(queryString, values, connection) { - return __awaiter(this, void 0, void 0, function* () { - return yield new Promise((resolve, reject) => { - Logger.dev('Mysql query:', queryString, '; values:', values); - (connection ? connection : this.pool).query(queryString, values, (error, results, fields) => { - if (error !== null) { - reject(error); - return; - } - resolve({ - results: Array.isArray(results) ? results : [], - fields: fields !== undefined ? fields : [], - other: Array.isArray(results) ? null : results - }); - }); - }); - }); - } - static wrapTransaction(transaction) { - return __awaiter(this, void 0, void 0, function* () { - return yield new Promise((resolve, reject) => { - this.pool.getConnection((err, connection) => { - if (err) { - reject(err); - return; - } - connection.beginTransaction((err) => { - if (err) { - reject(err); - this.pool.releaseConnection(connection); - return; - } - transaction(connection).then(val => { - connection.commit((err) => { - if (err) { - this.rejectAndRollback(connection, err, reject); - this.pool.releaseConnection(connection); - return; - } - this.pool.releaseConnection(connection); - resolve(val); - }); - }).catch(err => { - this.rejectAndRollback(connection, err, reject); - this.pool.releaseConnection(connection); - }); - }); - }); - }); - }); - } - static rejectAndRollback(connection, err, reject) { - connection.rollback((rollbackErr) => { - if (rollbackErr) { - reject(err + '\n' + rollbackErr); - } - else { - reject(err); - } - }); - } - static handleMigrations() { - return __awaiter(this, void 0, void 0, function* () { - let currentVersion = 0; - try { - const result = yield query('SELECT id FROM migrations ORDER BY id DESC LIMIT 1'); - currentVersion = result.results[0].id; - } - catch (e) { - if (e.code === 'ECONNREFUSED' || e.code !== 'ER_NO_SUCH_TABLE') { - throw new Error('Cannot run migrations: ' + e.code); - } - } - for (const migration of this.migrations) { - if (yield migration.shouldRun(currentVersion)) { - Logger.info('Running migration ', migration.version, migration.constructor.name); - yield migration.install(); - yield query('INSERT INTO migrations VALUES(?, ?, NOW())', [ - migration.version, - migration.constructor.name, - ]); - } - } - }); - } -} -MysqlConnectionManager.databaseReady = false; -MysqlConnectionManager.migrations = []; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"MysqlConnectionManager.js","sourceRoot":"./","sources":["db/MysqlConnectionManager.ts"],"names":[],"mappings":"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","sourcesContent":["import mysql, {Connection, FieldInfo, Pool} from 'mysql';\nimport config from 'config';\nimport Migration from \"./Migration\";\nimport Logger from \"../Logger\";\n\nexport interface QueryResult {\n    readonly results: any[];\n    readonly fields: FieldInfo[];\n    readonly other?: any;\n    foundRows?: number;\n}\n\nexport async function query(queryString: string, values?: any, connection?: Connection): Promise<QueryResult> {\n    return await MysqlConnectionManager.query(queryString, values, connection);\n}\n\nexport default class MysqlConnectionManager {\n    private static currentPool?: Pool;\n    private static databaseReady: boolean = false;\n    private static readonly migrations: Migration[] = [];\n\n    public static registerMigration(migration: (version: number) => Migration) {\n        this.migrations.push(migration(this.migrations.length + 1));\n    }\n\n    public static async prepare() {\n        if (config.get('mysql.create_database_automatically') === true) {\n            const dbName = config.get('mysql.database');\n            Logger.info(`Creating database ${dbName}...`);\n            const connection = mysql.createConnection({\n                host: config.get('mysql.host'),\n                user: config.get('mysql.user'),\n                password: config.get('mysql.password'),\n            });\n            await new Promise((resolve, reject) => {\n                connection.query(`CREATE DATABASE IF NOT EXISTS ${dbName}`, (error) => {\n                    if (error !== null) {\n                        reject(error);\n                    } else {\n                        resolve();\n                    }\n                });\n            });\n            connection.end();\n            Logger.info(`Database ${dbName} created!`);\n        }\n        this.databaseReady = true;\n\n        await this.handleMigrations();\n    }\n\n    public static get pool(): Pool {\n        if (this.currentPool === undefined) {\n            this.currentPool = this.createPool();\n        }\n        return this.currentPool;\n    }\n\n    private static createPool(): Pool {\n        return mysql.createPool({\n            connectionLimit: config.get('mysql.connectionLimit'),\n            host: config.get('mysql.host'),\n            user: config.get('mysql.user'),\n            password: config.get('mysql.password'),\n            database: config.get('mysql.database'),\n        });\n    }\n\n    public static async endPool(): Promise<void> {\n        return new Promise(resolve => {\n            if (this.currentPool !== undefined) {\n                this.currentPool.end(() => {\n                    Logger.info('Mysql connection pool ended.');\n                    resolve();\n                });\n                this.currentPool = undefined;\n            } else {\n                resolve();\n            }\n        });\n    }\n\n    public static async query(queryString: string, values?: any, connection?: Connection): Promise<QueryResult> {\n        return await new Promise<QueryResult>((resolve, reject) => {\n            Logger.dev('Mysql query:', queryString, '; values:', values);\n            (connection ? connection : this.pool).query(queryString, values, (error, results, fields) => {\n                if (error !== null) {\n                    reject(error);\n                    return;\n                }\n\n                resolve({\n                    results: Array.isArray(results) ? results : [],\n                    fields: fields !== undefined ? fields : [],\n                    other: Array.isArray(results) ? null : results\n                });\n            });\n        });\n    }\n\n    public static async wrapTransaction<T>(transaction: (connection: Connection) => Promise<T>): Promise<T> {\n        return await new Promise<T>((resolve, reject) => {\n            this.pool.getConnection((err, connection) => {\n                if (err) {\n                    reject(err);\n                    return;\n                }\n\n                connection.beginTransaction((err) => {\n                    if (err) {\n                        reject(err);\n                        this.pool.releaseConnection(connection);\n                        return;\n                    }\n\n                    transaction(connection).then(val => {\n                        connection.commit((err) => {\n                            if (err) {\n                                this.rejectAndRollback(connection, err, reject);\n                                this.pool.releaseConnection(connection);\n                                return;\n                            }\n\n                            this.pool.releaseConnection(connection);\n                            resolve(val);\n                        });\n                    }).catch(err => {\n                        this.rejectAndRollback(connection, err, reject);\n                        this.pool.releaseConnection(connection);\n                    });\n                });\n            });\n        });\n    }\n\n    private static rejectAndRollback(connection: Connection, err: any, reject: (err: any) => void) {\n        connection.rollback((rollbackErr) => {\n            if (rollbackErr) {\n                reject(err + '\\n' + rollbackErr);\n            } else {\n                reject(err);\n            }\n        });\n    }\n\n    private static async handleMigrations() {\n        let currentVersion = 0;\n\n        try {\n            const result = await query('SELECT id FROM migrations ORDER BY id DESC LIMIT 1');\n            currentVersion = result.results[0].id;\n        } catch (e) {\n            if (e.code === 'ECONNREFUSED' || e.code !== 'ER_NO_SUCH_TABLE') {\n                throw new Error('Cannot run migrations: ' + e.code);\n            }\n        }\n\n        for (const migration of this.migrations) {\n            if (await migration.shouldRun(currentVersion)) {\n                Logger.info('Running migration ', migration.version, migration.constructor.name);\n                await migration.install();\n                await query('INSERT INTO migrations VALUES(?, ?, NOW())', [\n                    migration.version,\n                    migration.constructor.name,\n                ]);\n            }\n        }\n    }\n}"]} \ No newline at end of file diff --git a/dist/db/Query.d.ts b/dist/db/Query.d.ts deleted file mode 100644 index 72cd517..0000000 --- a/dist/db/Query.d.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { QueryResult } from "./MysqlConnectionManager"; -import { Connection } from "mysql"; -export default class Query { - static select(table: string, ...fields: string[]): Query; - static update(table: string, data: { - [key: string]: any; - }): Query; - static delete(table: string): Query; - private readonly type; - private readonly table; - private readonly fields; - private _where; - private _limit?; - private _offset?; - private _sortBy?; - private _sortDirection?; - private _foundRows; - private constructor(); - where(field: string, value: string | Date | Query | any, operator?: WhereOperator, test?: WhereTest): Query; - whereNot(field: string, value: string | Date | Query | any, operator?: WhereOperator): Query; - orWhere(field: string, value: string | Date | Query | any): Query; - whereIn(field: string, value: any[]): Query; - limit(limit: number, offset?: number): Query; - first(): Query; - sortBy(field: string, direction?: 'ASC' | 'DESC'): Query; - withTotalRowCount(): Query; - toString(final?: boolean): string; - build(): string; - get variables(): any[]; - isCacheable(): boolean; - execute(connection?: Connection): Promise; -} -export declare enum QueryType { - SELECT = 0, - UPDATE = 1, - DELETE = 2 -} -declare enum WhereOperator { - AND = "AND", - OR = "OR" -} -declare enum WhereTest { - EQUALS = "=", - DIFFERENT = "!=", - IN = " IN " -} -export {}; diff --git a/dist/db/Query.js b/dist/db/Query.js deleted file mode 100644 index ece3d18..0000000 --- a/dist/db/Query.js +++ /dev/null @@ -1,176 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -import { query } from "./MysqlConnectionManager"; -export default class Query { - constructor(type, table, fields) { - this._where = []; - this._foundRows = false; - this.type = type; - this.table = table; - this.fields = fields || []; - } - static select(table, ...fields) { - return new Query(QueryType.SELECT, table, fields.length > 0 ? fields : ['*']); - } - static update(table, data) { - const fields = []; - for (let key in data) { - if (data.hasOwnProperty(key)) { - fields.push(new UpdateFieldValue(key, data[key])); - } - } - return new Query(QueryType.UPDATE, table, fields); - } - static delete(table) { - return new Query(QueryType.DELETE, table); - } - where(field, value, operator = WhereOperator.AND, test = WhereTest.EQUALS) { - this._where.push(new WhereFieldValue(field, value, operator, test)); - return this; - } - whereNot(field, value, operator = WhereOperator.AND) { - return this.where(field, value, operator, WhereTest.DIFFERENT); - } - orWhere(field, value) { - return this.where(field, value, WhereOperator.OR); - } - whereIn(field, value) { - return this.where(field, value, WhereOperator.AND, WhereTest.IN); - } - limit(limit, offset = 0) { - this._limit = limit; - this._offset = offset; - return this; - } - first() { - return this.limit(1); - } - sortBy(field, direction = 'ASC') { - this._sortBy = field; - this._sortDirection = direction; - return this; - } - withTotalRowCount() { - this._foundRows = true; - return this; - } - toString(final = false) { - var _a; - let query = ''; - let fields = (_a = this.fields) === null || _a === void 0 ? void 0 : _a.join(','); - let where = ''; - if (this._where.length > 0) { - where = `WHERE ${this._where[0]}`; - for (let i = 1; i < this._where.length; i++) { - where += this._where[i].toString(false); - } - } - let limit = ''; - if (typeof this._limit === 'number') { - limit = `LIMIT ${this._limit}`; - if (typeof this._offset === 'number' && this._offset !== 0) { - limit += ` OFFSET ${this._offset}`; - } - } - let orderBy = ''; - if (typeof this._sortBy === 'string') { - orderBy = `ORDER BY ${this._sortBy} ${this._sortDirection}`; - } - switch (this.type) { - case QueryType.SELECT: - query = `SELECT ${this._foundRows ? 'SQL_CALC_FOUND_ROWS' : ''} ${fields} FROM ${this.table} ${where} ${orderBy} ${limit}`; - break; - case QueryType.UPDATE: - query = `UPDATE ${this.table} SET ${fields} ${where} ${orderBy} ${limit}`; - break; - case QueryType.DELETE: - query = `DELETE FROM ${this.table} ${where} ${orderBy} ${limit}`; - break; - } - return final ? query : `(${query})`; - } - build() { - return this.toString(true); - } - get variables() { - var _a; - const variables = []; - (_a = this.fields) === null || _a === void 0 ? void 0 : _a.filter(v => v instanceof FieldValue).flatMap(v => v.variables).forEach(v => variables.push(v)); - this._where.flatMap(v => v.variables) - .forEach(v => variables.push(v)); - return variables; - } - isCacheable() { - return this.type === QueryType.SELECT && this.fields.length === 1 && this.fields[0] === '*'; - } - execute(connection) { - return __awaiter(this, void 0, void 0, function* () { - const queryResult = yield query(this.build(), this.variables, connection); - if (this._foundRows) { - const foundRows = yield query('SELECT FOUND_ROWS() as r', undefined, connection); - queryResult.foundRows = foundRows.results[0].r; - } - return queryResult; - }); - } -} -export var QueryType; -(function (QueryType) { - QueryType[QueryType["SELECT"] = 0] = "SELECT"; - QueryType[QueryType["UPDATE"] = 1] = "UPDATE"; - QueryType[QueryType["DELETE"] = 2] = "DELETE"; -})(QueryType || (QueryType = {})); -var WhereOperator; -(function (WhereOperator) { - WhereOperator["AND"] = "AND"; - WhereOperator["OR"] = "OR"; -})(WhereOperator || (WhereOperator = {})); -var WhereTest; -(function (WhereTest) { - WhereTest["EQUALS"] = "="; - WhereTest["DIFFERENT"] = "!="; - WhereTest["IN"] = " IN "; -})(WhereTest || (WhereTest = {})); -class FieldValue { - constructor(field, value) { - this.field = field; - this.value = value; - } - toString(first = true) { - return `${!first ? ',' : ''}${this.field}${this.test}${this.value instanceof Query ? this.value : (Array.isArray(this.value) ? '(?)' : '?')}`; - } - get test() { - return '='; - } - get variables() { - return this.value instanceof Query ? this.value.variables : [this.value]; - } -} -class SelectFieldValue extends FieldValue { - toString(first = true) { - return `(${this.value instanceof Query ? this.value : '?'}) AS ${this.field}`; - } -} -class UpdateFieldValue extends FieldValue { -} -class WhereFieldValue extends FieldValue { - constructor(field, value, operator, test) { - super(field, value); - this.operator = operator; - this._test = test; - } - toString(first = true) { - return (!first ? ` ${this.operator} ` : '') + super.toString(true); - } - get test() { - return this._test; - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Query.js","sourceRoot":"./","sources":["db/Query.ts"],"names":[],"mappings":"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","sourcesContent":["import {query, QueryResult} from \"./MysqlConnectionManager\";\nimport {Connection} from \"mysql\";\n\nexport default class Query {\n    public static select(table: string, ...fields: string[]): Query {\n        return new Query(QueryType.SELECT, table, fields.length > 0 ? fields : ['*']);\n    }\n\n    public static update(table: string, data: {\n        [key: string]: any\n    }) {\n        const fields = [];\n        for (let key in data) {\n            if (data.hasOwnProperty(key)) {\n                fields.push(new UpdateFieldValue(key, data[key]));\n            }\n        }\n        return new Query(QueryType.UPDATE, table, fields);\n    }\n\n    public static delete(table: string) {\n        return new Query(QueryType.DELETE, table);\n    }\n\n    private readonly type: QueryType;\n    private readonly table: string;\n    private readonly fields: (string | SelectFieldValue | UpdateFieldValue)[];\n    private _where: WhereFieldValue[] = [];\n    private _limit?: number;\n    private _offset?: number;\n    private _sortBy?: string;\n    private _sortDirection?: 'ASC' | 'DESC';\n    private _foundRows: boolean = false;\n\n    private constructor(type: QueryType, table: string, fields?: (string | SelectFieldValue | UpdateFieldValue)[]) {\n        this.type = type;\n        this.table = table;\n        this.fields = fields || [];\n    }\n\n    public where(field: string, value: string | Date | Query | any, operator: WhereOperator = WhereOperator.AND, test: WhereTest = WhereTest.EQUALS): Query {\n        this._where.push(new WhereFieldValue(field, value, operator, test));\n        return this;\n    }\n\n    public whereNot(field: string, value: string | Date | Query | any, operator: WhereOperator = WhereOperator.AND): Query {\n        return this.where(field, value, operator, WhereTest.DIFFERENT);\n    }\n\n    public orWhere(field: string, value: string | Date | Query | any): Query {\n        return this.where(field, value, WhereOperator.OR);\n    }\n\n    public whereIn(field: string, value: any[]): Query {\n        return this.where(field, value, WhereOperator.AND, WhereTest.IN);\n    }\n\n    public limit(limit: number, offset: number = 0): Query {\n        this._limit = limit;\n        this._offset = offset;\n        return this;\n    }\n\n    public first(): Query {\n        return this.limit(1);\n    }\n\n    public sortBy(field: string, direction: 'ASC' | 'DESC' = 'ASC'): Query {\n        this._sortBy = field;\n        this._sortDirection = direction;\n        return this;\n    }\n\n    public withTotalRowCount(): Query {\n        this._foundRows = true;\n        return this;\n    }\n\n    public toString(final: boolean = false): string {\n        let query = '';\n\n        let fields = this.fields?.join(',');\n\n        let where = '';\n        if (this._where.length > 0) {\n            where = `WHERE ${this._where[0]}`;\n            for (let i = 1; i < this._where.length; i++) {\n                where += this._where[i].toString(false);\n            }\n        }\n\n        let limit = '';\n        if (typeof this._limit === 'number') {\n            limit = `LIMIT ${this._limit}`;\n            if (typeof this._offset === 'number' && this._offset !== 0) {\n                limit += ` OFFSET ${this._offset}`;\n            }\n        }\n\n        let orderBy = '';\n        if (typeof this._sortBy === 'string') {\n            orderBy = `ORDER BY ${this._sortBy} ${this._sortDirection}`;\n        }\n\n        switch (this.type) {\n            case QueryType.SELECT:\n                query = `SELECT ${this._foundRows ? 'SQL_CALC_FOUND_ROWS' : ''} ${fields} FROM ${this.table} ${where} ${orderBy} ${limit}`;\n                break;\n            case QueryType.UPDATE:\n                query = `UPDATE ${this.table} SET ${fields} ${where} ${orderBy} ${limit}`;\n                break;\n            case QueryType.DELETE:\n                query = `DELETE FROM ${this.table} ${where} ${orderBy} ${limit}`;\n                break;\n\n        }\n\n        return final ? query : `(${query})`;\n    }\n\n    public build(): string {\n        return this.toString(true);\n    }\n\n    public get variables(): any[] {\n        const variables: any[] = [];\n        this.fields?.filter(v => v instanceof FieldValue)\n            .flatMap(v => (<FieldValue>v).variables)\n            .forEach(v => variables.push(v));\n        this._where.flatMap(v => v.variables)\n            .forEach(v => variables.push(v));\n        return variables;\n    }\n\n    public isCacheable(): boolean {\n        return this.type === QueryType.SELECT && this.fields.length === 1 && this.fields[0] === '*';\n    }\n\n    public async execute(connection?: Connection): Promise<QueryResult> {\n        const queryResult = await query(this.build(), this.variables, connection);\n        if (this._foundRows) {\n            const foundRows = await query('SELECT FOUND_ROWS() as r', undefined, connection);\n            queryResult.foundRows = foundRows.results[0].r;\n        }\n        return queryResult;\n    }\n}\n\nexport enum QueryType {\n    SELECT,\n    UPDATE,\n    DELETE,\n}\n\nenum WhereOperator {\n    AND = 'AND',\n    OR = 'OR',\n}\n\nenum WhereTest {\n    EQUALS = '=',\n    DIFFERENT = '!=',\n    IN = ' IN ',\n}\n\nclass FieldValue {\n    protected readonly field: string;\n    protected value: any;\n\n    constructor(field: string, value: any) {\n        this.field = field;\n        this.value = value;\n    }\n\n    public toString(first: boolean = true): string {\n        return `${!first ? ',' : ''}${this.field}${this.test}${this.value instanceof Query ? this.value : (Array.isArray(this.value) ? '(?)' : '?')}`;\n    }\n\n    protected get test(): string {\n        return '=';\n    }\n\n    public get variables(): any[] {\n        return this.value instanceof Query ? this.value.variables : [this.value];\n    }\n}\n\nclass SelectFieldValue extends FieldValue {\n    public toString(first: boolean = true): string {\n        return `(${this.value instanceof Query ? this.value : '?'}) AS ${this.field}`;\n    }\n}\n\nclass UpdateFieldValue extends FieldValue {\n}\n\nclass WhereFieldValue extends FieldValue {\n    private readonly operator: WhereOperator;\n    private readonly _test: WhereTest;\n\n    constructor(field: string, value: any, operator: WhereOperator, test: WhereTest) {\n        super(field, value);\n        this.operator = operator;\n        this._test = test;\n    }\n\n    public toString(first: boolean = true): string {\n        return (!first ? ` ${this.operator} ` : '') + super.toString(true);\n    }\n\n    protected get test(): string {\n        return this._test;\n    }\n}"]} \ No newline at end of file diff --git a/dist/db/Validator.d.ts b/dist/db/Validator.d.ts deleted file mode 100644 index e5a2edd..0000000 --- a/dist/db/Validator.d.ts +++ /dev/null @@ -1,86 +0,0 @@ -import Model from "./Model"; -import Query from "./Query"; -import { Connection } from "mysql"; -export default class Validator { - private readonly steps; - private readonly validationAttributes; - private _min?; - private _max?; - /** - * @param thingName The name of the thing to validate. - * @param value The value to verify. - * @param onlyFormat {@code true} to only validate format properties, {@code false} otherwise. - * @param connection A connection to use in case of wrapped transactions. - */ - execute(thingName: string, value: T | undefined, onlyFormat: boolean, connection?: Connection): Promise; - defined(): Validator; - acceptUndefined(): Validator; - equals(other?: T): Validator; - regexp(regexp: RegExp): Validator; - length(length: number): Validator; - /** - * @param minLength included - * @param maxLength included - */ - between(minLength: number, maxLength: number): Validator; - /** - * @param min included - */ - min(min: number): Validator; - /** - * @param max included - */ - max(max: number): Validator; - unique(model: Model, querySupplier?: () => Query): Validator; - exists(modelClass: Function, foreignKey?: string): Validator; - private addStep; - getValidationAttributes(): string[]; - step(step: number): Validator; -} -export declare class ValidationBag extends Error { - private readonly messages; - addMessage(err: ValidationError): void; - hasMessages(): boolean; - getMessages(): { - [p: string]: ValidationError; - }; -} -export declare abstract class ValidationError extends Error { - thingName?: string; - value?: any; - get name(): string; -} -export declare class BadLengthValidationError extends ValidationError { - private readonly expectedLength; - private readonly maxLength?; - constructor(expectedLength: number, maxLength?: number); - get message(): string; -} -export declare class BadValueValidationError extends ValidationError { - private readonly expectedValue; - constructor(expectedValue: any); - get message(): string; -} -export declare class OutOfRangeValidationError extends ValidationError { - private readonly min?; - private readonly max?; - constructor(min?: number, max?: number); - get message(): string; -} -export declare class InvalidFormatValidationError extends ValidationError { - get message(): string; -} -export declare class UndefinedValueValidationError extends ValidationError { - get message(): string; -} -export declare class AlreadyExistsValidationError extends ValidationError { - private readonly table; - constructor(table: string); - get message(): string; -} -export declare class UnknownRelationValidationError extends ValidationError { - private readonly table; - private readonly foreignKey?; - constructor(table: string, foreignKey?: string); - get message(): string; -} diff --git a/dist/db/Validator.js b/dist/db/Validator.js deleted file mode 100644 index 6766235..0000000 --- a/dist/db/Validator.js +++ /dev/null @@ -1,261 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -export default class Validator { - constructor() { - this.steps = []; - this.validationAttributes = []; - } - /** - * @param thingName The name of the thing to validate. - * @param value The value to verify. - * @param onlyFormat {@code true} to only validate format properties, {@code false} otherwise. - * @param connection A connection to use in case of wrapped transactions. - */ - execute(thingName, value, onlyFormat, connection) { - return __awaiter(this, void 0, void 0, function* () { - const bag = new ValidationBag(); - for (const step of this.steps) { - if (onlyFormat && !step.isFormat) - continue; - const result = step.verifyStep(value, thingName, connection); - if ((result === false || result instanceof Promise && (yield result) === false) && step.throw) { - const error = step.throw(); - error.thingName = thingName; - error.value = value; - bag.addMessage(error); - } - else if (step.interrupt !== undefined && step.interrupt(value)) { - break; - } - } - if (bag.hasMessages()) { - throw bag; - } - }); - } - defined() { - this.validationAttributes.push('required'); - this.addStep({ - verifyStep: val => val !== undefined, - throw: () => new UndefinedValueValidationError(), - isFormat: true, - }); - return this; - } - acceptUndefined() { - this.addStep({ - verifyStep: () => true, - throw: null, - interrupt: val => val === undefined || val === null, - isFormat: true, - }); - return this; - } - equals(other) { - this.addStep({ - verifyStep: val => val === other, - throw: () => new BadValueValidationError(other), - isFormat: true, - }); - return this; - } - regexp(regexp) { - this.validationAttributes.push(`pattern="${regexp}"`); - this.addStep({ - verifyStep: val => regexp.test(val), - throw: () => new InvalidFormatValidationError(), - isFormat: true, - }); - return this; - } - length(length) { - this.addStep({ - verifyStep: val => val.length === length, - throw: () => new BadLengthValidationError(length), - isFormat: true, - }); - return this; - } - /** - * @param minLength included - * @param maxLength included - */ - between(minLength, maxLength) { - this.addStep({ - verifyStep: val => { - const length = val.length; - return length >= minLength && length <= maxLength; - }, - throw: () => new BadLengthValidationError(minLength, maxLength), - isFormat: true, - }); - return this; - } - /** - * @param min included - */ - min(min) { - this.validationAttributes.push(`min="${min}"`); - this._min = min; - this.addStep({ - verifyStep: val => { - return val >= min; - }, - throw: () => new OutOfRangeValidationError(this._min, this._max), - isFormat: true, - }); - return this; - } - /** - * @param max included - */ - max(max) { - this.validationAttributes.push(`max="${max}"`); - this._max = max; - this.addStep({ - verifyStep: val => { - return val <= max; - }, - throw: () => new OutOfRangeValidationError(this._min, this._max), - isFormat: true, - }); - return this; - } - unique(model, querySupplier) { - this.addStep({ - verifyStep: (val, thingName, c) => __awaiter(this, void 0, void 0, function* () { - let query; - if (querySupplier) { - query = querySupplier().where(thingName, val); - } - else { - query = model.constructor.select('1').where(thingName, val); - } - if (typeof model.id === 'number') - query = query.whereNot('id', model.id); - return (yield query.execute(c)).results.length === 0; - }), - throw: () => new AlreadyExistsValidationError(model.table), - isFormat: false, - }); - return this; - } - exists(modelClass, foreignKey) { - this.addStep({ - verifyStep: (val, thingName, c) => __awaiter(this, void 0, void 0, function* () { return (yield modelClass.select('1').where(foreignKey !== undefined ? foreignKey : thingName, val).execute(c)).results.length >= 1; }), - throw: () => new UnknownRelationValidationError(modelClass.table, foreignKey), - isFormat: false, - }); - return this; - } - addStep(step) { - this.steps.push(step); - } - getValidationAttributes() { - return this.validationAttributes; - } - step(step) { - this.validationAttributes.push(`step="${step}"`); - return this; - } -} -export class ValidationBag extends Error { - constructor() { - super(...arguments); - this.messages = {}; - } - addMessage(err) { - if (!err.thingName) { - throw new Error('Null thing name'); - } - this.messages[err.thingName] = { - name: err.name, - message: err.message, - value: err.value, - }; - } - hasMessages() { - return Object.keys(this.messages).length > 0; - } - getMessages() { - return this.messages; - } -} -export class ValidationError extends Error { - get name() { - return this.constructor.name; - } -} -export class BadLengthValidationError extends ValidationError { - constructor(expectedLength, maxLength) { - super(); - this.expectedLength = expectedLength; - this.maxLength = maxLength; - } - get message() { - return `${this.thingName} expected length: ${this.expectedLength}${this.maxLength !== undefined ? ` to ${this.maxLength}` : ''}; ` + - `actual length: ${this.value.length}.`; - } -} -export class BadValueValidationError extends ValidationError { - constructor(expectedValue) { - super(); - this.expectedValue = expectedValue; - } - get message() { - return `Expected: ${this.expectedValue}; got: ${this.value}.`; - } -} -export class OutOfRangeValidationError extends ValidationError { - constructor(min, max) { - super(); - this.min = min; - this.max = max; - } - get message() { - if (this.min === undefined) { - return `${this.thingName} must be at most ${this.max}`; - } - else if (this.max === undefined) { - return `${this.thingName} must be at least ${this.min}`; - } - return `${this.thingName} must be between ${this.min} and ${this.max}.`; - } -} -export class InvalidFormatValidationError extends ValidationError { - get message() { - return `"${this.value}" is not a valid ${this.thingName}.`; - } -} -export class UndefinedValueValidationError extends ValidationError { - get message() { - return `${this.thingName} is required.`; - } -} -export class AlreadyExistsValidationError extends ValidationError { - constructor(table) { - super(); - this.table = table; - } - get message() { - return `${this.value} already exists in ${this.table}.${this.thingName}.`; - } -} -export class UnknownRelationValidationError extends ValidationError { - constructor(table, foreignKey) { - super(); - this.table = table; - this.foreignKey = foreignKey; - } - get message() { - return `${this.thingName}=${this.value} relation was not found in ${this.table}${this.foreignKey !== undefined ? `.${this.foreignKey}` : ''}.`; - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Validator.js","sourceRoot":"./","sources":["db/Validator.ts"],"names":[],"mappings":"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","sourcesContent":["import Model from \"./Model\";\nimport Query from \"./Query\";\nimport {Connection} from \"mysql\";\n\nexport default class Validator<T> {\n    private readonly steps: ValidationStep<T>[] = [];\n    private readonly validationAttributes: string[] = [];\n\n    private _min?: number;\n    private _max?: number;\n\n    /**\n     * @param thingName The name of the thing to validate.\n     * @param value The value to verify.\n     * @param onlyFormat {@code true} to only validate format properties, {@code false} otherwise.\n     * @param connection A connection to use in case of wrapped transactions.\n     */\n    async execute(thingName: string, value: T | undefined, onlyFormat: boolean, connection?: Connection): Promise<void> {\n        const bag = new ValidationBag();\n\n        for (const step of this.steps) {\n            if (onlyFormat && !step.isFormat) continue;\n\n            const result = step.verifyStep(value, thingName, connection);\n            if ((result === false || result instanceof Promise && (await result) === false) && step.throw) {\n                const error: ValidationError = step.throw();\n                error.thingName = thingName;\n                error.value = value;\n                bag.addMessage(error);\n            } else if (step.interrupt !== undefined && step.interrupt(value)) {\n                break;\n            }\n        }\n\n        if (bag.hasMessages()) {\n            throw bag;\n        }\n    }\n\n    public defined(): Validator<T> {\n        this.validationAttributes.push('required');\n\n        this.addStep({\n            verifyStep: val => val !== undefined,\n            throw: () => new UndefinedValueValidationError(),\n            isFormat: true,\n        });\n        return this;\n    }\n\n    public acceptUndefined(): Validator<T> {\n        this.addStep({\n            verifyStep: () => true,\n            throw: null,\n            interrupt: val => val === undefined || val === null,\n            isFormat: true,\n        });\n        return this;\n    }\n\n    public equals(other?: T): Validator<T> {\n        this.addStep({\n            verifyStep: val => val === other,\n            throw: () => new BadValueValidationError(other),\n            isFormat: true,\n        });\n        return this;\n    }\n\n    public regexp(regexp: RegExp): Validator<T> {\n        this.validationAttributes.push(`pattern=\"${regexp}\"`);\n        this.addStep({\n            verifyStep: val => regexp.test(<string><unknown>val),\n            throw: () => new InvalidFormatValidationError(),\n            isFormat: true,\n        });\n        return this;\n    }\n\n    public length(length: number): Validator<T> {\n        this.addStep({\n            verifyStep: val => (<any>val).length === length,\n            throw: () => new BadLengthValidationError(length),\n            isFormat: true,\n        });\n        return this;\n    }\n\n    /**\n     * @param minLength included\n     * @param maxLength included\n     */\n    public between(minLength: number, maxLength: number): Validator<T> {\n        this.addStep({\n            verifyStep: val => {\n                const length = (<any>val).length;\n                return length >= minLength && length <= maxLength;\n            },\n            throw: () => new BadLengthValidationError(minLength, maxLength),\n            isFormat: true,\n        });\n        return this;\n    }\n\n    /**\n     * @param min included\n     */\n    public min(min: number): Validator<T> {\n        this.validationAttributes.push(`min=\"${min}\"`);\n        this._min = min;\n        this.addStep({\n            verifyStep: val => {\n                return (<any>val) >= min;\n            },\n            throw: () => new OutOfRangeValidationError(this._min, this._max),\n            isFormat: true,\n        });\n        return this;\n    }\n\n    /**\n     * @param max included\n     */\n    public max(max: number): Validator<T> {\n        this.validationAttributes.push(`max=\"${max}\"`);\n        this._max = max;\n        this.addStep({\n            verifyStep: val => {\n                return (<any>val) <= max;\n            },\n            throw: () => new OutOfRangeValidationError(this._min, this._max),\n            isFormat: true,\n        });\n        return this;\n    }\n\n    public unique(model: Model, querySupplier?: () => Query): Validator<T> {\n        this.addStep({\n            verifyStep: async (val, thingName, c) => {\n                let query: Query;\n                if (querySupplier) {\n                    query = querySupplier().where(thingName, val);\n                } else {\n                    query = (<any>model.constructor).select('1').where(thingName, val);\n                }\n                if (typeof model.id === 'number') query = query.whereNot('id', model.id);\n                return (await query.execute(c)).results.length === 0;\n            },\n            throw: () => new AlreadyExistsValidationError(model.table),\n            isFormat: false,\n        });\n        return this;\n    }\n\n    public exists(modelClass: Function, foreignKey?: string): Validator<T> {\n        this.addStep({\n            verifyStep: async (val, thingName, c) => (await (<any>modelClass).select('1').where(foreignKey !== undefined ? foreignKey : thingName, val).execute(c)).results.length >= 1,\n            throw: () => new UnknownRelationValidationError((<any>modelClass).table, foreignKey),\n            isFormat: false,\n        });\n        return this;\n    }\n\n    private addStep(step: ValidationStep<T>) {\n        this.steps.push(step);\n    }\n\n    public getValidationAttributes(): string[] {\n        return this.validationAttributes;\n    }\n\n    public step(step: number): Validator<T> {\n        this.validationAttributes.push(`step=\"${step}\"`);\n        return this;\n    }\n}\n\ninterface ValidationStep<T> {\n    interrupt?: (val?: T) => boolean;\n\n    verifyStep(val: T | undefined, thingName: string, connection?: Connection): boolean | Promise<boolean>;\n\n    throw: ((val?: T) => ValidationError) | null;\n\n    readonly isFormat: boolean;\n}\n\nexport class ValidationBag extends Error {\n    private readonly messages: { [p: string]: any } = {};\n\n    public addMessage(err: ValidationError) {\n        if (!err.thingName) {\n            throw new Error('Null thing name');\n        }\n\n        this.messages[err.thingName] = {\n            name: err.name,\n            message: err.message,\n            value: err.value,\n        };\n    }\n\n    public hasMessages(): boolean {\n        return Object.keys(this.messages).length > 0;\n    }\n\n    public getMessages(): { [p: string]: ValidationError } {\n        return this.messages;\n    }\n}\n\nexport abstract class ValidationError extends Error {\n    public thingName?: string;\n    public value?: any;\n\n    public get name(): string {\n        return this.constructor.name;\n    }\n}\n\nexport class BadLengthValidationError extends ValidationError {\n    private readonly expectedLength: number;\n    private readonly maxLength?: number;\n\n    constructor(expectedLength: number, maxLength?: number) {\n        super();\n        this.expectedLength = expectedLength;\n        this.maxLength = maxLength;\n    }\n\n    public get message(): string {\n        return `${this.thingName} expected length: ${this.expectedLength}${this.maxLength !== undefined ? ` to ${this.maxLength}` : ''}; ` +\n            `actual length: ${this.value.length}.`;\n    }\n}\n\nexport class BadValueValidationError extends ValidationError {\n    private readonly expectedValue: any;\n\n    constructor(expectedValue: any) {\n        super();\n        this.expectedValue = expectedValue;\n    }\n\n    public get message(): string {\n        return `Expected: ${this.expectedValue}; got: ${this.value}.`\n    }\n}\n\nexport class OutOfRangeValidationError extends ValidationError {\n    private readonly min?: number;\n    private readonly max?: number;\n\n    constructor(min?: number, max?: number) {\n        super();\n        this.min = min;\n        this.max = max;\n    }\n\n    public get message(): string {\n        if (this.min === undefined) {\n            return `${this.thingName} must be at most ${this.max}`;\n        } else if (this.max === undefined) {\n            return `${this.thingName} must be at least ${this.min}`;\n        }\n        return `${this.thingName} must be between ${this.min} and ${this.max}.`;\n    }\n}\n\nexport class InvalidFormatValidationError extends ValidationError {\n    public get message(): string {\n        return `\"${this.value}\" is not a valid ${this.thingName}.`;\n    }\n}\n\nexport class UndefinedValueValidationError extends ValidationError {\n    public get message(): string {\n        return `${this.thingName} is required.`;\n    }\n}\n\nexport class AlreadyExistsValidationError extends ValidationError {\n    private readonly table: string;\n\n    constructor(table: string) {\n        super();\n        this.table = table;\n    }\n\n    public get message(): string {\n        return `${this.value} already exists in ${this.table}.${this.thingName}.`;\n    }\n}\n\nexport class UnknownRelationValidationError extends ValidationError {\n    private readonly table: string;\n    private readonly foreignKey?: string;\n\n    constructor(table: string, foreignKey?: string) {\n        super();\n        this.table = table;\n        this.foreignKey = foreignKey;\n    }\n\n    public get message(): string {\n        return `${this.thingName}=${this.value} relation was not found in ${this.table}${this.foreignKey !== undefined ? `.${this.foreignKey}` : ''}.`;\n    }\n}"]} \ No newline at end of file diff --git a/dist/index.d.ts b/dist/index.d.ts deleted file mode 100644 index e69de29..0000000 diff --git a/dist/index.js b/dist/index.js deleted file mode 100644 index 2bb1323..0000000 --- a/dist/index.js +++ /dev/null @@ -1,2 +0,0 @@ -"use strict"; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiLi8iLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIiXX0= \ No newline at end of file diff --git a/dist/migrations/CreateLogsTable.d.ts b/dist/migrations/CreateLogsTable.d.ts deleted file mode 100644 index 1feed20..0000000 --- a/dist/migrations/CreateLogsTable.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import Migration from "../db/Migration"; -/** - * Must be the first migration - */ -export default class CreateLogsTable extends Migration { - install(): Promise; - rollback(): Promise; -} diff --git a/dist/migrations/CreateLogsTable.js b/dist/migrations/CreateLogsTable.js deleted file mode 100644 index 37b968a..0000000 --- a/dist/migrations/CreateLogsTable.js +++ /dev/null @@ -1,37 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -import Migration from "../db/Migration"; -import { query } from "../db/MysqlConnectionManager"; -/** - * Must be the first migration - */ -export default class CreateLogsTable extends Migration { - install() { - return __awaiter(this, void 0, void 0, function* () { - yield query('CREATE TABLE logs(' + - 'id INT NOT NULL AUTO_INCREMENT,' + - 'level TINYINT UNSIGNED NOT NULL,' + - 'message TEXT NOT NULL,' + - 'log_id BINARY(16),' + - 'error_name VARCHAR(128),' + - 'error_message VARCHAR(512),' + - 'error_stack TEXT,' + - 'created_at DATETIME NOT NULL DEFAULT NOW(),' + - 'PRIMARY KEY (id)' + - ')'); - }); - } - rollback() { - return __awaiter(this, void 0, void 0, function* () { - yield query('DROP TABLE logs'); - }); - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3JlYXRlTG9nc1RhYmxlLmpzIiwic291cmNlUm9vdCI6Ii4vIiwic291cmNlcyI6WyJtaWdyYXRpb25zL0NyZWF0ZUxvZ3NUYWJsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLFNBQVMsTUFBTSxpQkFBaUIsQ0FBQztBQUN4QyxPQUFPLEVBQUMsS0FBSyxFQUFDLE1BQU0sOEJBQThCLENBQUM7QUFFbkQ7O0dBRUc7QUFDSCxNQUFNLENBQUMsT0FBTyxPQUFPLGVBQWdCLFNBQVEsU0FBUztJQUM1QyxPQUFPOztZQUNULE1BQU0sS0FBSyxDQUFDLG9CQUFvQjtnQkFDNUIsaUNBQWlDO2dCQUNqQyxrQ0FBa0M7Z0JBQ2xDLHdCQUF3QjtnQkFDeEIsb0JBQW9CO2dCQUNwQiwwQkFBMEI7Z0JBQzFCLDZCQUE2QjtnQkFDN0IsbUJBQW1CO2dCQUNuQiw2Q0FBNkM7Z0JBQzdDLGtCQUFrQjtnQkFDbEIsR0FBRyxDQUFDLENBQUM7UUFDYixDQUFDO0tBQUE7SUFFSyxRQUFROztZQUNWLE1BQU0sS0FBSyxDQUFDLGlCQUFpQixDQUFDLENBQUM7UUFDbkMsQ0FBQztLQUFBO0NBQ0oiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgTWlncmF0aW9uIGZyb20gXCIuLi9kYi9NaWdyYXRpb25cIjtcbmltcG9ydCB7cXVlcnl9IGZyb20gXCIuLi9kYi9NeXNxbENvbm5lY3Rpb25NYW5hZ2VyXCI7XG5cbi8qKlxuICogTXVzdCBiZSB0aGUgZmlyc3QgbWlncmF0aW9uXG4gKi9cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIENyZWF0ZUxvZ3NUYWJsZSBleHRlbmRzIE1pZ3JhdGlvbiB7XG4gICAgYXN5bmMgaW5zdGFsbCgpOiBQcm9taXNlPHZvaWQ+IHtcbiAgICAgICAgYXdhaXQgcXVlcnkoJ0NSRUFURSBUQUJMRSBsb2dzKCcgK1xuICAgICAgICAgICAgJ2lkIElOVCBOT1QgTlVMTCBBVVRPX0lOQ1JFTUVOVCwnICtcbiAgICAgICAgICAgICdsZXZlbCBUSU5ZSU5UIFVOU0lHTkVEIE5PVCBOVUxMLCcgK1xuICAgICAgICAgICAgJ21lc3NhZ2UgVEVYVCBOT1QgTlVMTCwnICtcbiAgICAgICAgICAgICdsb2dfaWQgQklOQVJZKDE2KSwnICtcbiAgICAgICAgICAgICdlcnJvcl9uYW1lIFZBUkNIQVIoMTI4KSwnICtcbiAgICAgICAgICAgICdlcnJvcl9tZXNzYWdlIFZBUkNIQVIoNTEyKSwnICtcbiAgICAgICAgICAgICdlcnJvcl9zdGFjayBURVhULCcgK1xuICAgICAgICAgICAgJ2NyZWF0ZWRfYXQgREFURVRJTUUgTk9UIE5VTEwgREVGQVVMVCBOT1coKSwnICtcbiAgICAgICAgICAgICdQUklNQVJZIEtFWSAoaWQpJyArXG4gICAgICAgICAgICAnKScpO1xuICAgIH1cblxuICAgIGFzeW5jIHJvbGxiYWNrKCk6IFByb21pc2U8dm9pZD4ge1xuICAgICAgICBhd2FpdCBxdWVyeSgnRFJPUCBUQUJMRSBsb2dzJyk7XG4gICAgfVxufSJdfQ== \ No newline at end of file diff --git a/dist/migrations/CreateMigrationsTable.d.ts b/dist/migrations/CreateMigrationsTable.d.ts deleted file mode 100644 index 9d00a58..0000000 --- a/dist/migrations/CreateMigrationsTable.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import Migration from "../db/Migration"; -/** - * Must be the first migration - */ -export default class CreateMigrationsTable extends Migration { - shouldRun(currentVersion: number): Promise; - install(): Promise; - rollback(): Promise; -} diff --git a/dist/migrations/CreateMigrationsTable.js b/dist/migrations/CreateMigrationsTable.js deleted file mode 100644 index cda8f45..0000000 --- a/dist/migrations/CreateMigrationsTable.js +++ /dev/null @@ -1,48 +0,0 @@ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -import Migration from "../db/Migration"; -import { query } from "../db/MysqlConnectionManager"; -/** - * Must be the first migration - */ -export default class CreateMigrationsTable extends Migration { - shouldRun(currentVersion) { - const _super = Object.create(null, { - shouldRun: { get: () => super.shouldRun } - }); - return __awaiter(this, void 0, void 0, function* () { - try { - yield query('SELECT 1 FROM migrations LIMIT 1'); - } - catch (e) { - if (e.code !== 'ER_NO_SUCH_TABLE') { - return false; - } - } - return yield _super.shouldRun.call(this, currentVersion); - }); - } - install() { - return __awaiter(this, void 0, void 0, function* () { - yield query('CREATE TABLE migrations(' + - 'id INT NOT NULL,' + - 'name VARCHAR(64) NOT NULL,' + - 'migration_date DATE,' + - 'PRIMARY KEY (id)' + - ')'); - }); - } - rollback() { - return __awaiter(this, void 0, void 0, function* () { - yield query('DROP TABLE migrations'); - }); - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3JlYXRlTWlncmF0aW9uc1RhYmxlLmpzIiwic291cmNlUm9vdCI6Ii4vIiwic291cmNlcyI6WyJtaWdyYXRpb25zL0NyZWF0ZU1pZ3JhdGlvbnNUYWJsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLFNBQVMsTUFBTSxpQkFBaUIsQ0FBQztBQUN4QyxPQUFPLEVBQUMsS0FBSyxFQUFDLE1BQU0sOEJBQThCLENBQUM7QUFFbkQ7O0dBRUc7QUFDSCxNQUFNLENBQUMsT0FBTyxPQUFPLHFCQUFzQixTQUFRLFNBQVM7SUFDbEQsU0FBUyxDQUFDLGNBQXNCOzs7OztZQUNsQyxJQUFJO2dCQUNBLE1BQU0sS0FBSyxDQUFDLGtDQUFrQyxDQUFDLENBQUM7YUFDbkQ7WUFBQyxPQUFPLENBQUMsRUFBRTtnQkFDUixJQUFJLENBQUMsQ0FBQyxJQUFJLEtBQUssa0JBQWtCLEVBQUU7b0JBQy9CLE9BQU8sS0FBSyxDQUFDO2lCQUNoQjthQUNKO1lBRUQsT0FBTyxNQUFNLE9BQU0sU0FBUyxZQUFDLGNBQWMsQ0FBQyxDQUFDO1FBQ2pELENBQUM7S0FBQTtJQUVLLE9BQU87O1lBQ1QsTUFBTSxLQUFLLENBQUMsMEJBQTBCO2dCQUNsQyxrQkFBa0I7Z0JBQ2xCLDRCQUE0QjtnQkFDNUIsc0JBQXNCO2dCQUN0QixrQkFBa0I7Z0JBQ2xCLEdBQUcsQ0FBQyxDQUFDO1FBQ2IsQ0FBQztLQUFBO0lBRUssUUFBUTs7WUFDVixNQUFNLEtBQUssQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO1FBQ3pDLENBQUM7S0FBQTtDQUNKIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IE1pZ3JhdGlvbiBmcm9tIFwiLi4vZGIvTWlncmF0aW9uXCI7XG5pbXBvcnQge3F1ZXJ5fSBmcm9tIFwiLi4vZGIvTXlzcWxDb25uZWN0aW9uTWFuYWdlclwiO1xuXG4vKipcbiAqIE11c3QgYmUgdGhlIGZpcnN0IG1pZ3JhdGlvblxuICovXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBDcmVhdGVNaWdyYXRpb25zVGFibGUgZXh0ZW5kcyBNaWdyYXRpb24ge1xuICAgIGFzeW5jIHNob3VsZFJ1bihjdXJyZW50VmVyc2lvbjogbnVtYmVyKTogUHJvbWlzZTxib29sZWFuPiB7XG4gICAgICAgIHRyeSB7XG4gICAgICAgICAgICBhd2FpdCBxdWVyeSgnU0VMRUNUIDEgRlJPTSBtaWdyYXRpb25zIExJTUlUIDEnKTtcbiAgICAgICAgfSBjYXRjaCAoZSkge1xuICAgICAgICAgICAgaWYgKGUuY29kZSAhPT0gJ0VSX05PX1NVQ0hfVEFCTEUnKSB7XG4gICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlO1xuICAgICAgICAgICAgfVxuICAgICAgICB9XG5cbiAgICAgICAgcmV0dXJuIGF3YWl0IHN1cGVyLnNob3VsZFJ1bihjdXJyZW50VmVyc2lvbik7XG4gICAgfVxuXG4gICAgYXN5bmMgaW5zdGFsbCgpOiBQcm9taXNlPHZvaWQ+IHtcbiAgICAgICAgYXdhaXQgcXVlcnkoJ0NSRUFURSBUQUJMRSBtaWdyYXRpb25zKCcgK1xuICAgICAgICAgICAgJ2lkIElOVCBOT1QgTlVMTCwnICtcbiAgICAgICAgICAgICduYW1lIFZBUkNIQVIoNjQpIE5PVCBOVUxMLCcgK1xuICAgICAgICAgICAgJ21pZ3JhdGlvbl9kYXRlIERBVEUsJyArXG4gICAgICAgICAgICAnUFJJTUFSWSBLRVkgKGlkKScgK1xuICAgICAgICAgICAgJyknKTtcbiAgICB9XG5cbiAgICBhc3luYyByb2xsYmFjaygpOiBQcm9taXNlPHZvaWQ+IHtcbiAgICAgICAgYXdhaXQgcXVlcnkoJ0RST1AgVEFCTEUgbWlncmF0aW9ucycpO1xuICAgIH1cbn0iXX0= \ No newline at end of file diff --git a/dist/models/Log.d.ts b/dist/models/Log.d.ts deleted file mode 100644 index 46553bf..0000000 --- a/dist/models/Log.d.ts +++ /dev/null @@ -1,21 +0,0 @@ -/// -import Model from "../db/Model"; -import { LogLevelKeys } from "../Logger"; -export default class Log extends Model { - private level?; - message?: string; - private log_id?; - private error_name?; - private error_message?; - private error_stack?; - private created_at?; - protected defineProperties(): void; - getLevel(): LogLevelKeys; - setLevel(level: LogLevelKeys): void; - getLogID(): string | null; - setLogID(buffer: Buffer): void; - getErrorName(): string; - getErrorMessage(): string; - getErrorStack(): string; - setError(error?: Error): void; -} diff --git a/dist/models/Log.js b/dist/models/Log.js deleted file mode 100644 index e1929e2..0000000 --- a/dist/models/Log.js +++ /dev/null @@ -1,56 +0,0 @@ -import Model from "../db/Model"; -import { LogLevel } from "../Logger"; -import Validator from "../db/Validator"; -export default class Log extends Model { - defineProperties() { - this.defineProperty('level', new Validator().defined()); - this.defineProperty('message', new Validator().defined().between(0, 65535)); - this.defineProperty('log_id', new Validator().acceptUndefined().length(16)); - this.defineProperty('error_name', new Validator().acceptUndefined().between(0, 128)); - this.defineProperty('error_message', new Validator().acceptUndefined().between(0, 512)); - this.defineProperty('error_stack', new Validator().acceptUndefined().between(0, 65535)); - this.defineProperty('created_at', new Validator()); - } - getLevel() { - if (typeof this.level !== 'number') - return 'ERROR'; - return LogLevel[this.level]; - } - setLevel(level) { - this.level = LogLevel[level]; - } - getLogID() { - if (!this.log_id) - return null; - const chars = this.log_id.toString('hex'); - let out = ''; - let i = 0; - for (const l of [8, 4, 4, 4, 12]) { - if (i > 0) - out += '-'; - out += chars.substr(i, l); - i += l; - } - return out; - } - setLogID(buffer) { - this.log_id = buffer; - } - getErrorName() { - return this.error_name || ''; - } - getErrorMessage() { - return this.error_message || ''; - } - getErrorStack() { - return this.error_stack || ''; - } - setError(error) { - if (!error) - return; - this.error_name = error.name; - this.error_message = error.message; - this.error_stack = error.stack; - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nLmpzIiwic291cmNlUm9vdCI6Ii4vIiwic291cmNlcyI6WyJtb2RlbHMvTG9nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxNQUFNLGFBQWEsQ0FBQztBQUNoQyxPQUFPLEVBQUMsUUFBUSxFQUFlLE1BQU0sV0FBVyxDQUFDO0FBQ2pELE9BQU8sU0FBUyxNQUFNLGlCQUFpQixDQUFDO0FBRXhDLE1BQU0sQ0FBQyxPQUFPLE9BQU8sR0FBSSxTQUFRLEtBQUs7SUFTeEIsZ0JBQWdCO1FBQ3RCLElBQUksQ0FBQyxjQUFjLENBQVMsT0FBTyxFQUFFLElBQUksU0FBUyxFQUFVLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztRQUN4RSxJQUFJLENBQUMsY0FBYyxDQUFTLFNBQVMsRUFBRSxJQUFJLFNBQVMsRUFBVSxDQUFDLE9BQU8sRUFBRSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsS0FBSyxDQUFDLENBQUMsQ0FBQztRQUM1RixJQUFJLENBQUMsY0FBYyxDQUFTLFFBQVEsRUFBRSxJQUFJLFNBQVMsRUFBVSxDQUFDLGVBQWUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQzVGLElBQUksQ0FBQyxjQUFjLENBQVMsWUFBWSxFQUFFLElBQUksU0FBUyxFQUFVLENBQUMsZUFBZSxFQUFFLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQ3JHLElBQUksQ0FBQyxjQUFjLENBQVMsZUFBZSxFQUFFLElBQUksU0FBUyxFQUFVLENBQUMsZUFBZSxFQUFFLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQ3hHLElBQUksQ0FBQyxjQUFjLENBQVMsYUFBYSxFQUFFLElBQUksU0FBUyxFQUFVLENBQUMsZUFBZSxFQUFFLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBQ3hHLElBQUksQ0FBQyxjQUFjLENBQU8sWUFBWSxFQUFFLElBQUksU0FBUyxFQUFRLENBQUMsQ0FBQztJQUNuRSxDQUFDO0lBRU0sUUFBUTtRQUNYLElBQUksT0FBTyxJQUFJLENBQUMsS0FBSyxLQUFLLFFBQVE7WUFBRSxPQUFPLE9BQU8sQ0FBQztRQUNuRCxPQUFxQixRQUFRLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzlDLENBQUM7SUFFTSxRQUFRLENBQUMsS0FBbUI7UUFDL0IsSUFBSSxDQUFDLEtBQUssR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDakMsQ0FBQztJQUVNLFFBQVE7UUFDWCxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU07WUFBRSxPQUFPLElBQUksQ0FBQztRQUM5QixNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsTUFBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMzQyxJQUFJLEdBQUcsR0FBRyxFQUFFLENBQUM7UUFDYixJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDVixLQUFLLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxFQUFFO1lBQzlCLElBQUksQ0FBQyxHQUFHLENBQUM7Z0JBQUUsR0FBRyxJQUFJLEdBQUcsQ0FBQztZQUN0QixHQUFHLElBQUksS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7WUFDMUIsQ0FBQyxJQUFJLENBQUMsQ0FBQztTQUNWO1FBQ0QsT0FBTyxHQUFHLENBQUM7SUFDZixDQUFDO0lBRU0sUUFBUSxDQUFDLE1BQWM7UUFDMUIsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7SUFDekIsQ0FBQztJQUVNLFlBQVk7UUFDZixPQUFPLElBQUksQ0FBQyxVQUFVLElBQUksRUFBRSxDQUFDO0lBQ2pDLENBQUM7SUFFTSxlQUFlO1FBQ2xCLE9BQU8sSUFBSSxDQUFDLGFBQWEsSUFBSSxFQUFFLENBQUM7SUFDcEMsQ0FBQztJQUVNLGFBQWE7UUFDaEIsT0FBTyxJQUFJLENBQUMsV0FBVyxJQUFJLEVBQUUsQ0FBQztJQUNsQyxDQUFDO0lBRU0sUUFBUSxDQUFDLEtBQWE7UUFDekIsSUFBSSxDQUFDLEtBQUs7WUFBRSxPQUFPO1FBRW5CLElBQUksQ0FBQyxVQUFVLEdBQUcsS0FBSyxDQUFDLElBQUksQ0FBQztRQUM3QixJQUFJLENBQUMsYUFBYSxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUM7UUFDbkMsSUFBSSxDQUFDLFdBQVcsR0FBRyxLQUFLLENBQUMsS0FBSyxDQUFDO0lBQ25DLENBQUM7Q0FDSiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBNb2RlbCBmcm9tIFwiLi4vZGIvTW9kZWxcIjtcbmltcG9ydCB7TG9nTGV2ZWwsIExvZ0xldmVsS2V5c30gZnJvbSBcIi4uL0xvZ2dlclwiO1xuaW1wb3J0IFZhbGlkYXRvciBmcm9tIFwiLi4vZGIvVmFsaWRhdG9yXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIExvZyBleHRlbmRzIE1vZGVsIHtcbiAgICBwcml2YXRlIGxldmVsPzogbnVtYmVyO1xuICAgIHB1YmxpYyBtZXNzYWdlPzogc3RyaW5nO1xuICAgIHByaXZhdGUgbG9nX2lkPzogQnVmZmVyO1xuICAgIHByaXZhdGUgZXJyb3JfbmFtZT86IHN0cmluZztcbiAgICBwcml2YXRlIGVycm9yX21lc3NhZ2U/OiBzdHJpbmc7XG4gICAgcHJpdmF0ZSBlcnJvcl9zdGFjaz86IHN0cmluZztcbiAgICBwcml2YXRlIGNyZWF0ZWRfYXQ/OiBEYXRlO1xuXG4gICAgcHJvdGVjdGVkIGRlZmluZVByb3BlcnRpZXMoKTogdm9pZCB7XG4gICAgICAgIHRoaXMuZGVmaW5lUHJvcGVydHk8bnVtYmVyPignbGV2ZWwnLCBuZXcgVmFsaWRhdG9yPG51bWJlcj4oKS5kZWZpbmVkKCkpO1xuICAgICAgICB0aGlzLmRlZmluZVByb3BlcnR5PHN0cmluZz4oJ21lc3NhZ2UnLCBuZXcgVmFsaWRhdG9yPHN0cmluZz4oKS5kZWZpbmVkKCkuYmV0d2VlbigwLCA2NTUzNSkpO1xuICAgICAgICB0aGlzLmRlZmluZVByb3BlcnR5PEJ1ZmZlcj4oJ2xvZ19pZCcsIG5ldyBWYWxpZGF0b3I8QnVmZmVyPigpLmFjY2VwdFVuZGVmaW5lZCgpLmxlbmd0aCgxNikpO1xuICAgICAgICB0aGlzLmRlZmluZVByb3BlcnR5PHN0cmluZz4oJ2Vycm9yX25hbWUnLCBuZXcgVmFsaWRhdG9yPHN0cmluZz4oKS5hY2NlcHRVbmRlZmluZWQoKS5iZXR3ZWVuKDAsIDEyOCkpO1xuICAgICAgICB0aGlzLmRlZmluZVByb3BlcnR5PHN0cmluZz4oJ2Vycm9yX21lc3NhZ2UnLCBuZXcgVmFsaWRhdG9yPHN0cmluZz4oKS5hY2NlcHRVbmRlZmluZWQoKS5iZXR3ZWVuKDAsIDUxMikpO1xuICAgICAgICB0aGlzLmRlZmluZVByb3BlcnR5PHN0cmluZz4oJ2Vycm9yX3N0YWNrJywgbmV3IFZhbGlkYXRvcjxzdHJpbmc+KCkuYWNjZXB0VW5kZWZpbmVkKCkuYmV0d2VlbigwLCA2NTUzNSkpO1xuICAgICAgICB0aGlzLmRlZmluZVByb3BlcnR5PERhdGU+KCdjcmVhdGVkX2F0JywgbmV3IFZhbGlkYXRvcjxEYXRlPigpKTtcbiAgICB9XG5cbiAgICBwdWJsaWMgZ2V0TGV2ZWwoKTogTG9nTGV2ZWxLZXlzIHtcbiAgICAgICAgaWYgKHR5cGVvZiB0aGlzLmxldmVsICE9PSAnbnVtYmVyJykgcmV0dXJuICdFUlJPUic7XG4gICAgICAgIHJldHVybiA8TG9nTGV2ZWxLZXlzPkxvZ0xldmVsW3RoaXMubGV2ZWxdO1xuICAgIH1cblxuICAgIHB1YmxpYyBzZXRMZXZlbChsZXZlbDogTG9nTGV2ZWxLZXlzKSB7XG4gICAgICAgIHRoaXMubGV2ZWwgPSBMb2dMZXZlbFtsZXZlbF07XG4gICAgfVxuXG4gICAgcHVibGljIGdldExvZ0lEKCk6IHN0cmluZyB8IG51bGwge1xuICAgICAgICBpZiAoIXRoaXMubG9nX2lkKSByZXR1cm4gbnVsbDtcbiAgICAgICAgY29uc3QgY2hhcnMgPSB0aGlzLmxvZ19pZCEudG9TdHJpbmcoJ2hleCcpO1xuICAgICAgICBsZXQgb3V0ID0gJyc7XG4gICAgICAgIGxldCBpID0gMDtcbiAgICAgICAgZm9yIChjb25zdCBsIG9mIFs4LCA0LCA0LCA0LCAxMl0pIHtcbiAgICAgICAgICAgIGlmIChpID4gMCkgb3V0ICs9ICctJztcbiAgICAgICAgICAgIG91dCArPSBjaGFycy5zdWJzdHIoaSwgbCk7XG4gICAgICAgICAgICBpICs9IGw7XG4gICAgICAgIH1cbiAgICAgICAgcmV0dXJuIG91dDtcbiAgICB9XG5cbiAgICBwdWJsaWMgc2V0TG9nSUQoYnVmZmVyOiBCdWZmZXIpIHtcbiAgICAgICAgdGhpcy5sb2dfaWQgPSBidWZmZXI7XG4gICAgfVxuXG4gICAgcHVibGljIGdldEVycm9yTmFtZSgpOiBzdHJpbmcge1xuICAgICAgICByZXR1cm4gdGhpcy5lcnJvcl9uYW1lIHx8ICcnO1xuICAgIH1cblxuICAgIHB1YmxpYyBnZXRFcnJvck1lc3NhZ2UoKTogc3RyaW5nIHtcbiAgICAgICAgcmV0dXJuIHRoaXMuZXJyb3JfbWVzc2FnZSB8fCAnJztcbiAgICB9XG5cbiAgICBwdWJsaWMgZ2V0RXJyb3JTdGFjaygpOiBzdHJpbmcge1xuICAgICAgICByZXR1cm4gdGhpcy5lcnJvcl9zdGFjayB8fCAnJztcbiAgICB9XG5cbiAgICBwdWJsaWMgc2V0RXJyb3IoZXJyb3I/OiBFcnJvcikge1xuICAgICAgICBpZiAoIWVycm9yKSByZXR1cm47XG5cbiAgICAgICAgdGhpcy5lcnJvcl9uYW1lID0gZXJyb3IubmFtZTtcbiAgICAgICAgdGhpcy5lcnJvcl9tZXNzYWdlID0gZXJyb3IubWVzc2FnZTtcbiAgICAgICAgdGhpcy5lcnJvcl9zdGFjayA9IGVycm9yLnN0YWNrO1xuICAgIH1cbn1cbiJdfQ== \ No newline at end of file diff --git a/dist/package.json b/dist/package.json deleted file mode 100644 index 71516db..0000000 --- a/dist/package.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "name": "wms-core", - "version": "0.1.1", - "description": "Node web framework", - "repository": "git@gitlab.com:ArisuOngaku/wms-core.git", - "author": "Alice Gaudon ", - "license": "MIT", - "publishConfig": { - "registry": "http://127.0.0.1:4873", - "access": "restricted" - }, - "main": "dist/index.js", - "types": "dist/index.d.ts", - "scripts": { - "build": "rm -r dist && tsc && cp package.json dist/", - "publish_to_local": "yarn build && cd dist && yarn publish" - }, - "devDependencies": { - "@types/config": "^0.0.36", - "@types/connect-flash": "^0.0.35", - "@types/connect-redis": "^0.0.13", - "@types/cookie": "^0.3.3", - "@types/cookie-parser": "^1.4.2", - "@types/express": "^4.17.6", - "@types/mjml": "^4.0.4", - "@types/mysql": "^2.15.10", - "@types/nodemailer": "^6.4.0", - "@types/nunjucks": "^3.1.3", - "@types/on-finished": "^2.3.1", - "@types/uuid": "^7.0.2", - "@types/ws": "^7.2.4", - "typescript": "^3.8.3" - }, - "dependencies": { - "config": "^3.3.1", - "connect-flash": "^0.1.1", - "connect-redis": "^4.0.4", - "cookie": "^0.4.1", - "cookie-parser": "^1.4.5", - "express": "^4.17.1", - "mjml": "^4.6.2", - "mysql": "^2.18.1", - "nodemailer": "^6.4.6", - "nunjucks": "^3.2.1", - "on-finished": "^2.3.0", - "uuid": "^7.0.3", - "ws": "^7.2.3" - } -} diff --git a/package.json b/package.json index 8782916..6ae4403 100644 --- a/package.json +++ b/package.json @@ -1,21 +1,21 @@ { "name": "wms-core", - "version": "0.1.0", + "version": "0.1.5", "description": "Node web framework", "repository": "git@gitlab.com:ArisuOngaku/wms-core.git", "author": "Alice Gaudon ", "license": "MIT", - "private": true, + "publishConfig": { + "registry": "http://127.0.0.1:4873", + "access": "restricted" + }, "main": "dist/index.js", "types": "dist/index.d.ts", "scripts": { - "build": "rm -r dist && tsc", - "prepublishOnly": "yarn build" + "build": "rm -r dist && tsc && cp package.json dist/ && mkdir dist/types && cp src/types/* dist/types/", + "publish_to_local": "yarn build && cd dist && yarn publish" }, "devDependencies": { - "typescript": "^3.8.3" - }, - "dependencies": { "@types/config": "^0.0.36", "@types/connect-flash": "^0.0.35", "@types/connect-redis": "^0.0.13", @@ -29,6 +29,9 @@ "@types/on-finished": "^2.3.1", "@types/uuid": "^7.0.2", "@types/ws": "^7.2.4", + "typescript": "^3.8.3" + }, + "dependencies": { "config": "^3.3.1", "connect-flash": "^0.1.1", "connect-redis": "^4.0.4", diff --git a/src/types/Express.d.ts b/src/types/Express.d.ts index 41a32b5..ce55917 100644 --- a/src/types/Express.d.ts +++ b/src/types/Express.d.ts @@ -1,20 +1,22 @@ import {Environment} from "nunjucks"; import Model from "../db/Model"; -declare module 'express-serve-static-core' { - export interface Request { - env: Environment; - models: { [p: string]: Model | null }; - modelCollections: { [p: string]: Model[] | null }; +declare global { + namespace Express { + export interface Request { + env: Environment; + models: { [p: string]: Model | null }; + modelCollections: { [p: string]: Model[] | null }; - flash(): { [key: string]: string[] }; + flash(): { [key: string]: string[] }; - flash(message: string): any; + flash(message: string): any; - flash(event: string, message: any): any; - } + flash(event: string, message: any): any; + } - export interface Response { - redirectBack(defaultUrl?: string): any; + export interface Response { + redirectBack(defaultUrl?: string): any; + } } } \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 3f61cae..b3b5107 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,6 +1,7 @@ { "compilerOptions": { - "target": "ES6", + "target": "ES2020", + "module": "CommonJS", "declaration": true, "stripInternal": true, @@ -11,9 +12,10 @@ "allowSyntheticDefaultImports": true, "moduleResolution": "Node", - "baseUrl": ".", + "esModuleInterop": true, + "baseUrl": "dist", "rootDir": "src", - "sourceRoot": ".", + "sourceRoot": "src", "inlineSourceMap": true, "inlineSources": true, "outDir": "dist",