alemonjs 1.0.3 → 1.0.4

package/README.md

@@ -4,8 +4,6 @@
 
 > 支持 NtQQ、QQ 频道、Discord、米游社大别野、KOOK
 
-[☞Alemon 文档](https://alemonjs.com)
-
 | 分支  | 类型   | 说明                 |
 | ----- | ------ | -------------------- |
 | main  | 核心   | 机器实例             |
@@ -13,21 +11,21 @@
 | cli   | 脚手架 | 开发模板脚手架       |
 | web   | 网站   | 共享平台插件贡献地址 |
 
-## 配置管理
+> 需要配置机器人才可启动
+
+文档查看 OPEN[alemonjs.com](https://alemonjs.com)
 
-参考配置说明进行
+开发模板 GITEE[create-alemonjs](https://gitee.com/ningmengchongshui/alemon/tree/cli/bin/template)
 
-更改[alemon.toml](./alemon.md)
+开发模板 GITHUB[create-alemonjs](https://github.com/ningmengchongshui/alemon/tree/cli/bin/template)
 
 ### 共享平台
 
 > 仓库只做资源收集,对齐安全性不做任何检查,请谨慎选择
 
-[Gitee ☞ 贡献资源](https://gitee.com/ningmengchongshui/alemon/blob/web/docs/about/plugins.md)
-
-[Github ☞ 贡献资源](https://gitee.com/ningmengchongshui/alemon/blob/web/docs/about/plugins.md)
+贡献资源 OPEN[Gitee](https://gitee.com/ningmengchongshui/alemon/blob/web/docs/about/plugins.md)
 
-### 平台推送
+贡献资源 OPEN[Github](https://gitee.com/ningmengchongshui/alemon/blob/web/docs/about/plugins.md)
 
 > 仅限签署开源协议的仓库、不开源将不做考虑范围内
 

package/bin/main.js

@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+
+import { spawn } from 'child_process'
+
+const ars = process.argv.slice(2)
+
+const command = spawn(`npx ts-node alemon.config.ts ${ars}`, {
+  shell: true
+})
+
+command.stdout.on('data', data => {
+  process.stdout.write(data.toString())
+})
+
+command.stderr.on('data', data => {
+  process.stderr.write(data.toString())
+})

package/lib/alemon/dealmsg.js

@@ -34,6 +34,21 @@ 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;
+    }
+}
 /**
  * 设置指令json地址
  * @param rt '/public/defset'
@@ -52,17 +67,32 @@ export function getPluginHelp(AppName) {
 }
 /**
  * 创建机器人帮助
+ * 存在且得到的app不为[]时才会创建json
  */
 function createPluginHelp() {
-    // 不存在
-    if (!existsSync(addressMenu))
-        mkdirSync(addressMenu, { recursive: true });
-    // 创建help
-    for (const item in plugins) {
-        const basePath = join(addressMenu, `${item}.json`);
-        const jsonData = JSON.stringify(plugins[item], null, 2);
-        // 异步创建避免阻塞
-        writeFile(basePath, jsonData, 'utf-8');
+    // 存在app才创建
+    if (Object.values(plugins).length != 0) {
+        // 同时key不能是空数组
+        let t = false;
+        for (const item in plugins) {
+            if (plugins[item] && plugins[item].length != 0) {
+                t = true;
+            }
+        }
+        if (t) {
+            // 不存在
+            if (!existsSync(addressMenu))
+                mkdirSync(addressMenu, { recursive: true });
+            // 创建help
+            for (const item in plugins) {
+                if (plugins[item] && plugins[item].length != 0) {
+                    const basePath = join(addressMenu, `${item}.json`);
+                    const jsonData = JSON.stringify(plugins[item], null, 2);
+                    // 异步创建避免阻塞
+                    writeFile(basePath, jsonData, 'utf-8');
+                }
+            }
+        }
     }
 }
 /**
@@ -167,13 +197,34 @@ async function synthesis(AppsObj, appname, belong) {
  * @param dir
  */
 async function loadPlugins(dir) {
-    if (!existsSync(dir))
-        mkdirSync(dir, { recursive: true });
+    /**
+     * ********************
+     * 没有该文件夹直接返回
+     * *******************
+     */
+    if (!existsSync(dir)) {
+        return;
+    }
     const flies = readdirSync(dir);
+    if (flies.length == 0) {
+        return;
+    }
+    const app = flies
+        .filter(item => appRegex.test(item))
+        .filter(item => {
+        // 关闭符合条件的
+        if (!appRegexClose) {
+            return true;
+        }
+        if (appRegexClose.test(item)) {
+            return false;
+        }
+        return true;
+    });
     /**
      * 识别并执行插件
      */
-    for await (const appname of flies) {
+    for await (const appname of app) {
         if (existsSync(`${dir}/${appname}/index.ts`)) {
             /**
              * 优先考虑ts
@@ -356,8 +407,7 @@ export async function InstructionMatching(e) {
                 return res;
             })
                 .catch((err) => {
-                console.error(`\n[${data.event}][${data.belong}][${data.AppName}][${data.fncName}][${err}]`);
-                console.error(`\n[${data.event}][${data.belong}][${data.AppName}][${data.fncName}][${false}]`);
+                console.error(`\n[${data.event}][${data.belong}][${data.AppName}][${data.fncName}][${false}]\n[${err}]`);
                 return false;
             });
             // 不是false都直接中断匹配
@@ -396,8 +446,7 @@ export async function typeMessage(e) {
                 return res;
             })
                 .catch((err) => {
-                console.error(err);
-                console.error(`\n[${data.event}][${data.belong}][${data.AppName}][${data.fncName}][${false}]`);
+                console.error(`\n[${data.event}][${data.belong}][${data.AppName}][${data.fncName}][${false}]\n[${err}]`);
                 return false;
             });
             if (res) {
@@ -417,7 +466,6 @@ export async function typeMessage(e) {
  * @param data
  */
 function logErr(err, data) {
-    console.error(err);
-    console.error(`\n[${data.event}][${data.belong}][${data.AppName}][${data.fncName}][${false}]`);
+    console.error(`\n[${data.event}][${data.belong}][${data.AppName}][${data.fncName}][${false}]\n[${err}]`);
     return;
 }

package/lib/alemon/puppeteer.js

@@ -54,9 +54,11 @@ export async function pupStartCheck() {
     /**
      * 检测是否开启
      */
-    if (isBrowser == false) {
-        if (!(await startChrom()))
+    if (!isBrowser) {
+        const T = await startChrom();
+        if (!T) {
             return false;
+        }
     }
     if (pic <= RestartControl) {
         /**
@@ -90,18 +92,12 @@ export async function pupStartCheck() {
  * @returns
  */
 export async function screenshotByFile(htmlPath, Options) {
-    if (!pupStartCheck())
+    const T = await pupStartCheck();
+    if (!T) {
         return false;
+    }
     const { SOptions, tab = 'body', timeout = 120000 } = Options;
     try {
-        /**
-         * 开始
-         */
-        if (!isBrowser) {
-            if (!(await startChrom()))
-                return false;
-        }
-        console.info('[puppeteer] start');
         /**
          * 实例化
          */
@@ -148,13 +144,10 @@ export async function screenshotByFile(htmlPath, Options) {
  * @returns
  */
 export async function screenshotByUrl(val) {
-    if (!pupStartCheck())
+    const T = await pupStartCheck();
+    if (!T) {
         return false;
-    if (!isBrowser) {
-        if (!(await startChrom()))
-            return false;
     }
-    console.info('[puppeteer] start');
     const { url, time, rand, params, tab, cache } = val;
     if (!pageCache[url]) {
         pageCache[url] = await browser.newPage();

package/lib/config/index.js

@@ -4,5 +4,5 @@
  * ********
  */
 export * from './login.js';
-export * from './toml.js';
 export * from './types.js';
+export * from './pup.js';

package/lib/config/login.js

@@ -1,86 +1,25 @@
+import redis from '../default/redis.js';
+import mysql from '../default/mysql.js';
+import server from '../default/server.js';
+import puppeteer from '../default/pup.js';
+import discord from '../default/login/discord.js';
+import kook from '../default/login/kook.js';
+import villa from '../default/login/villa.js';
+import qq from '../default/login/qq.js';
+import ntqq from '../default/login/ntqq.js';
 /**
  * bot-config
  */
 const config = {
-    redis: {
-        host: '127.0.0.1',
-        port: 6379,
-        password: '',
-        db: 1
-    },
-    mysql: {
-        host: '127.0.0.1',
-        port: 3306,
-        user: 'root',
-        password: '',
-        database: 'alemon'
-    },
-    discord: {
-        token: '',
-        masterID: '',
-        password: '',
-        intents: []
-    },
-    kook: {
-        token: '',
-        masterID: '',
-        password: ''
-    },
-    villa: {
-        bot_id: '',
-        secret: '',
-        pub_key: '',
-        masterID: '',
-        password: '',
-        http: 'http',
-        url: '/api/mys/callback',
-        port: 8080,
-        size: 999999,
-        img_url: '/api/mys/img',
-        IMAGE_DIR: '/data/mys/img'
-    },
-    qq: {
-        appID: '',
-        token: '',
-        masterID: '',
-        password: '',
-        intents: [],
-        isPrivate: false,
-        sandbox: false
-    },
-    ntqq: {
-        appID: '',
-        token: '',
-        secret: '',
-        masterID: '',
-        password: '',
-        intents: [],
-        port: 9090,
-        size: 999999,
-        img_url: '/api/mys/img',
-        IMAGE_DIR: '/data/mys/img',
-        http: 'http'
-    },
-    server: {
-        host: '127.0.0.1',
-        port: 5000
-    },
-    /**
-     * pup的配置的繁多的
-     */
-    puppeteer: {
-        headless: 'new',
-        timeout: 30000,
-        args: [
-            '--disable-gpu',
-            '--disable-dev-shm-usage',
-            '--disable-setuid-sandbox',
-            '--no-first-run',
-            '--no-sandbox',
-            '--no-zygote',
-            '--single-process'
-        ]
-    }
+    redis,
+    mysql,
+    discord,
+    kook,
+    villa,
+    qq,
+    ntqq,
+    server,
+    puppeteer
 };
 /**
  * 初始化配置
@@ -104,13 +43,13 @@ export function setBotConfig(val) {
                         config[i][j] = val[i][j];
                     }
                     else {
-                        console.log('[alemonjs][存在无效参数]', val[i]);
+                        console.info('[alemonjs][存在无效参数]', val[i]);
                     }
                 }
             }
         }
         else {
-            console.log('[alemonjs][存在无效参数]', val[i]);
+            console.info('[alemonjs][存在无效参数]', val[i]);
         }
     }
 }
@@ -133,7 +72,7 @@ export function setBotConfigByKey(key, val) {
                 config[key][item] = val[item];
             }
             else {
-                console.log('[alemonjs][存在无效参数]', val[item]);
+                console.info('[alemonjs][存在无效参数]', val[item]);
             }
         }
     }

package/lib/config/pup.js

@@ -0,0 +1,75 @@
+import { arch } from 'os';
+import { existsSync, realpathSync } from 'fs';
+import { execSync } from 'child_process';
+const isArch = arch();
+const platform = process.platform;
+const win32Edge = 'C:/Program Files (x86)/Microsoft/Edge/Application/msedge.exe';
+// Downloa
+let skipDownload = false;
+// Path
+let executablePath;
+if (process.platform == 'win32' && existsSync(win32Edge)) {
+    //  win32  Edge
+    skipDownload = true;
+    executablePath = win32Edge;
+    console.info('[Win32 Edge] start');
+}
+else if (platform == 'linux' || platform == 'android') {
+    // linux | android
+    const chromium = [
+        'whereis chrome-browser',
+        'whereis chrome',
+        'whereis chromium-browser',
+        'whereis chromium',
+        'whereis firefox'
+    ];
+    // get path
+    for (const item of chromium) {
+        try {
+            const chromiumPath = execSync(item).toString().split(' ')[1]?.trim();
+            if (chromiumPath) {
+                skipDownload = true;
+                executablePath = realpathSync(chromiumPath);
+                console.info('[Chromium] start');
+                break;
+            }
+        }
+        catch (error) {
+            console.error('Failed to get Chromium path:', error);
+            continue;
+        }
+    }
+    // not path
+    if (!skipDownload) {
+        /**
+         * search
+         */
+        const arr = [
+            '/usr/bin/chromium',
+            '/snap/bin/chromium',
+            '/usr/bin/chromium-browser'
+        ];
+        for (const item of arr) {
+            if (existsSync(item)) {
+                skipDownload = true;
+                executablePath = item;
+                console.info('[Chromium] start');
+                break;
+            }
+        }
+    }
+    //  arm64/arrch64
+    if (isArch == 'arm64' || isArch == 'aarch64') {
+        console.info('[arm64/aarch64] system');
+        skipDownload = true;
+    }
+}
+/**
+ * @type {import("puppeteer").Configuration}
+ */
+export function getPupPath() {
+    return {
+        skipDownload,
+        executablePath
+    };
+}

package/lib/config/types.js

@@ -1,10 +1 @@
-/**
- * *****
- * 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 {};

package/lib/default/login/discord.js

@@ -0,0 +1,16 @@
+import { GatewayIntentBits } from 'discord.js';
+export default {
+    token: '',
+    masterID: '',
+    password: '',
+    intents: [
+        GatewayIntentBits.DirectMessageReactions,
+        GatewayIntentBits.DirectMessageTyping,
+        GatewayIntentBits.DirectMessages,
+        GatewayIntentBits.GuildMessageReactions,
+        GatewayIntentBits.GuildMessageTyping,
+        GatewayIntentBits.GuildMessages,
+        GatewayIntentBits.Guilds,
+        GatewayIntentBits.MessageContent // 消息内容
+    ]
+};

package/lib/default/login/kook.js

@@ -0,0 +1,5 @@
+export default {
+    token: '',
+    masterID: '',
+    password: ''
+};

package/lib/default/login/ntqq.js

@@ -0,0 +1,17 @@
+export default {
+    appID: '',
+    token: '',
+    secret: '',
+    masterID: '',
+    password: '',
+    intents: [
+        'GROUP_AT_MESSAGE_CREATE',
+        'C2C_MESSAGE_CREATE'
+    ],
+    shard: [0, 1],
+    port: 9090,
+    size: 999999,
+    img_url: '/api/mys/img',
+    IMAGE_DIR: '/data/mys/img',
+    http: 'http'
+};

package/lib/default/login/qq.js

@@ -0,0 +1,16 @@
+import { AvailableIntentsEventsEnum } from 'qq-guild-bot';
+export default {
+    appID: '',
+    token: '',
+    secret: '',
+    masterID: '',
+    password: '',
+    intents: [
+        AvailableIntentsEventsEnum.GUILDS,
+        AvailableIntentsEventsEnum.PUBLIC_GUILD_MESSAGES,
+        AvailableIntentsEventsEnum.DIRECT_MESSAGE,
+        AvailableIntentsEventsEnum.GUILD_MEMBERS
+    ],
+    isPrivate: false,
+    sandbox: false
+};

package/lib/default/login/villa.js

@@ -0,0 +1,13 @@
+export default {
+    bot_id: '',
+    secret: '',
+    pub_key: '',
+    masterID: '',
+    password: '',
+    http: 'http',
+    url: '/api/mys/callback',
+    port: 8080,
+    size: 999999,
+    img_url: '/api/mys/img',
+    IMAGE_DIR: '/data/mys/img'
+};

package/lib/default/mysql.js

@@ -0,0 +1,7 @@
+export default {
+    host: 'localhost',
+    port: 3306,
+    user: 'root',
+    password: '',
+    database: 'alemonjs'
+};

package/lib/default/pup.js

@@ -0,0 +1,15 @@
+export default {
+    headless: 'new',
+    timeout: 30000,
+    args: [
+        '--disable-gpu',
+        '--disable-dev-shm-usage',
+        '--disable-setuid-sandbox',
+        '--no-first-run',
+        '--no-sandbox',
+        '--no-zygote',
+        '--single-process'
+    ],
+    skipDownload: true,
+    executablePath: 'C:/Program Files (x86)/Microsoft/Edge/Application/msedge.exe'
+};

package/lib/default/redis.js

@@ -0,0 +1,6 @@
+export default {
+    host: '127.0.0.1',
+    port: 6379,
+    password: '',
+    db: 1
+};

package/lib/default/server.js

@@ -0,0 +1,4 @@
+export default {
+    host: 'localhost',
+    port: 5000
+};

package/lib/default/types.js

@@ -0,0 +1,16 @@
+/**
+ * *****
+ * 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 = {}));

package/lib/define/api.js

@@ -0,0 +1,23 @@
+import { ClientAPIByQQ as ClientByNTQQ } from '../ntqq/sdk/index.js';
+import { Client as ClientByVILLA } from 'mys-villa';
+import { KOOKApiClient as ClientByKOOK } from 'kook-ws';
+/**
+ * discord客户端
+ */
+export const ClientDISCORD = {};
+/**
+ * qq客户端
+ */
+export const ClientQQ = global.ClientAPIByQQ;
+/**
+ * kook客户端
+ */
+export const ClientKOOK = ClientByKOOK;
+/**
+ * ntqq客户端
+ */
+export const ClientNTQQ = ClientByNTQQ;
+/**
+ * villa客户端
+ */
+export const ClientVILLA = ClientByVILLA;

package/lib/define/child_process.js

@@ -0,0 +1,10 @@
+import { spawn } from 'child_process';
+export function nodeScripts(name = 'node', file = '', ars = []) {
+    const command = spawn(`${name} ${file} ${ars.join(' ')}`, { shell: true });
+    command.stdout.on('data', data => {
+        process.stdout.write(data.toString());
+    });
+    command.stderr.on('data', data => {
+        process.stderr.write(data.toString());
+    });
+}

package/lib/define/command.js

@@ -0,0 +1,22 @@
+import { mkdirSync } from 'fs';
+import { execSync } from 'child_process';
+export async function command(cmd) {
+    // 错误参数
+    if (!cmd)
+        process.exit();
+    // 锁定位置
+    const dirPath = `./`;
+    // 没有存在
+    mkdirSync(dirPath, { recursive: true });
+    console.info('\n');
+    try {
+        // 切换目录
+        process.chdir(dirPath);
+        console.info(`[command] ${cmd}`);
+        execSync(cmd, { stdio: 'inherit' });
+    }
+    catch (error) {
+        console.info(`${error}`);
+        return;
+    }
+}

package/lib/define/index.js

@@ -0,0 +1,7 @@
+/**
+ * ********
+ * 初始化
+ * ******
+ */
+export * from './api.js';
+export * from './main.js';