@maiyunnet/kebab 4.1.0 → 5.0.1

package/lib/db.js

@@ -1,594 +1,33 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-4-15 13:40
- * Last: 2020-4-13 15:34:45, 2022-09-12 13:10:34, 2023-5-24 18:29:38, 2024-7-11 14:37:54, 2024-8-25 00:32:53, 2024-9-22 17:30:47, 2025-8-3 20:24:03
+ * Last: 2020-4-13 15:34:45, 2022-09-12 13:10:34, 2023-5-24 18:29:38, 2024-7-11 14:37:54, 2024-8-25 00:32:53, 2024-9-22 17:30:47, 2025-8-3 20:24:03, 2025-11-8 19:13:03
  */
-// --- Pool 是使用时必须要一个用户创建一份的，Connection 是池子里获取的 ---
-// --- 第三方 ---
-import * as mysql2 from 'mysql2/promise';
-import * as lTime from '#kebab/lib/time.js';
-import * as lSql from '#kebab/lib/sql.js';
-import * as lCore from '#kebab/lib/core.js';
 import * as sCtr from '#kebab/sys/ctr.js';
-/** --- 连接列表池 --- */
-const connections = [];
-/**
- * --- 计划任务 10 秒一次，关闭超过 30 秒不活动的连接，回滚独占时间过长的连接 ---
- */
-async function checkConnection() {
-    const now = lTime.stamp();
-    for (let i = 0; i < connections.length; ++i) {
-        const connection = connections[i];
-        if (connection.isLost()) {
-            // --- 连接已经丢失，移除 ---
-            await connection.end();
-            connections.splice(i, 1);
-            --i;
-            continue;
-        }
-        if (connection.isUsing()) {
-            // --- 连接正在被使用，看看是否空闲了超过 30 秒，超过则不是正常状态 ---
-            if (connection.getLast() <= now - 30) {
-                // --- 30 秒之前开始的 ---
-                const ls = connection.getLastSql();
-                const newarr = ls.map(item => {
-                    if (!item.values) {
-                        return item.sql;
-                    }
-                    return lSql.format(item.sql, item.values);
-                });
-                const msg = `[DB][checkConnection] There is a transactional connection[${i}] that is not closed, last sql: ${newarr.join(', ')}.`;
-                lCore.display(msg);
-                lCore.log({}, msg, '-error');
-                await connection.rollback();
-            }
-            continue;
-        }
-        if (connection.getLast() <= now - 30) {
-            // --- 超 30 秒未被使用，则关闭 ---
-            await connection.end();
-            connections.splice(i, 1);
-            --i;
-            continue;
-        }
-        // --- 30 秒内使用过，看看连接是否正常 ---
-        if (await connection.isAvailable(false)) {
-            // --- 正常 ---
-            continue;
-        }
-        // --- 连接有问题，直接关闭 ---
-        await connection.end();
-        connections.splice(i, 1);
-        --i;
-    }
-    setTimeout(function () {
-        checkConnection().catch(e => { lCore.display('[DB][checkConnection]', e); });
-    }, 10_000);
-}
-setTimeout(function () {
-    checkConnection().catch(e => { lCore.display('[DB][checkConnection]', e); });
-}, 10_000);
-/** --- 数据库连接池对象 --- */
-export class Pool {
-    constructor(etc) {
-        /** --- SQL 执行次数 --- */
-        this._queries = 0;
-        this._etc = etc;
-    }
-    /**
-     * --- 执行一条 SQL，无视顺序和相同连接，随用随取 ---
-     * @param sql 执行的 SQL 字符串
-     * @param values 要替换的 data 数据
-     * @returns error.errno = -500 表示系统错误
-     */
-    async query(sql, values) {
-        ++this._queries;
-        // --- 获取并自动 using  ---
-        const conn = await this._getConnection();
-        if (!conn) {
-            return {
-                'rows': null,
-                'fields': [],
-                'error': {
-                    'message': 'false',
-                    'errno': 0,
-                },
-                'result': -500,
-            };
-        }
-        // --- 执行一次后自动解除 using ---
-        return conn.query(sql, values);
-    }
-    /**
-     * --- 执行一条 SQL 并获得影响行数对象 packet，连接失败抛出错误 ---
-     * @param sql 执行的 SQL 字符串
-     * @param values 要替换的 data 数据
-     */
-    async execute(sql, values) {
-        ++this._queries;
-        const conn = await this._getConnection();
-        if (!conn) {
-            return {
-                'packet': null,
-                'fields': [],
-                'error': {
-                    'message': 'null',
-                    'errno': 0
-                }
-            };
-        }
-        return conn.execute(sql, values);
-    }
-    /**
-     * --- 开启事务，返回事务对象并锁定连接，别人任何人不可用，有 ctr 的话必传 this，独立执行时可传 null ---
-     */
-    async beginTransaction(ctr) {
-        const conn = await this._getConnection();
-        if (!conn) {
-            return null;
-        }
-        if (!await conn.beginTransaction()) {
-            return null;
-        }
-        return new Transaction(ctr, conn);
-    }
-    /**
-     * --- 获取一个连接，自动变为 using 状态，；连接失败会返回 null ---
-     */
-    async _getConnection() {
-        let conn = null;
-        for (const connection of connections) {
-            const etc = connection.getEtc();
-            if ((etc.host !== this._etc.host) ||
-                (etc.port !== this._etc.port) ||
-                (etc.name !== this._etc.name) ||
-                (etc.user !== this._etc.user)) {
-                // --- 配置项连接项不匹配 ---
-                continue;
-            }
-            if (!connection.using()) {
-                // --- 正在被使用，或者已经 lost ---
-                continue;
-            }
-            // --- 匹配且可用 ---
-            conn = connection;
-            break;
-        }
-        if (!conn) {
-            // --- 没有找到合适的连接，创建一个 ---
-            for (let i = 0; i < 3; ++i) {
-                try {
-                    const link = await mysql2.createConnection({
-                        'host': this._etc.host,
-                        'port': this._etc.port,
-                        'charset': this._etc.charset,
-                        'database': this._etc.name,
-                        'user': this._etc.user,
-                        'password': this._etc.pwd,
-                        'connectTimeout': 3_000,
-                    });
-                    const c = new Connection(this._etc, link);
-                    c.using();
-                    link.on('error', function (err) {
-                        c.setLost();
-                        if (err.code !== 'PROTOCOL_CONNECTION_LOST') {
-                            lCore.debug('[DB][_getConnection][error]', err);
-                            lCore.log({}, '[DB][_getConnection][error] ' + err.message, '-error');
-                        }
-                    }).on('end', () => {
-                        // lCore.debug('[DB][_getConnection] connection end.');
-                        c.setLost();
-                    }).on('close', () => {
-                        c.setLost();
-                    });
-                    conn = c;
-                    connections.push(conn);
-                    break;
-                }
-                catch (err) {
-                    if (err.message === 'ETIMEOUT' || err.message === 'EHOSTUNREACH') {
-                        lCore.debug('[DB][_getConnection][TIMEOUT|HOSTUNREACH]', err);
-                        await lCore.sleep(300);
-                        continue;
-                    }
-                    const msg = `[DB][_getConnection] ${err.message}(${this._etc.host}:${this._etc.port})`;
-                    lCore.debug(msg);
-                    lCore.log({}, msg, '-error');
-                    break;
-                }
-            }
-        }
-        return conn;
-    }
-    /**
-     * --- 获取 SQL 执行次数 ---
-     */
-    getQueries() {
-        return this._queries;
-    }
-}
-/** --- 事务连接对象，commit 和 rollback 后将无法使用 --- */
-export class Transaction {
-    constructor(ctr, conn, opts = {}) {
-        /** --- SQL 执行次数 --- */
-        this._queries = 0;
-        // --- 事务时长监听 timer ---
-        this._timer = {
-            'warning': undefined,
-            'danger': undefined
-        };
-        // --- 进来的连接对象直接是事务独占模式 ---
-        this._ctr = ctr;
-        if (ctr) {
-            ++ctr.getPrototype('_waitInfo').transaction;
-        }
-        this._conn = conn;
-        // --- 事务时长监听 ---
-        const warning = opts.warning ?? 1_500;
-        this._timer.warning = setTimeout(() => {
-            this._timer.warning = undefined;
-            lCore.display('[WARNING][DB][Transaction] time too long, ms: ' + warning + ' ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr'));
-        }, warning);
-        const danger = opts.danger ?? 5_000;
-        this._timer.danger = setTimeout(() => {
-            this._timer.danger = undefined;
-            lCore.display('[DANGER][DB][Transaction] time too long, ms:', danger, this._ctr?.getPrototype('_config').const.path ?? 'no ctr');
-        }, danger);
-    }
-    /**
-     * --- 在事务连接中执行一条 SQL ---
-     * @param sql 执行的 SQL 字符串
-     * @param values 要替换的 data 数据
-     */
-    async query(sql, values) {
-        if (!this._conn) {
-            // --- 当前连接已不可用 ---
-            lCore.display('[DB][Transaction][query] has been closed ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr') + ': ' + sql);
-            lCore.log({}, '[DB][Transaction][query] has been closed ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr') + ': ' + sql, '-error');
-            return {
-                'rows': null,
-                'fields': [],
-                'error': {
-                    'message': 'false',
-                    'errno': 0
-                },
-                'result': -500,
-            };
-        }
-        ++this._queries;
-        return this._conn.query(sql, values);
-    }
-    /**
-     * --- 执行一条 SQL 并获得影响行数对象 packet，连接失败抛出错误 ---
-     * @param sql 执行的 SQL 字符串
-     * @param values 要替换的 data 数据
-     */
-    async execute(sql, values) {
-        if (!this._conn) {
-            // --- 当前连接已不可用 ---
-            lCore.display('[DB][Transaction][execute] has been closed ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr') + ': ' + sql);
-            lCore.log({}, '(db.Transaction.execute) has been closed ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr') + ': ' + sql, '-error');
-            return {
-                'packet': null,
-                'fields': [],
-                'error': {
-                    'message': 'null',
-                    'errno': 0
-                }
-            };
-        }
-        ++this._queries;
-        return this._conn.execute(sql, values);
-    }
-    async commit() {
-        if (!this._conn) {
-            // --- 当前连接已不可用 ---
-            lCore.display('[DB][Transaction][commit] has been closed ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr'));
-            lCore.log({}, '[DB][Transaction][commit] has been closed ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr'), '-error');
-            return false;
-        }
-        const r = await this._conn.commit();
-        if (!r) {
-            return false;
-        }
-        this._conn = null;
-        if (this._ctr) {
-            --this._ctr.getPrototype('_waitInfo').transaction;
-        }
-        clearTimeout(this._timer.warning);
-        this._timer.warning = undefined;
-        clearTimeout(this._timer.danger);
-        this._timer.danger = undefined;
-        return true;
-    }
-    async rollback() {
-        if (!this._conn) {
-            // --- 当前连接已不可用 ---
-            lCore.display('[DB][Transaction][rollback] has been closed: ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr'));
-            lCore.log({}, '[DB][Transaction][rollback] has been closed: ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr'), '-error');
-            return false;
-        }
-        const r = await this._conn.rollback();
-        if (!r) {
-            return false;
-        }
-        this._conn = null;
-        if (this._ctr) {
-            --this._ctr.getPrototype('_waitInfo').transaction;
-        }
-        clearTimeout(this._timer.warning);
-        this._timer.warning = undefined;
-        clearTimeout(this._timer.danger);
-        this._timer.danger = undefined;
-        return true;
-    }
-}
-/** --- 数据库连接对象 --- */
-export class Connection {
-    constructor(etc, link) {
-        /** --- 本连接最后一次使用时间 --- */
-        this._last = 0;
-        /** --- 最后两次执行的 sql 完整串 --- */
-        this._lastSql = [];
-        /** --- 当前连接是否正在被独占使用 --- */
-        this._using = false;
-        /** --- 当发生断开，则需从连接池移除连接 --- */
-        this._lost = false;
-        /** --- 当前正在处理事务 --- */
-        this._transaction = false;
-        this._etc = etc;
-        this._link = link;
-        this.refreshLast();
-    }
-    /**
-     * --- 获取连接 etc 信息 ---
-     */
-    getEtc() {
-        return this._etc;
-    }
-    /**
-     * --- 获取最后一次获取连接的时间 ---
-     */
-    getLast() {
-        return this._last;
-    }
-    /**
-     * --- 获取最后两次执行的 sql 字符串 ---
-     */
-    getLastSql() {
-        return this._lastSql;
-    }
-    /**
-     * --- 将本条连接设置为不可用 ---
-     */
-    setLost() {
-        this._lost = true;
-    }
-    /**
-     * --- 是否已经丢失 ---
-     */
-    isLost() {
-        return this._lost;
-    }
-    /**
-     * --- 是否是开启事务状态 ---
-     */
-    isTransaction() {
-        return this._transaction;
-    }
-    /**
-     * --- 获取当前状态是否正在被使用中 ---
-     */
-    isUsing() {
-        return this._using;
-    }
-    /**
-     * --- 判断是否可用（丢失的也算不可用），返回 true 代表获取成功并自动刷新最后时间 ---
-     */
-    using() {
-        if (this._lost || this._using) {
-            return false;
-        }
-        else {
-            this.refreshLast();
-            this._using = true;
-            return true;
-        }
-    }
-    /**
-     * --- 取消占用 ---
-     */
-    used() {
-        this._using = false;
-    }
-    /**
-     * --- 设定最后使用时间 ---
-     */
-    refreshLast() {
-        this._last = lTime.stamp();
-    }
-    /**
-     * --- 通过执行一条语句判断当前连接是否可用 ---
-     * @param last 是否刷新最后使用时间（默认刷新）
-     */
-    async isAvailable(last = true) {
-        if (last) {
-            this.refreshLast();
-        }
-        try {
-            await this._link.query('SELECT 1');
-            return true;
-        }
-        catch {
-            return false;
-        }
-    }
-    /**
-     * --- 执行一条 SQL 并获得返回数据 ---
-     * @param sql 执行的 SQL 字符串
-     * @param values 要替换的 data 数据
-     */
-    async query(sql, values) {
-        let res;
-        try {
-            this.refreshLast();
-            if (this._lastSql.length === 2) {
-                this._lastSql.splice(0, 1);
-            }
-            this._lastSql.push({
-                'sql': sql,
-                'values': values
-            });
-            const time = Date.now();
-            res = await this._link.query(sql, values);
-            if (Date.now() - time > 200) {
-                lCore.log({}, '[WARNING][DB][Connection][query] slow sql 200ms: ' + sql, '-warning');
-            }
-        }
-        catch (e) {
-            if (!this._transaction) {
-                this._using = false;
-            }
-            return {
-                'rows': null,
-                'fields': [],
-                'error': e,
-                'result': -500,
-            };
-        }
-        if (!this._transaction) {
-            this._using = false;
-        }
-        // --- 返回数据 ---
-        return {
-            'rows': res[0],
-            'fields': res[1],
-            'error': null,
-            'result': 1,
-        };
-    }
-    /**
-     * --- 执行一条 SQL 并获得影响行数对象 packet ---
-     * @param sql 执行的 SQL 字符串
-     * @param values 要替换的 data 数据
-     */
-    async execute(sql, values) {
-        let res;
-        try {
-            this.refreshLast();
-            if (this._lastSql.length === 2) {
-                this._lastSql.splice(0, 1);
-            }
-            this._lastSql.push({
-                'sql': sql,
-                'values': values,
-            });
-            const time = Date.now();
-            res = await this._link.execute(sql, values);
-            if (Date.now() - time > 200) {
-                lCore.log({}, '[WARNING][DB][Connection][execute] slow sql 200ms: ' + sql, '-warning');
-            }
-        }
-        catch (e) {
-            if (!this._transaction) {
-                this._using = false;
-            }
-            // --- e.errno 可能为 1062 ---
-            return {
-                'packet': null,
-                'fields': [],
-                'error': e
-            };
-        }
-        if (!this._transaction) {
-            this._using = false;
-        }
-        return {
-            'packet': res[0],
-            'fields': res[1],
-            'error': null
-        };
-    }
-    /**
-     * --- 关闭连接，一般情况下不使用 ---
-     */
-    async end() {
-        try {
-            await this._link.end();
-            return true;
-        }
-        catch {
-            return false;
-        }
-    }
-    // --- 事务，只能在独占连接中使用，pool 创建事务返回独占连接，commit 或 rollback 释放连接回池 ---
-    async beginTransaction() {
-        if (this._using) {
-            try {
-                this._transaction = true;
-                await this._link.beginTransaction();
-                return true;
-            }
-            catch {
-                return false;
-            }
-        }
-        else {
-            return false;
-        }
-    }
-    async commit() {
-        try {
-            await this._link.commit();
-            this.refreshLast();
-            this._transaction = false;
-            this._using = false;
-            return true;
-        }
-        catch {
-            return false;
-        }
-    }
-    async rollback() {
-        try {
-            await this._link.rollback();
-            this.refreshLast();
-            this._transaction = false;
-            this._using = false;
-            return true;
-        }
-        catch {
-            return false;
-        }
-    }
-}
+import { Connection } from './db/conn.js';
+import { Pool } from './db/pool.js';
+import { Transaction } from './db/tran.js';
+/** --- 服务商定义 --- */
+export var ESERVICE;
+(function (ESERVICE) {
+    ESERVICE[ESERVICE["MYSQL"] = 0] = "MYSQL";
+    ESERVICE[ESERVICE["PGSQL"] = 1] = "PGSQL";
+})(ESERVICE || (ESERVICE = {}));
 /**
  * --- 获取 Db Pool 对象 ---
  * @param etc 配置信息可留空
  */
-export function get(ctrEtc) {
-    const etc = ctrEtc instanceof sCtr.Ctr ? ctrEtc.getPrototype('_config').db : ctrEtc;
-    return new Pool(etc);
-}
-/**
- * --- 获取当前连接池中所有连接的信息 ---
- */
-export function getConnectionList() {
-    const list = [];
-    for (let i = 0; i < connections.length; ++i) {
-        const connection = connections[i];
-        const etc = connection.getEtc();
-        list.push({
-            'id': i,
-            'last': connection.getLast(),
-            'host': etc.host,
-            'port': etc.port,
-            'name': etc.name,
-            'user': etc.user,
-            'lost': connection.isLost(),
-            'using': connection.isUsing(),
-            'transaction': connection.isTransaction()
+export function get(ctrEtc, opt = {}) {
+    if (ctrEtc instanceof sCtr.Ctr) {
+        // --- 从 ctr 中读取连接信息 ---
+        const config = ctrEtc.getPrototype('_config');
+        const service = opt.service ? ESERVICE[opt.service] : config.db.default;
+        return new Pool(config.db[service].default, {
+            'service': service === 'MYSQL' ? ESERVICE.MYSQL : ESERVICE.PGSQL,
         });
     }
-    return list;
+    return new Pool(ctrEtc, {
+        'service': opt.service ?? ESERVICE.PGSQL,
+    });
 }
+export { Connection, Pool, Transaction };

package/lib/scan.js

@@ -241,7 +241,7 @@ export async function scanned(link, token, opt = {}) {
         if (r.error) {
             return false;
         }
-        if (r.packet?.affectedRows && r.packet.affectedRows > 0) {
+        if (r.packet?.affected) {
             return true;
         }
     }
@@ -295,7 +295,7 @@ export async function setData(link, token, data, opt = {}) {
         if (r.error) {
             return false;
         }
-        if (r.packet?.affectedRows && r.packet?.affectedRows > 0) {
+        if (r.packet?.affected) {
             return true;
         }
     }