baja-lite 1.8.0 → 1.8.2

package/boot-remote.js

@@ -8,9 +8,6 @@ export const BootRomote = async function (options) {
     if (options.skipNull !== undefined) {
         globalThis[_GlobalSqlOption].skipNull = options.skipNull;
     }
-    if (options.skipEmptyString !== undefined) {
-        globalThis[_GlobalSqlOption].skipEmptyString = options.skipEmptyString;
-    }
     if (options.maxDeal !== undefined) {
         globalThis[_GlobalSqlOption].maxDeal = options.maxDeal;
     }

package/boot.js

@@ -9,9 +9,6 @@ export const Boot = async function (options) {
     if (options.skipNull !== undefined) {
         globalThis[_GlobalSqlOption].skipNull = options.skipNull;
     }
-    if (options.skipEmptyString !== undefined) {
-        globalThis[_GlobalSqlOption].skipEmptyString = options.skipEmptyString;
-    }
     if (options.maxDeal !== undefined) {
         globalThis[_GlobalSqlOption].maxDeal = options.maxDeal;
     }

package/error.d.ts

@@ -1,3 +1,30 @@
+/**
+ * 数据库错误类
+ * 用于统一数据库操作中的错误处理
+ */
+export declare class DatabaseError extends Error {
+    code: string;
+    sql?: string | undefined;
+    params?: any | undefined;
+    cause?: Error | undefined;
+    constructor(message: string, code: string, sql?: string | undefined, params?: any | undefined, cause?: Error | undefined);
+    /**
+     * 创建连接错误
+     */
+    static connection(message: string, cause?: Error): DatabaseError;
+    /**
+     * 创建查询错误
+     */
+    static query(message: string, sql: string, params?: any, cause?: Error): DatabaseError;
+    /**
+     * 创建事务错误
+     */
+    static transaction(message: string, cause?: Error): DatabaseError;
+    /**
+     * 获取安全的错误信息（不包含敏感数据）
+     */
+    getSafeMessage(): string;
+}
 export declare const Throw: {
     if(test: boolean, message: string | Error | any): void;
     ifNot(test: boolean, message: string | Error | any): void;

package/error.js

@@ -1,3 +1,45 @@
+/**
+ * 数据库错误类
+ * 用于统一数据库操作中的错误处理
+ */
+export class DatabaseError extends Error {
+    constructor(message, code, sql, params, cause) {
+        super(message);
+        this.code = code;
+        this.sql = sql;
+        this.params = params;
+        this.cause = cause;
+        this.name = 'DatabaseError';
+        // 保持正确的堆栈跟踪
+        if (Error.captureStackTrace) {
+            Error.captureStackTrace(this, DatabaseError);
+        }
+    }
+    /**
+     * 创建连接错误
+     */
+    static connection(message, cause) {
+        return new DatabaseError(message, 'CONNECTION_ERROR', undefined, undefined, cause);
+    }
+    /**
+     * 创建查询错误
+     */
+    static query(message, sql, params, cause) {
+        return new DatabaseError(message, 'QUERY_ERROR', sql, params, cause);
+    }
+    /**
+     * 创建事务错误
+     */
+    static transaction(message, cause) {
+        return new DatabaseError(message, 'TRANSACTION_ERROR', undefined, undefined, cause);
+    }
+    /**
+     * 获取安全的错误信息（不包含敏感数据）
+     */
+    getSafeMessage() {
+        return `${this.name} [${this.code}]: ${this.message}`;
+    }
+}
 export const Throw = {
     if(test, message) {
         if (test === true)

package/math.js

@@ -85,8 +85,8 @@ export const div = (...args) => {
 export const divDef = (def, ...args) => {
     const arr = filterNumber2(args);
     if (arr.length > 1) {
-        const zeros = arr.slice(1).findIndex(i => i.equals(ZERO));
-        if (zeros > -1) {
+        const hasZeroDivisor = arr.slice(1).some(i => i.equals(ZERO));
+        if (hasZeroDivisor) {
             return new Decimal(def).toNumber();
         }
         return arr.reduce((a, b) => a.div(b)).toNumber();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/baja-lite",
   "repository": {

package/snowflake.js

@@ -84,15 +84,25 @@ export class Snowflake {
      */
     generate() {
         let time = Date.now();
-        // 基础保护：如果系统时间回拨，强制同步到最后一次生成时间以防止 ID 重复
+        // 时钟回拨处理
         if (time < this.lastTime) {
-            time = this.lastTime;
+            const offset = this.lastTime - time;
+            // 如果回拨超过 5 秒，拒绝生成 ID
+            if (offset > 5000) {
+                console.error(`Clock moved backwards by ${offset}ms. Refusing to generate id`);
+                return null;
+            }
+            // 小幅回拨，等待追上上次时间
+            while (Date.now() <= this.lastTime) {
+                // 忙等待
+            }
+            time = Date.now();
         }
         if (this.lastTime === time) {
             this.seq++;
             if (this.seq > 4095) {
                 this.seq = 0;
-                // 方案2：不再忙等待，直接预支进入下一毫秒
+                // 序列号溢出，进入下一毫秒
                 time++;
             }
         }

package/sql.d.ts

@@ -538,6 +538,8 @@ interface Dao {
 }
 export declare class Mysql implements Dao {
     [_daoDB]: any;
+    private keepAliveTimer?;
+    private isClosing;
     constructor(pool: any);
     keepAlive(): Promise<void>;
     createConnection(sync: SyncMode.Sync): Connection | null;
@@ -555,7 +557,10 @@ export declare class Mysql implements Dao {
 }
 export declare class Postgresql implements Dao {
     [_daoDB]: any;
+    private keepAliveTimer?;
+    private isClosing;
     constructor(pool: any);
+    keepAlive(): Promise<void>;
     createConnection(sync: SyncMode.Sync): Connection | null;
     createConnection(sync: SyncMode.Async): Promise<Connection | null>;
     transaction<T = any>(sync: SyncMode.Sync, fn: (conn: Connection) => T, conn?: Connection | null): T | null;