alemonjs 1.1.18 → 1.1.19

package/README.md

@@ -2,8 +2,6 @@
 
 ## 阿柠檬跨平台开发框架机器人
 
-> 需要配置机器人才可启动
-
 开发文档 OPEN[https://alemonjs.com](https://alemonjs.com)
 
 类型/接口 OPEN[docs](https://ningmengchongshui.github.io/alemon/)

package/lib/core/apps.js

@@ -3,7 +3,7 @@ import { fileURLToPath } from 'url';
 import { setAppMessage, setAppArg, setAppCharacter, setAppEvent, setAppPriority } from './cache.js';
 import { setApp } from './app.js';
 /**
- * 引用路径
+ * 应用路径
  * @param url
  * @returns
  */
@@ -34,17 +34,19 @@ export function getAppName(url) {
 /**
  * 创建应用对象
  * @param url import.meta.url
- * @returns AppName目录名
+   @deprecated createApp()
+ * @returns
  */
 export function createApps(url) {
-    return createApp(getAppName(url));
+    return createApp(url);
 }
 /**
  * 创建应用对象
- * @param AppName 目录名 getAppName(import.meta.url)
- * @returns 应用app对象
+ * @param url import.meta.url
+ * @returns
  */
-export function createApp(AppName) {
+export function createApp(url) {
+    const AppName = getAppName(url);
     /**
      * 应用集
      */
@@ -56,8 +58,11 @@ export function createApp(AppName) {
     /**
      * 设置默认指令规则
      */
-    setAppCharacter(AppName, '/');
-    return {
+    setAppCharacter(AppName);
+    /**
+     * 应用
+     */
+    const app = {
         /**
          * 设置正则最低优先级
          * 当设置了500，而所有优先级为5000时
@@ -66,30 +71,28 @@ export function createApp(AppName) {
          * @param val
          * @returns
          */
-        setPriority: (val) => {
+        priority: (val) => {
             try {
                 setAppPriority(AppName, val);
-                return true;
             }
             catch (err) {
                 console.error('APP setEvent', err);
-                return false;
             }
+            return app;
         },
         /**
          * 设置正则默认消息
          * @param val
          * @returns
          */
-        setEvent: (val) => {
+        event: (val) => {
             try {
                 setAppEvent(AppName, val);
-                return true;
             }
             catch (err) {
                 console.error('APP setEvent', err);
-                return false;
             }
+            return app;
         },
         /**
          * 设置指令规则
@@ -97,12 +100,11 @@ export function createApp(AppName) {
         setCharacter: (val) => {
             try {
                 setAppCharacter(AppName, val);
-                return true;
             }
             catch (err) {
                 console.error('APP setCharacter', err);
-                return false;
             }
+            return app;
         },
         /**
          * 设置扩展参
@@ -110,31 +112,45 @@ export function createApp(AppName) {
         setArg: (fnc) => {
             try {
                 setAppArg(AppName, fnc);
-                return true;
             }
             catch (err) {
                 console.error('APP setArg', err);
-                return false;
             }
+            return app;
+        },
+        /**
+         * 重定义事件
+         * @param fnc 回调函数
+         * @returns 是否成功定义
+         */
+        reSetEvent: (fnc) => {
+            try {
+                setAppMessage(AppName, fnc);
+            }
+            catch (err) {
+                console.error('APP setMessage', err);
+            }
+            return app;
         },
         /**
-         * 重定义消息
+         * 重定义事件
          * @param fnc 回调函数
+         * @deprecated 废弃,请使用reSetEvent()
          * @returns 是否成功定义
          */
         setMessage: (fnc) => {
             try {
                 setAppMessage(AppName, fnc);
-                return true;
             }
             catch (err) {
                 console.error('APP setMessage', err);
-                return false;
             }
+            return app;
         },
         /**
          * 创建应用
          * @param app 应用对象
+         * @deprecated 废弃,请使用use()
          */
         component: (urlObject = {}) => {
             try {
@@ -173,15 +189,62 @@ export function createApp(AppName) {
                         }
                     }
                 }
-                return true;
             }
             catch (err) {
                 console.error('APP component', err);
-                return false;
             }
+            return app;
+        },
+        /**
+         * 创建应用
+         * @param app 应用对象
+         */
+        use: (urlObject = {}) => {
+            try {
+                for (const item in urlObject) {
+                    /**
+                     * 如果该导出是class
+                     */
+                    if (urlObject[item].prototype) {
+                        if (!Object.prototype.hasOwnProperty.call(apps, item)) {
+                            /**
+                             * 不重名
+                             */
+                            apps[item] = urlObject[item];
+                            continue;
+                        }
+                        const T = true;
+                        while (T) {
+                            const keyName = `${item}$${acount}`;
+                            if (!Object.prototype.hasOwnProperty.call(apps, keyName)) {
+                                /**
+                                 * 不重名
+                                 */
+                                apps[keyName] = urlObject[item];
+                                /**
+                                 * 重置为0
+                                 */
+                                acount = 0;
+                                break;
+                            }
+                            else {
+                                /**
+                                 * 加1
+                                 */
+                                acount++;
+                            }
+                        }
+                    }
+                }
+            }
+            catch (err) {
+                console.error('APP use', err);
+            }
+            return app;
         },
         /**
          * 挂起应用
+         * @returns
          */
         mount: () => {
             try {
@@ -190,6 +253,8 @@ export function createApp(AppName) {
             catch (err) {
                 console.error('APP mount', err);
             }
+            return app;
         }
     };
+    return app;
 }

package/lib/core/cache.js

@@ -62,7 +62,7 @@ export function getAppCharacter(key) {
  * @param key 插件名
  * @param val 字符
  */
-export function setAppCharacter(key, val) {
+export function setAppCharacter(key, val = '/') {
     CAT[key] = val;
 }
 /**

package/lib/core/ip.js

@@ -1,5 +1,12 @@
 import { publicIp } from 'public-ip';
 let myIp;
+/**
+ * 得到本机IP地址
+ * @returns
+ */
+export async function setPublicIP(val) {
+    myIp = val;
+}
 /**
  * 得到本机IP地址
  * @returns

package/lib/define/main.js

@@ -3,7 +3,7 @@ import { rebotMap } from './map.js';
 import { nodeScripts } from './child_process.js';
 import { command } from './command.js';
 import { AppNameError } from '../log/index.js';
-import { setLanchConfig, loadInit, appsInit, setAppProCoinfg, startChrom, getPublicIP } from '../core/index.js';
+import { setLanchConfig, loadInit, appsInit, setAppProCoinfg, startChrom, getPublicIP, setPublicIP } from '../core/index.js';
 import { getPupPath, setBotConfigByKey, getBotConfigByKey } from '../config/index.js';
 import { createWeb } from '../koa/index.js';
 import { autoClearFiles } from '../koa/file.js';
@@ -222,8 +222,12 @@ export async function defineAlemonConfig(Options) {
             // 定时清除
             autoClearFiles();
         }
-        // 缓存ip
-        getPublicIP();
+        if (Options?.server?.ip) {
+            setPublicIP(Options?.server?.ip);
+        }
+        else {
+            getPublicIP();
+        }
     }
     /**
      * ***********

package/lib/discord/alemon/bot.js

@@ -1,7 +1,7 @@
 let bot = {
     id: '',
     name: '',
-    avatar: 'string'
+    avatar: ''
 };
 export function setBotMsgByDISOCRD(val) {
     bot = val;

package/lib/discord/sdk/wss.js

@@ -10,7 +10,7 @@ import { getBotConfig } from './config.js';
 export async function createClient(conversation, shard = [0, 1]) {
     const { url } = await gateway();
     if (!url) {
-        console.error('TOKEN 错误');
+        console.error('[getway] token err');
         return;
     }
     const wsConn = new WebSocket(`${url}?v=10&encoding=json`);

package/lib/kook/alemon/bot.js

@@ -1,7 +1,7 @@
 let bot = {
     id: '',
     name: '',
-    avatar: 'string'
+    avatar: ''
 };
 export function setBotMsgByKOOK(val) {
     bot = val;

package/lib/kook/alemon/message/PUBLIC_GUILD_MESSAGES.js

@@ -30,7 +30,7 @@ export const PUBLIC_GUILD_MESSAGES_KOOK = async (event) => {
         at_users.push({
             id: item.role_id,
             name: item.name,
-            avatar: 'string',
+            avatar: '',
             bot: true
         });
         msg = msg.replace(`(rol)${item.role_id}(rol)`, '').trim();

package/lib/kook/sdk/ws.js

@@ -24,11 +24,11 @@ export async function getGatewayUrl(token, url = 'https://www.kookapp.cn/api/v3/
             return response.data.data.url;
         }
         else {
-            console.error('http err', response.data.message);
+            console.error('[getway] http err', response.data.message);
         }
     }
     catch (error) {
-        console.error('token err', error.message);
+        console.error('[getway] token err', error.message);
     }
 }
 /**

package/lib/ntqq/alemon/conversation.js

@@ -12,7 +12,7 @@ export function conversation(t, d) {
         setBotMsgByNtqq({
             id: d.user.id,
             name: d.user.name,
-            avatar: 'string'
+            avatar: ''
         });
     }
     else if (t == 'GROUP_AT_MESSAGE_CREATE') {

package/lib/ntqq/alemon/group/bot.js

@@ -1,7 +1,7 @@
 let bot = {
     id: '',
     name: '',
-    avatar: 'string'
+    avatar: ''
 };
 export function setBotMsgByNtqq(val) {
     bot = val;

package/lib/ntqq/sdk/api/group.js

@@ -35,11 +35,11 @@ export async function gateway() {
             return url;
         }
         else {
-            console.error('http err:', null);
+            console.error('[getway] http err:', null);
         }
     })
         .catch(error => {
-        console.error('token err:', error.message);
+        console.error('[getway] token err:', error.message);
     });
 }
 /**

package/lib/ntqq/sdk/wss.js

@@ -48,7 +48,7 @@ export async function createClient(cfg, conversation) {
             return;
         }
         setTimeout(() => {
-            console.info('reconnecting...');
+            console.info('[ws] reconnecting...');
             // 重新starrt
             start();
             // 记录
@@ -84,26 +84,26 @@ export async function createClient(cfg, conversation) {
                     }
                     // Resumed Event，恢复连接成功
                     if (t === 'RESUMED') {
-                        console.info('restore connection');
+                        console.info('[ws] restore connection');
                         // 重制次数
                         counter.setID(0);
                     }
                     return;
                 },
                 6: ({ d }) => {
-                    console.info('connection attempt', d);
+                    console.info('[ws] connection attempt', d);
                     return;
                 },
                 7: async ({ d }) => {
                     // 执行重新连接
-                    console.info('reconnect', d);
+                    console.info('[ws] reconnect', d);
                     // 取消鉴权发送
                     if (power)
                         clearInterval(power);
                     return;
                 },
                 9: ({ d, t }) => {
-                    console.info('parameter error', d);
+                    console.info('[ws] parameter error', d);
                     return;
                 },
                 10: ({ d }) => {
@@ -132,13 +132,13 @@ export async function createClient(cfg, conversation) {
                 },
                 11: () => {
                     // OpCode 11 Heartbeat ACK 消息，心跳发送成功
-                    console.info('heartbeat transmission');
+                    console.info('[ws] heartbeat transmission');
                     // 重制次数
                     counter.setID(0);
                     return;
                 },
                 12: ({ d }) => {
-                    console.info('platform data', d);
+                    console.info('[ws] platform data', d);
                     return;
                 }
             };

package/lib/one/alemon/bot.js

@@ -1,7 +1,7 @@
 let bot = {
     id: '',
     name: '',
-    avatar: 'string'
+    avatar: ''
 };
 export function setBotMsgByONE(val) {
     bot = val;

package/lib/one/alemon/conversation.js

@@ -11,7 +11,7 @@ export const conversation = {
             setBotMsgByONE({
                 id: bot.self.user_id,
                 name: bot.self.nickname,
-                avatar: 'string' // 头像是什么
+                avatar: '' // 头像是什么
             });
         }
     },

package/lib/qq/alemon/bot.js

@@ -1,7 +1,7 @@
 let bot = {
     id: '',
     name: '',
-    avatar: 'string'
+    avatar: ''
 };
 export function setBotMsgByQQ(val) {
     bot = val;

package/lib/qq/alemon/conversation.js

@@ -30,7 +30,7 @@ export const createConversationByQQ = ws => {
         const bot = {
             id: robot.user.id,
             name: robot.user.username,
-            avatar: 'string'
+            avatar: ''
         };
         // 设置bot信息
         setBotMsgByQQ(bot);

package/lib/qq/alemon/message/GUILD_MESSAGES.js

@@ -132,7 +132,7 @@ export const GUILD_MESSAGES = async (event) => {
          */
         e.at_user = e.at_users.find(item => item.bot != true);
     }
-    if (e.bot.avatar == 'string') {
+    if (e.bot.avatar == '') {
         /**
          * 配置一下机器人头像
          */

package/lib/qq/alemon/message/PUBLIC_GUILD_MESSAGES.js

@@ -133,7 +133,7 @@ export const PUBLIC_GUILD_MESSAGES = async (event) => {
          */
         e.at_user = e.at_users.find(item => item.bot != true);
     }
-    if (e.bot.avatar == 'string') {
+    if (e.bot.avatar == '') {
         /**
          * 配置一下机器人头像
          */

package/lib/qq/sdk/typings.js

@@ -1,5 +1,5 @@
 /**
- * 订阅枚举
+ *
  */
 export const AvailableIntentsEventsEnum = [
     'GUILDS',

package/lib/qq/sdk/wss.js

@@ -15,11 +15,11 @@ export async function getGatewayUrl() {
             return response.url;
         }
         else {
-            console.error('http err:', null);
+            console.error('[getway] http err:', null);
         }
     }
     catch (error) {
-        console.error('token err:', error.message);
+        console.error('[getway] token err:', error.message);
     }
 }
 /**
@@ -118,7 +118,7 @@ export async function createClient(callBack, shard = [0, 4]) {
                 }
                 case 11: {
                     // OpCode 11 Heartbeat ACK 消息，心跳发送成功
-                    console.info('heartbeat transmission');
+                    console.info('[ws] heartbeat transmission');
                     break;
                 }
                 case 12: {
@@ -127,7 +127,7 @@ export async function createClient(callBack, shard = [0, 4]) {
             }
         });
         ws.on('close', () => {
-            console.error('ws close');
+            console.error('[ws]  close');
         });
     }
 }

package/lib/villa/alemon/message/MESSAGES.js

@@ -52,7 +52,7 @@ export async function MESSAGES(event) {
             at_users.push({
                 id: item.entity.user_id,
                 name,
-                avatar: 'string',
+                avatar: '',
                 bot: false
             });
             continue;
@@ -61,7 +61,7 @@ export async function MESSAGES(event) {
             at_users.push({
                 id: item.entity.bot_id,
                 name,
-                avatar: 'string',
+                avatar: '',
                 bot: true
             });
             continue;

package/lib/villa/sdk/wss.js

@@ -37,14 +37,14 @@ export async function createClient(options, conversation) {
     setBotConfig('villa_id', options?.villa_id ?? 0);
     const data = await getWebsocketInfo(options.bot_id, options.bot_secret).then(res => res.data);
     if (!data?.websocket_url) {
-        console.log('鉴权失败');
+        console.log('[getway] secret err');
         return;
     }
-    const ws = new WebSocket(data.websocket_url);
-    ws.on('open', async () => {
-        console.info('[ws] open');
-        // login
-        ws.send(createMessage({
+    let IntervalID = null;
+    let size = 0;
+    const time = 20 * 1000;
+    const getLoginData = () => {
+        return {
             ID: counter.getNextID(),
             Flag: 1, // 发送
             BizType: 7,
@@ -58,19 +58,13 @@ export async function createClient(options, conversation) {
                 region: '',
                 meta: null
             })
-        }));
-        // 20s 心跳
-        setInterval(() => {
-            ws.send(createMessage({
-                ID: counter.getNextID(),
-                Flag: 1, // 发送
-                BizType: 6,
-                AppId: data.app_id,
-                BodyData: ProtoCommand('PHeartBeat').encode({
-                    clientTimestamp: `${new Date().getTime()}`
-                })
-            }));
-        }, 20 * 1000);
+        };
+    };
+    const ws = new WebSocket(data.websocket_url);
+    ws.on('open', async () => {
+        console.info('[ws] login open');
+        // login
+        ws.send(createMessage(getLoginData()));
     });
     ws.on('message', message => {
         if (Buffer.isBuffer(message)) {
@@ -85,7 +79,23 @@ export async function createClient(options, conversation) {
                         console.log('PLoginReply:', LongToNumber(reply));
                     }
                     if (reply.code)
-                        console.log('登录失败');
+                        console.log('[ws] login err');
+                    else {
+                        console.log('[ws] login success');
+                        size = 0;
+                        // 20s 心跳
+                        IntervalID = setInterval(() => {
+                            ws.send(createMessage({
+                                ID: counter.getNextID(),
+                                Flag: 1, // 发送
+                                BizType: 6,
+                                AppId: data.app_id,
+                                BodyData: ProtoCommand('PHeartBeat').encode({
+                                    clientTimestamp: `${new Date().getTime()}`
+                                })
+                            }));
+                        }, time);
+                    }
                 }
                 else if (obj.bizType == 6) {
                     // 心跳
@@ -93,8 +103,19 @@ export async function createClient(options, conversation) {
                     if (process.env?.VILLA_WS == 'dev') {
                         console.log('PHeartBeatReply:', LongToNumber(reply));
                     }
-                    if (reply.code)
-                        console.log('心跳错误');
+                    if (reply.code) {
+                        console.log('[ws] 心跳错误');
+                        // 心跳错误,关闭心跳记时器
+                        if (IntervalID)
+                            clearInterval(IntervalID);
+                        if (size < 5) {
+                            // 重新发送鉴权
+                            ws.send(createMessage(getLoginData()));
+                        }
+                        else {
+                            console.log('重鉴权次数上限');
+                        }
+                    }
                 }
                 else if (obj.bizType == 8) {
                     // 退出登录

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "alemonjs",
-  "version": "1.1.18",
+  "version": "1.1.19",
   "description": "DOCS https://alemonjs.com/",
   "scripts": {
     "dev": "ts-node alemon.config.ts",
     "tsc": "tsc",
+    "ts": "ts-node",
     "doc": "typedoc --options typedoc.json",
     "format": "prettier --write .",
     "lint": "eslint . --ext .js,.ts --fix --ignore-path .gitignore"

package/types/core/apps.d.ts

@@ -1,5 +1,5 @@
 /**
- * 引用路径
+ * 应用路径
  * @param url
  * @returns
  */
@@ -22,7 +22,8 @@ export declare function getAppName(url: string | URL): string;
 /**
  * 创建应用对象
  * @param url import.meta.url
- * @returns AppName目录名
+   @deprecated createApp()
+ * @returns
  */
 export declare function createApps(url: string): {
     /**
@@ -33,43 +34,57 @@ export declare function createApps(url: string): {
      * @param val
      * @returns
      */
-    setPriority: (val: number) => boolean;
+    priority: (val: number) => any;
     /**
      * 设置正则默认消息
      * @param val
      * @returns
      */
-    setEvent: (val: "message" | "MESSAGES") => boolean;
+    event: (val: "message" | "MESSAGES") => any;
     /**
      * 设置指令规则
      */
-    setCharacter: (val: "/" | "#") => boolean;
+    setCharacter: (val: "/" | "#") => any;
     /**
      * 设置扩展参
      */
-    setArg: (fnc: (...args: any[]) => any[] | Promise<any[]>) => boolean;
+    setArg: (fnc: (...args: any[]) => any[] | Promise<any[]>) => any;
+    /**
+     * 重定义事件
+     * @param fnc 回调函数
+     * @returns 是否成功定义
+     */
+    reSetEvent: (fnc: (...args: any[]) => any) => any;
     /**
-     * 重定义消息
+     * 重定义事件
      * @param fnc 回调函数
+     * @deprecated 废弃,请使用reSetEvent()
      * @returns 是否成功定义
      */
-    setMessage: (fnc: (...args: any[]) => any) => boolean;
+    setMessage: (fnc: (...args: any[]) => any) => any;
     /**
      * 创建应用
      * @param app 应用对象
+     * @deprecated 废弃,请使用use()
      */
-    component: (urlObject?: object) => boolean;
+    component: (urlObject?: object) => any;
+    /**
+     * 创建应用
+     * @param app 应用对象
+     */
+    use: (urlObject?: object) => any;
     /**
      * 挂起应用
+     * @returns
      */
-    mount: () => void;
+    mount: () => any;
 };
 /**
  * 创建应用对象
- * @param AppName 目录名 getAppName(import.meta.url)
- * @returns 应用app对象
+ * @param url import.meta.url
+ * @returns
  */
-export declare function createApp(AppName: string): {
+export declare function createApp(url: string): {
     /**
      * 设置正则最低优先级
      * 当设置了500，而所有优先级为5000时
@@ -78,34 +93,48 @@ export declare function createApp(AppName: string): {
      * @param val
      * @returns
      */
-    setPriority: (val: number) => boolean;
+    priority: (val: number) => any;
     /**
      * 设置正则默认消息
      * @param val
      * @returns
      */
-    setEvent: (val: 'MESSAGES' | 'message') => boolean;
+    event: (val: 'MESSAGES' | 'message') => any;
     /**
      * 设置指令规则
      */
-    setCharacter: (val: '#' | '/') => boolean;
+    setCharacter: (val: '#' | '/') => any;
     /**
      * 设置扩展参
      */
-    setArg: (fnc: (...args: any[]) => any[] | Promise<any[]>) => boolean;
+    setArg: (fnc: (...args: any[]) => any[] | Promise<any[]>) => any;
+    /**
+     * 重定义事件
+     * @param fnc 回调函数
+     * @returns 是否成功定义
+     */
+    reSetEvent: (fnc: (...args: any[]) => any) => any;
     /**
-     * 重定义消息
+     * 重定义事件
      * @param fnc 回调函数
+     * @deprecated 废弃,请使用reSetEvent()
      * @returns 是否成功定义
      */
-    setMessage: (fnc: (...args: any[]) => any) => boolean;
+    setMessage: (fnc: (...args: any[]) => any) => any;
     /**
      * 创建应用
      * @param app 应用对象
+     * @deprecated 废弃,请使用use()
      */
-    component: (urlObject?: object) => boolean;
+    component: (urlObject?: object) => any;
+    /**
+     * 创建应用
+     * @param app 应用对象
+     */
+    use: (urlObject?: object) => any;
     /**
      * 挂起应用
+     * @returns
      */
-    mount: () => void;
+    mount: () => any;
 };

package/types/core/cache.d.ts

@@ -43,7 +43,7 @@ export declare function getAppCharacter(key: string): "/" | "#";
  * @param key 插件名
  * @param val 字符
  */
-export declare function setAppCharacter(key: string, val: '/' | '#'): void;
+export declare function setAppCharacter(key: string, val?: '/' | '#'): void;
 /**
  * 删除令规则
  * @param key 插件名

package/types/core/ip.d.ts

@@ -1,4 +1,9 @@
 import { Options } from 'public-ip';
+/**
+ * 得到本机IP地址
+ * @returns
+ */
+export declare function setPublicIP(val: string): Promise<void>;
 /**
  * 得到本机IP地址
  * @returns

package/types/discord/sdk/config.d.ts

@@ -1,4 +1,4 @@
-interface ClientConfig {
+export interface ClientConfig {
     token: string;
     intent: number;
 }
@@ -14,4 +14,3 @@ export declare function setBotConfig<T extends keyof ClientConfig>(key: T, val:
  * @returns
  */
 export declare function getBotConfig<T extends keyof ClientConfig>(key: T): ClientConfig[T] | undefined;
-export {};

package/types/kook/sdk/config.d.ts

@@ -1,4 +1,4 @@
-interface ClientConfig {
+export interface ClientConfig {
     token: string;
 }
 /**
@@ -13,4 +13,3 @@ export declare function setBotConfig<T extends keyof ClientConfig>(key: T, val:
  * @returns
  */
 export declare function getBotConfig<T extends keyof ClientConfig>(key: T): ClientConfig[T] | undefined;
-export {};

package/types/ntqq/sdk/config.d.ts

@@ -1,4 +1,4 @@
-export interface BotCaCheType {
+export interface ClientConfig {
     appID: string;
     token: string;
     secret: string;
@@ -12,10 +12,10 @@ export interface BotCaCheType {
  * @param key
  * @param val
  */
-export declare function setBotConfig<T extends keyof BotCaCheType>(key: T, val: BotCaCheType[T]): void;
+export declare function setBotConfig<T extends keyof ClientConfig>(key: T, val: ClientConfig[T]): void;
 /**
  *
  * @param key
  * @returns
  */
-export declare function getBotConfig<T extends keyof BotCaCheType>(key: T): BotCaCheType[T] | undefined;
+export declare function getBotConfig<T extends keyof ClientConfig>(key: T): ClientConfig[T] | undefined;

package/types/ntqq/sdk/wss.d.ts

@@ -1,10 +1,10 @@
-import { type BotCaCheType } from './config.js';
+import { type ClientConfig } from './config.js';
 /**
  *
  * @param cfg
  * @param conversation
  */
-export declare function createClient(cfg: BotCaCheType, conversation: (...args: any[]) => any): Promise<void>;
+export declare function createClient(cfg: ClientConfig, conversation: (...args: any[]) => any): Promise<void>;
 /**
 
 1	Heartbeat	Send/Receive	客户端或服务端发送心跳

package/types/qq/sdk/config.d.ts

@@ -1,13 +1,20 @@
-import { BotConfig } from './typings.js';
+import { IntentsEnum } from './typings.js';
+export interface ClientConfig {
+    appID: string;
+    token: string;
+    secret: string;
+    intents: IntentsEnum[];
+    sandbox: boolean;
+}
 /**
  *
  * @param key
  * @param val
  */
-export declare function setBotConfig<T extends keyof BotConfig>(key: T, val: BotConfig[T]): void;
+export declare function setBotConfig<T extends keyof ClientConfig>(key: T, val: ClientConfig[T]): void;
 /**
  *
  * @param key
  * @returns
  */
-export declare function getBotConfig<T extends keyof BotConfig>(key: T): BotConfig[T] | undefined;
+export declare function getBotConfig<T extends keyof ClientConfig>(key: T): ClientConfig[T] | undefined;

package/types/qq/sdk/typings.d.ts

@@ -1,15 +1,8 @@
 /**
- * 登录配置
+ * 订阅枚举
  */
-export interface BotConfig {
-    appID: string;
-    token: string;
-    secret: string;
-    intents: IntentsEnum[];
-    sandbox: boolean;
-}
 export type IntentsEnum = (typeof AvailableIntentsEventsEnum)[number];
 /**
- * 订阅枚举
+ *
  */
 export declare const AvailableIntentsEventsEnum: readonly ["GUILDS", "GUILD_MEMBERS", "GUILD_MESSAGES", "GUILD_MESSAGE_REACTIONS", "DIRECT_MESSAGE", "FORUMS_EVENT", "AUDIO_ACTION", "PUBLIC_GUILD_MESSAGES", "MESSAGE_AUDIT", "INTERACTION"];

package/types/villa/sdk/config.d.ts

@@ -1,4 +1,10 @@
-import { type ClientConfig } from './types.js';
+export interface ClientConfig {
+    bot_id: string;
+    bot_secret: string;
+    pub_key: string;
+    villa_id?: number;
+    token: string;
+}
 /**
  *
  * @param key

package/types/villa/sdk/types.d.ts

@@ -1,13 +1,3 @@
-/**
- * 客户端配置
- */
-export interface ClientConfig {
-    bot_id: string;
-    bot_secret: string;
-    pub_key: string;
-    villa_id?: number;
-    token: string;
-}
 /**
  *  api路径地址
  */

package/types/villa/sdk/wss.d.ts

@@ -1,4 +1,4 @@
-import { ClientConfig } from './types.js';
+import { type ClientConfig } from './config.js';
 /**
  * 别野服务
  * @param villa_id 别野编号

package/types/villa/villa.d.ts

@@ -21,9 +21,9 @@ export interface VILLAOptions {
      */
     masterID?: string;
     /**
-     * 测试别野
+     * 别野
      */
-    villa_id?: number;
+    villa_id: number;
 }
 export declare const defineVILLA: {
     bot_id: string;