alemonjs 1.0.2 → 1.0.4

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() {
     /**
      * 登录
@@ -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
          */

package/lib/qq/login.js

@@ -1,7 +1,5 @@
-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 } from '../config/index.js';
 /**
  * 登录配置
  * @param Bcf
@@ -26,126 +24,6 @@ export async function checkRobotByQQ() {
         }
     }
     console.info('[LOGIN]', '-----------------------');
-    console.info('[LOGIN]', '推荐将机器人设置', '订阅推送', '打开');
-    console.info('[LOGIN]', '推荐将机器人设置', '私聊权限', '打开');
-    console.info('[LOGIN]', '非管理类机器推荐', '普通成员', '身份');
-    console.info('[LOGIN]', '-----------------------');
-    console.info('[LOGIN]', '退出重来？可按', '[CTRL+C]');
-    console.info('[LOGIN]', '更改登录？执行', 'npm run login');
-    console.info('[LOGIN]', '-----------------------');
-    const timeoutId = setTimeout(() => {
-        throw '超过1分钟未完成登录';
-    }, 60000);
-    const { appID, token, inputBot, imputDev } = 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: '
-        },
-        {
-            type: 'select',
-            name: 'inputBot',
-            message: '请选择机器人类型 :',
-            choices: [
-                { title: '公域', value: '0' },
-                { title: '私域', value: '1' }
-            ],
-            /**
-             * 默认公域
-             */
-            initial: 0
-        },
-        {
-            type: 'select',
-            name: 'imputDev',
-            message: '请选择机器人环境 :',
-            choices: [
-                { title: '部署环境', value: '0' },
-                { title: '开发环境', value: '1' }
-            ],
-            /**
-             * 默认部署
-             */
-            initial: 0
-        }
-    ]).catch((err) => {
-        console.error(err);
-        process.exit();
-    });
-    if (!appID || !token || !inputBot || !imputDev) {
-        return false;
-    }
-    clearTimeout(timeoutId);
-    /**
-     * 默认公域机器人
-     */
-    let intents = [
-        AvailableIntentsEventsEnum.GUILDS,
-        AvailableIntentsEventsEnum.GUILD_MEMBERS,
-        AvailableIntentsEventsEnum.DIRECT_MESSAGE,
-        /**
-         * 公域特有
-         */
-        AvailableIntentsEventsEnum.PUBLIC_GUILD_MESSAGES //公域事件
-    ];
-    /**
-     * 默认公域机器人
-     */
-    let isPrivate = false;
-    if (inputBot == '1') {
-        /**
-         * 私域机器人
-         */
-        intents = [
-            AvailableIntentsEventsEnum.GUILDS,
-            AvailableIntentsEventsEnum.GUILD_MEMBERS,
-            AvailableIntentsEventsEnum.DIRECT_MESSAGE,
-            /**
-             * 需申请的
-             */
-            AvailableIntentsEventsEnum.AUDIO_ACTION,
-            AvailableIntentsEventsEnum.MESSAGE_AUDIT,
-            AvailableIntentsEventsEnum.INTERACTION,
-            AvailableIntentsEventsEnum.GUILD_MESSAGE_REACTIONS,
-            /**
-             * 私域特有
-             */
-            AvailableIntentsEventsEnum.GUILD_MESSAGES,
-            AvailableIntentsEventsEnum.FORUMS_EVENT //私域论坛
-        ];
-        /**
-         * 私域机器人
-         */
-        isPrivate = true;
-    }
-    // 默认部署
-    let sandbox = false;
-    // 开发环境
-    if (imputDev == '1')
-        sandbox = true;
-    // 得到已变更的配置
-    const db = getBotConfigByKey('qq');
-    // 得到配置
-    const data = getToml();
-    data.qq = {
-        ...db,
-        // 覆盖新配置
-        appID,
-        token,
-        intents,
-        isPrivate,
-        sandbox
-    };
-    // 写入配置
-    writeToml(data);
-    // 设置配置
-    setBotConfigByKey('qq', data.qq);
-    return true;
+    console.info('[LOGIN]', 'qq配置加载失败~');
+    process.exit();
 }

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,4 @@
-import prompts from 'prompts';
-import { setBotConfigByKey, getBotConfigByKey } from '../login.js';
-import { getToml, writeToml } from '../config.js';
+import { setBotConfigByKey, getBotConfigByKey } from '../config/index.js';
 /**
  * 登录配置
  * @param Bcf
@@ -8,55 +6,16 @@ import { getToml, writeToml } from '../config.js';
  * @returns
  */
 export async function checkRobotByVilla() {
-    // 重写登录
-    if (process.argv.indexOf('login') == -1) {
-        // 启动
-        const config = getBotConfigByKey('villa');
-        // 存在
-        if ((config ?? '') !== '' &&
-            (config.bot_id ?? '') !== '' &&
-            (config.secret ?? '') !== '') {
-            setBotConfigByKey('villa', config);
-            return true;
-        }
+    // 启动
+    const config = getBotConfigByKey('villa');
+    // 存在
+    if ((config ?? '') !== '' &&
+        (config.bot_id ?? '') !== '' &&
+        (config.secret ?? '') !== '') {
+        setBotConfigByKey('villa', config);
+        return true;
     }
     console.info('[LOGIN]', '-----------------------');
-    const timeoutId = setTimeout(() => {
-        throw '超过1分钟未完成登录';
-    }, 60000);
-    const { bot_id, secret } = await prompts([
-        {
-            type: 'password',
-            name: 'bot_id',
-            message: 'bot_id: ',
-            validate: (value) => value !== '' && typeof value === 'string' ? true : 'bot_id: '
-        },
-        {
-            type: 'password',
-            name: 'secret',
-            message: 'secret: ',
-            validate: (value) => value !== '' && typeof value === 'string' ? true : 'secret: '
-        }
-    ]).catch((err) => {
-        console.error(err);
-        process.exit();
-    });
-    if (!bot_id || !secret)
-        return false;
-    clearTimeout(timeoutId);
-    // 得到已变更的配置
-    const db = getBotConfigByKey('villa');
-    // 得到配置
-    const data = getToml();
-    data.villa = {
-        ...db,
-        // 覆盖新配置
-        bot_id,
-        secret
-    };
-    // 写入配置
-    writeToml(data);
-    // 设置配置
-    setBotConfigByKey('villa', data.villa);
-    return true;
+    console.info('[LOGIN]', 'villa配置加载失败~');
+    process.exit();
 }

package/package.json

@@ -1,60 +1,62 @@
-{
-  "name": "alemonjs",
-  "version": "1.0.2",
-  "description": "阿柠檬框架",
-  "author": "ningmengchongshui",
-  "main": "lib/index.js",
-  "license": "GPL-2.0",
-  "type": "module",
-  "scripts": {
-    "app": "ts-node index.ts",
-    "login": "ts-node index.ts login",
-    "tsc": "npx tsc",
-    "format": "prettier --write .",
-    "lint": "eslint . --ext .js,.ts --fix --ignore-path .gitignore"
-  },
-  "dependencies": {
-    "@discordjs/builders": "^1.6.3",
-    "@discordjs/core": "^0.6.0",
-    "@discordjs/rest": "^1.7.1",
-    "@iarna/toml": "^2.2.5",
-    "alemon-rollup": "^1.0.2",
-    "axios": "^1.4.0",
-    "discord.js": "^14.11.0",
-    "image-size": "^1.0.2",
-    "kook-ws": "^1.0.4",
-    "lodash": "^4.17.21",
-    "mys-villa": "^1.1.8",
-    "prompts": "^2.4.2",
-    "puppeteer": "^20.7.1",
-    "qq-channel": "^1.0.0",
-    "qq-guild-bot": "^2.9.5",
-    "qrcode": "^1.5.3"
-  },
-  "devDependencies": {
-    "@types/lodash": "^4.14.186",
-    "@types/node": "^20.2.4",
-    "@types/progress": "^2.0.5",
-    "@types/qrcode": "^1.5.0",
-    "@types/ws": "^8.5.5",
-    "@typescript-eslint/eslint-plugin": "^5.60.0",
-    "@typescript-eslint/parser": "^5.60.0",
-    "eslint": "^8.43.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "prettier": "^2.8.8",
-    "ts-node": "^10.9.1",
-    "typescript": ">=5.0.4 <5.1.0"
-  },
-  "types": "types",
-  "files": [
-    "lib",
-    "types"
-  ],
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org"
-  },
-  "engines": {
-    "node": ">=16.14.0"
-  }
-}
+{
+  "name": "alemonjs",
+  "version": "1.0.4",
+  "description": "阿柠檬框架",
+  "author": "ningmengchongshui",
+  "main": "lib/index.js",
+  "license": "GPL-2.0",
+  "type": "module",
+  "scripts": {
+    "app": "alemonjs",
+    "dev": "alemonjs dev",
+    "tsc": "npx tsc",
+    "format": "prettier --write .",
+    "lint": "eslint . --ext .js,.ts --fix --ignore-path .gitignore"
+  },
+  "dependencies": {
+    "@discordjs/builders": "^1.6.3",
+    "@discordjs/core": "^0.6.0",
+    "@discordjs/rest": "^1.7.1",
+    "alemon-rollup": "^1.0.2",
+    "axios": "^1.4.0",
+    "discord.js": "^14.11.0",
+    "image-size": "^1.0.2",
+    "kook-ws": "^1.0.4",
+    "lodash": "^4.17.21",
+    "mys-villa": "^1.1.8",
+    "puppeteer": "^20.7.1",
+    "qq-channel": "^1.0.0",
+    "qq-guild-bot": "^2.9.5",
+    "qrcode": "^1.5.3"
+  },
+  "devDependencies": {
+    "@types/lodash": "^4.14.186",
+    "@types/node": "^20.2.4",
+    "@types/progress": "^2.0.5",
+    "@types/qrcode": "^1.5.0",
+    "@types/ws": "^8.5.5",
+    "@typescript-eslint/eslint-plugin": "^5.60.0",
+    "@typescript-eslint/parser": "^5.60.0",
+    "eslint": "^8.43.0",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "prettier": "^2.8.8",
+    "ts-node": "^10.9.1",
+    "typescript": ">=5.0.4 <5.1.0"
+  },
+  "types": "types",
+  "files": [
+    "bin",
+    "lib",
+    "types"
+  ],
+  "bin": {
+    "alemonjs": "bin/main.js"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org"
+  },
+  "engines": {
+    "node": ">=16.14.0"
+  }
+}

package/types/alemon/dealmsg.d.ts

@@ -1,4 +1,13 @@
 import { AMessage } from './typings.js';
+interface RegexControl {
+    RegexOpen?: RegExp;
+    RegexClose?: RegExp;
+}
+/**
+ * 插件名匹配
+ * @param val
+ */
+export declare function setAppRegex(val: RegexControl): void;
 /**
  * 设置指令json地址
  * @param rt '/public/defset'
@@ -39,3 +48,4 @@ export declare function InstructionMatching(e: AMessage): Promise<boolean>;
  * @returns
  */
 export declare function typeMessage(e: AMessage): Promise<boolean>;
+export {};

package/types/config/index.d.ts

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

package/types/config/pup.d.ts

@@ -0,0 +1,7 @@
+/**
+ * @type {import("puppeteer").Configuration}
+ */
+export declare function getPupPath(): {
+    skipDownload: boolean;
+    executablePath: string;
+};

package/types/config/types.d.ts

@@ -0,0 +1,18 @@
+import { PuppeteerLaunchOptions } from 'puppeteer';
+import { DiscordOptions, KookOptionsg, MysqlOptions, NtQQOptions, QqGuildOptions, RedisOptions, VillaOptions, ServerOptions } from '../default/types.js';
+/**
+ * ******
+ * config
+ * ******
+ */
+export interface ConfigType {
+    redis: RedisOptions;
+    mysql: MysqlOptions;
+    discord: DiscordOptions;
+    kook: KookOptionsg;
+    villa: VillaOptions;
+    qq: QqGuildOptions;
+    server: ServerOptions;
+    puppeteer: PuppeteerLaunchOptions;
+    ntqq: NtQQOptions;
+}

package/types/default/login/discord.d.ts

@@ -0,0 +1,8 @@
+import { GatewayIntentBits } from 'discord.js';
+declare const _default: {
+    token: string;
+    masterID: string;
+    password: string;
+    intents: GatewayIntentBits[];
+};
+export default _default;

package/types/default/login/kook.d.ts

@@ -0,0 +1,6 @@
+declare const _default: {
+    token: string;
+    masterID: string;
+    password: string;
+};
+export default _default;

package/types/default/login/ntqq.d.ts

@@ -0,0 +1,16 @@
+import { NtQQEventsEnum } from '../types.js';
+declare const _default: {
+    appID: string;
+    token: string;
+    secret: string;
+    masterID: string;
+    password: string;
+    intents: NtQQEventsEnum[];
+    shard: number[];
+    port: number;
+    size: number;
+    img_url: string;
+    IMAGE_DIR: string;
+    http: string;
+};
+export default _default;

package/types/default/login/qq.d.ts

@@ -0,0 +1,12 @@
+import { AvailableIntentsEventsEnum } from 'qq-guild-bot';
+declare const _default: {
+    appID: string;
+    token: string;
+    secret: string;
+    masterID: string;
+    password: string;
+    intents: AvailableIntentsEventsEnum[];
+    isPrivate: boolean;
+    sandbox: boolean;
+};
+export default _default;

package/types/default/login/villa.d.ts

@@ -0,0 +1,14 @@
+declare const _default: {
+    bot_id: string;
+    secret: string;
+    pub_key: string;
+    masterID: string;
+    password: string;
+    http: string;
+    url: string;
+    port: number;
+    size: number;
+    img_url: string;
+    IMAGE_DIR: string;
+};
+export default _default;

package/types/default/mysql.d.ts

@@ -0,0 +1,8 @@
+declare const _default: {
+    host: string;
+    port: number;
+    user: string;
+    password: string;
+    database: string;
+};
+export default _default;

package/types/default/pup.d.ts

@@ -0,0 +1,3 @@
+import { PuppeteerLaunchOptions } from 'puppeteer';
+declare const _default: PuppeteerLaunchOptions;
+export default _default;

package/types/default/redis.d.ts

@@ -0,0 +1,7 @@
+declare const _default: {
+    host: string;
+    port: number;
+    password: string;
+    db: number;
+};
+export default _default;

package/types/default/server.d.ts

@@ -0,0 +1,5 @@
+declare const _default: {
+    host: string;
+    port: number;
+};
+export default _default;