woodenfish-bot 4.7.1 → 4.7.3

package/es/index.js

@@ -11,7 +11,8 @@ import https from 'https';
 import _possibleConstructorReturn from '@babel/runtime/helpers/possibleConstructorReturn';
 import _getPrototypeOf from '@babel/runtime/helpers/getPrototypeOf';
 import _inherits from '@babel/runtime/helpers/inherits';
-import WebSocket, { EventEmitter } from 'ws';
+import WebSocket from 'ws';
+import { EventEmitter } from 'node:events';
 
 var versionMapping = Object.create(null);
 function register(version, api) {
@@ -70,6 +71,24 @@ var apiMap = {
   // 群组富媒体消息
   groupMessageURI: '/v2/groups/:groupOpenid/messages/:messageID',
   // 群组撤回消息
+  groupInfoURI: '/v2/groups/:groupOpenid/info',
+  // 群基本信息
+  groupBotStateURI: '/v2/groups/:groupOpenid/bot_state',
+  // 机器人群内状态
+  groupJoinRequestListURI: '/v2/groups/:groupOpenid/join_request_list',
+  // 入群申请列表
+  groupJoinRequestApprovalURI: '/v2/groups/:groupOpenid/approval_join_request/:memberOpenid',
+  // 入群申请审批
+  groupRestrictChatSettingURI: '/v2/groups/:groupOpenid/restrict_chat_setting',
+  // 群禁言状态及成员禁言
+  groupJoinApprovalStrategiesURI: '/v2/groups/join_approval_strategy',
+  // 入群自动审批策略列表及创建
+  groupJoinApprovalStrategyURI: '/v2/groups/join_approval_strategy/:strategyID',
+  // 入群自动审批策略
+  groupJoinApprovalStrategyExecuteURI: '/v2/groups/join_approval_strategy/:strategyID/execute',
+  // 执行入群自动审批策略
+  groupJoinApprovalStrategyWhitelistURI: '/v2/groups/join_approval_strategy/:strategyID/whitelist_users',
+  // 入群自动审批白名单
   c2cMessagesURI: '/v2/users/:userID/messages',
   // C2C消息
   c2cRichMediaURI: '/v2/users/:userID/files',
@@ -300,7 +319,7 @@ var Guild = /*#__PURE__*/function () {
   }]);
 }();
 
-var version = "4.7.1";
+var version = "4.7.3";
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -2127,6 +2146,164 @@ var Interaction = /*#__PURE__*/function () {
   }]);
 }();
 
+var Group = /*#__PURE__*/function () {
+  function Group(request, config) {
+    _classCallCheck(this, Group);
+    _defineProperty(this, "request", void 0);
+    _defineProperty(this, "config", void 0);
+    this.request = request;
+    this.config = config;
+  }
+  return _createClass(Group, [{
+    key: "getGroupInfo",
+    value: function getGroupInfo(groupOpenid) {
+      return this.request({
+        method: 'GET',
+        url: getURL('groupInfoURI'),
+        rest: {
+          groupOpenid: groupOpenid
+        },
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "getGroupBotState",
+    value: function getGroupBotState(groupOpenid) {
+      return this.request({
+        method: 'GET',
+        url: getURL('groupBotStateURI'),
+        rest: {
+          groupOpenid: groupOpenid
+        },
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "getGroupJoinRequests",
+    value: function getGroupJoinRequests(groupOpenid, pager) {
+      return this.request({
+        method: 'GET',
+        url: getURL('groupJoinRequestListURI'),
+        rest: {
+          groupOpenid: groupOpenid
+        },
+        params: pager || {},
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "approveGroupJoinRequest",
+    value: function approveGroupJoinRequest(groupOpenid, memberOpenid, options) {
+      return this.request({
+        method: 'POST',
+        url: getURL('groupJoinRequestApprovalURI'),
+        rest: {
+          groupOpenid: groupOpenid,
+          memberOpenid: memberOpenid
+        },
+        data: options,
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "getGroupRestrictChatSetting",
+    value: function getGroupRestrictChatSetting(groupOpenid) {
+      return this.request({
+        method: 'GET',
+        url: getURL('groupRestrictChatSettingURI'),
+        rest: {
+          groupOpenid: groupOpenid
+        },
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "setGroupRestrictChatSetting",
+    value: function setGroupRestrictChatSetting(groupOpenid, options) {
+      return this.request({
+        method: 'POST',
+        url: getURL('groupRestrictChatSettingURI'),
+        rest: {
+          groupOpenid: groupOpenid
+        },
+        data: options,
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "getGroupJoinApprovalStrategies",
+    value: function getGroupJoinApprovalStrategies(pager) {
+      return this.request({
+        method: 'GET',
+        url: getURL('groupJoinApprovalStrategiesURI'),
+        params: pager || {},
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "createGroupJoinApprovalStrategy",
+    value: function createGroupJoinApprovalStrategy(options) {
+      return this.request({
+        method: 'POST',
+        url: getURL('groupJoinApprovalStrategiesURI'),
+        data: options,
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "updateGroupJoinApprovalStrategy",
+    value: function updateGroupJoinApprovalStrategy(strategyID, options) {
+      return this.request({
+        method: 'PATCH',
+        url: getURL('groupJoinApprovalStrategyURI'),
+        rest: {
+          strategyID: strategyID
+        },
+        data: options,
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "deleteGroupJoinApprovalStrategy",
+    value: function deleteGroupJoinApprovalStrategy(strategyID) {
+      return this.request({
+        method: 'DELETE',
+        url: getURL('groupJoinApprovalStrategyURI'),
+        rest: {
+          strategyID: strategyID
+        },
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "executeGroupJoinApprovalStrategy",
+    value: function executeGroupJoinApprovalStrategy(strategyID) {
+      return this.request({
+        method: 'POST',
+        url: getURL('groupJoinApprovalStrategyExecuteURI'),
+        rest: {
+          strategyID: strategyID
+        },
+        data: {},
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "updateGroupJoinApprovalStrategyWhitelist",
+    value: function updateGroupJoinApprovalStrategyWhitelist(strategyID, options) {
+      return this.request({
+        method: 'POST',
+        url: getURL('groupJoinApprovalStrategyWhitelistURI'),
+        rest: {
+          strategyID: strategyID
+        },
+        data: options,
+        apiVersion: 'v2'
+      });
+    }
+  }]);
+}();
+
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var apiVersion = 'v2';
@@ -2154,6 +2331,7 @@ var OpenAPI = /*#__PURE__*/function () {
     _defineProperty(this, "interactionApi", void 0);
     _defineProperty(this, "pinsMessageApi", void 0);
     _defineProperty(this, "guildPermissionsApi", void 0);
+    _defineProperty(this, "groupApi", void 0);
     this.config = config;
     this.register(this);
   }
@@ -2178,6 +2356,7 @@ var OpenAPI = /*#__PURE__*/function () {
       client.reactionApi = new Reaction(this.request, this.config);
       client.interactionApi = new Interaction(this.request, this.config);
       client.pinsMessageApi = new PinsMessage(this.request, this.config);
+      client.groupApi = new Group(this.request, this.config);
     }
 
     // 基础rest请求
@@ -2314,7 +2493,8 @@ var AvailableIntentsEventsEnum = /*#__PURE__*/function (AvailableIntentsEventsEn
   AvailableIntentsEventsEnum["PUBLIC_GUILD_MESSAGES"] = "PUBLIC_GUILD_MESSAGES";
   AvailableIntentsEventsEnum["MESSAGE_AUDIT"] = "MESSAGE_AUDIT";
   AvailableIntentsEventsEnum["INTERACTION"] = "INTERACTION";
-  AvailableIntentsEventsEnum["GROUP_C2C_EVENT"] = "GROUP_C2C_EVENT";
+  AvailableIntentsEventsEnum["GROUP_MEMBER"] = "GROUP_MEMBER";
+  AvailableIntentsEventsEnum["GROUP_AND_C2C_EVENT"] = "GROUP_AND_C2C_EVENT";
   return AvailableIntentsEventsEnum;
 }({});
 
@@ -2426,28 +2606,36 @@ var WsEventType = {
   PUBLIC_MESSAGE_DELETE: AvailableIntentsEventsEnum.PUBLIC_GUILD_MESSAGES,
   // 当频道的消息被删除时
 
-  //  ======= GROUP_C2C_EVENT ======
-  GROUP_AT_MESSAGE_CREATE: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  //  ======= GROUP_AND_C2C_EVENT ======
+  GROUP_AT_MESSAGE_CREATE: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 机器人在群聊被@时触发
-  GROUP_MESSAGE_CREATE: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  GROUP_MESSAGE_CREATE: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 机器人收到群聊全量消息时触发
-  C2C_MESSAGE_CREATE: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  C2C_MESSAGE_CREATE: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 机器人收到C2C消息时触发
-  FRIEND_ADD: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  FRIEND_ADD: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 机器人被加好友时触发
-  FRIEND_DEL: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  FRIEND_DEL: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 机器人被删除好友时触发
-  C2C_MSG_RECEIVE: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  C2C_MSG_RECEIVE: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 用户在机器人资料卡手动开启"主动消息"推送
-  C2C_MSG_REJECT: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  C2C_MSG_REJECT: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 用户在机器人资料卡手动关闭"主动消息"推送
-  GROUP_ADD_ROBOT: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  GROUP_ADD_ROBOT: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 机器人被加入群聊时触发
-  GROUP_DEL_ROBOT: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  GROUP_DEL_ROBOT: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 机器人被移出群聊时触发
-  GROUP_MSG_RECEIVE: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  GROUP_MSG_RECEIVE: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 群管理员主动在机器人资料页操作开启通知
-  GROUP_MSG_REJECT: AvailableIntentsEventsEnum.GROUP_C2C_EVENT // 群管理员主动在机器人资料页操作关闭通知
+  GROUP_MSG_REJECT: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
+  // 群管理员主动在机器人资料页操作关闭通知
+  GROUP_JOIN_REQUEST: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
+  // 用户申请加群
+
+  //  ======= GROUP_MEMBER（兼容旧版群成员事件位） ======
+  GROUP_MEMBER_ADD: AvailableIntentsEventsEnum.GROUP_MEMBER,
+  // 群成员加入
+  GROUP_MEMBER_REMOVE: AvailableIntentsEventsEnum.GROUP_MEMBER // 群成员退出或被移出
 };
 var WSCodes = {
   1000: 'WS_CLOSE_REQUESTED',
@@ -2536,7 +2724,8 @@ var IntentEvents = {
   DIRECT_MESSAGE: 1 << 12,
   OPEN_FORUM_EVENT: 1 << 18,
   AUDIO_OR_LIVE_CHANNEL_MEMBER: 1 << 19,
-  GROUP_C2C_EVENT: 1 << 25,
+  GROUP_MEMBER: 1 << 24,
+  GROUP_AND_C2C_EVENT: 1 << 25,
   INTERACTION: 1 << 26,
   MESSAGE_AUDIT: 1 << 27,
   FORUM_EVENT: 1 << 28,
@@ -2563,7 +2752,8 @@ var Intents = {
   DIRECT_MESSAGE_TYPING: 14,
   OPEN_FORUM_EVENT: 18,
   AUDIO_OR_LIVE_CHANNEL_MEMBER: 19,
-  GROUP_C2C_EVENT: 25,
+  GROUP_MEMBER: 24,
+  GROUP_AND_C2C_EVENT: 25,
   INTERACTION: 26,
   MESSAGE_AUDIT: 27,
   FORUM_EVENT: 28,

package/lib/index.js

@@ -14,6 +14,7 @@ var _possibleConstructorReturn = require('@babel/runtime/helpers/possibleConstru
 var _getPrototypeOf = require('@babel/runtime/helpers/getPrototypeOf');
 var _inherits = require('@babel/runtime/helpers/inherits');
 var WebSocket = require('ws');
+var node_events = require('node:events');
 
 var versionMapping = Object.create(null);
 function register(version, api) {
@@ -72,6 +73,24 @@ var apiMap = {
   // 群组富媒体消息
   groupMessageURI: '/v2/groups/:groupOpenid/messages/:messageID',
   // 群组撤回消息
+  groupInfoURI: '/v2/groups/:groupOpenid/info',
+  // 群基本信息
+  groupBotStateURI: '/v2/groups/:groupOpenid/bot_state',
+  // 机器人群内状态
+  groupJoinRequestListURI: '/v2/groups/:groupOpenid/join_request_list',
+  // 入群申请列表
+  groupJoinRequestApprovalURI: '/v2/groups/:groupOpenid/approval_join_request/:memberOpenid',
+  // 入群申请审批
+  groupRestrictChatSettingURI: '/v2/groups/:groupOpenid/restrict_chat_setting',
+  // 群禁言状态及成员禁言
+  groupJoinApprovalStrategiesURI: '/v2/groups/join_approval_strategy',
+  // 入群自动审批策略列表及创建
+  groupJoinApprovalStrategyURI: '/v2/groups/join_approval_strategy/:strategyID',
+  // 入群自动审批策略
+  groupJoinApprovalStrategyExecuteURI: '/v2/groups/join_approval_strategy/:strategyID/execute',
+  // 执行入群自动审批策略
+  groupJoinApprovalStrategyWhitelistURI: '/v2/groups/join_approval_strategy/:strategyID/whitelist_users',
+  // 入群自动审批白名单
   c2cMessagesURI: '/v2/users/:userID/messages',
   // C2C消息
   c2cRichMediaURI: '/v2/users/:userID/files',
@@ -302,7 +321,7 @@ var Guild = /*#__PURE__*/function () {
   }]);
 }();
 
-var version = "4.7.1";
+var version = "4.7.3";
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -2129,6 +2148,164 @@ var Interaction = /*#__PURE__*/function () {
   }]);
 }();
 
+var Group = /*#__PURE__*/function () {
+  function Group(request, config) {
+    _classCallCheck(this, Group);
+    _defineProperty(this, "request", void 0);
+    _defineProperty(this, "config", void 0);
+    this.request = request;
+    this.config = config;
+  }
+  return _createClass(Group, [{
+    key: "getGroupInfo",
+    value: function getGroupInfo(groupOpenid) {
+      return this.request({
+        method: 'GET',
+        url: getURL('groupInfoURI'),
+        rest: {
+          groupOpenid: groupOpenid
+        },
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "getGroupBotState",
+    value: function getGroupBotState(groupOpenid) {
+      return this.request({
+        method: 'GET',
+        url: getURL('groupBotStateURI'),
+        rest: {
+          groupOpenid: groupOpenid
+        },
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "getGroupJoinRequests",
+    value: function getGroupJoinRequests(groupOpenid, pager) {
+      return this.request({
+        method: 'GET',
+        url: getURL('groupJoinRequestListURI'),
+        rest: {
+          groupOpenid: groupOpenid
+        },
+        params: pager || {},
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "approveGroupJoinRequest",
+    value: function approveGroupJoinRequest(groupOpenid, memberOpenid, options) {
+      return this.request({
+        method: 'POST',
+        url: getURL('groupJoinRequestApprovalURI'),
+        rest: {
+          groupOpenid: groupOpenid,
+          memberOpenid: memberOpenid
+        },
+        data: options,
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "getGroupRestrictChatSetting",
+    value: function getGroupRestrictChatSetting(groupOpenid) {
+      return this.request({
+        method: 'GET',
+        url: getURL('groupRestrictChatSettingURI'),
+        rest: {
+          groupOpenid: groupOpenid
+        },
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "setGroupRestrictChatSetting",
+    value: function setGroupRestrictChatSetting(groupOpenid, options) {
+      return this.request({
+        method: 'POST',
+        url: getURL('groupRestrictChatSettingURI'),
+        rest: {
+          groupOpenid: groupOpenid
+        },
+        data: options,
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "getGroupJoinApprovalStrategies",
+    value: function getGroupJoinApprovalStrategies(pager) {
+      return this.request({
+        method: 'GET',
+        url: getURL('groupJoinApprovalStrategiesURI'),
+        params: pager || {},
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "createGroupJoinApprovalStrategy",
+    value: function createGroupJoinApprovalStrategy(options) {
+      return this.request({
+        method: 'POST',
+        url: getURL('groupJoinApprovalStrategiesURI'),
+        data: options,
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "updateGroupJoinApprovalStrategy",
+    value: function updateGroupJoinApprovalStrategy(strategyID, options) {
+      return this.request({
+        method: 'PATCH',
+        url: getURL('groupJoinApprovalStrategyURI'),
+        rest: {
+          strategyID: strategyID
+        },
+        data: options,
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "deleteGroupJoinApprovalStrategy",
+    value: function deleteGroupJoinApprovalStrategy(strategyID) {
+      return this.request({
+        method: 'DELETE',
+        url: getURL('groupJoinApprovalStrategyURI'),
+        rest: {
+          strategyID: strategyID
+        },
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "executeGroupJoinApprovalStrategy",
+    value: function executeGroupJoinApprovalStrategy(strategyID) {
+      return this.request({
+        method: 'POST',
+        url: getURL('groupJoinApprovalStrategyExecuteURI'),
+        rest: {
+          strategyID: strategyID
+        },
+        data: {},
+        apiVersion: 'v2'
+      });
+    }
+  }, {
+    key: "updateGroupJoinApprovalStrategyWhitelist",
+    value: function updateGroupJoinApprovalStrategyWhitelist(strategyID, options) {
+      return this.request({
+        method: 'POST',
+        url: getURL('groupJoinApprovalStrategyWhitelistURI'),
+        rest: {
+          strategyID: strategyID
+        },
+        data: options,
+        apiVersion: 'v2'
+      });
+    }
+  }]);
+}();
+
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var apiVersion = 'v2';
@@ -2156,6 +2333,7 @@ var OpenAPI = /*#__PURE__*/function () {
     _defineProperty(this, "interactionApi", void 0);
     _defineProperty(this, "pinsMessageApi", void 0);
     _defineProperty(this, "guildPermissionsApi", void 0);
+    _defineProperty(this, "groupApi", void 0);
     this.config = config;
     this.register(this);
   }
@@ -2180,6 +2358,7 @@ var OpenAPI = /*#__PURE__*/function () {
       client.reactionApi = new Reaction(this.request, this.config);
       client.interactionApi = new Interaction(this.request, this.config);
       client.pinsMessageApi = new PinsMessage(this.request, this.config);
+      client.groupApi = new Group(this.request, this.config);
     }
 
     // 基础rest请求
@@ -2316,7 +2495,8 @@ var AvailableIntentsEventsEnum = /*#__PURE__*/function (AvailableIntentsEventsEn
   AvailableIntentsEventsEnum["PUBLIC_GUILD_MESSAGES"] = "PUBLIC_GUILD_MESSAGES";
   AvailableIntentsEventsEnum["MESSAGE_AUDIT"] = "MESSAGE_AUDIT";
   AvailableIntentsEventsEnum["INTERACTION"] = "INTERACTION";
-  AvailableIntentsEventsEnum["GROUP_C2C_EVENT"] = "GROUP_C2C_EVENT";
+  AvailableIntentsEventsEnum["GROUP_MEMBER"] = "GROUP_MEMBER";
+  AvailableIntentsEventsEnum["GROUP_AND_C2C_EVENT"] = "GROUP_AND_C2C_EVENT";
   return AvailableIntentsEventsEnum;
 }({});
 
@@ -2428,28 +2608,36 @@ var WsEventType = {
   PUBLIC_MESSAGE_DELETE: AvailableIntentsEventsEnum.PUBLIC_GUILD_MESSAGES,
   // 当频道的消息被删除时
 
-  //  ======= GROUP_C2C_EVENT ======
-  GROUP_AT_MESSAGE_CREATE: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  //  ======= GROUP_AND_C2C_EVENT ======
+  GROUP_AT_MESSAGE_CREATE: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 机器人在群聊被@时触发
-  GROUP_MESSAGE_CREATE: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  GROUP_MESSAGE_CREATE: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 机器人收到群聊全量消息时触发
-  C2C_MESSAGE_CREATE: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  C2C_MESSAGE_CREATE: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 机器人收到C2C消息时触发
-  FRIEND_ADD: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  FRIEND_ADD: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 机器人被加好友时触发
-  FRIEND_DEL: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  FRIEND_DEL: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 机器人被删除好友时触发
-  C2C_MSG_RECEIVE: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  C2C_MSG_RECEIVE: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 用户在机器人资料卡手动开启"主动消息"推送
-  C2C_MSG_REJECT: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  C2C_MSG_REJECT: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 用户在机器人资料卡手动关闭"主动消息"推送
-  GROUP_ADD_ROBOT: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  GROUP_ADD_ROBOT: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 机器人被加入群聊时触发
-  GROUP_DEL_ROBOT: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  GROUP_DEL_ROBOT: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 机器人被移出群聊时触发
-  GROUP_MSG_RECEIVE: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  GROUP_MSG_RECEIVE: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 群管理员主动在机器人资料页操作开启通知
-  GROUP_MSG_REJECT: AvailableIntentsEventsEnum.GROUP_C2C_EVENT // 群管理员主动在机器人资料页操作关闭通知
+  GROUP_MSG_REJECT: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
+  // 群管理员主动在机器人资料页操作关闭通知
+  GROUP_JOIN_REQUEST: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
+  // 用户申请加群
+
+  //  ======= GROUP_MEMBER（兼容旧版群成员事件位） ======
+  GROUP_MEMBER_ADD: AvailableIntentsEventsEnum.GROUP_MEMBER,
+  // 群成员加入
+  GROUP_MEMBER_REMOVE: AvailableIntentsEventsEnum.GROUP_MEMBER // 群成员退出或被移出
 };
 var WSCodes = {
   1000: 'WS_CLOSE_REQUESTED',
@@ -2538,7 +2726,8 @@ var IntentEvents = {
   DIRECT_MESSAGE: 1 << 12,
   OPEN_FORUM_EVENT: 1 << 18,
   AUDIO_OR_LIVE_CHANNEL_MEMBER: 1 << 19,
-  GROUP_C2C_EVENT: 1 << 25,
+  GROUP_MEMBER: 1 << 24,
+  GROUP_AND_C2C_EVENT: 1 << 25,
   INTERACTION: 1 << 26,
   MESSAGE_AUDIT: 1 << 27,
   FORUM_EVENT: 1 << 28,
@@ -2565,7 +2754,8 @@ var Intents = {
   DIRECT_MESSAGE_TYPING: 14,
   OPEN_FORUM_EVENT: 18,
   AUDIO_OR_LIVE_CHANNEL_MEMBER: 19,
-  GROUP_C2C_EVENT: 25,
+  GROUP_MEMBER: 24,
+  GROUP_AND_C2C_EVENT: 25,
   INTERACTION: 26,
   MESSAGE_AUDIT: 27,
   FORUM_EVENT: 28,
@@ -3057,7 +3247,7 @@ var WebsocketClient = /*#__PURE__*/function (_EventEmitter) {
       this.session.closeSession();
     }
   }]);
-}(WebSocket.EventEmitter);
+}(node_events.EventEmitter);
 
 // 注册v1接口
 v1Setup();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "woodenfish-bot",
-    "version": "4.7.1",
+    "version": "4.7.3",
     "description": "woodenfish-bot",
     "publishConfig": {
         "registry": "https://registry.npmjs.org/"
@@ -73,7 +73,6 @@
         "rimraf": "^6.1.3",
         "rollup": "^4.62.4",
         "rollup-plugin-dts": "^6.5.1",
-        "rollup-plugin-typescript-paths": "^1.5.0",
         "typescript": "^5.9.3"
     },
     "dependencies": {

package/typings/index.d.ts

@@ -1,11 +1,10 @@
 import { RestyResponse, RequestOptions } from 'resty-client';
-import WebSocket, { EventEmitter } from 'ws';
+import { EventEmitter } from 'node:events';
+import WebSocket from 'ws';
 
-interface wsResData {
+interface wsResData<T = any> {
     op: number;
-    d?: {
-        heartbeat_interval?: number;
-    };
+    d?: T;
     s: number;
     t: string;
     id?: string;
@@ -67,7 +66,8 @@ declare enum AvailableIntentsEventsEnum {
     PUBLIC_GUILD_MESSAGES = "PUBLIC_GUILD_MESSAGES",
     MESSAGE_AUDIT = "MESSAGE_AUDIT",
     INTERACTION = "INTERACTION",
-    GROUP_C2C_EVENT = "GROUP_C2C_EVENT"
+    GROUP_MEMBER = "GROUP_MEMBER",
+    GROUP_AND_C2C_EVENT = "GROUP_AND_C2C_EVENT"
 }
 declare const WsEventType: {
     [key: string]: AvailableIntentsEventsEnum;
@@ -124,7 +124,8 @@ declare const Intents: {
     DIRECT_MESSAGE_TYPING: number;
     OPEN_FORUM_EVENT: number;
     AUDIO_OR_LIVE_CHANNEL_MEMBER: number;
-    GROUP_C2C_EVENT: number;
+    GROUP_MEMBER: number;
+    GROUP_AND_C2C_EVENT: number;
     INTERACTION: number;
     MESSAGE_AUDIT: number;
     FORUM_EVENT: number;
@@ -155,6 +156,202 @@ declare const WsObjRequestOptions: (sandbox: boolean) => {
     };
 };
 
+interface GroupAPI {
+    getGroupInfo: (groupOpenid: string) => Promise<RestyResponse<GroupInfo>>;
+    getGroupBotState: (groupOpenid: string) => Promise<RestyResponse<GroupBotState>>;
+    getGroupJoinRequests: (groupOpenid: string, pager?: GroupCursorPager) => Promise<RestyResponse<GroupJoinRequestList>>;
+    approveGroupJoinRequest: (groupOpenid: string, memberOpenid: string, options: GroupJoinRequestApproval) => Promise<RestyResponse<Record<string, never>>>;
+    getGroupRestrictChatSetting: (groupOpenid: string) => Promise<RestyResponse<GroupRestrictChatSetting>>;
+    setGroupRestrictChatSetting: (groupOpenid: string, options: SetGroupRestrictChatSetting) => Promise<RestyResponse<Record<string, never>>>;
+    getGroupJoinApprovalStrategies: (pager?: GroupCursorPager) => Promise<RestyResponse<GroupJoinApprovalStrategyList>>;
+    createGroupJoinApprovalStrategy: (options: CreateGroupJoinApprovalStrategy) => Promise<RestyResponse<GroupJoinApprovalStrategyResult>>;
+    updateGroupJoinApprovalStrategy: (strategyID: string, options: UpdateGroupJoinApprovalStrategy) => Promise<RestyResponse<GroupJoinApprovalStrategyResult>>;
+    deleteGroupJoinApprovalStrategy: (strategyID: string) => Promise<RestyResponse<Record<string, never>>>;
+    executeGroupJoinApprovalStrategy: (strategyID: string) => Promise<RestyResponse<Record<string, never>>>;
+    updateGroupJoinApprovalStrategyWhitelist: (strategyID: string, options: UpdateGroupJoinApprovalStrategyWhitelist) => Promise<RestyResponse<GroupJoinApprovalStrategyWhitelistResult>>;
+}
+interface GroupInfo {
+    group_openid: string;
+    group_name: string;
+    group_finger_memo: string;
+    group_class_text: string;
+    group_tags: string[];
+    group_member_num: number;
+}
+type GroupReceiveMessageSetting = 'all' | 'only_mention' | 'mention_and_context';
+type GroupMemberRole = 'member' | 'owner' | 'admin';
+interface GroupBotState {
+    member_openid: string;
+    joined_at: string;
+    allow_proactive_msg: boolean;
+    recv_msg_setting: GroupReceiveMessageSetting;
+    member_role: GroupMemberRole;
+}
+interface GroupCursorPager {
+    cursor?: string;
+    limit?: number;
+}
+interface GroupJoinRequestList {
+    list: GroupJoinRequest[];
+    next_cursor: string;
+}
+type GroupJoinApplySource = 'self_apply' | 'invited';
+type GroupJoinVerifyMethod = 'verify_message' | 'admin_review_qa';
+interface GroupJoinReviewQA {
+    question: string;
+    answer: string;
+}
+interface GroupJoinVerifyInfo {
+    method: GroupJoinVerifyMethod;
+    verify_message?: string;
+    review_qa_list?: GroupJoinReviewQA[];
+}
+interface GroupJoinRequest {
+    join_request_id: string;
+    risk_tips?: string;
+    union_openid?: string;
+    member_openid: string;
+    username: string;
+    apply_at: string;
+    apply_source: GroupJoinApplySource;
+    invited_by?: string;
+    bot?: boolean;
+    verify_info?: GroupJoinVerifyInfo;
+}
+interface GroupJoinRequestApproval {
+    op: 'approve' | 'decline';
+    join_request_id?: string;
+    reject_reason?: string;
+    add_to_member_blacklist?: boolean;
+}
+type GroupMuteMode = 'none' | 'always' | 'schedule';
+interface GroupMuteScheduleRule {
+    task_id: string;
+    start_at: string;
+    end_at: string;
+    enabled: boolean;
+}
+interface GroupMuteRecurringRule {
+    task_id: string;
+    weekdays: number[];
+    start_time: string;
+    end_time: string;
+    enabled: boolean;
+}
+interface GroupGlobalMuteRule {
+    mode: GroupMuteMode;
+    schedule_rules: GroupMuteScheduleRule[];
+    recurring_rules: GroupMuteRecurringRule[];
+}
+interface GroupMemberMuteState {
+    member_openid: string;
+    mute_expire_at: string;
+    username: string;
+    union_openid?: string;
+}
+interface GroupRestrictChatSetting {
+    global_rule: GroupGlobalMuteRule;
+    members: GroupMemberMuteState[];
+}
+interface SetGroupMemberMuteState {
+    op: 'add' | 'update' | 'del';
+    member_openid: string;
+    mute_expire_at?: string;
+}
+interface SetGroupRestrictChatSetting {
+    members?: SetGroupMemberMuteState[];
+}
+type GroupJoinApprovalStrategyState = 'on' | 'off';
+type GroupJoinApprovalStrategyGroups = {
+    group_openids: string[];
+    group_ids?: never;
+} | {
+    group_ids: number[];
+    group_openids?: never;
+};
+interface GroupJoinApprovalStrategy {
+    strategy_id: string;
+    group_openids?: string[];
+    group_ids?: string[];
+    whitelist_user_count: number;
+    is_enable: GroupJoinApprovalStrategyState;
+    expire_at: string;
+    created_at: string;
+    updated_at: string;
+    remark?: string;
+}
+interface GroupJoinApprovalStrategyList {
+    strategies: GroupJoinApprovalStrategy[];
+    next_cursor: string;
+}
+type CreateGroupJoinApprovalStrategy = GroupJoinApprovalStrategyGroups & {
+    is_enable?: GroupJoinApprovalStrategyState;
+    expire_at?: string;
+    remark?: string;
+};
+type GroupJoinApprovalStrategyGroupAction = GroupJoinApprovalStrategyGroups & {
+    op: 'add' | 'del';
+};
+interface UpdateGroupJoinApprovalStrategy {
+    is_enable?: GroupJoinApprovalStrategyState;
+    expire_at?: string;
+    group_action?: GroupJoinApprovalStrategyGroupAction;
+    remark?: string;
+}
+interface GroupJoinApprovalStrategyResult {
+    strategy_id?: string;
+    is_enable: GroupJoinApprovalStrategyState;
+    expire_at: string;
+}
+interface UpdateGroupJoinApprovalStrategyWhitelist {
+    op: 'add' | 'del';
+    whitelist_users: string[];
+}
+interface GroupJoinApprovalStrategyWhitelistResult {
+    strategy_id: string;
+    whitelist_user_count: number;
+    updated_at: string;
+}
+
+interface GroupRobotEvent {
+    timestamp: number;
+    group_openid: string;
+    op_member_openid: string;
+}
+type GroupAddRobotEvent = GroupRobotEvent;
+type GroupDelRobotEvent = GroupRobotEvent;
+type GroupMsgReceiveEvent = GroupRobotEvent;
+type GroupMsgRejectEvent = GroupRobotEvent;
+interface GroupMemberEvent {
+    timestamp: number;
+    group_openid: string;
+    member_openid: string;
+    user_openid?: string;
+}
+type GroupMemberAddEvent = GroupMemberEvent;
+type GroupMemberRemoveEvent = GroupMemberEvent;
+interface GroupJoinRequestEvent extends GroupJoinRequest {
+    group_openid: string;
+    auto_approved?: {
+        strategy_id: string;
+    };
+}
+interface GroupEventPayloadMap {
+    GROUP_ADD_ROBOT: GroupAddRobotEvent;
+    GROUP_DEL_ROBOT: GroupDelRobotEvent;
+    GROUP_MSG_RECEIVE: GroupMsgReceiveEvent;
+    GROUP_MSG_REJECT: GroupMsgRejectEvent;
+    GROUP_MEMBER_ADD: GroupMemberAddEvent;
+    GROUP_MEMBER_REMOVE: GroupMemberRemoveEvent;
+    GROUP_JOIN_REQUEST: GroupJoinRequestEvent;
+}
+type GroupEventType = keyof GroupEventPayloadMap;
+interface WebsocketEventData<T = unknown> {
+    eventType: string;
+    eventId: string;
+    msg: T;
+}
+
 interface AudioAPI {
     postAudio: (channelID: string, value: AudioControl) => Promise<RestyResponse<AudioControl>>;
     botOnMic: (channelID: string) => Promise<RestyResponse<{}>>;
@@ -654,7 +851,10 @@ interface GuildPermissionDemandIdentify {
     method: string;
 }
 
-type OpenAPIRequest = <T extends Record<any, any> = any>(options: RequestOptions) => Promise<RestyResponse<T>>;
+interface OpenAPIRequestOptions extends RequestOptions {
+    apiVersion?: string;
+}
+type OpenAPIRequest = <T extends Record<any, any> = any>(options: OpenAPIRequestOptions) => Promise<RestyResponse<T>>;
 interface Config {
     appID: string;
     token: string;
@@ -682,6 +882,7 @@ interface IOpenAPI {
     reactionApi: ReactionAPI;
     interactionApi: InteractionAPI;
     pinsMessageApi: PinsMessageAPI;
+    groupApi: GroupAPI;
 }
 type APIVersion = `v${number}`;
 interface Token {
@@ -715,6 +916,7 @@ declare class OpenAPI implements IOpenAPI {
     interactionApi: InteractionAPI;
     pinsMessageApi: PinsMessageAPI;
     guildPermissionsApi: GuildPermissionsAPI;
+    groupApi: GroupAPI;
     constructor(config: Config);
     register(client: IOpenAPI): void;
     request<T extends Record<any, any> = any>(options: any): Promise<RestyResponse<T>>;
@@ -775,4 +977,4 @@ declare function createOpenAPI(config: Config): OpenAPI;
 declare function createWebsocket(config: GetWsParam): WebsocketClient;
 
 export { AvailableIntentsEventsEnum, IntentEvents, Intents, OpCode, SessionEvents, WSCodes, WebsocketCloseReason, WebsocketCode, WsEventType, WsObjRequestOptions, createOpenAPI, createWebsocket, selectOpenAPIVersion };
-export type { APIVersion, Action, AnnounceAPI, Ark, ArkKV, ArkObj, ArkObjKV, AudioAPI, AudioControl, Button, ChannelAPI, ChannelPermissionsAPI, ChannelSubType, ChannelType, Config, CustomKeyboard, DirectMessageAPI, DirectMessageToCreate, Embed, EmbedField, EmbedThumbnail, EventTypes, GetWsParam, GuildAPI, GuildMembersPager, GuildPermission, GuildPermissionDemand, GuildPermissionDemandIdentify, GuildPermissionRes, GuildPermissionsAPI, GuildRoles, HeartbeatParam, IAnnounce, IChannel, IChannelPermissions, IChannelRolePermissions, IDirectMessage, IGuild, IMedia, IMember, IMessage, IMessageRes, IOpenAPI, IPinsMessage, IRole, IRoleFilter, ISchedule, IUser, IVoiceMember, InputNotify, IntentEventsMapType, InteractionAPI, InteractionData, MeAPI, MeGuildsReq, Media, MediaToCreate, MemberAPI, MemberAddRoleBody, MessageAPI, MessageAttachment, MessageKeyboard, MessageReference, MessageToCreate, MessagesPager, MuteAPI, MuteOptions, Nullish, OpenAPIRequest, PatchChannelObj, Permission, PermissionDemandToCreate, PinsMessageAPI, PostChannelObj, ReactionAPI, ReactionObj, ReactionUserListObj, RecommendChannel, RecommendObj, RenderData, RoleAPI, Row, ScheduleAPI, ScheduleRemindType, ScheduleToCreate, ScheduleToPatch, SessionRecord, ThreadReplyToCreate, ThreadsAPI, ThreadsToCreate, Token, UpdateChannelPermissions, UpdateRoleRes, WebsocketAPI, WsAddressObj, WsDataInfo, wsResData };
+export type { APIVersion, Action, AnnounceAPI, Ark, ArkKV, ArkObj, ArkObjKV, AudioAPI, AudioControl, Button, ChannelAPI, ChannelPermissionsAPI, ChannelSubType, ChannelType, Config, CreateGroupJoinApprovalStrategy, CustomKeyboard, DirectMessageAPI, DirectMessageToCreate, Embed, EmbedField, EmbedThumbnail, EventTypes, GetWsParam, GroupAPI, GroupAddRobotEvent, GroupBotState, GroupCursorPager, GroupDelRobotEvent, GroupEventPayloadMap, GroupEventType, GroupGlobalMuteRule, GroupInfo, GroupJoinApplySource, GroupJoinApprovalStrategy, GroupJoinApprovalStrategyGroupAction, GroupJoinApprovalStrategyGroups, GroupJoinApprovalStrategyList, GroupJoinApprovalStrategyResult, GroupJoinApprovalStrategyState, GroupJoinApprovalStrategyWhitelistResult, GroupJoinRequest, GroupJoinRequestApproval, GroupJoinRequestEvent, GroupJoinRequestList, GroupJoinReviewQA, GroupJoinVerifyInfo, GroupJoinVerifyMethod, GroupMemberAddEvent, GroupMemberEvent, GroupMemberMuteState, GroupMemberRemoveEvent, GroupMemberRole, GroupMsgReceiveEvent, GroupMsgRejectEvent, GroupMuteMode, GroupMuteRecurringRule, GroupMuteScheduleRule, GroupReceiveMessageSetting, GroupRestrictChatSetting, GroupRobotEvent, GuildAPI, GuildMembersPager, GuildPermission, GuildPermissionDemand, GuildPermissionDemandIdentify, GuildPermissionRes, GuildPermissionsAPI, GuildRoles, HeartbeatParam, IAnnounce, IChannel, IChannelPermissions, IChannelRolePermissions, IDirectMessage, IGuild, IMedia, IMember, IMessage, IMessageRes, IOpenAPI, IPinsMessage, IRole, IRoleFilter, ISchedule, IUser, IVoiceMember, InputNotify, IntentEventsMapType, InteractionAPI, InteractionData, MeAPI, MeGuildsReq, Media, MediaToCreate, MemberAPI, MemberAddRoleBody, MessageAPI, MessageAttachment, MessageKeyboard, MessageReference, MessageToCreate, MessagesPager, MuteAPI, MuteOptions, Nullish, OpenAPIRequest, OpenAPIRequestOptions, PatchChannelObj, Permission, PermissionDemandToCreate, PinsMessageAPI, PostChannelObj, ReactionAPI, ReactionObj, ReactionUserListObj, RecommendChannel, RecommendObj, RenderData, RoleAPI, Row, ScheduleAPI, ScheduleRemindType, ScheduleToCreate, ScheduleToPatch, SessionRecord, SetGroupMemberMuteState, SetGroupRestrictChatSetting, ThreadReplyToCreate, ThreadsAPI, ThreadsToCreate, Token, UpdateChannelPermissions, UpdateGroupJoinApprovalStrategy, UpdateGroupJoinApprovalStrategyWhitelist, UpdateRoleRes, WebsocketAPI, WebsocketEventData, WsAddressObj, WsDataInfo, wsResData };