node-karin 1.8.11 → 1.8.12

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # 更新日志
 
+## [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
  * 传入一个对象 将对象中的嵌套数组中所有元素为字符串
@@ -12366,6 +12377,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 +12393,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,24 +3226,25 @@ 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) => {
@@ -16110,6 +16118,7 @@ __export(config_exports, {
   groups: () => groups,
   host: () => host,
   initConfigCache: () => initConfigCache,
+  initCount: () => initCount,
   initPm2: () => initPm2,
   master: () => master,
   mergeDegAndCfg: () => mergeDegAndCfg,
@@ -17824,6 +17833,7 @@ var init_mock = __esm({
     init_key4();
     init_common();
     RedisClient = class extends EventEmitter {
+      id;
       /** 键、类型、过期时间映射 */
       store = {};
       /** 键值对 */
@@ -17846,6 +17856,7 @@ var init_mock = __esm({
       #sqlite;
       constructor(sqlite) {
         super();
+        this.id = "mock";
         this.store = {};
         this.#str = {};
         this.#num = {};
@@ -19102,18 +19113,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/dist/web/assets/js/page-404.tsx-CQfJwMNP.js

@@ -0,0 +1 @@
+import{j as t}from"./vendor-react-Z2UfPrqC.js";import{P as r}from"./components-xTgkEKOh.js";import"./vendor-others-CpZ3FDDG.js";import"./vendor-editor-B8hjWfkw.js";import"./vendor-ui-utils-5rYIvRjL.js";import"./vendor-heroui-Blyb7kuN.js";import"./page-dashboard-Cg6WjwPD.js";import"./hooks-BVOSuufY.js";import"./utils-BuR6hXd1.js";import"./vendor-visual-DQREh7WM.js";const x=()=>t.jsx("div",{className:"min-h-screen flex items-center justify-center",children:t.jsx(r,{})});export{x as default};

package/dist/web/assets/js/{utils-DqFE1yN-.js → utils-BuR6hXd1.js}

@@ -1,2 +1,2 @@
-import{V as p}from"./vendor-react-Hg1DVPZt.js";import{a5 as g}from"./components-9RKTV4LX.js";const k=async(t,n,e,r)=>{const{setIsLogModalOpen:i,setTaskId:c,setTaskLogs:o,setTaskName:f}=n;f("更新插件");const a=["开始创建更新任务...",`options: ${JSON.stringify(t)}`];o(a);try{const s=await g(t);if(s.success&&s.taskId)c(s.taskId),o([...a,`
+import{V as p}from"./vendor-react-Z2UfPrqC.js";import{a5 as g}from"./components-xTgkEKOh.js";const k=async(t,n,e,r)=>{const{setIsLogModalOpen:i,setTaskId:c,setTaskLogs:o,setTaskName:f}=n;f("更新插件");const a=["开始创建更新任务...",`options: ${JSON.stringify(t)}`];o(a);try{const s=await g(t);if(s.success&&s.taskId)c(s.taskId),o([...a,`
 任务创建成功!`,`任务ID: ${s.taskId}`,"正在连接任务执行日志..."]),i(!0),typeof e=="function"&&e(),typeof r=="function"&&r();else throw new Error(s.message||"未知错误")}catch(s){console.error("更新失败:",s),p.error(`更新失败: ${s.message}`)}};export{k as c};

package/dist/web/index.html

@@ -14,17 +14,17 @@
     content="viewport-fit=cover, width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
     name="viewport" />
   <link href="/web/assets/ico/favicon-BoqZd694.ico" rel="icon" />
-  <script type="module" crossorigin src="/web/assets/js/entry-CzDSdA4M.js"></script>
+  <script type="module" crossorigin src="/web/assets/js/entry-DDp2aDp1.js"></script>
   <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-editor-B8hjWfkw.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-others-B6NXaB-r.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-others-CpZ3FDDG.js">
   <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-ui-utils-5rYIvRjL.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-react-Hg1DVPZt.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-heroui-WfpTlnyv.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/hooks-D65eaS4p.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-visual-mzxhMYK3.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/components-9RKTV4LX.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/utils-DqFE1yN-.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/page-dashboard-BewrlGFW.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-react-Z2UfPrqC.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-heroui-Blyb7kuN.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/hooks-BVOSuufY.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-visual-DQREh7WM.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/components-xTgkEKOh.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/utils-BuR6hXd1.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/page-dashboard-Cg6WjwPD.js">
   <link rel="stylesheet" crossorigin href="/web/assets/css/vendor-editor-CFbL2ovg.css">
   <link rel="stylesheet" crossorigin href="/web/assets/css/vendor-others-ZgkIHsf0.css">
   <link rel="stylesheet" crossorigin href="/web/assets/css/components-ep7vm38G.css">

package/package.json

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

package/README.md

@@ -1,95 +0,0 @@
-![karin](https://socialify.git.ci/karinjs/karin/image?description=1&font=Bitter&forks=1&issues=1&language=1&logo=https%3A%2F%2Favatars.githubusercontent.com%2Fu%2F162426977%3Fs%3D200%26v%3D4&name=1&owner=1&pulls=1&stargazers=1&theme=Auto)
-
-## 项目介绍
-
-`karin`（卡琳）是一款灵活、现代、极易扩展的 Node.js 插件化应用框架，专为开发者打造，助你轻松构建属于自己的高效工具链和自动化服务。
-
-✨ **主要特性**：
-- 插件化架构，支持热插拔，生态丰富
-- 一行命令即可初始化项目，快速上手
-- 丰富的 Web UI（基于 React + HeroUI），颜值与功能并存
-- 支持多种自动化场景、任务调度、依赖管理
-- 轻松集成第三方服务，打造属于你的"数字助理"
-- 社区活跃，持续更新，文档完善
-
-> 🦄 让开发变得像魔法一样有趣！
-
-## 🚀 稳定长期维护
-
-自 `1.8.0` 版本起，Karin 已进入**稳定长期维护阶段**。我们承诺持续修复 bug、优化体验，并欢迎社区力量共同完善生态。
-
-## 快速开始
-
-[📚 查看最新文档](https://karin.fun/)
-
-一键初始化：`pnpm create karin`
-
-> 当前文档可能存在滞后性，欢迎加入交流群（967068507）一起玩耍、提建议！
-
-## 温馨提示
-
-> Karin 现已稳定，放心食用！遇到问题欢迎提 Issue 或加群讨论，我们会持续优化。
-
-## 文档站说明
-
-我们提供多个文档站点供您访问，解决可能出现的访问困难：
-
-- **主文档站**: [https://karin.fun](https://karin.fun) (基于 GitHub Pages)
-- **镜像站点**:
-  - 憨憨镜像: [https://karin.hanhanz.top](https://karin.hanhanz.top) (**推荐访问**)
-  - Vercel 镜像: [https://docs.karin.fun](https://docs.karin.fun) (**推荐访问**)
-  - Deno 镜像: [https://karin.deno.dev](https://karin.deno.dev) (**推荐访问**)
-
-> 💡 主文档站托管在 GitHub 上，如访问不畅，推荐使用 Deno 镜像站
-
-## 鸣谢
-
-- webui: [bietiaop](https://github.com/bietiaop)
-- docs: [ikenxuan](https://github.com/ikenxuan)
-- name: [fuqiuluo](https://github.com/fuqiuluo)
-
-> 🧙‍♂️ 感谢三位大佬的魔法加持！
-
-### 贡献者
-
-> 🌟 星光闪烁，你们的智慧如同璀璨的夜空。感谢所有为 **Karin** 做出贡献的人！
-
-[![贡献者](https://contributors-img.web.app/image?repo=KarinJS/Karin)](https://github.com/KarinJS/Karin/graphs/contributors)
-
-![Alt](https://repobeats.axiom.co/api/embed/aaaa2759c8885691443a4d80e5753f975d4f250e.svg "Repobeats analytics image")
-
----
-
-🎉 **加入我们，让 Karin 成为你开发路上的贴心伙伴！**
-
-## 常见问题
-
-- 文档没看懂？[点我提问](https://github.com/KarinJS/Karin/issues) 或加群 967068507
-- 插件不会写？欢迎参考[插件开发文档](https://karin.fun/plugins/)
-- 遇到 bug？大胆提 Issue，我们超快响应！
-
-## 如何参与贡献（PR）
-
-1. Fork 本仓库，创建你的分支
-2. 提交你的更改，附上简要说明
-3. 发起 Pull Request，耐心等待 Review
-4. 你的名字将出现在贡献者列表，收获一份开源荣誉！
-
-> 💡 欢迎任何形式的贡献，无论是代码、文档、建议还是灵感！
-
-## Issue 指南
-
-- 提交前请先搜索是否有类似问题
-- 尽量提供详细的复现步骤、环境信息和截图
-- 标题简明扼要，正文描述清晰
-- 遇到安全相关问题请私信维护者
-
-## 开源协议
-
-本项目基于 [MIT License](./LICENSE) 开源，欢迎自由使用、修改和分发。
-
-> 📢 记得给个 Star 支持我们，你的支持是我们最大的动力！
-
-## 更新日志
-
-我们定期发布更新，查看 [CHANGELOG](https://github.com/KarinJS/Karin/releases) 了解最新变化。

package/dist/web/assets/js/page-404.tsx-BNti6Z2J.js

@@ -1 +0,0 @@
-import{j as t}from"./vendor-react-Hg1DVPZt.js";import{P as r}from"./components-9RKTV4LX.js";import"./vendor-others-B6NXaB-r.js";import"./vendor-editor-B8hjWfkw.js";import"./vendor-ui-utils-5rYIvRjL.js";import"./vendor-heroui-WfpTlnyv.js";import"./page-dashboard-BewrlGFW.js";import"./hooks-D65eaS4p.js";import"./utils-DqFE1yN-.js";import"./vendor-visual-mzxhMYK3.js";const x=()=>t.jsx("div",{className:"min-h-screen flex items-center justify-center",children:t.jsx(r,{})});export{x as default};