alemonjs 1.0.39 → 1.0.40

package/lib/ntqq/login.js

@@ -1,5 +1,5 @@
 import { setBotConfigByKey, getBotConfigByKey } from '../config/index.js';
-import { NtQQEventsEnum } from '../default/types.js';
+import { NTQQEventsEnum } from './ntqq.js';
 /**
  * 登录配置
  * @param Bcf
@@ -12,14 +12,14 @@ export async function checkRobotByQQ() {
         (config.token ?? '') !== '') {
         if (!config.intents) {
             config.intents = [
-                NtQQEventsEnum.GROUP_AT_MESSAGE_CREATE,
-                NtQQEventsEnum.C2C_MESSAGE_CREATE
+                NTQQEventsEnum.GROUP_AT_MESSAGE_CREATE,
+                NTQQEventsEnum.C2C_MESSAGE_CREATE
             ];
         }
         setBotConfigByKey('ntqq', config);
         return true;
     }
-    console.error('[AlemonJS]', '[LOGIN]', '-----------------------');
-    console.error('[AlemonJS]', '[LOGIN]', 'ntqq配置加载失败~');
+    console.error('login', '-----------------------');
+    console.error('login', 'NTQQ config err');
     return false;
 }

package/lib/ntqq/ntqq.js

@@ -1,4 +1,20 @@
-export default {
+/**
+ * *****
+ * ntqq订阅
+ * ****
+ */
+export var NTQQEventsEnum;
+(function (NTQQEventsEnum) {
+    /**
+     * 群聊消息
+     */
+    NTQQEventsEnum["GROUP_AT_MESSAGE_CREATE"] = "GROUP_AT_MESSAGE_CREATE";
+    /**
+     * 单聊消息
+     */
+    NTQQEventsEnum["C2C_MESSAGE_CREATE"] = "C2C_MESSAGE_CREATE";
+})(NTQQEventsEnum = NTQQEventsEnum || (NTQQEventsEnum = {}));
+export const defineNtqq = {
     appID: '',
     token: '',
     secret: '',

package/lib/ntqq/sdk/wss.js

@@ -15,11 +15,11 @@ export async function getGatewayUrl() {
             return response.url;
         }
         else {
-            console.error('[AlemonJS]', '[http] err:', null);
+            console.error('http err:', null);
         }
     }
     catch (error) {
-        console.error('[AlemonJS]', '[token] err:', error.message);
+        console.error('token err:', error.message);
     }
 }
 let reconnectAttempts = 0; // 重新连接计数器
@@ -36,10 +36,10 @@ export async function createClient(call, shard = [0, 1]) {
     // 重新连接的逻辑
     const reconnect = async () => {
         if (reconnectAttempts >= 5) {
-            console.info('[AlemonJS]', '已达到最大重连次数，取消重新连接');
+            console.info('The maximum number of reconnections has been reached, cancel reconnection');
             return;
         }
-        console.info('[AlemonJS]', '正在重新连接...');
+        console.info('reconnecting...');
         // 延迟一段时间后发起重新连接
         await new Promise(resolve => setTimeout(resolve, 5000));
         // 调用createClient函数重新建立连接
@@ -49,7 +49,7 @@ export async function createClient(call, shard = [0, 1]) {
     if (gatewayUrl) {
         const ws = new WebSocket(gatewayUrl);
         ws.on('open', () => {
-            console.info('[AlemonJS]', '[token] ok');
+            console.info('token ok');
         });
         /**
          * 标记是否已连接
@@ -98,19 +98,19 @@ export async function createClient(call, shard = [0, 1]) {
                     }
                     // Resumed Event，恢复连接成功
                     if (t === 'RESUMED') {
-                        console.info('[AlemonJS]', '恢复连接');
+                        console.info('restore connection');
                         // 重制次数
                         reconnectAttempts = 0;
                     }
                     break;
                 }
                 case 6: {
-                    console.info('[AlemonJS]', '[连接尝试]', message);
+                    console.info('connection attempt', message);
                     break;
                 }
                 case 7: {
                     // 执行重新连接
-                    console.info('[AlemonJS]', '[重新连接]', message);
+                    console.info('reconnect', message);
                     // 取消鉴权发送
                     if (power) {
                         clearInterval(power);
@@ -119,7 +119,7 @@ export async function createClient(call, shard = [0, 1]) {
                     break;
                 }
                 case 9: {
-                    console.info('[AlemonJS]', '[参数错误]', message);
+                    console.info('parameter error', message);
                     break;
                 }
                 case 10: {
@@ -148,16 +148,16 @@ export async function createClient(call, shard = [0, 1]) {
                 }
                 case 11: {
                     // OpCode 11 Heartbeat ACK 消息，心跳发送成功
-                    console.info('[AlemonJS]', '[心跳发送]', message);
+                    console.info('heartbeat transmission', message);
                     break;
                 }
                 case 12: {
-                    console.info('[AlemonJS]', '[平台数据]', message);
+                    console.info('platform data', message);
                 }
             }
         });
         ws.on('close', () => {
-            console.info('[AlemonJS]', '[ws] close');
+            console.info('[ws] close');
         });
     }
 }

package/lib/qq/alemon/conversation.js

@@ -23,7 +23,7 @@ export const createConversationByQQ = ws => {
     ws.on(SessionEvents.READY, async (data) => {
         const cfg = getBotConfigByKey('qq');
         if (cfg.sandbox)
-            console.info('[AlemonJS]', '[READY]', data);
+            console.info('ready', data);
         const robot = data.msg;
         const bot = {
             id: robot.user.id,
@@ -81,59 +81,56 @@ export const createConversationByQQ = ws => {
          * 审核事件监听
          */
         ws.on(AvailableIntentsEventsEnum.AUDIO_ACTION, AUDIO_ACTION);
-        console.info('[AlemonJS]', '[QQ]', ` 欢迎回来 ${bot.name}`);
+        console.info('qq', 'Welcome back', bot.name);
     });
     /**
      * 权限错误
      */
     ws.on(SessionEvents.ERROR, (one) => {
-        console.error('[AlemonJS]', '[ERROR]', one);
+        console.error('err', one);
     });
     /**
      * 超长断连
      */
     ws.on(SessionEvents.DEAD, (one) => {
-        console.error('[AlemonJS]', 'DEAD', one);
-        console.error('[AlemonJS]', '请确认配置！');
-        console.error('[AlemonJS]', '账户密码是否正确？');
-        console.error('[AlemonJS]', '域事件是否匹配？');
+        console.error('dead', one);
     });
     /**
      * 关闭
      */
     ws.on(SessionEvents.CLOSED, (one) => {
-        console.error('[AlemonJS]', '[CLOSED]', one);
+        console.error('close', one);
     });
     /**
      * 断开连接
      */
     ws.on(SessionEvents.DISCONNECT, (one) => {
-        console.error('[AlemonJS]', '[DISCONNECT]', one);
+        console.error('disconnect', one);
     });
     /**
      * 无效会话
      */
     ws.on(SessionEvents.INVALID_SESSION, (one) => {
-        console.error('[AlemonJS]', '[INVALID_SESSION]', one);
+        console.error('invalid session', one);
     });
     /**
      * 再连接
      */
     ws.on(SessionEvents.RECONNECT, (one) => {
-        console.error('[AlemonJS]', '[RECONNECT]', one);
+        console.error('reconnect', one);
     });
     /**
      * 重新开始
      */
     ws.on(SessionEvents.RESUMED, (one) => {
-        console.error('[AlemonJS]', '[RESUMED]', one);
+        console.error('resumed', one);
     });
     /**
      * WS断连
      */
     ws.on(SessionEvents.EVENT_WS, async (one) => {
         if (one.eventType == 'DISCONNECT') {
-            console.info('[AlemonJS]', '[EVENT_WS][DISCONNECT]', one);
+            console.info('ws disconnect', one);
         }
     });
 };

package/lib/qq/alemon/e.js

@@ -5,7 +5,7 @@ export const now_e = {
      * @returns
      */
     replyCard: async (obj) => {
-        console.info('[AlemonJS]', '待实现');
+        console.info('to be implemented');
         return false;
     },
     /**
@@ -15,7 +15,7 @@ export const now_e = {
      * @returns
      */
     replyByMid: async (mid, msg) => {
-        console.info('[AlemonJS]', '待实现');
+        console.info('to be implemented');
         return false;
     },
     /**
@@ -25,7 +25,7 @@ export const now_e = {
      * @returns
      */
     replyEmoji: async (mid, boj) => {
-        console.info('[AlemonJS]', '待实现');
+        console.info('to be implemented');
         return false;
     },
     /**
@@ -35,7 +35,7 @@ export const now_e = {
      * @returns
      */
     deleteEmoji: async (mid, boj) => {
-        console.info('[AlemonJS]', '待实现');
+        console.info('to be implemented');
         return false;
     }
 };

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

@@ -146,7 +146,7 @@ async function directMessage(e, event) {
      * @returns
      */
     e.replyEmoji = async (mid, boj) => {
-        console.info('[AlemonJS]', '不可用');
+        console.info('temporarily unavailable');
         return false;
     };
     /**
@@ -156,7 +156,7 @@ async function directMessage(e, event) {
      * @returns
      */
     e.deleteEmoji = async (mid, boj) => {
-        console.info('[AlemonJS]', '不可用');
+        console.info('temporarily unavailable');
         return false;
     };
     e.msg_txt = event.msg.content;

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

@@ -41,11 +41,11 @@ export const GUILD_MEMBERS = async (event) => {
     })
         .catch(error);
     if (typeof ChannelsData == 'boolean') {
-        console.info('[AlemonJS]', `[${Eevent}] [${eventType}] ${false}`);
+        console.info(`[${Eevent}] [${eventType}] ${false}`);
         return false;
     }
     if (ChannelsData.length == 0) {
-        console.info('[AlemonJS]', `[${Eevent}] [${eventType}] ${false}`);
+        console.info(`[${Eevent}] [${eventType}] ${false}`);
         return false;
     }
     const ChannelData = ChannelsData.find(item => item.type === 0);

package/lib/qq/login.js

@@ -21,7 +21,7 @@ export async function checkRobotByQQ() {
         setBotConfigByKey('qq', config);
         return true;
     }
-    console.error('[AlemonJS]', '[LOGIN]', '-----------------------');
-    console.error('[AlemonJS]', '[LOGIN]', 'QQ配置加载失败~');
+    console.error('login', '-----------------------');
+    console.error('login', 'QQ config err');
     return false;
 }

package/lib/qq/qq.js

@@ -1,5 +1,5 @@
 import { AvailableIntentsEventsEnum } from 'qq-guild-bot';
-export default {
+export const defineQQ = {
     appID: '',
     token: '',
     secret: '',

package/lib/qq/sdk/wss.js

@@ -15,11 +15,11 @@ export async function getGatewayUrl() {
             return response.url;
         }
         else {
-            console.error('[AlemonJS]', '[http] err:', null);
+            console.error('http err:', null);
         }
     }
     catch (error) {
-        console.error('[AlemonJS]', '[token] err:', error.message);
+        console.error('token err:', error.message);
     }
 }
 /**
@@ -35,7 +35,7 @@ export async function createClient(callBack) {
     if (gatewayUrl) {
         const ws = new WebSocket(gatewayUrl);
         ws.on('open', () => {
-            console.info('[AlemonJS]', '[token] ok');
+            console.info('token ok');
         });
         /**
          * 标记是否已连接
@@ -116,7 +116,7 @@ export async function createClient(callBack) {
                 }
                 case 11: {
                     // OpCode 11 Heartbeat ACK 消息，心跳发送成功
-                    console.info('[AlemonJS]', '心跳发送成功~');
+                    console.info('heartbeat transmission');
                     break;
                 }
                 case 12: {
@@ -125,7 +125,7 @@ export async function createClient(callBack) {
             }
         });
         ws.on('close', () => {
-            console.error('[AlemonJS]', '[ws] close');
+            console.error('ws close');
         });
     }
 }

package/lib/run.js

@@ -11,13 +11,13 @@ export function commandRun(ars) {
     const argsWithoutFiles = msg.replace(/(\S+\.js|\S+\.ts)/g, '');
     for (const item of files) {
         if (!existsSync(join(process.cwd(), item))) {
-            console.info('[AlemonJS]', '[NO FILE]', item);
+            console.info('no file', item);
             continue;
         }
         const isTypeScript = item.endsWith('.ts');
         const command = isTypeScript ? 'npx ts-node' : 'node';
         const cmd = `${command} ${item} ${argsWithoutFiles}`;
-        console.info('[AlemonJS]', cmd);
+        console.info(cmd);
         const childProcess = spawn(cmd, { shell: true });
         childProcess.stdout.on('data', data => {
             process.stdout.write(data.toString());

package/lib/villa/alemon/conversation.js

@@ -42,7 +42,7 @@ export async function callBackByVilla(event) {
         return await ConversationMap[event.type](event);
     }
     else {
-        // console.info('[新事件触发]', event.type)
+        // console.info('[new event triggering]', event.type)
         return;
     }
 }

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

@@ -5,7 +5,7 @@ export const now_e = {
      * @returns
      */
     replyCard: async (arr) => {
-        console.info('[AlemonJS]', '待实现');
+        console.info('to be implemented');
         return false;
     },
     /**
@@ -15,7 +15,7 @@ export const now_e = {
      * @returns
      */
     replyByMid: async (mid, msg) => {
-        console.info('[AlemonJS]', '待实现');
+        console.info('to be implemented');
         return false;
     },
     /**
@@ -25,7 +25,7 @@ export const now_e = {
      * @returns
      */
     replyEmoji: async (mid, boj) => {
-        console.info('[AlemonJS]', '待实现');
+        console.info('to be implemented');
         return false;
     },
     /**
@@ -35,7 +35,7 @@ export const now_e = {
      * @returns
      */
     deleteEmoji: async (mid, boj) => {
-        console.info('[AlemonJS]', '待实现');
+        console.info('to be implemented');
         return false;
     }
 };

package/lib/villa/index.js

@@ -20,7 +20,7 @@ export async function createAlemonByVilla() {
             callback_port: cfg.port ?? 8080,
             callback_url: cfg.url ?? '/api/mys/callback'
         }, callBackByVilla, async () => {
-            console.info('[AlemonJS]', '[HELLO] 欢迎使用大别野');
+            console.info('VILLA Welcome back');
         });
         return true;
     }

package/lib/villa/login.js

@@ -15,7 +15,7 @@ export async function checkRobotByVilla() {
         setBotConfigByKey('villa', config);
         return true;
     }
-    console.error('[AlemonJS]', '[LOGIN]', '-----------------------');
-    console.error('[AlemonJS]', '[LOGIN]', 'VILLA配置加载失败~');
+    console.error('login', '-----------------------');
+    console.error('login', 'VILLA config err');
     return false;
 }

package/lib/villa/sdk/client.js

@@ -39,11 +39,11 @@ export function createClient({ bot_id, bot_secret, callback_url = '/api/mys/call
                 /**
                  * 处理完毕后返回响应
                  */
-                ctx.body = { message: '错误回调', retcode: 0 };
+                ctx.body = { message: 'error callback', retcode: 0 };
                 return;
             }
             await callBack(event).catch(err => {
-                console.error('[AlemonJS]', '回调出错');
+                console.error('callback error');
                 console.error(err);
             });
         }
@@ -52,11 +52,11 @@ export function createClient({ bot_id, bot_secret, callback_url = '/api/mys/call
             /**
              * 处理完毕后返回响应
              */
-            ctx.body = { message: '执行错误', retcode: 0 };
+            ctx.body = { message: 'execution error', retcode: 0 };
             return;
         }
         // 处理完毕后返回响应
-        ctx.body = { message: '处理完成', retcode: 0 };
+        ctx.body = { message: 'processing completed', retcode: 0 };
     });
     /**
      * 将路由注册到应用
@@ -72,17 +72,17 @@ export function createClient({ bot_id, bot_secret, callback_url = '/api/mys/call
      */
     function handlePortConflict(err) {
         if (err.code === 'EADDRINUSE') {
-            console.error('[AlemonJS]', `端口 ${currentPort} 被占用，尝试启动新的端口...`);
+            console.error(`port ${currentPort} occupied, attempting to start a new port...`);
             currentPort++;
             size++;
             if (size >= 10) {
-                console.error('[AlemonJS]', '寻端失败~');
+                console.error('find port err');
                 return;
             }
             createApp(currentPort);
         }
         else {
-            console.error('[AlemonJS]', '启动应用程序时发生错误：', err);
+            console.error('an error occurred while starting the application', err);
         }
     }
     /**
@@ -110,10 +110,10 @@ export function createClient({ bot_id, bot_secret, callback_url = '/api/mys/call
             // 获取ip4
             const ip = await getIP();
             if (ip) {
-                console.info('[AlemonJS]', '[VILLA OPEN]', `http://${ip}:${port ?? 8080}${callback_url ?? '/api/mys/callback'}`);
+                console.info('villa open', `http://${ip}:${port ?? 8080}${callback_url ?? '/api/mys/callback'}`);
             }
             else {
-                console.error('[AlemonJS]', '[VILLA] 公网IP识别失败,无法支持运行');
+                console.error('vllia no public ip');
                 return;
             }
         })

package/lib/villa/sdk/hs.js

@@ -14,7 +14,7 @@ export function hmacSha256(secret, pubKey) {
         return Buffer.from(rawHmac).toString('hex');
     }
     catch (e) {
-        console.error('[AlemonJS]', '加密错误');
+        console.error('encryption error');
         throw new Error(e);
     }
 }

package/lib/villa/villa.js

@@ -1,4 +1,4 @@
-export default {
+export const defineVILLA = {
     bot_id: '',
     secret: '',
     pub_key: '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "1.0.39",
+  "version": "1.0.40",
   "description": "DOCS https://alemonjs.com/",
   "author": "ningmengchongshui",
   "license": "GPL-2.0",

package/run.js

@@ -11,13 +11,13 @@ export function commandRun(ars) {
   const argsWithoutFiles = msg.replace(/(\S+\.js|\S+\.ts)/g, '')
   for (const item of files) {
     if (!existsSync(join(process.cwd(), item))) {
-      console.log('[NO FILE]', item)
+      console.log('no file', item)
       continue
     }
     const isTypeScript = item.endsWith('.ts')
     const command = isTypeScript ? 'npx ts-node' : 'node'
     const cmd = `${command} ${item} ${argsWithoutFiles}`
-    console.log('[alemonjs]', cmd)
+    console.log(cmd)
     const childProcess = spawn(cmd, { shell: true })
     childProcess.stdout.on('data', data => {
       process.stdout.write(data.toString())

package/types/config/types.d.ts

@@ -1,7 +1,10 @@
 import { PuppeteerLaunchOptions } from 'puppeteer';
-import { KookOptionsg, NtQQOptions, QqGuildOptions, VillaOptions } from '../default/types.js';
-import { MysqlOptions, RedisOptions } from '../default/typings.js';
+import { MysqlOptions, RedisOptions } from '../default/types.js';
 import { ServerOptions } from '../koa/types.js';
+import { KOOKOptions } from '../kook/kook.js';
+import { VILLAOptions } from '../villa/villa.js';
+import { QQOptions } from '../qq/qq.js';
+import { NTQQOptions } from '../ntqq/ntqq.js';
 /**
  * ******
  * config
@@ -10,10 +13,10 @@ import { ServerOptions } from '../koa/types.js';
 export interface ConfigType {
     redis: RedisOptions;
     mysql: MysqlOptions;
-    kook: KookOptionsg;
-    villa: VillaOptions;
-    qq: QqGuildOptions;
+    kook: KOOKOptions;
+    villa: VILLAOptions;
+    qq: QQOptions;
     server: ServerOptions;
     puppeteer: PuppeteerLaunchOptions;
-    ntqq: NtQQOptions;
+    ntqq: NTQQOptions;
 }