befly 3.17.9 → 3.17.11

package/lib/dbHelper/execute.js

@@ -19,10 +19,18 @@ export const executeMethods = {
 
         try {
             let queryResult;
-            if (safeParams.length > 0) {
-                queryResult = await this.sql.unsafe(sql, safeParams);
-            } else {
-                queryResult = await this.sql.unsafe(sql);
+            // Bun 事件循环 bug workaround：
+            // 当事件循环中只有一个 I/O 源（SQL socket）时，Bun 会走单源快速路径，
+            // 在 I/O 回调内直接唤醒 JS Promise，跳过正常调度，导致 SQL 连接状态
+            // 未完全重置，下一条查询的 Promise resolver 永久丢失（远程 TCP 连接必现）。
+            // 预注册一个 timer 使事件循环中同时存在两种事件源，强制 Bun 走正常多源调度路径。
+            // timer 时长无关紧要，查询完成后会被 clearTimeout 清理。
+            const _timer = setTimeout(() => {}, 2147483647);
+            const queryPromise = safeParams.length > 0 ? this.sql.unsafe(sql, safeParams) : this.sql.unsafe(sql);
+            try {
+                queryResult = await queryPromise;
+            } finally {
+                clearTimeout(_timer);
             }
 
             const duration = Date.now() - startTime;

package/lib/redisHelper.js

@@ -12,8 +12,6 @@ import { isFiniteNumber, isNonEmptyString, isString } from "../utils/is.js";
  * 约定：除构造函数外，方法默认不抛异常；失败时返回 null/false/0/[] 并记录日志。
  */
 export class RedisHelper {
-    slowThresholdMs = 500;
-
     /**
      * 构造函数
      * @param prefix - Key 前缀
@@ -30,18 +28,6 @@ export class RedisHelper {
         this.prefix = prefix ? `${prefix}:` : "";
     }
 
-    logSlow(cmd, key, duration, extra = {}) {
-        if (duration <= this.slowThresholdMs) return;
-        Logger.warn("🐌 Redis 慢操作", {
-            subsystem: "redis",
-            event: "slow",
-            duration: duration,
-            cmd: cmd,
-            key: key,
-            extra: extra
-        });
-    }
-
     /**
      * 设置对象到 Redis
      * @param key - 键名
@@ -54,19 +40,11 @@ export class RedisHelper {
             const data = JSON.stringify(obj);
             const pkey = `${this.prefix}${key}`;
 
-            const startTime = Date.now();
-
             if (ttl) {
-                const res = await this.client.setex(pkey, ttl, data);
-                const duration = Date.now() - startTime;
-                this.logSlow("SETEX", pkey, duration, { ttl: ttl });
-                return res;
+                return await this.client.setex(pkey, ttl, data);
             }
 
-            const res = await this.client.set(pkey, data);
-            const duration = Date.now() - startTime;
-            this.logSlow("SET", pkey, duration);
-            return res;
+            return await this.client.set(pkey, data);
         } catch (error) {
             Logger.error("Redis setObject 错误", error);
             return null;
@@ -81,11 +59,7 @@ export class RedisHelper {
     async getObject(key) {
         try {
             const pkey = `${this.prefix}${key}`;
-
-            const startTime = Date.now();
             const data = await this.client.get(pkey);
-            const duration = Date.now() - startTime;
-            this.logSlow("GET", pkey, duration);
             return data ? JSON.parse(data) : null;
         } catch (error) {
             Logger.error("Redis getObject 错误", error);
@@ -100,11 +74,7 @@ export class RedisHelper {
     async delObject(key) {
         try {
             const pkey = `${this.prefix}${key}`;
-
-            const startTime = Date.now();
             await this.client.del(pkey);
-            const duration = Date.now() - startTime;
-            this.logSlow("DEL", pkey, duration);
         } catch (error) {
             Logger.error("Redis delObject 错误", error);
         }
@@ -124,16 +94,11 @@ export class RedisHelper {
         const timestamp = Date.now();
         const key = `${this.prefix}time_id:${timestamp}`;
 
-        const startTime = Date.now();
-
         const counter = await this.client.incr(key);
         if (counter === 1) {
             await this.client.expire(key, 1);
         }
 
-        const duration = Date.now() - startTime;
-        this.logSlow("INCR", key, duration, { expireSeconds: 1 });
-
         // 基于时间戳偏移起点，后缀 100-999 循环
         const suffix = 100 + (((timestamp % 900) + counter - 1) % 900);
 
@@ -150,104 +115,17 @@ export class RedisHelper {
     async setString(key, value, ttl = null) {
         try {
             const pkey = `${this.prefix}${key}`;
-
-            const startTime = Date.now();
             if (ttl) {
-                const res = await this.client.setex(pkey, ttl, value);
-                const duration = Date.now() - startTime;
-                this.logSlow("SETEX", pkey, duration, { ttl: ttl });
-                return res;
+                return await this.client.setex(pkey, ttl, value);
             }
 
-            const res = await this.client.set(pkey, value);
-            const duration = Date.now() - startTime;
-            this.logSlow("SET", pkey, duration);
-            return res;
+            return await this.client.set(pkey, value);
         } catch (error) {
             Logger.error("Redis setString 错误", error);
             return null;
         }
     }
 
-    /**
-     * 尝试获取分布式锁（SET key token NX PX ttlMs）
-     */
-    async tryAcquireLock(key, token, ttlMs) {
-        try {
-            if (!isNonEmptyString(key)) {
-                throw new Error("tryAcquireLock: key 必须是非空字符串", {
-                    cause: null,
-                    code: "validation"
-                });
-            }
-            if (!isNonEmptyString(token)) {
-                throw new Error("tryAcquireLock: token 必须是非空字符串", {
-                    cause: null,
-                    code: "validation"
-                });
-            }
-            if (!(isFiniteNumber(ttlMs) && ttlMs > 0)) {
-                throw new Error("tryAcquireLock: ttlMs 必须是正数", {
-                    cause: null,
-                    code: "validation"
-                });
-            }
-
-            const pkey = `${this.prefix}${key}`;
-            const startTime = Date.now();
-            const ttlMsString = String(Math.floor(ttlMs));
-            const res = await this.client.set(pkey, token, "NX", "PX", ttlMsString);
-            const duration = Date.now() - startTime;
-            this.logSlow("SET NX PX", pkey, duration, { ttlMs: ttlMs });
-
-            return res === "OK";
-        } catch (error) {
-            Logger.error("Redis tryAcquireLock 错误", error);
-            return false;
-        }
-    }
-
-    /**
-     * 释放分布式锁（原子校验 token 后删除）
-     */
-    async releaseLock(key, token) {
-        try {
-            if (!isNonEmptyString(key)) {
-                throw new Error("releaseLock: key 必须是非空字符串", {
-                    cause: null,
-                    code: "validation"
-                });
-            }
-            if (!isNonEmptyString(token)) {
-                throw new Error("releaseLock: token 必须是非空字符串", {
-                    cause: null,
-                    code: "validation"
-                });
-            }
-
-            const pkey = `${this.prefix}${key}`;
-
-            // 注意：Bun.RedisClient 当前未暴露 Lua/EVAL 等原子 compare-and-del API。
-            // 这里使用 get + del 的最小窗口实现；理论上存在极端竞态（TTL 恰好过期并被他人抢占）。
-            // 对启动期同步场景来说风险可接受；同时锁本身带 TTL，最坏情况下依赖 TTL 自动释放。
-            const startTime = Date.now();
-
-            const current = await this.client.get(pkey);
-            if (current !== token) {
-                return false;
-            }
-
-            const deleted = await this.client.del(pkey);
-            const duration = Date.now() - startTime;
-            this.logSlow("GET+DEL", pkey, duration);
-
-            return deleted > 0;
-        } catch (error) {
-            Logger.error("Redis releaseLock 错误", error);
-            return false;
-        }
-    }
-
     /**
      * 获取字符串值
      * @param key - 键名
@@ -255,12 +133,7 @@ export class RedisHelper {
     async getString(key) {
         try {
             const pkey = `${this.prefix}${key}`;
-
-            const startTime = Date.now();
-            const res = await this.client.get(pkey);
-            const duration = Date.now() - startTime;
-            this.logSlow("GET", pkey, duration);
-            return res;
+            return await this.client.get(pkey);
         } catch (error) {
             Logger.error("Redis getString 错误", error);
             return null;
@@ -275,12 +148,7 @@ export class RedisHelper {
     async exists(key) {
         try {
             const pkey = `${this.prefix}${key}`;
-
-            const startTime = Date.now();
-            const res = await this.client.exists(pkey);
-            const duration = Date.now() - startTime;
-            this.logSlow("EXISTS", pkey, duration);
-            return res;
+            return await this.client.exists(pkey);
         } catch (error) {
             Logger.error("Redis exists 错误", error);
             return false;
@@ -295,12 +163,7 @@ export class RedisHelper {
     async incr(key) {
         try {
             const pkey = `${this.prefix}${key}`;
-
-            const startTime = Date.now();
-            const res = await this.client.incr(pkey);
-            const duration = Date.now() - startTime;
-            this.logSlow("INCR", pkey, duration);
-            return res;
+            return await this.client.incr(pkey);
         } catch (error) {
             Logger.error("Redis incr 错误", error);
             return 0;
@@ -316,14 +179,10 @@ export class RedisHelper {
     async incrWithExpire(key, seconds) {
         try {
             const pkey = `${this.prefix}${key}`;
-
-            const startTime = Date.now();
             const res = await this.client.incr(pkey);
             if (res === 1) {
                 await this.client.expire(pkey, seconds);
             }
-            const duration = Date.now() - startTime;
-            this.logSlow("INCR", pkey, duration, { expireSeconds: seconds });
             return res;
         } catch (error) {
             Logger.error("Redis incrWithExpire 错误", error);
@@ -339,12 +198,7 @@ export class RedisHelper {
     async expire(key, seconds) {
         try {
             const pkey = `${this.prefix}${key}`;
-
-            const startTime = Date.now();
-            const res = await this.client.expire(pkey, seconds);
-            const duration = Date.now() - startTime;
-            this.logSlow("EXPIRE", pkey, duration, { seconds: seconds });
-            return res;
+            return await this.client.expire(pkey, seconds);
         } catch (error) {
             Logger.error("Redis expire 错误", error);
             return 0;
@@ -358,12 +212,7 @@ export class RedisHelper {
     async ttl(key) {
         try {
             const pkey = `${this.prefix}${key}`;
-
-            const startTime = Date.now();
-            const res = await this.client.ttl(pkey);
-            const duration = Date.now() - startTime;
-            this.logSlow("TTL", pkey, duration);
-            return res;
+            return await this.client.ttl(pkey);
         } catch (error) {
             Logger.error("Redis ttl 错误", error);
             return -1;
@@ -400,18 +249,11 @@ export class RedisHelper {
             if (members.length === 0) return 0;
 
             const pkey = `${this.prefix}${key}`;
-
-            const startTime = Date.now();
             const args = [pkey];
             for (const member of members) {
                 args.push(member);
             }
-            const res = await this.client.sadd.apply(this.client, args);
-            const duration = Date.now() - startTime;
-            this.logSlow("SADD", pkey, duration, {
-                membersCount: members.length
-            });
-            return res;
+            return await this.client.sadd.apply(this.client, args);
         } catch (error) {
             Logger.error("Redis sadd 错误", error);
             return 0;
@@ -427,12 +269,7 @@ export class RedisHelper {
     async sismember(key, member) {
         try {
             const pkey = `${this.prefix}${key}`;
-
-            const startTime = Date.now();
-            const res = await this.client.sismember(pkey, member);
-            const duration = Date.now() - startTime;
-            this.logSlow("SISMEMBER", pkey, duration);
-            return res;
+            return await this.client.sismember(pkey, member);
         } catch (error) {
             Logger.error("Redis sismember 错误", error);
             return false;
@@ -447,12 +284,7 @@ export class RedisHelper {
     async scard(key) {
         try {
             const pkey = `${this.prefix}${key}`;
-
-            const startTime = Date.now();
-            const res = await this.client.scard(pkey);
-            const duration = Date.now() - startTime;
-            this.logSlow("SCARD", pkey, duration);
-            return res;
+            return await this.client.scard(pkey);
         } catch (error) {
             Logger.error("Redis scard 错误", error);
             return 0;
@@ -467,12 +299,7 @@ export class RedisHelper {
     async smembers(key) {
         try {
             const pkey = `${this.prefix}${key}`;
-
-            const startTime = Date.now();
-            const res = await this.client.smembers(pkey);
-            const duration = Date.now() - startTime;
-            this.logSlow("SMEMBERS", pkey, duration);
-            return res;
+            return await this.client.smembers(pkey);
         } catch (error) {
             Logger.error("Redis smembers 错误", error);
             return [];
@@ -524,12 +351,7 @@ export class RedisHelper {
     async del(key) {
         try {
             const pkey = `${this.prefix}${key}`;
-
-            const startTime = Date.now();
-            const res = await this.client.del(pkey);
-            const duration = Date.now() - startTime;
-            this.logSlow("DEL", pkey, duration);
-            return res;
+            return await this.client.del(pkey);
         } catch (error) {
             Logger.error("Redis del 错误", error);
             return 0;
@@ -649,10 +471,7 @@ export class RedisHelper {
                 });
             }
 
-            const startTime = Date.now();
             const res = await client.info(section);
-            const duration = Date.now() - startTime;
-            this.logSlow("INFO", "(no-key)", duration, { section: section ?? "" });
             return res;
         } catch (error) {
             Logger.error("Redis info 错误", error);
@@ -666,11 +485,7 @@ export class RedisHelper {
      */
     async ping() {
         try {
-            const startTime = Date.now();
-            const res = await this.client.ping();
-            const duration = Date.now() - startTime;
-            this.logSlow("PING", "(no-key)", duration);
-            return res;
+            return await this.client.ping();
         } catch (error) {
             Logger.error("Redis ping 错误", error);
             throw new Error("Redis ping 错误", {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly",
-    "version": "3.17.9",
-    "gitHead": "01efb848cca619eb79b3c899d71cc36c037eaf61",
+    "version": "3.17.11",
+    "gitHead": "d6f49d8da98a65d26d4d4866ff3a3671e178c1fb",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",
     "keywords": [