@domain.js/main 0.3.26 → 0.4.2

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/cache/index.d.ts

@@ -1,5 +1,5 @@
 import { Cache, CnfDef, DepsDef, PubSubDef } from "./Define";
-export { Before } from "./Before";
 export { After } from "./After";
+export { Before } from "./Before";
 export declare function Main(cnf: CnfDef, deps: DepsDef, pubsub?: PubSubDef): Cache;
 export declare const Deps: string[];

package/dist/deps/cache/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Deps = exports.Main = exports.After = exports.Before = void 0;
-var Before_1 = require("./Before");
-Object.defineProperty(exports, "Before", { enumerable: true, get: function () { return Before_1.Before; } });
+exports.Deps = exports.Main = exports.Before = exports.After = void 0;
 var After_1 = require("./After");
 Object.defineProperty(exports, "After", { enumerable: true, get: function () { return After_1.After; } });
+var Before_1 = require("./Before");
+Object.defineProperty(exports, "Before", { enumerable: true, get: function () { return Before_1.Before; } });
 function Main(cnf, deps, pubsub) {
     let hits = 0; // 击中次数
     let misseds = 0; // 未击中次数

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

@@ -9,6 +9,7 @@ interface Deps {
         Sequelize: typeof Sequelize;
     };
 }
+export declare const Deps: string[];
 declare type NonConstructorKeys<T> = {
     [P in keyof T]: T[P] extends new () => any ? never : P;
 }[keyof T];
@@ -17,7 +18,6 @@ export declare type ModelStatic<M extends ModelBase> = NonConstructor<typeof Mod
 export declare function Main(cnf: Cnf, deps: Deps): {
     [propName: string]: Sequelize;
 };
-export declare const Deps: string[];
 /** Model 上的 sort 设定类型 */
 export interface ModelSort<Fields extends string> {
     default: Fields;
@@ -43,6 +43,10 @@ export declare class ModelBase<Attrs extends {} = any, Attrs4Create extends {} =
      * @param pk 主键
      */
     static getByPk<M extends ModelBase>(this: ModelStatic<M>, pk: string | number): Promise<M | null>;
+    /** cache 是否开启 */
+    static cache: boolean;
+    /** 删除cache */
+    static delCache(_pk: string | number): void;
     /**
      * 基于主键获取某些数据的Mode实例列表，维持参数的顺序，自动维护内存级 cache
      * @param pks 主键数组
@@ -93,7 +97,5 @@ export declare class ModelBase<Attrs extends {} = any, Attrs4Create extends {} =
     };
     /** 联合唯一列名称集合，用来自动恢复软删除的资源 */
     static unique?: string[];
-    /** cache 是否开启 */
-    static cache: boolean;
 }
 export {};

package/dist/deps/sequelize/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModelBase = exports.Deps = exports.Main = void 0;
+exports.ModelBase = exports.Main = exports.Deps = void 0;
 const sequelize_1 = require("sequelize");
+exports.Deps = ["Sequelize"];
 function Main(cnf, deps) {
     // 这里之所以要注入 Sequelize 是为了保证项目自身可以灵活选择自己的 Sequelize 版本, 这样改公共模块就会更加稳定, 避免频繁升级
     const { sequelize: dbs } = cnf;
@@ -14,7 +15,6 @@ function Main(cnf, deps) {
     return sequelizes;
 }
 exports.Main = Main;
-exports.Deps = ["Sequelize"];
 /**
  * Model 基类
  */
@@ -26,6 +26,8 @@ class ModelBase extends sequelize_1.Model {
     static getByPk(pk) {
         return this.findByPk(pk);
     }
+    /** 删除cache */
+    static delCache(_pk) { }
     /**
      * 基于主键获取某些数据的Mode实例列表，维持参数的顺序，自动维护内存级 cache
      * @param pks 主键数组
@@ -45,6 +47,8 @@ class ModelBase extends sequelize_1.Model {
     }
 }
 exports.ModelBase = ModelBase;
+/** cache 是否开启 */
+ModelBase.cache = true;
 /** 新增资源的时候可以写入的列名称集合 */
 ModelBase.writableCols = [];
 /** 编辑资源的时候可以写入的列名称集合 */
@@ -61,5 +65,3 @@ ModelBase.sort = {
     defaultDirection: "DESC",
     allow: ["id"],
 };
-/** cache 是否开启 */
-ModelBase.cache = true;

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.26",
+  "version": "0.4.2",
   "description": "DDD framework",
   "main": "dist/index.js",
   "bin": {