@ives_xxz/framework 1.0.6 → 1.0.8

package/FW.d.ts

@@ -661,6 +661,10 @@ declare namespace FW {
      * 资源引用计数
      */
     refCount: number;
+    /**
+     * 资源属性
+     */
+    assetProperty: AssetProperty;
   };
 
   type ResManager = {
@@ -744,12 +748,17 @@ declare namespace FW {
      * @param assetProperty
      */
     hasAsset(assetProperty: AssetProperty): boolean;
+    /**
+     * 初始化远程包配置
+     * @param config
+     */
+    initializeRemoteBundleConfig(config: RemoteBundleConfig): void;
   };
 
   type RemoteBundleConfig = {
     bundleName: string;
     url: string;
-    hash: string;
+    version: string;
   };
 
   type BundleManager = {
@@ -881,13 +890,13 @@ declare namespace FW {
      */
     load(assetProperty: AssetProperty): Promise<AssetData>;
 
-    loadDir(assetProperty: FW.AssetProperty): Promise<FW.AssetData[]>;
+    loadDir(assetProperty: AssetProperty): Promise<FW.AssetData[]>;
 
     /**
      * 获取资源
      * @param asset
      */
-    get(assetProperty: FW.AssetProperty): AssetData;
+    get(assetProperty: AssetProperty): AssetData;
 
     /**
      * 释放资源

package/manager/FWAssetManager.ts

@@ -15,6 +15,7 @@ class FWAssetData implements FW.AssetData {
   loaded: boolean;
   autoRelease: boolean;
   refCount: number;
+  assetProperty: FW.AssetProperty;
 }
 
 export class FWAssetManager extends FWManager implements FW.AssetManager {
@@ -152,6 +153,8 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             assetData.asset = asset;
             assetData.user = assetProperty.user;
             assetData.refCount = 1;
+            assetData.assetProperty = assetProperty;
+
             self.assetsMap.set(key, assetData);
 
             cb?.(assetData);
@@ -216,6 +219,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             assetData.autoRelease = autoRelease;
             assetData.asset = asset;
             assetData.type = type;
+            assetData.assetProperty = assetProperty;
 
             const key = `${this.createAssetMapKey({
               bundle: bundleName,
@@ -293,7 +297,6 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     }
 
     if (!this.has(assetProperty)) {
-      FWLog.error('获取资源失败,请先加载!');
       return undefined;
     }
     const key = this.createAssetMapKey(assetProperty);
@@ -344,6 +347,9 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
   }
 
   public onDestroy(): void {
+    this.assetsMap.forEach((v) => {
+      this.release(v.assetProperty);
+    });
     this.assetsMap.clear();
   }
 }

package/manager/FWBundleManager.ts

@@ -38,10 +38,9 @@ export class FWBundleManager extends FWManager implements FW.BundleManager {
         const remote = this.remoteBundleConfigMap.get(bundleName);
         const url = remote ? remote.url : '';
         const path = `${url}${bundleName}`;
-
         cc.assetManager.loadBundle(
           path,
-          { version: this.remoteBundleConfigMap.get(bundleName) || '' },
+          { version: this.remoteBundleConfigMap.get(bundleName)?.version || '' },
           (err: Error, bundle: cc.AssetManager.Bundle) => {
             if (err || !bundle) {
               FWLog.error(`"加载bundle失败:"${bundleName}!`);
@@ -86,6 +85,9 @@ export class FWBundleManager extends FWManager implements FW.BundleManager {
   }
 
   public onDestroy(): void {
+    this.bundleMap.forEach((bundle) => {
+      this.release(bundle.name);
+    });
     this.bundleMap.clear();
   }
 }

package/manager/FWHotUpdateManager.ts

@@ -1,6 +1,8 @@
 import FWLog from '../log/FWLog';
 import { FWManager } from './FWManager';
 
+const TEMOTE_ASSET = 'remote-asset';
+
 export default class FWHotUpdateManager extends FWManager implements FW.HotUpdateManager {
   private listener: FW.HotUpdateListener;
   private assetMgr: any;
@@ -19,6 +21,7 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
       return;
     }
     this.localManifest = localManifest;
+    this.storePath = `${jsb.fileUtils ? jsb.fileUtils.getWritablePath() : '/'}${TEMOTE_ASSET}`;
     this.assetMgr = new jsb.AssetsManager('', this.storePath, this.versionCompareHandle);
     this.assetMgr.setVerifyCallback(function (path: string, asset: any) {
       const compressed = asset.compressed;

package/manager/FWResManager.ts

@@ -161,6 +161,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
       autoRelease: res.autoRelease,
       loaded: res.loaded,
       refCount: res.refCount,
+      assetProperty: res.assetProperty,
     };
   }
 

package/package.json

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

package/service/socket/FWSocket.ts

@@ -60,6 +60,7 @@ export default class FWSocket implements FW.Socket {
     this.messageEvents = cc.js.createMap();
     this.protocolContainer = new Map<Symbol, string>();
     this.protocolRegistry = new Map<string, Set<Symbol>>();
+    this.reconnectTimes = 0;
   }
 
   createSocket(
@@ -80,7 +81,7 @@ export default class FWSocket implements FW.Socket {
     this.isReconnect = true;
     this.sendHeartTimestamp = 0;
     this.receiveTimeStamp = new Date().getTime();
-
+    FWLog.debug('创建socket -> ', address);
     this.socket = new WebSocket(address);
     this.socket.onopen = this.onSocketOpen.bind(this);
     this.socket.onclose = this.onSocketClose.bind(this);
@@ -248,6 +249,7 @@ export default class FWSocket implements FW.Socket {
 
   /** socket关闭 */
   private onSocketClose() {
+    FWLog.debug('on close!');
     this.handle?.onClose?.();
     FW.Entry.timeMgr.scheduleOnce(
       () => {

package/utils/FWTask.ts

@@ -47,7 +47,6 @@ export default class FWTask implements FW.Task {
       taskId,
     });
     this.taskStartTime = FW.Entry.timeMgr.getTime();
-    FWLog.debug('执行任务开始', this.taskStartTime);
     await this.executeFrame();
     return this;
   }
@@ -119,45 +118,32 @@ export default class FWTask implements FW.Task {
       performance.now() - frameStart < this.frameBudget
     ) {
       const task = this.taskQueue[0];
+
       const taskId = (task as any).taskId || `id-${processed}`;
 
-      try {
-        const result = await task.next();
-
-        if (result.done) {
-          this.taskQueue.shift();
-          this.recordEvent({
-            type: FWEventDefine.TaskEvent.COMPLETE,
-            progress: 1,
-            message: '任务完成',
-            taskId,
-          });
-        } else if (result.value) {
-          this.recordEvent({
-            ...result.value,
-            taskId,
-          });
-        }
-
-        frameTasks.push({
-          taskId: taskId,
-          result: result.done ? FWEventDefine.TaskEvent.COMPLETE : FWEventDefine.TaskEvent.YIELDED,
-          message: (result?.value as any)?.message,
-        });
-      } catch (error) {
-        FWLog.error('执行任务出错', error);
+      const result = await task.next();
+
+      if (result.done) {
         this.taskQueue.shift();
         this.recordEvent({
-          type: FWEventDefine.TaskEvent.ERROR,
-          message: `任务执行出错: ${error.message}`,
+          type: FWEventDefine.TaskEvent.COMPLETE,
+          progress: 1,
+          message: '任务完成',
           taskId,
         });
-        frameTasks.push({
-          taskId: taskId,
-          result: FWEventDefine.TaskEvent.ERROR,
-          message: error.message,
+      } else if (result.value) {
+        this.recordEvent({
+          ...result.value,
+          taskId,
         });
       }
+
+      frameTasks.push({
+        taskId: taskId,
+        result: result.done ? FWEventDefine.TaskEvent.COMPLETE : FWEventDefine.TaskEvent.YIELDED,
+        message: (result?.value as any)?.message,
+      });
+
       processed++;
     }