@ives_xxz/framework 1.0.7 → 1.0.9

package/FW.d.ts

@@ -748,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 = {

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}!`);

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;
@@ -11,6 +13,7 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
 
   setListener(listener: FW.HotUpdateListener): void {
     this.listener = listener;
+    FWLog.debug('热更新监听设置');
   }
 
   public update(localManifest: cc.Asset) {
@@ -18,7 +21,9 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
       FWLog.error('没有找到本地Manifest文件!');
       return;
     }
+    FWLog.debug('开始热更新流程');
     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;
@@ -35,6 +40,7 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
   }
 
   private versionCompareHandle(currentVersion: string, newVersion: string): number {
+    FWLog.debug('版本比较', currentVersion, newVersion);
     this.listener.versionCompareHandle(currentVersion, newVersion);
     var vA = currentVersion.split('.');
     var vB = newVersion.split('.');
@@ -63,12 +69,16 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
   }
 
   private checkHotUpdate() {
+    FWLog.debug('checkHotUpdate1', this.isUpdate);
     if (this.isUpdate) {
       return;
     }
+    FWLog.debug('checkHotUpdate2', this.assetMgr.getState() === jsb.AssetsManager.State.UNINITED);
     if (this.assetMgr.getState() === jsb.AssetsManager.State.UNINITED) {
       this.assetMgr.loadLocalManifest(this.localManifest.nativeUrl);
     }
+    FWLog.debug('checkHotUpdate3', this.assetMgr.getLocalManifest());
+    FWLog.debug('checkHotUpdate4', this.assetMgr.getLocalManifest().isLoaded());
     if (!this.assetMgr.getLocalManifest() || !this.assetMgr.getLocalManifest().isLoaded()) {
       return;
     }
@@ -208,6 +218,6 @@ export default class FWHotUpdateManager extends FWManager implements FW.HotUpdat
     return `${size.toFixed(size < 10 ? 2 : 1)} ${units[unitIndex]}`;
   }
 
-  public initialize(): void {}
-  public onDestroy(): void {}
+  public initialize(): void { }
+  public onDestroy(): void { }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ives_xxz/framework",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
   "keywords": [
@@ -8,4 +8,4 @@
   ],
   "author": "ives",
   "license": "ISC"
-}
+}

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(
       () => {