@domain.js/main 0.2.1 → 0.2.2

package/dist/http/defines.d.ts

@@ -15,6 +15,8 @@ export interface Profile {
     userAgent: string;
     startedAt: Date;
     requestId: string;
+    /** 用户类型，例如 user, worker */
+    type: string;
     /** 自由挂载信息的节点 */
     extra: Record<string, any>;
     revision?: string;

package/dist/http/socket.d.ts

@@ -1,13 +1,15 @@
 import { Server, Socket } from "socket.io";
 import { DefaultEventsMap } from "socket.io/dist/typed-events";
+import { Opt as Sign } from "../deps/signer";
 import { Domain, Profile } from "./defines";
-export declare type Listener = Client["emit"] & {
-    roomId?: string;
+declare type Signature = Sign & {
+    signature: string;
 };
-declare type Client = Socket<DefaultEventsMap, DefaultEventsMap, DefaultEventsMap, any> & {
+export declare type Client = Socket<DefaultEventsMap, DefaultEventsMap, DefaultEventsMap, any> & {
     profile?: ReturnType<typeof makeProfile>;
-    listener?: Listener;
+    inited?: boolean;
+    roomId?: string;
 };
-declare const makeProfile: (client: Client, token: string, params: any, extra: Profile["extra"]) => Profile;
+declare const makeProfile: (client: Client, type: string | undefined, auth: string | Signature, extra?: Profile["extra"]) => Profile;
 export declare function BridgeSocket(io: Server, domain: Domain): void;
 export {};

package/dist/http/socket.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BridgeSocket = void 0;
+const lodash_1 = __importDefault(require("lodash"));
 const proxyIps = new Set(["127.0.0.1"]);
 class MyError extends Error {
     constructor(code, message, data) {
@@ -37,9 +41,8 @@ const utils = {
         return realIp.split(",")[0];
     },
 };
-const makeProfile = (client, token, params, extra) => {
+const makeProfile = (client, type = "user", auth, extra = {}) => {
     const obj = {
-        token,
         clientIp: utils.clientIp(client),
         remoteIp: utils.remoteIp(client),
         realIp: utils.realIp(client),
@@ -47,19 +50,31 @@ const makeProfile = (client, token, params, extra) => {
         startedAt: new Date(),
         userAgent: client.handshake.headers["user-agent"] || "Not captured",
         requestId: client.id,
-        /** 客户端发布号 */
-        revision: params.revision,
-        /** 用户uuid 可以长期跨app */
-        uuid: params.uuid,
-        /** 额外信息，自由扩展 */
+        type,
         extra,
     };
+    if (extra) {
+        /** 客户端发布号 */
+        if (extra.revision)
+            obj.revision = extra.revision;
+        /** 用户uuid 可以长期跨app */
+        if (extra.uuid)
+            obj.uuid = extra.uuid;
+    }
+    if (typeof auth === "string") {
+        obj.token = auth;
+    }
+    else {
+        obj.sign = auth;
+        obj.sign.uri = "/socket.io";
+        obj.sign.method = "socket.init";
+    }
     return obj;
 };
 function BridgeSocket(io, domain) {
-    const subscribe = domain["message.subscribe"];
-    const unsubscribe = domain["message.unsubscribe"];
-    const entrance = domain["message.entrance"];
+    const subscribe = lodash_1.default.get(domain, "message.subscribe");
+    const unsubscribe = lodash_1.default.get(domain, "message.unsubscribe");
+    const entrance = lodash_1.default.get(domain, "message.entrance");
     if (!subscribe)
         throw Error("要启用 socket 服务，必须要要有 message.subscribe 方法，用来处理 socket 订阅");
     if (!unsubscribe)
@@ -67,25 +82,32 @@ function BridgeSocket(io, domain) {
     if (!entrance)
         throw Error("要启用 socket 服务，必须要要有 message.entrance 方法，用来处理 加入某个房间");
     io.on("connection", (client) => {
+        // 定义toJSON 避免 schema 验证报错
+        Object.assign(client, {
+            toJSON() {
+                return {};
+            },
+        });
         console.log("[%s] connection: client.id: %s", new Date(), client.id);
-        client.on("init", async (token, params, extra) => {
+        client.on("init", async (type, auth, extra = {}) => {
             console.log("[%s] socket.init: client.id: %s", new Date(), client.id);
-            if (!token) {
-                client.emit("initError", "Token lost");
+            if (!auth) {
+                client.emit("initError", "auth info lost");
                 return;
             }
             try {
-                Object.assign(client, { profile: makeProfile(client, token, params, extra) });
+                Object.assign(client, { profile: makeProfile(client, type, auth, extra) });
                 if (!client.profile)
                     throw new MyError("noAuth", "请先登录");
                 // 创建消息监听函数
-                if (!client.listener)
-                    client.listener = client.emit.bind(client);
+                if (!client.inited)
+                    client.inited = true;
                 // 向领域注册改用户的监听函数
-                const session = subscribe(client.profile, client.listener);
+                const session = await subscribe(client.profile, client);
                 client.emit("inited", session);
             }
             catch (e) {
+                client.inited = false;
                 if (e instanceof MyError) {
                     client.emit("internalError", e.message, e.code || "unknown");
                     return;
@@ -95,14 +117,17 @@ function BridgeSocket(io, domain) {
         });
         client.on("entrance", async (roomId) => {
             try {
-                if (!client.profile || !client.listener)
+                if (!client.profile || !client.inited)
                     return;
-                const res = await entrance({ roomId, ...client.profile }, client.listener);
+                const res = await entrance({ roomId, ...client.profile }, client);
                 client.profile.roomId = roomId;
-                client.listener.roomId = roomId;
+                client.roomId = roomId;
                 client.emit("entranced", res);
             }
             catch (e) {
+                client.roomId = undefined;
+                if (client.profile)
+                    client.profile.roomId = undefined;
                 if (e instanceof MyError) {
                     client.emit("internalError", e.message, e.code || "unknown");
                     return;
@@ -143,10 +168,10 @@ function BridgeSocket(io, domain) {
         client.on("disconnect", () => {
             if (!client.profile)
                 return;
-            if (!client.listener)
+            if (!client.inited)
                 return;
             // 这里要取消对领域消息的监听
-            unsubscribe(client.profile, client.listener);
+            unsubscribe(client.profile, client);
         });
     });
 }

package/dist/http/utils.js

@@ -71,8 +71,12 @@ function Utils(cnf) {
                 userAgent: req.userAgent(),
                 startedAt: new Date(),
                 requestId: req.id(),
+                type: "user",
                 extra: {},
             };
+            if (req.headers["x-auth-user-type"]) {
+                obj.type = req.headers["x-auth-user-type"].toString();
+            }
             const token = req.headers["x-auth-token"] || req.query.access_token || req.query.accessToken;
             // token 和签名认证只能二选一
             if (token) {

package/dist/index.d.ts

@@ -1,10 +1,10 @@
 import { Defaults } from "./defaults";
 import Deps = require("./deps/defines");
-export { Main as Http } from "./http";
-export { Errors } from "./Errors";
+export { Main as Cfg } from "./cfg";
 export * as DM from "./dm";
+export { Errors } from "./Errors";
+export { Main as Http } from "./http";
 export * as utils from "./utils";
-export { Main as Cfg } from "./cfg";
 export declare const basicErrors: Readonly<Record<"notFound" | "notAllowed" | "noAuth", import("./Errors").ErrorFn>>;
 declare type TDeps = typeof Deps;
 declare type Merge<T> = {

package/dist/index.js

@@ -19,18 +19,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Main = exports.basicErrors = exports.Cfg = exports.utils = exports.DM = exports.Errors = exports.Http = void 0;
+exports.Main = exports.basicErrors = exports.utils = exports.Http = exports.Errors = exports.DM = exports.Cfg = void 0;
 const defaults_1 = require("./defaults");
 const DM = __importStar(require("./dm"));
 const Deps = require("./deps/defines");
-var http_1 = require("./http");
-Object.defineProperty(exports, "Http", { enumerable: true, get: function () { return http_1.Main; } });
+var cfg_1 = require("./cfg");
+Object.defineProperty(exports, "Cfg", { enumerable: true, get: function () { return cfg_1.Main; } });
+exports.DM = __importStar(require("./dm"));
 var Errors_1 = require("./Errors");
 Object.defineProperty(exports, "Errors", { enumerable: true, get: function () { return Errors_1.Errors; } });
-exports.DM = __importStar(require("./dm"));
+var http_1 = require("./http");
+Object.defineProperty(exports, "Http", { enumerable: true, get: function () { return http_1.Main; } });
 exports.utils = __importStar(require("./utils"));
-var cfg_1 = require("./cfg");
-Object.defineProperty(exports, "Cfg", { enumerable: true, get: function () { return cfg_1.Main; } });
 exports.basicErrors = defaults_1.defaults.errors;
 function Main(features) {
     const { _ } = defaults_1.defaults;

package/dist/utils/index.d.ts

@@ -75,4 +75,10 @@ declare type Params = {
  * @returns Modified address
  */
 export declare const modifiyURL: (address: string, adds?: Params | undefined, removes?: string[] | undefined) => string;
+/**
+ * 等待，知道 test 返回 true
+ * @param test 检测函数
+ * @param intervalMS 间隔多久判断一次, 单位毫秒 默认 100
+ */
+export declare const waitFor: (test: () => boolean, intervalMS?: number) => Promise<void>;
 export {};

package/dist/utils/index.js

@@ -18,8 +18,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.modifiyURL = exports.inExpired = exports.tryCatchLog = exports.deepFreeze = exports.sleep = exports.lcfirst = exports.ucfirst = exports.nt2space = exports.randStr = exports.md5 = void 0;
+exports.waitFor = exports.modifiyURL = exports.inExpired = exports.tryCatchLog = exports.deepFreeze = exports.sleep = exports.lcfirst = exports.ucfirst = exports.nt2space = exports.randStr = exports.md5 = void 0;
+const async_1 = __importDefault(require("async"));
 const crypto = __importStar(require("crypto"));
 /** 随机字符串字典 */
 const RAND_STR_DICT = {
@@ -147,3 +151,14 @@ const modifiyURL = (address, adds, removes) => {
     return obj.toString();
 };
 exports.modifiyURL = modifiyURL;
+/**
+ * 等待，知道 test 返回 true
+ * @param test 检测函数
+ * @param intervalMS 间隔多久判断一次, 单位毫秒 默认 100
+ */
+const waitFor = async (test, intervalMS = 100) => {
+    await async_1.default.doUntil(async () => {
+        await (0, exports.sleep)(intervalMS);
+    }, async () => test());
+};
+exports.waitFor = waitFor;

package/package.json

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