alemonjs 1.0.3 → 1.0.5

package/lib/define/main.js

@@ -0,0 +1,198 @@
+import { compilationTools } from 'alemon-rollup';
+import PupOptions from '../default/pup.js';
+import { rebotMap } from './map.js';
+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';
+// 设置ntqq独立鉴权路径
+export const setAuthenticationByNtqq = ClientByNTQQ.setAuthentication;
+let appDir = 'application';
+/**
+ * 应用模块集成
+ * @param AppName
+ * @param name
+ * @returns
+ */
+export function ApplicationTools(AppName, name = 'apps') {
+    return compilationTools({
+        aInput: `${appDir}/${AppName}/${name}/**/*.ts`,
+        aOutput: `${appDir}/${AppName}/apps.js`
+    });
+}
+let OptionsCache;
+/**
+ * 得到载入配置
+ * @returns
+ */
+export function getAlemonConfig() {
+    return OptionsCache;
+}
+/**
+ * 机器人配置
+ * @param Options
+ */
+export async function defineAlemonConfig(Options) {
+    if (!Options)
+        return;
+    OptionsCache = Options;
+    /**
+     * *******
+     * pup配置
+     * *******
+     */
+    const pCig = { ...PupOptions, ...getPupPath() };
+    // 设置旧的值
+    setBotConfigByKey('puppeteer', pCig);
+    if (Options?.puppeteer) {
+        // 存在 替换新的值
+        setBotConfigByKey('puppeteer', Options?.puppeteer);
+    }
+    const pData = getBotConfigByKey('puppeteer');
+    await setLanchConfig(pData);
+    /**
+     * *********
+     * mysql配置
+     * *********
+     */
+    if (Options?.mysql) {
+        setBotConfigByKey('mysql', Options.mysql);
+    }
+    /**
+     * *********
+     * redis配置
+     * *********
+     */
+    if (Options?.redis) {
+        setBotConfigByKey('redis', Options.redis);
+    }
+    /**
+     * *********
+     * serer配置
+     * *********
+     */
+    if (Options?.server) {
+        setBotConfigByKey('server', Options.server);
+    }
+    /**
+     * **********
+     * 启动转换器
+     * **********
+     */
+    const arr = [];
+    /**
+     * *********
+     * 启动机器人
+     * *********
+     */
+    if (Options?.login) {
+        /**
+         * ********
+         * 配置载入
+         * *******
+         */
+        if (Options.login?.discord) {
+            setBotConfigByKey('discord', Options.login.discord);
+        }
+        if (Options.login?.qq) {
+            setBotConfigByKey('qq', Options.login.qq);
+        }
+        if (Options.login?.ntqq) {
+            setBotConfigByKey('ntqq', Options.login.ntqq);
+        }
+        if (Options.login?.kook) {
+            setBotConfigByKey('kook', Options.login.kook);
+        }
+        if (Options.login?.villa) {
+            setBotConfigByKey('villa', Options.login.villa);
+        }
+        for (const item in Options.login) {
+            if (arr.indexOf(item) != -1)
+                continue;
+            if (!rebotMap[item])
+                continue;
+            arr.push(item);
+            await rebotMap[item]();
+        }
+    }
+    if (!Options?.login || Object.keys(Options?.login ?? {}).length == 0) {
+        console.info('[LOGIN] 无登录配置');
+    }
+    /**
+     * ************
+     * 迟缓插件加载
+     * ************
+     */
+    let mount = false;
+    if (Options?.app?.component || Options?.app?.module) {
+        mount = true;
+    }
+    const address = Options?.plugin?.directory ?? 'application';
+    appDir = address;
+    /**
+     * ************
+     * 设置扫描规则
+     * ***********
+     */
+    if (Options?.plugin?.RegexOpen || Options?.plugin?.RegexClose) {
+        setAppRegex({
+            RegexOpen: Options?.plugin?.RegexOpen,
+            RegexClose: Options?.plugin?.RegexClose
+        });
+    }
+    /**
+     * ************
+     * 扫描插件
+     * ************
+     */
+    await loadInit({
+        mount: mount,
+        address: address == undefined ? '/application' : `/${address}`
+    });
+    /**
+     * ************
+     * 编译独立插件
+     * ************
+     */
+    if (mount) {
+        const app = createApp(Options?.app?.name ?? 'bot');
+        if (Options?.app?.regJSon?.address) {
+            app.setHelp(Options?.app?.regJSon?.address ?? '/public/defset');
+        }
+        if (Options?.app?.module) {
+            const word = await compilationTools({
+                aInput: Options?.app?.module?.input ?? 'src/apps/**/*.ts',
+                aOutput: Options?.app?.module?.input ?? '.apps/index.js'
+            });
+            app.component(word);
+        }
+        if (Options?.app?.component) {
+            for await (const item of Options.app.component) {
+                app.component(item);
+            }
+        }
+        app.mount('#app');
+    }
+    /**
+     * **********
+     * 附加执行
+     * **********
+     */
+    if (Options?.command) {
+        for await (const item of Options.command) {
+            await command(item);
+        }
+    }
+    /**
+     * ***************
+     * 附加脚本
+     * ***************
+     */
+    if (Options?.scripts) {
+        for await (const item of Options.scripts) {
+            const name = item?.name ?? 'node';
+            nodeScripts(name, item?.file, item?.ars ?? []);
+        }
+    }
+    return;
+}

package/lib/{map.js → define/map.js}

@@ -1,9 +1,11 @@
 /**
+ * **********
  * 启动机器人
+ * **********
  */
-export const createAlemon = {
+export const rebotMap = {
     qq: async () => {
-        const { createAlemonByQQ: qq } = await import('./qq/index.js');
+        const { createAlemonByQQ: qq } = await import('../qq/index.js');
         return qq().catch(err => {
             console.error(err);
             console.error('QQ机器人启动失败~');
@@ -11,7 +13,7 @@ export const createAlemon = {
         });
     },
     villa: async () => {
-        const { createAlemonByVilla: villa } = await import('./villa/index.js');
+        const { createAlemonByVilla: villa } = await import('../villa/index.js');
         return villa().catch(err => {
             console.error(err);
             console.error('Villa机器人启动失败~');
@@ -19,7 +21,7 @@ export const createAlemon = {
         });
     },
     kook: async () => {
-        const { createAlemonByKOOK: kook } = await import('./kook/index.js');
+        const { createAlemonByKOOK: kook } = await import('../kook/index.js');
         return kook().catch(err => {
             console.error(err);
             console.error('KOOK机器人启动失败~');
@@ -27,7 +29,7 @@ export const createAlemon = {
         });
     },
     discord: async () => {
-        const { createAlemonByDiscord: dc } = await import('./discord/index.js');
+        const { createAlemonByDiscord: dc } = await import('../discord/index.js');
         return dc().catch(err => {
             console.error(err);
             console.error('Discord机器人启动失败~');
@@ -35,7 +37,7 @@ export const createAlemon = {
         });
     },
     ntqq: async () => {
-        const { createAlemonByNtqq: ntqq } = await import('./ntqq/index.js');
+        const { createAlemonByNtqq: ntqq } = await import('../ntqq/index.js');
         return ntqq().catch(err => {
             console.error(err);
             console.error('Ntqq机器人启动失败~');

package/lib/define/plugin.js

@@ -0,0 +1,25 @@
+/**
+ * 同步挂载文件
+ */
+export function copyAppsFile() {
+    /**
+     * 得到插件目录
+     */
+    /**
+     * 检测是否有插件
+     */
+    /**
+     * 检测是否有指定目录
+     * assets
+     * pages
+     * plugins
+     * server
+     */
+    /**
+     * publick/.AppName/assets
+     * publick/.AppName/pages
+     * publick/.AppName/plugins
+     * publick/.AppName/server
+     * 有则 重加载 无则忽略
+     */
+}

package/lib/define/types.js

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

package/lib/discord/login.js

@@ -1,6 +1,5 @@
-import prompts from 'prompts';
 import { GatewayIntentBits } from 'discord.js';
-import { setBotConfigByKey, getBotConfigByKey, getToml, writeToml } from '../config/index.js';
+import { setBotConfigByKey, getBotConfigByKey } from '../config/index.js';
 /**
  * 登录配置
  * @param Bcf
@@ -11,69 +10,26 @@ export async function checkRobotByDiscord() {
     /**
      * 读取配置
      */
-    if (process.argv.indexOf('login') == -1) {
-        const config = getBotConfigByKey('discord');
-        if ((config ?? '') !== '' && (config.token ?? '') !== '') {
-            if (!config.intents) {
-                config.intents = [
-                    GatewayIntentBits.DirectMessageReactions,
-                    GatewayIntentBits.DirectMessageTyping,
-                    GatewayIntentBits.DirectMessages,
-                    GatewayIntentBits.GuildMessageReactions,
-                    GatewayIntentBits.GuildMessageTyping,
-                    GatewayIntentBits.GuildMessages,
-                    GatewayIntentBits.Guilds,
-                    GatewayIntentBits.MessageContent // 消息内容
-                ];
-            }
-            setBotConfigByKey('discord', config);
-            return true;
+    const config = getBotConfigByKey('discord');
+    if ((config ?? '') !== '' && (config.token ?? '') !== '') {
+        if (!config.intents) {
+            config.intents = [
+                GatewayIntentBits.DirectMessageReactions,
+                GatewayIntentBits.DirectMessageTyping,
+                GatewayIntentBits.DirectMessages,
+                GatewayIntentBits.GuildMessageReactions,
+                GatewayIntentBits.GuildMessageTyping,
+                GatewayIntentBits.GuildMessages,
+                GatewayIntentBits.Guilds,
+                GatewayIntentBits.MessageContent // 消息内容
+            ];
         }
+        setBotConfigByKey('discord', config);
+        return true;
     }
     console.info('[LOGIN]', '-----------------------');
-    const timeoutId = setTimeout(() => {
-        throw '超过1分钟未完成登录';
-    }, 60000);
-    const { token } = await prompts([
-        {
-            type: 'password',
-            name: 'token',
-            message: 'BotToken: ',
-            validate: value => value !== '' && typeof value === 'string' ? true : 'BotToken: '
-        }
-    ]);
-    if (!token) {
-        return false;
-    }
-    clearTimeout(timeoutId);
-    /**
-     * 默认公域机器人
-     */
-    const intents = [
-        GatewayIntentBits.DirectMessageReactions,
-        GatewayIntentBits.DirectMessageTyping,
-        GatewayIntentBits.DirectMessages,
-        GatewayIntentBits.GuildMessageReactions,
-        GatewayIntentBits.GuildMessageTyping,
-        GatewayIntentBits.GuildMessages,
-        GatewayIntentBits.Guilds,
-        GatewayIntentBits.MessageContent // 消息内容
-    ];
-    // 得到已变更的配置
-    const db = getBotConfigByKey('discord');
-    // 得到配置
-    const data = getToml();
-    data.discord = {
-        ...db,
-        // 覆盖新配置
-        token,
-        intents
-    };
-    // 写入配置
-    writeToml(data);
-    // 设置配置
-    setBotConfigByKey('discord', data.discord);
-    return true;
+    console.info('[LOGIN]', 'DISCORD配置加载失败~');
+    process.exit();
 }
 // GatewayIntentBits.AutoModerationConfiguration, // 自动调节配置
 // GatewayIntentBits.AutoModerationExecution, // 自动调节执行

package/lib/index.js

@@ -1,16 +1,30 @@
 if (process.argv.slice(2).includes('discord') &&
-    !process.argv.slice(2).includes('not')) {
+    !process.argv.slice(2).includes('no')) {
     process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 }
-// 导出编译工具
-export { compilationTools, integration } from 'alemon-rollup';
-// 导出核心方法
+/**
+ * *******************
+ * 核心处理&公共方法
+ * *******************
+ */
 export * from './alemon/index.js';
-// 导出机器人
-export * from './bot.js';
-// 机器配置管理
+/**
+ * *******************
+ * 初始化
+ * *******************
+ */
+export * from './define/index.js';
+/**
+ * **********
+ * 配置管理
+ * **********
+ */
 export * from './config/index.js';
-// 监听退出
+/**
+ * *********
+ * 监听退出
+ * *********
+ */
 process.on('SIGINT', signals => {
     console.info(signals);
     if (process.pid) {

package/lib/kook/login.js

@@ -1,5 +1,4 @@
-import prompts from 'prompts';
-import { setBotConfigByKey, getBotConfigByKey, getToml, writeToml } from '../config/index.js';
+import { setBotConfigByKey, getBotConfigByKey } from '../config/index.js';
 /**
  * 登录配置
  * @param Bcf
@@ -10,43 +9,12 @@ export async function checkRobotByKOOK() {
     /**
      * 读取配置
      */
-    if (process.argv.indexOf('login') == -1) {
-        const config = getBotConfigByKey('kook');
-        if ((config ?? '') !== '' && (config.token ?? '') !== '') {
-            setBotConfigByKey('kook', config);
-            return true;
-        }
+    const config = getBotConfigByKey('kook');
+    if ((config ?? '') !== '' && (config.token ?? '') !== '') {
+        setBotConfigByKey('kook', config);
+        return true;
     }
     console.info('[LOGIN]', '-----------------------');
-    const timeoutId = setTimeout(() => {
-        throw '超过1分钟未完成登录';
-    }, 60000);
-    const { token } = await prompts([
-        {
-            type: 'password',
-            name: 'token',
-            message: 'BotToken: ',
-            validate: (value) => value !== '' && typeof value === 'string' ? true : '机器人 token: '
-        }
-    ]).catch((err) => {
-        console.error(err);
-        process.exit();
-    });
-    if (!token)
-        return false;
-    clearTimeout(timeoutId);
-    // 得到已变更的配置
-    const db = getBotConfigByKey('kook');
-    // 得到配置
-    const data = getToml();
-    data.kook = {
-        ...db,
-        // 覆盖新配置
-        token
-    };
-    // 写入配置
-    writeToml(data);
-    // 设置配置
-    setBotConfigByKey('kook', data.kook);
-    return true;
+    console.info('[LOGIN]', 'KOOK配置加载失败~');
+    process.exit();
 }

package/lib/ntqq/index.js

@@ -46,7 +46,7 @@ export async function createAlemonByNtqq() {
         /**
          * 创建客户端
          */
-        createClient(conversation);
+        createClient(conversation, cfg?.shard ?? [0, 1]);
         /**
          * 创建web端
          */

package/lib/ntqq/login.js

@@ -1,72 +1,25 @@
-import prompts from 'prompts';
-import { NtQQEventsEnum, setBotConfigByKey, getBotConfigByKey, getToml, writeToml } from '../config/index.js';
+import { setBotConfigByKey, getBotConfigByKey } from '../config/index.js';
+import { NtQQEventsEnum } from '../default/types.js';
 /**
  * 登录配置
  * @param Bcf
  * @returns
  */
 export async function checkRobotByQQ() {
-    if (process.argv.indexOf('login') == -1) {
-        const config = getBotConfigByKey('ntqq');
-        if ((config ?? '') !== '' &&
-            (config.appID ?? '') !== '' &&
-            (config.token ?? '') !== '') {
-            if (!config.intents) {
-                config.intents = [
-                    NtQQEventsEnum.GROUP_AT_MESSAGE_CREATE,
-                    NtQQEventsEnum.C2C_MESSAGE_CREATE
-                ];
-            }
-            setBotConfigByKey('ntqq', config);
-            return true;
+    const config = getBotConfigByKey('ntqq');
+    if ((config ?? '') !== '' &&
+        (config.appID ?? '') !== '' &&
+        (config.token ?? '') !== '') {
+        if (!config.intents) {
+            config.intents = [
+                NtQQEventsEnum.GROUP_AT_MESSAGE_CREATE,
+                NtQQEventsEnum.C2C_MESSAGE_CREATE
+            ];
         }
+        setBotConfigByKey('ntqq', config);
+        return true;
     }
     console.info('[LOGIN]', '-----------------------');
-    const timeoutId = setTimeout(() => {
-        throw '超过1分钟未完成登录';
-    }, 60000);
-    const { appID, token } = await prompts([
-        {
-            type: 'password',
-            name: 'appID',
-            message: 'BotAppID: ',
-            validate: value => value !== '' && typeof value === 'string' ? true : '机器人 appID: '
-        },
-        {
-            type: 'password',
-            name: 'token',
-            message: 'BotToken: ',
-            validate: value => value !== '' && typeof value === 'string' ? true : '机器人 token: '
-        }
-    ]).catch((err) => {
-        console.error(err);
-        process.exit();
-    });
-    if (!appID || !token) {
-        return false;
-    }
-    clearTimeout(timeoutId);
-    /**
-     * 默认公域机器人
-     */
-    const intents = [
-        NtQQEventsEnum.GROUP_AT_MESSAGE_CREATE,
-        NtQQEventsEnum.C2C_MESSAGE_CREATE
-    ];
-    // 得到已变更的配置
-    const db = getBotConfigByKey('ntqq');
-    // 得到配置
-    const data = getToml();
-    data.ntqq = {
-        ...db,
-        // 覆盖新配置
-        appID,
-        token,
-        intents
-    };
-    // 写入配置
-    writeToml(data);
-    // 设置配置
-    setBotConfigByKey('ntqq', data.ntqq);
-    return true;
+    console.info('[LOGIN]', 'ntqq配置加载失败~');
+    process.exit();
 }

package/lib/ntqq/sdk/wss.js

@@ -81,7 +81,6 @@ export async function createClient(call, shard = [0, 1]) {
             // 根据 opcode 进行处理
             switch (op) {
                 case 0: {
-                    console.log('[数据接收]', data);
                     // 存在,则执行t对应的函数
                     if (Object.prototype.hasOwnProperty.call(call, t)) {
                         call[t](data);

package/lib/qq/index.js

@@ -19,7 +19,11 @@ export async function createAlemonByQQ() {
         /**
          * 创建 clientApiByQQ
          */
-        global.clientApiByQQ = createOpenAPI(cfg);
+        global.clientApiByQQ = createOpenAPI({
+            appID: cfg.appID,
+            token: cfg.token,
+            sandbox: cfg.sandbox ?? false
+        });
         /**
          * 设置 qq-channal 配置
          */
@@ -33,7 +37,14 @@ export async function createAlemonByQQ() {
         /**
          * 创建 websocket
          */
-        const WebsocketClient = createWebsocket(cfg);
+        const WebsocketClient = createWebsocket({
+            appID: cfg.appID,
+            token: cfg.token,
+            sandbox: cfg.sandbox,
+            // shards?:[],
+            intents: cfg.intents
+            // maxRetry:
+        });
         /**
          * 创建 conversation
          */