@ives_xxz/framework 1.4.16 → 1.5.0

package/manager/FWManager.ts

@@ -1,65 +1,11 @@
-import { FWEventDefine } from '../define/FWEventDefine';
-import FWLog from '../log/FWLog';
-
-export abstract class FWManager implements FW.Manager {
-  public readonly entry: FW.Entry = FW.Entry;
-  public readonly managerName: string = this.constructor.name;
+import { FrameworkBase } from '../FrameworkBase';
 
+export abstract class FWManager extends FrameworkBase implements FW.Manager {
   public abstract initialize(): void;
   public abstract onDestroy(): void;
 
-  constructor() {
-    this.initialize();
-    this.entry.evtMgr.register(FWEventDefine.SystemEvent.SYSTEM_RESTART, this.onRestart, this);
-  }
-
   protected onRestart() {
     this.onDestroy();
     this.initialize();
   }
-
-  protected async invoke<T>(operation: Promise<T>, operationName: string = 'unknown'): Promise<T> {
-    const startTime = this.getCurrentTime();
-
-    try {
-      const result = await operation;
-      const duration = this.getCurrentTime() - startTime;
-
-      this.recordPerformanceMetric(operationName, duration);
-      return result;
-    } catch (error) {
-      this.handleError(operationName, error);
-      return undefined;
-    }
-  }
-
-  private recordPerformanceMetric(operationName: string, duration: number): void {
-    if (FW.Entry.performanceMgr) {
-      FW.Entry.performanceMgr.recordOperationMetric(this.managerName, operationName, duration);
-    }
-
-    if (duration > 1000) {
-      FWLog.warn(`Operation ${operationName} took ${duration}ms`);
-    } else if (FW.Entry.engineMgr.debug) {
-      FWLog.debug(`Operation ${operationName} took ${duration}ms`);
-    }
-  }
-
-  protected handleError(operation: string, error: any): void {
-    const errorInfo = {
-      manager: this.managerName,
-      operation,
-      error: error?.message || error,
-      stack: error?.stack,
-    };
-
-    FWLog.error(`Manager error in ${this.managerName}.${operation}:`, errorInfo);
-
-    if (CC_DEBUG && FW.Entry.engineMgr.debug) {
-    }
-  }
-
-  protected getCurrentTime(): number {
-    return Date.now();
-  }
 }

package/manager/FWObjectManager.ts

@@ -1,17 +1,29 @@
 import { FWSystemDefine } from '../define/FWSystemDefine';
-import Framework from '../Framework';
 import FWObject from '../utils/FWObject';
 import { FWObjectPool } from '../utils/FWObjectPool';
 import { FWManager } from './FWManager';
+import FWLog from '../log/FWLog';
 
 export default class FWObjectManager extends FWManager implements FW.ObjectManager {
   public initialize(): void {
     this.poolMap = new Map<string, FWObjectPool>();
+    this.poolIdCounter = 0;
   }
-  public onDestroy(): void {}
+
+  public onDestroy(): void {
+    this.poolMap.forEach((pool, tag) => {
+      try {
+        pool.onDestroy();
+      } catch (error) {
+        FWLog.error(`销毁对象池失败: ${tag}`, error);
+      }
+    });
+    this.poolMap.clear();
+  }
+
   private poolMap: Map<string, FWObjectPool>;
+  private poolIdCounter: number = 0;
 
-  /** 创建一个对象池 */
   async createObjectPool<T extends FWObject = FWObject>(
     node: cc.Node,
     parent: cc.Node,
@@ -43,49 +55,104 @@ export default class FWObjectManager extends FWManager implements FW.ObjectManag
     type?: number,
   ): Promise<FWObjectPool>;
   async createObjectPool<T extends FWObject = FWObject>(): Promise<FWObjectPool> {
+    if (arguments.length < 2 || arguments.length > 3) {
+      FWLog.error('createObjectPool 参数数量错误,需要2-3个参数');
+      throw new Error('Invalid arguments count');
+    }
+
     let objectNode: cc.Node = null;
     let objectPrefab: cc.Prefab = null;
     let objectAssetProperty: FW.AssetProperty = null;
     let objectParent: cc.Node;
     let objectTag: string;
     let objectType: FWSystemDefine.FWObjectType;
-    if (arguments.length > 3) return;
-    if (arguments[0] instanceof cc.Node) {
-      objectNode = arguments[0];
-    } else if (arguments[0] instanceof cc.Prefab) {
-      objectPrefab = arguments[0];
-      objectNode = cc.instantiate(objectPrefab);
-    } else {
-      objectAssetProperty = arguments[0];
-      objectPrefab = await FW.Entry.resMgr.loadAsset<cc.Prefab>(objectAssetProperty);
-      objectNode = cc.instantiate(objectPrefab);
-    }
-    objectParent = arguments[1];
-    if (arguments[2] && typeof arguments[2] === 'string') {
-      objectTag = arguments[2];
-      objectType = FWSystemDefine.FWObjectType.OPACITY;
-    } else {
-      objectTag = this.poolMap.size?.toString() || '';
-      objectType = arguments[2];
-    }
 
-    const pool = new FWObjectPool<T>(objectNode, objectParent, objectType);
+    try {
+      const resources = arguments[0];
+      if (resources instanceof cc.Node) {
+        objectNode = resources;
+      } else if (resources instanceof cc.Prefab) {
+        objectPrefab = resources;
+        objectNode = cc.instantiate(objectPrefab);
+      } else {
+        objectAssetProperty = resources;
+        objectPrefab = await FW.Entry.resMgr.loadAsset<cc.Prefab>(objectAssetProperty);
+        if (!objectPrefab) {
+          throw new Error(`加载预制体失败: ${objectAssetProperty.path}`);
+        }
+        objectNode = cc.instantiate(objectPrefab);
+      }
+
+      objectParent = arguments[1];
+      if (!(objectParent instanceof cc.Node)) {
+        throw new Error('第二个参数必须是 cc.Node 类型');
+      }
+
+      const arg = arguments[2];
+      if (typeof arg === 'string') {
+        objectTag = arg;
+        objectType = FWSystemDefine.FWObjectType.OPACITY;
+      } else if (typeof arg === 'number') {
+        objectTag = `pool_${this.poolIdCounter++}`;
+        objectType = arg;
+      } else {
+        objectTag = `pool_${this.poolIdCounter++}`;
+        objectType = FWSystemDefine.FWObjectType.OPACITY;
+      }
+
+      if (this.poolMap.has(objectTag)) {
+        this.destroyObjectPool(objectTag);
+      }
+
+      const pool = new FWObjectPool<T>(objectNode, objectParent, objectType);
+      this.poolMap.set(objectTag, pool);
 
-    this.poolMap.set(objectTag, pool);
+      return pool;
+    } catch (error) {
+      FWLog.error('创建对象池失败:', error);
 
-    return pool;
+      if (objectNode && objectNode.isValid) {
+        objectNode.destroy();
+      }
+
+      throw error;
+    }
   }
 
-  /** 获取已经创建的对象池 */
-  getObjectPool(tag: string) {
-    if (!this.poolMap.has(tag)) return undefined;
+  getObjectPool(tag: string): FWObjectPool | undefined {
+    if (!this.poolMap.has(tag)) {
+      FWLog.warn(`对象池不存在: ${tag}`);
+      return undefined;
+    }
     return this.poolMap.get(tag);
   }
 
-  /** 销毁一个对象池 */
-  destroyObjectPool(tag: string) {
-    if (!this.poolMap.has(tag)) return;
-    this.poolMap.get(tag).onDestroy();
-    this.poolMap.delete(tag);
+  destroyObjectPool(tag: string): boolean {
+    if (!this.poolMap.has(tag)) {
+      return false;
+    }
+
+    try {
+      const pool = this.poolMap.get(tag);
+      pool.onDestroy();
+      this.poolMap.delete(tag);
+      return true;
+    } catch (error) {
+      return false;
+    }
+  }
+
+  getPoolStats(): { total: number; tags: string[] } {
+    return {
+      total: this.poolMap.size,
+      tags: Array.from(this.poolMap.keys()),
+    };
+  }
+
+  clearAllPools(): void {
+    const tags = Array.from(this.poolMap.keys());
+    tags.forEach((tag) => {
+      this.destroyObjectPool(tag);
+    });
   }
 }

package/manager/FWPerformanceManager.ts

@@ -1,5 +1,3 @@
-// FWPerformanceManager.ts
-
 import FWLog from '../log/FWLog';
 import { FWManager } from './FWManager';
 
@@ -8,7 +6,7 @@ import { FWManager } from './FWManager';
  */
 export class FWPerformanceManager extends FWManager implements FW.PerformanceManager {
   private metrics: FW.PerformanceMetric[] = [];
-  private managerStats: Map<
+  private moduleStats: Map<
     string,
     {
       totalDuration: number;
@@ -18,7 +16,7 @@ export class FWPerformanceManager extends FWManager implements FW.PerformanceMan
     }
   > = new Map();
 
-  private performanceOptions: FW.PerformanceManagerOptions;
+  private performanceOptions: FW.PerformanceModuleOptions;
 
   public async initialize(): Promise<void> {
     this.performanceOptions = {
@@ -28,13 +26,13 @@ export class FWPerformanceManager extends FWManager implements FW.PerformanceMan
       warningThreshold: 1000,
     };
     if (this.performanceOptions.autoCollect) {
-      this.startAutoCleanup();
+      this.autoClear();
     }
   }
 
   public onDestroy(): void {
     this.metrics = [];
-    this.managerStats.clear();
+    this.moduleStats.clear();
   }
 
   protected onCleanup(): void {}
@@ -42,38 +40,38 @@ export class FWPerformanceManager extends FWManager implements FW.PerformanceMan
   /**
    * 记录操作性能指标
    */
-  public recordOperationMetric(manager: string, operation: string, duration: number): void {
+  public recordOperationMetric(module: string, operation: string, duration: number): void {
     if (Math.random() > this.performanceOptions.samplingRate!) {
       return;
     }
     const metric: FW.PerformanceMetric = {
-      manager,
+      module,
       operation,
       duration,
       timestamp: Date.now(),
     };
 
     this.metrics.push(metric);
-    this.updateManagerStats(manager, duration);
+    this.updateModuleStats(module, duration);
 
     if (duration > this.performanceOptions.warningThreshold!) {
-      FWLog.warn(`Performance warning: ${manager}.${operation} took ${duration}ms`);
+      FWLog.warn(`Performance warning: ${module}.${operation} took ${duration}ms`);
     }
   }
 
   /**
-   * 获取指定管理器的性能报告
+   * 获取指定模块的性能报告
    */
-  public getManagerReport(manager: string): FW.PerformanceReport | null {
-    const stats = this.managerStats.get(manager);
+  public getModuleReport(module: string): FW.PerformanceReport | null {
+    const stats = this.moduleStats.get(module);
     if (!stats) {
       return null;
     }
 
-    const recentMetrics = this.metrics.filter((m) => m.manager === manager).slice(-500);
+    const recentMetrics = this.metrics.filter((m) => m.module === module).slice(-500);
 
     return {
-      manager,
+      module,
       totalOperations: stats.operationCount,
       averageDuration: stats.totalDuration / stats.operationCount,
       minDuration: stats.minDuration,
@@ -88,10 +86,10 @@ export class FWPerformanceManager extends FWManager implements FW.PerformanceMan
   public getAllReports(): Map<string, FW.PerformanceReport> {
     const reports = new Map<string, FW.PerformanceReport>();
 
-    this.managerStats.forEach((stats, manager) => {
-      const recentMetrics = this.metrics.filter((m) => m.manager === manager).slice(-500);
-      reports.set(manager, {
-        manager,
+    this.moduleStats.forEach((stats, module) => {
+      const recentMetrics = this.metrics.filter((m) => m.module === module).slice(-500);
+      reports.set(module, {
+        module,
         totalOperations: stats.operationCount,
         averageDuration: stats.totalDuration / stats.operationCount,
         minDuration: stats.minDuration,
@@ -109,37 +107,37 @@ export class FWPerformanceManager extends FWManager implements FW.PerformanceMan
   public getPerformanceSummary(): {
     totalOperations: number;
     averageOperationTime: number;
-    slowestManager: string;
-    mostActiveManager: string;
+    slowestModule: string;
+    mostActiveModule: string;
   } {
     let totalOperations = 0;
     let totalDuration = 0;
-    let slowestManager = '';
+    let slowestModule = '';
     let maxAvgDuration = 0;
-    let mostActiveManager = '';
+    let mostActiveModule = '';
     let maxOperations = 0;
 
-    this.managerStats.forEach((stats, manager) => {
+    this.moduleStats.forEach((stats, module) => {
       totalOperations += stats.operationCount;
       totalDuration += stats.totalDuration;
 
       const avgDuration = stats.totalDuration / stats.operationCount;
       if (avgDuration > maxAvgDuration) {
         maxAvgDuration = avgDuration;
-        slowestManager = manager;
+        slowestModule = module;
       }
 
       if (stats.operationCount > maxOperations) {
         maxOperations = stats.operationCount;
-        mostActiveManager = manager;
+        mostActiveModule = module;
       }
     });
 
     return {
       totalOperations,
       averageOperationTime: totalOperations > 0 ? totalDuration / totalOperations : 0,
-      slowestManager,
-      mostActiveManager,
+      slowestModule: slowestModule,
+      mostActiveModule: mostActiveModule,
     };
   }
 
@@ -167,15 +165,15 @@ export class FWPerformanceManager extends FWManager implements FW.PerformanceMan
    */
   public resetAllData(): void {
     this.metrics = [];
-    this.managerStats.clear();
+    this.moduleStats.clear();
   }
 
   /**
    * 更新管理器统计信息
    */
-  private updateManagerStats(manager: string, duration: number): void {
-    if (!this.managerStats.has(manager)) {
-      this.managerStats.set(manager, {
+  private updateModuleStats(module: string, duration: number): void {
+    if (!this.moduleStats.has(module)) {
+      this.moduleStats.set(module, {
         totalDuration: 0,
         operationCount: 0,
         minDuration: Infinity,
@@ -183,7 +181,7 @@ export class FWPerformanceManager extends FWManager implements FW.PerformanceMan
       });
     }
 
-    const stats = this.managerStats.get(manager)!;
+    const stats = this.moduleStats.get(module)!;
     stats.totalDuration += duration;
     stats.operationCount++;
     stats.minDuration = Math.min(stats.minDuration, duration);
@@ -193,7 +191,7 @@ export class FWPerformanceManager extends FWManager implements FW.PerformanceMan
   /**
    * 启动自动清理任务
    */
-  private startAutoCleanup(): void {
+  private autoClear(): void {
     FW.Entry.timeMgr.schedule(() => {
       this.clearPerformanceData();
     }, 300);

package/manager/FWPromiseManager.ts

@@ -192,7 +192,6 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
           };
 
           for (const promiseProxy of promises) {
-            // 检查是否已取消
             if (abortController.signal.aborted) {
               result.cancelled.push(
                 ...promises

package/manager/FWResManager.ts

@@ -75,7 +75,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @returns
    */
   async loadAssetData<T extends cc.Asset>(assetProperty: FW.AssetProperty) {
-    return this.dataProcessing<T>(await this.assetMgr.load(assetProperty));
+    return this.process<T>(await this.assetMgr.load(assetProperty));
   }
   /**
    * 加载资源
@@ -84,7 +84,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
    */
   async loadAsset<T extends cc.Asset>(assetProperty: FW.AssetProperty): Promise<T> {
     const res = await this.assetMgr.load(assetProperty);
-    return this.dataProcessing<T>(res).asset as T;
+    return this.process<T>(res).asset as T;
   }
 
   /**
@@ -102,7 +102,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @returns
    */
   getAssetData<T extends cc.Asset>(assetProperty: FW.AssetProperty) {
-    return this.dataProcessing<T>(this.assetMgr.get(assetProperty));
+    return this.process<T>(this.assetMgr.get(assetProperty));
   }
   /**
    * 获取资源
@@ -110,7 +110,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @returns
    */
   getAsset<T extends cc.Asset>(assetProperty: FW.AssetProperty): T {
-    return this.dataProcessing<T>(this.assetMgr.get(assetProperty)).asset as T;
+    return this.process<T>(this.assetMgr.get(assetProperty)).asset as T;
   }
 
   /**
@@ -141,7 +141,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @param res
    * @returns
    */
-  private dataProcessing<T extends cc.Asset>(res: FW.AssetData) {
+  private process<T extends cc.Asset>(res: FW.AssetData) {
     let asset: cc.Asset;
 
     if (res.asset instanceof cc.Texture2D) {

package/manager/FWTimeManager.ts

@@ -133,46 +133,18 @@ export class FWTimeManager extends FWManager implements FW.TimeManager {
     let cb: () => void;
     let tag: string;
     let target: any;
-    if (arguments.length == 1) {
-      if (typeof arguments[0] === 'number') time = arguments[0];
-      else if (typeof arguments[0] === 'function') cb = arguments[0];
-    } else if (arguments.length == 2) {
-      if (typeof arguments[0] === 'number') {
-        time = arguments[0];
-        if (typeof arguments[1] === 'string') {
-          tag = arguments[1];
-        } else if (typeof arguments[1] === 'object') {
-          cb = arguments[1];
-        } else {
-          target = arguments[1];
-        }
-      } else if (typeof arguments[0] === 'function') {
-        cb = arguments[0];
-        if (typeof arguments[1] === 'string') {
-          tag = arguments[1];
-        } else if (typeof arguments[1] === 'number') {
-          time = arguments[1];
-        } else {
-          target = arguments[1];
-        }
-      }
-    } else if (arguments.length == 3) {
-      if (typeof arguments[0] === 'number') {
-        time = arguments[0];
-        cb = arguments[1];
-        if (typeof arguments[2] === 'string') {
-          tag = arguments[2];
-        } else {
-          target = arguments[2];
-        }
-      } else if (typeof arguments[0] === 'function') {
-        cb = arguments[0];
-        time = arguments[1];
-        if (typeof arguments[2] === 'string') {
-          tag = arguments[2];
-        } else {
-          target = arguments[2];
-        }
+
+    const config: any = {};
+
+    for (const arg of arguments) {
+      if (typeof arg === 'function') {
+        cb = arg;
+      } else if (typeof arg === 'number') {
+        time = arg;
+      } else if (typeof arg === 'string') {
+        tag = arg;
+      } else if (arg) {
+        target = arg;
       }
     }
 

package/package.json

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

package/service/FWService.ts

@@ -1,57 +1,10 @@
-import { FWEventDefine } from '../define/FWEventDefine';
-import FWLog from '../log/FWLog';
+import { FrameworkBase } from '../FrameworkBase';
 
-export default abstract class FWService {
-  constructor() {
-    this.initialize();
-    this.entry.evtMgr.register(FWEventDefine.SystemEvent.SYSTEM_RESTART, this.onDestroy, this);
-  }
-  public entry: FW.Entry = FW.Entry;
+export default abstract class FWService extends FrameworkBase {
   public abstract initialize(): void;
   public abstract onDestroy(): void;
-  public abstract readonly serviceName: string;
-
-  protected async invoke<T>(operation: Promise<T>, operationName: string = 'unknown'): Promise<T> {
-    const startTime = this.getCurrentTime();
-
-    try {
-      const result = await operation;
-      const duration = this.getCurrentTime() - startTime;
-
-      this.recordPerformanceMetric(operationName, duration);
-      return result;
-    } catch (error) {
-      this.handleError(operationName, error);
-      return undefined;
-    }
-  }
-
-  private recordPerformanceMetric(operationName: string, duration: number): void {
-    if (FW.Entry.performanceMgr) {
-      FW.Entry.performanceMgr.recordOperationMetric(this.serviceName, operationName, duration);
-    }
-
-    if (FW.Entry.engineMgr.debug) {
-      const log = duration > 1000 ? FWLog.warn : FWLog.debug;
-      log(`Operation ${operationName} took ${duration}ms`);
-    }
-  }
-
-  protected getCurrentTime(): number {
-    return Date.now();
-  }
-
-  protected handleError(operation: string, error: any): void {
-    const errorInfo = {
-      manager: this.serviceName,
-      operation,
-      error: error?.message || error,
-      stack: error?.stack,
-    };
-
-    FWLog.error(`Manager error in ${this.serviceName}.${operation}:`, errorInfo);
-
-    if (FW.Entry.engineMgr.debug) {
-    }
+  protected onRestart() {
+    this.onDestroy();
+    this.initialize();
   }
 }

package/service/http/FWHttp.ts

@@ -1,9 +1,9 @@
+import { FWSystemConfig } from '../../config/FWSystemConfig';
 import { FWSystemDefine } from '../../define/FWSystemDefine';
 import FWLog from '../../log/FWLog';
 import FWService from '../FWService';
 
 export default class FWHttp extends FWService {
-  public serviceName: string = 'http';
   public initialize(): void {}
   public onDestroy(): void {}
 
@@ -13,7 +13,7 @@ export default class FWHttp extends FWService {
     cb?: (response: string) => void,
     tag?: string,
   ): Promise<string> {
-    return this.dataProcessing(url, params, cb, tag, FWSystemDefine.FWHttpRequestType.GET);
+    return this.process(url, params, cb, tag, FWSystemDefine.FWHttpRequestType.GET);
   }
 
   protected async postMessage(
@@ -22,10 +22,10 @@ export default class FWHttp extends FWService {
     cb?: (response: string) => void,
     tag?: string,
   ): Promise<string> {
-    return this.dataProcessing(url, params, cb, tag, FWSystemDefine.FWHttpRequestType.POST);
+    return this.process(url, params, cb, tag, FWSystemDefine.FWHttpRequestType.POST);
   }
 
-  private async dataProcessing(
+  private async process(
     url: string,
     params: string,
     cb: (response: any) => void,
@@ -47,12 +47,12 @@ export default class FWHttp extends FWService {
 
         xhr.onerror = (err: any) => {
           FWLog.error(err);
-          this.onError(err);
+          this.onError?.(err);
           reject(`http request error:${err}`);
         };
 
         xhr.ontimeout = () => {
-          this.onTimeout();
+          this.onTimeout?.();
           reject(`http request timeout!`);
         };
 
@@ -60,7 +60,7 @@ export default class FWHttp extends FWService {
         xhr.send(params);
       },
       {
-        retryCount: 3,
+        ...FWSystemConfig.PromiseConfig.http,
         retryCondition(error, retryCount) {
           return xhr.readyState != 4 || (xhr.status !== 200 && retryCount < 3);
         },

package/service/socket/FWSocket.ts

@@ -8,7 +8,6 @@ import FWSocketSender from './FWSocketSender';
  * TODO 犹豫socket没有改版暂时已老的cmd字符串映射方式做,后期优化
  */
 export default class FWSocket extends FWService implements FW.Socket {
-  public serviceName: string = 'socket';
   /** 发送心跳时间抽 */
   private sendHeartTimestamp: number;
   /** 接收心跳时间戳 */