light-h5-core-lib 2.10.10 → 2.10.11

package/common/util/MapUtil.js

@@ -24,5 +24,57 @@ class MapUtil {
             keyItems = keys.next();
         }
     }
+    /**
+     * 通过Value寻找Key值
+     * @param targetMap 目标Map
+     * @param value 目标值
+     */
+    static getKeyByValue(targetMap, value) {
+        if (!targetMap || targetMap.size <= 0) {
+            return null;
+        }
+        if (!value)
+            return null;
+        const keys = targetMap.keys();
+        let keyItems = keys.next();
+        while (!keyItems.done) {
+            if (targetMap.get(keyItems.value) === value) {
+                return keyItems.value;
+            }
+            keyItems = keys.next();
+        }
+        return null;
+    }
+    /**
+     * 清理字典中的空Value
+     * @param targetMap 目标Map
+     * @param isNeedClearCallback 判断一个值是不是需要被删除 默认：null
+     */
+    static clearEmptyValue(targetMap, isNeedClearCallback = null) {
+        if (!targetMap || targetMap.size <= 0) {
+            return;
+        }
+        const keys = targetMap.keys();
+        let keyItems = keys.next();
+        const deleteKeys = [];
+        let item;
+        while (!keyItems.done) {
+            item = targetMap.get(keyItems.value);
+            if (!item) {
+                deleteKeys.push(keyItems.value);
+            }
+            else if (isNeedClearCallback) {
+                if (isNeedClearCallback(item)) {
+                    deleteKeys.push(keyItems.value);
+                }
+            }
+            keyItems = keys.next();
+        }
+        if (deleteKeys.length <= 0)
+            return;
+        for (let i = 0; i < deleteKeys.length; i++) {
+            targetMap.delete(deleteKeys[i]);
+        }
+    }
 }
 exports.MapUtil = MapUtil;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "light-h5-core-lib",
-  "version": "2.10.10",
+  "version": "2.10.11",
   "description": "light core lib",
   "main": "./LightCore.js",
   "types": "./type/index.d.ts",

package/pool/PoolObj.js

@@ -9,17 +9,20 @@ const PoolObjPutStatus_1 = require("./PoolObjPutStatus");
  */
 class PoolObj {
     /**
-     * @param cap 容量(容积) <b style="color:red">小于等于0：无限容量，慎用</b>
-     * @param initCreateNum 初始化创建数量 <b style="color:red">（createCallback != null 有效）</b>
-     * @param createCallback Item创建函数
-     * @param clearCallback Item清理函数
-     * @param destroyCallback Item销毁函数
+     * @param cap 容量(容积) <b style="color:red">小于等于0：无限容量，慎用</b> 默认：5
+     * @param initCreateNum 初始化创建数量 <b style="color:red">（createCallback != null 有效）</b> 默认： 0
+     * @param createCallback Item创建函数 默认: null
+     * @param clearCallback Item清理函数 默认: null
+     * @param destroyCallback Item销毁函数 默认: null
+     * @param isCanPutCallback Item是否可以被放入到对象池 默认: null
+     * @param isForceRefTypeChecking 如果放入的对象是引用对象，是否要检测重复放入的问题 默认: true
      */
-    constructor(cap = 5, initCreateNum = 0, createCallback = null, clearCallback = null, destroyCallback = null, isForceRefTypeChecking = true) {
+    constructor(cap = 5, initCreateNum = 0, createCallback = null, clearCallback = null, destroyCallback = null, isCanPutCallback = null, isForceRefTypeChecking = true) {
         this._cap = cap == null ? 5 : cap;
         this._createCallback = createCallback;
         this._clearCallback = clearCallback;
         this._destroyCallback = destroyCallback;
+        this._isCanPutCallback = isCanPutCallback;
         this._isForceRefTypeChecking = isForceRefTypeChecking;
         this._pool = [];
         this.initCreate(initCreateNum == null ? 0 : initCreateNum);
@@ -66,6 +69,13 @@ class PoolObj {
                 }
             }
         }
+        if (this._isCanPutCallback) {
+            if (!this._isCanPutCallback(obj)) {
+                //client阻止了放入，进行销毁处理
+                this._destroyCallback && this._destroyCallback(obj);
+                return PoolObjPutStatus_1.PoolObjPutStatus.FAILED_CLIENT_PREVENT;
+            }
+        }
         this._clearCallback && this._clearCallback(obj);
         this._pool.push(obj);
         return PoolObjPutStatus_1.PoolObjPutStatus.SUCCESS;

package/pool/PoolObjPutStatus.js

@@ -13,6 +13,8 @@ var PoolObjPutStatus;
     PoolObjPutStatus[PoolObjPutStatus["FAILED_NULL"] = 1] = "FAILED_NULL";
     /**失败的(超过了容量)*/
     PoolObjPutStatus[PoolObjPutStatus["FAILED_EXCEEDS_CAPACITY"] = 2] = "FAILED_EXCEEDS_CAPACITY";
-    /**⚠：引用对象重复放置*/
+    /**⚠️：引用对象重复放入*/
     PoolObjPutStatus[PoolObjPutStatus["WARNING_DUPLICATE"] = 2] = "WARNING_DUPLICATE";
+    /**⚠️: 客户端阻止了放入*/
+    PoolObjPutStatus[PoolObjPutStatus["FAILED_CLIENT_PREVENT"] = 3] = "FAILED_CLIENT_PREVENT";
 })(PoolObjPutStatus || (exports.PoolObjPutStatus = PoolObjPutStatus = {}));

package/type/index.d.ts

@@ -17,8 +17,10 @@ export declare enum PoolObjPutStatus {
 	FAILED_NULL = 1,
 	/**失败的(超过了容量)*/
 	FAILED_EXCEEDS_CAPACITY = 2,
-	/**⚠：引用对象重复放置*/
-	WARNING_DUPLICATE = 2
+	/**⚠️：引用对象重复放入*/
+	WARNING_DUPLICATE = 2,
+	/**⚠️: 客户端阻止了放入*/
+	FAILED_CLIENT_PREVENT = 3
 }
 /**
  * 对象池（泛型）</br>
@@ -31,15 +33,18 @@ export declare class PoolObj<T> implements IClear {
 	private _createCallback;
 	private _clearCallback;
 	private _destroyCallback;
+	private _isCanPutCallback;
 	private _isForceRefTypeChecking;
 	/**
-	 * @param cap 容量(容积) <b style="color:red">小于等于0：无限容量，慎用</b>
-	 * @param initCreateNum 初始化创建数量 <b style="color:red">（createCallback != null 有效）</b>
-	 * @param createCallback Item创建函数
-	 * @param clearCallback Item清理函数
-	 * @param destroyCallback Item销毁函数
+	 * @param cap 容量(容积) <b style="color:red">小于等于0：无限容量，慎用</b> 默认：5
+	 * @param initCreateNum 初始化创建数量 <b style="color:red">（createCallback != null 有效）</b> 默认： 0
+	 * @param createCallback Item创建函数 默认: null
+	 * @param clearCallback Item清理函数 默认: null
+	 * @param destroyCallback Item销毁函数 默认: null
+	 * @param isCanPutCallback Item是否可以被放入到对象池 默认: null
+	 * @param isForceRefTypeChecking 如果放入的对象是引用对象，是否要检测重复放入的问题 默认: true
 	 */
-	constructor(cap?: number, initCreateNum?: number, createCallback?: () => T, clearCallback?: (item: T) => void, destroyCallback?: (item: T) => void, isForceRefTypeChecking?: boolean);
+	constructor(cap?: number, initCreateNum?: number, createCallback?: () => T, clearCallback?: (item: T) => void, destroyCallback?: (item: T) => void, isCanPutCallback?: (item: T) => boolean, isForceRefTypeChecking?: boolean);
 	/**
 	 * 初始化一些数量的item
 	 */
@@ -575,7 +580,19 @@ export declare class MapUtil {
 	 * @param targetMap 目标Map
 	 * @param everyCallback 每次的回调
 	 */
-	static all(targetMap: Map<any, any>, everyCallback: (key: any, item: any) => void): void;
+	static all<KEY, VALUE>(targetMap: Map<KEY, VALUE>, everyCallback: (key: KEY, item: VALUE) => void): void;
+	/**
+	 * 通过Value寻找Key值
+	 * @param targetMap 目标Map
+	 * @param value 目标值
+	 */
+	static getKeyByValue<KEY, VALUE>(targetMap: Map<KEY, VALUE>, value: VALUE): KEY;
+	/**
+	 * 清理字典中的空Value
+	 * @param targetMap 目标Map
+	 * @param isNeedClearCallback 判断一个值是不是需要被删除 默认：null
+	 */
+	static clearEmptyValue<KEY, VALUE>(targetMap: Map<KEY, VALUE>, isNeedClearCallback?: (item: VALUE) => boolean): void;
 }
 
 export {};