typespeed 2.2.1 → 2.3.2

package/app/nodemon.json

@@ -0,0 +1,5 @@
+{
+    "watch": ["src", "../dist", "../src", "../test"],
+    "ext": "ts,json",
+    "exec": "npm test" 
+}

package/{test → app}/package.json

@@ -5,7 +5,6 @@
     "scripts": {
       "watch": "nodemon",
       "test": "ts-node src/main.ts",
-      "start": "ts-node --transpile-only src/main.ts",
       "build": "tsc -p ."
     },
     "author": "",

package/{test → app}/src/config-development.json

@@ -9,7 +9,14 @@
     },
     "view": {
         "engine": "mustache",
-        "path": "/test/views",
+        "path": "/app/src/views",
         "suffix": "html"
+    },
+    "rabbitmq": {
+        "protocol": "amqp",
+        "hostname": "localhost",
+        "port": 5672,
+        "username": "guest",
+        "password": "guest"
     }
 }

package/{test → app}/src/config.json

@@ -1,11 +1,10 @@
 {
     "view": {
-        "engine": "pug",
-        "path": "./views",
+        "engine": "mustache",
+        "path": "./src/views",
         "suffix": "html"
     },
-    "static": "/static",
-    "favicon": "/static/favicon.ico",
+
     "compression": {
         "level": 9
     },

package/{test → app}/src/custom-log.class.ts

@@ -17,7 +17,7 @@ export default class CustomLog extends LogFactory {
     }
 
     public log(message?: any, ...optionalParams: any[]) : void{
-        this.logger.log(message, ...optionalParams);
+        //this.logger.log(message, ...optionalParams);
     }
 
     public error(message?: any, ...optionalParams: any[]) : void {

package/{test → app}/src/jwt-authentication.class.ts

@@ -11,7 +11,7 @@ const jwtConfig: {
 
 export default class JwtAuthentication extends AuthenticationFactory {
 
-    //@bean
+    @bean
     public getJwtAuthentication(): AuthenticationFactory {
         return new JwtAuthentication();
     }
@@ -21,8 +21,9 @@ export default class JwtAuthentication extends AuthenticationFactory {
             const jwtMiddleware = expressjwt(jwtConfig);
             jwtMiddleware(req, res, (err) => {  
                 if (err) {
-                    next(err);
+                    //next(err);
                 }
+                next();
             });
         }
     }

package/{test → app}/src/main.ts

@@ -1,5 +1,6 @@
 import { app, log, autoware, ServerFactory } from "../../";
 //import * as basicAuth from "express-basic-auth"
+let appServer = null;
 
 @app
 class Main {
@@ -11,7 +12,13 @@ class Main {
         // this.server.setMiddleware(basicAuth({
         //     users: { 'admin': 'supersecret' }
         // }));
-        this.server.start(8081);
+        appServer = this.server.start(8081);
         log('start application');
     }
-}
+}
+
+export default () => {
+    if (appServer != null) {
+        appServer.close();
+    }
+};

package/{test → app}/src/test-database.class.ts

@@ -18,7 +18,7 @@ export default class TestDatabase {
     @getMapping("/db/insert2")
     async insertByObject(req, res) {
         const newId = await this.addRowByObject({
-            "id": 25, "name": "new name 25"
+            "id": Math.ceil(Math.random() * 1000), "name": "new name 25"
         });
         log("Insert newId: " + newId);
         res.send("Insert success");

package/app/src/test-log.class.ts

@@ -0,0 +1,11 @@
+import { component, getMapping, error } from "../../";
+
+@component
+export default class TestLog {
+
+    @getMapping("/test/error")
+    testError() {
+        //error("This is a error log");
+        return "This is a error log";
+    }
+}

package/{test → app}/src/test-mq.class.ts

@@ -8,7 +8,7 @@ export default class TestMq {
     @autoware
     private rabbitMQ: RabbitMQ;
 
-    //@rabbitListener("myqueues")
+    @rabbitListener("myqueues")
     public async listen(message) {
         log(" Received by Decorator '%s'", message.content.toString());
     }
@@ -31,9 +31,8 @@ export default class TestMq {
             password: 'guest'
         });
         const channel = await connection.createChannel();
-        await channel.checkQueue(queue);
+        await channel.assertQueue(queue);
         channel.sendToQueue(queue, Buffer.from(text));
-        console.log(" [x] Sent by queue '%s'", text);
         await channel.close();
         return "sent by queue";
     }
@@ -46,7 +45,6 @@ export default class TestMq {
         const channel = await connection.createChannel();
         await channel.checkExchange(exchange);
         channel.publish(exchange, '', Buffer.from(text));
-        console.log(" [x] Publish by exchange '%s'", text);
         await channel.close();
         return "sent by exchange";
     }
@@ -60,10 +58,8 @@ export default class TestMq {
         await channel.checkQueue(queue);
         await channel.checkQueue(queue2);
         await channel.consume(queue, (message) => {
-            console.log(" [x] Received '%s'", message.content.toString());
         }, { noAck: true });
         await channel.consume(queue2, (message) => {
-            console.log(" [x] Received queue2 '%s'", message.content.toString());
         }, { noAck: true });
         return "ok";
     }

package/{test → app}/src/test-orm.class.ts

@@ -38,33 +38,33 @@ export default class TestOrm {
 
     @getMapping("/orm/count")
     async countTest(req, res) {
-        const results = await this.userModel.count();
-        res.send(results);
+        const total = await this.userModel.count();
+        res.send({"count": total});
     }
 
     @getMapping("/orm/new")
     async newUserTest(req, res) {
-        const results = await this.userModel.newUsers();
-        res.send("new user test, to " + results);
+        const newId = await this.userModel.newUsers();
+        res.send({"newId": newId});
     }
 
     @getMapping("/orm/page/calculate")
     async calculatePage(req, res) {
         const pages = this.userModel.pager(15, 376);
-        res.send("pages calculate result: " + JSON.stringify(pages));
+        res.json(pages);
     }
 
     @getMapping("/orm/pages/:id")
     async findPage(req, res) {
         const results = await this.userModel.findAll("1", { id: -1 }, "*", { page: req.params.id, pageSize: 3 });
         log(this.userModel.page);
-        res.send("pages find result: " + JSON.stringify(results));
+        res.json(results);
     }
 
     @postMapping("/orm/edit")
     async updateTest(req, res) {
-        const results = await this.userModel.editUser(req.body.id, req.body.name);
-        res.send(results);
+        const effectRows = await this.userModel.editUser(req.body.id, req.body.name);
+        res.send({"effectRows": effectRows});
     }
 
     //@schedule("* * * * * *")

package/{test → app}/src/test-request.class.ts

@@ -18,20 +18,20 @@ export default class TestRequest {
     }
 
     @postMapping("/request/body")
-    testBody(@res res, @reqBody body: object):MutilUsers {
+    testBody(@res res, @reqBody body: UserDto):MutilUsers {
         log("body: " + JSON.stringify(body));
-        return new MutilUsers("group", [new UserDto(1, "name"), new UserDto(2, "name")]);
+        return new MutilUsers("group", [body]);
     }
 
     @postMapping("/request/form")
     testForm(@res res, @reqForm("name") name: string) {
         log("form: " + JSON.stringify(name));
-        res.send("test form");
+        res.send("Got name: " + name);
     }
 
     @getMapping("/request/param/:id")
     testParam(@res res, @reqParam id: number) {
         log("id: " + id);
-        res.send("test param");
+        res.send("test param: " + id);
     }
 }

package/{test → app}/src/user-model.class.ts

@@ -8,24 +8,25 @@ export default class UserModel extends Model {
         const users = await this.findAll({
             id: { $lt: 10, $lte: 20 }, "name": { $like: "%a%" },
             $or: [{ id: 1 }, { id: 2 }]
-        });
+        }, "id asc", "*", { page: 1, pageSize: 10 });
         log("users", users);
         return "getUsers";
     }
 
     async getUser(id: number) {
-        const user = await this.find({ id: id }, "");
+        const user = await this.find({ id: id }, "id asc", "*");
         log("user", user);
         return "getUser";
     }
 
     async newUsers() {
-        const users = await this.create([
-            new UserDto(30, "UserDto 30"),
-            new UserDto(31, "UserDto 31"),
-            { id: 33, name: "UserDto 33" }
+        const newId = Math.ceil(Math.random() * 1000);
+        await this.create([
+            new UserDto(newId, "UserDto " + newId),
+            new UserDto(newId+1, "UserDto " + (newId+1)),
+            { id: newId+2, name: "UserDto " + (newId+2) },
         ]);
-        return "newUsers";
+        return newId;
     }
 
     async remove(id: number) {
@@ -33,13 +34,13 @@ export default class UserModel extends Model {
         return "remove rows: " + result;
     }
 
-    async count() {
+    async count():Promise<number> {
         const result = await this.findCount("1");
-        return "we had users : " + result;
+        return result;
     }
 
     async editUser(id: number, name: string) {
-        const result = await this.update({ id: id }, { name: name });
-        return "edit user: " + result;
+        const effectRows = await this.update({ id: id }, { name: name });
+        return effectRows;
     }
 }

package/dist/core.decorator.js

@@ -1,54 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.schedule = exports.getComponent = exports.getBean = exports.autoware = exports.config = exports.error = exports.value = exports.app = exports.log = exports.resource = exports.bean = exports.component = void 0;
+exports.schedule = exports.getComponent = exports.getBean = exports.autoware = exports.error = exports.log = exports.resource = exports.bean = exports.component = void 0;
 require("reflect-metadata");
-const fs = require("fs");
-const path = require("path");
-const walkSync = require("walk-sync");
 const cron = require("cron");
 const log_factory_class_1 = require("./factory/log-factory.class");
-let globalConfig = {};
 const resourceObjects = new Map();
 const beanMapper = new Map();
 const objectMapper = new Map();
-function app(constructor) {
-    const coreDir = __dirname;
-    const mainPath = path.dirname(getRootPath() || process.argv[1]);
-    const configFile = mainPath + "/config.json";
-    if (fs.existsSync(configFile)) {
-        globalConfig = JSON.parse(fs.readFileSync(configFile, "utf-8"));
-        const nodeEnv = process.env.NODE_ENV || "development";
-        const envConfigFile = mainPath + "/config-" + nodeEnv + ".json";
-        if (fs.existsSync(envConfigFile)) {
-            globalConfig = Object.assign(globalConfig, JSON.parse(fs.readFileSync(envConfigFile, "utf-8")));
-        }
-    }
-    const coreFiles = walkSync(coreDir, { globs: ['**/*.ts'], ignore: ['**/*.d.ts', 'scaffold/**'] });
-    const mainFiles = walkSync(mainPath, { globs: ['**/*.ts'] });
-    (async function () {
-        try {
-            for (let p of coreFiles) {
-                let moduleName = p.replace(".d.ts", "").replace(".ts", "");
-                await Promise.resolve().then(() => require(coreDir + "/" + moduleName));
-            }
-            for (let p of mainFiles) {
-                let moduleName = p.replace(".d.ts", "").replace(".ts", "");
-                await Promise.resolve().then(() => require(mainPath + "/" + moduleName));
-            }
-        }
-        catch (err) {
-            console.error(err);
-        }
-        //log("main start")
-        const main = new constructor();
-        main["main"]();
-    }());
-}
-exports.app = app;
-function config(node) {
-    return globalConfig[node] || null;
-}
-exports.config = config;
 function component(constructorFunction) {
     objectMapper.set(constructorFunction.name, new constructorFunction());
 }
@@ -71,30 +29,6 @@ function getBean(mappingClass) {
     return bean["factory"];
 }
 exports.getBean = getBean;
-function value(configPath) {
-    return function (target, propertyKey) {
-        if (globalConfig === undefined) {
-            Object.defineProperty(target, propertyKey, {
-                get: () => {
-                    return undefined;
-                }
-            });
-        }
-        else {
-            let pathNodes = configPath.split(".");
-            let nodeValue = globalConfig;
-            for (let i = 0; i < pathNodes.length; i++) {
-                nodeValue = nodeValue[pathNodes[i]];
-            }
-            Object.defineProperty(target, propertyKey, {
-                get: () => {
-                    return nodeValue;
-                }
-            });
-        }
-    };
-}
-exports.value = value;
 function autoware(target, propertyKey) {
     const type = Reflect.getMetadata("design:type", target, propertyKey);
     Object.defineProperty(target, propertyKey, {
@@ -147,23 +81,6 @@ function error(message, ...optionalParams) {
     }
 }
 exports.error = error;
-function getRootPath() {
-    const lines = new Error().stack.split("\n");
-    let rootPath = "";
-    let lastLine = "";
-    for (let line of lines) {
-        if (line.includes("at ") &&
-            line.includes("node:internal/modules/cjs/loader") &&
-            line.includes("Module._compile") &&
-            lastLine.includes("at ") &&
-            lastLine.includes("Object.<anonymous>")) {
-            rootPath = lastLine.split("(")[1].split(":")[0];
-            break;
-        }
-        lastLine = line;
-    }
-    return rootPath;
-}
 function schedule(cronTime) {
     return (target, propertyKey) => {
         new cron.CronJob(cronTime, target[propertyKey]).start();

package/dist/database.decorator.js

@@ -74,7 +74,7 @@ function select(sql) {
 exports.select = select;
 function resultType(dataClass) {
     return function (target, propertyKey) {
-        resultTypeMap.set([target.constructor.name, propertyKey].toString(), new dataClass());
+        resultTypeMap.set([target.constructor.name, propertyKey].toString(), dataClass);
         //never return
     };
 }

package/dist/default/express-server.class.js

@@ -19,6 +19,7 @@ const expressSession = require("express-session");
 const connectRedis = require("connect-redis");
 const server_factory_class_1 = require("../factory/server-factory.class");
 const route_decorator_1 = require("../route.decorator");
+const typespeed_1 = require("../typespeed");
 const core_decorator_1 = require("../core.decorator");
 const redis_class_1 = require("./redis.class");
 const authentication_factory_class_1 = require("../factory/authentication-factory.class");
@@ -31,15 +32,13 @@ class ExpressServer extends server_factory_class_1.default {
     setMiddleware(middleware) {
         this.middlewareList.push(middleware);
     }
-    start(port) {
+    start(port, callback) {
         this.app.use(this.authentication.afterCompletion);
         this.middlewareList.forEach(middleware => {
             this.app.use(middleware);
         });
         this.setDefaultMiddleware();
-        return this.app.listen(port, () => {
-            (0, core_decorator_1.log)("server start at port: " + port);
-        });
+        return this.app.listen(port, callback);
     }
     setDefaultMiddleware() {
         this.app.use(express.urlencoded({ extended: true }));
@@ -110,31 +109,31 @@ class ExpressServer extends server_factory_class_1.default {
     }
 }
 __decorate([
-    (0, core_decorator_1.value)("view"),
+    (0, typespeed_1.value)("view"),
     __metadata("design:type", String)
 ], ExpressServer.prototype, "view", void 0);
 __decorate([
-    (0, core_decorator_1.value)("static"),
+    (0, typespeed_1.value)("static"),
     __metadata("design:type", String)
 ], ExpressServer.prototype, "static", void 0);
 __decorate([
-    (0, core_decorator_1.value)("favicon"),
+    (0, typespeed_1.value)("favicon"),
     __metadata("design:type", String)
 ], ExpressServer.prototype, "favicon", void 0);
 __decorate([
-    (0, core_decorator_1.value)("compression"),
+    (0, typespeed_1.value)("compression"),
     __metadata("design:type", Object)
 ], ExpressServer.prototype, "compression", void 0);
 __decorate([
-    (0, core_decorator_1.value)("cookie"),
+    (0, typespeed_1.value)("cookie"),
     __metadata("design:type", Object)
 ], ExpressServer.prototype, "cookieConfig", void 0);
 __decorate([
-    (0, core_decorator_1.value)("session"),
+    (0, typespeed_1.value)("session"),
     __metadata("design:type", Object)
 ], ExpressServer.prototype, "session", void 0);
 __decorate([
-    (0, core_decorator_1.value)("redis"),
+    (0, typespeed_1.value)("redis"),
     __metadata("design:type", Object)
 ], ExpressServer.prototype, "redisConfig", void 0);
 __decorate([

package/dist/default/node-cache.class.js

@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const cache_factory_class_1 = require("../factory/cache-factory.class");
 const cache = require("node-cache");
+const typespeed_1 = require("../typespeed");
 const core_decorator_1 = require("../core.decorator");
 class NodeCache extends cache_factory_class_1.default {
     constructor() {
@@ -38,7 +39,7 @@ class NodeCache extends cache_factory_class_1.default {
     }
 }
 __decorate([
-    (0, core_decorator_1.value)("cache"),
+    (0, typespeed_1.value)("cache"),
     __metadata("design:type", Object)
 ], NodeCache.prototype, "config", void 0);
 __decorate([

package/dist/default/rabbitmq.class.js

@@ -11,11 +11,12 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rabbitListener = exports.RabbitMQ = void 0;
 const core_decorator_1 = require("../core.decorator");
+const typespeed_1 = require("../typespeed");
 const amqplib_1 = require("amqplib");
 let rabbitConnection = null;
 class RabbitMQ {
     getRabbitMQ() {
-        if (!(0, core_decorator_1.config)("rabbitmq")) {
+        if (!(0, typespeed_1.config)("rabbitmq")) {
             return null;
         }
         return new RabbitMQ();
@@ -48,7 +49,7 @@ __decorate([
 exports.RabbitMQ = RabbitMQ;
 async function getChannel() {
     if (rabbitConnection === null) {
-        rabbitConnection = await (0, amqplib_1.connect)((0, core_decorator_1.config)("rabbitmq"));
+        rabbitConnection = await (0, amqplib_1.connect)((0, typespeed_1.config)("rabbitmq"));
         process.once('SIGINT', async () => {
             await rabbitConnection.close();
         });

package/dist/default/read-write-db.class.js

@@ -12,10 +12,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const mysql2_1 = require("mysql2");
 const data_source_factory_class_1 = require("../factory/data-source-factory.class");
 const core_decorator_1 = require("../core.decorator");
+const typespeed_1 = require("../typespeed");
 class ReadWriteDb extends data_source_factory_class_1.default {
+    getDataSource() {
+        if (!(0, typespeed_1.config)("mysql")) {
+            return null;
+        }
+        return new ReadWriteDb();
+    }
     constructor() {
         super();
-        const dbConfig = (0, core_decorator_1.config)("mysql");
+        const dbConfig = (0, typespeed_1.config)("mysql");
         if (dbConfig["master"] && dbConfig["slave"]) {
             this.writeSession = this.getConnectionByConfig(dbConfig["master"]);
             if (Array.isArray(dbConfig["slave"])) {
@@ -30,12 +37,6 @@ class ReadWriteDb extends data_source_factory_class_1.default {
             this.readSession = [this.writeSession];
         }
     }
-    getDataSource() {
-        if (!(0, core_decorator_1.config)("mysql")) {
-            return null;
-        }
-        return new ReadWriteDb();
-    }
     getConnectionByConfig(config) {
         if (config["PoolOptions"] !== undefined) {
             // we need pool

package/dist/default/redis.class.js

@@ -11,12 +11,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_decorator_1 = require("../core.decorator");
 const ioredis_1 = require("ioredis");
+const typespeed_1 = require("../typespeed");
 class Redis extends ioredis_1.default {
     getRedis() {
-        if (!(0, core_decorator_1.config)("redis")) {
+        if (!(0, typespeed_1.config)("redis")) {
             return null;
         }
-        return new Redis((0, core_decorator_1.config)("redis"));
+        return new Redis((0, typespeed_1.config)("redis"));
     }
     constructor(config) {
         super(config);

package/dist/factory/log-factory.class.js

@@ -7,8 +7,5 @@ class LogFactory {
     error(message, ...optionalParams) {
         console.error(message, ...optionalParams);
     }
-    debug(message, ...optionalParams) {
-        console.debug(message, ...optionalParams);
-    }
 }
 exports.default = LogFactory;

package/dist/typespeed.js

@@ -14,7 +14,91 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReadWriteDb = exports.Redis = exports.NodeCache = exports.LogDefault = exports.ExpressServer = exports.AuthenticationFactory = exports.ServerFactory = exports.DataSourceFactory = exports.CacheFactory = exports.LogFactory = void 0;
+exports.ReadWriteDb = exports.Redis = exports.NodeCache = exports.LogDefault = exports.ExpressServer = exports.AuthenticationFactory = exports.ServerFactory = exports.DataSourceFactory = exports.CacheFactory = exports.LogFactory = exports.config = exports.value = exports.app = void 0;
+require("reflect-metadata");
+const fs = require("fs");
+const path = require("path");
+const walkSync = require("walk-sync");
+let globalConfig = {};
+const coreDir = __dirname;
+const mainPath = path.dirname(getRootPath(new Error().stack.split("\n")) || process.argv[1]);
+const configFile = mainPath + "/config.json";
+if (fs.existsSync(configFile)) {
+    globalConfig = JSON.parse(fs.readFileSync(configFile, "utf-8"));
+    const nodeEnv = process.env.NODE_ENV || "development";
+    const envConfigFile = mainPath + "/config-" + nodeEnv + ".json";
+    if (fs.existsSync(envConfigFile)) {
+        globalConfig = Object.assign(globalConfig, JSON.parse(fs.readFileSync(envConfigFile, "utf-8")));
+    }
+}
+function app(constructor) {
+    const coreFiles = walkSync(coreDir, { globs: ['**/*.ts'], ignore: ['**/*.d.ts', 'scaffold/**'] });
+    const mainFiles = walkSync(mainPath, { globs: ['**/*.ts'] });
+    (async function () {
+        var _a, _b;
+        try {
+            for (let p of coreFiles) {
+                let moduleName = p.replace(".d.ts", "").replace(".ts", "");
+                await (_a = coreDir + "/" + moduleName, Promise.resolve().then(() => require(_a)));
+            }
+            for (let p of mainFiles) {
+                let moduleName = p.replace(".d.ts", "").replace(".ts", "");
+                await (_b = mainPath + "/" + moduleName, Promise.resolve().then(() => require(_b)));
+            }
+        }
+        catch (err) {
+            console.error(err);
+        }
+        //log("main start")
+        const main = new constructor();
+        main["main"]();
+    }());
+}
+exports.app = app;
+function config(node) {
+    return globalConfig[node] || null;
+}
+exports.config = config;
+function value(configPath) {
+    return function (target, propertyKey) {
+        if (globalConfig === undefined) {
+            Object.defineProperty(target, propertyKey, {
+                get: () => {
+                    return undefined;
+                }
+            });
+        }
+        else {
+            let pathNodes = configPath.split(".");
+            let nodeValue = globalConfig;
+            for (let i = 0; i < pathNodes.length; i++) {
+                nodeValue = nodeValue[pathNodes[i]];
+            }
+            Object.defineProperty(target, propertyKey, {
+                get: () => {
+                    return nodeValue;
+                }
+            });
+        }
+    };
+}
+exports.value = value;
+function getRootPath(lines) {
+    const macths = ["at Function.Module._load", "at Module.require", "at require", "at Object.<anonymous>"];
+    let matchIndex = 0;
+    for (let line of lines) {
+        if (line.includes(macths[matchIndex])) {
+            if (matchIndex === macths.length - 1) {
+                return line.split("(")[1].split(":")[0];
+            }
+            matchIndex++;
+        }
+        else {
+            matchIndex = 0;
+        }
+    }
+    return undefined;
+}
 __exportStar(require("./core.decorator"), exports);
 __exportStar(require("./route.decorator"), exports);
 __exportStar(require("./database.decorator"), exports);