light-h5-core-lib 2.10.8 → 2.10.10

package/LightCore.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MapUtil = exports.CollisionDetectionUtil = exports.SelfDecrypt = exports.GetDecorateUtils = exports.NumberUtil = exports.BooleanUtil = exports.Crc32Util = exports.PromiseUtil = exports.BeizerUtil = exports.UniqueIDUtil = exports.StringUtil = exports.RandomNumUtil = exports.FloatDigitUtil = exports.DateUtil = exports.BitUtil = exports.MD5 = exports.BaseSingleton = exports.SetterGetterBase = exports.ClassNameUtil = exports.PoolObj = void 0;
+exports.MapUtil = exports.CollisionDetectionUtil = exports.SelfDecrypt = exports.GetDecorateUtils = exports.NumberUtil = exports.BooleanUtil = exports.Crc32Util = exports.PromiseUtil = exports.BeizerUtil = exports.UniqueIDUtil = exports.StringUtil = exports.RandomNumUtil = exports.FloatDigitUtil = exports.DateUtil = exports.BitUtil = exports.MD5 = exports.BaseSingleton = exports.SetterGetterBase = exports.ClassNameUtil = exports.PoolObj = exports.PoolObjPutStatus = void 0;
 const PoolObj_1 = require("./pool/PoolObj");
 Object.defineProperty(exports, "PoolObj", { enumerable: true, get: function () { return PoolObj_1.PoolObj; } });
 const BaseSingleton_1 = require("./common/base/BaseSingleton");
@@ -44,7 +44,10 @@ const GetDecorateUtils_1 = require("./common/util/GetDecorateUtils");
 Object.defineProperty(exports, "GetDecorateUtils", { enumerable: true, get: function () { return GetDecorateUtils_1.GetDecorateUtils; } });
 const MapUtil_1 = require("./common/util/MapUtil");
 Object.defineProperty(exports, "MapUtil", { enumerable: true, get: function () { return MapUtil_1.MapUtil; } });
+const PoolObjPutStatus_1 = require("./pool/PoolObjPutStatus");
+Object.defineProperty(exports, "PoolObjPutStatus", { enumerable: true, get: function () { return PoolObjPutStatus_1.PoolObjPutStatus; } });
 module.exports = {
+    PoolObjPutStatus: PoolObjPutStatus_1.PoolObjPutStatus,
     PoolObj: PoolObj_1.PoolObj,
     ClassNameUtil: ClassNameUtil_1.ClassNameUtil,
     SetterGetterBase: SetterGetterBase_1.SetterGetterBase,

package/package.json

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

package/pool/PoolObj.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PoolObj = void 0;
+const PoolObjPutStatus_1 = require("./PoolObjPutStatus");
 /**
- * 对象池（泛型）
+ * 对象池（泛型）</br>
+ * 可以防止引用类型二次放入
  * @author Aonaufly
  */
 class PoolObj {
@@ -13,11 +15,12 @@ class PoolObj {
      * @param clearCallback Item清理函数
      * @param destroyCallback Item销毁函数
      */
-    constructor(cap = 5, initCreateNum = 0, createCallback = null, clearCallback = null, destroyCallback = null) {
+    constructor(cap = 5, initCreateNum = 0, createCallback = null, clearCallback = null, destroyCallback = null, isForceRefTypeChecking = true) {
         this._cap = cap == null ? 5 : cap;
         this._createCallback = createCallback;
         this._clearCallback = clearCallback;
         this._destroyCallback = destroyCallback;
+        this._isForceRefTypeChecking = isForceRefTypeChecking;
         this._pool = [];
         this.initCreate(initCreateNum == null ? 0 : initCreateNum);
     }
@@ -34,20 +37,38 @@ class PoolObj {
             this._pool.push(this._createCallback());
         }
     }
+    isObject(obj) {
+        const str = typeof obj;
+        if (str == "object")
+            return true;
+        if (str == "function")
+            return true;
+        return false;
+    }
     /**
      * 放入到对象池
-     * @return 放入到对象池是否成功
+     * @return 放入到对象池是否成功, PoolObjPutStatus.WARNING_DUPLICATE: 重复放置相同的引用(用户可以据此查找问题)
      */
     put(obj) {
         if (!obj)
-            return false;
+            return PoolObjPutStatus_1.PoolObjPutStatus.FAILED_NULL;
         if (this._cap > 0 && this._pool.length >= this._cap) {
             this._destroyCallback && this._destroyCallback(obj);
-            return false;
+            return PoolObjPutStatus_1.PoolObjPutStatus.FAILED_EXCEEDS_CAPACITY;
+        }
+        if (this._isForceRefTypeChecking &&
+            this._pool.length > 0 &&
+            this.isObject(obj)) {
+            for (let i = 0; i < this._pool.length; i++) {
+                if (this._pool[i] === obj) {
+                    //已经放入，无法二次放入
+                    return PoolObjPutStatus_1.PoolObjPutStatus.WARNING_DUPLICATE;
+                }
+            }
         }
         this._clearCallback && this._clearCallback(obj);
         this._pool.push(obj);
-        return true;
+        return PoolObjPutStatus_1.PoolObjPutStatus.SUCCESS;
     }
     /**
      * 获得一个Item<br>

package/pool/PoolObjPutStatus.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PoolObjPutStatus = void 0;
+/**
+ * 对象池放置的结果状态
+ * @author Aonaufly
+ */
+var PoolObjPutStatus;
+(function (PoolObjPutStatus) {
+    /**成功的*/
+    PoolObjPutStatus[PoolObjPutStatus["SUCCESS"] = 0] = "SUCCESS";
+    /**失败的(item: null)*/
+    PoolObjPutStatus[PoolObjPutStatus["FAILED_NULL"] = 1] = "FAILED_NULL";
+    /**失败的(超过了容量)*/
+    PoolObjPutStatus[PoolObjPutStatus["FAILED_EXCEEDS_CAPACITY"] = 2] = "FAILED_EXCEEDS_CAPACITY";
+    /**⚠：引用对象重复放置*/
+    PoolObjPutStatus[PoolObjPutStatus["WARNING_DUPLICATE"] = 2] = "WARNING_DUPLICATE";
+})(PoolObjPutStatus || (exports.PoolObjPutStatus = PoolObjPutStatus = {}));

package/type/index.d.ts

@@ -7,7 +7,22 @@ export interface IClear extends IDestroy {
 	clear(): void;
 }
 /**
- * 对象池（泛型）
+ * 对象池放置的结果状态
+ * @author Aonaufly
+ */
+export declare enum PoolObjPutStatus {
+	/**成功的*/
+	SUCCESS = 0,
+	/**失败的(item: null)*/
+	FAILED_NULL = 1,
+	/**失败的(超过了容量)*/
+	FAILED_EXCEEDS_CAPACITY = 2,
+	/**⚠：引用对象重复放置*/
+	WARNING_DUPLICATE = 2
+}
+/**
+ * 对象池（泛型）</br>
+ * 可以防止引用类型二次放入
  * @author Aonaufly
  */
 export declare class PoolObj<T> implements IClear {
@@ -16,6 +31,7 @@ export declare class PoolObj<T> implements IClear {
 	private _createCallback;
 	private _clearCallback;
 	private _destroyCallback;
+	private _isForceRefTypeChecking;
 	/**
 	 * @param cap 容量(容积) <b style="color:red">小于等于0：无限容量，慎用</b>
 	 * @param initCreateNum 初始化创建数量 <b style="color:red">（createCallback != null 有效）</b>
@@ -23,16 +39,17 @@ export declare class PoolObj<T> implements IClear {
 	 * @param clearCallback Item清理函数
 	 * @param destroyCallback Item销毁函数
 	 */
-	constructor(cap?: number, initCreateNum?: number, createCallback?: () => T, clearCallback?: (item: T) => void, destroyCallback?: (item: T) => void);
+	constructor(cap?: number, initCreateNum?: number, createCallback?: () => T, clearCallback?: (item: T) => void, destroyCallback?: (item: T) => void, isForceRefTypeChecking?: boolean);
 	/**
 	 * 初始化一些数量的item
 	 */
 	private initCreate;
+	private isObject;
 	/**
 	 * 放入到对象池
-	 * @return 放入到对象池是否成功
+	 * @return 放入到对象池是否成功, PoolObjPutStatus.WARNING_DUPLICATE: 重复放置相同的引用(用户可以据此查找问题)
 	 */
-	put(obj: T): boolean;
+	put(obj: T): PoolObjPutStatus;
 	/**
 	 * 获得一个Item<br>
 	 * <div style="color: #FF0000;">⚠️友情提示：如果有createCallback需要判断是否是New的item则提前使用 this.size == 0保存句柄</div><br>