@alemonjs/qq-bot 2.1.32 → 2.1.33

package/lib/sdk/api.d.ts

@@ -1,9 +1,9 @@
 import { type AxiosRequestConfig } from 'axios';
-import { ApiRequestData, FileType } from './typing.js';
+import { ApiRequestData, FileType, GroupAction, SetMemberMuteState, StreamMessageData, UploadPartFinishData, UploadPrepareData } from './typing.js';
 import { QQBotConfig } from './config.js';
-export declare const BOTS_API_RUL = "https://bots.qq.com";
+export declare const BOTS_API_RUL = "https://api.bot.qq.com";
 export declare const API_URL_SANDBOX = "https://sandbox.api.sgroup.qq.com";
-export declare const API_URL = "https://api.sgroup.qq.com";
+export declare const API_URL = "https://api.bot.qq.com";
 export type QQBotConnectionState = 'idle' | 'connecting' | 'ready' | 'reconnecting' | 'offline' | 'stopped';
 export type QQBotConnectionStatus = {
     state: QQBotConnectionState;
@@ -64,20 +64,28 @@ export declare class QQBotAPI {
         file_type: FileType;
         url?: string;
         file_data?: any;
+        upload_id?: string;
+        file_name?: string;
     }): Promise<{
         file_uuid: string;
         file_info: string;
         ttl: number;
+        id?: string;
+        raw_url?: string;
     }>;
     postRichMediaByGroup(openid: string, data: {
         srv_send_msg?: boolean;
         file_type: FileType;
         url?: string;
         file_data?: any;
+        upload_id?: string;
+        file_name?: string;
     }): Promise<{
         file_uuid: string;
         file_info: string;
         ttl: number;
+        id?: string;
+        raw_url?: string;
     }>;
     getMediaFileHashes(filePath: string): Promise<QQBotMediaHashes>;
     postChunkedRichMedia(params: {
@@ -96,7 +104,54 @@ export declare class QQBotAPI {
         ttl: number;
     }>;
     userMessageDelete(openid: string, message_id: string): Promise<any>;
+    groupMessageDelete(group_openid: string, message_id: string): Promise<any>;
     grouMessageDelte(group_openid: string, message_id: string): Promise<any>;
+    groupsInfo(group_openid: string): Promise<any>;
+    groupsBotState(group_openid: string): Promise<any>;
+    groupsMembersMessage(group_openid: string, member_openid: string): Promise<any>;
+    groupsJoinRequestList(group_openid: string, params?: {
+        cursor?: string;
+        limit?: number;
+    }): Promise<any>;
+    groupsApprovalJoinRequest(group_openid: string, member_openid: string, data: {
+        op: 'approve' | 'decline';
+        join_request_id?: string;
+        reject_reason?: string;
+        add_to_member_blacklist?: boolean;
+    }): Promise<any>;
+    groupsRestrictChatSetting(group_openid: string): Promise<any>;
+    groupsRestrictChatSettingPost(group_openid: string, data: {
+        members?: SetMemberMuteState[];
+    }): Promise<any>;
+    groupsJoinApprovalStrategies(params?: {
+        cursor?: string;
+        limit?: number;
+    }): Promise<any>;
+    groupsJoinApprovalStrategyCreate(data: {
+        group_openids?: string[];
+        group_ids?: string[];
+        is_enable?: 'on' | 'off';
+        expire_at?: string;
+        remark?: string;
+    }): Promise<any>;
+    groupsJoinApprovalStrategyPatch(strategy_id: string, data: {
+        is_enable?: 'on' | 'off';
+        expire_at?: string;
+        group_action?: GroupAction;
+        remark?: string;
+    }): Promise<any>;
+    groupsJoinApprovalStrategyDelete(strategy_id: string): Promise<any>;
+    groupsJoinApprovalStrategyExecute(strategy_id: string): Promise<any>;
+    groupsJoinApprovalStrategyWhitelistUsers(strategy_id: string, data: {
+        op: 'add' | 'del';
+        whitelist_users: string[];
+    }): Promise<any>;
+    usersUploadPrepare(userId: string, data: UploadPrepareData): Promise<any>;
+    groupUploadPrepare(groupId: string, data: UploadPrepareData): Promise<any>;
+    usersUploadPartFinish(userId: string, data: UploadPartFinishData): Promise<any>;
+    groupUploadPartFinish(groupId: string, data: UploadPartFinishData): Promise<any>;
+    uploadPartDirect(presignedUrl: string, part: Buffer): Promise<import("axios").AxiosResponse<any, any, {}>>;
+    streamMessages(userId: string, data: StreamMessageData): Promise<any>;
     channelsMessages(channel_id: string, message: {
         content?: string;
         embed?: any;

package/lib/sdk/api.js

@@ -5,10 +5,11 @@ import { createPicFrom } from 'alemonjs/utils';
 import { createAxiosInstance } from './instance.js';
 import { randomUUID, createHash } from 'node:crypto';
 import { createReadStream } from 'node:fs';
+import { fileDataToBuffer, CHUNK_THRESHOLD, chunkedUpload } from '../upload.js';
 
-const BOTS_API_RUL = 'https://bots.qq.com';
+const BOTS_API_RUL = 'https://api.bot.qq.com';
 const API_URL_SANDBOX = 'https://sandbox.api.sgroup.qq.com';
-const API_URL = 'https://api.sgroup.qq.com';
+const API_URL = 'https://api.bot.qq.com';
 class QQBotAPI {
     config;
     #msgMap = new Map();
@@ -237,6 +238,10 @@ class QQBotAPI {
         });
     }
     postRichMediaByUser(openid, data) {
+        const fileBuffer = fileDataToBuffer(data.file_data);
+        if (!data.upload_id && fileBuffer && fileBuffer.byteLength > CHUNK_THRESHOLD) {
+            return chunkedUpload(this, 'user', openid, fileBuffer, { file_type: data.file_type, file_name: data.file_name, srv_send_msg: data.srv_send_msg });
+        }
         return this.groupService({
             url: `/v2/users/${openid}/files`,
             method: 'post',
@@ -244,6 +249,10 @@ class QQBotAPI {
         });
     }
     postRichMediaByGroup(openid, data) {
+        const fileBuffer = fileDataToBuffer(data.file_data);
+        if (!data.upload_id && fileBuffer && fileBuffer.byteLength > CHUNK_THRESHOLD) {
+            return chunkedUpload(this, 'group', openid, fileBuffer, { file_type: data.file_type, file_name: data.file_name, srv_send_msg: data.srv_send_msg });
+        }
         return this.groupService({
             url: `/v2/groups/${openid}/files`,
             method: 'post',
@@ -362,12 +371,138 @@ class QQBotAPI {
             method: 'delete'
         });
     }
-    grouMessageDelte(group_openid, message_id) {
+    groupMessageDelete(group_openid, message_id) {
         return this.groupService({
             url: `/v2/groups/${group_openid}/messages/${message_id}`,
             method: 'delete'
         });
     }
+    grouMessageDelte(group_openid, message_id) {
+        return this.groupMessageDelete(group_openid, message_id);
+    }
+    groupsInfo(group_openid) {
+        return this.groupService({
+            url: `/v2/groups/${group_openid}/info`,
+            method: 'get'
+        });
+    }
+    groupsBotState(group_openid) {
+        return this.groupService({
+            url: `/v2/groups/${group_openid}/bot_state`,
+            method: 'get'
+        });
+    }
+    groupsMembersMessage(group_openid, member_openid) {
+        return this.groupService({
+            url: `/v2/groups/${group_openid}/members/${member_openid}`,
+            method: 'get'
+        });
+    }
+    groupsJoinRequestList(group_openid, params) {
+        return this.groupService({
+            url: `/v2/groups/${group_openid}/join_request_list`,
+            method: 'get',
+            params
+        });
+    }
+    groupsApprovalJoinRequest(group_openid, member_openid, data) {
+        return this.groupService({
+            url: `/v2/groups/${group_openid}/approval_join_request/${member_openid}`,
+            method: 'post',
+            data
+        });
+    }
+    groupsRestrictChatSetting(group_openid) {
+        return this.groupService({
+            url: `/v2/groups/${group_openid}/restrict_chat_setting`,
+            method: 'get'
+        });
+    }
+    groupsRestrictChatSettingPost(group_openid, data) {
+        return this.groupService({
+            url: `/v2/groups/${group_openid}/restrict_chat_setting`,
+            method: 'post',
+            data
+        });
+    }
+    groupsJoinApprovalStrategies(params) {
+        return this.groupService({
+            url: '/v2/groups/join_approval_strategy',
+            method: 'get',
+            params
+        });
+    }
+    groupsJoinApprovalStrategyCreate(data) {
+        return this.groupService({
+            url: '/v2/groups/join_approval_strategy',
+            method: 'post',
+            data
+        });
+    }
+    groupsJoinApprovalStrategyPatch(strategy_id, data) {
+        return this.groupService({
+            url: `/v2/groups/join_approval_strategy/${strategy_id}`,
+            method: 'patch',
+            data
+        });
+    }
+    groupsJoinApprovalStrategyDelete(strategy_id) {
+        return this.groupService({
+            url: `/v2/groups/join_approval_strategy/${strategy_id}`,
+            method: 'delete'
+        });
+    }
+    groupsJoinApprovalStrategyExecute(strategy_id) {
+        return this.groupService({
+            url: `/v2/groups/join_approval_strategy/${strategy_id}/execute`,
+            method: 'post'
+        });
+    }
+    groupsJoinApprovalStrategyWhitelistUsers(strategy_id, data) {
+        return this.groupService({
+            url: `/v2/groups/join_approval_strategy/${strategy_id}/whitelist_users`,
+            method: 'post',
+            data
+        });
+    }
+    usersUploadPrepare(userId, data) {
+        return this.groupService({
+            url: `/v2/users/${userId}/upload_prepare`,
+            method: 'post',
+            data
+        });
+    }
+    groupUploadPrepare(groupId, data) {
+        return this.groupService({
+            url: `/v2/groups/${groupId}/upload_prepare`,
+            method: 'post',
+            data
+        });
+    }
+    usersUploadPartFinish(userId, data) {
+        return this.groupService({
+            url: `/v2/users/${userId}/upload_part_finish`,
+            method: 'post',
+            data
+        });
+    }
+    groupUploadPartFinish(groupId, data) {
+        return this.groupService({
+            url: `/v2/groups/${groupId}/upload_part_finish`,
+            method: 'post',
+            data
+        });
+    }
+    uploadPartDirect(presignedUrl, part) {
+        return axios.put(presignedUrl, part);
+    }
+    streamMessages(userId, data) {
+        return this.groupService({
+            url: `/v2/users/${userId}/stream_messages`,
+            method: 'post',
+            data
+        });
+    }
     async channelsMessages(channel_id, message, image) {
         const formdata = new FormData();
         for (const key in message) {

package/lib/sdk/instance.js

@@ -1,3 +1,5 @@
+import { logger } from 'alemonjs';
+
 const filterHeaders = (headers = {}) => {
     if (!headers) {
         return headers;

package/lib/sdk/intents.d.ts

@@ -1,3 +1,3 @@
-export declare const AvailableIntentsEventsEnum: readonly ["GUILDS", "GUILD_MEMBERS", "GUILD_MESSAGES", "GUILD_MESSAGE_REACTIONS", "DIRECT_MESSAGE", "INTERACTION", "MESSAGE_AUDIT", "FORUMS_EVENT", "AUDIO_ACTION", "PUBLIC_GUILD_MESSAGES", "GROUP_AND_C2C_EVENT"];
+export declare const AvailableIntentsEventsEnum: readonly ["GUILDS", "GUILD_MEMBERS", "GUILD_MESSAGES", "GUILD_MESSAGE_REACTIONS", "DIRECT_MESSAGE", "GROUP_MEMBER_EVENT", "INTERACTION", "MESSAGE_AUDIT", "FORUMS_EVENT", "AUDIO_ACTION", "PUBLIC_GUILD_MESSAGES", "GROUP_AND_C2C_EVENT"];
 export type IntentsEnum = (typeof AvailableIntentsEventsEnum)[number];
 export declare function getIntentsMask(intents: IntentsEnum[]): number;

package/lib/sdk/intents.js

@@ -4,6 +4,7 @@ const AvailableIntentsEventsEnum = [
     'GUILD_MESSAGES',
     'GUILD_MESSAGE_REACTIONS',
     'DIRECT_MESSAGE',
+    'GROUP_MEMBER_EVENT',
     'INTERACTION',
     'MESSAGE_AUDIT',
     'FORUMS_EVENT',
@@ -17,6 +18,7 @@ const intentsMap = {
     GUILD_MESSAGES: 1 << 9,
     GUILD_MESSAGE_REACTIONS: 1 << 10,
     DIRECT_MESSAGE: 1 << 12,
+    GROUP_MEMBER_EVENT: 1 << 24,
     INTERACTION: 1 << 26,
     MESSAGE_AUDIT: 1 << 27,
     FORUMS_EVENT: 1 << 28,

package/lib/sdk/message.group.d.ts

@@ -14,6 +14,7 @@ import { FRIEND_DEL_TYPE } from '../message/group/FRIEND_DEL';
 import { ERROR_TYPE } from '../message/ERROR';
 import { GROUP_MEMBER_REMOVE } from '../message/group/GROUP_MEMBER_REMOVE';
 import { GROUP_MEMBER_ADD } from '../message/group/GROUP_MEMBER_ADD';
+import { GROUP_JOIN_REQUEST_TYPE } from '../message/group/GROUP_JOIN_REQUEST';
 export type QQBotGroupEventMap = {
     C2C_MESSAGE_CREATE: C2C_MESSAGE_CREATE_TYPE;
     C2C_MSG_REJECT: C2C_MSG_REJECT_TYPE;
@@ -31,4 +32,5 @@ export type QQBotGroupEventMap = {
     ERROR: ERROR_TYPE;
     GROUP_MEMBER_ADD: GROUP_MEMBER_ADD;
     GROUP_MEMBER_REMOVE: GROUP_MEMBER_REMOVE;
+    GROUP_JOIN_REQUEST: GROUP_JOIN_REQUEST_TYPE;
 };

package/lib/sdk/typing.d.ts

@@ -1,6 +1,6 @@
 import { IntentsEnum } from './intents';
 import type { SessionStore } from './session.js';
-export type MessageType = 0 | 1 | 2 | 3 | 4 | 7;
+export type MessageType = 0 | 1 | 2 | 3 | 4 | 6 | 7;
 export type FileType = 1 | 2 | 3 | 4;
 export interface ButtonType {
     id: string;
@@ -55,6 +55,128 @@ export interface ApiRequestData {
     event_id?: any;
     msg_id?: string;
     msg_seq?: number;
+    is_wakeup?: boolean;
+    force_verify_image_resource?: boolean;
+    input_notify?: {
+        input_type: number;
+        input_second: number;
+    };
+}
+export interface VerifyInfo {
+    method: string;
+    verify_message?: string;
+    review_qa_list?: {
+        question: string;
+        answer: string;
+    }[];
+}
+export interface JoinRequest {
+    join_request_id: string;
+    risk_tips?: string;
+    union_openid?: string;
+    member_openid: string;
+    username: string;
+    apply_at: string;
+    apply_source: string;
+    invited_by?: string;
+    bot: boolean;
+    verify_info?: VerifyInfo;
+    auto_approved?: {
+        strategy_id: string;
+    };
+}
+export interface GlobalMuteRule {
+    mode: 'none' | 'always' | 'schedule';
+    schedule_rules?: {
+        task_id: string;
+        start_at: string;
+        end_at: string;
+        enabled: boolean;
+    }[];
+    recurring_rules?: {
+        task_id: string;
+        weekdays: number[];
+        start_time: string;
+        end_time: string;
+        enabled: boolean;
+    }[];
+}
+export interface MemberMuteState {
+    member_openid: string;
+    mute_expire_at: string;
+    username: string;
+    union_openid: string;
+}
+export interface SetMemberMuteState {
+    op: 'add' | 'update' | 'del';
+    member_openid: string;
+    mute_expire_at?: string;
+}
+export interface JoinApprovalStrategy {
+    strategy_id: string;
+    group_openids: string[];
+    group_ids: string[];
+    whitelist_user_count: number;
+    is_enable: 'on' | 'off';
+    expire_at: string;
+    created_at: string;
+    updated_at: string;
+    remark: string;
+}
+export interface GroupAction {
+    op: 'add' | 'del';
+    group_openids?: string[];
+    group_ids?: string[];
+}
+export interface UploadPrepareData {
+    file_type: FileType;
+    file_name: string;
+    file_size: string;
+    md5: string;
+    sha1: string;
+    md5_10m: string;
+}
+export interface UploadPart {
+    index: number;
+    presigned_url: string;
+    block_size: string;
+}
+export interface UploadConfig {
+    concurrency: number;
+    retry_timeout: number;
+    retry_delay: number;
+}
+export interface UploadPrepareResult {
+    upload_id: string;
+    block_size: string;
+    parts: UploadPart[];
+    upload_config: UploadConfig;
+}
+export interface UploadPartFinishData {
+    upload_id: string;
+    part_index: number;
+    block_size: string;
+    md5: string;
+}
+export interface StreamMessageData {
+    input_mode?: 'append' | 'replace';
+    input_state?: 1 | 10;
+    content_type?: 'text' | 'markdown';
+    content_raw?: string;
+    event_id?: string;
+    msg_id?: string;
+    msg_seq?: number;
+    index?: number;
+    stream_msg_id?: string;
+    is_wakeup?: boolean;
+}
+export interface StreamMessageResult {
+    id: string;
+    timestamp: string;
+    ext_info?: {
+        ref_idx?: string;
+    };
+    remain_msg_len?: number;
 }
 export interface Options {
     app_id: string;

package/lib/sends.d.ts

@@ -5,12 +5,16 @@ export declare const GROUP_AT_MESSAGE_CREATE: (client: Client, event: {
     ChannelId: string;
     MessageId?: string;
     _tag?: string;
-}, val: DataEnums[]) => Promise<ClientAPIMessageResult[]>;
+}, val: DataEnums[], options?: {
+    forceVerifyImageResource?: boolean;
+}) => Promise<ClientAPIMessageResult[]>;
 export declare const C2C_MESSAGE_CREATE: (client: Client, event: {
     UserId: string;
     MessageId?: string;
     _tag?: string;
-}, val: DataEnums[]) => Promise<ClientAPIMessageResult[]>;
+}, val: DataEnums[], options?: {
+    forceVerifyImageResource?: boolean;
+}) => Promise<ClientAPIMessageResult[]>;
 export declare const DIRECT_MESSAGE_CREATE: (client: Client, event: {
     UserId: string;
     MessageId?: string;