typespeed 2.5.0 → 2.5.1

package/src/database.decorator.ts

@@ -1,446 +0,0 @@
-import { ResultSetHeader } from 'mysql2';
-import { log, getBean } from './core.decorator';
-import { isStd, getStdArgs } from './decorator-utils';
-import { getBindMapping } from './bind.decorator';
-import CacheFactory from './factory/cache-factory.class';
-import DataSourceFactory from './factory/data-source-factory.class';
-
-const paramMetadataKey = Symbol('param');
-const resultTypeMap = new Map<string, object>();
-const cacheDefindMap = new Map<string, number>();
-const tableVersionMap = new Map<string, number>();
-let cacheBean: CacheFactory;
-
-function insert(sql: string) {
-    return (...args: any[]): any => {
-        if (isStd(args)) {
-            const [, ctx] = getStdArgs(args);
-            const propertyKey = String(ctx.name);
-            return async function (this: any, ...callArgs: any[]) {
-                const result: ResultSetHeader = await queryForExecute(sql, callArgs, this, propertyKey);
-                if (cacheBean && result.affectedRows > 0) {
-                    const [tableName, tableVersion] = getTableAndVersion("insert", sql);
-                    tableVersionMap.set(tableName, tableVersion + 1);
-                }
-                return result.insertId;
-            };
-        }
-        const target = args[0];
-        const propertyKey = args[1] as string;
-        const descriptor = args[2] as PropertyDescriptor;
-        descriptor.value = async (...callArgs: any[]) => {
-            const result: ResultSetHeader = await queryForExecute(sql, callArgs, target, propertyKey);
-            if (cacheBean && result.affectedRows > 0) {
-                const [tableName, tableVersion] = getTableAndVersion("insert", sql);
-                tableVersionMap.set(tableName, tableVersion + 1);
-            }
-            return result.insertId;
-        };
-    };
-}
-
-function update(sql: string) {
-    return (...args: any[]): any => {
-        if (isStd(args)) {
-            const [, ctx] = getStdArgs(args);
-            const propertyKey = String(ctx.name);
-            return async function (this: any, ...callArgs: any[]) {
-                const result: ResultSetHeader = await queryForExecute(sql, callArgs, this, propertyKey);
-                if (cacheBean && result.affectedRows > 0) {
-                    const [tableName, tableVersion] = getTableAndVersion("update", sql);
-                    tableVersionMap.set(tableName, tableVersion + 1);
-                }
-                return result.affectedRows;
-            };
-        }
-        const target = args[0];
-        const propertyKey = args[1] as string;
-        const descriptor = args[2] as PropertyDescriptor;
-        descriptor.value = async (...callArgs: any[]) => {
-            const result: ResultSetHeader = await queryForExecute(sql, callArgs, target, propertyKey);
-            if (cacheBean && result.affectedRows > 0) {
-                const [tableName, tableVersion] = getTableAndVersion("update", sql);
-                tableVersionMap.set(tableName, tableVersion + 1);
-            }
-            return result.affectedRows;
-        };
-    };
-}
-
-function remove(sql: string) {
-    return (...args: any[]): any => {
-        if (isStd(args)) {
-            const [, ctx] = getStdArgs(args);
-            const propertyKey = String(ctx.name);
-            return async function (this: any, ...callArgs: any[]) {
-                const result: ResultSetHeader = await queryForExecute(sql, callArgs, this, propertyKey);
-                if (cacheBean && result.affectedRows > 0) {
-                    const [tableName, tableVersion] = getTableAndVersion("delete", sql);
-                    tableVersionMap.set(tableName, tableVersion + 1);
-                }
-                return result.affectedRows;
-            };
-        }
-        const target = args[0];
-        const propertyKey = args[1] as string;
-        const descriptor = args[2] as PropertyDescriptor;
-        descriptor.value = async (...callArgs: any[]) => {
-            const result: ResultSetHeader = await queryForExecute(sql, callArgs, target, propertyKey);
-            if (cacheBean && result.affectedRows > 0) {
-                const [tableName, tableVersion] = getTableAndVersion("delete", sql);
-                tableVersionMap.set(tableName, tableVersion + 1);
-            }
-            return result.affectedRows;
-        };
-    };
-}
-
-function select(sql: string) {
-    return (...args: any[]): any => {
-        if (isStd(args)) {
-            const [, ctx] = getStdArgs(args);
-            const propertyKey = String(ctx.name);
-            return async function (this: any, ...callArgs: any[]) {
-                const [newSql, sqlValues] = convertSQLParams(sql, this, propertyKey, callArgs);
-                const resultType = resultTypeMap.get([this.constructor.name, propertyKey].toString());
-                if (cacheBean && cacheDefindMap.has([this.constructor.name, propertyKey].toString())) {
-                    const [tableName, tableVersion] = getTableAndVersion("select", newSql);
-                    const cacheKey = JSON.stringify([tableName, tableVersion, newSql, sqlValues]);
-                    if (cacheBean.get(cacheKey)) {
-                        return cacheBean.get(cacheKey);
-                    } else {
-                        const rows = await actionQuery(newSql, sqlValues, resultType);
-                        cacheBean.set(cacheKey, rows, cacheDefindMap.get([this.constructor.name, propertyKey].toString()));
-                        return rows;
-                    }
-                } else {
-                    return await actionQuery(newSql, sqlValues, resultType);
-                }
-            };
-        }
-        const target = args[0];
-        const propertyKey = args[1] as string;
-        const descriptor = args[2] as PropertyDescriptor;
-        descriptor.value = async (...callArgs: any[]) => {
-            const [newSql, sqlValues] = convertSQLParams(sql, target, propertyKey, callArgs);
-            const resultType = resultTypeMap.get([target.constructor.name, propertyKey].toString());
-            if (cacheBean && cacheDefindMap.has([target.constructor.name, propertyKey].toString())) {
-                const [tableName, tableVersion] = getTableAndVersion("select", newSql);
-                const cacheKey = JSON.stringify([tableName, tableVersion, newSql, sqlValues]);
-                if (cacheBean.get(cacheKey)) {
-                    return cacheBean.get(cacheKey);
-                } else {
-                    const rows = await actionQuery(newSql, sqlValues, resultType);
-                    cacheBean.set(cacheKey, rows, cacheDefindMap.get([target.constructor.name, propertyKey].toString()));
-                    return rows;
-                }
-            } else {
-                return await actionQuery(newSql, sqlValues, resultType);
-            }
-        };
-    }
-}
-
-function resultType(dataClass) {
-    return function (...args: any[]): any {
-        if (isStd(args)) {
-            const [, ctx] = getStdArgs(args);
-            ctx.addInitializer(function (this: any) {
-                resultTypeMap.set([this.constructor.name, String(ctx.name)].toString(), dataClass);
-            });
-            return;
-        }
-        const target = args[0];
-        const propertyKey = args[1] as string;
-        resultTypeMap.set([target.constructor.name, propertyKey].toString(), dataClass);
-        //never return
-    };
-}
-
-function param(name: string) {
-    return function (target: any, propertyKey: string | symbol, parameterIndex: number) {
-        const existingParameters: [string, number][] = Reflect.getOwnMetadata(paramMetadataKey, target, propertyKey) || [];
-        existingParameters.push([name, parameterIndex]);
-        Reflect.defineMetadata(paramMetadataKey, existingParameters, target, propertyKey);
-    };
-}
-
-async function queryForExecute(sql: string, args: any[], target, propertyKey: string): Promise<ResultSetHeader> {
-    const [newSql, sqlValues] = convertSQLParams(sql, target, propertyKey, args);
-    return actionExecute(newSql, sqlValues);
-}
-
-async function actionExecute(newSql, sqlValues): Promise<ResultSetHeader> {
-    const writeConnection = await getBean(DataSourceFactory).writeConnection();
-    const [result] = await writeConnection.query(newSql, sqlValues);
-    return <ResultSetHeader>result;
-}
-
-async function actionQuery(newSql, sqlValues, dataClassType?) {
-    const readConnection = await getBean(DataSourceFactory).readConnection();
-    const [rows] = await readConnection.query(newSql, sqlValues);
-    if (rows === null || Object.keys(rows).length === 0){
-        return null;
-    } else if (!dataClassType) {
-        return rows;
-    }
-    const records = [];
-    for (const rowIndex in rows) {
-        const entity = new dataClassType();
-        Object.getOwnPropertyNames(entity).forEach((propertyRow) => {
-            if (rows[rowIndex].hasOwnProperty(propertyRow)) {
-                Object.defineProperty(entity, propertyRow, Object.getOwnPropertyDescriptor(rows[rowIndex], propertyRow));
-            }
-        });
-        records.push(entity);
-    }
-    return Object.keys(records).length === 0 ? null : records;
-}
-
-function convertSQLParams(decoratorSQL: string, target: any, propertyKey: string, args: any[]): [string, any[]] {
-    const queryValues = [];
-    if (args.length > 0) {
-        let argsVal;
-        if (typeof args[0] === 'object') {
-            argsVal = new Map(Object.getOwnPropertyNames(args[0]).map((valName) => [valName, args[0][valName]]));
-        } else {
-            // 优先 @param（legacy reflect-metadata），否则回退 @bind（方法级声明，标准模式）
-            let existingParameters: [string, number][] = Reflect.getOwnMetadata(paramMetadataKey, target, propertyKey);
-            if (!existingParameters) {
-                const bindMapping = getBindMapping(target.constructor.name, propertyKey);
-                if (bindMapping) {
-                    existingParameters = Object.entries(bindMapping)
-                        .filter(([, value]) => typeof value === "number")
-                        .map(([name, value]) => [name, value as number]);
-                }
-            }
-            argsVal = new Map((existingParameters || []).map(([argName, argIdx]) => [argName, args[argIdx]]));
-        }
-        const regExp = /#{(\w+)}/;
-        let match;
-        while (match = regExp.exec(decoratorSQL)) {
-            const [replaceTag, matchName] = match;
-            decoratorSQL = decoratorSQL.replace(new RegExp(replaceTag, 'g'), '?');
-            queryValues.push(argsVal.get(matchName));
-        }
-    }
-    return [decoratorSQL, queryValues];
-}
-
-function cache(ttl: number) {
-    return function (...args: any[]): any {
-        if (isStd(args)) {
-            const [, ctx] = getStdArgs(args);
-            ctx.addInitializer(function (this: any) {
-                cacheDefindMap.set([this.constructor.name, String(ctx.name)].toString(), ttl);
-                if (cacheBean == null) {
-                    const cacheFactory = getBean(CacheFactory);
-                    if (cacheFactory || cacheFactory["factory"]) {
-                        cacheBean = cacheFactory["factory"];
-                    }
-                }
-            });
-            return;
-        }
-        const target = args[0];
-        const propertyKey = args[1] as string;
-        cacheDefindMap.set([target.constructor.name, propertyKey].toString(), ttl);
-        if (cacheBean == null) {
-            const cacheFactory = getBean(CacheFactory);
-            if (cacheFactory || cacheFactory["factory"]) {
-                cacheBean = cacheFactory["factory"];
-            }
-        }
-    }
-}
-
-function getTableAndVersion(name: string, sql: string): [string, number] {
-    const regExpMap = {
-        insert: /insert\sinto\s+([\w`\'\"]+)/i,
-        update: /update\s+([\w`\'\"]+)/i,
-        delete: /delete\sfrom\s+([\w`\'\"]+)/i,
-        select: /\s+from\s+([\w`\'\"]+)/i
-    }
-    const macths = sql.match(regExpMap[name]);
-    if (macths && macths.length > 1) {
-        const tableName = macths[1].replace(/[`\'\"]/g, "");
-        const tableVersion = tableVersionMap.get(tableName) || 1;
-        tableVersionMap.set(tableName, tableVersion);
-        log(tableVersionMap);
-        return [tableName, tableVersion];
-    } else {
-        throw new Error("can not find table name");
-    }
-}
-
-
-class Model {
-
-    public page = null;
-    private table: string;
-
-    constructor(table?: string) {
-        if (table) this.table = table;
-    }
-
-    async findAll<T>(conditions: object | string, sort: string | object = '', fields: string | [string] = '*', limit?: number | object): Promise<T[]> {
-        const { sql, values } = this.where(conditions);
-        if (typeof fields !== 'string') {
-            fields = fields.join(", ");
-        }
-        if (typeof sort !== 'string') {
-            sort = Object.keys(sort).map(s => {
-                return s + (sort[s] === 1 ? " ASC" : " DESC");
-            }).join(", ");
-        }
-        let newSql = 'SELECT ' + fields + ' FROM ' + this.table + ' WHERE ' + sql + " ORDER BY " + sort;
-        if (typeof limit === 'number') {
-            newSql += ' LIMIT ' + limit
-        } else if (typeof limit === 'object') {
-            const total = await actionQuery('SELECT COUNT(*) AS M_COUNTER  FROM ' + this.table + ' WHERE ' + sql, values);
-            if (total === null || total[0] === undefined || total[0]['M_COUNTER'] === 0) {
-                return [];
-            }
-            if (limit['pageSize'] !== undefined && limit['pageSize'] < total[0]['M_COUNTER']) {
-                const pager = this.pager(limit["page"] || 1, total[0]['M_COUNTER'], limit["pageSize"] || 10, limit["scope"] || 10);
-                newSql += ' LIMIT ' + pager['offset'] + ',' + pager['limit'];
-                this.page = pager;
-            }
-        }
-        return <T[]>await actionQuery(newSql, values);
-    }
-
-    async create(rows): Promise<number> {
-        let newSql = "";
-        let values = [];
-        if (!Array.isArray(rows)) {
-            rows = [rows];
-        }
-        const firstRow = rows[0];
-        newSql += 'INSERT INTO ' + this.table + ' (' + Object.keys(firstRow).map((field) => '`' + field + '`').join(', ') + ') VALUES';
-        rows.forEach((row) => {
-            const valueRow = [];
-            Object.keys(row).map((field) => {
-                values.push(row[field]);
-                valueRow.push('?');
-            });
-            newSql += '(' + valueRow.map((value) => '?').join(', ') + ')' + (rows.indexOf(row) === rows.length - 1 ? '' : ',');
-        });
-        const result: ResultSetHeader = await actionExecute(newSql, values);
-        return result.insertId;
-    }
-
-    async find<T>(conditions, sort, fields = '*'): Promise<T> {
-        const result = await this.findAll(conditions, sort, fields, 1);
-        return result != null && result.length > 0 ? <T>result[0] : null;
-    }
-
-    async update(conditions, fieldToValues): Promise<number> {
-        const { sql, values } = this.where(conditions);
-        const newSql = 'UPDATE ' + this.table + ' SET ' + Object.keys(fieldToValues).map((field) => { return '`' + field + '` = ? ' }).join(', ') + ' WHERE ' + sql;
-        const result: ResultSetHeader = await actionExecute(newSql, Object.values(fieldToValues).concat(values));
-        return result.affectedRows;
-    }
-
-    async delete(conditions): Promise<number> {
-        const { sql, values } = this.where(conditions);
-        const newSql = 'DELETE FROM ' + this.table + ' WHERE ' + sql;
-        const result: ResultSetHeader = await actionExecute(newSql, values);
-        return result.affectedRows;
-    }
-
-    async findCount(conditions): Promise<number> {
-        const { sql, values } = this.where(conditions);
-        const newSql = 'SELECT COUNT(*) AS M_COUNTER FROM ' + this.table + ' WHERE ' + sql;
-        const result = await actionQuery(newSql, values);
-        return result != null && result[0] != undefined ? result[0]['M_COUNTER'] : 0;
-    }
-
-    async incr(conditions, field, optval = 1): Promise<number> {
-        const { sql, values } = this.where(conditions);
-        const newSql = 'UPDATE ' + this.table + ' SET `' + field + '` = `' + field + '` + ? WHERE ' + sql;
-        values.unshift(optval); // increase at the top
-        const result: ResultSetHeader = await actionExecute(newSql, values);
-        return result.affectedRows;
-    }
-
-    async decr(conditions, field, optval = 1): Promise<number> {
-        return await this.incr(conditions, field, -optval);
-    }
-
-    pager(page, total, pageSize = 10, scope = 10) {
-        this.page = null
-        if (total === undefined) throw new Error('Pager total would not be undefined')
-        if (total > pageSize) {
-            let totalPage = Math.ceil(total / pageSize)
-            page = Math.min(Math.max(page, 1), total)
-            this.page = {
-                'total': total,
-                'pageSize': pageSize,
-                'totalPage': totalPage,
-                'firstPage': 1,
-                'prevPage': ((1 == page) ? 1 : (page - 1)),
-                'nextPage': ((page == totalPage) ? totalPage : (page + 1)),
-                'lastPage': totalPage,
-                'currentPage': page,
-                'allPages': [],
-                'offset': (page - 1) * pageSize,
-                'limit': pageSize
-            }
-            if (totalPage <= scope) {
-                this.page.allPages = this.range(1, totalPage)
-            } else if (page <= scope / 2) {
-                this.page.allPages = this.range(1, scope)
-            } else if (page <= totalPage - scope / 2) {
-                let right = page + (scope / 2)
-                this.page.allPages = this.range(right - scope + 1, right)
-            } else {
-                this.page.allPages = this.range(totalPage - scope + 1, totalPage)
-            }
-        }
-        return this.page
-    }
-
-    private where(conditions: object | string): { sql: string, values: any[] } {
-        const result = { sql: '', values: [] };
-        if (typeof conditions === 'object') {
-            Object.keys(conditions).map((field) => {
-                if (result["sql"].length > 0) {
-                    result["sql"] += " AND "
-                }
-                if (typeof conditions[field] === 'object') {
-                    if (field === '$or') {
-                        let orSql = "";
-                        conditions[field].map((item) => {
-                            const { sql, values } = this.where(item);
-                            orSql += (orSql.length > 0 ? " OR " : "") + `(${sql})`;
-                            result["values"] = result["values"].concat(values);
-                        });
-                        result["sql"] += `(${orSql})`;
-                    } else {
-                        const operatorTemplate = { $lt: "<", $lte: "<=", $gt: ">", $gte: ">=", $ne: "!=", $like: "LIKE" };
-                        Object.keys(conditions[field]).map((operator, index) => {
-                            if (operatorTemplate[operator]) {
-                                const operatorValue = operatorTemplate[operator];
-                                result["sql"] += (index ? " AND " : "") + ` ${field} ${operatorValue} ? `;
-                                result["values"].push(conditions[field][operator]);
-                            }
-                        });
-                    }
-                } else {
-                    result["sql"] += ` ${field} = ? `;
-                    result["values"].push(conditions[field]);
-                }
-            });
-        } else {
-            result["sql"] = conditions;
-        }
-        return result
-    }
-
-    private range(start, end) {
-        return [...Array(end - start + 1).keys()].map(i => i + start);
-    }
-}
-
-export { insert, update, remove, select, param, resultType, cache, Model };

package/src/decorator-utils.ts

@@ -1,53 +0,0 @@
-/**
- * 装饰器双签名感知工具。
- *
- * typespeed 2.5.x 起，装饰器同时支持两套运行时签名：
- *   - legacy（experimentalDecorators: true，2.4.x 现状）：
- *       类装饰器 (ctor)；方法/属性装饰器 (target, key)；带 descriptor 的方法 (target, key, descriptor)；参数 (target, key, index)
- *   - 标准（TC39 装饰器提案，当前 Stage 2.7，experimentalDecorators: false）：
- *       统一 (value, context)，context 恒为带 kind 字段的对象
- *
- * 装饰器函数本质是普通函数，运行时收到什么签名由「调用方（用户代码）」的编译模式决定，
- * 因此库可以单份源码、运行时按签名形态分流：legacy 分支逻辑与 2.4.x 逐字一致，标准分支为新增。
- */
-
-/** 标准装饰器 context 的 kind 取值（TS/Babel 2022-03 版语义） */
-export type StdDecoratorKind = "class" | "method" | "getter" | "setter" | "field" | "accessor";
-
-/** 标准装饰器 context 的宽松类型描述（不依赖 esnext.decorators lib，保持 ES2017 可编译） */
-export interface StdDecoratorContext {
-    kind: StdDecoratorKind;
-    name?: string | symbol;
-    static?: boolean;
-    private?: boolean;
-    access?: { get?: boolean; set?: boolean };
-    metadata?: Record<PropertyKey, unknown>;
-    addInitializer(fn: (this: any) => void): void;
-}
-
-/**
- * 判断装饰器收到的运行时参数是否为标准装饰器签名 (value, context)。
- *
- * 判据（与 `2.5.x-新版装饰器使用方案.md` 一致）：
- *   参数个数 === 2 且第二个参数是「带 string 类型 kind 字段」的对象。
- *
- * 为什么这个判据可靠：
- *   - legacy 类装饰器只有 1 参 → 不满足 length === 2
- *   - legacy 方法/属性装饰器第二参是 string 的 key → 不是对象
- *   - legacy 带 descriptor 的方法 / 参数装饰器是 3 参 → 不满足 length === 2
- *   - 标准模式第二参恒是带 kind 的对象 → 命中
- */
-export function isStd(args: unknown[]): boolean {
-    return args.length === 2
-        && typeof args[1] === "object"
-        && args[1] !== null
-        && typeof (args[1] as { kind?: unknown }).kind === "string";
-}
-
-/**
- * 从标准装饰器参数中解出 (value, context)。
- * 仅应在 isStd(args) 为 true 时调用。
- */
-export function getStdArgs(args: unknown[]): [any, StdDecoratorContext] {
-    return [args[0], args[1] as StdDecoratorContext];
-}

package/src/default/default-authentication.class.ts

@@ -1,10 +0,0 @@
-import AuthenticationFactory from "../factory/authentication-factory.class";
-import { bean } from "../core.decorator";
-
-export default class DefaultAuthentication extends AuthenticationFactory{
-    @bean
-    public getAuthentication(): AuthenticationFactory {
-        return new DefaultAuthentication();
-    }
-}
-

package/src/default/express-server.class.ts

@@ -1,150 +0,0 @@
-import * as fs from "fs";
-import * as express from "express";
-import * as consolidate from "consolidate";
-import * as serveFavicon from "serve-favicon";
-import * as compression from "compression";
-import * as cookieParser from "cookie-parser";
-import * as expressSession from "express-session";
-import * as connectRedis from "connect-redis";
-import ServerFactory from "../factory/server-factory.class";
-import { setRouter } from "../route.decorator";
-import { SocketIo } from "../default/socket-io.class";
-import { value } from "../typespeed";
-import { bean, error, autoware, resource } from "../core.decorator";
-import { Redis } from "./redis.class";
-import AuthenticationFactory from "../factory/authentication-factory.class";
-
-export default class ExpressServer extends ServerFactory {
-
-    @value("view")
-    public view: string;
-
-    @value("static")
-    private static: string;
-
-    @value("favicon")
-    private favicon: string;
-
-    @value("compression")
-    private compression: object;
-
-    @value("cookie")
-    private cookieConfig: object;
-
-    @value("session")
-    private session: object;
-
-    @value("redis")
-    private redisConfig: object;
-
-    @value("socket")
-    private socketIoConfig: object;
-
-    @value("MAIN_PATH")
-    private mainPath: string;
-
-    @autoware
-    private redisClient: Redis;
-
-    @autoware
-    public authentication: AuthenticationFactory;
-
-    @bean
-    public getSever(): ServerFactory {
-        const server = new ExpressServer();
-        server.app = express();
-        return server;
-    }
-
-    public setMiddleware(middleware: any) {
-        this.middlewareList.push(middleware);
-    }
-
-    public start(port: number): any {
-        this.middlewareList.forEach(middleware => {
-            this.app.use(middleware);
-        });
-
-        this.setDefaultMiddleware();
-        if(this.socketIoConfig) {
-            const newSocketApp = SocketIo.setIoServer(this.app, this.socketIoConfig);
-            return newSocketApp.listen(port);
-        }else{
-            return this.app.listen(port);
-        }
-    }
-
-    private setDefaultMiddleware() {
-        this.app.use(express.urlencoded({ extended: true }));
-        this.app.use(express.json());
-        if (this.view) {
-            const viewConfig = this.view;
-            this.app.engine(viewConfig["suffix"], consolidate[viewConfig["engine"]]);
-            this.app.set('view engine', viewConfig["suffix"]);
-            this.app.set('views', this.mainPath + viewConfig["path"]);
-        }
-
-        if (this.session) {
-            const sessionConfig = this.session;
-            if (sessionConfig["trust proxy"] === 1) {
-                this.app.set('trust proxy', 1);
-            }
-            if (this.redisConfig) {
-                const RedisStore = connectRedis(expressSession);
-                sessionConfig["store"] = new RedisStore({ client: this.redisClient });
-            }
-
-            this.app.use(expressSession(sessionConfig));
-        }
-
-        if (this.favicon) {
-            const faviconPath = this.mainPath + this.favicon;
-            this.app.use(serveFavicon(faviconPath));
-        }
-
-        if (this.compression) {
-            this.app.use(compression(this.compression));
-        }
-
-        if (this.cookieConfig) {
-            this.app.use(cookieParser(this.cookieConfig["secret"] || undefined, this.cookieConfig["options"] || {}));
-        }
-
-        this.app.use(this.authentication.preHandle);
-
-        if (this.static) {
-            const staticPath = this.mainPath + this.static;
-            this.app.use(express.static(staticPath))
-        }
-        setRouter(this.app);
-        this.app.use(this.authentication.afterCompletion);
-        
-        const errorPageDir = __dirname + "/pages";
-        this.app.use((req, res) => {
-            error("404 not found, for page: " + req.url);
-            res.status(404);
-            if (req.accepts('html')) {
-                res.type('html').send(fs.readFileSync(errorPageDir + "/404.html", "utf-8"));
-            } else if (req.accepts('json')) {
-                res.json({ error: 'Not found' });
-            } else {
-                res.type('txt').send('Not found');
-            }
-        });
-
-        this.app.use((err, req, res, next) => {
-            if (!err) {
-                next();
-            }
-            error(err);
-            res.status(err.status || 500);
-            if (req.accepts('html')) {
-                res.type('html').send(fs.readFileSync(errorPageDir + "/500.html", "utf-8"));
-            } else if (req.accepts('json')) {
-                res.json({ error: 'Internal Server Error' });
-            } else {
-                res.type('txt').send('Internal Server Error');
-            }
-        });
-    }
-}

package/src/default/log-default.class.ts

@@ -1,9 +0,0 @@
-import { bean } from "../core.decorator";
-import LogFactory from "../factory/log-factory.class";
-
-export default class LogDefault extends LogFactory {
-    @bean
-    createLog(): LogFactory {
-        return new LogDefault();
-    }
-}