alemonjs 1.1.16 → 1.1.18

package/lib/discord/index.js

@@ -1,34 +1,20 @@
-import { getIntents, setDISOCRD, createClient } from './sdk/index.js';
+import { getIntents, createClient, setBotConfig } from './sdk/index.js';
 import { conversation } from './alemon/conversation.js';
 import { checkRobotByDISCORD } from './login.js';
 import { getBotConfigByKey } from '../config/index.js';
-/**
- * 创建实例
- * @returns
- */
 export async function createAlemonByDISCORD() {
-    /**
-     * 创建登录配置
-     */
     if (await checkRobotByDISCORD().catch(err => {
         console.error(err);
         return false;
     })) {
-        /**
-         * 读取配置
-         */
+        // 读取配置
         const cfg = getBotConfigByKey('discord');
-        /**
-         * 设置配置
-         */
-        setDISOCRD(cfg.token, getIntents(cfg.intent));
-        /**
-         * 启动监听
-         */
+        setBotConfig('token', cfg.token);
+        setBotConfig('intent', getIntents(cfg.intent));
+        // 启动监听
         createClient(conversation, cfg?.shard);
         return true;
     }
     return false;
 }
-// 客户端
 export { ClientDISOCRD } from './sdk/index.js';

package/lib/discord/sdk/base.js

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { getDISCORD } from './config.js';
+import { getBotConfig } from './config.js';
 import { ApiLog } from './log.js';
 /**
  * KOOK服务
@@ -7,7 +7,7 @@ import { ApiLog } from './log.js';
  * @returns
  */
 export function Service(config) {
-    const { token } = getDISCORD();
+    const token = getBotConfig('token');
     const service = axios.create({
         baseURL: 'https://discord.com/api/v10',
         timeout: 6000,

package/lib/discord/sdk/cdn.js

@@ -1,9 +1,9 @@
 import axios from 'axios';
-import { getDISCORD } from './config.js';
+import { getBotConfig } from './config.js';
 import { ApiLog } from './log.js';
 const BaseUrl = 'https://cdn.discordapp.com';
 export function ServiceApp(config) {
-    const { token } = getDISCORD();
+    const token = getBotConfig('token');
     const service = axios.create({
         baseURL: BaseUrl,
         timeout: 6000,

package/lib/discord/sdk/config.js

@@ -1,20 +1,22 @@
-let token = '';
-let intent = 0;
+const cfg = {
+    token: '',
+    intent: 0
+};
 /**
  *
+ * @param key
  * @param val
  */
-export function setDISOCRD(val, i) {
-    token = val;
-    intent = i;
+export function setBotConfig(key, val) {
+    if (Object.prototype.hasOwnProperty.call(cfg, key)) {
+        cfg[key] = val;
+    }
 }
 /**
  *
+ * @param key
  * @returns
  */
-export function getDISCORD() {
-    return {
-        token,
-        intent
-    };
+export function getBotConfig(key) {
+    return cfg[key];
 }

package/lib/discord/sdk/wss.js

@@ -1,6 +1,6 @@
 import WebSocket from 'ws';
 import { gateway } from './api.js';
-import { getDISCORD } from './config.js';
+import { getBotConfig } from './config.js';
 /**
  * 创建ws监听
  * @param conversation
@@ -27,7 +27,8 @@ export async function createClient(conversation, shard = [0, 1]) {
         }));
         setTimeout(call, heartbeat_interval);
     };
-    const { token, intent } = getDISCORD();
+    const token = getBotConfig('token');
+    const intent = getBotConfig('intent');
     const map = {
         0: ({ d, t }) => {
             conversation(t, d);
@@ -51,6 +52,7 @@ export async function createClient(conversation, shard = [0, 1]) {
         },
         9: message => {
             //  6 或 2 失败
+            // 连接失败
             console.info('[ws] parameter error', message);
         },
         /**

package/lib/kook/sdk/api.js

@@ -1,7 +1,7 @@
 import axios from 'axios';
 import FormData from 'form-data';
 import { ApiEnum } from './typings.js';
-import { getKookToken } from './config.js';
+import { getBotConfig } from './config.js';
 import { createPicFrom } from '../../core/index.js';
 export function ApiLog(res) {
     if (process.env?.KOOK_API_REQUEST == 'dev')
@@ -20,7 +20,7 @@ export function ApiLog(res) {
  * @returns
  */
 export function kookService(config) {
-    const token = getKookToken();
+    const token = getBotConfig('token');
     const service = axios.create({
         baseURL: 'https://www.kookapp.cn',
         timeout: 30000,

package/lib/kook/sdk/config.js

@@ -1,15 +1,21 @@
-let token = '';
+const cfg = {
+    token: ''
+};
 /**
  *
+ * @param key
  * @param val
  */
-export function setKookToken(val) {
-    token = val;
+export function setBotConfig(key, val) {
+    if (Object.prototype.hasOwnProperty.call(cfg, key)) {
+        cfg[key] = val;
+    }
 }
 /**
  *
+ * @param key
  * @returns
  */
-export function getKookToken() {
-    return token;
+export function getBotConfig(key) {
+    return cfg[key];
 }

package/lib/kook/sdk/ws.js

@@ -1,6 +1,6 @@
 import WebSocket from 'ws';
 import axios from 'axios';
-import { setKookToken } from './config.js';
+import { setBotConfig } from './config.js';
 /**
  * 获取鉴权
  * @param token  token
@@ -38,13 +38,13 @@ export async function getGatewayUrl(token, url = 'https://www.kookapp.cn/api/v3/
  */
 export async function createClient(token, conversation) {
     // 设置token
-    setKookToken(token);
+    setBotConfig('token', token);
     // 请求url
     const gatewayUrl = await getGatewayUrl(token);
     if (gatewayUrl) {
         const ws = new WebSocket(gatewayUrl);
         ws.on('open', () => {
-            console.info('token ok');
+            console.info('[ws] open');
         });
         // 标记是否已连接
         let isConnected = false;

package/lib/ntqq/index.js

@@ -1,44 +1,25 @@
 import { checkRobotByQQ } from './login.js';
 import { getBotConfigByKey } from '../config/index.js';
 import { conversation } from './alemon/conversation.js';
-import { createClient, setTimeoutBotConfig, getIntentsMask, setBotConfig } from './sdk/index.js';
+import { createClient, getIntentsMask } from './sdk/index.js';
 export async function createAlemonByNtqq() {
-    /**
-     * 登录
-     */
     if (await checkRobotByQQ().catch(err => {
         console.error(err);
         return false;
     })) {
-        /**
-         * 读取配置
-         */
+        // 读取配置
         const cfg = getBotConfigByKey('ntqq');
         const intents = getIntentsMask(cfg.intents);
-        if (cfg.mode == 'qq-guild') {
-            setBotConfig({
-                appID: cfg.appID,
-                token: cfg.token,
-                secret: cfg.secret,
-                intents: intents,
-                isPrivate: cfg.isPrivate,
-                sandbox: cfg.sandbox
-            });
-        }
-        else {
-            await setTimeoutBotConfig({
-                appID: cfg.appID,
-                token: cfg.token,
-                secret: cfg.secret,
-                intents: intents,
-                isPrivate: cfg.isPrivate,
-                sandbox: cfg.sandbox
-            });
-        }
-        /**
-         * 创建客户端
-         */
-        createClient(conversation, cfg?.shard ?? [0, 1]);
+        // 创建客户端
+        await createClient({
+            appID: cfg.appID,
+            token: cfg.token,
+            secret: cfg.secret,
+            intents: intents,
+            isPrivate: cfg.isPrivate,
+            sandbox: cfg.sandbox,
+            shard: cfg?.shard ?? [0, 1]
+        }, conversation);
         return true;
     }
     return false;

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

@@ -8,7 +8,8 @@ import { ApiLog } from '../log.js';
  * @returns
  */
 export async function GroupService(config) {
-    const { token, appID } = getBotConfig();
+    const appID = getBotConfig('appID');
+    const token = getBotConfig('token');
     const service = await axios.create({
         baseURL: API_SGROUP,
         timeout: 20000,

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

@@ -9,7 +9,9 @@ import { API_SGROUP_SANDBOX, API_SGROUP } from './config.js';
  * @returns
  */
 export async function GuildServer(config) {
-    const { appID, token, sandbox } = getBotConfig();
+    const token = getBotConfig('token');
+    const sandbox = getBotConfig('sandbox');
+    const appID = getBotConfig('appID');
     const service = await axios.create({
         baseURL: sandbox ? API_SGROUP_SANDBOX : API_SGROUP,
         timeout: 20000,

package/lib/ntqq/sdk/config.js

@@ -1,63 +1,28 @@
-import { getAuthentication } from './api/auth.js';
-/**
- * 机器人缓存配置
- */
-let cfg = {
+// 机器人缓存配置
+const cfg = {
     appID: '',
     token: '',
     secret: '',
     intents: 0,
     isPrivate: false,
-    sandbox: false
+    sandbox: false,
+    shard: [0, 1]
 };
 /**
- * 得到机器人配置
- * @returns
- */
-export function getBotConfig() {
-    return cfg;
-}
-/**
- * 设置机器人配置
+ *
+ * @param key
  * @param val
- * @returns
  */
-export function setBotConfig(val) {
-    cfg = val;
-    return;
+export function setBotConfig(key, val) {
+    if (Object.prototype.hasOwnProperty.call(cfg, key)) {
+        cfg[key] = val;
+    }
 }
 /**
- * 定时鉴权
+ *
+ * @param key
+ * @returns
  */
-export async function setTimeoutBotConfig(cfg) {
-    /**
-     * 发送请求
-     */
-    const data = await getAuthentication(cfg.appID, cfg.secret).then(res => res.data);
-    const g = {
-        appID: cfg.appID,
-        token: data.access_token,
-        secret: cfg.secret,
-        intents: cfg.intents,
-        isPrivate: cfg.isPrivate,
-        sandbox: cfg.sandbox
-    };
-    /**
-     * 设置配置
-     */
-    setBotConfig(g);
-    const bal = async () => {
-        /**
-         * 发送请求
-         */
-        const data = await getAuthentication(cfg.appID, cfg.secret).then(res => res.data);
-        g.token = data.access_token;
-        /**
-         * 设置配置
-         */
-        setBotConfig(g);
-        console.info('refresh', data.expires_in, 's');
-        setTimeout(bal, data.expires_in * 1000);
-    };
-    setTimeout(bal, data.expires_in * 1000);
+export function getBotConfig(key) {
+    return cfg[key];
 }

package/lib/ntqq/sdk/wss.js

@@ -1,14 +1,44 @@
 import WebSocket from 'ws';
-import { gateway } from './api/index.js';
-import { getBotConfig } from './config.js';
+import { gateway, getAuthentication } from './api/index.js';
+import { getBotConfig, setBotConfig } from './config.js';
 import { Counter } from './counter.js';
 const counter = new Counter(1); // 初始值为1
 /**
- * 使用获取到的网关连接地址建立 WebSocket 连接
- * @param token
- * @param callBack
+ * 定时鉴权
+ * @param cfg
+ * @returns
  */
-export async function createClient(conversation, shard = [0, 1]) {
+async function setTimeoutBotConfig() {
+    const callBack = async () => {
+        const appID = getBotConfig('appID');
+        const secret = getBotConfig('secret');
+        // 发送请求
+        const data = await getAuthentication(appID, secret).then(res => res.data);
+        setBotConfig('token', data.access_token);
+        console.info('refresh', data.expires_in, 's');
+        setTimeout(callBack, data.expires_in * 1000);
+    };
+    await callBack();
+    return;
+}
+/**
+ *
+ * @param cfg
+ * @param conversation
+ */
+export async function createClient(cfg, conversation) {
+    setBotConfig('appID', cfg.appID);
+    setBotConfig('token', cfg.token);
+    setBotConfig('intents', cfg.intents);
+    setBotConfig('shard', cfg.shard);
+    setBotConfig('isPrivate', cfg.isPrivate);
+    setBotConfig('sandbox', cfg.sandbox);
+    setBotConfig('secret', cfg.secret);
+    /**
+     * 定时模式
+     */
+    if (cfg.secret != '')
+        await setTimeoutBotConfig();
     // 请求url
     const gatewayUrl = await gateway();
     // 重新连接的逻辑
@@ -17,107 +47,120 @@ export async function createClient(conversation, shard = [0, 1]) {
             console.info('The maximum number of reconnections has been reached, cancel reconnection');
             return;
         }
-        console.info('reconnecting...');
-        // 延迟一段时间后发起重新连接
-        await new Promise(resolve => setTimeout(resolve, 5000));
-        // 调用createClient函数重新建立连接
-        await createClient(conversation, shard);
-        counter.getNextID();
+        setTimeout(() => {
+            console.info('reconnecting...');
+            // 重新starrt
+            start();
+            // 记录
+            counter.getNextID();
+        }, 5000);
     };
-    if (gatewayUrl) {
-        const ws = new WebSocket(gatewayUrl);
-        ws.on('open', () => {
-            console.info('TOKEN ok');
-        });
-        // 标记是否已连接
-        let isConnected = false;
-        // 存储最新的消息序号
-        let heartbeat_interval = 30000;
-        // 鉴权
-        let power;
-        const map = {
-            0: ({ t, d }) => {
-                // 存在,则执行t对应的函数
-                conversation(t, d);
-                // Ready Event，鉴权成功
-                if (t === 'READY') {
-                    power = setInterval(() => {
-                        if (isConnected) {
-                            ws.send(JSON.stringify({
-                                op: 1, //  op = 1
-                                d: null // 如果是第一次连接，传null
-                            }));
+    const start = () => {
+        if (gatewayUrl) {
+            const ws = new WebSocket(gatewayUrl);
+            ws.on('open', () => {
+                console.info('[ws] open');
+            });
+            // 标记是否已连接
+            let isConnected = false;
+            // 存储最新的消息序号
+            let heartbeat_interval = 30000;
+            // 鉴权
+            let power;
+            const map = {
+                0: async ({ t, d }) => {
+                    // 存在,则执行t对应的函数
+                    await conversation(t, d);
+                    // Ready Event，鉴权成功
+                    if (t === 'READY') {
+                        power = setInterval(() => {
+                            if (isConnected) {
+                                ws.send(JSON.stringify({
+                                    op: 1, //  op = 1
+                                    d: null // 如果是第一次连接，传null
+                                }));
+                            }
+                        }, heartbeat_interval);
+                    }
+                    // Resumed Event，恢复连接成功
+                    if (t === 'RESUMED') {
+                        console.info('restore connection');
+                        // 重制次数
+                        counter.setID(0);
+                    }
+                    return;
+                },
+                6: ({ d }) => {
+                    console.info('connection attempt', d);
+                    return;
+                },
+                7: async ({ d }) => {
+                    // 执行重新连接
+                    console.info('reconnect', d);
+                    // 取消鉴权发送
+                    if (power)
+                        clearInterval(power);
+                    return;
+                },
+                9: ({ d, t }) => {
+                    console.info('parameter error', d);
+                    return;
+                },
+                10: ({ d }) => {
+                    // 重制次数
+                    isConnected = true;
+                    // 记录新循环
+                    heartbeat_interval = d.heartbeat_interval;
+                    const token = getBotConfig('token');
+                    const intents = getBotConfig('intents');
+                    const shard = getBotConfig('shard');
+                    // 发送鉴权
+                    ws.send(JSON.stringify({
+                        op: 2, // op = 2
+                        d: {
+                            token: `QQBot ${token}`,
+                            intents: intents,
+                            shard: shard,
+                            properties: {
+                                $os: process.platform,
+                                $browser: 'alemonjs',
+                                $device: 'alemonjs'
+                            }
                         }
-                    }, heartbeat_interval);
-                }
-                // Resumed Event，恢复连接成功
-                if (t === 'RESUMED') {
-                    console.info('restore connection');
+                    }));
+                    return;
+                },
+                11: () => {
+                    // OpCode 11 Heartbeat ACK 消息，心跳发送成功
+                    console.info('heartbeat transmission');
                     // 重制次数
                     counter.setID(0);
+                    return;
+                },
+                12: ({ d }) => {
+                    console.info('platform data', d);
+                    return;
+                }
+            };
+            // 监听消息
+            ws.on('message', async (msg) => {
+                const message = JSON.parse(msg.toString('utf8'));
+                const { op, s, d, t } = message;
+                if (process.env.NTQQ_WS == 'dev') {
+                    console.log('data', d);
                 }
-            },
-            6: message => {
-                console.info('connection attempt', message);
-            },
-            7: async (message) => {
-                // 执行重新连接
-                console.info('reconnect', message);
-                // 取消鉴权发送
-                if (power)
-                    clearInterval(power);
+                // 根据 opcode 进行处理
+                if (Object.prototype.hasOwnProperty.call(map, op)) {
+                    await map[op]({ d, t });
+                }
+            });
+            ws.on('close', async (err) => {
                 await reconnect();
-            },
-            9: message => {
-                console.info('parameter error', message);
-            },
-            10: ({ d }) => {
-                // 重制次数
-                isConnected = true;
-                // 记录新循环
-                heartbeat_interval = d.heartbeat_interval;
-                const { token, intents } = getBotConfig();
-                // 发送鉴权
-                ws.send(JSON.stringify({
-                    op: 2, // op = 2
-                    d: {
-                        token: `QQBot ${token}`,
-                        intents: intents,
-                        shard,
-                        properties: {
-                            $os: process.platform,
-                            $browser: 'alemonjs',
-                            $device: 'alemonjs'
-                        }
-                    }
-                }));
-                // 重制次数
-                counter.setID(0);
-            },
-            11: () => {
-                // OpCode 11 Heartbeat ACK 消息，心跳发送成功
-                console.info('heartbeat transmission');
-            },
-            12: message => {
-                console.info('platform data', message);
-            }
-        };
-        // 监听消息
-        ws.on('message', async (msg) => {
-            const message = JSON.parse(msg.toString('utf8'));
-            const { op, s, d, t } = message;
-            if (process.env.NTQQ_WS == 'dev') {
-                console.log('data', d);
-            }
-            // 根据 opcode 进行处理
-            if (Object.prototype.hasOwnProperty.call(map, op)) {
-                map[op]({ d, t });
-            }
-        });
-        ws.on('close', err => {
-            console.info('[ws] close', err);
-        });
-    }
+                console.info('[ws] close', err);
+            });
+        }
+    };
+    start();
 }
 /**
 

package/lib/qq/index.js

@@ -23,16 +23,10 @@ export async function createAlemonByQQ() {
             token: cfg.token,
             sandbox: cfg.sandbox ?? false
         });
-        /**
-         * 设置 qq-channal 配置
-         */
-        setBotQQConfig({
-            token: cfg.token,
-            appID: cfg.appID,
-            intents: cfg.intents,
-            secret: '',
-            sandbox: cfg.sandbox
-        });
+        setBotQQConfig('appID', cfg.appID);
+        setBotQQConfig('token', cfg.token);
+        setBotQQConfig('intents', cfg.intents);
+        setBotQQConfig('sandbox', cfg.sandbox);
         /**
          * 创建 websocket
          */

package/lib/qq/sdk/api.js

@@ -8,7 +8,9 @@ import { createPicFrom } from '../../core/index.js';
  * @returns
  */
 export async function requestService(config) {
-    const { appID, token, sandbox } = getBotConfig();
+    const appID = getBotConfig('appID');
+    const token = getBotConfig('token');
+    const sandbox = getBotConfig('sandbox');
     const service = await axios.create({
         baseURL: sandbox
             ? 'https://sandbox.api.sgroup.qq.com'

package/lib/qq/sdk/config.js

@@ -1,4 +1,4 @@
-let cfg = {
+const cfg = {
     appID: '',
     token: '',
     secret: '',
@@ -6,18 +6,20 @@ let cfg = {
     sandbox: false
 };
 /**
- * 得到机器人配置
- * @returns
+ *
+ * @param key
+ * @param val
  */
-export function getBotConfig() {
-    return cfg;
+export function setBotConfig(key, val) {
+    if (Object.prototype.hasOwnProperty.call(cfg, key)) {
+        cfg[key] = val;
+    }
 }
 /**
- * 设置机器人配置
- * @param val
+ *
+ * @param key
  * @returns
  */
-export function setBotConfig(val) {
-    cfg = val;
-    return;
+export function getBotConfig(key) {
+    return cfg[key];
 }

package/lib/qq/sdk/wss.js

@@ -35,7 +35,7 @@ export async function createClient(callBack, shard = [0, 4]) {
     if (gatewayUrl) {
         const ws = new WebSocket(gatewayUrl);
         ws.on('open', () => {
-            console.info('token ok');
+            console.info('[ws] open');
         });
         /**
          * 标记是否已连接
@@ -95,7 +95,9 @@ export async function createClient(callBack, shard = [0, 4]) {
                     // OpCode 10 Hello 消息，处理心跳周期
                     isConnected = true;
                     heartbeat_interval = data.heartbeat_interval;
-                    const { appID, token, intents } = getBotConfig();
+                    const appID = getBotConfig('appID');
+                    const token = getBotConfig('token');
+                    const intents = getBotConfig('intents');
                     /**
                      * 发送鉴权
                      */

package/lib/villa/index.js

@@ -1,7 +1,6 @@
 import { checkRobotByVilla } from './login.js';
-import { hmacSha256 } from './sdk/index.js';
+import { hmacSha256, createClient } from './sdk/index.js';
 import { getBotConfigByKey } from '../config/index.js';
-import { createClient } from './sdk/wss.js';
 import { conversation } from './alemon/conversation.js';
 export async function createAlemonByVilla() {
     // 登录

package/lib/villa/sdk/api.js

@@ -3,7 +3,7 @@ import FormData from 'form-data';
 import { createHash } from 'crypto';
 import { ApiEnum } from './types.js';
 import { createPicFrom } from '../../core/index.js';
-import { getClientConfig } from './config.js';
+import { getBotConfig } from './config.js';
 import { ApiLog } from './log.js';
 /**
  * 别野服务
@@ -12,13 +12,14 @@ import { ApiLog } from './log.js';
  * @returns
  */
 export async function villaService(config) {
-    const ClientCfg = getClientConfig();
+    const bot_id = getBotConfig('bot_id');
+    const bot_secret = getBotConfig('bot_secret');
     const service = axios.create({
         baseURL: 'https://bbs-api.miyoushe.com', // 地址
         timeout: 6000, // 响应
         headers: {
-            'x-rpc-bot_id': ClientCfg.bot_id, // 账号
-            'x-rpc-bot_secret': ClientCfg.bot_secret // 密码
+            'x-rpc-bot_id': bot_id, // 账号
+            'x-rpc-bot_secret': bot_secret // 密码
         }
     });
     return await service(config);

package/lib/villa/sdk/config.js

@@ -1,7 +1,4 @@
-/**
- * 配置
- */
-let ClientCfg = {
+const cfg = {
     bot_id: '',
     bot_secret: '',
     pub_key: '',
@@ -9,16 +6,20 @@ let ClientCfg = {
     token: ''
 };
 /**
- * 设置配置
- * @param cfg
+ *
+ * @param key
+ * @param val
  */
-export function setClientConfig(cfg) {
-    ClientCfg = cfg;
+export function setBotConfig(key, val) {
+    if (Object.prototype.hasOwnProperty.call(cfg, key)) {
+        cfg[key] = val;
+    }
 }
 /**
- * 得到配置
+ *
+ * @param key
  * @returns
  */
-export function getClientConfig() {
-    return ClientCfg;
+export function getBotConfig(key) {
+    return cfg[key];
 }

package/lib/villa/sdk/index.js

@@ -1,3 +1,5 @@
 export * as ClientVILLA from './all.js';
 export * from './hs.js';
 export * from './types.js';
+export * from './config.js';
+export * from './wss.js';

package/lib/villa/sdk/wss.js

@@ -3,7 +3,7 @@ import axios from 'axios';
 import { Counter } from './counter.js';
 import { createMessage, parseMessage } from './data.js';
 import { ProtoCommand, ProtoModel } from './proto.js';
-import { setClientConfig } from './config.js';
+import { setBotConfig } from './config.js';
 const counter = new Counter(1); // 初始值为1
 /**
  * 别野服务
@@ -30,7 +30,11 @@ export async function getWebsocketInfo(bot_id, bot_secret) {
  * @returns
  */
 export async function createClient(options, conversation) {
-    setClientConfig(options);
+    setBotConfig('bot_id', options.bot_id);
+    setBotConfig('bot_secret', options.bot_secret);
+    setBotConfig('pub_key', options.pub_key);
+    setBotConfig('token', options.token);
+    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('鉴权失败');
@@ -38,7 +42,7 @@ export async function createClient(options, conversation) {
     }
     const ws = new WebSocket(data.websocket_url);
     ws.on('open', async () => {
-        console.log('open');
+        console.info('[ws] open');
         // login
         ws.send(createMessage({
             ID: counter.getNextID(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "1.1.16",
+  "version": "1.1.18",
   "description": "DOCS https://alemonjs.com/",
   "scripts": {
     "dev": "ts-node alemon.config.ts",

package/types/discord/index.d.ts

@@ -1,6 +1,2 @@
-/**
- * 创建实例
- * @returns
- */
 export declare function createAlemonByDISCORD(): Promise<boolean>;
 export { ClientDISOCRD } from './sdk/index.js';

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

@@ -1,13 +1,17 @@
+interface ClientConfig {
+    token: string;
+    intent: number;
+}
 /**
  *
+ * @param key
  * @param val
  */
-export declare function setDISOCRD(val: string, i: number): void;
+export declare function setBotConfig<T extends keyof ClientConfig>(key: T, val: ClientConfig[T]): void;
 /**
  *
+ * @param key
  * @returns
  */
-export declare function getDISCORD(): {
-    token: string;
-    intent: number;
-};
+export declare function getBotConfig<T extends keyof ClientConfig>(key: T): ClientConfig[T] | undefined;
+export {};

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

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

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

@@ -1,24 +1,21 @@
-interface BotCaCheType {
+export interface BotCaCheType {
     appID: string;
     token: string;
     secret: string;
     intents: number;
     isPrivate?: boolean;
     sandbox?: boolean;
+    shard?: number[];
 }
 /**
- * 得到机器人配置
- * @returns
- */
-export declare function getBotConfig(): BotCaCheType;
-/**
- * 设置机器人配置
+ *
+ * @param key
  * @param val
- * @returns
  */
-export declare function setBotConfig(val: BotCaCheType): void;
+export declare function setBotConfig<T extends keyof BotCaCheType>(key: T, val: BotCaCheType[T]): void;
 /**
- * 定时鉴权
+ *
+ * @param key
+ * @returns
  */
-export declare function setTimeoutBotConfig(cfg: BotCaCheType): Promise<void>;
-export {};
+export declare function getBotConfig<T extends keyof BotCaCheType>(key: T): BotCaCheType[T] | undefined;

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

@@ -1,9 +1,10 @@
+import { type BotCaCheType } from './config.js';
 /**
- * 使用获取到的网关连接地址建立 WebSocket 连接
- * @param token
- * @param callBack
+ *
+ * @param cfg
+ * @param conversation
  */
-export declare function createClient(conversation: (...args: any[]) => any, shard?: number[]): Promise<void>;
+export declare function createClient(cfg: BotCaCheType, conversation: (...args: any[]) => any): Promise<void>;
 /**
 
 1	Heartbeat	Send/Receive	客户端或服务端发送心跳

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

@@ -1,12 +1,13 @@
 import { BotConfig } from './typings.js';
 /**
- * 得到机器人配置
- * @returns
+ *
+ * @param key
+ * @param val
  */
-export declare function getBotConfig(): BotConfig;
+export declare function setBotConfig<T extends keyof BotConfig>(key: T, val: BotConfig[T]): void;
 /**
- * 设置机器人配置
- * @param val
+ *
+ * @param key
  * @returns
  */
-export declare function setBotConfig(val: BotConfig): void;
+export declare function getBotConfig<T extends keyof BotConfig>(key: T): BotConfig[T] | undefined;

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

@@ -1,11 +1,13 @@
 import { type ClientConfig } from './types.js';
 /**
- * 设置配置
- * @param cfg
+ *
+ * @param key
+ * @param val
  */
-export declare function setClientConfig(cfg: ClientConfig): void;
+export declare function setBotConfig<T extends keyof ClientConfig>(key: T, val: ClientConfig[T]): void;
 /**
- * 得到配置
+ *
+ * @param key
  * @returns
  */
-export declare function getClientConfig(): ClientConfig;
+export declare function getBotConfig<T extends keyof ClientConfig>(key: T): ClientConfig[T] | undefined;

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

@@ -1,3 +1,5 @@
 export * as ClientVILLA from './all.js';
 export * from './hs.js';
 export * from './types.js';
+export * from './config.js';
+export * from './wss.js';