alemonjs 1.0.4 → 1.0.6

package/lib/alemon/dealmsg.js

@@ -49,6 +49,16 @@ export function setAppRegex(val) {
         appRegexClose = RegexClose;
     }
 }
+/**
+ * 得到插件名匹配模式
+ * @returns
+ */
+export function getAppRegex() {
+    return {
+        RegexOpen: appRegex,
+        RegexClose: appRegexClose
+    };
+}
 /**
  * 设置指令json地址
  * @param rt '/public/defset'
@@ -197,22 +207,14 @@ async function synthesis(AppsObj, appname, belong) {
  * @param dir
  */
 async function loadPlugins(dir) {
-    /**
-     * ********************
-     * 没有该文件夹直接返回
-     * *******************
-     */
-    if (!existsSync(dir)) {
+    if (!existsSync(dir))
         return;
-    }
     const flies = readdirSync(dir);
-    if (flies.length == 0) {
+    if (flies.length == 0)
         return;
-    }
-    const app = flies
+    const apps = flies
         .filter(item => appRegex.test(item))
         .filter(item => {
-        // 关闭符合条件的
         if (!appRegexClose) {
             return true;
         }
@@ -224,7 +226,7 @@ async function loadPlugins(dir) {
     /**
      * 识别并执行插件
      */
-    for await (const appname of app) {
+    for await (const appname of apps) {
         if (existsSync(`${dir}/${appname}/index.ts`)) {
             /**
              * 优先考虑ts

package/lib/default/pup.js

@@ -10,6 +10,5 @@ export default {
         '--no-zygote',
         '--single-process'
     ],
-    skipDownload: true,
-    executablePath: 'C:/Program Files (x86)/Microsoft/Edge/Application/msedge.exe'
+    skipDownload: true
 };

package/lib/define/main.js

@@ -5,6 +5,8 @@ import { nodeScripts } from './child_process.js';
 import { ClientAPIByQQ as ClientByNTQQ } from '../ntqq/sdk/index.js';
 import { createApp, loadInit, setBotConfigByKey, setLanchConfig, getPupPath, getBotConfigByKey, setAppRegex } from '../index.js';
 import { command } from './command.js';
+import { copyAppsFile } from './plugin.js';
+import { join } from 'path';
 // 设置ntqq独立鉴权路径
 export const setAuthenticationByNtqq = ClientByNTQQ.setAuthentication;
 let appDir = 'application';
@@ -36,16 +38,6 @@ export async function defineAlemonConfig(Options) {
     if (!Options)
         return;
     OptionsCache = Options;
-    /**
-     * **********
-     * 运行前执行
-     * **********
-     */
-    if (Options?.command) {
-        for await (const item of Options.command) {
-            await command(item);
-        }
-    }
     /**
      * *******
      * pup配置
@@ -125,7 +117,12 @@ export async function defineAlemonConfig(Options) {
             await rebotMap[item]();
         }
     }
-    else {
+    /**
+     * ********
+     * 登录提示
+     * ********
+     */
+    if (!Options?.login || Object.keys(Options?.login ?? {}).length == 0) {
         console.info('[LOGIN] 无登录配置');
     }
     /**
@@ -150,6 +147,14 @@ export async function defineAlemonConfig(Options) {
             RegexClose: Options?.plugin?.RegexClose
         });
     }
+    /**
+     * ***************
+     * 是否同步文件
+     * ***************
+     */
+    if (Options?.plugin?.mountFile) {
+        copyAppsFile(join(process.cwd(), `/${address}`));
+    }
     /**
      * ************
      * 扫描插件
@@ -183,22 +188,25 @@ export async function defineAlemonConfig(Options) {
         }
         app.mount('#app');
     }
+    /**
+     * **********
+     * 附加执行
+     * **********
+     */
+    if (Options?.command) {
+        for await (const item of Options.command) {
+            await command(item);
+        }
+    }
     /**
      * ***************
-     * 如果是开发模式
-     * 不会执行附加脚本
+     * 附加脚本
      * ***************
      */
-    const ars = process.argv.slice(2);
-    if (!ars.includes('off')) {
-        /**
-         * 执行附加脚本
-         */
-        if (Options?.scripts) {
-            for await (const item of Options.scripts) {
-                const name = item?.name ?? 'node';
-                nodeScripts(name, item?.file, item?.ars ?? []);
-            }
+    if (Options?.scripts) {
+        for await (const item of Options.scripts) {
+            const name = item?.name ?? 'node';
+            nodeScripts(name, item?.file, item?.ars ?? []);
         }
     }
     return;

package/lib/define/plugin.js

@@ -1,25 +1,65 @@
+import { existsSync, readdirSync, copyFileSync, mkdirSync } from 'fs';
+import { getAppRegex } from '../alemon/index.js';
+import { join } from 'path';
+/**
+ * 遍历复制方法
+ */
+const copyFiles = (source, destination) => {
+    if (!existsSync(destination)) {
+        mkdirSync(destination, { recursive: true });
+    }
+    const files = readdirSync(source);
+    for (const file of files) {
+        const sourcePath = join(source, file);
+        const destinationPath = join(destination, file);
+        copyFileSync(sourcePath, destinationPath);
+    }
+};
 /**
  * 同步挂载文件
+ * @param dir 插件目录
  */
-export function copyAppsFile() {
-    /**
-     * 得到插件目录
-     */
-    /**
-     * 检测是否有插件
-     */
-    /**
-     * 检测是否有指定目录
-     * assets
-     * pages
-     * plugins
-     * server
-     */
-    /**
-     * publick/.AppName/assets
-     * publick/.AppName/pages
-     * publick/.AppName/plugins
-     * publick/.AppName/server
-     * 有则 重加载 无则忽略
-     */
+export function copyAppsFile(dir) {
+    if (!existsSync(dir))
+        return;
+    const flies = readdirSync(dir);
+    if (flies.length === 0)
+        return;
+    const { RegexOpen, RegexClose } = getAppRegex();
+    // 插件名
+    const apps = flies
+        .filter(item => RegexOpen.test(item))
+        .filter(item => {
+        // 关闭符合条件的
+        if (!RegexClose) {
+            return true;
+        }
+        if (RegexClose.test(item)) {
+            return false;
+        }
+        return true;
+    });
+    for (const appname of apps) {
+        const appPath = join(dir, appname);
+        if (existsSync(`${appPath}/assets`)) {
+            const originalAddress = `${appPath}/assets`;
+            const destinationAddress = join(process.cwd(), `/public/.${appname}/assets`);
+            copyFiles(originalAddress, destinationAddress);
+        }
+        if (existsSync(`${appPath}/pages`)) {
+            const originalAddress = `${appPath}/pages`;
+            const destinationAddress = join(process.cwd(), `/public/.${appname}/pages`);
+            copyFiles(originalAddress, destinationAddress);
+        }
+        if (existsSync(`${appPath}/plugins`)) {
+            const originalAddress = `${appPath}/plugins`;
+            const destinationAddress = join(process.cwd(), `/public/.${appname}/plugins`);
+            copyFiles(originalAddress, destinationAddress);
+        }
+        if (existsSync(`${appPath}/server`)) {
+            const originalAddress = `${appPath}/server`;
+            const destinationAddress = join(process.cwd(), `/public/.${appname}/server`);
+            copyFiles(originalAddress, destinationAddress);
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "阿柠檬框架",
   "author": "ningmengchongshui",
   "main": "lib/index.js",

package/types/alemon/dealmsg.d.ts

@@ -8,6 +8,14 @@ interface RegexControl {
  * @param val
  */
 export declare function setAppRegex(val: RegexControl): void;
+/**
+ * 得到插件名匹配模式
+ * @returns
+ */
+export declare function getAppRegex(): {
+    RegexOpen: RegExp;
+    RegexClose: RegExp;
+};
 /**
  * 设置指令json地址
  * @param rt '/public/defset'

package/types/define/plugin.d.ts

@@ -1,4 +1,5 @@
 /**
  * 同步挂载文件
+ * @param dir 插件目录
  */
-export declare function copyAppsFile(): void;
+export declare function copyAppsFile(dir: any): void;