node-karin 0.12.0 → 0.12.2-5.pr.206.24448f3

package/lib/utils/config/config.d.ts

@@ -1,193 +0,0 @@
-import { Logger } from 'log4js';
-import { Redis, App, Config, Server, Package, GroupCfg, KarinEventTypes } from '../../types/index.js';
-/**
- * 配置文件
- */
-export declare const config: {
-    /**
-     * 运行目录绝对路径
-     */
-    dir: string;
-    /**
-     * 运行目录配置文件夹路径
-     */
-    cfgDir: string;
-    /**
-     * node-karin npm包路径
-     */
-    pkgDir: string;
-    /**
-     * node-karin 包配置文件夹路径
-     */
-    pkgCfgDir: string;
-    change: Map<string, any>;
-    watcher: Map<string, any>;
-    review: boolean;
-    logger: Logger;
-    /**
-     * 初始化配置
-     */
-    initCfg(): Promise<void>;
-    getPlugins(): Promise<string[]>;
-    /**
-     * 递归创建目录
-     * @param dirname - 要创建的文件夹路径
-     */
-    mkdir(dirname: string): boolean;
-    /**
-     * 为每一个插件建立对应的文件夹
-     */
-    dirPath(_path: string, plugins: string[]): Promise<void>;
-    /**
-     * 超时时间
-     */
-    timeout(type?: "ws" | "grpc"): number;
-    /**
-     * Redis 配置
-     * 采用实时读取优化性能
-     */
-    readonly redis: Redis;
-    /**
-     * 主人列表
-     */
-    readonly master: string[];
-    /**
-     * 管理员列表
-     */
-    readonly admin: string[];
-    /**
-     * App管理
-     */
-    readonly App: App;
-    /**
-     * 基本配置
-     */
-    readonly Config: Config;
-    /**
-     * Server 配置文档
-     */
-    readonly Server: Server;
-    /**
-     * packageon
-     * 实时获取packageon文件
-     */
-    readonly package: Package;
-    /**
-     * 获取群配置
-     * @param group_id - 群号
-     * @param e - 事件
-     */
-    group(group_id: string, e: KarinEventTypes): GroupCfg;
-    /**
-     * 获取配置yaml
-     * @param type 类型
-     * @param name 文件名称
-     * @param isWatch 是否监听文件
-     */
-    getYaml(type: "defSet" | "config", name: string, isWatch?: boolean): any;
-    /**
-     * 监听配置文件
-     * @param type 类型
-     * @param name 文件名称 不带后缀
-     * @param file 文件路径
-     */
-    watch(type: "defSet" | "config", name: string, file: string): Promise<true | undefined>;
-    changeApp(): Promise<void>;
-    changeCfg(): Promise<void>;
-    changeGroup(): Promise<void>;
-    "__#2@#review"(): Promise<void>;
-};
-export declare const Cfg: {
-    /**
-     * 运行目录绝对路径
-     */
-    dir: string;
-    /**
-     * 运行目录配置文件夹路径
-     */
-    cfgDir: string;
-    /**
-     * node-karin npm包路径
-     */
-    pkgDir: string;
-    /**
-     * node-karin 包配置文件夹路径
-     */
-    pkgCfgDir: string;
-    change: Map<string, any>;
-    watcher: Map<string, any>;
-    review: boolean;
-    logger: Logger;
-    /**
-     * 初始化配置
-     */
-    initCfg(): Promise<void>;
-    getPlugins(): Promise<string[]>;
-    /**
-     * 递归创建目录
-     * @param dirname - 要创建的文件夹路径
-     */
-    mkdir(dirname: string): boolean;
-    /**
-     * 为每一个插件建立对应的文件夹
-     */
-    dirPath(_path: string, plugins: string[]): Promise<void>;
-    /**
-     * 超时时间
-     */
-    timeout(type?: "ws" | "grpc"): number;
-    /**
-     * Redis 配置
-     * 采用实时读取优化性能
-     */
-    readonly redis: Redis;
-    /**
-     * 主人列表
-     */
-    readonly master: string[];
-    /**
-     * 管理员列表
-     */
-    readonly admin: string[];
-    /**
-     * App管理
-     */
-    readonly App: App;
-    /**
-     * 基本配置
-     */
-    readonly Config: Config;
-    /**
-     * Server 配置文档
-     */
-    readonly Server: Server;
-    /**
-     * packageon
-     * 实时获取packageon文件
-     */
-    readonly package: Package;
-    /**
-     * 获取群配置
-     * @param group_id - 群号
-     * @param e - 事件
-     */
-    group(group_id: string, e: KarinEventTypes): GroupCfg;
-    /**
-     * 获取配置yaml
-     * @param type 类型
-     * @param name 文件名称
-     * @param isWatch 是否监听文件
-     */
-    getYaml(type: "defSet" | "config", name: string, isWatch?: boolean): any;
-    /**
-     * 监听配置文件
-     * @param type 类型
-     * @param name 文件名称 不带后缀
-     * @param file 文件路径
-     */
-    watch(type: "defSet" | "config", name: string, file: string): Promise<true | undefined>;
-    changeApp(): Promise<void>;
-    changeCfg(): Promise<void>;
-    changeGroup(): Promise<void>;
-    "__#2@#review"(): Promise<void>;
-};

package/lib/utils/config/config.js

@@ -1,328 +0,0 @@
-import fs from 'fs';
-import Yaml from 'yaml';
-import path from 'path';
-import chokidar from 'chokidar';
-import { karinDir } from '../../core/init/dir.js';
-import { common } from '../../utils/common/common.js';
-/**
- * 配置文件
- */
-export const config = new (class Cfg {
-    /**
-     * 运行目录绝对路径
-     */
-    dir;
-    /**
-     * 运行目录配置文件夹路径
-     */
-    cfgDir;
-    /**
-     * node-karin npm包路径
-     */
-    pkgDir;
-    /**
-     * node-karin 包配置文件夹路径
-     */
-    pkgCfgDir;
-    change;
-    watcher;
-    review;
-    logger;
-    constructor() {
-        this.dir = process.cwd();
-        this.pkgDir = karinDir;
-        this.cfgDir = this.dir + '/config';
-        this.pkgCfgDir = this.pkgDir + '/config/defSet';
-        /** 缓存 */
-        this.change = new Map();
-        /** 监听文件 */
-        this.watcher = new Map();
-        /** 拦截器状态 */
-        this.review = false;
-        this.initCfg();
-    }
-    /**
-     * 初始化配置
-     */
-    async initCfg() {
-        const list = [
-            this.dir + '/temp/input',
-            this.dir + '/plugins/karin-plugin-example',
-            this.cfgDir + '/config',
-            this.cfgDir + '/plugin',
-        ];
-        list.forEach(path => this.mkdir(path));
-        if (this.pkgCfgDir !== (this.cfgDir + '/defSet').replace(/\\/g, '/')) {
-            const files = fs.readdirSync(this.pkgCfgDir).filter(file => file.endsWith('.yaml'));
-            files.forEach(file => {
-                const path = `${this.cfgDir}/config/${file}`;
-                const pathDef = `${this.pkgCfgDir}/${file}`;
-                if (!fs.existsSync(path))
-                    fs.copyFileSync(pathDef, path);
-            });
-        }
-        /** 为每个插件包创建统一存储的文件夹 */
-        const plugins = await this.getPlugins();
-        const DataList = [
-            'data',
-            'temp',
-            'resources',
-            'temp/html',
-            this.cfgDir + '/plugin',
-        ];
-        DataList.forEach(path => this.dirPath(path, plugins));
-        this.logger = (await import('../core/logger.js')).default;
-    }
-    async getPlugins() {
-        const list = [];
-        const files = fs.readdirSync('./plugins', { withFileTypes: true });
-        // 过滤掉非karin-plugin-开头的文件夹
-        list.push(...files.filter(file => file.isDirectory() && (file.name.startsWith('karin-plugin-'))).map(dir => dir.name));
-        // 获取npm插件
-        list.push(...(await common.getNpmPlugins(false)));
-        return list;
-    }
-    /**
-     * 递归创建目录
-     * @param dirname - 要创建的文件夹路径
-     */
-    mkdir(dirname) {
-        if (fs.existsSync(dirname))
-            return true;
-        /** 递归自调用 */
-        if (this.mkdir(path.dirname(dirname)))
-            fs.mkdirSync(dirname);
-        return true;
-    }
-    /**
-     * 为每一个插件建立对应的文件夹
-     */
-    async dirPath(_path, plugins) {
-        this.mkdir(_path);
-        for (const plugin of plugins) {
-            const path = `${_path}/${plugin}`;
-            this.mkdir(path);
-        }
-    }
-    /**
-     * 超时时间
-     */
-    timeout(type = 'ws') {
-        let timeout = 60;
-        if (type === 'ws') {
-            timeout = this.Server.websocket.timeout;
-        }
-        else {
-            timeout = this.Server.grpc.timeout;
-        }
-        return timeout || 60;
-    }
-    /**
-     * Redis 配置
-     * 采用实时读取优化性能
-     */
-    get redis() {
-        const config = this.getYaml('config', 'redis', false);
-        const defSet = this.getYaml('defSet', 'redis', false);
-        const data = { ...defSet, ...config };
-        return data;
-    }
-    /**
-     * 主人列表
-     */
-    get master() {
-        return this.Config.master || [];
-    }
-    /**
-     * 管理员列表
-     */
-    get admin() {
-        return this.Config.admin || [];
-    }
-    /**
-     * App管理
-     */
-    get App() {
-        const key = 'change.App';
-        const res = this.change.get(key);
-        /** 取缓存 */
-        if (res)
-            return res;
-        /** 取配置 */
-        const config = this.getYaml('config', 'App', true);
-        const defSet = this.getYaml('defSet', 'App', true);
-        const data = { ...defSet, ...config };
-        /** 缓存 */
-        this.change.set(key, data);
-        return data;
-    }
-    /**
-     * 基本配置
-     */
-    get Config() {
-        const key = 'change.config';
-        const res = this.change.get(key);
-        /** 取缓存 */
-        if (res)
-            return res;
-        /** 取配置 */
-        const config = this.getYaml('config', 'config', true);
-        const defSet = this.getYaml('defSet', 'config', false);
-        const data = { ...defSet, ...config };
-        const Config = {
-            ...data,
-            WhiteList: {
-                users: data.WhiteList.users.map((i) => String(i)),
-                groups: data.WhiteList.groups.map((i) => String(i)),
-                GroupMsgLog: data.WhiteList.GroupMsgLog.map((i) => String(i)),
-            },
-            BlackList: {
-                users: data.BlackList.users.map((i) => String(i)),
-                groups: data.BlackList.groups.map((i) => String(i)),
-                GroupMsgLog: data.BlackList.GroupMsgLog.map((i) => String(i)),
-            },
-            master: data.master.map((i) => String(i)),
-            admin: data.admin.map((i) => String(i)),
-            private: {
-                white_list: data.private.white_list.map((i) => String(i)),
-                tips: data.private.tips,
-            },
-        };
-        /** 缓存 */
-        this.change.set(key, Config);
-        return Config;
-    }
-    /**
-     * Server 配置文档
-     */
-    get Server() {
-        const key = 'change.server';
-        /** 取缓存 */
-        const res = this.change.get(key);
-        if (res)
-            return res;
-        /** 取配置 */
-        const config = this.getYaml('config', 'server', true);
-        const defSet = this.getYaml('defSet', 'server', false);
-        const data = { ...defSet, ...config };
-        /** 缓存 */
-        this.change.set(key, data);
-        return data;
-    }
-    /**
-     * packageon
-     * 实时获取packageon文件
-     */
-    get package() {
-        const data = fs.readFileSync(this.pkgDir + '/package.json', 'utf8');
-        const pack = JSON.parse(data);
-        return pack;
-    }
-    /**
-     * 获取群配置
-     * @param group_id - 群号
-     * @param e - 事件
-     */
-    group(group_id, e) {
-        const key = 'change.group';
-        /** 取缓存 */
-        const res = this.change.get(key);
-        const keys = e?.self_id ? [`Bot.${e.self_id}.${group_id}`, `Bot.${e.self_id}`, group_id] : [group_id];
-        if (res) {
-            const cfg = { ...res.defCfg.default, ...res.Config.default };
-            for (const k of keys) {
-                if (res.Config?.[k])
-                    return { ...cfg, ...res.Config?.[k] };
-            }
-            return cfg;
-        }
-        /** 取配置 */
-        const Config = this.getYaml('config', 'group', true);
-        const defCfg = this.getYaml('defSet', 'group', false);
-        const data = { Config, defCfg };
-        /** 缓存 */
-        this.change.set(key, data);
-        const cfg = { ...defCfg.default, ...Config.default };
-        for (const k of keys) {
-            if (Config[k])
-                return { ...cfg, ...Config[k] };
-        }
-        return cfg;
-    }
-    /**
-     * 获取配置yaml
-     * @param type 类型
-     * @param name 文件名称
-     * @param isWatch 是否监听文件
-     */
-    getYaml(type, name, isWatch = false) {
-        /** 文件路径 */
-        const file = type === 'defSet' ? `${this.pkgCfgDir}/${name}.yaml` : `${this.cfgDir}/config/${name}.yaml`;
-        /** 读取文件 */
-        const data = Yaml.parse(fs.readFileSync(file, 'utf8'));
-        /** 监听文件 */
-        if (isWatch)
-            this.watch(type, name, file);
-        return data;
-    }
-    /**
-     * 监听配置文件
-     * @param type 类型
-     * @param name 文件名称 不带后缀
-     * @param file 文件路径
-     */
-    async watch(type, name, file) {
-        const key = `change.${name}`;
-        /** 已经监听过了 */
-        const res = this.watcher.get(key);
-        if (res)
-            return true;
-        /** 监听文件 */
-        const watcher = chokidar.watch(file);
-        /** 监听文件变化 */
-        watcher.on('change', () => {
-            this.change.delete(key);
-            this.logger.mark(`[修改配置文件][${type}][${name}]`);
-            /** 文件修改后调用对应的方法 */
-            switch (`change_${name}`) {
-                case 'change_App':
-                    this.changeApp();
-                    break;
-                case 'change_config':
-                    this.changeCfg();
-                    break;
-                case 'change_group':
-                    this.changeGroup();
-                    break;
-            }
-        });
-        /** 缓存 防止重复监听 */
-        this.watcher.set(key, watcher);
-    }
-    async changeApp() {
-        await this.#review();
-    }
-    async changeCfg() {
-        /** 修改日志等级 */
-        this.logger.level = this.Config.log4jsCfg.level;
-        await this.#review();
-        if (this.Server.HotUpdate) {
-            const { Bot } = await import('../../index.js');
-            Bot.emit('restart_http', {});
-            Bot.emit('restart_grpc', {});
-        }
-    }
-    async changeGroup() {
-        await this.#review();
-    }
-    async #review() {
-        // 应该改成事件监听
-        if (this.review)
-            return;
-        this.review = true;
-        const { review } = await import('../../event/index.js');
-        review.main();
-        this.review = false;
-    }
-})();
-export const Cfg = config;

package/lib/utils/config/updateVersion.d.ts

@@ -1,33 +0,0 @@
-export default class Version {
-    path: string;
-    packageDir: string;
-    CHANGELOGDir: string;
-    packageJson: any;
-    version: string;
-    commitsMap: {
-        [key: string]: string[];
-    };
-    HEAD: string;
-    cmd: string;
-    stdout: string | string[];
-    url: string;
-    constructor(path: string);
-    init(): Promise<void>;
-    /**
-     * 获取当前仓库最新的一个标签的HEAD
-     */
-    gitTag(): Promise<false | undefined>;
-    /**
-     * 获取当前仓库的远程地址
-     */
-    gitUrl(): Promise<void>;
-    /**
-     * 更新版本号 tag
-     */
-    updateVersion(): Promise<void>;
-    /**
-     * 封装exce方法
-     * @param {string} cmd 执行的命令
-     */
-    exce(cmd: string): Promise<string>;
-}

package/lib/utils/config/updateVersion.js

@@ -1,145 +0,0 @@
-import fs from 'fs';
-import { exec } from 'child_process';
-export default class Version {
-    path;
-    packageDir;
-    CHANGELOGDir;
-    packageJson;
-    version;
-    commitsMap;
-    HEAD;
-    cmd;
-    stdout;
-    url;
-    constructor(path) {
-        this.cmd = '';
-        this.stdout = '';
-        this.url = '';
-        this.HEAD = '';
-        this.path = path;
-        this.packageDir = this.path + '/packageon';
-        this.CHANGELOGDir = this.path + '/CHANGELOG.md';
-        this.packageJson = JSON.parse(fs.readFileSync(this.packageDir, 'utf-8'));
-        this.version = this.packageJson.version;
-        this.commitsMap = {
-            release: ['### Releases'],
-            feat: ['### 新增功能'],
-            fix: ['### Bug修复'],
-            docs: ['### 文档更新'],
-            style: ['### 代码样式修改'],
-            refactor: ['### 代码重构'],
-            perf: ['### 性能优化'],
-            chore: ['### 构建工具相关'],
-            revert: ['### 回滚'],
-            others: ['### 其他提交'],
-        };
-    }
-    async init() {
-        /** 获取仓库地址 */
-        await this.gitUrl();
-        /** 取tag对应的head */
-        await this.gitTag();
-        const HEAD = this.HEAD ? `${this.HEAD}..HEAD ` : '';
-        this.cmd = `git log ${HEAD}--pretty=format:"HEAD: %H=分割=sha: %h=分割=log: %s"`;
-        this.stdout = (await this.exce(this.cmd));
-        if (!this.stdout)
-            throw new Error('commit为空...');
-        this.stdout = this.stdout.trim().split('\n');
-        const reg = /(fix|feat|docs|style|refactor|perf|release|chore|revert)(:|：)/i;
-        for (const commit of this.stdout) {
-            /** 拆分 */
-            const [HEAD, sha, log] = commit.split('=分割=').map(item => item.trim().replace(/^(HEAD|sha|log): /, ''));
-            /** 排除此项 */
-            if (log.startsWith('Merge branch'))
-                continue;
-            const match = log.match(reg);
-            const type = match ? match[1].toLowerCase() : 'others';
-            /** 拼接commit */
-            const info = `- ${log} ([${sha}](${this.url}/commit/${HEAD}))`;
-            this.commitsMap[type].push(info);
-        }
-        /** 更新版本号 */
-        await this.updateVersion();
-        /** YYYY-MM-DD */
-        const date = new Date().toLocaleDateString().replace(/\//g, '-');
-        const text = [`## ${this.version} (${date})`];
-        for (const key in this.commitsMap) {
-            /** 排除空 */
-            if (this.commitsMap[key].length === 1) {
-                delete this.commitsMap[key];
-                continue;
-            }
-            text.push(this.commitsMap[key].join('\n'));
-        }
-        /** 判断是否有CHANGELOG.md文件 */
-        if (fs.existsSync(this.CHANGELOGDir)) {
-            const oldText = fs.readFileSync(this.CHANGELOGDir, 'utf-8');
-            text.push(oldText);
-        }
-        fs.writeFileSync(this.CHANGELOGDir, text.join('\n\n'));
-        console.log('更新成功~');
-    }
-    /**
-     * 获取当前仓库最新的一个标签的HEAD
-     */
-    async gitTag() {
-        const cmd = 'git tag';
-        const stdout = await this.exce(cmd);
-        if (!stdout)
-            return false;
-        const tags = stdout.trim().split('\n');
-        const lastTag = tags[tags.length - 1];
-        const cmd2 = `git rev-list -n 1 ${lastTag}`;
-        const HEAD = await this.exce(cmd2);
-        this.HEAD = HEAD.trim();
-    }
-    /**
-     * 获取当前仓库的远程地址
-     */
-    async gitUrl() {
-        const cmd = 'git remote -v';
-        const stdout = await this.exce(cmd);
-        let [url] = stdout.split('\n').map(item => item.split('\t')[1]);
-        url = url.trim().split(' ')[0];
-        this.url = url;
-    }
-    /**
-     * 更新版本号 tag
-     */
-    async updateVersion() {
-        /** 10进1 */
-        const versionArr = this.version.split('.').map((item) => parseInt(item));
-        if (versionArr[2] === 9) {
-            versionArr[1]++;
-            versionArr[2] = 0;
-        }
-        else {
-            versionArr[2]++;
-        }
-        this.version = versionArr.join('.');
-        this.packageJson.version = this.version;
-        fs.writeFileSync(this.packageDir, JSON.stringify(this.packageJson, null, 2));
-        /** tag */
-        try {
-            await this.exce(`git tag v${this.version}`);
-        }
-        catch (e) {
-            console.log('tag已存在');
-        }
-    }
-    /**
-     * 封装exce方法
-     * @param {string} cmd 执行的命令
-     */
-    exce(cmd) {
-        return new Promise((resolve, reject) => {
-            exec(cmd, { cwd: this.path }, (error, stdout) => {
-                if (error) {
-                    reject(error);
-                    return;
-                }
-                resolve(stdout);
-            });
-        });
-    }
-}