@domain.js/main 0.3.4 → 0.3.7

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

@@ -5,12 +5,14 @@ interface Cnf {
     };
 }
 interface Deps {
-    redis: Pick<Redis, "hget" | "hset" | "hincrby">;
+    redis: Pick<Redis, "hget" | "hset" | "hincrby" | "hmget">;
 }
 export declare function Main(cnf: Cnf, deps: Deps): {
+    mget: (keys: string[]) => Promise<number[]>;
     get: (key: string) => Promise<number>;
     set: (key: string, val: number) => Promise<number>;
     incr: (key: string) => Promise<number>;
+    decr: (key: string) => Promise<number>;
 };
 export declare const Deps: string[];
 export {};

package/dist/deps/counter/index.js

@@ -4,13 +4,39 @@ exports.Deps = exports.Main = void 0;
 function Main(cnf, deps) {
     const { counter: { key: REDIS_KEY }, } = cnf;
     const { redis } = deps;
+    /**
+     * 获取指定 key 的统计数
+     * @param key 要获取的 key
+     */
     const get = async (key) => {
         const num = await redis.hget(REDIS_KEY, key);
         return Number(num) | 0;
     };
+    /**
+     * 主动设置某个key为一个数字
+     * @param key 要设置的key
+     * @param val 要设置的值
+     */
     const set = (key, val) => redis.hset(REDIS_KEY, key, Math.max(0, val | 0));
+    /**
+     * 某个key自增长1
+     * @param key 要自增长的key
+     */
     const incr = (key) => redis.hincrby(REDIS_KEY, key, 1);
-    return { get, set, incr };
+    /**
+     * 某个key自减少1
+     * @param key 要自减少的key
+     */
+    const decr = (key) => redis.hincrby(REDIS_KEY, key, -1);
+    /**
+     * 一次获取多个key的统计值
+     * @param keys 多个key按序输入, 返回的统计数据为数组，和keys数组保持对应关系
+     */
+    const mget = async (keys) => {
+        const res = await redis.hmget(REDIS_KEY, ...keys);
+        return res.map((x) => Number(x) | 0);
+    };
+    return { mget, get, set, incr, decr };
 }
 exports.Main = Main;
 exports.Deps = ["redis"];

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

@@ -27,11 +27,17 @@ export declare function Main(cnf: Cnf, deps: Deps, utils: ReturnType<typeof Util
     modify: <T extends ModelBase<any, any>>(Model: ModelStatic<T>, model: T, params: Record<string, any>, isAdmin?: boolean, _cols?: string[] | undefined) => Promise<T>;
     add: <T_1 extends ModelBase<any, any>>(Model: ModelStatic<T_1>, params: Record<string, any>, isAdmin: boolean | undefined, _cols: string[] | undefined, { creatorId, clientIp }: CreatorAndClientIp) => Promise<T_1>;
     remove: (model: Sequelize.Model, deletorId: UserId) => Promise<void | Sequelize.Model<any, any>>;
-    list: <T_2 extends ModelBase<any, any>>(Model: ModelStatic<T_2>, params: Record<string, any>, allowAttrs?: string[] | undefined, toJSON?: boolean | undefined) => Promise<{
-        count: number;
-        rows: T_2[];
-    }>;
-    stats: <T_3 extends ModelBase<any, any>>(Model: ModelStatic<T_3>, params: Record<string, any>, where?: any, conf?: {
+    list: {
+        <T_2 extends ModelBase<any, any>, J = ReturnType<T_2["toJSON"]>>(Model: ModelStatic<T_2>, params: Record<string, any>, allowAttrs?: string[] | undefined, toJSON?: false | undefined): Promise<{
+            rows: T_2[];
+            count: number;
+        }>;
+        <T_3 extends ModelBase<any, any>, J_1 = ReturnType<T_3["toJSON"]>>(Model: ModelStatic<T_3>, params: Record<string, any>, allowAttrs?: string[] | undefined, toJSON?: true | undefined): Promise<{
+            rows: J_1[];
+            count: number;
+        }>;
+    };
+    stats: <T_4 extends ModelBase<any, any>>(Model: ModelStatic<T_4>, params: Record<string, any>, where?: any, conf?: {
         dimensions?: Record<string, string> | undefined;
         metrics: Record<string, string>;
         pagination?: {

package/dist/deps/rest/index.js

@@ -99,15 +99,7 @@ function Main(cnf, deps, utils) {
     };
     // count条件所需属性
     const COUNT_OPT = Object.freeze(["where", "include"]);
-    /**
-     * Restful list (R of CRUD) for list resource
-     * @param Model Model definition of resources
-     * @param params parameters for updating
-     * @param allowAttrs Allow columns to be returned
-     * @param toJSON Whether to directly return JSON formatted objects
-     * @returns findAll resource result, object propoties has count, rows
-     */
-    const list = async (Model, params, allowAttrs, toJSON) => {
+    async function list(Model, params, allowAttrs, toJSON) {
         const opt = findAllOpts(Model, params);
         const { _ignoreTotal } = params;
         // 提高查询速度
@@ -117,13 +109,10 @@ function Main(cnf, deps, utils) {
         if (Array.isArray(allowAttrs) && allowAttrs.length)
             opt.attributes = allowAttrs;
         const rows = await Model.findAll(opt);
-        if (toJSON) {
-            for (let i = 0; i < rows.length; i += 1) {
-                rows[i] = rows[i].toJSON();
-            }
-        }
-        return { count, rows };
-    };
+        if (!toJSON)
+            return { rows, count };
+        return { count, rows: rows.map((x) => x.toJSON()) };
+    }
     return { modify, add, remove, list, stats: (0, stats_1.Stats)(cnf, deps, utils) };
 }
 exports.Main = Main;

package/dist/http/socket.js

@@ -68,15 +68,15 @@ const makeProfile = (client, type = "user", auth, extra = {}) => {
     return obj;
 };
 function BridgeSocket(io, domain) {
-    const { method: subscribe } = domain["message.subscribe"];
-    const { method: unsubscribe } = domain["message.unsubscribe"];
-    const { method: entrance } = domain["message.entrance"];
+    const { method: subscribe } = domain["socket.subscribe"];
+    const { method: unsubscribe } = domain["socket.unsubscribe"];
+    const { method: entrance } = domain["socket.entrance"];
     if (!subscribe)
-        throw Error("要启用 socket 服务，必须要要有 message.subscribe 方法，用来处理 socket 订阅");
+        throw Error("要启用 socket 服务，必须要要有 socket.subscribe 方法，用来处理 socket 订阅");
     if (!unsubscribe)
-        throw Error("要启用 socket 服务，必须要要有 message.unsubscribe 方法，用来处理 socket 退订");
+        throw Error("要启用 socket 服务，必须要要有 socket.unsubscribe 方法，用来处理 socket 退订");
     if (!entrance)
-        throw Error("要启用 socket 服务，必须要要有 message.entrance 方法，用来处理 加入某个房间");
+        throw Error("要启用 socket 服务，必须要要有 socket.entrance 方法，用来处理 加入某个房间");
     io.on("connection", (client) => {
         // 定义toJSON 避免 schema 验证报错
         Object.assign(client, {

package/package.json

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