node-karin 1.4.4 → 1.4.6

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # 更新日志
 
+## [1.4.6](https://github.com/KarinJS/Karin/compare/core-v1.4.5...core-v1.4.6) (2025-03-05)
+
+
+### 🐛 Bug Fixes
+
+* 修复插件页面跳转 修复web在夜间模式下某些样式问题 ([aa8734e](https://github.com/KarinJS/Karin/commit/aa8734e74d064a86b88256c53768dfaae9bdf70a))
+* 实时日志 ([d3512b2](https://github.com/KarinJS/Karin/commit/d3512b20ea08e348390f7fbfde0046e133595a14))
+
+
+### 💄 Styles
+
+* tabs ([9369507](https://github.com/KarinJS/Karin/commit/9369507dc16a561fa69eafd95af07c62bfc6dce9))
+
+## [1.4.5](https://github.com/KarinJS/Karin/compare/core-v1.4.4...core-v1.4.5) (2025-03-04)
+
+
+### 🐛 Bug Fixes
+
+* pub error ([0bfc6dc](https://github.com/KarinJS/Karin/commit/0bfc6dcb4603f4002b1b90400a6e8fd2e68f34ba))
+
 ## [1.4.4](https://github.com/KarinJS/Karin/compare/core-v1.4.3...core-v1.4.4) (2025-03-04)
 
 

package/dist/index.js

@@ -14,9 +14,9 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// ../../node_modules/.pnpm/tsup@8.3.6_@swc+core@1.10.18_@swc+helpers@0.5.15__jiti@1.21.7_postcss@8.5.3_tsx@4.19.3_typescript@5.7.3_yaml@2.7.0/node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@8.4.0_tsx@4.19.3_typescript@5.7.3/node_modules/tsup/assets/esm_shims.js
 var init_esm_shims = __esm({
-  "../../node_modules/.pnpm/tsup@8.3.6_@swc+core@1.10.18_@swc+helpers@0.5.15__jiti@1.21.7_postcss@8.5.3_tsx@4.19.3_typescript@5.7.3_yaml@2.7.0/node_modules/tsup/assets/esm_shims.js"() {
+  "../../node_modules/.pnpm/tsup@8.4.0_tsx@4.19.3_typescript@5.7.3/node_modules/tsup/assets/esm_shims.js"() {
     "use strict";
   }
 });
@@ -2213,20 +2213,26 @@ var init_env2 = __esm({
         obj[index4] = line;
       });
       lines.forEach((line, index4) => {
+        var _a;
         if (!line.includes("=")) return;
         let comment2 = "";
         let [key, value] = line.split("=").map((item) => item.trim());
         if (value.includes("#")) {
-          const arr = value.split("#").map((item) => item.trim());
-          comment2 = arr.length > 1 ? `# ${arr[1]}` : "";
-          value = arr[0].replace(/^"|"$/g, "");
-        } else {
-          const data = obj[index4 - 1];
-          if (data.startsWith("#")) {
-            comment2 = data;
+          const data = value.match(/^".*"$/);
+          if (data) {
+            value = data[0];
+            comment2 = value.replace(value, "") || "";
+          } else {
+            const arr = value.split("#").map((item) => item.trim());
+            comment2 = arr.length > 1 ? `# ${arr[1]}` : "";
+            value = arr[0];
           }
-          value = value.replace(/^"|"$/g, "");
         }
+        if (!comment2) {
+          const data = (_a = obj[index4 - 1]) == null ? void 0 : _a.trim();
+          if (data == null ? void 0 : data.startsWith("#")) comment2 = data;
+        }
+        value = (value == null ? void 0 : value.replace(/^"|"$/g, "")) || "";
         list2.push({ key, value, comment: comment2.replace(/\\r|\\n/g, "").trim() });
       });
       const result = {};
@@ -2298,28 +2304,30 @@ ${key}="${value.value}"`).join("\n");
       });
       return env3;
     };
-    writeEnv = (data, cwd = path7.join(process.cwd(), ".env"), isCover = false) => {
+    writeEnv = (data, cwd, isCover = false) => {
+      if (!cwd) cwd = path7.join(process.cwd(), ".env");
       const env3 = getEnv(cwd);
+      const result = { ...env3 };
       if (!Array.isArray(data)) data = [data];
       data.forEach((item) => {
         var _a;
         const { key, value, comment: comment2 } = item;
-        if (!key || typeof key !== "string" || typeof value !== "string") {
+        if (!key || typeof key !== "string") {
           logger.error("[writeEnv]", "key \u5FC5\u987B\u4E3A\u5B57\u7B26\u4E32");
           return;
         }
-        if (env3[key]) {
+        if (result[key]) {
           if (!isCover) {
             logger.debug(`[writeEnv] key: ${key} \u5DF2\u5B58\u5728 \u8DF3\u8FC7`);
             return;
           }
         }
-        env3[key] = {
+        result[key] = {
           value,
-          comment: comment2 || ((_a = env3 == null ? void 0 : env3[key]) == null ? void 0 : _a.comment) || ""
+          comment: comment2 || ((_a = result == null ? void 0 : result[key]) == null ? void 0 : _a.comment) || ""
         };
       });
-      const content = Object.entries(env3).map(([key, value]) => {
+      const content = Object.entries(result).map(([key, value]) => {
         const val = /^".*"$/.test(value.value) ? value.value : `"${value.value}"`;
         if (value.comment) {
           const comment2 = /^#/.test(value.comment) ? value.comment : `# ${value.comment}`;
@@ -3603,7 +3611,12 @@ var init_list = __esm({
           await getNpmInfo(info, file, name, isForce, env3);
         }
       }));
-      env3 && writeEnv(env3);
+      if (env3 && env3.length) {
+        logger.debug("[getPluginsInfo] \u5904\u7406\u73AF\u5883\u53D8\u91CF \u540C\u6B65\u5199\u5165", JSON.stringify(env3, null, 2));
+        writeEnv(env3);
+      } else {
+        logger.debug("[getPluginsInfo] \u5904\u7406\u73AF\u5883\u53D8\u91CF \u672A\u6536\u96C6\u5230\u73AF\u5883\u53D8\u91CF \u8DF3\u8FC7\u5199\u5165");
+      }
       return info;
     };
     createPkg = (type, name, dir2, apps, allApps, isForce) => {
@@ -5780,7 +5793,7 @@ var init_config3 = __esm({
             value: value.value,
             comment: value.comment
           }));
-          writeEnv(result);
+          writeEnv(result, void 0, true);
           return true;
         }
         if (list2.includes(type)) {
@@ -5891,7 +5904,7 @@ var init_manage = __esm({
 import fs18 from "node:fs";
 import moment from "moment";
 import path13 from "node:path";
-var logRouter, activeConnections, getLogRouter;
+var isStandardDate, logRouter, activeConnections, getLogRouter, getLogFileListRouter, getLogFileRouter;
 var init_log = __esm({
   "src/server/api/system/log.ts"() {
     "use strict";
@@ -5900,6 +5913,9 @@ var init_log = __esm({
     init_router();
     init_config2();
     init_response();
+    isStandardDate = (date) => {
+      return typeof date === "string" && /^\d{4}-\d{2}-\d{2}$/.test(date);
+    };
     logRouter = async (req, res) => {
       var _a;
       const level2 = (_a = req.body) == null ? void 0 : _a.level;
@@ -5908,7 +5924,7 @@ var init_log = __esm({
         return createBadRequestResponse(res, "\u53C2\u6570\u9519\u8BEF");
       }
       updateLevel(level2);
-      createSuccessResponse(res, null, "\u6210\u529F");
+      createSuccessResponse(res, null, "\u4FEE\u6539\u6210\u529F");
     };
     activeConnections = 0;
     getLogRouter = async (req, res) => {
@@ -5917,19 +5933,22 @@ var init_log = __esm({
         return createBadRequestResponse(res, "\u5F53\u524D\u8FDE\u63A5\u6570\u5DF2\u8FBE\u5230\u4E0A\u9650\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5");
       }
       activeConnections++;
-      const date = req.query.date ? moment(req.query.date) : moment();
+      const date = moment();
       if (!date.isValid()) {
         return createBadRequestResponse(res, "\u65E5\u671F\u683C\u5F0F\u9519\u8BEF");
       }
       const file = path13.join(logsPath, `logger.${date.format("YYYY-MM-DD")}.log`);
-      if (!fs18.existsSync(file)) {
-        return createBadRequestResponse(res, "\u65E5\u5FD7\u6587\u4EF6\u4E0D\u5B58\u5728");
-      }
-      res.setHeader("Content-Type", "text/plain; charset=utf-8");
+      res.setHeader("Content-Type", "text/event-stream; charset=utf-8");
       res.setHeader("Cache-Control", "no-cache");
       res.setHeader("Connection", "keep-alive");
       res.setHeader("X-Accel-Buffering", "no");
       let position = 0;
+      const isEventSource = req.headers.accept === "text/event-stream";
+      const heartbeat = setInterval(() => {
+        if (isEventSource) {
+          res.write(":heartbeat\n\n");
+        }
+      }, 3e4);
       const tailFile = () => {
         fs18.stat(file, (err, stats) => {
           if (err) {
@@ -5941,7 +5960,19 @@ var init_log = __esm({
           }
           if (position < stats.size) {
             const stream3 = fs18.createReadStream(file, { start: position, encoding: "utf-8" });
-            stream3.on("data", (data) => res.write(data));
+            stream3.on("data", (data) => {
+              const lines = data.toString().split("\n");
+              for (const line of lines) {
+                if (isEventSource) {
+                  res.write(`data: ${line}
+
+`);
+                } else {
+                  res.write(`${line}
+`);
+                }
+              }
+            });
             stream3.on("end", () => {
               position = stats.size;
             });
@@ -5955,11 +5986,31 @@ var init_log = __esm({
       const interval = setInterval(tailFile, 1e3);
       req.on("close", () => {
         clearInterval(interval);
+        clearInterval(heartbeat);
         activeConnections--;
       });
     };
+    getLogFileListRouter = async (req, res) => {
+      const files = fs18.readdirSync(logsPath);
+      const logFiles = files.filter((file) => file.startsWith("logger.") && file.endsWith(".log")).map((file) => file.replace("logger.", "").replace(".log", ""));
+      createSuccessResponse(res, logFiles, "\u6210\u529F");
+    };
+    getLogFileRouter = async (req, res) => {
+      const file = req.query.file;
+      if (!isStandardDate(file)) {
+        return createBadRequestResponse(res, "\u65E5\u671F\u683C\u5F0F\u9519\u8BEF");
+      }
+      const filePath = path13.join(logsPath, `logger.${file}.log`);
+      if (!fs18.existsSync(filePath)) {
+        return createBadRequestResponse(res, "\u65E5\u5FD7\u6587\u4EF6\u4E0D\u5B58\u5728");
+      }
+      const content = fs18.readFileSync(filePath, "utf-8");
+      createSuccessResponse(res, content, "\u6210\u529F");
+    };
     router.get("/log", getLogRouter);
-    router.post("/log_level", logRouter);
+    router.get("/logs/level", logRouter);
+    router.get("/logs/list", getLogFileListRouter);
+    router.get("/logs/file", getLogFileRouter);
   }
 });
 
@@ -10834,6 +10885,10 @@ var init_config4 = __esm({
     init_response();
     getWebConfigPathFromPkg = (pkg2, baseDir) => {
       if (!pkg2.karin) return null;
+      if (baseDir.includes("node_modules")) {
+        if (pkg2.karin.web) return path16.join(baseDir, pkg2.karin.web);
+        return null;
+      }
       if (isTsx() && pkg2.karin["ts-web"]) {
         return path16.join(baseDir, pkg2.karin["ts-web"]);
       }

package/dist/web/assets/index-BNXr-pbF.js

@@ -0,0 +1 @@
+import{aZ as a}from"./index-6g1t6wsY.js";var t=a;export{t as default};

package/dist/web/assets/index-D_n2vAEv.js

@@ -0,0 +1 @@
+import{aZ as a}from"./index-6g1t6wsY.js";var r=a;export{r as default};

package/dist/web/assets/{save-Dx1lPS63.js → save-C0_Ql9-S.js}

@@ -1 +1 @@
-import{aW as t,V as r}from"./index-BUa4ALoK.js";const n=async(e,o)=>{try{const s=await t.serverPost("/api/v1/config/new/save",{type:e,data:o});r.success(s)}catch(s){const a=s instanceof Error?s.message:"未知错误";r.error(a),console.error("保存配置出错:",s)}};export{n as s};
+import{aY as t,V as r}from"./index-6g1t6wsY.js";const n=async(e,o)=>{try{const s=await t.serverPost("/api/v1/config/new/save",{type:e,data:o});r.success(s)}catch(s){const a=s instanceof Error?s.message:"未知错误";r.error(a),console.error("保存配置出错:",s)}};export{n as s};

package/dist/web/index.html

@@ -14,8 +14,8 @@
     content="viewport-fit=cover, width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
     name="viewport" />
   <link href="/web/assets/favicon-BoqZd694.ico" rel="icon" />
-  <script type="module" crossorigin src="/web/assets/index-BUa4ALoK.js"></script>
-  <link rel="stylesheet" crossorigin href="/web/assets/index-C6tAGsOw.css">
+  <script type="module" crossorigin src="/web/assets/index-6g1t6wsY.js"></script>
+  <link rel="stylesheet" crossorigin href="/web/assets/index-DWfBbs41.css">
 </head>
 
 <body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "description": "Lightweight, efficient, concise, and stable robot framework.",
   "keywords": [
     "node",
@@ -65,6 +65,7 @@
     "sort": "sort-package-json && sort-json tsconfig.json"
   },
   "dependencies": {
+    "@karinjs/plugin-basic": "^1.0.4",
     "@types/express": "^4.17.21",
     "@types/lodash": "^4.17.10",
     "@types/node-schedule": "^2.1.7",
@@ -96,7 +97,7 @@
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
-  "time": "2025-02-28",
+  "time": "2025-03-05",
   "exports": {
     ".": {
       "import": "./dist/index.js",

package/README.md

@@ -1,32 +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` 中译为「卡琳」，这个名字由[fuqiuluo](https://github.com/fuqiuluo)提供~
-
-## 快速开始
-
-[点击跳转文档](https://karin.fun/)
-
-当前文档可能存在滞后性，正在努力更新中。
-
-有其他问题请加群讨论: 967068507
-
-## 温馨提示
-
-当前`1.0.0`仍处于测试阶段，欢迎大家提出宝贵意见，我们会尽快修复。
-
-## 鸣谢
-
-- webui: [bietiaop](https://github.com/bietiaop)
-- docs: [ikenxuan](https://github.com/ikenxuan)
-
-> ps: 感谢两位大佬~
-
-### 贡献者
-
-> 🌟 星光闪烁，你们的智慧如同璀璨的夜空。感谢所有为**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")

package/dist/web/assets/index-Ce8lPojj.js

@@ -1 +0,0 @@
-import{aX as a}from"./index-BUa4ALoK.js";var r=a;export{r as default};

package/dist/web/assets/index-DPfmHo7T.js

@@ -1 +0,0 @@
-import{aX as a}from"./index-BUa4ALoK.js";var t=a;export{t as default};