@karinjs/plugin-basic 1.3.3 → 1.3.5

package/README.md

@@ -10,22 +10,26 @@ pnpm add @karinjs/plugin-basic -w
 
 ## 基本指令
 
-```
+```bash
 # 关机
 ```
 
-```
+```text
 # 重启
 ```
 
-```
+```text
 # 状态
 ```
 
-```
+```text
 # 插件列表
 ```
 
-```
+```text
 #web登录
 ```
+
+```text
+#日志
+```

package/dist/apps/logger.js

@@ -1,62 +1,143 @@
 import {
   render
-} from "../chunk-AAM3ZLYA.js";
+} from "../chunk-4GSJ5FLI.js";
 
 // src/apps/logger.ts
 import fs from "fs";
 import path from "path";
 import { karin, logger } from "node-karin";
+var ESC = "\x1B";
+var ANSI_REGEX = new RegExp(`${ESC}\\[([0-9;]+)m`, "g");
+var escapeHtml = (str) => str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+var ANSI_COLOR_MAP = {
+  30: "#020617",
+  31: "#ef4444",
+  32: "#22c55e",
+  33: "#eab308",
+  34: "#3b82f6",
+  35: "#ec4899",
+  36: "#06b6d4",
+  37: "#e5e7eb",
+  90: "#6b7280",
+  91: "#f97373",
+  92: "#4ade80",
+  93: "#fde047",
+  94: "#60a5fa",
+  95: "#a855f7",
+  96: "#38bdf8",
+  97: "#f9fafb"
+};
+var LOG_TIME_PREFIX_REGEX = /^\[\d{2}:\d{2}:\d{2}\.\d{3}\]/;
+var LOG_HEADER_REGEX = /^(\[\d{2}:\d{2}:\d{2}\.\d{3}\])(\[(?:INFO|WARN|ERROR|ERRO|FATAL|DEBUG|TRACE|MARK)\])/;
+var LOG_LEVEL_COLOR_CODE = {
+  INFO: "\x1B[32m",
+  // 绿色
+  WARN: "\x1B[33m",
+  // 黄色
+  ERROR: "\x1B[31m",
+  // 红色
+  ERRO: "\x1B[31m",
+  // 兼容旧字段
+  FATAL: "\x1B[35m",
+  // 紫色
+  DEBUG: "\x1B[90m",
+  // 灰色
+  TRACE: "\x1B[90m",
+  // 灰色
+  MARK: "\x1B[90m"
+  // 灰色
+};
+var ansi256ToRgb = (idx) => {
+  if (idx < 0 || idx > 255 || Number.isNaN(idx)) return null;
+  const basicPalette = [
+    "#020617",
+    // 0: black
+    "#ef4444",
+    // 1: red
+    "#22c55e",
+    // 2: green
+    "#eab308",
+    // 3: yellow
+    "#3b82f6",
+    // 4: blue
+    "#ec4899",
+    // 5: magenta
+    "#06b6d4",
+    // 6: cyan
+    "#e5e7eb",
+    // 7: white (light gray)
+    "#6b7280",
+    // 8: bright black (gray)
+    "#f97373",
+    // 9: bright red
+    "#4ade80",
+    // 10: bright green
+    "#fde047",
+    // 11: bright yellow
+    "#60a5fa",
+    // 12: bright blue
+    "#a855f7",
+    // 13: bright magenta
+    "#38bdf8",
+    // 14: bright cyan
+    "#f9fafb"
+    // 15: bright white
+  ];
+  if (idx <= 15) {
+    return basicPalette[idx];
+  }
+  if (idx >= 16 && idx <= 231) {
+    const n = idx - 16;
+    const r = Math.floor(n / 36);
+    const g = Math.floor(n % 36 / 6);
+    const b = n % 6;
+    const conv = (c) => c === 0 ? 0 : 55 + c * 40;
+    return `rgb(${conv(r)}, ${conv(g)}, ${conv(b)})`;
+  }
+  const gray = 8 + (idx - 232) * 10;
+  return `rgb(${gray}, ${gray}, ${gray})`;
+};
 var ansiToHtml = (text) => {
   if (!text) return "";
-  const ESC = "\x1B";
-  const ansiRegex = new RegExp(`${ESC}\\[([0-9;]+)m`, "g");
-  const escapeHtml = (str) => str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
   let result = "";
   let lastIndex = 0;
   let openSpan = "";
-  const colorMap = {
-    30: "#020617",
-    31: "#ef4444",
-    32: "#22c55e",
-    33: "#eab308",
-    34: "#3b82f6",
-    35: "#ec4899",
-    36: "#06b6d4",
-    37: "#e5e7eb",
-    90: "#6b7280",
-    91: "#f97373",
-    92: "#4ade80",
-    93: "#fde047",
-    94: "#60a5fa",
-    95: "#a855f7",
-    96: "#38bdf8",
-    97: "#f9fafb"
-  };
-  text.replace(ansiRegex, (match, codesStr, offset) => {
+  text.replace(ANSI_REGEX, (match, codesStr, offset) => {
     const chunk = text.slice(lastIndex, offset);
     if (chunk) {
       result += escapeHtml(chunk);
     }
     lastIndex = offset + match.length;
-    const codes = codesStr.split(";").map((n) => Number(n) || 0);
+    const codes = codesStr.split(";").map((n) => parseInt(n, 10));
     if (openSpan) {
       result += "</span>";
       openSpan = "";
     }
-    if (codes.includes(0) || codes.includes(39)) {
-      return "";
-    }
     if (codes[0] === 38 && codes[1] === 2 && codes.length >= 5) {
       const r = codes[2];
       const g = codes[3];
       const b = codes[4];
-      openSpan = `color: rgb(${r}, ${g}, ${b})`;
-      result += `<span style="${openSpan}">`;
+      if (!isNaN(r) && !isNaN(g) && !isNaN(b)) {
+        openSpan = `color: rgb(${r}, ${g}, ${b})`;
+        result += `<span style="${openSpan}">`;
+      }
       return "";
     }
-    const colorCode = codes.find((c) => colorMap[c]);
+    if (codes[0] === 38 && codes[1] === 5 && codes.length >= 3) {
+      const idx = codes[2];
+      const rgb = ansi256ToRgb(idx);
+      if (rgb) {
+        openSpan = `color: ${rgb}`;
+        result += `<span style="${openSpan}">`;
+      }
+      return "";
+    }
+    if (codes.length === 1 && (codes[0] === 0 || codes[0] === 39)) {
+      return "";
+    }
+    const colorCode = codes.find((c) => ANSI_COLOR_MAP[c]);
     if (colorCode !== void 0) {
-      const color = colorMap[colorCode];
+      const color = ANSI_COLOR_MAP[colorCode];
       openSpan = `color: ${color}`;
       result += `<span style="${openSpan}">`;
       return "";
@@ -72,21 +153,19 @@ var ansiToHtml = (text) => {
   }
   return result;
 };
-var trimEmptyLines = (text) => {
-  const lines = text.split("\n");
-  while (lines.length && !lines[0].trim()) lines.shift();
-  while (lines.length && !lines[lines.length - 1].trim()) lines.pop();
-  return lines.join("\n");
+var colorizeLog = (line) => {
+  return line.replace(LOG_HEADER_REGEX, (match, timePart, levelPart) => {
+    const levelKey = levelPart.replace("[", "").replace("]", "");
+    const colorCode = LOG_LEVEL_COLOR_CODE[levelKey] ?? "\x1B[37m";
+    return `${colorCode}${timePart}${levelPart}\x1B[0m`;
+  });
 };
 var groupLogLines = (lines) => {
   const groups = [];
   let current = [];
-  const isNewEntry = (line) => {
-    const trimmed = line.trim();
-    if (!trimmed) return false;
-    return /^\[\d{2}:\d{2}:\d{2}\.\d{3}\]\[[A-Z]+]/.test(trimmed);
-  };
+  const isNewEntry = (line) => LOG_TIME_PREFIX_REGEX.test(line);
   for (const line of lines) {
+    if (!line.trim()) continue;
     if (isNewEntry(line)) {
       if (current.length) groups.push(current);
       current = [line];
@@ -99,9 +178,15 @@ var groupLogLines = (lines) => {
     }
   }
   if (current.length) groups.push(current);
-  return groups.map((item) => item.join("\n"));
+  return groups.map((g) => g.join("\n"));
 };
-var getTodayLogs = async (limit = 50) => {
+var readAndGroupLogFile = (logFile, limit) => {
+  const content = fs.readFileSync(logFile, "utf-8");
+  const lines = content.split("\n");
+  const groups = groupLogLines(lines);
+  return groups.slice(-limit);
+};
+var getTodayLogs = async (limit = 100) => {
   const today = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
   const logDir = path.join(process.cwd(), "@karinjs", "logs");
   const logFile = path.join(logDir, `logger.${today}.log`);
@@ -112,21 +197,15 @@ var getTodayLogs = async (limit = 50) => {
         return ["\u6682\u65E0\u65E5\u5FD7\u8BB0\u5F55"];
       }
       const latestLog = path.join(logDir, files[0]);
-      const content2 = fs.readFileSync(latestLog, "utf-8");
-      const lines2 = content2.split("\n").filter((line) => line.trim());
-      const groups2 = groupLogLines(lines2);
-      return groups2.slice(-limit).reverse();
+      return readAndGroupLogFile(latestLog, limit);
     }
-    const content = fs.readFileSync(logFile, "utf-8");
-    const lines = content.split("\n").filter((line) => line.trim());
-    const groups = groupLogLines(lines);
-    return groups.slice(-limit).reverse();
+    return readAndGroupLogFile(logFile, limit);
   } catch (error) {
     logger.error("\u8BFB\u53D6\u65E5\u5FD7\u6587\u4EF6\u5931\u8D25:", error);
     return ["\u8BFB\u53D6\u65E5\u5FD7\u5931\u8D25"];
   }
 };
-var getErrorLogs = async (limit = 50) => {
+var getErrorLogs = async (limit = 100) => {
   const today = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
   const errorDir = path.join(process.cwd(), "@karinjs", "logs", "error");
   if (!fs.existsSync(errorDir)) {
@@ -147,47 +226,23 @@ var getErrorLogs = async (limit = 50) => {
       }
     }
     if (!logFile) return [];
-    const content = fs.readFileSync(logFile, "utf-8");
-    const lines = content.split("\n").filter((line) => line.trim());
-    const groups = groupLogLines(lines);
-    return groups.slice(-limit).reverse();
+    return readAndGroupLogFile(logFile, limit);
   } catch (error) {
     logger.error("\u8BFB\u53D6\u9519\u8BEF\u65E5\u5FD7\u6587\u4EF6\u5931\u8D25:", error);
     return [];
   }
 };
-var parseLogLine = (line) => {
-  const [firstLine, ...rest] = line.split("\n");
-  let time = "";
-  let levelRaw = "INFO";
-  const timeMatch = firstLine.match(/^\[(\d{2}:\d{2}:\d{2}\.\d{3})]/);
-  const levelMatch = firstLine.match(/\[([A-Z]+)]/);
-  if (timeMatch) time = timeMatch[1];
-  if (levelMatch) levelRaw = levelMatch[1];
-  const levelKey = levelRaw.toLowerCase();
-  const level = levelKey === "erro" ? "error" : levelKey;
-  const messageHead = firstLine.replace(/^\[\d{2}:\d{2}:\d{2}\.\d{3}]\[[A-Z]+]\s*/, "");
-  const messageTail = rest.length ? "\n" + rest.join("\n") : "";
-  const fullMessage = trimEmptyLines(`${messageHead}${messageTail}`);
-  const plainMessage = fullMessage.replace(/\u001b\[[0-9;]+m/g, "");
-  return {
-    time,
-    level,
-    message: plainMessage,
-    messageHtml: ansiToHtml(fullMessage)
-  };
-};
 var logViewer = karin.command(/^#日志\s*(\d+)?$/, async (e) => {
   const match = e.msg.match(/^#日志\s*(\d+)?$/);
   let limit = match && match[1] ? Number(match[1]) : 50;
   if (!Number.isFinite(limit) || limit <= 0) limit = 50;
   if (limit > 1e3) limit = 1e3;
   const logs = await getTodayLogs(limit);
-  const parsedLogs = logs.map(parseLogLine);
+  const logsHtml = logs.map((line) => ansiToHtml(colorizeLog(line)));
   try {
     const img = await render("logger/index", {
-      logs: parsedLogs,
-      total: parsedLogs.length,
+      logs: logsHtml,
+      total: logs.length,
       date: (/* @__PURE__ */ new Date()).toLocaleString("zh-CN")
     });
     await e.reply(img);
@@ -208,11 +263,11 @@ var errorLogViewer = karin.command(/^#错误日志\s*(\d+)?$/, async (e) => {
     await e.reply("\u6682\u65E0\u9519\u8BEF\u65E5\u5FD7");
     return true;
   }
-  const parsedLogs = logs.map(parseLogLine);
+  const logsHtml = logs.map((line) => ansiToHtml(colorizeLog(line)));
   try {
     const img = await render("logger/index", {
-      logs: parsedLogs,
-      total: parsedLogs.length,
+      logs: logsHtml,
+      total: logs.length,
       date: (/* @__PURE__ */ new Date()).toLocaleString("zh-CN")
     });
     await e.reply(img);

package/dist/apps/login.js

@@ -1,7 +1,7 @@
 import {
   cfg
-} from "../chunk-ZRGOU5NN.js";
-import "../chunk-AAM3ZLYA.js";
+} from "../chunk-TUC5A7K4.js";
+import "../chunk-4GSJ5FLI.js";
 
 // src/apps/login.ts
 import karin, { common, contactFriend, logger, segment } from "node-karin";

package/dist/apps/restart.js

@@ -1,7 +1,7 @@
 import {
   cfg
-} from "../chunk-ZRGOU5NN.js";
-import "../chunk-AAM3ZLYA.js";
+} from "../chunk-TUC5A7K4.js";
+import "../chunk-4GSJ5FLI.js";
 
 // src/apps/restart.ts
 import { common, karin, logger, restart } from "node-karin";

package/dist/apps/status.js

@@ -7,8 +7,8 @@ import {
 } from "../chunk-ODFXVVIE.js";
 import {
   cfg
-} from "../chunk-ZRGOU5NN.js";
-import "../chunk-AAM3ZLYA.js";
+} from "../chunk-TUC5A7K4.js";
+import "../chunk-4GSJ5FLI.js";
 
 // src/apps/status.ts
 import { karin } from "node-karin";

package/dist/apps/update.js

@@ -1,10 +1,10 @@
 import {
   cfg,
   sendToFirstAdmin
-} from "../chunk-ZRGOU5NN.js";
+} from "../chunk-TUC5A7K4.js";
 import {
   render
-} from "../chunk-AAM3ZLYA.js";
+} from "../chunk-4GSJ5FLI.js";
 
 // src/apps/update.ts
 import fs from "fs";

package/dist/{chunk-AAM3ZLYA.js → chunk-4GSJ5FLI.js}

@@ -7,7 +7,7 @@ import { karinPathBase } from "node-karin";
 // package.json
 var package_default = {
   name: "@karinjs/plugin-basic",
-  version: "1.3.3",
+  version: "1.3.5",
   description: "Karin\u7684\u57FA\u7840\u63D2\u4EF6,\u63D0\u4F9B\u6700\u57FA\u7840\u7684\u529F\u80FD",
   homepage: "https://github.com/KarinJS/karin-plugin-basic",
   bugs: {

package/dist/{chunk-ZRGOU5NN.js → chunk-TUC5A7K4.js}

@@ -1,6 +1,6 @@
 import {
   plugin
-} from "./chunk-AAM3ZLYA.js";
+} from "./chunk-4GSJ5FLI.js";
 
 // src/utils/utils.ts
 import karin, { config, logger } from "node-karin";

package/dist/index.js

@@ -9,10 +9,10 @@ import {
 } from "./chunk-ODFXVVIE.js";
 import {
   cfg
-} from "./chunk-ZRGOU5NN.js";
+} from "./chunk-TUC5A7K4.js";
 import {
   plugin
-} from "./chunk-AAM3ZLYA.js";
+} from "./chunk-4GSJ5FLI.js";
 
 // src/index.ts
 import { logger, restartDirect } from "node-karin";

package/dist/web.config.js

@@ -1,9 +1,9 @@
 import {
   cfg
-} from "./chunk-ZRGOU5NN.js";
+} from "./chunk-TUC5A7K4.js";
 import {
   plugin
-} from "./chunk-AAM3ZLYA.js";
+} from "./chunk-4GSJ5FLI.js";
 
 // src/web.config.ts
 import { components, defineConfig } from "node-karin";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karinjs/plugin-basic",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "description": "Karin的基础插件,提供最基础的功能",
   "homepage": "https://github.com/KarinJS/karin-plugin-basic",
   "bugs": {

package/resources/logger/index.css

@@ -1,200 +1,58 @@
 :root {
-  --bg-color: #1e1e1e;
-  --container-bg: #252526;
-  --text-color: #d4d4d4;
-  --border-color: #3e3e42;
-  --header-bg: #333333;
-  --accent-color: #007acc;
-
-  --level-debug: #b5cea8;
-  --level-info: #569cd6;
-  --level-mark: #c586c0;
-  --level-warn: #ce9178;
-  --level-error: #f44747;
-  --level-fatal: #d16969;
+  --bg-color: #000000;
+  --text-color: #c1c1c1;
+  --font-family: 'Consolas', 'Lucida Console', 'Courier New', monospace;
+  --border-color: #333333;
 }
 
-* {
+body {
   margin: 0;
   padding: 0;
-  box-sizing: border-box;
-}
-
-body {
-  font-family: 'Fira Code', 'Consolas', 'Monaco', 'Courier New', monospace;
   background-color: var(--bg-color);
   color: var(--text-color);
-  padding: 0;
-  margin: 0;
+  font-family: var(--font-family);
   font-size: 14px;
-  line-height: 1.5;
-}
-
-.container {
-  max-width: 100%;
-  margin: 0;
-  background: var(--bg-color);
+  line-height: 1.15;
+  min-height: 100vh;
   display: flex;
   flex-direction: column;
 }
 
 .header {
-  background: var(--header-bg);
-  padding: 10px 20px;
-  border-bottom: 1px solid var(--border-color);
+  padding: 8px 15px;
+  border-bottom: 1px dashed var(--border-color);
+  background-color: var(--bg-color);
   display: flex;
   justify-content: space-between;
   align-items: center;
-  position: sticky;
-  top: 0;
-  z-index: 100;
-  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
-}
-
-.header h1 {
-  font-size: 16px;
-  font-weight: 600;
-  color: #fff;
-  margin: 0;
-  display: flex;
-  align-items: center;
-  gap: 10px;
 }
 
-.header h1::before {
-  content: '>';
-  color: var(--accent-color);
+.title {
   font-weight: bold;
+  color: #ffffff;
 }
 
-.info {
-  display: flex;
-  gap: 15px;
-  font-size: 12px;
-  color: #cccccc;
-}
-
-.info span {
-  background: rgba(255, 255, 255, 0.1);
-  padding: 2px 8px;
-  border-radius: 3px;
-}
-
-.header-bg-text {
-  display: none;
-}
-
-.logs-container {
-  padding: 10px 0;
-}
-
-.log-item {
-  padding: 2px 10px;
-  border-left: 3px solid transparent;
-  transition: background-color 0.1s;
-  font-size: 13px;
-  line-height: 1.6;
-}
-
-.log-item:hover {
-  background-color: #2a2d2e;
-}
-
-.log-content {
-  display: block;
-}
-
-.log-prefix {
-  color: #858585;
+.meta {
   font-size: 12px;
-  white-space: nowrap;
-  opacity: 0.9;
-  margin-right: 8px;
+  color: #888888;
 }
 
-.log-time {
-  color: #858585;
-}
-
-.log-level {
-  font-weight: bold;
-  text-transform: uppercase;
-  font-size: 12px;
-}
-
-.level-debug {
-  color: var(--level-debug);
-}
-
-.level-info {
-  color: var(--level-info);
-}
-
-.level-mark {
-  color: var(--level-mark);
-}
-
-.level-warn {
-  color: var(--level-warn);
-}
-
-.level-error {
-  color: var(--level-error);
-}
-
-.level-fatal {
-  color: var(--level-fatal);
-  background: #5a1d1d;
-  padding: 0 4px;
-  border-radius: 2px;
-}
-
-.log-message {
+.logs {
+  flex: 1;
+  padding: 15px;
   white-space: pre-wrap;
-  word-break: break-word;
-  color: #cccccc;
-}
-
-/* Log item border indicators */
-.log-item.log-error {
-  border-left-color: var(--level-error);
-  background: rgba(244, 71, 71, 0.05);
-}
-
-.log-item.log-warn {
-  border-left-color: var(--level-warn);
-  background: rgba(206, 145, 120, 0.05);
-}
-
-.log-item.log-fatal {
-  border-left-color: var(--level-fatal);
-  background: rgba(209, 105, 105, 0.1);
+  word-break: break-all;
 }
 
 .footer {
-  padding: 5px 20px;
+  padding: 8px 15px;
+  border-top: 1px dashed var(--border-color);
+  font-size: 12px;
+  color: #666666;
   text-align: center;
-  color: #666;
-  font-size: 11px;
-  border-top: 1px solid var(--border-color);
-  background: var(--container-bg);
+  background-color: var(--bg-color);
 }
 
-/* Scrollbar */
 ::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
-}
-
-::-webkit-scrollbar-track {
-  background: var(--bg-color);
-}
-
-::-webkit-scrollbar-thumb {
-  background: #424242;
-  border-radius: 5px;
+  display: none;
 }
-
-::-webkit-scrollbar-thumb:hover {
-  background: #4f4f4f;
-}

package/resources/logger/index.html

@@ -3,36 +3,19 @@
 
 <head>
   <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Karin 日志</title>
   <link rel="stylesheet" href="{{pluResPath}}logger/index.css">
 </head>
 
 <body>
-  <div class="container">
-    <div class="header">
-      <h1>Karin 日志</h1>
-      <div class="info">
-        <span class="date">{{date}}</span>
-        <span class="count">共 {{total}} 条日志</span>
-      </div>
-    </div>
+  <div class="header">
+    <div class="title">Karin 日志</div>
+    <div class="meta">{{date}} | 共 {{total}} 条日志</div>
+  </div>
 
-    <div class="logs-container">
-      {{each logs}}
-      <div class="log-item log-{{$value.level}}">
-        <div class="log-content">
-          <span class="log-prefix">[<span class="log-time">{{$value.time}}</span>][<span
-              class="log-level level-{{$value.level}}">{{$value.level}}</span>]</span>
-          <span class="log-message">{{@ $value.messageHtml}}</span>
-        </div>
-      </div>
-      {{/each}}
-    </div>
+  <div class="logs">{{@ logs.join('\n') }}</div>
 
-    <div class="footer">
-      <p>{{sys.copyright}}</p>
-    </div>
+  <div class="footer">
+    {{sys.copyright}}
   </div>
 </body>