llonebot-dist 7.9.3 → 7.10.0

package/llbot.js

@@ -11797,7 +11797,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.9.3";
+const version$3 = "7.10.0";
 var utils$4 = { exports: {} };
 var windows;
 var hasRequiredWindows;
@@ -16506,26 +16506,18 @@ class Core extends Service2 {
       sentMsgIds.set(payload.msgId, true);
     });
     const groupNotifyIgnore = [];
-    registerReceiveHook(ReceiveCmdS.UNREAD_GROUP_NOTIFY, async (payload) => {
-      const [doubt, oldestUnreadSeq, unreadCount] = payload;
-      if (unreadCount) {
-        let notifies;
-        try {
-          notifies = (await this.ctx.ntGroupApi.getSingleScreenNotifies(doubt, unreadCount)).notifies;
-        } catch (e) {
-          return;
+    registerReceiveHook("nodeIKernelGroupListener/onGroupNotifiesUpdated", async (payload) => {
+      const [doubt, notifies] = payload;
+      for (const notify of notifies) {
+        const notifyTime = Math.trunc(+notify.seq / 1e3 / 1e3);
+        if (groupNotifyIgnore.includes(notify.seq) || notifyTime < this.startupTime) {
+          continue;
         }
-        for (const notify of notifies) {
-          const notifyTime = Math.trunc(+notify.seq / 1e3 / 1e3);
-          if (groupNotifyIgnore.includes(notify.seq) || notifyTime < this.startupTime) {
-            continue;
-          }
-          groupNotifyIgnore.push(notify.seq);
-          if (groupNotifyIgnore.length > 1e3) {
-            groupNotifyIgnore.shift();
-          }
-          this.ctx.parallel("nt/group-notify", { notify, doubt });
+        groupNotifyIgnore.push(notify.seq);
+        if (groupNotifyIgnore.length > 1e3) {
+          groupNotifyIgnore.shift();
         }
+        this.ctx.parallel("nt/group-notify", { notify, doubt });
       }
     });
     registerReceiveHook(ReceiveCmdS.FRIEND_REQUEST, (payload) => {
@@ -17522,16 +17514,17 @@ var OB11Entities;
 })(OB11Entities || (OB11Entities = {}));
 class OB11FriendRequestEvent extends OB11BaseNoticeEvent {
   post_type = EventType.REQUEST;
+  request_type = "friend";
   user_id;
-  request_type;
   comment;
   flag;
-  constructor(userId, comment, flag, requestType = "friend") {
+  via;
+  constructor(userId, comment, flag, via) {
     super();
     this.user_id = userId;
     this.comment = comment;
     this.flag = flag;
-    this.request_type = requestType;
+    this.via = via;
   }
 }
 class OB11Response {
@@ -38270,19 +38263,13 @@ class OneBot11Adapter extends Service2 {
     }).catch((e) => this.ctx.logger.error("handling recall events", e));
   }
   async handleFriendRequest(req) {
-    let userId = 0;
-    try {
-      const requesterUin = await this.ctx.ntUserApi.getUinByUid(req.friendUid);
-      userId = +requesterUin;
-    } catch (e) {
-      this.ctx.logger.error("获取加好友者QQ号失败", e);
-    }
+    const uin = await this.ctx.ntUserApi.getUinByUid(req.friendUid);
     const flag = req.friendUid + "|" + req.reqTime;
-    const comment = req.extWords;
     const friendRequestEvent = new OB11FriendRequestEvent(
-      userId,
-      comment,
-      flag
+      +uin,
+      req.extWords,
+      flag,
+      req.addSource ?? ""
     );
     this.dispatch(friendRequestEvent);
   }
@@ -38554,7 +38541,7 @@ class OneBot11Adapter extends Service2 {
           if (msgType === 732 && subType === 16) {
             const notify = Msg.NotifyMessageBody.decode(pushMsg.message.body.msgContent.subarray(7));
             if (notify.field13 === 35) {
-              this.ctx.logger.info("群表情回应", notify.reaction.data.body);
+              this.ctx.logger.info("群表情回应", notify.groupCode, notify.reaction.data.body);
               const info = notify.reaction.data.body.info;
               const target = notify.reaction.data.body.target;
               const userId = Number(await this.ctx.ntUserApi.getUinByUid(info.operatorUid));
@@ -39048,6 +39035,7 @@ var require_index = __commonJS({
       Element2.at = createFactory("at", "id");
       Element2.sharp = createFactory("sharp", "id");
       Element2.quote = createFactory("quote", "id");
+      Element2.emoji = createFactory("emoji", "id");
       Element2.image = createAssetFactory("img");
       Element2.img = createAssetFactory("img");
       Element2.video = createAssetFactory("video");
@@ -39085,10 +39073,10 @@ var Methods = {
   "message.delete": Method("deleteMessage", ["channel_id", "message_id"]),
   "message.get": Method("getMessage", ["channel_id", "message_id"]),
   "message.list": Method("getMessageList", ["channel_id", "next", "direction", "limit", "order"]),
-  "reaction.create": Method("createReaction", ["channel_id", "message_id", "emoji"]),
-  "reaction.delete": Method("deleteReaction", ["channel_id", "message_id", "emoji", "user_id"]),
-  "reaction.clear": Method("clearReaction", ["channel_id", "message_id", "emoji"]),
-  "reaction.list": Method("getReactionList", ["channel_id", "message_id", "emoji", "next"]),
+  "reaction.create": Method("createReaction", ["channel_id", "message_id", "emoji_id"]),
+  "reaction.delete": Method("deleteReaction", ["channel_id", "message_id", "emoji_id", "user_id"]),
+  "reaction.clear": Method("clearReaction", ["channel_id", "message_id", "emoji_id"]),
+  "reaction.list": Method("getReactionList", ["channel_id", "message_id", "emoji_id", "next"]),
   "upload.create": Method("createUpload", [], true),
   "guild.get": Method("getGuild", ["guild_id"]),
   "guild.list": Method("getGuildList", ["next"]),
@@ -39244,13 +39232,34 @@ const createDirectChannel = async (ctx, payload) => {
     type: Channel.Type.DIRECT
   };
 };
+const robotUinRanges = [
+  {
+    minUin: "3328144510",
+    maxUin: "3328144510"
+  },
+  {
+    minUin: "2854196301",
+    maxUin: "2854216399"
+  },
+  {
+    minUin: "66600000",
+    maxUin: "66600000"
+  },
+  {
+    minUin: "3889000000",
+    maxUin: "3889999999"
+  },
+  {
+    minUin: "4010000000",
+    maxUin: "4019999999"
+  }
+];
 function decodeUser(user) {
   return {
     id: user.uin,
     name: user.nick,
-    nick: user.remark || user.nick,
     avatar: `http://q.qlogo.cn/headimg_dl?dst_uin=${user.uin}&spec=640`,
-    is_bot: false
+    is_bot: robotUinRanges.some((e) => user.uin >= e.minUin && user.uin <= e.maxUin)
   };
 }
 function decodeGuildChannelId(data) {
@@ -39260,14 +39269,6 @@ function decodeGuildChannelId(data) {
     return [void 0, "private:" + data.peerUin];
   }
 }
-function decodeMessageUser(data) {
-  return {
-    id: data.senderUin,
-    name: data.sendNickName,
-    nick: data.sendRemarkName || data.sendNickName,
-    avatar: `http://q.qlogo.cn/headimg_dl?dst_uin=${data.senderUin}&spec=640`
-  };
-}
 async function decodeElement(ctx, data, quoted = false) {
   const buffer2 = [];
   for (const v of data.elements) {
@@ -39369,15 +39370,20 @@ async function decodeMessage(ctx, data, message = {}) {
     name: data.peerName,
     type: guildId ? Channel.Type.TEXT : Channel.Type.DIRECT
   };
-  message.user = decodeMessageUser(data);
+  message.user = {
+    id: data.senderUin,
+    name: data.sendNickName,
+    avatar: `http://q.qlogo.cn/headimg_dl?dst_uin=${data.senderUin}&spec=640`,
+    is_bot: robotUinRanges.some((e) => data.senderUin >= e.minUin && data.senderUin <= e.maxUin)
+  };
   message.created_at = +data.msgTime * 1e3;
   if (!message.user.name) {
-    const info = (await ctx.ntUserApi.getUserSimpleInfo(data.senderUid)).coreInfo;
-    message.user.name = info.nick;
-    message.user.nick = info.remark || info.nick;
-    if (message.channel.type === Channel.Type.DIRECT) {
-      message.channel.name = info.nick;
-    }
+    const { coreInfo } = await ctx.ntUserApi.getUserSimpleInfo(data.senderUid);
+    message.user.name = coreInfo.nick;
+  }
+  if (!message.channel.name && message.channel.type === Channel.Type.DIRECT) {
+    const { coreInfo } = await ctx.ntUserApi.getUserSimpleInfo(data.peerUid);
+    message.channel.name = coreInfo.nick;
   }
   if (guildId) {
     message.guild = {
@@ -39387,20 +39393,25 @@ async function decodeMessage(ctx, data, message = {}) {
     };
     message.member = {
       user: message.user,
-      nick: data.sendMemberName || message.user.name
+      nick: data.sendMemberName
     };
   }
   return message;
 }
 function decodeGuildMember(data) {
   return {
-    user: {
-      ...decodeUser(data),
-      is_bot: data.isRobot
-    },
+    user: decodeUser(data),
     nick: data.cardName || data.nick,
     avatar: `http://q.qlogo.cn/headimg_dl?dst_uin=${data.uin}&spec=640`,
-    joined_at: data.joinTime * 1e3
+    joined_at: data.joinTime * 1e3,
+    roles: [{
+      id: data.role.toString(),
+      name: {
+        4: "owner",
+        3: "admin",
+        2: "member"
+      }[data.role]
+    }]
   };
 }
 function decodeGuild(data) {
@@ -39891,7 +39902,7 @@ const createReaction = async (ctx, payload) => {
   if (!msgList.length) {
     throw new Error("无法获取该消息");
   }
-  const res = await ctx.ntMsgApi.setEmojiLike(peer, msgList[0].msgSeq, payload.emoji, true);
+  const res = await ctx.ntMsgApi.setEmojiLike(peer, msgList[0].msgSeq, payload.emoji_id, true);
   if (res.result !== 0) {
     throw new Error(res.errMsg);
   }
@@ -39903,8 +39914,7 @@ const deleteReaction = async (ctx, payload) => {
   if (!msgList.length) {
     throw new Error("无法获取该消息");
   }
-  await ctx.ntMsgApi.setEmojiLike(peer, msgList[0].msgSeq, payload.emoji, false);
-  const res = await ctx.ntMsgApi.setEmojiLike(peer, msgList[0].msgSeq, payload.emoji, false);
+  const res = await ctx.ntMsgApi.setEmojiLike(peer, msgList[0].msgSeq, payload.emoji_id, false);
   if (res.result !== 0) {
     throw new Error(res.errMsg);
   }
@@ -39916,8 +39926,8 @@ const getReactionList = async (ctx, payload) => {
   if (!msgList.length) {
     throw new Error("无法获取该消息");
   }
-  const count = msgList[0].emojiLikesList.find((e) => e.emojiId === payload.emoji)?.likesCnt ?? "50";
-  const data = await ctx.ntMsgApi.getMsgEmojiLikesList(peer, msgList[0].msgSeq, payload.emoji, +count);
+  const count = msgList[0].emojiLikesList.find((e) => e.emojiId === payload.emoji_id)?.likesCnt ?? "50";
+  const data = await ctx.ntMsgApi.getMsgEmojiLikesList(peer, msgList[0].msgSeq, payload.emoji_id, +count);
   if (data.result !== 0) {
     throw new Error(data.errMsg);
   }
@@ -39964,19 +39974,15 @@ const getUser = async (ctx, payload) => {
   const uid = await ctx.ntUserApi.getUidByUin(uin);
   if (!uid) throw new Error("无法获取用户信息");
   const data = await ctx.ntUserApi.getUserSimpleInfo(uid, true);
-  const range2 = await ctx.ntUserApi.getRobotUinRange();
-  if (range2.result !== 0) {
-    throw new Error(range2.errMsg);
-  }
-  return {
-    ...decodeUser(data.coreInfo),
-    is_bot: range2.response.robotUinRanges.some((e) => uin >= e.minUin && uin <= e.maxUin)
-  };
+  return decodeUser(data.coreInfo);
 };
 const getFriendList = async (ctx) => {
   const friends = await ctx.ntFriendApi.getBuddyList();
   return {
-    data: friends.map((e) => decodeUser(e.coreInfo))
+    data: friends.map((e) => ({
+      user: decodeUser(e.coreInfo),
+      nick: e.coreInfo.remark
+    }))
   };
 };
 const handleFriendRequest = async (ctx, payload) => {
@@ -39992,6 +39998,15 @@ const handleFriendRequest = async (ctx, payload) => {
   }
   return {};
 };
+const deleteFriend = async (ctx, payload) => {
+  const uid = await ctx.ntUserApi.getUidByUin(payload.user_id);
+  if (!uid) throw new Error("无法获取用户信息");
+  const res = await ctx.ntFriendApi.delBuddy(uid);
+  if (res.result !== 0) {
+    throw new Error(res.errMsg);
+  }
+  return {};
+};
 const handlers = {
   // 频道 (Channel)
   getChannel,
@@ -40026,8 +40041,10 @@ const handlers = {
   getGuildRoleList,
   // 用户 (User)
   getUser,
+  // 好友 (Friend)
   getFriendList,
-  handleFriendRequest
+  handleFriendRequest,
+  deleteFriend
 };
 class SatoriServer {
   constructor(ctx, config2) {
@@ -40243,7 +40260,7 @@ async function parseGuildRequest(bot, notify) {
     }
   });
 }
-async function parseGuildMemberAdded(bot, input, isBot = false) {
+async function parseGuildMemberAdded(bot, input) {
   const groupAll = await bot.ctx.ntGroupApi.getGroupAllInfo(input.peerUid);
   let memberUid;
   if (input.elements[0].grayTipElement?.groupElement) {
@@ -40260,13 +40277,12 @@ async function parseGuildMemberAdded(bot, input, isBot = false) {
   }
   if (!memberUid) return;
   const user = decodeUser((await bot.ctx.ntUserApi.getUserSimpleInfo(memberUid)).coreInfo);
-  user.is_bot = isBot;
   return bot.event("guild-member-added", {
     guild: decodeGuild(groupAll),
     user,
     member: {
       user,
-      nick: user.name
+      nick: ""
     }
   });
 }
@@ -40277,7 +40293,7 @@ async function parseGuildMemberRemoved(bot, input) {
     user,
     member: {
       user,
-      nick: user.name
+      nick: ""
     }
   });
 }
@@ -40303,7 +40319,7 @@ async function parseFriendRequest(bot, input) {
     }
   });
 }
-async function parseReactionAdded(bot, input, time2) {
+async function parseReactionAdded(bot, input) {
   const { info, target } = input.reaction.data.body;
   const peer = {
     chatType: ChatType.Group,
@@ -40319,9 +40335,7 @@ async function parseReactionAdded(bot, input, time2) {
   const groupAll = await bot.ctx.ntGroupApi.getGroupAllInfo(input.groupCode.toString());
   return bot.event("reaction-added", {
     message: {
-      id: targetMsg.msgList[0].msgId,
-      content: info.code,
-      timestamp: time2 * 1e3
+      id: targetMsg.msgList[0].msgId
     },
     user: decodeUser(user.coreInfo),
     channel: {
@@ -40329,10 +40343,13 @@ async function parseReactionAdded(bot, input, time2) {
       name: groupAll.groupName,
       type: Channel.Type.TEXT
     },
-    guild: decodeGuild(groupAll)
+    guild: decodeGuild(groupAll),
+    emoji: {
+      id: info.code
+    }
   });
 }
-async function parseReactionRemoved(bot, input, time2) {
+async function parseReactionRemoved(bot, input) {
   const { info, target } = input.reaction.data.body;
   const peer = {
     chatType: ChatType.Group,
@@ -40348,9 +40365,7 @@ async function parseReactionRemoved(bot, input, time2) {
   const groupAll = await bot.ctx.ntGroupApi.getGroupAllInfo(input.groupCode.toString());
   return bot.event("reaction-removed", {
     message: {
-      id: targetMsg.msgList[0].msgId,
-      content: info.code,
-      timestamp: time2 * 1e3
+      id: targetMsg.msgList[0].msgId
     },
     user: decodeUser(user.coreInfo),
     channel: {
@@ -40358,7 +40373,10 @@ async function parseReactionRemoved(bot, input, time2) {
       name: groupAll.groupName,
       type: Channel.Type.TEXT
     },
-    guild: decodeGuild(groupAll)
+    guild: decodeGuild(groupAll),
+    emoji: {
+      id: info.code
+    }
   });
 }
 class SatoriAdapter extends Service2 {
@@ -40399,7 +40417,7 @@ class SatoriAdapter extends Service2 {
     } else if (input.msgType === 5 && input.subMsgType === 12 && input.elements[0]?.grayTipElement?.xmlElement?.templId === "10179") {
       return await parseGuildMemberAdded(this, input);
     } else if (input.msgType === 5 && input.subMsgType === 12 && input.elements[0]?.grayTipElement?.jsonGrayTipElement?.busiId === "19217") {
-      return await parseGuildMemberAdded(this, input, true);
+      return await parseGuildMemberAdded(this, input);
     } else if (input.msgType === 5 && input.subMsgType === 12 && input.elements[0]?.grayTipElement?.xmlElement?.templId === "10382") ;
     else {
       return await parseMessageCreated(this, input);
@@ -40471,17 +40489,17 @@ class SatoriAdapter extends Service2 {
         if (!pushMsg.message.body) {
           return;
         }
-        const { msgTime, msgType, subType } = pushMsg.message.contentHead;
+        const { msgType, subType } = pushMsg.message.contentHead;
         if (msgType === 732 && subType === 16) {
           const notify = Msg.NotifyMessageBody.decode(pushMsg.message.body.msgContent.subarray(7));
           if (notify.field13 === 35) {
             if (notify.reaction.data.body.info.actionType === 1) {
-              const event = await parseReactionAdded(this, notify, msgTime).catch((e) => this.ctx.logger.error(e));
+              const event = await parseReactionAdded(this, notify).catch((e) => this.ctx.logger.error(e));
               if (event) {
                 this.server.dispatch(event);
               }
             } else {
-              const event = await parseReactionRemoved(this, notify, msgTime).catch((e) => this.ctx.logger.error(e));
+              const event = await parseReactionRemoved(this, notify).catch((e) => this.ctx.logger.error(e));
               if (event) {
                 this.server.dispatch(event);
               }
@@ -56426,7 +56444,7 @@ function validateAttributeString(attrStr, options) {
     if (!validateAttrName(attrName)) {
       return getErrorObject("InvalidAttr", "Attribute '" + attrName + "' is an invalid name.", getPositionFromMatch(matches[i]));
     }
-    if (!attrNames.hasOwnProperty(attrName)) {
+    if (!Object.prototype.hasOwnProperty.call(attrNames, attrName)) {
       attrNames[attrName] = 1;
     } else {
       return getErrorObject("InvalidAttr", "Attribute '" + attrName + "' is repeated.", getPositionFromMatch(matches[i]));
@@ -56536,7 +56554,9 @@ const defaultOptions = {
     return tagName;
   },
   // skipEmptyListItem: false
-  captureMetaData: false
+  captureMetaData: false,
+  maxNestedTags: 100,
+  strictReservedNames: true
 };
 function normalizeProcessEntities(value) {
   if (typeof value === "boolean") {
@@ -56580,7 +56600,7 @@ class XmlNode {
   constructor(tagname) {
     this.tagname = tagname;
     this.child = [];
-    this[":@"] = {};
+    this[":@"] = /* @__PURE__ */ Object.create(null);
   }
   add(key2, val) {
     if (key2 === "__proto__") key2 = "#__proto__";
@@ -56608,7 +56628,7 @@ class DocTypeReader {
     this.options = options;
   }
   readDocType(xmlData, i) {
-    const entities = {};
+    const entities = /* @__PURE__ */ Object.create(null);
     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;
@@ -56877,8 +56897,10 @@ const consider = {
   // oct: false,
   leadingZeros: true,
   decimalPoint: ".",
-  eNotation: true
-  //skipLike: /regex/
+  eNotation: true,
+  //skipLike: /regex/,
+  infinity: "original"
+  // "null", "infinity" (Infinity type), "string" ("Infinity" (the string literal))
 };
 function toNumber(str, options = {}) {
   options = Object.assign({}, consider, options);
@@ -56888,6 +56910,8 @@ function toNumber(str, options = {}) {
   else if (str === "0") return 0;
   else if (options.hex && hexRegex.test(trimmedStr)) {
     return parse_int(trimmedStr, 16);
+  } else if (!isFinite(trimmedStr)) {
+    return handleInfinity(str, Number(trimmedStr), options);
   } else if (trimmedStr.includes("e") || trimmedStr.includes("E")) {
     return resolveEnotation(str, trimmedStr, options);
   } else {
@@ -56966,6 +56990,21 @@ function parse_int(numStr, base) {
   else if (window && window.parseInt) return window.parseInt(numStr, base);
   else throw new Error("parseInt, Number.parseInt, window.parseInt are not supported");
 }
+function handleInfinity(str, num, options) {
+  const isPositive = num === Infinity;
+  switch (options.infinity.toLowerCase()) {
+    case "null":
+      return null;
+    case "infinity":
+      return num;
+    // Return Infinity or -Infinity
+    case "string":
+      return isPositive ? "Infinity" : "-Infinity";
+    case "original":
+    default:
+      return str;
+  }
+}
 function getIgnoreAttributesFn(ignoreAttributes) {
   if (typeof ignoreAttributes === "function") {
     return ignoreAttributes;
@@ -57236,6 +57275,9 @@ const parseXml = function(xmlData) {
           }
           tagName = newTagName;
         }
+        if (this.options.strictReservedNames && (tagName === this.options.commentPropName || tagName === this.options.cdataPropName)) {
+          throw new Error(`Invalid tag name: ${tagName}`);
+        }
         if (currentNode && textData) {
           if (currentNode.tagname !== "!xml") {
             textData = this.saveTextToParentTag(textData, currentNode, jPath, false);
@@ -57301,8 +57343,20 @@ const parseXml = function(xmlData) {
             }
             this.addChild(currentNode, childNode, jPath, startIndex);
             jPath = jPath.substr(0, jPath.lastIndexOf("."));
+          } else if (this.options.unpairedTags.indexOf(tagName) !== -1) {
+            const childNode = new XmlNode(tagName);
+            if (tagName !== tagExp && attrExpPresent) {
+              childNode[":@"] = this.buildAttributesMap(tagExp, jPath);
+            }
+            this.addChild(currentNode, childNode, jPath, startIndex);
+            jPath = jPath.substr(0, jPath.lastIndexOf("."));
+            i = result.closeIndex;
+            continue;
           } else {
             const childNode = new XmlNode(tagName);
+            if (this.tagsNodeStack.length > this.options.maxNestedTags) {
+              throw new Error("Maximum nested tags exceeded");
+            }
             this.tagsNodeStack.push(currentNode);
             if (tagName !== tagExp && attrExpPresent) {
               childNode[":@"] = this.buildAttributesMap(tagExp, jPath, tagName);
@@ -57386,19 +57440,19 @@ const replaceEntitiesValue = function(val, tagName, jPath) {
   val = val.replace(this.ampEntity.regex, this.ampEntity.val);
   return val;
 };
-function saveTextToParentTag(textData, currentNode, jPath, isLeafNode) {
+function saveTextToParentTag(textData, parentNode, jPath, isLeafNode) {
   if (textData) {
-    if (isLeafNode === void 0) isLeafNode = currentNode.child.length === 0;
+    if (isLeafNode === void 0) isLeafNode = parentNode.child.length === 0;
     textData = this.parseTextData(
       textData,
-      currentNode.tagname,
+      parentNode.tagname,
       jPath,
       false,
-      currentNode[":@"] ? Object.keys(currentNode[":@"]).length !== 0 : false,
+      parentNode[":@"] ? Object.keys(parentNode[":@"]).length !== 0 : false,
       isLeafNode
     );
     if (textData !== void 0 && textData !== "")
-      currentNode.add(this.options.textNodeName, textData);
+      parentNode.add(this.options.textNodeName, textData);
     textData = "";
   }
   return textData;
@@ -57556,9 +57610,6 @@ function compress(arr, options, jPath) {
     } else if (tagObj[property]) {
       let val = compress(tagObj[property], options, newJpath);
       const isLeaf = isLeafTag(val, options);
-      if (tagObj[METADATA_SYMBOL] !== void 0) {
-        val[METADATA_SYMBOL] = tagObj[METADATA_SYMBOL];
-      }
       if (tagObj[":@"]) {
         assignAttributes(val, tagObj[":@"], newJpath, options);
       } else if (Object.keys(val).length === 1 && val[options.textNodeName] !== void 0 && !options.alwaysCreateTextNode) {
@@ -57567,7 +57618,10 @@ function compress(arr, options, jPath) {
         if (options.alwaysCreateTextNode) val[options.textNodeName] = "";
         else val = "";
       }
-      if (compressedObj[property] !== void 0 && compressedObj.hasOwnProperty(property)) {
+      if (tagObj[METADATA_SYMBOL] !== void 0 && typeof val === "object" && val !== null) {
+        val[METADATA_SYMBOL] = tagObj[METADATA_SYMBOL];
+      }
+      if (compressedObj[property] !== void 0 && Object.prototype.hasOwnProperty.call(compressedObj, property)) {
         if (!Array.isArray(compressedObj[property])) {
           compressedObj[property] = [compressedObj[property]];
         }
@@ -58170,21 +58224,21 @@ const GetMessage = defineApi(
   async (ctx, payload) => {
     const peer = {
       chatType: {
-        friend: 1,
-        group: 2,
-        temp: 100
+        friend: ChatType.C2C,
+        group: ChatType.Group,
+        temp: ChatType.TempC2CFromGroup
       }[payload.message_scene],
       peerUid: payload.peer_id.toString(),
       guildId: ""
     };
-    if (peer.chatType === 1 || peer.chatType === 100) {
+    if (peer.chatType === ChatType.C2C || peer.chatType === ChatType.TempC2CFromGroup) {
       const uid = await ctx.ntUserApi.getUidByUin(peer.peerUid);
       if (!uid) {
         return Failed(-404, "User not found");
       }
       peer.peerUid = uid;
     }
-    const msgResult = await ctx.ntMsgApi.queryFirstMsgBySeq(peer, payload.message_seq.toString());
+    const msgResult = await ctx.ntMsgApi.getSingleMsg(peer, payload.message_seq.toString());
     if (msgResult.msgList.length === 0) {
       return Failed(-404, "Message not found");
     }
@@ -58431,21 +58485,6 @@ const GetFriendRequests = defineApi(
         requests: await Promise.all(buddyReqs.map(async (e) => {
           const friendId = Number(await ctx.ntUserApi.getUinByUid(e.friendUid));
           const selfId = Number(selfInfo.uin);
-          let via = "";
-          if (e.sourceId === 3020) {
-            via = "QQ号查找";
-          } else if (e.sourceId === 3004) {
-            const groupAll = await ctx.ntGroupApi.getGroupAllInfo(e.groupCode);
-            via = `QQ群-${groupAll.groupName}`;
-          } else if (e.sourceId === 3014) {
-            via = "手机号码查找";
-          } else if (e.sourceId === 3999) {
-            via = "搜索好友";
-          } else if (e.sourceId === 3022) {
-            via = "推荐联系人";
-          } else if (e.sourceId > 10) {
-            ctx.logger.info(`via 获取失败, 请反馈, friendId: ${friendId}, sourceId: ${e.sourceId}`);
-          }
           return {
             time: Number(e.reqTime),
             initiator_id: e.isInitiator ? selfId : friendId,
@@ -58461,7 +58500,7 @@ const GetFriendRequests = defineApi(
               [BuddyReqType.MeRefused]: "rejected"
             }[e.reqType] ?? "pending",
             comment: e.extWords,
-            via,
+            via: e.addSource ?? "",
             is_filtered: e.isDoubt
           };
         }))
@@ -59321,26 +59360,11 @@ async function transformGroupMessageDeleted(ctx, message) {
 async function transformFriendRequestEvent(ctx, request2) {
   try {
     const initiatorId = Number(await ctx.ntUserApi.getUinByUid(request2.friendUid));
-    let via = "";
-    if (request2.sourceId === 3020) {
-      via = "QQ号查找";
-    } else if (request2.sourceId === 3004) {
-      const groupAll = await ctx.ntGroupApi.getGroupAllInfo(request2.groupCode);
-      via = `QQ群-${groupAll.groupName}`;
-    } else if (request2.sourceId === 3014) {
-      via = "手机号码查找";
-    } else if (request2.sourceId === 3999) {
-      via = "搜索好友";
-    } else if (request2.sourceId === 3022) {
-      via = "推荐联系人";
-    } else if (request2.sourceId > 10) {
-      ctx.logger.info(`via 获取失败, 请反馈, friendId: ${initiatorId}, sourceId: ${request2.sourceId}`);
-    }
     return {
       initiator_id: initiatorId,
       initiator_uid: request2.friendUid,
       comment: request2.extWords,
-      via
+      via: request2.addSource ?? ""
     };
   } catch (error2) {
     ctx.logger.error("Failed to transform friend request event:", error2);
@@ -72004,27 +72028,6 @@ function requireLib() {
   };
   return lib;
 }
-var immutable;
-var hasRequiredImmutable;
-function requireImmutable() {
-  if (hasRequiredImmutable) return immutable;
-  hasRequiredImmutable = 1;
-  immutable = extend2;
-  var hasOwnProperty = Object.prototype.hasOwnProperty;
-  function extend2() {
-    var target = {};
-    for (var i = 0; i < arguments.length; i++) {
-      var source2 = arguments[i];
-      for (var key2 in source2) {
-        if (hasOwnProperty.call(source2, key2)) {
-          target[key2] = source2[key2];
-        }
-      }
-    }
-    return target;
-  }
-  return immutable;
-}
 var parsePath_1;
 var hasRequiredParsePath;
 function requireParsePath() {
@@ -72214,7 +72217,6 @@ var hasRequiredFileAppender;
 function requireFileAppender() {
   if (hasRequiredFileAppender) return fileAppender;
   hasRequiredFileAppender = 1;
-  var objectAssign2 = requireObjectAssign();
   function arrayRemove(arr, item) {
     var idx = arr.indexOf(item);
     if (~idx) arr.splice(idx, 1);
@@ -72283,7 +72285,7 @@ function requireFileAppender() {
       return;
     }
     delete placeholder.fieldname;
-    objectAssign2(placeholder, file2);
+    Object.assign(placeholder, file2);
   };
   fileAppender = FileAppender;
   return fileAppender;
@@ -72324,7 +72326,6 @@ function requireMakeMiddleware() {
   hasRequiredMakeMiddleware = 1;
   var is2 = requireTypeIs();
   var Busboy = requireLib();
-  var extend2 = requireImmutable();
   var appendField = requireAppendField();
   var Counter = requireCounter();
   var MulterError = requireMulterError();
@@ -72345,17 +72346,10 @@ function requireMakeMiddleware() {
       var fileFilter = options.fileFilter;
       var fileStrategy = options.fileStrategy;
       var preservePath = options.preservePath;
+      var defParamCharset = options.defParamCharset;
       req.body = /* @__PURE__ */ Object.create(null);
-      req.on("error", function(err) {
-        abortWithError(err);
-      });
       var busboy;
-      try {
-        busboy = Busboy({ headers: req.headers, limits, preservePath });
-      } catch (err) {
-        return next(err);
-      }
-      var appender = new FileAppender(fileStrategy, req);
+      var appender = null;
       var isDone = false;
       var readFinished = false;
       var errorOccured = false;
@@ -72364,12 +72358,14 @@ function requireMakeMiddleware() {
       function done(err) {
         if (isDone) return;
         isDone = true;
-        req.unpipe(busboy);
+        if (busboy) {
+          req.unpipe(busboy);
+          setImmediate(() => {
+            busboy.removeAllListeners();
+          });
+        }
         drainStream(req);
         req.resume();
-        setImmediate(() => {
-          busboy.removeAllListeners();
-        });
         next(err);
       }
       function indicateDone() {
@@ -72392,6 +72388,32 @@ function requireMakeMiddleware() {
       function abortWithCode(code, optionalField) {
         abortWithError(new MulterError(code, optionalField));
       }
+      function handleRequestFailure(err) {
+        if (isDone) return;
+        if (busboy) busboy.destroy(err);
+        abortWithError(err);
+      }
+      req.on("error", function(err) {
+        handleRequestFailure(err || new Error("Request error"));
+      });
+      req.on("aborted", function() {
+        handleRequestFailure(new Error("Request aborted"));
+      });
+      req.on("close", function() {
+        if (req.readableEnded) return;
+        handleRequestFailure(new Error("Request closed"));
+      });
+      try {
+        busboy = Busboy({
+          headers: req.headers,
+          limits,
+          preservePath,
+          defParamCharset
+        });
+      } catch (err) {
+        return next(err);
+      }
+      appender = new FileAppender(fileStrategy, req);
       busboy.on("field", function(fieldname, value, { nameTruncated, valueTruncated }) {
         if (fieldname == null) return abortWithCode("MISSING_FIELD_NAME");
         if (nameTruncated) return abortWithCode("LIMIT_FIELD_KEY");
@@ -72422,6 +72444,10 @@ function requireMakeMiddleware() {
         };
         var placeholder = appender.insertPlaceholder(file2);
         fileFilter(req, file2, function(err, includeFile) {
+          if (errorOccured) {
+            appender.removePlaceholder(placeholder);
+            return fileStream.resume();
+          }
           if (err) {
             appender.removePlaceholder(placeholder);
             return abortWithError(err);
@@ -72445,7 +72471,7 @@ function requireMakeMiddleware() {
           storage._handleFile(req, file2, function(err2, info) {
             if (aborting) {
               appender.removePlaceholder(placeholder);
-              uploadedFiles.push(extend2(file2, info));
+              uploadedFiles.push({ ...file2, ...info });
               return pendingWrites.decrement();
             }
             if (err2) {
@@ -72453,7 +72479,7 @@ function requireMakeMiddleware() {
               pendingWrites.decrement();
               return abortWithError(err2);
             }
-            var fileInfo = extend2(file2, info);
+            var fileInfo = { ...file2, ...info };
             appender.replacePlaceholder(placeholder, fileInfo);
             uploadedFiles.push(fileInfo);
             pendingWrites.decrement();
@@ -72483,95 +72509,6 @@ function requireMakeMiddleware() {
   makeMiddleware_1 = makeMiddleware;
   return makeMiddleware_1;
 }
-var mkdirp;
-var hasRequiredMkdirp;
-function requireMkdirp() {
-  if (hasRequiredMkdirp) return mkdirp;
-  hasRequiredMkdirp = 1;
-  var path2 = path$1;
-  var fs2 = require$$0$9;
-  var _0777 = parseInt("0777", 8);
-  mkdirp = mkdirP.mkdirp = mkdirP.mkdirP = mkdirP;
-  function mkdirP(p, opts, f, made) {
-    if (typeof opts === "function") {
-      f = opts;
-      opts = {};
-    } else if (!opts || typeof opts !== "object") {
-      opts = { mode: opts };
-    }
-    var mode2 = opts.mode;
-    var xfs = opts.fs || fs2;
-    if (mode2 === void 0) {
-      mode2 = _0777;
-    }
-    if (!made) made = null;
-    var cb = f || /* istanbul ignore next */
-    function() {
-    };
-    p = path2.resolve(p);
-    xfs.mkdir(p, mode2, function(er) {
-      if (!er) {
-        made = made || p;
-        return cb(null, made);
-      }
-      switch (er.code) {
-        case "ENOENT":
-          if (path2.dirname(p) === p) return cb(er);
-          mkdirP(path2.dirname(p), opts, function(er2, made2) {
-            if (er2) cb(er2, made2);
-            else mkdirP(p, opts, cb, made2);
-          });
-          break;
-        // In the case of any other error, just see if there's a dir
-        // there already.  If so, then hooray!  If not, then something
-        // is borked.
-        default:
-          xfs.stat(p, function(er2, stat2) {
-            if (er2 || !stat2.isDirectory()) cb(er, made);
-            else cb(null, made);
-          });
-          break;
-      }
-    });
-  }
-  mkdirP.sync = function sync(p, opts, made) {
-    if (!opts || typeof opts !== "object") {
-      opts = { mode: opts };
-    }
-    var mode2 = opts.mode;
-    var xfs = opts.fs || fs2;
-    if (mode2 === void 0) {
-      mode2 = _0777;
-    }
-    if (!made) made = null;
-    p = path2.resolve(p);
-    try {
-      xfs.mkdirSync(p, mode2);
-      made = made || p;
-    } catch (err0) {
-      switch (err0.code) {
-        case "ENOENT":
-          made = sync(path2.dirname(p), opts, made);
-          sync(p, opts, made);
-          break;
-        // In the case of any other error, just see if there's a dir
-        // there already.  If so, then hooray!  If not, then something
-        // is borked.
-        default:
-          var stat2;
-          try {
-            stat2 = xfs.statSync(p);
-          } catch (err1) {
-            throw err0;
-          }
-          if (!stat2.isDirectory()) throw err0;
-          break;
-      }
-    }
-    return made;
-  };
-  return mkdirp;
-}
 var disk;
 var hasRequiredDisk;
 function requireDisk() {
@@ -72581,7 +72518,6 @@ function requireDisk() {
   var os2 = require$$1$2;
   var path2 = path$1;
   var crypto2 = require$$0$e;
-  var mkdirp2 = requireMkdirp();
   function getFilename(req, file2, cb) {
     crypto2.randomBytes(16, function(err, raw) {
       cb(err, err ? void 0 : raw.toString("hex"));
@@ -72593,7 +72529,7 @@ function requireDisk() {
   function DiskStorage(opts) {
     this.getFilename = opts.filename || getFilename;
     if (typeof opts.destination === "string") {
-      mkdirp2.sync(opts.destination);
+      fs2.mkdirSync(opts.destination, { recursive: true });
       this.getDestination = function($0, $1, cb) {
         cb(null, opts.destination);
       };
@@ -75972,6 +75908,7 @@ function requireMulter() {
     }
     this.limits = options.limits;
     this.preservePath = options.preservePath;
+    this.defParamCharset = options.defParamCharset || "latin1";
     this.fileFilter = options.fileFilter || allowAll;
   }
   Multer.prototype._makeMiddleware = function(fields, fileStrategy) {
@@ -75995,6 +75932,7 @@ function requireMulter() {
       return {
         limits: this.limits,
         preservePath: this.preservePath,
+        defParamCharset: this.defParamCharset,
         storage: this.storage,
         fileFilter: wrappedFileFilter,
         fileStrategy
@@ -76019,6 +75957,7 @@ function requireMulter() {
       return {
         limits: this.limits,
         preservePath: this.preservePath,
+        defParamCharset: this.defParamCharset,
         storage: this.storage,
         fileFilter: this.fileFilter,
         fileStrategy: "ARRAY"
@@ -76636,7 +76575,6 @@ function createProxyRoutes(ctx) {
         return;
       }
       let url2 = decodeURIComponent(urlParam);
-      ctx.logger.info("图片代理请求:", url2);
       let parsedUrl;
       try {
         parsedUrl = new URL(url2);
@@ -76657,7 +76595,6 @@ function createProxyRoutes(ctx) {
             const rkey = appid === "1406" ? rkeyData.private_rkey : rkeyData.group_rkey;
             if (rkey) {
               url2 = url2 + rkey;
-              ctx.logger.info("已添加 rkey 到图片 URL");
             }
           }
         } catch (e) {
@@ -77206,6 +77143,7 @@ data: ${JSON.stringify(serializedData)}
             const target = notify.reaction.data.body.target;
             const groupCode = String(notify.groupCode);
             const userId = await this.ctx.ntUserApi.getUinByUid(info.operatorUid);
+            const actionType = typeof info.actionType === "number" ? info.actionType : info.type;
             let userName = userId;
             try {
               const membersResult = await this.ctx.ntGroupApi.getGroupMembers(groupCode);
@@ -77227,7 +77165,7 @@ data: ${JSON.stringify(serializedData)}
                 emojiId: info.code,
                 userId,
                 userName,
-                isAdd: info.type === 1
+                isAdd: actionType === 1
               }
             });
           }