@alemonjs/qq-bot 2.1.31 → 2.1.33

package/dist/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en" id="__gui">
   <head>
     <meta charset="UTF-8" />

package/lib/config.d.ts

@@ -6,7 +6,15 @@ export type Options = {
     master_id?: string[];
     markdownToText?: boolean;
     hideUnsupported?: boolean | number;
+    bots?: Record<string, Omit<sdkOptions, 'app_id'> & {
+        app_id?: string;
+    }>;
+    default_bot?: string;
 } & sdkOptions;
 export declare const getQQBotConfig: () => Options;
+export declare const getQQBotBots: () => {
+    bots: Map<string, sdkOptions>;
+    defaultBot?: string;
+};
 export declare const getIdentity: (UserId: string) => readonly [boolean, string];
 export declare const getMaster: (UserId: string) => readonly [boolean, string];

package/lib/config.js

@@ -8,6 +8,28 @@ const getQQBotConfig = () => {
     const bagValue = value[platformFullName] || {};
     return { ...commonValue, ...bagValue };
 };
+const getQQBotBots = () => {
+    const config = getQQBotConfig();
+    const { bots: configuredBots, default_bot, master_id: _masterId, master_key: _masterKey, markdownToText: _markdown, hideUnsupported: _hide, ...common } = config;
+    const bots = new Map();
+    if (configuredBots && Object.keys(configuredBots).length) {
+        for (const [botId, value] of Object.entries(configuredBots)) {
+            if (value.app_id && value.app_id !== botId)
+                throw new Error(`qq-bot bots.${botId}.app_id must match its map key`);
+            if (!value.secret)
+                throw new Error(`qq-bot bots.${botId}.secret is required`);
+            bots.set(botId, { ...common, ...value, app_id: botId, secret: value.secret });
+        }
+    }
+    else if (config.app_id && config.secret) {
+        bots.set(config.app_id, common);
+    }
+    if (bots.size > 1 && !default_bot)
+        throw new Error('qq-bot.default_bot is required when multiple bots are configured');
+    if (default_bot && !bots.has(default_bot))
+        throw new Error(`qq-bot.default_bot ${default_bot} is not configured`);
+    return { bots, defaultBot: default_bot || (bots.size === 1 ? bots.keys().next().value : undefined) };
+};
 const getIdentity = (UserId) => {
     const isMasterUser = UserId ? isMaster(UserId, platform) : false;
     const UserKey = createUserHashKey({
@@ -20,4 +42,4 @@ const getMaster = (UserId) => {
     return getIdentity(UserId);
 };
 
-export { getIdentity, getMaster, getQQBotConfig, platform, platformFullName };
+export { getIdentity, getMaster, getQQBotBots, getQQBotConfig, platform, platformFullName };

package/lib/desktop.js

@@ -2,6 +2,7 @@ import { readFileSync } from 'fs';
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 import { getConfig, getConfigValue } from 'alemonjs';
+import { getQQBotRegistry } from './index.websoket.js';
 
 const __dirname$1 = dirname(fileURLToPath(import.meta.url));
 const activate = context => {
@@ -22,7 +23,7 @@ const activate = context => {
     webView.onMessage(data => {
         try {
             if (data.type === 'qq-bot.form.save') {
-                const db = data.data;
+                const { bots_json: _botsJson, ...db } = data.data;
                 const config = getConfig();
                 const value = config.value ?? {};
                 value['qq-bot'] = {
@@ -43,6 +44,12 @@ const activate = context => {
                     data: config['qq-bot'] ?? {}
                 });
             }
+            else if (data.type === 'qq-bot.status') {
+                webView.postMessage({
+                    type: 'qq-bot.status',
+                    data: getQQBotRegistry()?.getConnectionStatus() ?? { Platform: 'qq-bot', state: 'stopped', bots: [] }
+                });
+            }
         }
         catch (e) {
             console.error(e);

package/lib/hook.d.ts

@@ -31,6 +31,7 @@ import { C2C_MSG_RECEIVE_TYPE } from './message/group/C2C_MSG_RECEIVE';
 import { C2C_MSG_REJECT_TYPE } from './message/group/C2C_MSG_REJECT';
 import { MESSAGE_AUDIT_PASS_TYPE } from './message/group/MESSAGE_AUDIT_PASS';
 import { MESSAGE_AUDIT_REJECT_TYPE } from './message/group/MESSAGE_AUDIT_REJECT';
+import { GROUP_JOIN_REQUEST_TYPE } from './message/group/GROUP_JOIN_REQUEST';
 type MAP = {
     'message.create': GROUP_AT_MESSAGE_CREATE_TYPE | GROUP_MESSAGE_CREATE_TYPE | AT_MESSAGE_CREATE_TYPE | MESSAGE_CREATE_TYPE;
     'private.message.create': DIRECT_MESSAGE_CREATE_TYPE | C2C_MESSAGE_CREATE_TYPE;
@@ -52,7 +53,7 @@ type MAP = {
     'member.ban': undefined;
     'member.unban': undefined;
     'member.update': GUILD_MEMBER_UPDATE_TYPE;
-    'notice.create': GROUP_MSG_RECEIVE_TYPE | GROUP_MSG_REJECT_TYPE | MESSAGE_AUDIT_PASS_TYPE | MESSAGE_AUDIT_REJECT_TYPE;
+    'notice.create': GROUP_MSG_RECEIVE_TYPE | GROUP_MSG_REJECT_TYPE | MESSAGE_AUDIT_PASS_TYPE | MESSAGE_AUDIT_REJECT_TYPE | GROUP_JOIN_REQUEST_TYPE;
     'private.message.update': undefined;
     'private.message.delete': DIRECT_MESSAGE_DELETE_TYPE;
     'private.friend.add': FRIEND_ADD_TYPE;

package/lib/index.js

@@ -1,16 +1,13 @@
-import { definePlatform, getConfigValue } from 'alemonjs';
+import { definePlatform } from 'alemonjs';
 import { start } from './index.webhook.js';
 import { start as start$1 } from './index.websoket.js';
-import { platform } from './config.js';
+import { getQQBotConfig } from './config.js';
+export { platform } from './config.js';
 export { useClient, useMode, useValue } from './hook.js';
 export { QQBotAPI as API } from './sdk/api.js';
 
 const main = () => {
-    let value = getConfigValue();
-    if (!value) {
-        value = {};
-    }
-    const config = value[platform];
+    const config = getQQBotConfig();
     if (config?.route || config?.port || config?.ws) {
         start();
     }
@@ -20,4 +17,4 @@ const main = () => {
 };
 var index = definePlatform({ main });
 
-export { index as default, platform };
+export { index as default };

package/lib/index.webhook.js

@@ -4,6 +4,9 @@ import { getQQBotConfig } from './config.js';
 
 const start = () => {
     const config = getQQBotConfig();
+    if (config.bots && Object.keys(config.bots).length > 1) {
+        throw new Error('qq-bot.bots is only supported by WebSocket mode; remove route/port/ws to use the QQ WebSocket gateway');
+    }
     const { master_id: _, master_key: __, ...cfgConfig } = config;
     const client = new QQBotClient({
         ...cfgConfig

package/lib/index.websoket.d.ts

@@ -1 +1,3 @@
+import { QQBotRegistry } from './sdk/registry';
+export declare const getQQBotRegistry: () => QQBotRegistry;
 export declare const start: () => void;

package/lib/index.websoket.js

@@ -1,9 +1,13 @@
-import { QQBotClients } from './sdk/client.websoket.js';
-import { register } from './register.js';
-import { getQQBotConfig } from './config.js';
+import { getQQBotConfig, getQQBotBots } from './config.js';
+import { QQBotRegistry } from './sdk/registry.js';
 
+let activeRegistry;
+const getQQBotRegistry = () => activeRegistry;
 const start = () => {
     const config = getQQBotConfig();
+    const { bots, defaultBot } = getQQBotBots();
+    const registry = new QQBotRegistry(defaultBot);
+    activeRegistry = registry;
     const notPrivateIntents = [
         'GUILDS',
         'GUILD_MEMBERS',
@@ -19,27 +23,25 @@ const start = () => {
         'DIRECT_MESSAGE',
         'FORUMS_EVENT'
     ];
-    const isGroupIntents = ['GROUP_AND_C2C_EVENT'];
+    const isGroupIntents = ['GROUP_AND_C2C_EVENT', 'GROUP_MEMBER_EVENT'];
     const pubIntents = ['INTERACTION'];
     const intents = [];
     if (config?.is_private) {
-        intents.push(...isPrivateIntents, ...pubIntents);
+        intents.push(...isPrivateIntents, ...isGroupIntents, ...pubIntents);
     }
     else {
         intents.push(...notPrivateIntents, ...isGroupIntents, ...pubIntents);
     }
-    const client = new QQBotClients({
-        ...config,
-        intents: config?.intents || intents,
-        is_private: config?.is_private ?? false,
-        sandbox: config?.sandbox ?? false,
-        shard: config?.shard ?? [0, 1],
-        gatewayURL: config?.gatewayURL,
-        base_url_gateway: config?.base_url_gateway,
-        base_url_app_access_token: config?.base_url_app_access_token
-    });
-    void client.connect(config?.gatewayURL);
-    register(client);
+    for (const [botId, botConfig] of bots) {
+        const client = registry.add(botId, {
+            ...botConfig,
+            intents: botConfig.intents || intents,
+            is_private: botConfig.is_private ?? false,
+            sandbox: botConfig.sandbox ?? false,
+            shard: botConfig.shard ?? [0, 1]
+        });
+        void client.connect(botConfig.gatewayURL);
+    }
 };
 
-export { start };
+export { getQQBotRegistry, start };

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

@@ -1,4 +1,11 @@
 export type C2C_MESSAGE_CREATE_TYPE = {
+    attachments?: {
+        id?: string;
+        url?: string;
+        content_type?: string;
+        filename?: string;
+        size?: number;
+    }[];
     author: {
         id: string;
         user_openid: string;

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

@@ -1,4 +1,11 @@
 export interface GROUP_AT_MESSAGE_CREATE_TYPE {
+    attachments?: {
+        id?: string;
+        url?: string;
+        content_type?: string;
+        filename?: string;
+        size?: number;
+    }[];
     author: {
         bot?: boolean;
         id: string;

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

@@ -0,0 +1,23 @@
+export type GROUP_JOIN_REQUEST_TYPE = {
+    group_openid: string;
+    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?: {
+        method: string;
+        verify_message?: string;
+        review_qa_list?: {
+            question: string;
+            answer: string;
+        }[];
+    };
+    auto_approved?: {
+        strategy_id: string;
+    };
+};

package/lib/message/group/GROUP_JOIN_REQUEST.js

@@ -0,0 +1 @@
+

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

@@ -1,4 +1,11 @@
 export interface GROUP_MESSAGE_CREATE_TYPE {
+    attachments?: {
+        id?: string;
+        url?: string;
+        content_type?: string;
+        filename?: string;
+        size?: number;
+    }[];
     author: {
         bot?: boolean;
         id: string;

package/lib/register.d.ts

@@ -1,2 +1,11 @@
+import { cbpPlatform } from 'alemonjs';
 import { QQBotClients } from './sdk/client.websoket';
-export declare const register: (client: QQBotClients) => void;
+export type QQBotRegistration = {
+    onAction: (data: any, consume: (result: any[]) => void) => Promise<void>;
+    onApi: (data: any, consume: (result: any[]) => void) => Promise<void>;
+};
+export declare const register: (client: QQBotClients, options?: {
+    botId?: string;
+    cbp?: ReturnType<typeof cbpPlatform>;
+    bindActions?: boolean;
+}) => QQBotRegistration;