alemonjs 1.1.10 → 1.1.11

package/lib/core/dealmsg.js

@@ -200,7 +200,7 @@ async function loadPlugins(dir) {
                     if (match && match[1]) {
                         const packageName = match[1];
                         console.error(`[APP] [${appname}] 缺失 ${packageName} 包`);
-                        // 发生消息
+                        // 发送消息
                         process.send?.({
                             type: 'lack-of-package',
                             message: {

package/lib/define/main.js

@@ -2,11 +2,13 @@ import PupOptions from '../default/pup.js';
 import { rebotMap } from './map.js';
 import { nodeScripts } from './child_process.js';
 import { command } from './command.js';
-import { createApp, setLanchConfig, loadInit, appsInit, setAppProCoinfg, startChrom, getPublicIP } from '../core/index.js';
+import { AppNameError } from '../log/index.js';
+import { setLanchConfig, loadInit, appsInit, setAppProCoinfg, startChrom, getPublicIP } from '../core/index.js';
 import { getPupPath, setBotConfigByKey, getBotConfigByKey } from '../config/index.js';
 import { createWeb } from '../koa/index.js';
 import { autoClearFiles } from '../koa/file.js';
 import { AvailableIntentsEventsEnum } from 'qq-guild-bot';
+import { join } from 'path';
 let OptionsCache;
 /**
  * 得到初始化配置
@@ -229,19 +231,19 @@ export async function defineAlemonConfig(Options) {
      * ************
      */
     if (Options?.login && Options?.app?.init !== false) {
-        const app = createApp(Options?.app?.name ?? 'bot');
-        if (Options?.app?.regJSon?.create === false) {
-            setAppProCoinfg('regex', Options?.app?.regJSon?.create);
+        if (Options?.app?.regJSON?.create === false) {
+            setAppProCoinfg('regex', Options?.app?.regJSON?.create);
         }
-        if (Options?.app?.regJSon?.address) {
-            setAppProCoinfg('route', Options?.app?.regJSon?.address);
+        if (Options?.app?.regJSON?.address) {
+            setAppProCoinfg('route', Options?.app?.regJSON?.address);
         }
-        if (Options?.app?.component) {
-            for await (const item of Options.app.component) {
-                app.component(item);
-            }
+        if (Options?.app?.scripts && typeof Options?.app?.scripts == 'string') {
+            const dir = join(process.cwd(), Options?.app?.scripts);
+            await import(`file://${dir}`).catch(err => {
+                console.error(`file://${dir}`);
+                AppNameError('local dev', err);
+            });
         }
-        app.mount();
     }
     /**
      * ************
@@ -300,9 +302,6 @@ export async function defineAlemonConfig(Options) {
      * ************
      */
     if (Options?.mount !== false) {
-        if (Options?.regex) {
-            setAppProCoinfg('regex', Options?.regex);
-        }
         await appsInit();
     }
     /**

package/lib/log/index.js

@@ -4,3 +4,33 @@ export const everyoneError = (err) => {
     console.error(err);
     return err;
 };
+/**
+ * 捕捉插件错误
+ * @param appname
+ * @param err
+ * @returns
+ */
+export const AppNameError = (appname, err) => {
+    // 属于依赖缺失
+    const match = /Cannot find package '(.+)' imported from/.exec(err.message);
+    if (match && match[1]) {
+        const packageName = match[1];
+        console.error(`[APP] [${appname}] 缺失 ${packageName} 包`);
+        // 发送消息
+        process.send?.({
+            type: 'lack-of-package',
+            message: {
+                packageName
+            }
+        });
+        return;
+    }
+    else {
+        // 其他错误
+        console.error(`[APP] [${appname}]`, err);
+        process.send?.({
+            type: 'error',
+            message: err
+        });
+    }
+};

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

@@ -52,7 +52,8 @@ export const Controller = {
                             }).then(res => res.file_info)
                         },
                         msg_id,
-                        msg_type: 7
+                        msg_type: 7,
+                        msg_seq: ClientNTQQ.getMsgSeq(msg_id)
                     });
                 }
                 return false;
@@ -69,7 +70,8 @@ export const Controller = {
                             }).then(res => res.file_info)
                         },
                         msg_id,
-                        msg_type: 7
+                        msg_type: 7,
+                        msg_seq: ClientNTQQ.getMsgSeq(msg_id)
                     });
                 }
                 return false;
@@ -82,7 +84,8 @@ export const Controller = {
                 for (const item of msg) {
                     arr.push(ClientNTQQ.groupOpenMessages(guild_id, {
                         msg_id,
-                        ...item
+                        ...item,
+                        msg_seq: ClientNTQQ.getMsgSeq(msg_id)
                     }));
                 }
                 return arr;

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

@@ -84,7 +84,8 @@ const Controller = {
                             }).then(res => res.file_info)
                         },
                         msg_id,
-                        msg_type: 7
+                        msg_type: 7,
+                        msg_seq: ClientNTQQ.getMsgSeq(msg_id)
                     }).catch(everyoneError);
                 }
                 return false;
@@ -106,7 +107,8 @@ const Controller = {
                             }).then(res => res.file_info)
                         },
                         msg_id,
-                        msg_type: 7
+                        msg_type: 7,
+                        msg_seq: ClientNTQQ.getMsgSeq(msg_id)
                     }).catch(everyoneError);
                 }
                 return;
@@ -116,6 +118,7 @@ const Controller = {
                 for (const item of msg) {
                     arr.push(ClientNTQQ.usersOpenMessages(open_id, {
                         msg_id,
+                        msg_seq: ClientNTQQ.getMsgSeq(msg_id),
                         ...item
                     }));
                 }
@@ -179,7 +182,8 @@ export async function directController(msg, open_id, msg_id) {
                     }).then(res => res.file_info)
                 },
                 msg_id,
-                msg_type: 7
+                msg_type: 7,
+                msg_seq: ClientNTQQ.getMsgSeq(msg_id)
             }).catch(everyoneError);
         }
         catch (err) {
@@ -214,7 +218,8 @@ export async function directController(msg, open_id, msg_id) {
                     }).then(res => res.file_info)
                 },
                 msg_id,
-                msg_type: 7
+                msg_type: 7,
+                msg_seq: ClientNTQQ.getMsgSeq(msg_id)
             }).catch(everyoneError);
         }
         catch (err) {
@@ -252,13 +257,15 @@ export async function directController(msg, open_id, msg_id) {
                     }).then(res => res.file_info)
                 },
                 msg_id,
-                msg_type: 7
+                msg_type: 7,
+                msg_seq: ClientNTQQ.getMsgSeq(msg_id)
             }).catch(everyoneError);
         }
     }
     return await ClientNTQQ.usersOpenMessages(open_id, {
         content,
         msg_id,
-        msg_type: 0
+        msg_type: 0,
+        msg_seq: ClientNTQQ.getMsgSeq(msg_id)
     }).catch(everyoneError);
 }

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

@@ -25,7 +25,8 @@ export async function replyController(msg, guild_id, msg_id) {
                     }).then(res => res.file_info)
                 },
                 msg_id,
-                msg_type: 7
+                msg_type: 7,
+                msg_seq: ClientNTQQ.getMsgSeq(msg_id)
             }).catch(everyoneError);
         }
         catch (err) {
@@ -57,7 +58,8 @@ export async function replyController(msg, guild_id, msg_id) {
                     }).then(res => res.file_info)
                 },
                 msg_id,
-                msg_type: 7
+                msg_type: 7,
+                msg_seq: ClientNTQQ.getMsgSeq(msg_id)
             }).catch(everyoneError);
         }
         catch (err) {
@@ -87,12 +89,14 @@ export async function replyController(msg, guild_id, msg_id) {
                 }).then(res => res.file_info)
             },
             msg_id,
-            msg_type: 7
+            msg_type: 7,
+            msg_seq: ClientNTQQ.getMsgSeq(msg_id)
         }).catch(everyoneError);
     }
     return await ClientNTQQ.groupOpenMessages(guild_id, {
         content,
         msg_id,
-        msg_type: 0
+        msg_type: 0,
+        msg_seq: ClientNTQQ.getMsgSeq(msg_id)
     }).catch(everyoneError);
 }

package/lib/ntqq/alemon/guild/controller.js

@@ -0,0 +1 @@
+export {};

package/lib/ntqq/index.js

@@ -14,9 +14,7 @@ export async function createAlemonByNtqq() {
          * 读取配置
          */
         const cfg = getBotConfigByKey('ntqq');
-        console.log('cfg', cfg);
         const intents = getIntentsMask(cfg.intents);
-        console.log('intents', intents);
         if (cfg.mode == 'qq-guild') {
             setBotConfig({
                 appID: cfg.appID,

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

@@ -8,7 +8,6 @@ import { API_SGROUP } from './config.js';
  */
 export async function GroupService(config) {
     const { token, appID } = getBotConfig();
-    console.log('token', token);
     const service = await axios.create({
         baseURL: API_SGROUP,
         timeout: 20000,
@@ -29,7 +28,6 @@ export async function gateway() {
     })
         .then(res => res.data)
         .then(data => {
-        console.log('data', data);
         const { url } = data;
         if (url) {
             return url;
@@ -58,6 +56,22 @@ export async function usersOpenMessages(openid, data, msg_id) {
     }).then(res => res.data);
 }
 // /\[🔗[^\]]+\]\([^)]+\)|@everyone/.test(content)
+// map会越来越大,应该自动delte第一个key
+const map = {};
+export function getMsgSeq(MsgId) {
+    if (Object.prototype.hasOwnProperty.call(map, MsgId)) {
+        map[MsgId] = map[MsgId] + 1;
+    }
+    else {
+        map[MsgId] = 1;
+    }
+    const arr = Object.keys(map);
+    if (arr.length > 15) {
+        const firstKey = arr[0];
+        delete map[firstKey];
+    }
+    return map[MsgId];
+}
 /**
  * 发送群聊消息
  * @param group_openid

package/lib/ntqq/sdk/config.js

@@ -34,7 +34,6 @@ export async function setTimeoutBotConfig(cfg) {
      * 发送请求
      */
     const data = await getAuthentication(cfg.appID, cfg.secret).then(res => res.data);
-    console.log('data.access_token', data.access_token);
     const g = {
         appID: cfg.appID,
         token: data.access_token,
@@ -52,7 +51,6 @@ export async function setTimeoutBotConfig(cfg) {
          * 发送请求
          */
         const data = await getAuthentication(cfg.appID, cfg.secret).then(res => res.data);
-        console.log('data.access_token', data.access_token);
         g.token = data.access_token;
         /**
          * 设置配置

package/lib/villa/villa.js

@@ -3,10 +3,6 @@ export const defineVILLA = {
     secret: '',
     pub_key: '',
     masterID: '',
-    http: 'http',
     url: '/api/mys/callback',
-    port: 8080,
-    size: 999999,
-    img_url: '/api/mys/img',
-    IMAGE_DIR: '/data/mys/img'
+    port: 8080
 };

package/package.json

@@ -1,16 +1,10 @@
 {
   "name": "alemonjs",
-  "version": "1.1.10",
+  "version": "1.1.11",
   "description": "DOCS https://alemonjs.com/",
-  "author": "ningmengchongshui",
-  "license": "GPL-2.0",
-  "type": "module",
   "scripts": {
     "app": "ts-node alemon.config.ts",
-    "build": "npm run tsc && npm run tsc:logs && npm run tsc:run ",
     "tsc": "tsc",
-    "tsc:logs": "tsc --module NodeNext --declaration ./logs.ts",
-    "tsc:run": "tsc --module NodeNext --declaration ./run.ts",
     "doc": "typedoc --options typedoc.json",
     "format": "prettier --write .",
     "lint": "eslint . --ext .js,.ts --fix --ignore-path .gitignore"
@@ -46,39 +40,25 @@
     "@types/ws": "^8.5.5",
     "@typescript-eslint/eslint-plugin": "^5.60.0",
     "@typescript-eslint/parser": "^5.60.0",
-    "alemon-rollup": "^1.0.4",
-    "art-template": "^4.13.2",
     "eslint": "^8.43.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "prettier": "^2.8.8",
-    "ts-node": "^10.9.1",
-    "typedoc": "^0.25.2",
-    "typescript": ">=5.0.4 <5.1.0"
+    "typedoc": "^0.25.2"
   },
+  "author": "ningmengchongshui",
+  "license": "GPL-2.0",
+  "type": "module",
   "types": "types",
   "main": "lib/index.js",
   "files": [
-    "bin",
     "lib",
-    "types",
-    "run.js",
-    "run.d.ts",
-    "logs.js",
-    "logs.d.ts"
+    "types"
   ],
   "exports": {
     ".": {
       "import": "./lib/index.js",
       "types": "./types/index.d.ts"
-    },
-    "./run": {
-      "import": "./run.js",
-      "types": "./run.d.ts"
-    },
-    "./logs": {
-      "import": "./logs.js",
-      "types": "./logs.d.ts"
     }
   },
   "publishConfig": {

package/types/define/types.d.ts

@@ -16,10 +16,6 @@ export interface AlemonOptions {
      * 事件屏蔽
      */
     shieldEvent?: string[];
-    /**
-     * 是否生成json
-     */
-    regex?: boolean;
     /**
      * 自定义起始符规则
      */
@@ -33,21 +29,13 @@ export interface AlemonOptions {
      */
     app?: {
         /**
-         * 是否创建
+         * 是否执行
          */
         init?: boolean;
-        /**
-         * 应用名称
-         */
-        name?: string;
-        /**
-         * 可执行的包
-         */
-        component?: any[];
         /**
          * 指令预览
          */
-        regJSon?: {
+        regJSON?: {
             /**
              * 是否生成
              * defaukt true
@@ -59,12 +47,7 @@ export interface AlemonOptions {
              */
             address?: string;
         };
-        /**
-         * 重定义消息对象
-         * @param args
-         * @returns
-         */
-        redefineMessage?: (...args: any[]) => any;
+        scripts?: string;
     };
     /**
      * 插件配置

package/types/log/index.d.ts

@@ -1,3 +1,10 @@
 export * from './user.js';
 export * from './event.js';
 export declare const everyoneError: (err: any) => any;
+/**
+ * 捕捉插件错误
+ * @param appname
+ * @param err
+ * @returns
+ */
+export declare const AppNameError: (appname: string, err: any) => void;

package/types/ntqq/alemon/guild/controller.d.ts

@@ -0,0 +1 @@
+export {};

package/types/ntqq/sdk/api/group.d.ts

@@ -35,6 +35,7 @@ export declare function usersOpenMessages(openid: string, data: {
     id: string;
     timestamp: number;
 }>;
+export declare function getMsgSeq(MsgId: string): any;
 /**
  * 发送群聊消息
  * @param group_openid

package/types/villa/villa.d.ts

@@ -28,32 +28,12 @@ export interface VILLAOptions {
      * 端口
      */
     port?: number;
-    /**
-     * 随机数大小
-     */
-    size?: number;
-    /**
-     * 图片路由
-     */
-    img_url?: string;
-    /**
-     * 本地缓存图地址
-     */
-    IMAGE_DIR?: string;
-    /**
-     * 头模式
-     */
-    http?: string;
 }
 export declare const defineVILLA: {
     bot_id: string;
     secret: string;
     pub_key: string;
     masterID: string;
-    http: string;
     url: string;
     port: number;
-    size: number;
-    img_url: string;
-    IMAGE_DIR: string;
 };

package/logs.d.ts

@@ -1,6 +0,0 @@
-/**
- * 重定义log
- * @param fun 中间值
- * @param prefix 前缀
- */
-export declare function setLog(fun: (...args: any[]) => any): void

package/logs.js

@@ -1,23 +0,0 @@
-/**
- * 重定义log
- * @param fun 中间值
- * @param prefix 前缀
- */
-export function setLog(fun) {
-  const log = console.log
-  global.console.log = (...argv) => {
-    log(fun(), ...argv)
-  }
-  const info = console.info
-  global.console.info = (...argv) => {
-    info(fun(), ...argv)
-  }
-  const error = console.error
-  global.console.error = (...argv) => {
-    error(fun(), ...argv)
-  }
-  const debug = console.debug
-  global.console.debug = (...argv) => {
-    debug(fun(), ...argv)
-  }
-}

package/run.d.ts

@@ -1,5 +0,0 @@
-/**
- * 指令运行队则
- * @param ars 指令参数数组
- */
-export declare function commandRun(ars: string[]): void

package/run.js

@@ -1,29 +0,0 @@
-import { spawn } from 'child_process'
-import { existsSync } from 'fs'
-import { join } from 'path'
-/**
- * 指令运行队则
- * @param ars 指令参数数组
- */
-export function commandRun(ars) {
-  const msg = ars.join(' ')
-  const files = msg.match(/(\S+\.js|\S+\.ts)/g) ?? ['alemon.config.ts']
-  const argsWithoutFiles = msg.replace(/(\S+\.js|\S+\.ts)/g, '')
-  for (const item of files) {
-    if (!existsSync(join(process.cwd(), item))) {
-      console.info('no file', item)
-      continue
-    }
-    const isTypeScript = item.endsWith('.ts')
-    const command = isTypeScript ? 'ts-node' : 'node'
-    const cmd = `${command} ${item} ${argsWithoutFiles}`
-    console.info(cmd)
-    const childProcess = spawn(cmd, { shell: true })
-    childProcess.stdout.on('data', data => {
-      process.stdout.write(data.toString())
-    })
-    childProcess.stderr.on('data', data => {
-      process.stderr.write(data.toString())
-    })
-  }
-}