baja-lite 1.7.7 → 1.7.8

package/fn.d.ts

@@ -79,7 +79,8 @@ export declare enum ExcuteSplitMode {
   ## 分割数组方式:2种，选择一种即可
   1. everyLength=每组个数(最后一组可能不足次数)
   2. groupCount=拆分几组
-  ## settled 异步执行是否并行执行? 默认false
+  ## `settled` 异步执行是否并行执行? 默认false。
+  ** 注意：开启并行执行时，请确保 `fn` 内部没有共享状态（如共用同一个数据库连接），否则可能导致冲突。
   ## `extendParams`：扩展参数
   ** 数组
   ** 结合分组方式：groupCount使用。例如:

package/fn.js

@@ -88,7 +88,11 @@ export function excuteSplit(sync, datas, fn, { everyLength = 0, groupCount = 0,
             try {
                 const reasons = [];
                 if (settled) {
-                    const result = await Promise.allSettled(list.map((list, i) => fn(list, i, list.length, extendParams[i])));
+                    const result = await Promise.allSettled(list.map((list, i) => {
+                        const startIndex = i * ps.everyLength;
+                        const endIndex = startIndex + list.length - 1;
+                        return fn(list, i, list.length, extendParams[i], startIndex, endIndex);
+                    }));
                     for (const item of result) {
                         if (item.status === 'rejected') {
                             reject(item.reason);
@@ -100,7 +104,7 @@ export function excuteSplit(sync, datas, fn, { everyLength = 0, groupCount = 0,
                 }
                 else {
                     for (let i = 0; i < list.length; i++) {
-                        const startIndex = (i - 1) * ps.everyLength;
+                        const startIndex = i * ps.everyLength;
                         const endIndex = startIndex + list[i].length - 1;
                         reasons.push(await fn(list[i], i, list.length, extendParams[i], startIndex, endIndex));
                     }
@@ -117,7 +121,11 @@ export function excuteSplit(sync, datas, fn, { everyLength = 0, groupCount = 0,
             try {
                 const reasons = { result: [], error: [] };
                 if (settled) {
-                    const result = await Promise.allSettled(list.map((list, i) => fn(list, i, list.length, extendParams[i])));
+                    const result = await Promise.allSettled(list.map((list, i) => {
+                        const startIndex = i * ps.everyLength;
+                        const endIndex = startIndex + list.length - 1;
+                        return fn(list, i, list.length, extendParams[i], startIndex, endIndex);
+                    }));
                     for (const item of result) {
                         if (item.status === 'rejected') {
                             reasons.error.push(item.reason);
@@ -129,7 +137,7 @@ export function excuteSplit(sync, datas, fn, { everyLength = 0, groupCount = 0,
                 }
                 else {
                     for (let i = 0; i < list.length; i++) {
-                        const startIndex = (i - 1) * ps.everyLength;
+                        const startIndex = i * ps.everyLength;
                         const endIndex = startIndex + list[i].length - 1;
                         try {
                             reasons.result.push(await fn(list[i], i, list.length, extendParams[i], startIndex, endIndex));
@@ -149,7 +157,7 @@ export function excuteSplit(sync, datas, fn, { everyLength = 0, groupCount = 0,
     else if (sync === ExcuteSplitMode.SyncTrust) {
         const reasons = [];
         for (let i = 0; i < list.length; i++) {
-            const startIndex = (i - 1) * ps.everyLength;
+            const startIndex = i * ps.everyLength;
             const endIndex = startIndex + list[i].length - 1;
             reasons.push(fn(list[i], i, list.length, extendParams[i], startIndex, endIndex));
         }
@@ -159,8 +167,8 @@ export function excuteSplit(sync, datas, fn, { everyLength = 0, groupCount = 0,
         const reasons = { result: [], error: [] };
         for (let i = 0; i < list.length; i++) {
             try {
-                const startIndex = (i - 1) * ps.everyLength;
-                const endIndex = startIndex + list[i].length - 1;
+                const startIndex = i * ps.everyLength;
+                const endIndex = startIndex + list[i].length - 0;
                 reasons.result.push(fn(list[i], i, list.length, extendParams[i], startIndex, endIndex));
             }
             catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.7.7",
+  "version": "1.7.8",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/baja-lite",
   "repository": {
@@ -47,7 +47,7 @@
     "reflect-metadata": "0.2.2",
     "request": "2.88.2",
     "request-promise": "4.2.6",
-    "sql-formatter": "15.7.2",
+    "sql-formatter": "15.7.3",
     "sqlstring": "2.3.3",
     "tslib": "2.8.1"
   },

package/snowflake.d.ts

@@ -1,3 +1,7 @@
+/**
+ * 雪花算法 ID 生成器
+ * 用于生成分布式唯一 ID
+ */
 export declare class Snowflake {
     private seq;
     private mid;
@@ -7,6 +11,10 @@ export declare class Snowflake {
         mid?: number;
         offset?: number;
     });
+    /**
+     * 生成下一个唯一 ID
+     * @returns 10 进制字符串形式的 ID，失败返回 null
+     */
     generate(): string | null;
 }
 export declare const snowflake: Snowflake;

package/snowflake.js

@@ -66,6 +66,10 @@ function convertBase(str, fromBase, toBase) {
     }
     return out;
 }
+/**
+ * 雪花算法 ID 生成器
+ * 用于生成分布式唯一 ID
+ */
 export class Snowflake {
     constructor(options) {
         options = options || {};
@@ -74,20 +78,29 @@ export class Snowflake {
         this.offset = options.offset || 0;
         this.lastTime = 0;
     }
+    /**
+     * 生成下一个唯一 ID
+     * @returns 10 进制字符串形式的 ID，失败返回 null
+     */
     generate() {
-        let time = Date.now(), bTime = (time - this.offset).toString(2);
-        if (this.lastTime == time) {
+        let time = Date.now();
+        // 基础保护：如果系统时间回拨，强制同步到最后一次生成时间以防止 ID 重复
+        if (time < this.lastTime) {
+            time = this.lastTime;
+        }
+        if (this.lastTime === time) {
             this.seq++;
             if (this.seq > 4095) {
                 this.seq = 0;
-                while (Date.now() <= time) { }
+                // 方案2：不再忙等待，直接预支进入下一毫秒
+                time++;
             }
         }
         else {
             this.seq = 0;
         }
         this.lastTime = time;
-        let bSeq = this.seq.toString(2), bMid = this.mid.toString(2);
+        let bTime = (time - this.offset).toString(2), bSeq = this.seq.toString(2), bMid = this.mid.toString(2);
         while (bSeq.length < 12) {
             bSeq = "0" + bSeq;
         }

package/sql.d.ts

@@ -518,8 +518,8 @@ export interface Connection {
     /** 多行多列 */
     query<Many_Row_Many_Column = any>(sync: SyncMode.Sync, sql?: string, params?: any): Many_Row_Many_Column[];
     query<Many_Row_Many_Column = any>(sync: SyncMode.Async, sql?: string, params?: any): Promise<Many_Row_Many_Column[]>;
-    realse(sync: SyncMode.Sync): void;
-    realse(sync: SyncMode.Async): Promise<void>;
+    release(sync: SyncMode.Sync): void;
+    release(sync: SyncMode.Async): Promise<void>;
 }
 interface Dao {
     [_daoDB]: any;
@@ -606,8 +606,8 @@ export declare class SqliteRemoteConnection implements Connection {
     raw<T = any>(sync: SyncMode.Async, sql?: string, params?: any): Promise<T[]>;
     query<T = any>(sync: SyncMode.Sync, sql?: string, params?: any): T[];
     query<T = any>(sync: SyncMode.Async, sql?: string, params?: any): Promise<T[]>;
-    realse(sync: SyncMode.Sync): void;
-    realse(sync: SyncMode.Async): Promise<void>;
+    release(sync: SyncMode.Sync): void;
+    release(sync: SyncMode.Async): Promise<void>;
 }
 export declare class SqliteRemote implements Dao {
     [_sqliteRemoteName]: string;

package/sql.js

@@ -390,15 +390,15 @@ class MysqlConnection {
             }
         });
     }
-    realse(sync) {
-        if (sync === SyncMode.Sync) {
-            try {
-                this[_daoConnection]?.release();
-            }
-            catch (error) {
-            }
+    release(sync) {
+        try {
+            this[_daoConnection]?.release();
+        }
+        catch (error) {
+        }
+        if (sync === SyncMode.Async) {
+            return Promise.resolve();
         }
-        ;
     }
 }
 _b = _inTransaction;
@@ -408,10 +408,21 @@ export class Mysql {
         this.keepAlive();
     }
     async keepAlive() {
-        const connection = await this.createConnection(SyncMode.Async);
-        const data = await connection?.query(SyncMode.Async, 'SELECT 1 FROM DUAL');
-        globalThis[_LoggerService].debug?.('keepAlive->', data?.[0]?.[1]);
-        setTimeout(() => this.keepAlive(), globalThis[_MysqlKeepAliveTime] ?? 30000);
+        let connection = null;
+        try {
+            connection = await this.createConnection(SyncMode.Async);
+            const data = await connection?.query(SyncMode.Async, 'SELECT 1 FROM DUAL');
+            globalThis[_LoggerService].debug?.('keepAlive->', data?.[0]?.[1]);
+        }
+        catch (error) {
+            globalThis[_LoggerService].error('keepAlive error', error);
+        }
+        finally {
+            if (connection) {
+                await connection.release(SyncMode.Async);
+            }
+            setTimeout(() => this.keepAlive(), globalThis[_MysqlKeepAliveTime] ?? 30000);
+        }
     }
     createConnection(sync) {
         if (sync === SyncMode.Sync) {
@@ -691,15 +702,15 @@ class PostgresqlConnection {
             }
         });
     }
-    realse(sync) {
-        if (sync === SyncMode.Sync) {
-            try {
-                this[_daoConnection]?.release();
-            }
-            catch (error) {
-            }
+    release(sync) {
+        try {
+            this[_daoConnection]?.release();
+        }
+        catch (error) {
+        }
+        if (sync === SyncMode.Async) {
+            return Promise.resolve();
         }
-        ;
     }
 }
 _c = _inTransaction;
@@ -930,7 +941,7 @@ class SqliteConnection {
             throw error;
         }
     }
-    realse(sync) {
+    release(sync) {
     }
 }
 _d = _inTransaction;
@@ -1174,7 +1185,7 @@ export class SqliteRemoteConnection {
             }
         });
     }
-    realse(sync) {
+    release(sync) {
     }
 }
 _e = _inTransaction;
@@ -1706,27 +1717,27 @@ export class SqlCache {
             this.sqlFNMap = options.sqlFNMap;
         }
         if (options.sqlFNDir) {
-            const sqlFis = globalThis[_fs].readdirSync(options.sqlDir);
+            const sqlFis = globalThis[_fs].readdirSync(options.sqlFNDir);
             for (const modeName of sqlFis) {
                 const extname = globalThis[_path].extname(modeName);
                 const name = globalThis[_path].basename(modeName, extname);
-                const file = globalThis[_path].join(options.sqlDir, modeName);
-                if (extname === 'mu') {
+                const file = globalThis[_path].join(options.sqlFNDir, modeName);
+                if (extname === '.mu') {
                     this.sqlFNMap[name] = globalThis[_fs].readFileSync(file, { encoding: 'utf-8' }).toString();
                 }
             }
         }
         if (options.sqlMapperMap) {
-            globalThis[_resultMap] = options.sqlFNMap;
+            globalThis[_resultMap] = options.sqlMapperMap;
         }
         if (options.sqlMapperDir) {
-            const sqlFis = globalThis[_fs].readdirSync(options.sqlDir);
+            const sqlFis = globalThis[_fs].readdirSync(options.sqlMapperDir);
             globalThis[_resultMap] ?? (globalThis[_resultMap] = {});
             for (const modeName of sqlFis) {
                 const extname = globalThis[_path].extname(modeName);
                 const name = globalThis[_path].basename(modeName, extname);
-                const file = globalThis[_path].join(options.sqlDir, modeName);
-                if (extname === 'json') {
+                const file = globalThis[_path].join(options.sqlMapperDir, modeName);
+                if (extname === '.json') {
                     globalThis[_resultMap][name] = JSON.parse(globalThis[_fs].readFileSync(file, { encoding: 'utf-8' }).toString());
                 }
             }
@@ -1827,7 +1838,7 @@ function P(skipConn = false) {
                 finally {
                     if (needRealseConn && option && option.conn) {
                         try {
-                            option.conn.realse(SyncMode.Sync);
+                            option.conn.release(SyncMode.Sync);
                         }
                         catch (error) {
                         }
@@ -1865,7 +1876,7 @@ function P(skipConn = false) {
                     finally {
                         if (needRealseConn && option && option.conn) {
                             try {
-                                option.conn.realse(SyncMode.Sync);
+                                await option.conn.release(SyncMode.Async);
                             }
                             catch (error) {
                             }
@@ -1895,7 +1906,7 @@ function P(skipConn = false) {
                     finally {
                         if (needRealseConn && option && option.conn) {
                             try {
-                                option.conn.realse(SyncMode.Sync);
+                                await option.conn.release(SyncMode.Async);
                             }
                             catch (error) {
                             }
@@ -1925,7 +1936,7 @@ function P(skipConn = false) {
                     finally {
                         if (needRealseConn && option && option.conn) {
                             try {
-                                option.conn.realse(SyncMode.Sync);
+                                await option.conn.release(SyncMode.Async);
                             }
                             catch (error) {
                             }

package/string.d.ts

@@ -2,16 +2,43 @@
  * 通过uri获取key
  * @param uri
  */
+/**
+ * 通过 URI 获取图片 Key
+ * @param uri 图片完整路径或包含 Key 的字符串
+ */
 export declare const getPicKey: (uri: string) => string;
+/**
+ * 判断对象/字符串是否为空
+ * @param source 待判断的对象
+ * @param skipEmptyString 是否跳过仅包含空白字符的字符串，默认为 true
+ */
 export declare const emptyString: (source: any, skipEmptyString?: boolean) => boolean;
+/**
+ * 判断对象/字符串是否不为空
+ */
 export declare const notEmptyString: (source: any, skipEmptyString?: boolean) => boolean;
+/**
+ * 安全字符串处理（移除单引号，防止简单 SQL 注入）
+ */
 export declare const safeString: (source?: string) => string;
+/**
+ * 修剪对象中所有字符串属性的首尾空格
+ */
 export declare const trimObject: <T>(data: any) => T;
+/**
+ * 生成指定长度的随机数字字符串
+ */
 export declare const randomNumber: (len: number) => string;
+/**
+ * 生成指定长度的随机字符串（包含大小写字母和数字）
+ */
 export declare const randomString: (len: number) => string;
 export declare const randomString2: (len: number) => string;
 export declare const randomString3: (len: number) => string;
 export declare const buildWxStr: (data: {
     [key: string]: string;
 }, maxLabelLength: number, ...titles: string[]) => string;
+/**
+ * 将字符串中的中文标点符号统一替换为对应的英文标点
+ */
 export declare const replaceChineseCode: (str: string) => string;

package/string.js

@@ -2,6 +2,10 @@
  * 通过uri获取key
  * @param uri
  */
+/**
+ * 通过 URI 获取图片 Key
+ * @param uri 图片完整路径或包含 Key 的字符串
+ */
 export const getPicKey = (uri) => {
     const arr = /key=([0-9a-zA-Z.]+)/.exec(uri);
     if (arr && arr.length === 2) {
@@ -9,20 +13,34 @@ export const getPicKey = (uri) => {
     }
     return uri;
 };
+/**
+ * 判断对象/字符串是否为空
+ * @param source 待判断的对象
+ * @param skipEmptyString 是否跳过仅包含空白字符的字符串，默认为 true
+ */
 export const emptyString = (source, skipEmptyString = true) => {
     return (source === null ||
         source === undefined ||
         (skipEmptyString === true && (source === '' || `${source}`.replace(/\s/g, '') === '')));
 };
+/**
+ * 判断对象/字符串是否不为空
+ */
 export const notEmptyString = (source, skipEmptyString = true) => {
     return emptyString(source, skipEmptyString) === false;
 };
+/**
+ * 安全字符串处理（移除单引号，防止简单 SQL 注入）
+ */
 export const safeString = (source) => {
     if (source) {
         return `${source}`.replace(/'/g, '');
     }
     return '';
 };
+/**
+ * 修剪对象中所有字符串属性的首尾空格
+ */
 export const trimObject = (data) => {
     if (data) {
         for (const k in data) {
@@ -33,11 +51,17 @@ export const trimObject = (data) => {
     }
     return data;
 };
+/**
+ * 生成指定长度的随机数字字符串
+ */
 export const randomNumber = (len) => {
     return `${parseInt(`${(Math.random() * 9 + 1) * Math.pow(10, (len - 1))}`, 10)}`;
 };
 const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
 const charLen = chars.length;
+/**
+ * 生成指定长度的随机字符串（包含大小写字母和数字）
+ */
 export const randomString = (len) => {
     return Array.from(new Array(len)).map(() => chars.charAt(Math.floor(Math.random() * charLen))).join('');
 };
@@ -100,6 +124,9 @@ const table = {
     '～': '~',
     '﹏': '~'
 };
+/**
+ * 将字符串中的中文标点符号统一替换为对应的英文标点
+ */
 export const replaceChineseCode = (str) => {
     return str.replace(chinese, (a) => table[a] || '');
 };