@domain.js/main 0.2.0 → 0.2.1

package/dist/http/defines.d.ts

@@ -1,3 +1,4 @@
+import { Opt as Sign } from "../deps/signer";
 export interface Cnf {
     proxyIps?: string;
     port?: number;
@@ -7,15 +8,6 @@ export interface Cnf {
     socket?: boolean;
     [propName: string]: any;
 }
-interface Sign {
-    signature: string;
-    uri: string;
-    key: string;
-    timestamp: number;
-    signMethod: string;
-    signVersion: string;
-    method: string;
-}
 export interface Profile {
     clientIp: string;
     remoteIp: string;
@@ -28,10 +20,12 @@ export interface Profile {
     revision?: string;
     uuid?: string;
     token?: string;
-    sign?: Sign;
+    sign?: Sign & {
+        signature: string;
+    };
     isSocket?: boolean;
-    /** socket 的时候汇报自己的位置 */
-    position?: string;
+    /** socket 的时候加入的房间 */
+    roomId?: string;
 }
 export interface HttpCodes {
     [propName: string]: number;
@@ -45,4 +39,3 @@ export interface Err {
     code?: number | string;
     data?: any;
 }
-export {};

package/dist/http/socket.d.ts

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

package/dist/http/socket.js

@@ -59,10 +59,13 @@ const makeProfile = (client, token, params, extra) => {
 function BridgeSocket(io, domain) {
     const subscribe = domain["message.subscribe"];
     const unsubscribe = domain["message.unsubscribe"];
+    const entrance = domain["message.entrance"];
     if (!subscribe)
         throw Error("要启用 socket 服务，必须要要有 message.subscribe 方法，用来处理 socket 订阅");
     if (!unsubscribe)
         throw Error("要启用 socket 服务，必须要要有 message.unsubscribe 方法，用来处理 socket 退订");
+    if (!entrance)
+        throw Error("要启用 socket 服务，必须要要有 message.entrance 方法，用来处理 加入某个房间");
     io.on("connection", (client) => {
         console.log("[%s] connection: client.id: %s", new Date(), client.id);
         client.on("init", async (token, params, extra) => {
@@ -75,12 +78,11 @@ function BridgeSocket(io, domain) {
                 Object.assign(client, { profile: makeProfile(client, token, params, extra) });
                 if (!client.profile)
                     throw new MyError("noAuth", "请先登录");
-                const session = await domain["auth.session"](client.profile, {});
                 // 创建消息监听函数
                 if (!client.listener)
                     client.listener = client.emit.bind(client);
                 // 向领域注册改用户的监听函数
-                domain["message.subscribe"](client.profile, client.listener);
+                const session = subscribe(client.profile, client.listener);
                 client.emit("inited", session);
             }
             catch (e) {
@@ -91,8 +93,25 @@ function BridgeSocket(io, domain) {
                 console.error(e);
             }
         });
+        client.on("entrance", async (roomId) => {
+            try {
+                if (!client.profile || !client.listener)
+                    return;
+                const res = await entrance({ roomId, ...client.profile }, client.listener);
+                client.profile.roomId = roomId;
+                client.listener.roomId = roomId;
+                client.emit("entranced", res);
+            }
+            catch (e) {
+                if (e instanceof MyError) {
+                    client.emit("internalError", e.message, e.code || "unknown");
+                    return;
+                }
+                console.error(e);
+            }
+        });
         client.use(async ([name, params, responseId], next) => {
-            if (name === "init")
+            if (name === "init" || name === "entrance")
                 return next();
             const method = domain[name];
             try {

package/package.json

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