node-karin 1.0.2 → 1.0.4

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # 更新日志
 
+## [1.0.4](https://github.com/KarinJS/Karin/compare/node-karin-v1.0.3...node-karin-v1.0.4) (2025-01-15)
+
+
+### 🐛 Bug Fixes
+
+* test ci ([437350f](https://github.com/KarinJS/Karin/commit/437350f3376af7bc7f3fca6e51e8c6d846f1d798))
+
+## [1.0.3](https://github.com/KarinJS/Karin/compare/node-karin-v1.0.2...node-karin-v1.0.3) (2025-01-15)
+
+
+### Bug Fixes
+
+* registerBot ws_client ([a9d7905](https://github.com/KarinJS/Karin/commit/a9d7905b5c0c739eb1e8c64beafb658a3c12c64d))
+
 ## [1.0.2](https://github.com/KarinJS/Karin/compare/node-karin-v1.0.1...node-karin-v1.0.2) (2025-01-15)
 
 

package/default/config/pm2.json

@@ -9,8 +9,8 @@
       "max_memory_restart": "1G",
       "restart_delay": 2000,
       "merge_logs": true,
-      "error_file": "./logs/pm2_error.log",
-      "out_file": "./logs/pm2_out.log"
+      "error_file": "./@karinjs/logs/pm2_error.log",
+      "out_file": "./@karinjs/logs/pm2_out.log"
     }
   ]
 }

package/dist/cli/index.cjs

@@ -103,8 +103,8 @@ var dir = process.env.INIT_CWD || process.cwd();
 var pkgDir = url.fileURLToPath(new url.URL("../..", (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href))));
 var createDir = () => {
   const list = [
-    path2__default.default.join(dir, "logs"),
     path2__default.default.join(dir, "plugins", "karin-plugin-example"),
+    path2__default.default.join(dir, "@karinjs", "logs"),
     path2__default.default.join(dir, "@karinjs", "config"),
     path2__default.default.join(dir, "@karinjs", "data"),
     path2__default.default.join(dir, "@karinjs", "temp", "console"),
@@ -259,6 +259,7 @@ var modifyPackageJson = () => {
   const pkg = fs2__default.default.readFileSync(path2__default.default.join(dir, "package.json"), "utf-8");
   const data = JSON.parse(pkg);
   data.type = "module";
+  if (!data.scripts) data.scripts = {};
   data.scripts.karin = "karin";
   const list = [
     "app",

package/dist/cli/index.js

@@ -94,8 +94,8 @@ var dir = process.env.INIT_CWD || process.cwd();
 var pkgDir = fileURLToPath(new URL$1("../..", import.meta.url));
 var createDir = () => {
   const list = [
-    path2.join(dir, "logs"),
     path2.join(dir, "plugins", "karin-plugin-example"),
+    path2.join(dir, "@karinjs", "logs"),
     path2.join(dir, "@karinjs", "config"),
     path2.join(dir, "@karinjs", "data"),
     path2.join(dir, "@karinjs", "temp", "console"),
@@ -250,6 +250,7 @@ var modifyPackageJson = () => {
   const pkg = fs2.readFileSync(path2.join(dir, "package.json"), "utf-8");
   const data = JSON.parse(pkg);
   data.type = "module";
+  if (!data.scripts) data.scripts = {};
   data.scripts.karin = "karin";
   const list = [
     "app",

package/dist/index.d.ts

@@ -6276,7 +6276,7 @@ interface SendMsgOptions$1 {
 }
 /**
  * 发送主动消息
- * @param uid Bot的uid
+ * @param selfId Bot的id
  * @param contact 目标信息
  * @param elements 消息内容
  * @param options 消息选项

package/dist/index.js

@@ -45,7 +45,7 @@ var init_root = __esm({
     dbPath = Object.freeze(path.join(dataPath, "db"));
     levelPath = Object.freeze(path.join(dbPath, "level"));
     redisLevelPath = Object.freeze(path.join(dbPath, "redis-level"));
-    logsPath = Object.freeze(path.join(process.cwd(), "logs"));
+    logsPath = Object.freeze(path.join(basePath, "logs"));
     htmlPath = Object.freeze(path.join(tempPath, "html"));
     pm2Path = Object.freeze(path.join(configPath, "pm2.yaml"));
     consolePath = Object.freeze(path.join(tempPath, "console"));
@@ -107,8 +107,13 @@ var init_tools = __esm({
       const list4 = {};
       await Promise.all(Object.keys(defData).map(async (key) => {
         if (Array.isArray(data == null ? void 0 : data[key])) {
-          list4[key] = setStr((data == null ? void 0 : data[key]) || defData[key]);
-          return;
+          if (data == null ? void 0 : data[key].every((v) => typeof v !== "object")) {
+            list4[key] = setStr((data == null ? void 0 : data[key]) || defData[key]);
+            return;
+          } else {
+            list4[key] = (data == null ? void 0 : data[key]) || defData[key];
+            return;
+          }
         }
         if (NODE_TYPES.includes(typeof (data == null ? void 0 : data[key]))) {
           list4[key] = (data == null ? void 0 : data[key]) ?? defData[key];
@@ -648,8 +653,8 @@ var init_default = __esm({
             max_memory_restart: "1G",
             restart_delay: 2e3,
             merge_logs: true,
-            error_file: "./logs/pm2_error.log",
-            out_file: "./logs/pm2_out.log"
+            error_file: "./@karinjs/logs/pm2_error.log",
+            out_file: "./@karinjs/logs/pm2_out.log"
           }
         ]
       },
@@ -5458,7 +5463,6 @@ var init_bot = __esm({
     registerBot = (type, bot) => {
       const id = ++index;
       list3.push({ index: id, bot });
-      const tips = (str) => logger.green(`[\u6CE8\u518CBot][${str}]`);
       const sendForwardMsg = bot.sendForwardMsg;
       bot.sendForwardMsg = async (contact3, elements, options) => {
         return sendForwardMsg.call(bot, contact3, elements, options);
@@ -5484,20 +5488,9 @@ var init_bot = __esm({
           await level2.del(key);
         }
       }, 10);
-      listeners.once("online", () => {
-        if (type === "webSocketClient") {
-          logger.bot("info", bot.selfId, `${tips("\u6B63\u5411webSocket")} ${bot.account.name}: ${bot.adapter.address}`);
-        } else if (type === "other") {
-          bot.adapter.address = "internal://127.0.0.1";
-          logger.bot("info", bot.selfId, `${tips("internal")} ${bot.account.name}`);
-        } else if (type === "http") {
-          logger.bot("info", bot.selfId, `${tips("HTTP")} ${bot.account.name}: ${bot.adapter.address}`);
-        } else if (type === "webSocketServer") {
-          logger.bot("info", bot.selfId, `${tips("\u53CD\u5411WebSocket")} ${bot.account.name}: ${bot.adapter.address}`);
-        } else if (type === "grpc") {
-          logger.bot("info", bot.selfId, `${tips("gRPC")} ${bot.account.name}: ${bot.adapter.address}`);
-        }
-      });
+      setTimeout(() => {
+        logger.bot("info", bot.selfId, `${logger.green("[registerBot]")}[${bot.adapter.name}]: ${bot.account.name} ${bot.adapter.address}`);
+      }, 1e3);
       return id;
     };
     sendMsg = async (selfId, contact3, elements, options = { recallMsg: 0, retryCount: 1, retry_count: 1 }) => {
@@ -9136,7 +9129,7 @@ var initLogger = (options = {}) => {
         /** 输出到文件 */
         type: "file",
         /** 日志文件名 */
-        filename: "logs/logger",
+        filename: "@karinjs/logs/logger",
         /** 日期后缀 */
         pattern: "yyyy-MM-dd.log",
         /** 日期后缀 */
@@ -12372,7 +12365,7 @@ var AdapterServerOneBot11 = class extends WsAdapterOneBot11 {
     this.socket.on("close", () => {
       this.socket.removeAllListeners();
       unregisterBot("index", this.adapter.index);
-      logger.bot("info", this.selfId, "\u8FDE\u63A5\u5173\u95ED");
+      logger.bot("info", this.selfId, `\u8FDE\u63A5\u5173\u95ED: ${url}`);
     });
   }
   /**
@@ -12411,7 +12404,7 @@ var createClient2 = async () => {
   const cfg = adapter();
   if (!cfg.onebot.ws_client || !Array.isArray(cfg.onebot.ws_client)) return;
   for (const item of cfg.onebot.ws_client) {
-    if (!(item == null ? void 0 : item.enable) || !(item == null ? void 0 : item.url) || !(item == null ? void 0 : item.token)) continue;
+    if (!(item == null ? void 0 : item.enable) || !(item == null ? void 0 : item.url)) continue;
     AdapterClientOneBot11.init(item.url, item.token);
   }
 };
@@ -12420,7 +12413,7 @@ var createHttp = async () => {
   if (!cfg.onebot.http_server || !Array.isArray(cfg.onebot.http_server)) return;
   for (const data of cfg.onebot.http_server) {
     try {
-      if (!(data == null ? void 0 : data.enable) || !(data == null ? void 0 : data.url) || !(data == null ? void 0 : data.token) || !(data == null ? void 0 : data.self_id)) continue;
+      if (!(data == null ? void 0 : data.enable) || !(data == null ? void 0 : data.url) || !(data == null ? void 0 : data.self_id)) continue;
       if (!(data == null ? void 0 : data.self_id) || !(data == null ? void 0 : data.url) || !(data == null ? void 0 : data.url.startsWith("http"))) {
         logger.bot("error", data.self_id, "\u8BF7\u914D\u7F6E\u6B63\u786E\u7684 onebot http \u4FE1\u606F");
         continue;

package/dist/root.js

@@ -17,7 +17,7 @@ var resourcePath = Object.freeze(path.join(basePath, "resource"));
 var dbPath = Object.freeze(path.join(dataPath, "db"));
 var levelPath = Object.freeze(path.join(dbPath, "level"));
 var redisLevelPath = Object.freeze(path.join(dbPath, "redis-level"));
-var logsPath = Object.freeze(path.join(process.cwd(), "logs"));
+var logsPath = Object.freeze(path.join(basePath, "logs"));
 var htmlPath = Object.freeze(path.join(tempPath, "html"));
 var pm2Path = Object.freeze(path.join(configPath, "pm2.yaml"));
 var consolePath = Object.freeze(path.join(tempPath, "console"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Lightweight, efficient, concise, and stable robot framework.",
   "keywords": [
     "node",