node-karin 1.8.11 → 1.8.13

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # 更新日志
 
+## [1.8.13](https://github.com/KarinJS/Karin/compare/core-v1.8.12...core-v1.8.13) (2025-05-09)
+
+
+### 🐛 Bug Fixes
+
+* clearCache ([#418](https://github.com/KarinJS/Karin/issues/418)) ([652b8fd](https://github.com/KarinJS/Karin/commit/652b8fdd65bf461fbbe85c3ba7b4dfc948cce915))
+* restart ([#415](https://github.com/KarinJS/Karin/issues/415)) ([790ccdd](https://github.com/KarinJS/Karin/commit/790ccddf3c09ef1c91e5b344d3ff9afa7d116e8e))
+
+
+### 🎡 Continuous Integration
+
+* ban publish-minimal-repro ([#417](https://github.com/KarinJS/Karin/issues/417)) ([6ddcf80](https://github.com/KarinJS/Karin/commit/6ddcf803c99bac68662dbd95902f02bc8b6078cd))
+
+## [1.8.12](https://github.com/KarinJS/Karin/compare/core-v1.8.11...core-v1.8.12) (2025-05-08)
+
+
+### 🐛 Bug Fixes
+
+* 修复主进程退出时子进程未被正确终止的问题 修复场景唯一标识符缓存问题 ([#413](https://github.com/KarinJS/Karin/issues/413)) ([e971438](https://github.com/KarinJS/Karin/commit/e971438892fe5726466ddfc1fd408599d8af6457))
+
 ## [1.8.11](https://github.com/KarinJS/Karin/compare/core-v1.8.10...core-v1.8.11) (2025-05-08)
 
 

package/dist/index.d.ts

@@ -12074,6 +12074,17 @@ declare namespace index$1 {
  * @param data 数据
  */
 declare const formatArray: (data: any[]) => string[];
+/**
+ * 初始化count
+ * @param count 计数器
+ * @param key 键
+ */
+declare const initCount: (count: Record<string, {
+    /** 上一分钟调用次数 */
+    start: number;
+    /** 当前调用次数 */
+    count: number;
+}>, key: string) => void;
 /**
  * @internal
  * 传入一个对象 将对象中的嵌套数组中所有元素为字符串
@@ -12104,8 +12115,11 @@ declare const createCount: () => Record<string, {
 declare const getCacheCfg: <T>(cache: Record<string, T>, count: ReturnType<typeof createCount>, keys: string[]) => T;
 /**
  * 定时清理缓存
+ * @param data 数据
+ * @param count 计数器
+ * @param cache 缓存
  */
-declare const clearCache: <T>(count: ReturnType<typeof createCount>, cache: Record<string, T>) => void;
+declare const clearCache: <T extends GroupsObjectValue | PrivatesObjectValue>(data: Record<string, T>, count: ReturnType<typeof createCount>, cache: Record<string, T>) => void;
 
 /**
  * @description 默认配置
@@ -12259,7 +12273,9 @@ declare const writeEnv: (data: {
  * @description 获取群聊、频道配置
  * @returns 群聊、频道配置
  */
-declare const groups: () => Record<string, GroupsObjectValue>;
+declare const groups: () => {
+    get: () => Record<string, GroupsObjectValue>;
+};
 /**
  * @public 公开Api
  * @description 获取指定群聊配置
@@ -12366,6 +12382,7 @@ declare const index_getYaml: typeof getYaml;
 declare const index_groups: typeof groups;
 declare const index_host: typeof host;
 declare const index_initConfigCache: typeof initConfigCache;
+declare const index_initCount: typeof initCount;
 declare const index_initPm2: typeof initPm2;
 declare const index_master: typeof master;
 declare const index_mergeDegAndCfg: typeof mergeDegAndCfg;
@@ -12381,7 +12398,7 @@ declare const index_updateLevel: typeof updateLevel;
 declare const index_webSocketServerToken: typeof webSocketServerToken;
 declare const index_writeEnv: typeof writeEnv;
 declare namespace index {
-  export { index_adapter as adapter, index_admin as admin, index_authKey as authKey, index_clearCache as clearCache, index_clearFiles as clearFiles, index_config as config, index_createCount as createCount, index_defaultConfig as defaultConfig, index_env as env, index_ffmpegPath as ffmpegPath, index_ffplayPath as ffplayPath, index_ffprobePath as ffprobePath, index_formatArray as formatArray, index_formatObject as formatObject, index_getCacheCfg as getCacheCfg, index_getDirectCfg as getDirectCfg, index_getEnv as getEnv, index_getFriendCfg as getFriendCfg, index_getGroupCfg as getGroupCfg, index_getGroupsFileData as getGroupsFileData, index_getGuildCfg as getGuildCfg, index_getPrivatesFileData as getPrivatesFileData, index_getRenderCfg as getRenderCfg, index_getYaml as getYaml, index_groups as groups, index_host as host, index_initConfigCache as initConfigCache, index_initPm2 as initPm2, index_master as master, index_mergeDegAndCfg as mergeDegAndCfg, index_pkg as pkg, index_pm2 as pm2, index_port as port, index_privates as privates, redis$1 as redis, render$1 as render, index_setConfig as setConfig, index_setEnv as setEnv, index_setYaml as setYaml, index_timeout as timeout, index_updateLevel as updateLevel, index_webSocketServerToken as webSocketServerToken, index_writeEnv as writeEnv };
+  export { index_adapter as adapter, index_admin as admin, index_authKey as authKey, index_clearCache as clearCache, index_clearFiles as clearFiles, index_config as config, index_createCount as createCount, index_defaultConfig as defaultConfig, index_env as env, index_ffmpegPath as ffmpegPath, index_ffplayPath as ffplayPath, index_ffprobePath as ffprobePath, index_formatArray as formatArray, index_formatObject as formatObject, index_getCacheCfg as getCacheCfg, index_getDirectCfg as getDirectCfg, index_getEnv as getEnv, index_getFriendCfg as getFriendCfg, index_getGroupCfg as getGroupCfg, index_getGroupsFileData as getGroupsFileData, index_getGuildCfg as getGuildCfg, index_getPrivatesFileData as getPrivatesFileData, index_getRenderCfg as getRenderCfg, index_getYaml as getYaml, index_groups as groups, index_host as host, index_initConfigCache as initConfigCache, index_initCount as initCount, index_initPm2 as initPm2, index_master as master, index_mergeDegAndCfg as mergeDegAndCfg, index_pkg as pkg, index_pm2 as pm2, index_port as port, index_privates as privates, redis$1 as redis, render$1 as render, index_setConfig as setConfig, index_setEnv as setEnv, index_setYaml as setYaml, index_timeout as timeout, index_updateLevel as updateLevel, index_webSocketServerToken as webSocketServerToken, index_writeEnv as writeEnv };
 }
 
 /**

package/dist/index.mjs

@@ -3174,7 +3174,7 @@ var init_exec = __esm({
 });
 
 // src/utils/config/tools.ts
-var formatArray, formatObject, mergeDegAndCfg, createCount, getCacheCfg, clearCache;
+var formatArray, initCount, formatObject, mergeDegAndCfg, createCount, getCacheCfg, clearCache;
 var init_tools = __esm({
   "src/utils/config/tools.ts"() {
     formatArray = (data) => {
@@ -3184,6 +3184,13 @@ var init_tools = __esm({
         return [];
       }
     };
+    initCount = (count3, key) => {
+      if (!count3[key]) {
+        count3[key] = { start: 0, count: 1 };
+      } else {
+        count3[key].count++;
+      }
+    };
     formatObject = (data) => {
       const list2 = {};
       Object.entries(data).forEach(([key, value]) => {
@@ -3219,30 +3226,35 @@ var init_tools = __esm({
       return {};
     };
     getCacheCfg = (cache12, count3, keys) => {
-      if (keys[0] in cache12) {
-        if (!count3[keys[0]]) {
-          count3[keys[0]] = { start: 0, count: 0 };
-        }
-        count3[keys[0]].count++;
-        return cache12[keys[0]];
-      }
-      for (const index6 in keys) {
-        if (keys[index6] in cache12) {
-          if (index6 === "0") {
-            count3[keys[index6]] = { start: 0, count: 1 };
-          } else {
-            count3[keys[0]] = { start: 0, count: 1 };
-            cache12[keys[0]] = cache12[keys[index6]];
-          }
-          return cache12[keys[index6]];
-        }
-      }
+      const key = keys[0];
+      if (cache12[key]) {
+        initCount(count3, key);
+        return cache12[key];
+      }
+      keys.forEach((v, index6) => {
+        if (!cache12[v]) return;
+        if (index6 === 0 && v === key) {
+          initCount(count3, v);
+          return cache12[v];
+        }
+        if (v === key) {
+          initCount(count3, v);
+          return cache12[v];
+        }
+        cache12[key] = cache12[v];
+        initCount(count3, key);
+        return cache12[key];
+      });
       return cache12.default;
     };
-    clearCache = (count3, cache12) => {
+    clearCache = (data, count3, cache12) => {
       setInterval(() => {
         Object.keys(count3).forEach((key) => {
           if (count3[key].count - count3[key].start < 10) {
+            if (data[key]) {
+              delete count3[key];
+              return;
+            }
             delete count3[key];
             delete cache12[key];
           } else {
@@ -11165,7 +11177,11 @@ var init_restart = __esm({
       const db2 = await createDB2();
       await db2.set(key, options);
       if (isFront && process.send) {
-        process.send("restart");
+        process.send(JSON.stringify({
+          type: "restart",
+          port: process.env.HTTP_PORT,
+          token: process.env.HTTP_AUTH_KEY
+        }));
         return { status: "success", data: "\u5DF2\u53D1\u9001\u91CD\u542F\u4FE1\u53F7" };
       }
       if (process.env.PM2_RESTART === "true") process.exit();
@@ -16110,6 +16126,7 @@ __export(config_exports, {
   groups: () => groups,
   host: () => host,
   initConfigCache: () => initConfigCache,
+  initCount: () => initCount,
   initPm2: () => initPm2,
   master: () => master,
   mergeDegAndCfg: () => mergeDegAndCfg,
@@ -16693,16 +16710,21 @@ var init_groups4 = __esm({
       const name = "groups.json";
       const file = `${dir2}/${name}`;
       const data = requireFileSync(file, { type: "json" });
-      cache8 = isOld(data) ? migrate(file, data) : format2(data);
+      const DATA = isOld(data) ? migrate(file, data) : format2(data);
+      cache8 = DATA;
       watch(file, async (old, data2) => {
         cache8 = format2(data2);
         const options = { file: name, old, data: cache8 };
         listeners.emit(FILE_CHANGE, options);
         listeners.emit(`${FILE_CHANGE}:${name}`, options);
       }, { type: "json" });
-      clearCache(count, cache8);
+      clearCache(DATA, count, cache8);
+    };
+    groups = () => {
+      return {
+        get: () => cache8
+      };
     };
-    groups = () => cache8;
     getGroupCfg = (groupId, selfId) => {
       const keys = [
         `Bot:${selfId}:${groupId}`,
@@ -16769,14 +16791,15 @@ var init_privates = __esm({
       const name = "privates.json";
       const file = `${dir2}/${name}`;
       const data = requireFileSync(file, { type: "json" });
-      cache9 = isOld2(data) ? migrate2(file, data) : format3(data);
+      const DATA = isOld2(data) ? migrate2(file, data) : format3(data);
+      cache9 = DATA;
       watch(file, async (old, data2) => {
         cache9 = format3(data2);
         const options = { file: name, old, data: cache9 };
         listeners.emit(FILE_CHANGE, options);
         listeners.emit(`${FILE_CHANGE}:${name}`, options);
       }, { type: "json" });
-      clearCache(count2, cache9);
+      clearCache(DATA, count2, cache9);
     };
     privates = () => cache9;
     getFriendCfg = (userId, selfId) => {
@@ -17824,6 +17847,7 @@ var init_mock = __esm({
     init_key4();
     init_common();
     RedisClient = class extends EventEmitter {
+      id;
       /** 键、类型、过期时间映射 */
       store = {};
       /** 键值对 */
@@ -17846,6 +17870,7 @@ var init_mock = __esm({
       #sqlite;
       constructor(sqlite) {
         super();
+        this.id = "mock";
         this.store = {};
         this.#str = {};
         this.#num = {};
@@ -19102,18 +19127,21 @@ var init_exit = __esm({
     init_uptime();
     exitStatus = false;
     processExit = async (code) => {
+      logger.debug("[child] \u5B50\u8FDB\u7A0B\u6536\u5230\u9000\u51FA\u7533\u8BF7:", code);
       try {
         if (exitStatus) return;
         exitStatus = true;
+        logger.debug("[child] \u5F00\u59CB\u4FDD\u5B58redis\u6570\u636E");
         const { redis: redis3 } = await Promise.resolve().then(() => (init_redis3(), redis_exports));
-        await redis3.save();
+        if (redis3.id === "mock") await redis3.save();
+        logger.debug("[child] redis\u6570\u636E\u4FDD\u5B58\u5B8C\u6210");
         logger.mark(tips(`\u8FD0\u884C\u7ED3\u675F \u8FD0\u884C\u65F6\u95F4\uFF1A${uptime2()} \u9000\u51FA\u7801\uFF1A${code ?? "\u672A\u77E5"}`));
         if (process.env.pm_id) {
-          logger.mark(tips("pm2\u73AF\u5883 \u5220\u9664pm2\u8FDB\u7A0B"));
+          logger.mark(tips("[child] pm2\u73AF\u5883 \u5220\u9664pm2\u8FDB\u7A0B"));
           await exec(`pm2 delete ${process.env.pm_id}`);
         }
       } catch (error) {
-        logger.error(new Error("\u9000\u51FA\u4E8B\u4EF6\u53D1\u751F\u9519\u8BEF:", { cause: error }));
+        logger.error(new Error("[child] \u9000\u51FA\u4E8B\u4EF6\u53D1\u751F\u9519\u8BEF:", { cause: error }));
       } finally {
         setTimeout(() => {
           exitStatus = true;

package/dist/start/index.mjs

@@ -95,8 +95,6 @@ var sendExit = async (port, token) => {
   }
 };
 process.on("exit", () => {
-  if (child && !child.killed) {
-    child.kill("SIGTERM");
-  }
+  child.kill("SIGTERM");
 });
 start();

package/package.json

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