@alemonjs/qq-bot 2.1.0-alpha.30 → 2.1.0-alpha.32

package/README.md

@@ -24,33 +24,24 @@ qq-bot:
   secret: ''
 ```
 
-> 默认使用 1）websocket 模式，配置 route 可选择 webhook 模式
+> 1、默认 websocket 模式，配置 route/port 可选择 webhook 模式
 
-> 配置 webhook 需 ip/域名，一旦生效官方将禁用 websocket 模式
+> 2、webhook 模式，需 ip/域名，一旦生效官方将禁用 websocket 模式
+
+> 3、gatewayURL 直连模式，
+
+> 4、域名代理模式
 
 ```sh
 qq-bot:
   # 频道沙盒，默认false
-  sandbox: false
-  # 1）websocket 模式
-  # mode: 'guild'
-  # mode: 'group'
-  # 2）webhook 模式
-  # 推荐nginx进行代理 http://localhost:17157/webhook
-  # 填写将启动 webhook模式
-  port: 17157
-  route: '/webhook'
-  # 当配置ws的时候，会连接另一台webhook机器人的消息。不会再启动本地端口。
-  # 假设代理后的地址为 https://qqbotjs.com
-  # ws: 'wss://qqbotjs.com/websocket'
-  # ws: 'ws://[your ip]:17157/websocket'
+  # sandbox: false
+  # 2）填写将启动 webhook模式
+  # port: 17157
+  # route: '/webhook'
   # 3) 自定义模式 (用于连接类官网连接方式的指定服务端)
   # gatewayURL: 'ws://[your ip]:8080'
-  # 其他
-  # 使用 user_key
-  master_key:
-     - 'xxx'
-  # 使用 user_id
-  master_id:
-     - 'yyy'
+  # 4) 域名代理模式
+  # base_url_gateway: https://[your addr]
+  # base_url_app_access_token: https://[your addr]
 ```

package/lib/hook.d.ts

@@ -28,7 +28,7 @@ export declare const useValue: <T extends EventKeys>(event: Events[T]) => readon
 export declare const useClient: <T extends EventKeys>(event: Events[T]) => readonly [{
     getAuthentication: () => Promise<import("alemonjs").Result<any>>;
     groupService: (options: import("axios").AxiosRequestConfig<any>) => Promise<import("alemonjs").Result<any>>;
-    guildServer: (opstion: import("axios").AxiosRequestConfig<any>) => Promise<import("alemonjs").Result<any>>;
+    guildServer: (options: import("axios").AxiosRequestConfig<any>) => Promise<import("alemonjs").Result<any>>;
     gateway: () => Promise<import("alemonjs").Result<any>>;
     usersOpenMessages: (openid: string, data: import("./sdk/typing").ApiRequestData) => Promise<import("alemonjs").Result<{
         id: string;
@@ -215,7 +215,7 @@ export declare const useClient: <T extends EventKeys>(event: Events[T]) => reado
     }) => Promise<import("alemonjs").Result<any>>;
     channelsThreadsDelete: (channel_id: string, thread_id: string) => Promise<import("alemonjs").Result<any>>;
     guildApiPermission: (guild_id: string) => Promise<import("alemonjs").Result<any>>;
-    interactionResponse: (mode: "guild" | "group", interaction_id: string, code?: number) => Promise<import("alemonjs").Result<any>>;
+    interactionResponse: (_mode: "group" | "guild", interaction_id: string, code?: number) => Promise<import("alemonjs").Result<any>>;
 }, MAP[T]];
 export declare const useMode: <T extends EventKeys>(event: Events[T]) => (mode: "guild" | "group" | "c2c") => boolean;
 export {};

package/lib/index.websoket.js

@@ -22,24 +22,11 @@ const start = () => {
     const isGroupIntents = ['GROUP_AND_C2C_EVENT'];
     const pubIntents = ['INTERACTION'];
     const intents = [];
-    if (config?.mode === 'guild') {
-        if (config?.is_private) {
-            intents.push(...isPrivateIntents, ...pubIntents);
-        }
-        else {
-            intents.push(...notPrivateIntents, ...pubIntents);
-        }
-    }
-    else if (config?.mode === 'group') {
-        intents.push(...isGroupIntents, ...pubIntents);
+    if (config?.is_private) {
+        intents.push(...isPrivateIntents, ...pubIntents);
     }
     else {
-        if (config?.is_private) {
-            intents.push(...isPrivateIntents, ...pubIntents);
-        }
-        else {
-            intents.push(...notPrivateIntents, ...isGroupIntents, ...pubIntents);
-        }
+        intents.push(...notPrivateIntents, ...isGroupIntents, ...pubIntents);
     }
     const client = new QQBotClients({
         ...config,
@@ -47,7 +34,9 @@ const start = () => {
         is_private: config?.is_private ?? false,
         sandbox: config?.sandbox ?? false,
         shard: config?.shard ?? [0, 1],
-        mode: config?.mode ?? 'group'
+        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);

package/lib/sdk/api.d.ts

@@ -6,7 +6,7 @@ export declare const API_URL = "https://api.sgroup.qq.com";
 export declare class QQBotAPI {
     getAuthentication(): Promise<any>;
     groupService(options: AxiosRequestConfig): Promise<any>;
-    guildServer(opstion: AxiosRequestConfig): Promise<any>;
+    guildServer(options: AxiosRequestConfig): Promise<any>;
     gateway(): Promise<any>;
     usersOpenMessages(openid: string, data: ApiRequestData): Promise<{
         id: string;
@@ -193,5 +193,5 @@ export declare class QQBotAPI {
     }): Promise<any>;
     channelsThreadsDelete(channel_id: string, thread_id: string): Promise<any>;
     guildApiPermission(guild_id: string): Promise<any>;
-    interactionResponse(mode: 'group' | 'guild', interaction_id: string, code?: number): Promise<any>;
+    interactionResponse(_mode: 'group' | 'guild', interaction_id: string, code?: number): Promise<any>;
 }

package/lib/sdk/api.js

@@ -12,12 +12,19 @@ class QQBotAPI {
     getAuthentication() {
         const app_id = config.get('app_id');
         const secret = config.get('secret');
+        const baseUrlAppAccessToken = config.get('base_url_app_access_token');
+        const params = {
+            url: '/app/getAppAccessToken'
+        };
+        if (baseUrlAppAccessToken) {
+            params.baseURL = baseUrlAppAccessToken;
+        }
         const service = axios.create({
             baseURL: BOTS_API_RUL,
             timeout: 20000
         });
         return createAxiosInstance(service, {
-            url: '/app/getAppAccessToken',
+            ...params,
             method: 'post',
             data: {
                 appId: `${app_id}`,
@@ -28,8 +35,9 @@ class QQBotAPI {
     groupService(options) {
         const app_id = config.get('app_id');
         const token = config.get('access_token');
+        const sandbox = config.get('sandbox');
         const service = axios.create({
-            baseURL: API_URL,
+            baseURL: sandbox ? API_URL_SANDBOX : API_URL,
             timeout: 20000,
             headers: {
                 'X-Union-Appid': app_id,
@@ -38,36 +46,18 @@ class QQBotAPI {
         });
         return createAxiosInstance(service, options);
     }
-    guildServer(opstion) {
-        const app_id = config.get('app_id');
-        const token = config.get('token');
-        const sandbox = config.get('sandbox');
-        const service = axios.create({
-            baseURL: sandbox ? API_URL_SANDBOX : API_URL,
-            timeout: 20000,
-            headers: {
-                Authorization: `Bot ${app_id}.${token}`
-            }
-        });
-        return createAxiosInstance(service, opstion);
+    guildServer(options) {
+        return this.groupService(options);
     }
     gateway() {
-        const mode = config.get('mode');
-        if (mode === 'group') {
-            return this.groupService({
-                url: '/gateway'
-            });
-        }
-        else if (mode === 'guild') {
-            return this.guildServer({
-                url: '/gateway'
-            });
-        }
-        else {
-            return this.groupService({
-                url: '/gateway'
-            });
+        const baseUrlGateway = config.get('base_url_gateway');
+        const params = {
+            url: '/gateway'
+        };
+        if (baseUrlGateway) {
+            params.baseURL = baseUrlGateway;
         }
+        return this.groupService(params);
     }
     usersOpenMessages(openid, data) {
         const db = {
@@ -518,25 +508,14 @@ class QQBotAPI {
             url: `/guilds/${guild_id}/api_permission`
         });
     }
-    interactionResponse(mode, interaction_id, code) {
-        if (mode === 'group') {
-            return this.groupService({
-                method: 'PUT',
-                url: `/interactions/${interaction_id}`,
-                data: {
-                    code: code || 0
-                }
-            });
-        }
-        else {
-            return this.guildServer({
-                method: 'PUT',
-                url: `/interactions/${interaction_id}`,
-                data: {
-                    code: code || 0
-                }
-            });
-        }
+    interactionResponse(_mode, interaction_id, code) {
+        return this.groupService({
+            method: 'PUT',
+            url: `/interactions/${interaction_id}`,
+            data: {
+                code: code || 0
+            }
+        });
     }
 }
 

package/lib/sdk/typing.d.ts

@@ -63,9 +63,10 @@ export interface Options {
     intents?: IntentsEnum[];
     is_private?: boolean;
     sandbox?: boolean;
-    mode?: 'guild' | 'group' | '';
     route?: string;
     port?: string;
     ws?: string;
     gatewayURL?: string;
+    base_url_gateway?: string;
+    base_url_app_access_token?: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/qq-bot",
-  "version": "2.1.0-alpha.30",
+  "version": "2.1.0-alpha.32",
   "description": "阿柠檬qq-bot平台连接",
   "author": "lemonade",
   "license": "MIT",