node-karin 1.10.5 → 1.10.7

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # 更新日志
 
+## [1.10.7](https://github.com/KarinJS/Karin/compare/core-v1.10.6...core-v1.10.7) (2025-06-13)
+
+
+### 🐛 Bug Fixes
+
+* 优化重启功能逻辑和UI引导 ([7746c21](https://github.com/KarinJS/Karin/commit/7746c21834ea8f010dbb713e66a3ee0d87d1e206))
+
+## [1.10.6](https://github.com/KarinJS/Karin/compare/core-v1.10.5...core-v1.10.6) (2025-06-13)
+
+
+### 🐛 Bug Fixes
+
+* close [#477](https://github.com/KarinJS/Karin/issues/477) [#460](https://github.com/KarinJS/Karin/issues/460) ([74d2e08](https://github.com/KarinJS/Karin/commit/74d2e08e5cde67b9a17acb857c2691cce33a6d9c))
+
 ## [1.10.5](https://github.com/KarinJS/Karin/compare/core-v1.10.4...core-v1.10.5) (2025-06-12)
 
 

package/dist/index.mjs

@@ -11255,6 +11255,7 @@ var restart, restartDirect;
 var init_restart = __esm({
   "src/utils/system/restart.ts"() {
     init_exec();
+    init_config();
     restart = async (selfId, contact3, messageId, isFront = true, reloadDeps = false) => {
       const options = {
         selfId,
@@ -11283,6 +11284,19 @@ var init_restart = __esm({
     restartDirect = async (options) => {
       const { isPm2 = false, reloadDeps = false } = options || {};
       logger.mark("\u6536\u5230\u91CD\u542F\u8BF7\u6C42\uFF0C\u6B63\u5728\u91CD\u542F...");
+      const envCfg = env();
+      if (isPm2 && envCfg.RUNTIME === "node") {
+        const envCfg2 = env();
+        if (envCfg2.RUNTIME === "node") {
+          envCfg2.RUNTIME = "pm2";
+          const envData = Object.entries(envCfg2).map(([key, value]) => ({
+            key,
+            value,
+            comment: value.comment
+          }));
+          writeEnv(envData, void 0, true);
+        }
+      }
       if (!isPm2 && process?.send) {
         process.send(JSON.stringify({ type: "restart", reloadDeps }));
         logger.debug("\u6B63\u5728\u901A\u77E5\u7236\u8FDB\u7A0B\u91CD\u542F...");

package/dist/start/index.mjs

@@ -329,8 +329,6 @@ var dotenv_default = app;
 var ProcessManager = class {
   /** 是否已经启动 */
   isStarted = false;
-  /** 是否正在重启 */
-  isRestarting = false;
   /** 子进程实例 */
   childProcess = null;
   /** 重启延迟时间 */
@@ -359,6 +357,8 @@ var ProcessManager = class {
     gray: "\x1B[90m",
     reset: "\x1B[0m"
   };
+  /** exit 事件监听器引用 */
+  exitListenerRef = null;
   constructor() {
     process.on("exit", this.stop.bind(this));
     this.logSystemInfo();
@@ -389,7 +389,6 @@ var ProcessManager = class {
       return this.start({ reloadDeps });
     }
     const oldPid = this.childProcess.pid;
-    this.isRestarting = true;
     this.processStats.restartCount++;
     this.processStats.lastRestartTime = Date.now();
     this.log(`\u51C6\u5907\u91CD\u542F\u5B50\u8FDB\u7A0B | \u5F53\u524DPID: ${oldPid} | \u91CD\u8F7D\u4F9D\u8D56: ${reloadDeps ? "\u662F" : "\u5426"} | \u91CD\u542F\u6B21\u6570: ${this.processStats.restartCount}`);
@@ -408,8 +407,6 @@ var ProcessManager = class {
       }
       this.logError(`\u91CD\u542F\u5931\u8D25 | \u9519\u8BEF: ${error.message} | \u4EE3\u7801: ${error.code || "\u672A\u77E5"}`);
       return null;
-    } finally {
-      this.isRestarting = false;
     }
   }
   /**
@@ -423,7 +420,6 @@ var ProcessManager = class {
       this.terminateChildProcess();
       this.childProcess = null;
       this.isStarted = false;
-      this.isRestarting = false;
     }
     const totalUptime = this.getTotalUptime();
     this.log(`\u7236\u8FDB\u7A0B\u9000\u51FA | \u603B\u8FD0\u884C\u65F6\u95F4: ${totalUptime} | \u91CD\u542F\u6B21\u6570: ${this.processStats.restartCount}`);
@@ -441,7 +437,11 @@ var ProcessManager = class {
   setupEventListeners() {
     if (!this.childProcess) return;
     this.childProcess.on("message", this.handleChildMessage.bind(this));
-    this.childProcess.once("exit", this.handleChildExit.bind(this));
+    if (this.exitListenerRef) {
+      this.childProcess.off("exit", this.exitListenerRef);
+    }
+    this.exitListenerRef = this.handleChildExit.bind(this);
+    this.childProcess.once("exit", this.exitListenerRef);
   }
   /**
    * 处理子进程发送的消息
@@ -450,7 +450,7 @@ var ProcessManager = class {
     if (typeof message !== "string") return;
     try {
       const { type, reloadDeps } = JSON.parse(message);
-      if (type === "restart") {
+      if (type === "restart" || type === "rs") {
         this.log(`\u6536\u5230\u6D88\u606F | \u7C7B\u578B: restart | \u91CD\u8F7D\u4F9D\u8D56: ${reloadDeps ? "\u662F" : "\u5426"}`);
         const child = await this.restart(reloadDeps);
         if (!child) {
@@ -477,9 +477,7 @@ var ProcessManager = class {
     const exitType = signal ? `\u4FE1\u53F7: ${signal}` : `\u9000\u51FA\u7801: ${code ?? "\u672A\u77E5"}`;
     const uptime = this.getProcessUptime();
     this.log(`\u5B50\u8FDB\u7A0B\u9000\u51FA | ${exitType} | \u8FD0\u884C\u65F6\u95F4: ${uptime}`);
-    if (!this.isRestarting) {
-      this.stop();
-    }
+    this.stop();
   }
   /**
    * 等待端口释放
@@ -564,6 +562,10 @@ var ProcessManager = class {
    */
   async terminateChildProcess() {
     if (!this.childProcess) return;
+    if (this.exitListenerRef) {
+      this.childProcess.off("exit", this.exitListenerRef);
+      this.exitListenerRef = null;
+    }
     try {
       const pid = this.childProcess.pid;
       this.log(`\u53D1\u9001\u7EC8\u6B62\u4FE1\u53F7 | PID: ${pid} | \u4FE1\u53F7: SIGTERM`);

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

@@ -0,0 +1 @@
+import{j as t}from"./vendor-react-ZA9Ag8xC.js";import{P as r}from"./components-C8mD5H9u.js";import"./vendor-others-DGUjmv7c.js";import"./vendor-editor-B8hjWfkw.js";import"./vendor-ui-utils-Bb93SeY3.js";import"./vendor-heroui-DqoPVa63.js";import"./page-dashboard-DNNUfIJO.js";import"./utils-DV3Ugabq.js";import"./hooks-CrFgaybL.js";import"./vendor-visual-CTuViOkk.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-Csan4HCy.js → utils-DV3Ugabq.js}

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

package/dist/web/index.html

@@ -14,21 +14,21 @@
     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-Bu34wpVH.js"></script>
+  <script type="module" crossorigin src="/web/assets/js/entry-B3jpAEDK.js"></script>
   <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-editor-B8hjWfkw.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-others-CBBlg8Fy.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-others-DGUjmv7c.js">
   <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-ui-utils-Bb93SeY3.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-react-DODmErXx.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-heroui-BHUSASI0.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/hooks-Ct7PuBJz.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-visual-C2oODoBB.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/components-BLnh3G72.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/utils-Csan4HCy.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/page-dashboard-CWURXXkN.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-react-ZA9Ag8xC.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-heroui-DqoPVa63.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/hooks-CrFgaybL.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-visual-CTuViOkk.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/components-C8mD5H9u.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/utils-DV3Ugabq.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/page-dashboard-DNNUfIJO.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">
-  <link rel="stylesheet" crossorigin href="/web/assets/css/index-UGP8LfJg.css">
+  <link rel="stylesheet" crossorigin href="/web/assets/css/index-Bq0kgume.css">
 </head>
 
 <body>

package/package.json

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

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

@@ -1 +0,0 @@
-import{j as t}from"./vendor-react-DODmErXx.js";import{P as r}from"./components-BLnh3G72.js";import"./vendor-others-CBBlg8Fy.js";import"./vendor-editor-B8hjWfkw.js";import"./vendor-ui-utils-Bb93SeY3.js";import"./vendor-heroui-BHUSASI0.js";import"./page-dashboard-CWURXXkN.js";import"./hooks-Ct7PuBJz.js";import"./utils-Csan4HCy.js";import"./vendor-visual-C2oODoBB.js";const x=()=>t.jsx("div",{className:"min-h-screen flex items-center justify-center",children:t.jsx(r,{})});export{x as default};