@ives_xxz/framework 1.4.4 → 1.4.6

package/FW.d.ts

@@ -1924,8 +1924,8 @@ declare namespace FW {
 
   type PromiseProxy<T = Promise> = {
     id: number;
-    promise: Promise<T>;
     status: any;
+    promise?: Promise<T>;
     abortController: AbortController;
     abort?: (reason?: any) => void;
     addAbortEventListener?: (

package/manager/FWAssetManager.ts

@@ -131,45 +131,37 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
 
     assetData.loaded = false;
 
-    return FW.Entry.promiseMgr.execute(
-      (resolve, reject, signal) => {
-        const self = this;
-        bundle.load(
-          path,
-          type,
-          (finish: number, total: number, item: cc.AssetManager.RequestItem) => {
-            progress?.(finish, total, item);
-          },
-          (err: Error, asset: cc.Asset) => {
-            if (err || !asset) {
-              signal.addEventListener('abort', () => {
-                FWLog.error(`加载资源失败:${asset},请检查!`);
-                reject(err);
-              });
-              return;
-            }
-
-            assetData.loaded = true;
-            assetData.dependentBundle = bundleName;
-            assetData.uuid = asset['_uuid'];
-            assetData.autoRelease = autoRelease;
-            assetData.asset = asset;
-            assetData.user = assetProperty.user;
-            assetData.refCount = 1;
-            assetData.assetProperty = assetProperty;
-
-            self.assetsMap.set(key, assetData);
+    const proxy = FW.Entry.promiseMgr.execute((resolve, reject) => {
+      const self = this;
+      bundle.load(
+        path,
+        type,
+        (finish: number, total: number, item: cc.AssetManager.RequestItem) => {
+          progress?.(finish, total, item);
+        },
+        (err: Error, asset: cc.Asset) => {
+          if (err || !asset) {
+            reject(err);
+            return;
+          }
 
-            cb?.(assetData);
-            resolve(assetData);
-          },
-        );
-      },
-      {
-        timeout: 10,
-        retryCount: 3,
-      },
-    ).promise;
+          assetData.loaded = true;
+          assetData.dependentBundle = bundleName;
+          assetData.uuid = asset['_uuid'];
+          assetData.autoRelease = autoRelease;
+          assetData.asset = asset;
+          assetData.user = assetProperty.user;
+          assetData.refCount = 1;
+          assetData.assetProperty = assetProperty;
+
+          self.assetsMap.set(key, assetData);
+
+          cb?.(assetData);
+          resolve(assetData);
+        },
+      );
+    });
+    return proxy.promise;
   }
   /**
    * 加载文件夹

package/manager/FWPromiseManager.ts

@@ -25,12 +25,10 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
     const id = this.uniqueId++;
     const abortController = new AbortController();
     let retryCount = 0;
-    let promise: Promise<T>;
     const maxRetryTimes = options.retryCount || 0;
     const retryInterval = options.retryInterval || 0;
     const promiseProxy: FW.PromiseProxy<T> = {
       id,
-      promise,
       status: FWSystemDefine.FWPromiseStatus.PENDING,
       abortController,
     };
@@ -77,13 +75,11 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
         abortController.signal.addEventListener('abort', onAbort);
 
         const wrappedResolve = (value: T | PromiseLike<T>) => {
+          promiseProxy.status = FWSystemDefine.FWPromiseStatus.FULFILLED;
+          abortController.signal.removeEventListener('abort', onAbort);
+          this.removePromise(id);
           this.timerSchedule?.unSchedule();
-          if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
-            promiseProxy.status = FWSystemDefine.FWPromiseStatus.FULFILLED;
-            abortController.signal.removeEventListener('abort', onAbort);
-            this.removePromise(id);
-            resolve(value);
-          }
+          resolve(value);
         };
 
         const wrappedReject = (reason?: any) => {
@@ -118,7 +114,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
       });
     };
 
-    promise = createPromise();
+    promiseProxy.promise = createPromise();
     promiseProxy.abort = (reason?: any) => {
       if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
         FWLog.debug(reason || 'promise cancelled');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ives_xxz/framework",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
   "keywords": ["123456"],