@ives_xxz/framework 1.5.7 → 1.5.9

package/manager/FWLayerManager.ts

@@ -9,6 +9,7 @@ import FWLogic from "../logic/FWLogic";
 import FWData from "../data/FWData";
 import FWSocketSender from "../service/socket/FWSocketSender";
 import FWSocketHandle from "../service/socket/FWSocketHandle";
+import Framework from "../Framework";
 
 const ADD_EXTERNAL_REFERENCE: string = "addExternalReference";
 
@@ -296,18 +297,39 @@ class FWLayerDataManager {
     }
   }
 
+  private findBundleNameByClassName(name: string): string | undefined {
+    const registeredComponents = Framework.getRegisteredComponents();
+
+    const bundleNames = Array.from(registeredComponents.keys());
+
+    for (const bundleName of bundleNames) {
+      if (this.doesClassNameContainBundleName(name, bundleName)) {
+        return bundleName;
+      }
+    }
+    return undefined;
+  }
+
+  private doesClassNameContainBundleName(
+    className: string,
+    bundleName: string
+  ): boolean {
+    const bundleNameLower = bundleName.toLowerCase();
+    const classNameLower = className.toLowerCase();
+    return classNameLower.includes(bundleNameLower);
+  }
+
   /**
    * 生成数据
    */
   private generationData(ctr: FW.LayerController): FWLayerData {
     const layerData = new FWLayerData();
     const layerType = ctr.layerType;
+    const constructorName = ctr.constructor.name;
+    const bundleName = this.findBundleNameByClassName(constructorName);
+    const configTag = FWSystemDefine.FWBindTag.CONFIG;
 
-    ctr.config = FW.Entry.getComponent(FWAssetConfig);
-    ctr.logic = FW.Entry.getComponent(FWLogic);
-    ctr.data = FW.Entry.getComponent(FWData);
-    ctr.sender = FW.Entry.getComponent(FWSocketSender);
-    ctr.handle = FW.Entry.getComponent(FWSocketHandle);
+    ctr.config = FW.Entry.getComponent(`${bundleName}${configTag}`);
 
     layerData.layerRenderOrder = ctr.renderOrder;
     layerData.layerAssetProperty = ctr.layerAssetProperty;
@@ -561,20 +583,6 @@ class FWLayerOpenManager {
     return true;
   }
 
-  /**
-   * 获取undefined结果
-   */
-  private getUndefinedResult<Ctr>(isAsync: boolean): Promise<Ctr> | Ctr {
-    return isAsync ? Promise.resolve(undefined) : undefined;
-  }
-
-  /**
-   * 包装结果
-   */
-  private wrapResult<Ctr>(result: Ctr, isAsync: boolean): Promise<Ctr> | Ctr {
-    return isAsync ? Promise.resolve(result) : result;
-  }
-
   /**
    * 异步生成Layer
    */

package/manager/FWPromiseManager.ts

@@ -1,8 +1,11 @@
-import { FWSystemDefine } from '../define/FWSystemDefine';
-import FWLog from '../log/FWLog';
-import { FWManager } from './FWManager';
-
-export default class FWPromiseManager extends FWManager implements FW.PromiseManager {
+import { FWSystemDefine } from "../define/FWSystemDefine";
+import FWLog from "../log/FWLog";
+import { FWManager } from "./FWManager";
+
+export default class FWPromiseManager
+  extends FWManager
+  implements FW.PromiseManager
+{
   private promiseRegistry: Map<number, FW.PromiseProxy>;
   private uniqueId: number = 0;
 
@@ -18,7 +21,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
   /** 创建Promise执行器 */
   public execute<T = any>(
     executor: FW.PromiseExcutor<T>,
-    options: FW.PromiseExecuteOptions = {},
+    options: FW.PromiseExecuteOptions = {}
   ): FW.PromiseProxy<T> {
     const id = this.uniqueId++;
     const abortController = new AbortController();
@@ -26,17 +29,23 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
     const retryInterval = options.retryInterval || 0;
     let retryCount = 0;
     let timerSchedule: FW.TimerSchedule;
+
     const createPromise = (): Promise<T> => {
       return new Promise<T>((resolve, reject) => {
         if (options.timeout && options.timeout > 0) {
           timerSchedule = FW.Entry.timeMgr.scheduleOnce(() => {
-            const timeoutError = new Error(`Promise ${id} timeout after ${options.timeout} s`);
+            const timeoutError = new Error(
+              `Promise ${id} timeout after ${options.timeout} s`
+            );
             if (
               retryCount < maxRetryTimes &&
-              (!options.retryCondition || options.retryCondition(timeoutError, retryCount))
+              (!options.retryCondition ||
+                options.retryCondition(timeoutError, retryCount))
             ) {
               retryCount++;
-              FWLog.debug(`Promise ${id} timeout, retrying (${retryCount}/${maxRetryTimes})`);
+              FWLog.debug(
+                `Promise ${id} timeout, retrying (${retryCount}/${maxRetryTimes})`
+              );
               if (retryInterval > 0) {
                 FW.Entry.timeMgr.scheduleOnce(() => {
                   createPromise().then(resolve, reject);
@@ -64,11 +73,11 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
           return;
         }
 
-        abortController.signal.addEventListener('abort', onAbort);
+        abortController.signal.addEventListener("abort", onAbort);
 
         const wrappedResolve = (value: T | PromiseLike<T>) => {
           promiseProxy.status = FWSystemDefine.FWPromiseStatus.FULFILLED;
-          abortController.signal.removeEventListener('abort', onAbort);
+          abortController.signal.removeEventListener("abort", onAbort);
           this.removePromise(id);
           timerSchedule?.unSchedule();
           resolve(value);
@@ -78,10 +87,14 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
           timerSchedule?.unSchedule();
           if (
             retryCount < maxRetryTimes &&
-            (!options.retryCondition || options.retryCondition(reason, retryCount))
+            (!options.retryCondition ||
+              options.retryCondition(reason, retryCount))
           ) {
             retryCount++;
-            FWLog.debug(`Promise ${id} failed, retrying (${retryCount}/${maxRetryTimes}):`, reason);
+            FWLog.debug(
+              `Promise ${id} failed, retrying (${retryCount}/${maxRetryTimes}):`,
+              reason
+            );
             if (retryInterval > 0) {
               FW.Entry.timeMgr.scheduleOnce(() => {
                 createPromise().then(resolve, reject);
@@ -90,16 +103,23 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
               createPromise().then(resolve, reject);
             }
           } else {
-            if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
+            if (
+              promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING
+            ) {
               promiseProxy.status = FWSystemDefine.FWPromiseStatus.REJECTED;
-              abortController.signal.removeEventListener('abort', onAbort);
+              abortController.signal.removeEventListener("abort", onAbort);
               this.removePromise(id);
               reject(reason);
             }
           }
         };
         try {
-          executor(wrappedResolve, wrappedReject, abortController.signal, options.reason);
+          executor(
+            wrappedResolve,
+            wrappedReject,
+            abortController.signal,
+            options.reason
+          );
         } catch (error) {
           wrappedReject(error);
         }
@@ -114,16 +134,16 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
       abortController,
       abort: (reason?: any) => {
         if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
-          FWLog.debug(reason || 'promise cancelled');
+          FWLog.debug(reason || "promise cancelled");
           abortController.abort(reason);
         }
       },
 
       addAbortEventListener: (
         listener: (this: AbortSignal, ev: Event) => any,
-        options?: boolean | AddEventListenerOptions,
+        options?: boolean | AddEventListenerOptions
       ) => {
-        abortController.signal.addEventListener('abort', listener, options);
+        abortController.signal.addEventListener("abort", listener, options);
       },
     };
 
@@ -134,7 +154,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
   /** 批量执行Promise并等待所有完成 */
   public all<T = any>(
     promises: FW.PromiseProxy<T>[],
-    options: FW.PromiseExecuteOptions = {},
+    options: FW.PromiseExecuteOptions = {}
   ): FW.PromiseProxy<FW.PromiseResult<T>> {
     const id = this.uniqueId++;
     const abortController = new AbortController();
@@ -148,13 +168,18 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
         if (options.timeout && options.timeout > 0) {
           timerSchedule?.unSchedule();
           timerSchedule = FW.Entry.timeMgr.scheduleOnce(() => {
-            const timeoutError = new Error(`All Promise ${id} timeout after ${options.timeout} s`);
+            const timeoutError = new Error(
+              `All Promise ${id} timeout after ${options.timeout} s`
+            );
             if (
               retryCount < maxRetryTimes &&
-              (!options.retryCondition || options.retryCondition(timeoutError, retryCount))
+              (!options.retryCondition ||
+                options.retryCondition(timeoutError, retryCount))
             ) {
               retryCount++;
-              FWLog.debug(`All Promise ${id} timeout, retrying (${retryCount}/${maxRetryTimes})`);
+              FWLog.debug(
+                `All Promise ${id} timeout, retrying (${retryCount}/${maxRetryTimes})`
+              );
               if (retryInterval > 0) {
                 FW.Entry.timeMgr.scheduleOnce(() => {
                   createPromise().then(resolve, reject);
@@ -182,7 +207,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
           return;
         }
 
-        abortController.signal.addEventListener('abort', onAbort);
+        abortController.signal.addEventListener("abort", onAbort);
 
         const processAll = async () => {
           const result: FW.PromiseResult<T> = {
@@ -199,8 +224,8 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
                   .filter(
                     (id) =>
                       !result.success.some((s) => s.id === id) &&
-                      !result.failed.some((f) => f.id === id),
-                  ),
+                      !result.failed.some((f) => f.id === id)
+                  )
               );
               break;
             }
@@ -209,7 +234,9 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
               const value = await promiseProxy.promise;
               result.success.push(value);
             } catch (error) {
-              if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.CANCELLED) {
+              if (
+                promiseProxy.status === FWSystemDefine.FWPromiseStatus.CANCELLED
+              ) {
                 result.cancelled.push(promiseProxy.id);
               } else {
                 result.failed.push({
@@ -226,7 +253,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
         processAll()
           .then((result) => {
             promiseProxy.status = FWSystemDefine.FWPromiseStatus.FULFILLED;
-            abortController.signal.removeEventListener('abort', onAbort);
+            abortController.signal.removeEventListener("abort", onAbort);
             this.removePromise(id);
             timerSchedule?.unSchedule();
             resolve(result);
@@ -235,12 +262,13 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
             timerSchedule?.unSchedule();
             if (
               retryCount < maxRetryTimes &&
-              (!options.retryCondition || options.retryCondition(error, retryCount))
+              (!options.retryCondition ||
+                options.retryCondition(error, retryCount))
             ) {
               retryCount++;
               FWLog.debug(
                 `All Promise ${id} failed, retrying (${retryCount}/${maxRetryTimes}):`,
-                error,
+                error
               );
               if (retryInterval > 0) {
                 FW.Entry.timeMgr.scheduleOnce(() => {
@@ -250,9 +278,11 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
                 createPromise().then(resolve, reject);
               }
             } else {
-              if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
+              if (
+                promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING
+              ) {
                 promiseProxy.status = FWSystemDefine.FWPromiseStatus.REJECTED;
-                abortController.signal.removeEventListener('abort', onAbort);
+                abortController.signal.removeEventListener("abort", onAbort);
                 this.removePromise(id);
                 reject(error);
               }
@@ -269,15 +299,15 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
       abortController,
       abort: (reason?: any) => {
         if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
-          FWLog.debug(reason || 'all promise cancelled');
+          FWLog.debug(reason || "all promise cancelled");
           abortController.abort(reason);
         }
       },
       addAbortEventListener: (
         listener: (this: AbortSignal, ev: Event) => any,
-        options?: boolean | AddEventListenerOptions,
+        options?: boolean | AddEventListenerOptions
       ) => {
-        abortController.signal.addEventListener('abort', listener, options);
+        abortController.signal.addEventListener("abort", listener, options);
       },
     };
 
@@ -288,7 +318,10 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
   /** 取消指定Promise */
   public cancel(id: number, reason?: any): boolean {
     const promiseProxy = this.promiseRegistry.get(id);
-    if (promiseProxy && promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
+    if (
+      promiseProxy &&
+      promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING
+    ) {
       promiseProxy.abort(reason);
       return true;
     }
@@ -313,7 +346,6 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
       promiseProxy.abort(reason);
       cancelled.push(id);
     });
-    FWLog.error(cancelled);
     return cancelled;
   }
 
@@ -340,7 +372,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
   /** 获取正在执行的Promise数量 */
   public getActiveCount(): number {
     return Array.from(this.promiseRegistry.values()).filter(
-      (p) => p.status === FWSystemDefine.FWPromiseStatus.PENDING,
+      (p) => p.status === FWSystemDefine.FWPromiseStatus.PENDING
     ).length;
   }
 

package/package.json

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