@domain.js/main 0.3.23 → 0.3.26

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

@@ -2,6 +2,7 @@ import _ from "lodash";
 import { v4 } from "uuid";
 interface Cnf {
     logger: {
+        level?: "info" | "error" | "none";
         clientId: string;
         errorLogPath: string;
         infoLogPath: string;

package/dist/deps/logger/index.js

@@ -4,19 +4,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Deps = exports.Main = void 0;
-const fs_1 = __importDefault(require("fs"));
+const fs_1 = require("fs");
+const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
 const util_1 = require("util");
 const date = (offset = 0) => new Date(Date.now() + (offset | 0)).toISOString();
 function Main(cnf, deps) {
-    const { logger: { errorLogPath, infoLogPath, ignoreErrors, clientId }, } = cnf;
+    const { logger: { level, errorLogPath, infoLogPath, ignoreErrors, clientId }, } = cnf;
     const { _, uuid: { v4: uuid }, } = deps;
     const makeDir = _.memoize((dir) => {
-        if (!fs_1.default.existsSync(dir))
-            fs_1.default.mkdirSync(dir);
+        if (!(0, fs_1.existsSync)(dir))
+            (0, fs_1.mkdirSync)(dir);
     });
     const ignores = new Set(ignoreErrors);
     const error = (e, extra) => {
+        if (level === "none")
+            return;
         if (!e) {
             console.trace("Logger.error but error is null or undefined");
             return;
@@ -49,14 +52,11 @@ function Main(cnf, deps) {
         }
         if (e.stack)
             content.push(JSON.stringify(e.stack));
-        try {
-            fs_1.default.appendFileSync(file, `${content.join("\t")}\n`);
-        }
-        catch (err) {
-            console.error("Logger.error appendFileSync faid: %o", err);
-        }
+        promises_1.default.appendFile(file, `${content.join("\t")}\n`).catch(console.error);
     };
     const info = (message, extra) => {
+        if (level === "none" || level === "error")
+            return;
         const time = date();
         const today = time.split("T")[0];
         const dir = path_1.default.resolve(infoLogPath, today);
@@ -72,14 +72,11 @@ function Main(cnf, deps) {
                 content.push((0, util_1.format)(extra));
             }
         }
-        try {
-            fs_1.default.appendFileSync(file, `${content.join("\t")}\n`);
-        }
-        catch (e) {
-            console.error("Logger.info appendFileSync faid: %o", e);
-        }
+        promises_1.default.appendFile(file, `${content.join("\t")}\n`).catch(console.error);
     };
     const logger = (fn, name, isAsync = false, transform = (x) => x, errorHandler = (e) => (e instanceof Error ? e.message : ""), argsHandler = JSON.stringify) => {
+        if (level === "none")
+            return fn;
         if (isAsync) {
             const handler = {
                 async apply(fn, me, args) {

package/dist/http/socket.js

@@ -116,15 +116,12 @@ function BridgeSocket(io, domain) {
             try {
                 if (!client.profile || !client.inited)
                     return;
-                const res = await entrance({ roomId, ...client.profile }, client);
+                const res = await entrance({ ...client.profile, roomId }, client);
                 client.profile.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;

package/dist/http/utils.js

@@ -126,7 +126,8 @@ function Utils(cnf) {
                 throw Error("Params.__files disallow assignment");
             if (lodash_1.default.size(req.files))
                 params.__files = req.files;
-            return params;
+            // 将上传文件附加到 params 中
+            return { ...params, ...req.files };
         },
         /**
          *

package/package.json

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