alemonjs 1.0.2 → 1.0.3

package/README.md

@@ -13,33 +13,19 @@
 | cli   | 脚手架 | 开发模板脚手架       |
 | web   | 网站   | 共享平台插件贡献地址 |
 
-## 快速开始
-
-```shell
-npm init almeonjs@latest -y #安装
-```
-
-```shell
-cd alemon-bot #进入
-```
-
-```shell
-npm run app qq #启动
-```
-
 ## 配置管理
 
-打开 alemon.toml 文件
+参考配置说明进行
 
-参考配置说明进行更改[config](./config.md)
+更改[alemon.toml](./alemon.md)
 
 ### 共享平台
 
 > 仓库只做资源收集,对齐安全性不做任何检查,请谨慎选择
 
-Gitee ☞[贡献资源](https://gitee.com/ningmengchongshui/alemon/tree/web/docs/root/examples/about/plugins.md)
+[Gitee ☞ 贡献资源](https://gitee.com/ningmengchongshui/alemon/blob/web/docs/about/plugins.md)
 
-Github ☞[贡献资源](https://github.com/ningmengchongshui/alemon/tree/web/docs/root/examples/about/plugins.md)
+[Github ☞ 贡献资源](https://gitee.com/ningmengchongshui/alemon/blob/web/docs/about/plugins.md)
 
 ### 平台推送
 

package/lib/bot.js

@@ -1,54 +1,24 @@
 import { setLanchConfig } from './alemon/index.js';
-import { getBotConfigByKey, setBotConfig } from './login.js';
-import { getToml } from './config.js';
+import { getBotConfigByKey, setBotConfig, getToml } from './config/index.js';
 import { loadInit } from './alemon/index.js';
 import { ClientAPIByQQ } from './ntqq/sdk/index.js';
 import { compilationTools } from 'alemon-rollup';
+import { createAlemon } from './map.js';
+// 设置独立鉴权路径
+export const setAuthenticationByNtqq = ClientAPIByQQ.setAuthentication;
+let appDir = 'application';
 /**
- * 启动机器人
+ * 应用模块集成
+ * @param AppName
+ * @param name
+ * @returns
  */
-const createAlemon = {
-    qq: async () => {
-        const { createAlemonByQQ: qq } = await import('./qq/index.js');
-        return qq().catch(err => {
-            console.error(err);
-            console.error('QQ机器人启动失败~');
-            return false;
-        });
-    },
-    villa: async () => {
-        const { createAlemonByVilla: villa } = await import('./villa/index.js');
-        return villa().catch(err => {
-            console.error(err);
-            console.error('Villa机器人启动失败~');
-            return false;
-        });
-    },
-    kook: async () => {
-        const { createAlemonByKOOK: kook } = await import('./kook/index.js');
-        return kook().catch(err => {
-            console.error(err);
-            console.error('KOOK机器人启动失败~');
-            return false;
-        });
-    },
-    discord: async () => {
-        const { createAlemonByDiscord: dc } = await import('./discord/index.js');
-        return dc().catch(err => {
-            console.error(err);
-            console.error('Discord机器人启动失败~');
-            return false;
-        });
-    },
-    ntqq: async () => {
-        const { createAlemonByNtqq: ntqq } = await import('./ntqq/index.js');
-        return ntqq().catch(err => {
-            console.error(err);
-            console.error('Ntqq机器人启动失败~');
-            return false;
-        });
-    }
-};
+export function ApplicationTools(AppName, name = 'apps') {
+    return compilationTools({
+        aInput: `${appDir}/${AppName}/${name}/**/*.ts`,
+        aOutput: `${appDir}/${AppName}/apps.js`
+    });
+}
 /**
  * 创建机器人
  * @param val
@@ -57,9 +27,11 @@ const createAlemon = {
 export async function createBot(val = {
     args: process.argv.slice(2),
     mount: false,
-    address: '/application'
+    address: 'application'
 }) {
     const { args, mount, cfg, address } = val;
+    // 配置快捷路径
+    appDir = address == undefined ? 'application' : address;
     /**
      * 加载配置
      */
@@ -88,11 +60,7 @@ export async function createBot(val = {
      */
     await loadInit({
         mount: mount == undefined ? false : mount,
-        address: address == undefined ? '/application' : address
+        address: address == undefined ? '/application' : `/${address}`
     });
     return compilationTools;
 }
-// 机器人配置
-export { getBotConfigByKey, setBotConfigByKey } from './login.js';
-// 设置独立鉴权路径
-export const setAuthenticationByNtqq = ClientAPIByQQ.setAuthentication;

package/lib/config/index.js

@@ -0,0 +1,8 @@
+/**
+ * ********
+ * 配置管理器
+ * ********
+ */
+export * from './login.js';
+export * from './toml.js';
+export * from './types.js';

package/lib/{login.js → config/login.js}

@@ -65,6 +65,9 @@ const config = {
         host: '127.0.0.1',
         port: 5000
     },
+    /**
+     * pup的配置的繁多的
+     */
     puppeteer: {
         headless: 'new',
         timeout: 30000,
@@ -85,11 +88,29 @@ const config = {
  */
 export function setBotConfig(val) {
     // 分布覆盖
-    for (const item in val) {
+    for (const i in val) {
         // 当且仅当存在同key的时候才会覆盖默认配置
-        for (const i in val[item]) {
-            // 当前仅当同属性名的时候才会覆盖默认配置
-            config[item][i] = val[item][i];
+        if (Object.prototype.hasOwnProperty.call(config, i)) {
+            if (i == 'puppeteer') {
+                // pup 不用检查 直接覆盖
+                for (const j in val[i]) {
+                    config[i][j] = val[i][j];
+                }
+            }
+            else {
+                for (const j in val[i]) {
+                    // 当前仅当同属性名的时候才会覆盖默认配置
+                    if (Object.prototype.hasOwnProperty.call(config[i], j)) {
+                        config[i][j] = val[i][j];
+                    }
+                    else {
+                        console.log('[alemonjs][存在无效参数]', val[i]);
+                    }
+                }
+            }
+        }
+        else {
+            console.log('[alemonjs][存在无效参数]', val[i]);
         }
     }
 }
@@ -99,10 +120,22 @@ export function setBotConfig(val) {
  * @param val
  */
 export function setBotConfigByKey(key, val) {
-    // 分布覆盖
-    for (const item in val) {
-        // 当前仅当同属性名的时候才会覆盖默认配置
-        config[key][item] = val[item];
+    if (key == 'puppeteer') {
+        // pup 不用检查 直接覆盖
+        for (const item in val) {
+            config[key][item] = val[item];
+        }
+    }
+    else {
+        for (const item in val) {
+            // 当前仅当同属性名的时候才会覆盖默认配置
+            if (Object.prototype.hasOwnProperty.call(config[key], item)) {
+                config[key][item] = val[item];
+            }
+            else {
+                console.log('[alemonjs][存在无效参数]', val[item]);
+            }
+        }
     }
 }
 /**

package/lib/discord/alemon/message/PUBLIC_GUILD_MESSAGES.js

@@ -2,7 +2,7 @@ import { InstructionMatching } from '../../../alemon/index.js';
 import { segmentDiscord } from '../segment.js';
 import { getBotMsgByDiscord } from '../bot.js';
 import { postImage } from '../api.js';
-import { getBotConfigByKey } from '../../../login.js';
+import { getBotConfigByKey } from '../../../config/index.js';
 /**
  * 公共
  * @param event

package/lib/discord/index.js

@@ -2,7 +2,7 @@ import { Client } from 'discord.js';
 import { checkRobotByDiscord } from './login.js';
 import { callBackByDisdord } from './alemon/conversation.js';
 import { setBotMsgByDiscord } from './alemon/bot.js';
-import { getBotConfigByKey } from '../login.js';
+import { getBotConfigByKey } from '../config/index.js';
 export async function createAlemonByDiscord() {
     /**
      * 登录

package/lib/discord/login.js

@@ -1,7 +1,6 @@
 import prompts from 'prompts';
 import { GatewayIntentBits } from 'discord.js';
-import { setBotConfigByKey, getBotConfigByKey } from '../login.js';
-import { getToml, writeToml } from '../config.js';
+import { setBotConfigByKey, getBotConfigByKey, getToml, writeToml } from '../config/index.js';
 /**
  * 登录配置
  * @param Bcf

package/lib/index.js

@@ -8,6 +8,8 @@ export { compilationTools, integration } from 'alemon-rollup';
 export * from './alemon/index.js';
 // 导出机器人
 export * from './bot.js';
+// 机器配置管理
+export * from './config/index.js';
 // 监听退出
 process.on('SIGINT', signals => {
     console.info(signals);

package/lib/kook/alemon/message/PUBLIC_GUILD_MESSAGES.js

@@ -2,7 +2,7 @@ import { InstructionMatching } from '../../../alemon/index.js';
 import { KOOKApiClient } from 'kook-ws';
 import { segmentKOOK } from '../segment.js';
 import { getBotMsgByKOOK } from '../bot.js';
-import { getBotConfigByKey } from '../../../login.js';
+import { getBotConfigByKey } from '../../../config/index.js';
 /**
  *
  * @param event

package/lib/kook/index.js

@@ -2,7 +2,7 @@ import { checkRobotByKOOK } from './login.js';
 import { callBackByKOOK } from './alemon/conversation.js';
 import { createClient, KOOKApiClient } from 'kook-ws';
 import { setBotMsgByKOOK } from './alemon/bot.js';
-import { getBotConfigByKey } from '../login.js';
+import { getBotConfigByKey } from '../config/index.js';
 /**
  * 创建实例
  * @returns

package/lib/kook/login.js

@@ -1,6 +1,5 @@
 import prompts from 'prompts';
-import { setBotConfigByKey, getBotConfigByKey } from '../login.js';
-import { getToml, writeToml } from '../config.js';
+import { setBotConfigByKey, getBotConfigByKey, getToml, writeToml } from '../config/index.js';
 /**
  * 登录配置
  * @param Bcf

package/lib/map.js

@@ -0,0 +1,45 @@
+/**
+ * 启动机器人
+ */
+export const createAlemon = {
+    qq: async () => {
+        const { createAlemonByQQ: qq } = await import('./qq/index.js');
+        return qq().catch(err => {
+            console.error(err);
+            console.error('QQ机器人启动失败~');
+            return false;
+        });
+    },
+    villa: async () => {
+        const { createAlemonByVilla: villa } = await import('./villa/index.js');
+        return villa().catch(err => {
+            console.error(err);
+            console.error('Villa机器人启动失败~');
+            return false;
+        });
+    },
+    kook: async () => {
+        const { createAlemonByKOOK: kook } = await import('./kook/index.js');
+        return kook().catch(err => {
+            console.error(err);
+            console.error('KOOK机器人启动失败~');
+            return false;
+        });
+    },
+    discord: async () => {
+        const { createAlemonByDiscord: dc } = await import('./discord/index.js');
+        return dc().catch(err => {
+            console.error(err);
+            console.error('Discord机器人启动失败~');
+            return false;
+        });
+    },
+    ntqq: async () => {
+        const { createAlemonByNtqq: ntqq } = await import('./ntqq/index.js');
+        return ntqq().catch(err => {
+            console.error(err);
+            console.error('Ntqq机器人启动失败~');
+            return false;
+        });
+    }
+};

package/lib/ntqq/alemon/message/GROUP_AT_MESSAGE_CREATE.js

@@ -2,7 +2,7 @@ import { InstructionMatching } from '../../../alemon/index.js';
 import { ClientAPIByQQ as Client, ClinetWeb, getWebConfig } from '../../sdk/index.js';
 import { segmentQQ } from '../segment.js';
 import { getBotMsgByNtqq } from '../bot.js';
-import { getBotConfigByKey } from '../../../login.js';
+import { getBotConfigByKey } from '../../../config/index.js';
 import IMGS from 'image-size';
 /**
  * 获取ip

package/lib/ntqq/index.js

@@ -1,5 +1,5 @@
 import { checkRobotByQQ } from './login.js';
-import { getBotConfigByKey } from '../login.js';
+import { getBotConfigByKey } from '../config/index.js';
 import { conversation } from './alemon/conversation.js';
 import { setBotConfig, createClient, ClientAPIByQQ, ClinetWeb, getWebConfig } from './sdk/index.js';
 import { createWeb } from './sdk/web/client.js';

package/lib/ntqq/login.js

@@ -1,7 +1,5 @@
 import prompts from 'prompts';
-import { setBotConfigByKey, getBotConfigByKey } from '../login.js';
-import { getToml, writeToml } from '../config.js';
-import { NtQQEventsEnum } from '../types.js';
+import { NtQQEventsEnum, setBotConfigByKey, getBotConfigByKey, getToml, writeToml } from '../config/index.js';
 /**
  * 登录配置
  * @param Bcf

package/lib/qq/alemon/conversation.js

@@ -11,7 +11,7 @@ import { MESSAGE_AUDIT } from './message/MESSAGE_AUDIT.js';
 import { AUDIO_ACTION } from './message/AUDIO_ACTION.js';
 import { FORUMS_EVENT } from './message/FORUMS_EVENT.js';
 import { setBotMsgByQQ } from './bot.js';
-import { getBotConfigByKey } from '../../login.js';
+import { getBotConfigByKey } from '../../config/index.js';
 /**
  * 会话事件分类
  * @param ws

package/lib/qq/alemon/message/MESSAGE.js

@@ -3,7 +3,7 @@ import { ClientAPIByQQ as Client } from 'qq-channel';
 import { Private } from '../privatechat.js';
 import { segmentQQ } from '../segment.js';
 import { setBotMsgByQQ } from '../bot.js';
-import { getBotConfigByKey } from '../../../login.js';
+import { getBotConfigByKey } from '../../../config/index.js';
 /**
  * 公私域合并
  * @param e

package/lib/qq/index.js

@@ -3,7 +3,7 @@ import { createOpenAPI, createWebsocket } from 'qq-guild-bot';
 import { setBotConfig } from 'qq-channel';
 import { checkRobotByQQ } from './login.js';
 import { createConversationByQQ } from './alemon/conversation.js';
-import { getBotConfigByKey } from '../login.js';
+import { getBotConfigByKey } from '../config/index.js';
 export async function createAlemonByQQ() {
     /**
      * 登录

package/lib/qq/login.js

@@ -1,7 +1,6 @@
 import prompts from 'prompts';
 import { AvailableIntentsEventsEnum } from 'qq-guild-bot';
-import { setBotConfigByKey, getBotConfigByKey } from '../login.js';
-import { getToml, writeToml } from '../config.js';
+import { setBotConfigByKey, getBotConfigByKey, getToml, writeToml } from '../config/index.js';
 /**
  * 登录配置
  * @param Bcf

package/lib/villa/alemon/message/MESSAGES.js

@@ -2,7 +2,7 @@ import { InstructionMatching } from '../../../alemon/index.js';
 import { Client } from 'mys-villa';
 import IMGS from 'image-size';
 import { segmentVilla } from '../segment.js';
-import { getBotConfigByKey } from '../../../login.js';
+import { getBotConfigByKey } from '../../../config/index.js';
 import { now_e } from './e.js';
 /**
  * 获取ip

package/lib/villa/index.js

@@ -1,7 +1,7 @@
 import { callBackByVilla } from './alemon/conversation.js';
 import { checkRobotByVilla } from './login.js';
 import { createClient, Client, hmacSha256 } from 'mys-villa';
-import { getBotConfigByKey } from '../login.js';
+import { getBotConfigByKey } from '../config/index.js';
 export async function createAlemonByVilla() {
     /**
      * 登录

package/lib/villa/login.js

@@ -1,6 +1,5 @@
 import prompts from 'prompts';
-import { setBotConfigByKey, getBotConfigByKey } from '../login.js';
-import { getToml, writeToml } from '../config.js';
+import { setBotConfigByKey, getBotConfigByKey, getToml, writeToml } from '../config/index.js';
 /**
  * 登录配置
  * @param Bcf

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "阿柠檬框架",
   "author": "ningmengchongshui",
   "main": "lib/index.js",
@@ -57,4 +57,4 @@
   "engines": {
     "node": ">=16.14.0"
   }
-}
+}

package/types/bot.d.ts

@@ -1,15 +1,20 @@
 import { ClientAPIByQQ } from './ntqq/sdk/index.js';
-interface botOpoint {
-    args?: string[];
-    mount?: boolean;
-    address?: string;
-    cfg?: string;
-}
+export declare const setAuthenticationByNtqq: typeof ClientAPIByQQ.setAuthentication;
+/**
+ * 应用模块集成
+ * @param AppName
+ * @param name
+ * @returns
+ */
+export declare function ApplicationTools(AppName: string, name?: string): any;
 /**
  * 创建机器人
  * @param val
  * @returns
  */
-export declare function createBot(val?: botOpoint): Promise<any>;
-export { getBotConfigByKey, setBotConfigByKey } from './login.js';
-export declare const setAuthenticationByNtqq: typeof ClientAPIByQQ.setAuthentication;
+export declare function createBot(val?: {
+    args?: string[];
+    mount?: boolean;
+    address?: string;
+    cfg?: string;
+}): Promise<any>;

package/types/config/index.d.ts

@@ -0,0 +1,8 @@
+/**
+ * ********
+ * 配置管理器
+ * ********
+ */
+export * from './login.js';
+export * from './toml.js';
+export * from './types.js';

package/types/{types.d.ts → config/types.d.ts}

@@ -1,20 +1,21 @@
 import { GatewayIntentBits } from 'discord.js';
 import { AvailableIntentsEventsEnum } from 'qq-guild-bot';
+import { PuppeteerLaunchOptions } from 'puppeteer';
 /**
- * ****
+ * ******
  * config
- * /////
+ * ******
  */
 export interface ConfigType {
-    redis?: RedisConfig;
-    mysql?: MysqlConfig;
-    discord?: DiscordConfig;
-    kook?: KookConfig;
-    villa?: VillaConfig;
-    qq?: QQConfig;
-    server?: ServerConfig;
-    puppeteer?: PuppeteerConfig;
-    ntqq?: NtQQConfig;
+    redis: RedisConfig;
+    mysql: MysqlConfig;
+    discord: DiscordConfig;
+    kook: KookConfig;
+    villa: VillaConfig;
+    qq: QQConfig;
+    server: ServerConfig;
+    puppeteer: PuppeteerLaunchOptions;
+    ntqq: NtQQConfig;
 }
 /**
  * ****
@@ -123,13 +124,3 @@ export interface ServerConfig {
     host: string;
     port: number;
 }
-/**
- * ********
- * pup
- * *******
- */
-export interface PuppeteerConfig {
-    args: string[];
-    headless: 'new';
-    timeout: number;
-}

package/types/index.d.ts

@@ -1,3 +1,4 @@
 export { compilationTools, integration } from 'alemon-rollup';
 export * from './alemon/index.js';
 export * from './bot.js';
+export * from './config/index.js';

package/types/map.d.ts

@@ -0,0 +1,10 @@
+/**
+ * 启动机器人
+ */
+export declare const createAlemon: {
+    qq: () => Promise<boolean>;
+    villa: () => Promise<boolean>;
+    kook: () => Promise<boolean>;
+    discord: () => Promise<boolean>;
+    ntqq: () => Promise<boolean>;
+};