typespeed 2.4.7 → 2.4.9

package/dist/database.decorator.js

@@ -99,7 +99,10 @@ async function actionExecute(newSql, sqlValues) {
 async function actionQuery(newSql, sqlValues, dataClassType) {
     const readConnection = await (0, core_decorator_1.getBean)(data_source_factory_class_1.default).readConnection();
     const [rows] = await readConnection.query(newSql, sqlValues);
-    if (rows === null || Object.keys(rows).length === 0 || !dataClassType) {
+    if (rows === null || Object.keys(rows).length === 0) {
+        return null;
+    }
+    else if (!dataClassType) {
         return rows;
     }
     const records = [];
@@ -112,7 +115,7 @@ async function actionQuery(newSql, sqlValues, dataClassType) {
         });
         records.push(entity);
     }
-    return records;
+    return Object.keys(records).length === 0 ? null : records;
 }
 function convertSQLParams(decoratorSQL, target, propertyKey, args) {
     const queryValues = [];
@@ -188,7 +191,7 @@ class Model {
         }
         else if (typeof limit === 'object') {
             const total = await actionQuery('SELECT COUNT(*) AS M_COUNTER  FROM ' + this.table + ' WHERE ' + sql, values);
-            if (total === undefined || total[0]['M_COUNTER'] === 0) {
+            if (total === null || total[0] === undefined || total[0]['M_COUNTER'] === 0) {
                 return [];
             }
             if (limit['pageSize'] !== undefined && limit['pageSize'] < total[0]['M_COUNTER']) {
@@ -220,7 +223,7 @@ class Model {
     }
     async find(conditions, sort, fields = '*') {
         const result = await this.findAll(conditions, sort, fields, 1);
-        return result.length > 0 ? result[0] : null;
+        return result != null && result.length > 0 ? result[0] : null;
     }
     async update(conditions, fieldToValues) {
         const { sql, values } = this.where(conditions);
@@ -238,7 +241,7 @@ class Model {
         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[0]['M_COUNTER'] || 0;
+        return result != null && result[0] != undefined ? result[0]['M_COUNTER'] : 0;
     }
     async incr(conditions, field, optval = 1) {
         const { sql, values } = this.where(conditions);

package/dist/default/rabbitmq.class.js

@@ -62,7 +62,8 @@ function rabbitListener(queue) {
         (async function () {
             const channel = await getChannel();
             await channel.assertQueue(queue);
-            await channel.consume(queue, target[propertyKey], { noAck: true });
+            const targetBean = (0, core_decorator_1.getComponent)(target.constructor);
+            await channel.consume(queue, targetBean[propertyKey], { noAck: true });
         }());
     };
 }

package/dist/default/redis.class.js

@@ -47,6 +47,14 @@ class Redis extends ioredis_1.default {
             return this.subObj;
         }
     }
+    static async close() {
+        if (this.subObj != null) {
+            await this.subObj.quit();
+        }
+        if (this.pubObj != null) {
+            await this.pubObj.quit();
+        }
+    }
 }
 Redis.pubObj = null;
 Redis.subObj = null;
@@ -68,16 +76,18 @@ function redisSubscriber(channel) {
         }
     });
     return function (target, propertyKey) {
-        redisSubscribers[channel] = target[propertyKey];
+        redisSubscribers[channel] = {
+            target: target,
+            propertyKey: propertyKey
+        };
     };
 }
 exports.redisSubscriber = redisSubscriber;
 if ((0, typespeed_1.config)("redis")) {
-    Redis.getInstanceOfRedis("sub").on("message", function (channel, message) {
-        redisSubscribers[channel](message);
+    Redis.getInstanceOfRedis("sub").on("message", async function (channel, message) {
+        await (0, core_decorator_1.getComponent)(redisSubscribers[channel].target.constructor)[redisSubscribers[channel].propertyKey](message);
     });
 }
 process.once('SIGINT', () => {
-    Redis.getInstanceOfRedis("sub") || Redis.getInstanceOfRedis("sub").disconnect();
-    Redis.getInstanceOfRedis("pub") || Redis.getInstanceOfRedis("pub").disconnect();
+    Redis.close();
 });

package/dist/default/socket-io.class.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.io = exports.SocketIo = void 0;
 const socket_io_1 = require("socket.io");
 const http_1 = require("http");
+const core_decorator_1 = require("../core.decorator");
 let io = null;
 exports.io = io;
 const listeners = { "event": [], "disconnect": null, "error": null, "connected": null };
@@ -10,27 +11,27 @@ class SocketIo {
     static setIoServer(app, ioSocketConfig) {
         const httpServer = (0, http_1.createServer)(app);
         exports.io = io = new socket_io_1.Server(httpServer, ioSocketConfig);
-        io.use((socket, next) => {
+        io.use(async (socket, next) => {
             if (listeners["connected"] !== null) {
-                listeners["connected"](socket, async (err) => {
+                await (0, core_decorator_1.getComponent)(listeners["connected"].target.constructor)[listeners["connected"].propertyKey](socket, async (err) => {
                     if (listeners["error"] !== null && err) {
-                        await listeners["error"](socket, err);
+                        await (0, core_decorator_1.getComponent)(listeners["error"].target.constructor)[listeners["error"].propertyKey](socket, err);
                     }
                 });
             }
             next();
         });
-        io.on("connection", (socket) => {
+        io.on("connection", async (socket) => {
             if (listeners["disconnect"] !== null) {
                 socket.on("disconnect", async (reason) => {
-                    await listeners["disconnect"](socket, reason);
+                    await (0, core_decorator_1.getComponent)(listeners["disconnect"].target.constructor)[listeners["disconnect"].propertyKey](socket, reason);
                 });
             }
             socket.use(async ([event, ...args], next) => {
                 try {
                     for (let listener of listeners["event"]) {
                         if (listener[1] === event) {
-                            await listener[0](socket, ...args);
+                            await (0, core_decorator_1.getComponent)(listener[0].target.constructor)[listener[0].propertyKey](socket, ...args);
                         }
                     }
                 }
@@ -40,7 +41,7 @@ class SocketIo {
             });
             if (listeners["error"] !== null) {
                 socket.on("error", async (err) => {
-                    await listeners["error"](socket, err);
+                    await (0, core_decorator_1.getComponent)(listeners["error"].target.constructor)[listeners["error"].propertyKey](socket, err);
                 });
             }
         });
@@ -48,17 +49,29 @@ class SocketIo {
     }
     static onEvent(event) {
         return (target, propertyKey) => {
-            listeners["event"].push([target[propertyKey], event]);
+            listeners["event"].push([{
+                    target: target,
+                    propertyKey: propertyKey
+                }, event]);
         };
     }
     static onError(target, propertyKey) {
-        listeners["error"] = target[propertyKey];
+        listeners["error"] = {
+            target: target,
+            propertyKey: propertyKey
+        };
     }
     static onDisconnect(target, propertyKey) {
-        listeners["disconnect"] = target[propertyKey];
+        listeners["disconnect"] = {
+            target: target,
+            propertyKey: propertyKey
+        };
     }
     static onConnected(target, propertyKey) {
-        listeners["connected"] = target[propertyKey];
+        listeners["connected"] = {
+            target: target,
+            propertyKey: propertyKey
+        };
     }
 }
 exports.SocketIo = SocketIo;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typespeed",
-  "version": "2.4.7", 
+  "version": "2.4.9",
   "description": "A new Framework for TypeScript.",
   "author": "speedphp",
   "license": "MIT License",

package/src/database.decorator.ts

@@ -99,7 +99,9 @@ async function actionExecute(newSql, sqlValues): Promise<ResultSetHeader> {
 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 || !dataClassType) {
+    if (rows === null || Object.keys(rows).length === 0){
+        return null;
+    } else if (!dataClassType) {
         return rows;
     }
     const records = [];
@@ -112,7 +114,7 @@ async function actionQuery(newSql, sqlValues, dataClassType?) {
         });
         records.push(entity);
     }
-    return records;
+    return Object.keys(records).length === 0 ? null : records;
 }
 
 function convertSQLParams(decoratorSQL: string, target: any, propertyKey: string, args: any[]): [string, any[]] {
@@ -192,7 +194,7 @@ class Model {
             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 === undefined || total[0]['M_COUNTER'] === 0) {
+            if (total === null || total[0] === undefined || total[0]['M_COUNTER'] === 0) {
                 return [];
             }
             if (limit['pageSize'] !== undefined && limit['pageSize'] < total[0]['M_COUNTER']) {
@@ -226,7 +228,7 @@ class Model {
 
     async find<T>(conditions, sort, fields = '*'): Promise<T> {
         const result = await this.findAll(conditions, sort, fields, 1);
-        return result.length > 0 ? <T>result[0] : null;
+        return result != null && result.length > 0 ? <T>result[0] : null;
     }
 
     async update(conditions, fieldToValues): Promise<number> {
@@ -247,7 +249,7 @@ class Model {
         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[0]['M_COUNTER'] || 0;
+        return result != null && result[0] != undefined ? result[0]['M_COUNTER'] : 0;
     }
 
     async incr(conditions, field, optval = 1): Promise<number> {

package/src/default/rabbitmq.class.ts

@@ -1,4 +1,4 @@
-import { bean  } from "../core.decorator";
+import { bean, getComponent  } from "../core.decorator";
 import { config } from "../typespeed";
 import { connect } from "amqplib";
 let rabbitConnection = null;
@@ -52,7 +52,8 @@ function rabbitListener(queue: string) {
         (async function () {
             const channel = await getChannel();
             await channel.assertQueue(queue);
-            await channel.consume(queue, target[propertyKey], { noAck: true });
+            const targetBean = getComponent(target.constructor);
+            await channel.consume(queue, targetBean[propertyKey], { noAck: true });
         }());
     }
 }

package/src/default/redis.class.ts

@@ -1,4 +1,4 @@
-import { bean } from "../core.decorator";
+import { bean, getComponent } from "../core.decorator";
 import { default as IoRedis, RedisKey} from "ioredis";
 import { config } from "../typespeed";
 const redisSubscribers = {};
@@ -42,6 +42,11 @@ class Redis extends IoRedis {
             return this.subObj;
         }
     }
+
+    static async close() {
+        if(this.subObj != null) { await this.subObj.quit(); }
+        if(this.pubObj != null) { await this.pubObj.quit(); }
+    }
 }
 
 function redisSubscriber(channel: string) {
@@ -54,19 +59,21 @@ function redisSubscriber(channel: string) {
         }
     });
     return function (target: any, propertyKey: string) {
-        redisSubscribers[channel] = target[propertyKey];
+        redisSubscribers[channel] = {
+            target: target,
+            propertyKey: propertyKey
+        };
     };
 }
 
 if (config("redis")) {
-    Redis.getInstanceOfRedis("sub").on("message", function (channel, message) {
-        redisSubscribers[channel](message);
+    Redis.getInstanceOfRedis("sub").on("message", async function (channel, message) {
+        await getComponent(redisSubscribers[channel].target.constructor)[redisSubscribers[channel].propertyKey](message);
     });
 }
 
 process.once('SIGINT', () => { 
-    Redis.getInstanceOfRedis("sub") || Redis.getInstanceOfRedis("sub").disconnect();
-    Redis.getInstanceOfRedis("pub") || Redis.getInstanceOfRedis("pub").disconnect();
+    Redis.close();
 });
 
 export { Redis, redisSubscriber };

package/src/default/socket-io.class.ts

@@ -1,5 +1,6 @@
 import { Server as IoServer } from "socket.io";
 import { createServer } from "http";
+import { getComponent } from "../core.decorator";
 
 let io: IoServer = null;
 const listeners = { "event": [], "disconnect": null, "error": null, "connected": null };
@@ -9,27 +10,27 @@ class SocketIo {
     public static setIoServer(app, ioSocketConfig) {
         const httpServer = createServer(app);
         io = new IoServer(httpServer, ioSocketConfig);
-        io.use((socket, next) => {
+        io.use(async (socket, next) => {
             if (listeners["connected"] !== null) {
-                listeners["connected"](socket, async (err) => {
+                await getComponent(listeners["connected"].target.constructor)[listeners["connected"].propertyKey](socket, async (err) => {
                     if (listeners["error"] !== null && err) {
-                        await listeners["error"](socket, err);
+                        await getComponent(listeners["error"].target.constructor)[listeners["error"].propertyKey](socket, err);
                     }
                 });
             }
             next();
         });
-        io.on("connection", (socket) => {
+        io.on("connection", async (socket) => {
             if (listeners["disconnect"] !== null) {
                 socket.on("disconnect", async (reason) => {
-                    await listeners["disconnect"](socket, reason);
+                    await getComponent(listeners["disconnect"].target.constructor)[listeners["disconnect"].propertyKey](socket, reason);
                 });
             }
             socket.use(async ([event, ...args], next) => {
                 try {
                     for (let listener of listeners["event"]) {
                         if (listener[1] === event) {
-                            await listener[0](socket, ...args);
+                            await getComponent(listener[0].target.constructor)[listener[0].propertyKey](socket, ...args);
                         }
                     }
                 } catch (err) {
@@ -39,7 +40,7 @@ class SocketIo {
 
             if (listeners["error"] !== null) {
                 socket.on("error", async (err) => {
-                    await listeners["error"](socket, err);
+                    await getComponent(listeners["error"].target.constructor)[listeners["error"].propertyKey](socket, err);
                 });
             }
         });
@@ -48,20 +49,32 @@ class SocketIo {
 
     public static onEvent(event: string) {
         return (target: any, propertyKey: string) => {
-            listeners["event"].push([target[propertyKey], event]);
+            listeners["event"].push([{
+                target: target,
+                propertyKey: propertyKey
+            }, event]);
         }
     }
 
     public static onError(target: any, propertyKey: string) {
-        listeners["error"] = target[propertyKey];
+        listeners["error"] = {
+            target: target,
+            propertyKey: propertyKey
+        };
     }
 
     public static onDisconnect(target: any, propertyKey: string) {
-        listeners["disconnect"] = target[propertyKey];
+        listeners["disconnect"] = {
+            target: target,
+            propertyKey: propertyKey
+        };
     }
 
     public static onConnected(target: any, propertyKey: string) {
-        listeners["connected"] = target[propertyKey];
+        listeners["connected"] = {
+            target: target,
+            propertyKey: propertyKey
+        };
     }
 }