@domain.js/main 0.6.6 → 0.7.1

package/dist/deps/defines.js

@@ -37,21 +37,21 @@ const schema = __importStar(require("./schema"));
 const sequelize = __importStar(require("./sequelize"));
 const signer = __importStar(require("./signer"));
 module.exports = {
-    "aes": aes,
-    "cache": cache,
-    "checker": checker,
-    "counter": counter,
-    "cron": cron,
-    "frequency": frequency,
-    "graceful": graceful,
-    "hash": hash,
-    "logger": logger,
-    "myCia": myCia,
-    "parallel": parallel,
-    "redis": redis,
-    "request": request,
-    "rest": rest,
-    "schema": schema,
-    "sequelize": sequelize,
-    "signer": signer,
+    aes: aes,
+    cache: cache,
+    checker: checker,
+    counter: counter,
+    cron: cron,
+    frequency: frequency,
+    graceful: graceful,
+    hash: hash,
+    logger: logger,
+    myCia: myCia,
+    parallel: parallel,
+    redis: redis,
+    request: request,
+    rest: rest,
+    schema: schema,
+    sequelize: sequelize,
+    signer: signer,
 };

package/dist/http/socket.d.ts

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

package/dist/http/socket.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BridgeSocket = void 0;
+const basic_errors_1 = require("../basic-errors");
 const proxyIps = new Set(["127.0.0.1"]);
 class MyError extends Error {
     constructor(code, message, data) {
@@ -83,12 +84,18 @@ function BridgeSocket(io, domain) {
     io.on("connection", (client) => {
         // 定义toJSON 避免 schema 验证报错
         Object.assign(client, {
+            extra: {},
             toJSON() {
                 return {};
             },
         });
         console.log("[%s] connection: client.id: %s", new Date(), client.id);
         client.on("init", async (type, auth, extra = {}) => {
+            if (client.inited)
+                throw basic_errors_1.errors.notAllowed("已经初始化，请勿重复操作");
+            if (client.extra.initing)
+                throw basic_errors_1.errors.notAllowed("正在初始化，请勿重复操作");
+            client.extra.initing = true;
             console.log("[%s] socket.init: client.id: %s", new Date(), client.id);
             try {
                 Object.assign(client, { profile: makeProfile(client, type, auth, extra) });
@@ -106,11 +113,15 @@ function BridgeSocket(io, domain) {
                 client.emit("internalError", e.code || "unknown", e.message, e.data);
                 console.error(e);
             }
+            client.extra.initing = false;
         });
         client.on("entrance", async (roomId, ...opts) => {
+            if (client.extra.entrancing)
+                throw basic_errors_1.errors.notAllowed("正在进入房间，请勿重复操作");
+            client.extra.entrancing = true;
             try {
                 if (!client.profile || !client.inited)
-                    return;
+                    throw basic_errors_1.errors.notAllowed("请先执行 init");
                 if (opts.length)
                     Object.assign(client, { entranceOpts: opts });
                 const ret = await entrance({ ...client.profile, roomId }, client);
@@ -123,6 +134,7 @@ function BridgeSocket(io, domain) {
                 client.emit("internalError", e.code || "unknown", e.message, e.data);
                 console.error(e);
             }
+            client.extra.entrancing = false;
         });
         client.use(async ([name, params, responseId], next) => {
             if (name === "init" || name === "entrance")

package/dist/index.d.ts

@@ -28,7 +28,7 @@ export declare function Main<T extends Readonly<Array<keyof TDeps>>>(features: T
     myCia: typeof import("./deps/myCia");
     parallel: typeof import("./deps/parallel");
     redis: typeof import("./deps/redis");
-    request: typeof import("./deps/request"); /** 这里之所以要浅拷贝，是为了避免多次初始化之间互相干扰 */
+    request: typeof import("./deps/request");
     rest: typeof import("./deps/rest");
     schema: typeof import("./deps/schema");
     sequelize: typeof import("./deps/sequelize");
@@ -46,7 +46,7 @@ export declare function Main<T extends Readonly<Array<keyof TDeps>>>(features: T
     myCia: typeof import("./deps/myCia");
     parallel: typeof import("./deps/parallel");
     redis: typeof import("./deps/redis");
-    request: typeof import("./deps/request"); /** 这里之所以要浅拷贝，是为了避免多次初始化之间互相干扰 */
+    request: typeof import("./deps/request");
     rest: typeof import("./deps/rest");
     schema: typeof import("./deps/schema");
     sequelize: typeof import("./deps/sequelize");
@@ -64,7 +64,7 @@ export declare function Main<T extends Readonly<Array<keyof TDeps>>>(features: T
     myCia: typeof import("./deps/myCia");
     parallel: typeof import("./deps/parallel");
     redis: typeof import("./deps/redis");
-    request: typeof import("./deps/request"); /** 这里之所以要浅拷贝，是为了避免多次初始化之间互相干扰 */
+    request: typeof import("./deps/request");
     rest: typeof import("./deps/rest");
     schema: typeof import("./deps/schema");
     sequelize: typeof import("./deps/sequelize");

package/package.json

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