llonebot-dist 7.7.0 → 7.7.1

package/assets/{index-B1KgxRHW.js → index-BvqM9dZ0.js}

@@ -1,4 +1,5 @@
-import { A, M, a, N, O } from "../llbot.js";
+import { M as Msg } from "../llbot.js";
+import { A, a, N, O } from "../llbot.js";
 import "node:path";
 import "node:url";
 import "cosmokit";
@@ -43,9 +44,9 @@ import "dns";
 import "tls";
 export {
   A as Action,
-  M as Media,
-  a as Msg,
+  a as Media,
+  Msg,
   N as Notify,
   O as Oidb
 };
-//# sourceMappingURL=index-B1KgxRHW.js.map
+//# sourceMappingURL=index-BvqM9dZ0.js.map

package/assets/index-BvqM9dZ0.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index-BvqM9dZ0.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/llbot.js

@@ -2127,6 +2127,11 @@ class PMHQBase {
   wsUrl = "ws://127.0.0.1:13000/ws";
   ws;
   resListeners = /* @__PURE__ */ new Map();
+  disconnectCallbacks = /* @__PURE__ */ new Map();
+  lastConnectedTime = Date.now();
+  disconnectCheckTimer;
+  hasConnectedOnce = false;
+  hasLoggedConnectionError = false;
   constructor() {
     console.log(process.argv);
     const { pmhqHost, pmhqPort } = this.getPMHQHostPort();
@@ -2137,6 +2142,41 @@ class PMHQBase {
   get_is_connected() {
     return this.ws && this.ws.readyState === WebSocket.OPEN;
   }
+  onDisconnect(timeout2, callback) {
+    const id2 = randomUUID();
+    this.disconnectCallbacks.set(id2, { timeout: timeout2, callback, triggered: false });
+    console.info(`[PMHQ] Registered disconnect callback ${id2} with timeout ${timeout2}ms`);
+    return id2;
+  }
+  offDisconnect(id2) {
+    this.disconnectCallbacks.delete(id2);
+  }
+  startDisconnectMonitoring() {
+    if (this.disconnectCheckTimer) return;
+    console.info("[PMHQ] Starting disconnect monitoring");
+    this.disconnectCheckTimer = setInterval(() => {
+      const isConnected = this.get_is_connected();
+      if (isConnected) {
+        this.lastConnectedTime = Date.now();
+        for (const info of this.disconnectCallbacks.values()) {
+          info.triggered = false;
+        }
+      } else {
+        const disconnectedDuration = Date.now() - this.lastConnectedTime;
+        for (const info of this.disconnectCallbacks.values()) {
+          if (!info.triggered && disconnectedDuration >= info.timeout) {
+            info.triggered = true;
+            console.warn(`[PMHQ] Triggering disconnect callback, duration: ${disconnectedDuration}ms, timeout: ${info.timeout}ms`);
+            try {
+              info.callback(disconnectedDuration);
+            } catch (e) {
+              console.error("PMHQ disconnect callback error", e);
+            }
+          }
+        }
+      }
+    }, 5e3);
+  }
   getPMHQHostPort() {
     let pmhqPort = "13000";
     let pmhqHost = "127.0.0.1";
@@ -2194,16 +2234,27 @@ class PMHQBase {
     };
     this.ws.onerror = () => {
       selfInfo.online = false;
-      console.error("PMHQ WebSocket 连接错误，可能 QQ 未启动", "正在等待 QQ 启动进行重连...");
+      if (!this.hasLoggedConnectionError) {
+        console.error("PMHQ WebSocket 连接错误，可能 QQ 未启动，正在等待 QQ 启动进行重连...");
+        this.hasLoggedConnectionError = true;
+      }
       reconnect();
     };
     this.ws.onclose = () => {
       selfInfo.online = false;
-      console.info("PMHQ WebSocket 连接关闭，准备重连...");
+      if (!this.hasLoggedConnectionError) {
+        console.info("PMHQ WebSocket 连接关闭，准备重连...");
+        this.hasLoggedConnectionError = true;
+      }
       reconnect();
     };
     this.ws.onopen = () => {
       console.info("PMHQ WebSocket 连接成功");
+      this.hasLoggedConnectionError = false;
+      if (!this.hasConnectedOnce) {
+        this.hasConnectedOnce = true;
+        this.startDisconnectMonitoring();
+      }
     };
   }
   async call(func, args, timeout2 = 1e4) {
@@ -10613,7 +10664,7 @@ class OB11HeartbeatEvent extends OB11BaseMetaEvent {
     };
   }
 }
-const version$3 = "7.7.0";
+const version$3 = "7.7.1";
 class OB11WebSocket {
   constructor(ctx, config2) {
     this.ctx = ctx;
@@ -70059,11 +70110,11 @@ function createEmailRoutes(ctx) {
   const router2 = expressExports.Router();
   router2.get("/config", async (_req, res) => {
     try {
-      const emailService = ctx.emailNotification;
-      if (!emailService) {
-        res.status(500).json({ success: false, message: "邮件服务未初始化" });
+      if (!ctx.emailNotification) {
+        res.status(503).json({ success: false, message: "邮件服务未初始化，请等待登录完成" });
         return;
       }
+      const emailService = ctx.emailNotification;
       const config2 = emailService.getConfigManager().getConfig();
       const maskedConfig = {
         ...config2,
@@ -70089,11 +70140,11 @@ function createEmailRoutes(ctx) {
   });
   router2.post("/config", async (req, res) => {
     try {
-      const emailService = ctx.emailNotification;
-      if (!emailService) {
-        res.status(500).json({ success: false, message: "邮件服务未初始化" });
+      if (!ctx.emailNotification) {
+        res.status(503).json({ success: false, message: "邮件服务未初始化，请等待登录完成" });
         return;
       }
+      const emailService = ctx.emailNotification;
       const emailConfig = req.body;
       if (!emailConfig) {
         res.status(400).json({
@@ -70131,15 +70182,19 @@ function createEmailRoutes(ctx) {
   });
   router2.post("/test", async (req, res) => {
     try {
-      const emailService = ctx.emailNotification;
-      if (!emailService) {
-        res.status(500).json({ success: false, message: "邮件服务未初始化" });
+      if (!ctx.emailNotification) {
+        res.status(503).json({ success: false, message: "邮件服务未初始化，请等待登录完成" });
         return;
       }
+      const emailService = ctx.emailNotification;
       const { config: testConfig } = req.body;
       let emailConfig;
       if (testConfig) {
         emailConfig = testConfig;
+        const currentConfig = emailService.getConfigManager().getConfig();
+        if (emailConfig.smtp.auth.pass === "********" || emailConfig.smtp.auth.pass === "") {
+          emailConfig.smtp.auth.pass = currentConfig.smtp.auth.pass;
+        }
       } else {
         emailConfig = emailService.getConfigManager().getConfig();
       }
@@ -70211,7 +70266,10 @@ class WebUIServer extends Service2 {
   upload;
   fileUpload;
   uploadDir;
-  static inject = ["ntLoginApi", "ntFriendApi", "ntGroupApi", "ntSystemApi", "ntMsgApi", "ntUserApi", "ntFileApi"];
+  static inject = {
+    required: ["ntLoginApi", "ntFriendApi", "ntGroupApi", "ntSystemApi", "ntMsgApi", "ntUserApi", "ntFileApi"],
+    optional: ["emailNotification"]
+  };
   createImageUpload() {
     return multer({
       storage: multer.diskStorage({
@@ -70340,7 +70398,7 @@ data: ${JSON.stringify(serializedData)}
       if (data.type !== "recv" || data.data.cmd !== "trpc.msg.olpush.OlPushService.MsgPush") return;
       try {
         const { Msg: Msg2 } = await __vitePreload(async () => {
-          const { Msg: Msg3 } = await import("./assets/index-B1KgxRHW.js");
+          const { Msg: Msg3 } = await import("./assets/index-BvqM9dZ0.js");
           return { Msg: Msg3 };
         }, true ? [] : void 0);
         const pushMsg = Msg2.PushMsg.decode(Buffer.from(data.data.pb, "hex"));
@@ -81639,305 +81697,91 @@ class EmailService {
   }
   formatOfflineEmail(botInfo, reason) {
     const timestamp = botInfo.timestamp.toLocaleString("zh-CN", { timeZone: "Asia/Shanghai" });
-    const reasonText = reason || "未知原因";
-    const subject = `【LLBot 告警】机器人 ${botInfo.uin} 已离线`;
+    const displayName = botInfo.nick ? `${botInfo.nick} (${botInfo.uin})` : botInfo.uin;
+    const subject = "LLBot 掉线通知";
+    const reasonSection = reason ? `<div class="info">
+                <p><strong>掉线原因:</strong> ${reason}</p>
+            </div>` : `<p>可能的原因：</p>
+            <ul>
+                <li>网络连接中断</li>
+                <li>QQ 被强制下线</li>
+                <li>程序异常退出</li>
+            </ul>`;
     const html = `
 <!DOCTYPE html>
 <html>
 <head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <style>
-    * { margin: 0; padding: 0; box-sizing: border-box; }
-    body { 
-      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Microsoft YaHei", Arial, sans-serif;
-      background: linear-gradient(135deg, #8b5cf6 0%, #ec4899 100%);
-      padding: 40px 20px;
-      line-height: 1.6;
-    }
-    .container { 
-      max-width: 600px; 
-      margin: 0 auto; 
-      background: white;
-      border-radius: 20px;
-      overflow: hidden;
-      box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.25);
-    }
-    .header { 
-      background: linear-gradient(135deg, #ef4444 0%, #ec4899 100%);
-      color: white; 
-      padding: 40px 32px;
-      text-align: center;
-      position: relative;
-    }
-    .header::before {
-      content: '';
-      position: absolute;
-      top: 0;
-      left: 0;
-      right: 0;
-      bottom: 0;
-      background: radial-gradient(circle at 30% 50%, rgba(255,255,255,0.1) 0%, transparent 50%);
-    }
-    .header-content {
-      position: relative;
-      z-index: 1;
-    }
-    .icon {
-      font-size: 56px;
-      margin-bottom: 16px;
-      filter: drop-shadow(0 4px 6px rgba(0,0,0,0.1));
-    }
-    .header h2 {
-      font-size: 28px;
-      font-weight: 700;
-      margin-bottom: 8px;
-      letter-spacing: -0.5px;
-    }
-    .header p {
-      font-size: 15px;
-      opacity: 0.95;
-      font-weight: 500;
-    }
-    .content { 
-      padding: 36px 32px;
-    }
-    .info-card {
-      background: linear-gradient(135deg, #f3f4f6 0%, #e5e7eb 100%);
-      border-radius: 16px;
-      padding: 24px;
-      margin-bottom: 24px;
-      border: 1px solid rgba(0,0,0,0.05);
-    }
-    .info-item { 
-      margin: 14px 0;
-      display: flex;
-      align-items: flex-start;
-      padding: 8px 0;
-    }
-    .info-item:not(:last-child) {
-      border-bottom: 1px solid rgba(0,0,0,0.06);
-    }
-    .label { 
-      font-weight: 600;
-      color: #374151;
-      min-width: 90px;
-      flex-shrink: 0;
-      font-size: 14px;
-    }
-    .value {
-      color: #6b7280;
-      flex: 1;
-      font-size: 14px;
-      word-break: break-word;
-    }
-    .alert-message {
-      background: linear-gradient(135deg, #fef3c7 0%, #fde68a 100%);
-      border-left: 4px solid #f59e0b;
-      padding: 18px 20px;
-      border-radius: 12px;
-      color: #92400e;
-      font-size: 14px;
-      line-height: 1.6;
-      box-shadow: 0 1px 3px rgba(0,0,0,0.1);
-    }
-    .footer {
-      text-align: center;
-      padding: 28px 24px;
-      background: linear-gradient(135deg, #f9fafb 0%, #f3f4f6 100%);
-      color: #9ca3af;
-      font-size: 13px;
-      border-top: 1px solid rgba(0,0,0,0.05);
-    }
-    .footer strong {
-      background: linear-gradient(135deg, #8b5cf6 0%, #ec4899 100%);
-      -webkit-background-clip: text;
-      -webkit-text-fill-color: transparent;
-      background-clip: text;
-      font-weight: 600;
-    }
-  </style>
+    <meta charset="utf-8">
+    <style>
+        body { font-family: Arial, sans-serif; line-height: 1.6; color: #333; }
+        .container { max-width: 600px; margin: 0 auto; padding: 20px; }
+        .header { background: linear-gradient(135deg, #f093fb 0%, #f5576c 100%); color: white; padding: 20px; border-radius: 8px 8px 0 0; }
+        .content { background: #f9f9f9; padding: 20px; border-radius: 0 0 8px 8px; }
+        .alert { background: #fff3cd; border-left: 4px solid #ffc107; padding: 15px; margin: 10px 0; }
+        .info { background: white; padding: 15px; margin: 10px 0; }
+        .footer { text-align: center; margin-top: 20px; color: #666; font-size: 12px; }
+    </style>
 </head>
 <body>
-  <div class="container">
-    <div class="header">
-      <div class="header-content">
-        <div class="icon">⚠️</div>
-        <h2>机器人离线告警</h2>
-        <p>您的 LLBot 实例已离线</p>
-      </div>
-    </div>
-    <div class="content">
-      <div class="info-card">
-        <div class="info-item">
-          <span class="label">机器人账号</span>
-          <span class="value">${botInfo.uin} (${botInfo.nick})</span>
+    <div class="container">
+        <div class="header">
+            <h2>⚠️ LLBot 掉线通知</h2>
         </div>
-        <div class="info-item">
-          <span class="label">离线时间</span>
-          <span class="value">${timestamp}</span>
+        <div class="content">
+            <div class="alert">
+                <p><strong>⚠️ QQ 已掉线</strong></p>
+            </div>
+            <div class="info">
+                <p><strong>账号信息:</strong> ${displayName}</p>
+                <p><strong>掉线时间:</strong> ${timestamp}</p>
+            </div>
+            <p>您的 QQ 机器人已掉线，请及时检查并重新登录。</p>
+            ${reasonSection}
         </div>
-        <div class="info-item">
-          <span class="label">离线原因</span>
-          <span class="value">${reasonText}</span>
+        <div class="footer">
+            <p>此邮件由 LLBot 自动发送，请勿回复</p>
         </div>
-      </div>
-      <div class="alert-message">
-        💡 请检查机器人状态和日志以获取更多信息，确保服务正常运行。
-      </div>
-    </div>
-    <div class="footer">
-      Powered by <strong>LLBot</strong> · Lucky Lillia Bot
     </div>
-  </div>
 </body>
 </html>
     `.trim();
     return { subject, html };
   }
   formatTestEmail(timestamp) {
-    const subject = "【LLBot】测试邮件";
+    const subject = "LLBot 邮件通知测试";
     const html = `
 <!DOCTYPE html>
 <html>
 <head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <style>
-    * { margin: 0; padding: 0; box-sizing: border-box; }
-    body { 
-      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Microsoft YaHei", Arial, sans-serif;
-      background: linear-gradient(135deg, #8b5cf6 0%, #ec4899 100%);
-      padding: 40px 20px;
-      line-height: 1.6;
-    }
-    .container { 
-      max-width: 600px; 
-      margin: 0 auto; 
-      background: white;
-      border-radius: 20px;
-      overflow: hidden;
-      box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.25);
-    }
-    .header { 
-      background: linear-gradient(135deg, #10b981 0%, #14b8a6 100%);
-      color: white; 
-      padding: 40px 32px;
-      text-align: center;
-      position: relative;
-    }
-    .header::before {
-      content: '';
-      position: absolute;
-      top: 0;
-      left: 0;
-      right: 0;
-      bottom: 0;
-      background: radial-gradient(circle at 30% 50%, rgba(255,255,255,0.1) 0%, transparent 50%);
-    }
-    .header-content {
-      position: relative;
-      z-index: 1;
-    }
-    .icon {
-      font-size: 56px;
-      margin-bottom: 16px;
-      filter: drop-shadow(0 4px 6px rgba(0,0,0,0.1));
-    }
-    .header h2 {
-      font-size: 28px;
-      font-weight: 700;
-      margin-bottom: 8px;
-      letter-spacing: -0.5px;
-    }
-    .header p {
-      font-size: 15px;
-      opacity: 0.95;
-      font-weight: 500;
-    }
-    .content { 
-      padding: 36px 32px;
-    }
-    .success-card {
-      background: linear-gradient(135deg, #d1fae5 0%, #a7f3d0 100%);
-      border-radius: 16px;
-      padding: 28px;
-      margin-bottom: 24px;
-      text-align: center;
-      border: 1px solid rgba(16, 185, 129, 0.2);
-      box-shadow: 0 1px 3px rgba(0,0,0,0.1);
-    }
-    .success-card p {
-      color: #065f46;
-      font-size: 17px;
-      margin: 10px 0;
-      font-weight: 500;
-    }
-    .success-card .subtitle {
-      font-size: 14px;
-      margin-top: 12px;
-      opacity: 0.8;
-      font-weight: 400;
-    }
-    .info-box {
-      background: linear-gradient(135deg, #f3f4f6 0%, #e5e7eb 100%);
-      border-radius: 12px;
-      padding: 20px;
-      margin-top: 24px;
-      border: 1px solid rgba(0,0,0,0.05);
-    }
-    .info-box .label {
-      font-weight: 600;
-      color: #374151;
-      margin-bottom: 6px;
-      font-size: 13px;
-      text-transform: uppercase;
-      letter-spacing: 0.5px;
-    }
-    .info-box .value {
-      color: #6b7280;
-      font-size: 15px;
-    }
-    .footer {
-      text-align: center;
-      padding: 28px 24px;
-      background: linear-gradient(135deg, #f9fafb 0%, #f3f4f6 100%);
-      color: #9ca3af;
-      font-size: 13px;
-      border-top: 1px solid rgba(0,0,0,0.05);
-    }
-    .footer strong {
-      background: linear-gradient(135deg, #8b5cf6 0%, #ec4899 100%);
-      -webkit-background-clip: text;
-      -webkit-text-fill-color: transparent;
-      background-clip: text;
-      font-weight: 600;
-    }
-  </style>
+    <meta charset="utf-8">
+    <style>
+        body { font-family: Arial, sans-serif; line-height: 1.6; color: #333; }
+        .container { max-width: 600px; margin: 0 auto; padding: 20px; }
+        .header { background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); color: white; padding: 20px; border-radius: 8px 8px 0 0; }
+        .content { background: #f9f9f9; padding: 20px; border-radius: 0 0 8px 8px; }
+        .info { background: white; padding: 15px; border-left: 4px solid #667eea; margin: 10px 0; }
+        .footer { text-align: center; margin-top: 20px; color: #666; font-size: 12px; }
+    </style>
 </head>
 <body>
-  <div class="container">
-    <div class="header">
-      <div class="header-content">
-        <div class="icon">✅</div>
-        <h2>测试邮件</h2>
-        <p>LLBot 邮件通知系统</p>
-      </div>
-    </div>
-    <div class="content">
-      <div class="success-card">
-        <p>🎉 恭喜！邮件配置测试成功</p>
-        <p class="subtitle">如果您收到此邮件，说明您的邮件配置已正确设置。</p>
-      </div>
-      <div class="info-box">
-        <div class="label">发送时间</div>
-        <div class="value">${timestamp}</div>
-      </div>
-    </div>
-    <div class="footer">
-      Powered by <strong>LLBot</strong> · Lucky Lillia Bot
+    <div class="container">
+        <div class="header">
+            <h2>🎉 LLBot 邮件通知测试</h2>
+        </div>
+        <div class="content">
+            <p>您好！</p>
+            <p>这是一封来自 <strong>LLBot</strong> 的测试邮件。</p>
+            <div class="info">
+                <p><strong>📧 邮件配置测试成功</strong></p>
+                <p>发送时间: ${timestamp}</p>
+            </div>
+            <p>如果您收到这封邮件，说明邮件通知功能已正常工作。</p>
+            <p>当 QQ 掉线时，系统将自动向您发送通知邮件。</p>
+        </div>
+        <div class="footer">
+            <p>此邮件由 LLBot 自动发送，请勿回复</p>
+        </div>
     </div>
-  </div>
 </body>
 </html>
     `.trim();
@@ -82043,12 +81887,14 @@ class EmailConfigManager {
   }
 }
 class EmailNotificationService extends Service2 {
+  static inject = ["logger"];
   emailService;
   configManager;
   notificationSent = false;
   hasLoggedIn = false;
   configPath;
   fileWatcher = null;
+  pmhqDisconnectId = null;
   constructor(ctx) {
     super(ctx, "emailNotification", true);
     this.configPath = path__default.join(DATA_DIR, "email_config.json");
@@ -82057,6 +81903,7 @@ class EmailNotificationService extends Service2 {
     this.initializeConfig();
     this.registerEventListeners();
     this.watchConfigFile();
+    this.registerPmhqDisconnectCallback();
   }
   async initializeConfig() {
     try {
@@ -82072,7 +81919,7 @@ class EmailNotificationService extends Service2 {
     let wasOffline = false;
     this.ctx.on("nt/kicked-offLine", (info) => {
       wasOffline = true;
-      this.onOffline(info);
+      this.onOffline(info.tipsDesc || info.tipsTitle);
     });
     const checkLoginStatus = setInterval(() => {
       if (wasOffline && selfInfo.online) {
@@ -82086,6 +81933,9 @@ class EmailNotificationService extends Service2 {
       if (this.fileWatcher) {
         this.fileWatcher.close();
       }
+      if (this.pmhqDisconnectId) {
+        pmhq.offDisconnect(this.pmhqDisconnectId);
+      }
     });
   }
   watchConfigFile() {
@@ -82102,7 +81952,16 @@ class EmailNotificationService extends Service2 {
       this.ctx.logger.error("[EmailNotification] Failed to watch config file:", error2);
     }
   }
-  onOffline(info) {
+  registerPmhqDisconnectCallback() {
+    this.pmhqDisconnectId = pmhq.onDisconnect(6e4, (duration2) => {
+      if (!this.notificationSent && this.hasLoggedIn) {
+        this.ctx.logger.warn(`[EmailNotification] PMHQ disconnected for ${duration2}ms`);
+        this.onOffline("可能 QQ 已经有点死了");
+      }
+    });
+    this.ctx.logger.info(`[EmailNotification] Registered PMHQ disconnect callback with ID: ${this.pmhqDisconnectId}`);
+  }
+  onOffline(reason) {
     if (!this.hasLoggedIn) {
       this.ctx.logger.debug("[EmailNotification] Offline event before login, ignoring");
       return;
@@ -82112,7 +81971,7 @@ class EmailNotificationService extends Service2 {
       return;
     }
     this.ctx.logger.info("[EmailNotification] Bot went offline, sending notification");
-    this.sendOfflineNotification(info.tipsDesc || info.tipsTitle);
+    this.sendOfflineNotification(reason);
   }
   async sendOfflineNotification(reason) {
     try {
@@ -82257,9 +82116,9 @@ try {
 }
 export {
   Action as A,
-  Media as M,
+  Msg as M,
   Notify as N,
   Oidb as O,
-  Msg as a
+  Media as a
 };
 //# sourceMappingURL=llbot.js.map