alemonjs 1.0.13 → 1.0.15

package/bin/main.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 import { spawn } from 'child_process'
 const ars = process.argv.slice(2)

package/lib/core/apps.js

@@ -2,7 +2,6 @@ import { dirname, basename } from 'path';
 import { fileURLToPath } from 'url';
 import { setMessage } from './message.js';
 import { setApp } from './app.js';
-import { setAppsHelp } from './dealmsg.js';
 /**
  * 得到执行路径
  * @param url
@@ -34,11 +33,6 @@ export function createApp(AppName) {
      */
     let acount = 0;
     return {
-        /**
-         * 设置指令json地址
-         * @param rt = '/public/defset'
-         */
-        setHelp: setAppsHelp,
         /**
          * 重定义消息
          * @param fnc

package/lib/core/configs.js

@@ -0,0 +1,22 @@
+const ApplicationProcessingConfiguration = {
+    // 根目录
+    dir: '/application',
+    // 主函数
+    main: '/index',
+    type: 'ts',
+    // 打开正则
+    openRegex: /./,
+    // 屏蔽正则
+    closeRegex: /./,
+    // 指令生成地址
+    route: '/public/defset'
+};
+export function setAppProCoinfg(key, val) {
+    // 当前仅当同属性名的时候才会覆盖默认配置
+    if (Object.prototype.hasOwnProperty.call(ApplicationProcessingConfiguration, val)) {
+        ApplicationProcessingConfiguration[key] = val;
+    }
+}
+export function getAppProCoinfg(key) {
+    return ApplicationProcessingConfiguration[key];
+}

package/lib/core/dealmsg.js

@@ -6,71 +6,27 @@ import { getMessage } from './message.js';
 import { getApp, delApp, getAppKey } from './app.js';
 import { EventEnum } from './typings.js';
 import { conversationHandlers, getConversationState } from './dialogue.js';
+import { getAppProCoinfg } from './configs.js';
 const Command = {};
 const CommandNotR = {};
 /**
- * ***********
- * plugins管理
- * ***********
+ * 机器人统计
  */
-let PluginsArr = [];
 const plugins = {};
-/**
- * 默认执行地址
- */
-const route = '/public/defset';
-/**
- * 执行文件
- */
-let addressMenu = join(process.cwd(), route);
 // 大正则
 let mergedRegex;
-// 插件目录匹配规则
-let appRegex = /./;
-// 插件目录取消规则
-let appRegexClose;
-/**
- * 插件名匹配
- * @param val
- */
-export function setAppRegex(val) {
-    const { RegexOpen, RegexClose } = val;
-    if (RegexOpen) {
-        appRegex = RegexOpen;
-    }
-    if (RegexClose) {
-        appRegexClose = RegexClose;
-    }
-}
-/**
- * 得到插件名匹配模式
- * @returns
- */
-export function getAppRegex() {
-    return {
-        RegexOpen: appRegex,
-        RegexClose: appRegexClose
-    };
-}
-/**
- * 设置指令json地址
- * @param rt '/public/defset'
- */
-export function setAppsHelp(rt = route) {
-    addressMenu = join(process.cwd(), rt);
-}
 /**
  * 得到机器人帮助
  * @param AppName
  * @returns
  */
 export function getPluginHelp(AppName) {
-    const basePath = join(addressMenu, `${AppName}.json`);
+    const dir = getAppProCoinfg('route');
+    const basePath = join(process.cwd(), dir, `${AppName}.json`);
     return JSON.parse(readFileSync(basePath, 'utf8'));
 }
 /**
  * 创建机器人帮助
- * 存在且得到的app不为[]时才会创建json
  */
 function createPluginHelp() {
     // 存在app才创建
@@ -83,13 +39,14 @@ function createPluginHelp() {
             }
         }
         if (t) {
+            const dir = join(process.cwd(), getAppProCoinfg('route'));
             // 不存在
-            if (!existsSync(addressMenu))
-                mkdirSync(addressMenu, { recursive: true });
+            if (!existsSync(dir))
+                mkdirSync(dir, { recursive: true });
             // 创建help
             for (const item in plugins) {
                 if (plugins[item] && plugins[item].length != 0) {
-                    const basePath = join(addressMenu, `${item}.json`);
+                    const basePath = join(dir, `${item}.json`);
                     const jsonData = JSON.stringify(plugins[item], null, 2);
                     // 异步创建避免阻塞
                     writeFile(basePath, jsonData, 'utf-8');
@@ -112,25 +69,18 @@ async function synthesis(AppsObj, appname) {
         const keys = new AppsObj[item]();
         // 控制类型
         const eventType = keys['eventType'] ?? 'CREATE';
-        /**
-         * 不合法
-         */
+        // 不合法
         if (!keys['rule'] ||
             !Array.isArray(keys['rule']) ||
             keys['rule'].length == 0) {
             continue;
         }
-        /**
-         * 指令不存在
-         */
+        // 指令不存在
         for await (const key of keys['rule']) {
             if (!key['fnc'] ||
                 !key['reg'] ||
                 typeof keys[key['fnc']] !== 'function') {
-                /**
-                 * 函数指定不存在,正则不存在
-                 * 得到的不是函数
-                 */
+                /// 函数指定不存在,正则不存在 得到的不是函数
                 continue;
             }
             // 先看指令优先级,没有就看类优先级,再没有则默认优先级
@@ -202,41 +152,34 @@ async function loadPlugins(dir) {
     const flies = readdirSync(dir);
     if (flies.length == 0)
         return;
+    // 读取配置
+    const open = getAppProCoinfg('openRegex');
+    const close = getAppProCoinfg('closeRegex');
+    // 排除
     const apps = flies
-        .filter(item => appRegex.test(item))
+        .filter(item => open.test(item))
         .filter(item => {
-        if (!appRegexClose) {
+        if (!close) {
             return true;
         }
-        if (appRegexClose.test(item)) {
+        if (close.test(item)) {
             return false;
         }
         return true;
     });
     /**
-     * 识别并执行插件
+     * 动态扫描
      */
+    const main = getAppProCoinfg('main');
+    const type = getAppProCoinfg('type');
     for await (const appname of apps) {
-        if (existsSync(`${dir}/${appname}/index.ts`)) {
-            /**
-             * 优先考虑ts
-             */
-            await import(`file://${dir}/${appname}/index.ts`).catch(err => {
-                console.error(`file://${dir}/${appname}/index.ts`);
+        if (existsSync(`${dir}/${appname}${main}.${type}`)) {
+            await import(`file://${dir}/${appname}${main}.${type}`).catch(err => {
+                console.error(`file://${dir}/${appname}${main}.${type}`);
                 console.error(err);
                 process.exit();
             });
         }
-        else if (existsSync(`${dir}/${appname}/index.js`)) {
-            /**
-             * 允许js写法
-             */
-            await import(`file://${dir}/${appname}/index.js`).catch(error => {
-                console.error(`file://${dir}/${appname}/index.js`);
-                console.error(error);
-                process.exit();
-            });
-        }
     }
     return;
 }
@@ -244,7 +187,6 @@ async function loadPlugins(dir) {
  * 初始化应用
  */
 function dataInit() {
-    PluginsArr = [];
     for (const item of EventEnum) {
         if (isNaN(Number(item))) {
             Command[item] = [];
@@ -258,87 +200,55 @@ function dataInit() {
  * @returns
  */
 export async function appsInit() {
-    /**
-     * 清空当前的apps
-     */
+    // 清空当前的apps
     dataInit();
-    /**
-     * 得到所有插件名
-     */
+    // 得到所有插件名
     const APPARR = getAppKey();
-    /**
-     * 导出所有插件名
-     */
+    // 导出所有插件名
     for await (const item of APPARR) {
-        /**
-         * 获取插件集
-         */
+        // 获取插件集
         const apps = getApp(item);
-        /**
-         * 分析插件集
-         */
+        // 分析插件集
         await synthesis(apps, item);
-        /**
-         * 记录该插件
-         */
-        PluginsArr.push(item);
-        /**
-         * 删除指集
-         */
+        // 删除指集
         delApp(item);
     }
-    /**
-     * 排序
-     */
+    // 排序
     for (const val in Command) {
         Command[val] = lodash.orderBy(Command[val], ['priority'], ['asc']);
     }
-    /**
-     * 排序
-     */
+    // 排序
     for (const val in CommandNotR) {
         CommandNotR[val] = lodash.orderBy(CommandNotR[val], ['priority'], ['asc']);
     }
-    /***
-     * 排序之后把所有正则变成一条正则
-     */
+    // 排序之后把所有正则变成一条正则
     const mergedRegexArr = [];
     for (const val in Command) {
-        for (const data of Command[val]) {
-            if (data.reg !== undefined && data.eventType !== undefined) {
-                mergedRegexArr.push(data.reg);
-            }
+        for await (const { reg } of Command[val]) {
+            mergedRegexArr.push(reg);
         }
     }
     // 机器人整体指令正则
     mergedRegex = new RegExp(mergedRegexArr.map(regex => regex.source).join('|'));
-    /**
-     * 生成指令json
-     */
+    // 生成指令json
     createPluginHelp();
-    /**
-     * 打印
-     */
-    console.info(`[LOAD] APPS*${PluginsArr.length} `);
+    // 打印
+    console.info(`[LOAD] APPS*${Object.keys(plugins).length} `);
     return;
 }
+/**
+ * 得到大正则
+ * @returns
+ */
 export function getMergedRegex() {
     return mergedRegex;
 }
-let appDir = '/application';
-export function getAppDir() {
-    return appDir;
-}
-export function setAppDir(val) {
-    appDir = val;
-}
 /**
- *  初始化应用 mount = ture 则直接应用
- * @param param0 { mount = false, address = '/application' }
+ * 初始化应用
  * @returns
  */
 export async function loadInit() {
-    await loadPlugins(join(process.cwd(), getAppDir()));
+    await loadPlugins(join(process.cwd(), getAppProCoinfg('dir')));
     return;
 }
 /**

package/lib/core/index.js

@@ -7,6 +7,7 @@
  * *******
  */
 export * from './plugin.js';
+export * from './configs.js';
 export * from './apps.js';
 export * from './message.js';
 export * from './dialogue.js';

package/lib/core/screenshot.js

@@ -1,7 +1,7 @@
 import lodash from 'lodash';
 import { join, basename } from 'path';
 import { readFileSync, watch, mkdirSync } from 'fs';
-import { getAppDir } from './dealmsg.js';
+import { getAppProCoinfg } from './configs.js';
 /**
  * 源码缓存
  */
@@ -54,7 +54,7 @@ function watchCT(tplFile) {
  */
 export function createStr(Options) {
     const { AppName, tplFile, data } = Options;
-    const appDir = getAppDir();
+    const appDir = getAppProCoinfg('dir');
     /**
      * 插件路径
      */

package/lib/define/main.js

@@ -5,7 +5,7 @@ import { nodeScripts } from './child_process.js';
 import { AvailableIntentsEventsEnum } from 'qq-guild-bot';
 import { ClientAPIByQQ as ClientByNTQQ } from '../ntqq/sdk/index.js';
 import { command } from './command.js';
-import { createApp, setLanchConfig, loadInit, appsInit, setAppRegex, setAppDir, getAppDir } from '../core/index.js';
+import { createApp, setLanchConfig, loadInit, appsInit, setAppProCoinfg, getAppProCoinfg } from '../core/index.js';
 import { getPupPath, setBotConfigByKey, getBotConfigByKey } from '../config/index.js';
 // 设置ntqq独立鉴权路径
 export const setAuthenticationByNtqq = ClientByNTQQ.setAuthentication;
@@ -16,10 +16,10 @@ export const setAuthenticationByNtqq = ClientByNTQQ.setAuthentication;
  * @returns
  */
 export function ApplicationTools(AppName, name = 'apps') {
-    const appDir = getAppDir();
+    const appDir = getAppProCoinfg('dir');
     return compilationTools({
-        aInput: `${appDir}/${AppName}/${name}/**/*.ts`,
-        aOutput: `${appDir}/${AppName}/apps.js`
+        aInput: `${appDir.replace(/^\//, '')}/${AppName}/${name}/**/*.ts`,
+        aOutput: `${appDir.replace(/^\//, '')}/${AppName}/apps.js`
     });
 }
 let OptionsCache;
@@ -164,12 +164,12 @@ export async function defineAlemonConfig(Options) {
     if (Options?.login && Options?.app?.init !== false) {
         const app = createApp(Options?.app?.name ?? 'bot');
         if (Options?.app?.regJSon?.address) {
-            app.setHelp(Options?.app?.regJSon?.address ?? '/public/defset');
+            setAppProCoinfg('route', Options?.app?.regJSon?.address);
         }
         if (Options?.app?.module) {
             const word = await compilationTools({
-                aInput: Options?.app?.module?.input ?? 'apps/**/*.ts',
-                aOutput: Options?.app?.module?.input ?? '.apps/index.js'
+                aInput: Options?.app?.module?.input?.replace(/^\//, '') ?? 'apps/**/*.ts',
+                aOutput: Options?.app?.module?.output.replace(/^\//, '') ?? '.apps/index.js'
             });
             app.component(word);
         }
@@ -185,17 +185,25 @@ export async function defineAlemonConfig(Options) {
      * 设置加载目录
      * ************
      */
-    setAppDir(Options?.plugin?.directory ?? '/application');
+    if (Options?.plugin?.directory) {
+        setAppProCoinfg('dir', Options?.plugin?.directory);
+    }
+    if (Options?.plugin?.main) {
+        setAppProCoinfg('main', Options?.plugin?.main);
+    }
+    if (Options?.plugin?.type) {
+        setAppProCoinfg('type', Options?.plugin?.type);
+    }
     /**
      * ************
      * 设置扫描规则
      * ***********
      */
-    if (Options?.plugin?.RegexOpen || Options?.plugin?.RegexClose) {
-        setAppRegex({
-            RegexOpen: Options?.plugin?.RegexOpen,
-            RegexClose: Options?.plugin?.RegexClose
-        });
+    if (Options?.plugin?.RegexOpen) {
+        setAppProCoinfg('openRegex', Options?.plugin?.RegexOpen);
+    }
+    if (Options?.plugin?.RegexClose) {
+        setAppProCoinfg('closeRegex', Options?.plugin?.RegexClose);
     }
     /**
      * ************

package/package.json

@@ -1,17 +1,10 @@
 {
   "name": "alemonjs",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "阿柠檬框架",
   "author": "ningmengchongshui",
-  "main": "lib/index.js",
   "license": "GPL-2.0",
   "type": "module",
-  "exports": {
-    "./run": {
-      "types": "./run.d.ts",
-      "import": "./run.js"
-    }
-  },
   "scripts": {
     "app": "alemonjs",
     "dev": "alemonjs dev",
@@ -24,6 +17,7 @@
     "@discordjs/core": "^0.6.0",
     "@discordjs/rest": "^1.7.1",
     "alemon-rollup": "^1.0.2",
+    "alemonjs": "^1.0.13",
     "axios": "^1.4.0",
     "discord.js": "^14.11.0",
     "image-size": "^1.0.2",
@@ -51,6 +45,7 @@
     "typescript": ">=5.0.4 <5.1.0"
   },
   "types": "types",
+  "main": "lib/index.js",
   "files": [
     "bin",
     "lib",
@@ -58,6 +53,13 @@
     "run.js",
     "run.d.ts"
   ],
+  "exports": {
+    ".": "./lib/index.js",
+    "./run": {
+      "import": "./run.js",
+      "types": "./run.d.ts"
+    }
+  },
   "bin": {
     "alemonjs": "bin/main.js"
   },

package/types/core/apps.d.ts

@@ -1,4 +1,3 @@
-import { setAppsHelp } from './dealmsg.js';
 /**
  * 得到执行路径
  * @param url
@@ -17,11 +16,6 @@ export declare function getAppName(url: string | URL): string;
  * @returns
  */
 export declare function createApp(AppName: string): {
-    /**
-     * 设置指令json地址
-     * @param rt = '/public/defset'
-     */
-    setHelp: typeof setAppsHelp;
     /**
      * 重定义消息
      * @param fnc

package/types/core/configs.d.ts

@@ -0,0 +1,11 @@
+interface ApplicationProcessingOpsion {
+    dir: string;
+    main: string;
+    type: 'ts' | 'js';
+    openRegex: RegExp;
+    closeRegex: RegExp;
+    route: string;
+}
+export declare function setAppProCoinfg<T extends keyof ApplicationProcessingOpsion>(key: T, val: ApplicationProcessingOpsion[T]): void;
+export declare function getAppProCoinfg<T extends keyof ApplicationProcessingOpsion>(key: T): ApplicationProcessingOpsion[T];
+export {};

package/types/core/dealmsg.d.ts

@@ -1,26 +1,4 @@
 import { AMessage } from './typings.js';
-interface RegexControl {
-    RegexOpen?: RegExp;
-    RegexClose?: RegExp;
-}
-/**
- * 插件名匹配
- * @param val
- */
-export declare function setAppRegex(val: RegexControl): void;
-/**
- * 得到插件名匹配模式
- * @returns
- */
-export declare function getAppRegex(): {
-    RegexOpen: RegExp;
-    RegexClose: RegExp;
-};
-/**
- * 设置指令json地址
- * @param rt '/public/defset'
- */
-export declare function setAppsHelp(rt?: string): void;
 /**
  * 得到机器人帮助
  * @param AppName
@@ -32,12 +10,13 @@ export declare function getPluginHelp(AppName: string): any;
  * @returns
  */
 export declare function appsInit(): Promise<void>;
+/**
+ * 得到大正则
+ * @returns
+ */
 export declare function getMergedRegex(): RegExp;
-export declare function getAppDir(): string;
-export declare function setAppDir(val: string): void;
 /**
- *  初始化应用 mount = ture 则直接应用
- * @param param0 { mount = false, address = '/application' }
+ * 初始化应用
  * @returns
  */
 export declare function loadInit(): Promise<void>;
@@ -54,4 +33,3 @@ export declare function InstructionMatching(e: AMessage): Promise<boolean>;
  * @returns
  */
 export declare function typeMessage(e: AMessage): Promise<boolean>;
-export {};

package/types/core/index.d.ts

@@ -7,6 +7,7 @@
  * *******
  */
 export * from './plugin.js';
+export * from './configs.js';
 export * from './apps.js';
 export * from './message.js';
 export * from './dialogue.js';

package/types/define/types.d.ts

@@ -85,6 +85,17 @@ export interface AlemonOptions {
          * 插件名关闭规则
          */
         RegexClose?: RegExp;
+        /**
+         * 插件入口
+         * 默认index
+         * type='ts'
+         * 即 index.ts
+         */
+        main?: string;
+        /**
+         * 入口文件类型
+         */
+        type?: 'ts' | 'js';
     };
     /**
      * login配置