@domain.js/main 0.3.27 → 0.4.3

package/dist/deps/aes/index.js

@@ -20,8 +20,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Main = void 0;
-const cryptojs = __importStar(require("crypto-js/core"));
 const AES = __importStar(require("crypto-js/aes"));
+const cryptojs = __importStar(require("crypto-js/core"));
 function Main() {
     // aes-256-cbc encrypt
     const encrypt = (message, key) => AES.encrypt(message, key).toString();

package/dist/deps/cache/After.d.ts

@@ -1,2 +1,2 @@
-import { CnfDef, DepsDef, PubSubDef, Cache } from "./Define";
+import { Cache, CnfDef, DepsDef, PubSubDef } from "./Define";
 export declare const After: (lru: Pick<Cache, "del">, cnf: CnfDef, deps: Pick<DepsDef, "logger">, pubsub?: PubSubDef | undefined) => void;

package/dist/deps/cache/After.js

@@ -18,6 +18,7 @@ const After = (lru, cnf, deps, pubsub) => {
     });
     const del = lru.del.bind(lru);
     lru.del = (key) => {
+        del(key);
         pub.publish(delSignalChannel, key);
     };
     sub.on("message", async (channel, key) => {

package/dist/deps/cron/index.d.ts

@@ -21,6 +21,12 @@ interface Deps {
         submit: (name: string, times: number, callback: (arg: callbackArg) => void) => void;
     };
 }
+/**
+ * 定时执行函数, 解决 setTimeout 第二个参数不能大于 2147483647 的问题
+ * @param fn 要执行的函数
+ * @param timeoutMS 执行间隔时间，单位毫秒
+ */
+export declare const timeout: (fn: Function, timeoutMS: number) => void;
 export declare function Main(cnf: Cnf, deps: Deps): {
     regist: (name: string, intervalStr: string, startAt?: string | undefined) => void;
     start: () => void;

package/dist/deps/cron/index.js

@@ -1,6 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Deps = exports.Main = void 0;
+exports.Deps = exports.Main = exports.timeout = void 0;
+/**
+ * 定时执行函数, 解决 setTimeout 第二个参数不能大于 2147483647 的问题
+ * @param fn 要执行的函数
+ * @param timeoutMS 执行间隔时间，单位毫秒
+ */
+const timeout = (fn, timeoutMS) => {
+    if (timeoutMS < 2147483647) {
+        setTimeout(fn, timeoutMS);
+    }
+    else {
+        setTimeout(() => {
+            (0, exports.timeout)(fn, timeoutMS - 2147483647);
+        }, 2147483647);
+    }
+};
+exports.timeout = timeout;
 function Main(cnf, deps) {
     const { cron = {} } = cnf;
     const ciaTaskType = "cronJob";
@@ -37,7 +53,7 @@ function Main(cnf, deps) {
                 throw Error("startAt 定义不合法");
             timeoutMS = startAt;
         }
-        setTimeout(() => {
+        (0, exports.timeout)(() => {
             opt.times += 1;
             opt.triggeredAt = Date.now();
             myCia.submit(`Cron::${name}`, opt.times, ({ cronJob: [err, , totalMS] }) => {

package/dist/deps/hash/index.d.ts

@@ -8,7 +8,7 @@ interface Deps {
     redis: Pick<Redis, "hget" | "hset" | "hdel" | "hincrby">;
 }
 export declare function Main(cnf: Cnf, deps: Deps): {
-    get: (key: string) => Promise<number>;
+    get: (key: string) => Promise<string | null>;
     set: (key: string, value: string) => Promise<number>;
     del: (key: string) => Promise<number>;
     incr: (key: string, step?: number) => Promise<number>;

package/dist/deps/hash/index.js

@@ -5,8 +5,7 @@ function Main(cnf, deps) {
     const { hash: { key: REDIS_KEY }, } = cnf;
     const { redis } = deps;
     const get = async (key) => {
-        const num = await redis.hget(REDIS_KEY, key);
-        return Number(num) | 0;
+        return redis.hget(REDIS_KEY, key);
     };
     const set = (key, value) => redis.hset(REDIS_KEY, key, value);
     const del = (key) => redis.hdel(REDIS_KEY, key);

package/dist/deps/sequelize/index.d.ts

@@ -1,13 +1,22 @@
 import { Model, Options, Sequelize } from "sequelize";
 interface Cnf {
     sequelize: {
-        [propName: string]: Options;
+        [propName: string]: Options & {
+            /** 是否开启账号密码aes加密，以增强安全性 */
+            security?: boolean;
+        };
+    };
+    aes: {
+        key: string;
     };
 }
 interface Deps {
     Sequelize: {
         Sequelize: typeof Sequelize;
     };
+    aes: {
+        decrypt: (str: string, key: string) => string;
+    };
 }
 export declare const Deps: string[];
 declare type NonConstructorKeys<T> = {

package/dist/deps/sequelize/index.js

@@ -2,14 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelBase = exports.Main = exports.Deps = void 0;
 const sequelize_1 = require("sequelize");
-exports.Deps = ["Sequelize"];
+exports.Deps = ["Sequelize", "aes"];
 function Main(cnf, deps) {
     // 这里之所以要注入 Sequelize 是为了保证项目自身可以灵活选择自己的 Sequelize 版本, 这样改公共模块就会更加稳定, 避免频繁升级
-    const { sequelize: dbs } = cnf;
-    const { Sequelize } = deps;
+    const { sequelize: dbs, aes: { key: AES_KEY }, } = cnf;
+    const { Sequelize, aes } = deps;
     const sequelizes = {};
     for (const k of Object.keys(dbs)) {
         const db = dbs[k];
+        if (db.security) {
+            db.username = aes.decrypt(db.username, AES_KEY);
+            db.password = aes.decrypt(db.password, AES_KEY);
+        }
         sequelizes[k] = new Sequelize.Sequelize(db);
     }
     return sequelizes;

package/dist/http/socket.d.ts

@@ -9,6 +9,10 @@ export declare type Client = Socket<DefaultEventsMap, DefaultEventsMap, DefaultE
     profile?: ReturnType<typeof makeProfile>;
     inited?: boolean;
     roomId?: string;
+    methods?: Record<string, Function>;
+    operator?: any;
+    /** 退出房间回调函数 */
+    quit?: Function;
 };
 declare const makeProfile: (client: Client, type: string | undefined, auth: string | Signature, extra?: Profile["extra"]) => Profile;
 export declare function BridgeSocket(io: Server, domain: Domain): void;

package/dist/http/socket.js

@@ -105,10 +105,7 @@ function BridgeSocket(io, domain) {
             }
             catch (e) {
                 client.inited = false;
-                if (e instanceof MyError) {
-                    client.emit("internalError", e.message, e.code || "unknown");
-                    return;
-                }
+                client.emit("internalError", e.code || "unknown", e.message, e.data);
                 console.error(e);
             }
         });
@@ -116,44 +113,40 @@ function BridgeSocket(io, domain) {
             try {
                 if (!client.profile || !client.inited)
                     return;
-                const res = await entrance({ ...client.profile, roomId }, client);
+                const ret = await entrance({ ...client.profile, roomId }, client);
                 client.profile.roomId = roomId;
                 client.roomId = roomId;
-                client.emit("entranced", res);
+                Object.assign(client, ret);
+                client.emit("entranced", { ...ret, methods: Object.keys(ret.methods) });
             }
             catch (e) {
-                if (e instanceof MyError) {
-                    client.emit("internalError", e.message, e.code || "unknown");
-                    return;
-                }
+                client.emit("internalError", e.code || "unknown", e.message, e.data);
                 console.error(e);
             }
         });
         client.use(async ([name, params, responseId], next) => {
             if (name === "init" || name === "entrance")
                 return next();
-            const { method } = domain[name];
+            if (!client.methods)
+                throw new MyError("没有允许执行的方法", "请先进入房间");
+            const method = client.methods[name];
             try {
                 if (!method)
-                    throw new MyError("notFound", "不存在该领域方法");
+                    throw new MyError("notFound", `不存在该领域方法: ${name}`);
                 if (!client.profile)
                     throw new MyError("noAuth", "请先执行 init");
-                const res = await method({ ...client.profile, method: name }, params);
+                const res = await method(...(params || []));
                 if (responseId) {
                     client.emit("response", responseId, res);
                 }
             }
             catch (e) {
-                if (e instanceof Error) {
-                    if (responseId) {
-                        client.emit("responseError", responseId, e.code, e.message, e.data);
-                    }
-                    else {
-                        client.emit(`${name}Error`, e.code, e.message, e.data);
-                    }
+                if (responseId) {
+                    console.error(e);
+                    client.emit("responseError", responseId, e.code, e.message, e.data);
                 }
                 else {
-                    console.error(e);
+                    client.emit("internalError", e.code, e.message, e.data);
                 }
             }
             return next();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domain.js/main",
-  "version": "0.3.27",
+  "version": "0.4.3",
   "description": "DDD framework",
   "main": "dist/index.js",
   "bin": {