llonebot-dist 7.10.0 → 7.10.1

package/llbot.js

@@ -1,6 +1,6 @@
 import * as path from "node:path";
 import path__default, { resolve, dirname } from "node:path";
-import fsPromise, { writeFile, stat, unlink, copyFile, readFile, access, mkdir } from "node:fs/promises";
+import fsPromise, { writeFile, stat, unlink, mkdir, copyFile, readFile, access } from "node:fs/promises";
 import require$$0$9, { existsSync as existsSync$1 } from "fs";
 import require$$0$6 from "util";
 import require$$0$5 from "stream";
@@ -5895,6 +5895,24 @@ var require_index$1 = __commonJS$1({
     }, "Schema");
     Schema.prototype = Object.create(Function.prototype);
     Schema.prototype[kSchema] = true;
+    Object.defineProperty(Schema.prototype, "~standard", {
+      get() {
+        return {
+          version: 1,
+          vendor: "schemastery",
+          validate: /* @__PURE__ */ __name$8((value) => {
+            try {
+              return { value: Schema.resolve(value, this, {})[0] };
+            } catch (error2) {
+              if (ValidationError.is(error2)) {
+                return { issues: [{ message: error2.message, path: error2.options.path }] };
+              }
+              throw error2;
+            }
+          }, "validate")
+        };
+      }
+    });
     Schema.ValidationError = ValidationError;
     Schema.prototype.toJSON = /* @__PURE__ */ __name$8(function toJSON() {
       if (globalThis.__schemastery_refs__) {
@@ -9197,6 +9215,9 @@ function extractOrientation(exifBlock, isBigEndian) {
       return;
     }
     const block = exifBlock.slice(start, end);
+    if (block.length < IDF_ENTRY_BYTES) {
+      return;
+    }
     const tagNumber = readUInt(block, 16, 0, isBigEndian);
     if (tagNumber === 274) {
       const dataFormat = readUInt(block, 16, 2, isBigEndian);
@@ -10397,7 +10418,7 @@ function isNumeric(str) {
 }
 function calcQQLevel(level) {
   const { penguinNum, crownNum, sunNum, moonNum, starNum } = level;
-  return (penguinNum || 0) * 256 + crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum;
+  return (penguinNum ?? 0) * 256 + crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum;
 }
 function mergeNewProperties(newObj, oldObj) {
   Object.keys(newObj).forEach((key2) => {
@@ -11797,7 +11818,7 @@ class WebUITokenUtil {
 }
 const webuiTokenUtil = new WebUITokenUtil(path__default.join(DATA_DIR, "webui_token.txt"));
 const logFileName = `llbot-${(/* @__PURE__ */ new Date()).toLocaleString("zh-CN")}.log`.replace(/\//g, "-").replace(/:/g, "-");
-const version$3 = "7.10.0";
+const version$3 = "7.10.1";
 var utils$4 = { exports: {} };
 var windows;
 var hasRequiredWindows;
@@ -16045,7 +16066,7 @@ function UserMixin(Base) {
       });
       const res = await this.httpSendPB("MQUpdateSvc_com_qq_ti.web.OidbSvc.0xdef_1", body);
       const { json: json2 } = Action.FetchUserLoginDaysResp.decode(Buffer.from(res.pb, "hex"));
-      return JSON.parse(json2).msg_rsp_basic_info.rpt_msg_basic_info.find((e) => e.uint64_uin === uin)?.uint32_login_days || 0;
+      return JSON.parse(json2).msg_rsp_basic_info.rpt_msg_basic_info.find((e) => e.uint64_uin === uin)?.uint32_login_days ?? 0;
     }
   };
 }
@@ -16852,9 +16873,10 @@ class OB11GroupRequestAddEvent extends OB11BaseNoticeEvent {
   post_type = EventType.REQUEST;
   request_type = "group";
   sub_type;
+  group_id;
+  user_id;
   comment;
   flag;
-  group_id;
   // 当有 invitor_id 时表示有邀请人
   invitor_id;
   // https://github.com/Mrs4s/go-cqhttp/blob/master/coolq/event.go#L566
@@ -16873,18 +16895,20 @@ class OB11GroupRequestInviteBotEvent extends OB11BaseNoticeEvent {
   request_type = "group";
   sub_type;
   // invite 为邀请 bot 进群
-  comment;
-  flag;
   group_id;
   user_id;
   // 当 sub_type 为 invite 的时候， user_id 为邀请人的 QQ 号
-  constructor(groupId, userId, flag, comment) {
+  comment;
+  flag;
+  source_group_id;
+  constructor(groupId, userId, flag, comment, sourceGroupId) {
     super();
     this.group_id = groupId;
     this.user_id = userId;
     this.comment = comment;
     this.flag = flag;
     this.sub_type = "invite";
+    this.source_group_id = sourceGroupId;
   }
 }
 var OB11Entities;
@@ -17363,7 +17387,7 @@ var OB11Entities;
           id: element.fileElement.fileUuid,
           name: element.fileElement.fileName,
           size: +element.fileElement.fileSize,
-          busid: element.fileElement.fileBizId || 0
+          busid: element.fileElement.fileBizId ?? 0
         });
       } else if (element.grayTipElement) {
         const grayTipElement = element.grayTipElement;
@@ -33587,6 +33611,7 @@ var SendElement;
     }
     const thumbDir = path__default.dirname(path2.replaceAll("\\", "/").replace(`/Ori/`, `/Thumb/`));
     const thumbFilePath = path__default.join(thumbDir, `${md5}_0.png`);
+    await mkdir(thumbDir, { recursive: true });
     if (diyThumbPath) {
       await copyFile(diyThumbPath, thumbFilePath);
     } else {
@@ -33874,8 +33899,8 @@ async function createSendElements(ctx, messageData, peer, ignoreTypes = []) {
           const res = await SendElement.pic(
             ctx,
             (await handleOb11RichMedia(ctx, segment, deleteAfterSentFiles)).path,
-            segment.data.summary || "",
-            segment.data.subType || 0,
+            segment.data.summary ?? "",
+            Number(segment.data.subType) || 0,
             segment.data.type === "flash"
           );
           deleteAfterSentFiles.push(res.picElement.sourcePath);
@@ -34615,6 +34640,7 @@ var ActionName = /* @__PURE__ */ ((ActionName2) => {
   ActionName2["SetGroupMsgMask"] = "set_group_msg_mask";
   ActionName2["SetGroupRemark"] = "set_group_remark";
   ActionName2["MoveGroupFile"] = "move_group_file";
+  ActionName2["RenameGroupFile"] = "rename_group_file";
   ActionName2["SetGroupFileForever"] = "set_group_file_forever";
   ActionName2["GetGroupShutList"] = "get_group_shut_list";
   ActionName2["RenameGroupFileFolder"] = "rename_group_file_folder";
@@ -36683,11 +36709,7 @@ class GetProfileLikeMe extends BaseAction {
     }
     const users = ret.info.userLikeInfos[0].voteInfo.userInfos;
     for (const item of users) {
-      try {
-        item.uin = Number(await this.ctx.ntUserApi.getUinByUid(item.uid)) || 0;
-      } catch (e) {
-        item.uin = 0;
-      }
+      item.uin = Number(await this.ctx.ntUserApi.getUinByUid(item.uid));
     }
     return { users, nextStart: ret.info.start };
   }
@@ -37249,11 +37271,7 @@ class GetProfileLike extends BaseAction {
     }
     const users = ret.info.userLikeInfos[0].favoriteInfo.userInfos;
     for (const item of users) {
-      try {
-        item.uin = Number(await this.ctx.ntUserApi.getUinByUid(item.uid)) || 0;
-      } catch (e) {
-        item.uin = 0;
-      }
+      item.uin = Number(await this.ctx.ntUserApi.getUinByUid(item.uid));
     }
     return { users, nextStart: ret.info.start };
   }
@@ -37306,6 +37324,23 @@ let MoveGroupFile$1 = class MoveGroupFile extends BaseAction {
     return null;
   }
 };
+let RenameGroupFile$1 = class RenameGroupFile extends BaseAction {
+  actionName = ActionName.RenameGroupFile;
+  payloadSchema = z$2.object({
+    group_id: z$2.union([Number, String]).required(),
+    file_id: z$2.string().required(),
+    current_parent_directory: z$2.string().required(),
+    new_name: z$2.string().required()
+  });
+  async _handle(payload) {
+    const groupId = payload.group_id.toString();
+    const res = await this.ctx.ntGroupApi.renameGroupFile(groupId, payload.file_id, payload.current_parent_directory, payload.new_name);
+    if (res.renameGroupFileResult.result.retCode !== 0) {
+      throw new Error(res.renameGroupFileResult.result.clientWording);
+    }
+    return null;
+  }
+};
 class GetGroupShutList extends BaseAction {
   actionName = ActionName.GetGroupShutList;
   payloadSchema = z$2.object({
@@ -37858,6 +37893,7 @@ function initActionMap(adapter) {
     new SetGroupMsgMask(adapter),
     new SetGroupRemark(adapter),
     new MoveGroupFile$1(adapter),
+    new RenameGroupFile$1(adapter),
     new GetGroupShutList(adapter),
     new RenameGroupFileFolder(adapter),
     new GetRecommendFace(adapter),
@@ -38092,10 +38128,14 @@ class OneBot11Adapter extends Service2 {
     this.config = config2;
     this.actionMap = initActionMap(this);
     this.reportOfflineMessage = false;
+    this.reportSelfMessage = false;
     this.connect = config2.connect.map((item) => {
       if (item.reportOfflineMessage) {
         this.reportOfflineMessage = true;
       }
+      if (item.reportSelfMessage) {
+        this.reportSelfMessage = true;
+      }
       if (item.type === "http") {
         return new OB11Http(ctx, {
           ...item,
@@ -38133,6 +38173,7 @@ class OneBot11Adapter extends Service2 {
   connect;
   actionMap;
   reportOfflineMessage;
+  reportSelfMessage;
   dispatch(event) {
     for (const item of this.connect) {
       item.emitEvent(event);
@@ -38151,7 +38192,7 @@ class OneBot11Adapter extends Service2 {
         const requestUin = await this.ctx.ntUserApi.getUinByUid(notify.user1.uid);
         const event = new OB11GroupRequestAddEvent(
           +notify.group.groupCode,
-          +requestUin || 0,
+          +requestUin,
           flag,
           notify.postscript
         );
@@ -38162,9 +38203,10 @@ class OneBot11Adapter extends Service2 {
         this.ctx.logger.info("收到邀请我加群通知, 邀请人uin:", userId);
         const event = new OB11GroupRequestInviteBotEvent(
           +notify.group.groupCode,
-          +userId || 0,
+          +userId,
           flag,
-          notify.postscript
+          notify.postscript,
+          +notify.invitationExt.groupCode
         );
         this.dispatch(event);
       } else if (notify.type === GroupNotifyType.InvitedNeedAdminiStratorPass && notify.status === GroupNotifyStatus.Unhandle) {
@@ -38173,10 +38215,10 @@ class OneBot11Adapter extends Service2 {
         const invitorId = await this.ctx.ntUserApi.getUinByUid(notify.user2.uid);
         const event = new OB11GroupRequestAddEvent(
           +notify.group.groupCode,
-          +userId || 0,
+          +userId,
           flag,
           notify.postscript,
-          +invitorId || 0
+          +invitorId
         );
         this.dispatch(event);
       }
@@ -38188,6 +38230,9 @@ class OneBot11Adapter extends Service2 {
     if (offline && !this.reportOfflineMessage) {
       return;
     }
+    if (self2 && !this.reportSelfMessage) {
+      return;
+    }
     OB11Entities.message(this.ctx, message).then((msg) => {
       if (!msg) {
         return;
@@ -38281,10 +38326,14 @@ class OneBot11Adapter extends Service2 {
     }
     if (config2.ob11.enable) {
       this.reportOfflineMessage = false;
+      this.reportSelfMessage = false;
       this.connect = config2.ob11.connect.map((item) => {
         if (item.reportOfflineMessage) {
           this.reportOfflineMessage = true;
         }
+        if (item.reportSelfMessage) {
+          this.reportSelfMessage = true;
+        }
         if (item.type === "http") {
           return new OB11Http(this.ctx, {
             ...item,
@@ -54892,7 +54941,8 @@ const GroupInvitedJoinRequestEvent = object({
 const GroupInvitationEvent = object({
   group_id: ZUin.describe("群号"),
   invitation_seq: ZInt64.describe("邀请序列号"),
-  initiator_id: ZUin.describe("邀请者 QQ 号")
+  initiator_id: ZUin.describe("邀请者 QQ 号"),
+  source_group_id: ZUin.nullish().describe("来源群号，如果是通过 QQ 群邀请")
 });
 const FriendNudgeEvent = object({
   user_id: ZUin.describe("好友 QQ 号"),
@@ -55094,7 +55144,7 @@ discriminatedUnion("event_type", [
     data: GroupFileUploadEvent
   }).describe("群文件上传事件")
 ]).describe("事件");
-var version$1 = "1.2.0-rc.2";
+var version$1 = "1.2.0-rc.3";
 const milkyPackageVersion = version$1;
 const milkyVersion = milkyPackageVersion.split(".").slice(0, 2).join(".");
 const CachedApiBase = object({ no_cache: ZBooleanWithDefault(false).describe("是否强制不使用缓存") });
@@ -55849,7 +55899,7 @@ async function transformOutgoingMessage(ctx, segments2, peerUid, isGroup = false
           peerUid,
           guildId: ""
         };
-        const source2 = await ctx.ntMsgApi.getMsgsBySeqAndCount(peer, replyMsgSeq, 1, true, true);
+        const source2 = await ctx.ntMsgApi.getSingleMsg(peer, replyMsgSeq);
         if (source2.msgList.length === 0) {
           throw new Error("被回复的消息未找到");
         }
@@ -56567,6 +56617,7 @@ function normalizeProcessEntities(value) {
       maxExpansionDepth: 10,
       maxTotalExpansions: 1e3,
       maxExpandedLength: 1e5,
+      maxEntityCount: 100,
       allowedTags: null,
       tagFilter: null
     };
@@ -56579,6 +56630,7 @@ function normalizeProcessEntities(value) {
       maxExpansionDepth: value.maxExpansionDepth ?? 10,
       maxTotalExpansions: value.maxTotalExpansions ?? 1e3,
       maxExpandedLength: value.maxExpandedLength ?? 1e5,
+      maxEntityCount: value.maxEntityCount ?? 100,
       allowedTags: value.allowedTags ?? null,
       tagFilter: value.tagFilter ?? null
     };
@@ -56629,6 +56681,7 @@ class DocTypeReader {
   }
   readDocType(xmlData, i) {
     const entities = /* @__PURE__ */ Object.create(null);
+    let entityCount = 0;
     if (xmlData[i + 3] === "O" && xmlData[i + 4] === "C" && xmlData[i + 5] === "T" && xmlData[i + 6] === "Y" && xmlData[i + 7] === "P" && xmlData[i + 8] === "E") {
       i = i + 9;
       let angleBracketsCount = 1;
@@ -56641,11 +56694,17 @@ class DocTypeReader {
             let entityName, val;
             [entityName, val, i] = this.readEntityExp(xmlData, i + 1, this.suppressValidationErr);
             if (val.indexOf("&") === -1) {
+              if (this.options.enabled !== false && this.options.maxEntityCount && entityCount >= this.options.maxEntityCount) {
+                throw new Error(
+                  `Entity count (${entityCount + 1}) exceeds maximum allowed (${this.options.maxEntityCount})`
+                );
+              }
               const escaped = entityName.replace(/[.\-+*:]/g, "\\.");
               entities[entityName] = {
                 regx: RegExp(`&${escaped};`, "g"),
                 val
               };
+              entityCount++;
             }
           } else if (hasBody && hasSeq(xmlData, "!ELEMENT", i)) {
             i += 8;
@@ -59187,7 +59246,7 @@ const MoveGroupFile2 = defineApi(
     return Ok({});
   }
 );
-const RenameGroupFile = defineApi(
+const RenameGroupFile2 = defineApi(
   "rename_group_file",
   RenameGroupFileInput,
   z.object({}),
@@ -59274,7 +59333,7 @@ const FileApi = [
   GetGroupFileDownloadUrl,
   GetGroupFiles,
   MoveGroupFile2,
-  RenameGroupFile,
+  RenameGroupFile2,
   DeleteGroupFile2,
   CreateGroupFolder,
   RenameGroupFolder,
@@ -59400,7 +59459,8 @@ async function transformGroupNotify(ctx, notify, doubt) {
         data: {
           group_id: Number(notify.group.groupCode),
           invitation_seq: Number(notify.seq),
-          initiator_id: Number(await ctx.ntUserApi.getUinByUid(notify.user2.uid))
+          initiator_id: Number(await ctx.ntUserApi.getUinByUid(notify.user2.uid)),
+          source_group_id: Number(notify.invitationExt.groupCode)
         }
       };
     } else {
@@ -72308,7 +72368,9 @@ function requireRemoveUploadedFiles() {
           errors2.push(err);
         }
         if (idx < length - 1) {
-          handleFile(idx + 1);
+          setImmediate(function() {
+            handleFile(idx + 1);
+          });
         } else {
           cb(null, errors2);
         }
@@ -72356,6 +72418,12 @@ function requireMakeMiddleware() {
       var pendingWrites = new Counter();
       var uploadedFiles = [];
       function done(err) {
+        var called = false;
+        function onFinished2() {
+          if (called) return;
+          called = true;
+          next(err);
+        }
         if (isDone) return;
         isDone = true;
         if (busboy) {
@@ -72366,15 +72434,21 @@ function requireMakeMiddleware() {
         }
         drainStream(req);
         req.resume();
+        if (err && req.readable && !req.destroyed) {
+          req.once("end", onFinished2);
+          req.once("error", onFinished2);
+          req.once("close", onFinished2);
+          return;
+        }
         next(err);
       }
       function indicateDone() {
         if (readFinished && pendingWrites.isZero() && !errorOccured) done();
       }
-      function abortWithError(uploadError) {
+      function abortWithError(uploadError, skipPendingWait) {
         if (errorOccured) return;
         errorOccured = true;
-        pendingWrites.onceZero(function() {
+        function finishAbort() {
           function remove2(file2, cb) {
             storage._removeFile(req, file2, cb);
           }
@@ -72383,15 +72457,23 @@ function requireMakeMiddleware() {
             uploadError.storageErrors = storageErrors;
             done(uploadError);
           });
-        });
+        }
+        if (skipPendingWait) {
+          finishAbort();
+        } else {
+          pendingWrites.onceZero(finishAbort);
+        }
       }
       function abortWithCode(code, optionalField) {
         abortWithError(new MulterError(code, optionalField));
       }
       function handleRequestFailure(err) {
         if (isDone) return;
-        if (busboy) busboy.destroy(err);
-        abortWithError(err);
+        if (busboy) {
+          req.unpipe(busboy);
+          busboy.destroy(err);
+        }
+        abortWithError(err, true);
       }
       req.on("error", function(err) {
         handleRequestFailure(err || new Error("Request error"));
@@ -76098,6 +76180,13 @@ function serializeResult(result) {
   }
   return result;
 }
+function isDockerEnvironment() {
+  try {
+    return existsSync$1("/.dockerenv");
+  } catch {
+    return false;
+  }
+}
 function isListenAllInterfaces(host) {
   return !host || host === "0.0.0.0" || host === "::";
 }
@@ -76123,16 +76212,19 @@ function createConfigRoutes(ctx) {
   const router2 = expressExports.Router();
   router2.get("/network-interfaces", (req, res) => {
     try {
+      const isDocker = isDockerEnvironment();
       const interfaces = networkInterfaces();
       const addresses = [];
-      for (const name2 in interfaces) {
-        for (const iface of interfaces[name2] || []) {
-          if (iface.family === "IPv4" && !iface.internal) {
-            addresses.push(iface.address);
+      if (!isDocker) {
+        for (const name2 in interfaces) {
+          for (const iface of interfaces[name2] || []) {
+            if (iface.family === "IPv4" && !iface.internal) {
+              addresses.push(iface.address);
+            }
           }
         }
       }
-      res.json({ success: true, data: addresses });
+      res.json({ success: true, data: addresses, isDocker });
     } catch (e) {
       res.status(500).json({ success: false, message: "获取网卡列表失败", error: e });
     }
@@ -77468,7 +77560,7 @@ function requireCookies() {
   return cookies;
 }
 const name = "nodemailer";
-const version = "8.0.1";
+const version = "8.0.2";
 const homepage = "https://nodemailer.com/";
 const require$$10 = {
   name,
@@ -81686,6 +81778,14 @@ function requireAddressparser() {
         parsedAddresses = parsedAddresses.concat(address2);
       }
     });
+    for (let i = parsedAddresses.length - 2; i >= 0; i--) {
+      let current = parsedAddresses[i];
+      let next = parsedAddresses[i + 1];
+      if (current.address === "" && current.name && !current.group && next.address && next.name && !next.group) {
+        next.name = current.name + ", " + next.name;
+        parsedAddresses.splice(i, 1);
+      }
+    }
     if (options.flatten) {
       let addresses2 = [];
       let walkAddressList = (list) => {
@@ -88833,7 +88933,7 @@ class EmailNotificationService extends Service2 {
     }
   }
   registerPmhqDisconnectCallback() {
-    this.pmhqDisconnectId = pmhq.onDisconnect(6e4, (duration2) => {
+    this.pmhqDisconnectId = pmhq.onDisconnect(1e4, (duration2) => {
       if (!this.notificationSent && this.hasLoggedIn) {
         this.ctx.logger.warn(`[EmailNotification] PMHQ disconnected for ${duration2}ms`);
         this.onOffline("可能 QQ 已经有点死了");
@@ -88881,13 +88981,6 @@ class EmailNotificationService extends Service2 {
     return this.configManager;
   }
 }
-function isDockerEnvironment() {
-  try {
-    return existsSync$1("/.dockerenv");
-  } catch {
-    return false;
-  }
-}
 process.on("uncaughtException", (err) => {
   console.error("[uncaughtException]", err?.message || err);
 });