@ives_xxz/framework 2.0.16 → 2.1.0

package/Framework.ts

@@ -174,10 +174,14 @@ export class Framework implements FW.Framework {
         this.container.unbind(this.getKey(data.bundleName, index));
       }
     });
-
     this.removeRegistration(data);
   }
-
+  /**
+   * 获取注册表
+   * @param bundleName
+   * @param tag
+   * @returns
+   */
   private recordRegistration(data: FW.RegisterFramework) {
     const bundleName = data.bundleName;
     if (!this.registeredComponents.has(bundleName)) {
@@ -185,6 +189,9 @@ export class Framework implements FW.Framework {
     }
 
     const registrations = this.registeredComponents.get(bundleName)!;
+
+    if (!registrations) return;
+
     const exists = registrations.some(
       (reg) => reg.logic === data.logic && reg.data === data.data && reg.config === data.config,
     );
@@ -219,7 +226,6 @@ export class Framework implements FW.Framework {
       defaultScope: 'Singleton',
       autoBindInjectable: true,
     });
-
     this.reregisterAllComponents();
   }
 

package/manager/FWAssetManager.ts

@@ -1,5 +1,5 @@
-import { FWSystemConfig } from "../config/FWSystemConfig";
-import { FWManager } from "./FWManager";
+import { FWSystemConfig } from '../config/FWSystemConfig';
+import { FWManager } from './FWManager';
 
 /**
  * 资源数据
@@ -47,7 +47,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
           const img = data.img;
           const ske = data.ske;
           const atlas = data.atlas;
-          const type = bin ? ".bin" : ".txt";
+          const type = bin ? '.bin' : '.txt';
           cc.assetManager.loadAny(
             [
               { url: atlas, ext: type },
@@ -59,38 +59,34 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
               asset.skeletonJson = assets[1];
               asset.atlasText = assets[0];
               asset.textures.push(texture);
-              asset["textureNames"] = [`${img}.png`];
-              asset["_uuid"] = ske;
+              asset['textureNames'] = [`${img}.png`];
+              asset['_uuid'] = ske;
               resolve(asset);
-            }
+            },
           );
-        }, FWSystemConfig.PromiseConfig.loadAsset).promise
+        }, FWSystemConfig.PromiseConfig.loadAsset).promise,
       );
     } catch (e) {
-      FW.Log.error("从远程加载spine动画资源失败!");
+      FW.Log.error('从远程加载spine动画资源失败!');
     }
   }
 
   /** 加载远程资源 */
   async loadRemote<T extends cc.Asset = cc.Asset>(
     url?: string,
-    cb?: (asset: cc.Asset) => void
+    cb?: (asset: cc.Asset) => void,
   ): Promise<T> {
     return await this.invoke(
       FW.Entry.promiseMgr.execute((resolve, reject, signal) => {
-        cc.assetManager.loadRemote(
-          url,
-          { cacheEnabled: true, maxRetryCount: 3 },
-          (err, asset) => {
-            if (err || !asset) {
-              reject(err);
-            }
-            cb?.(asset as T);
-            resolve(asset as T);
+        cc.assetManager.loadRemote(url, { cacheEnabled: true, maxRetryCount: 3 }, (err, asset) => {
+          if (err || !asset) {
+            reject(err);
           }
-        );
+          cb?.(asset as T);
+          resolve(asset as T);
+        });
       }, FWSystemConfig.PromiseConfig.loadAsset).promise,
-      `loadAssets -> ${url}`
+      `loadAssets -> ${url}`,
     );
   }
 
@@ -100,9 +96,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
       return undefined;
     }
 
-    const propertys = Array.isArray(assetProperty)
-      ? assetProperty
-      : [assetProperty];
+    const propertys = Array.isArray(assetProperty) ? assetProperty : [assetProperty];
 
     await Promise.all(
       propertys.map(async (property) => {
@@ -111,19 +105,17 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
         const path = property.path;
         const progress = property.progress;
 
-        if (!bundleName || bundleName === "") {
+        if (!bundleName || bundleName === '') {
           FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
           return undefined;
         }
 
-        if (!path || path === "") {
+        if (!path || path === '') {
           FW.Log.error(`找不到资源路径${path},请检查!`);
           return undefined;
         }
 
-        let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(
-          bundleName
-        );
+        let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(bundleName);
 
         if (!bundle) {
           FW.Log.error(`加载bundle失败,请检查!`);
@@ -135,24 +127,20 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             bundle.preload(
               path,
               type,
-              (
-                finish: number,
-                total: number,
-                item: cc.AssetManager.RequestItem
-              ) => {
+              (finish: number, total: number, item: cc.AssetManager.RequestItem) => {
                 progress?.(finish, total, item);
               },
               (err: Error, item: cc.AssetManager.RequestItem[]) => {
                 if (err || !item || item?.length == 0) {
-                  reject(err || "preload failed!");
+                  reject(err || 'preload failed!');
                 }
                 resolve(item);
-              }
+              },
             );
           }, FWSystemConfig.PromiseConfig.loadAsset).promise,
-          `preLoadAssets -> ${property.path}`
+          `preLoadAssets -> ${property.path}`,
         );
-      })
+      }),
     );
   }
 
@@ -173,19 +161,17 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const progress = assetProperty.progress;
     const autoRelease = assetProperty.autoRelease;
 
-    if (!bundleName || bundleName === "") {
+    if (!bundleName || bundleName === '') {
       FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === "") {
+    if (!path || path === '') {
       FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
 
-    let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(
-      bundleName
-    );
+    let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(bundleName);
 
     if (!bundle) {
       FW.Log.error(`加载bundle失败,请检查!`);
@@ -195,8 +181,12 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
 
     if (this.assetsMap.has(key)) {
       const assetData = this.assetsMap.get(key);
-      assetData.refCount++;
-      return assetData;
+      if (!assetData.asset.loaded) {
+        this.assetsMap.delete(key);
+      } else {
+        assetData.refCount++;
+        return assetData;
+      }
     }
 
     const assetData = new FWAssetData();
@@ -209,11 +199,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
         bundle.load(
           path,
           type,
-          (
-            finish: number,
-            total: number,
-            item: cc.AssetManager.RequestItem
-          ) => {
+          (finish: number, total: number, item: cc.AssetManager.RequestItem) => {
             progress?.(finish, total, item);
           },
           (err: Error, asset: cc.Asset) => {
@@ -223,7 +209,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             }
             assetData.loaded = true;
             assetData.dependentBundle = bundleName;
-            assetData.uuid = asset["_uuid"];
+            assetData.uuid = asset['_uuid'];
             assetData.autoRelease = autoRelease;
             assetData.asset = asset;
             assetData.user = assetProperty.user;
@@ -234,10 +220,10 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
 
             cb?.(assetData);
             resolve(assetData);
-          }
+          },
         );
       }, FWSystemConfig.PromiseConfig.loadAsset).promise,
-      `loadAssets -> ${assetProperty.path}`
+      `loadAssets -> ${assetProperty.path}`,
     );
   }
   /**
@@ -256,19 +242,17 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const cb = assetProperty.cb;
     const autoRelease = assetProperty.autoRelease;
 
-    if (!bundleName || bundleName === "") {
+    if (!bundleName || bundleName === '') {
       FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === "") {
+    if (!path || path === '') {
       FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
 
-    const bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(
-      bundleName
-    );
+    const bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(bundleName);
 
     if (!bundle) {
       FW.Log.error(`加载bundle失败,请检查!`);
@@ -278,7 +262,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     return new Promise(
       (
         resolve: (value: FW.AssetData[] | PromiseLike<FW.AssetData[]>) => void,
-        reject: (reason?: any) => void
+        reject: (reason?: any) => void,
       ) => {
         bundle.loadDir(path, type, (err: Error, assets: cc.Asset[]) => {
           if (err || assets.length === 0) {
@@ -292,7 +276,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             const assetData = new FWAssetData();
             assetData.loaded = true;
             assetData.dependentBundle = bundleName;
-            assetData.uuid = asset["_uuid"];
+            assetData.uuid = asset['_uuid'];
             assetData.autoRelease = autoRelease;
             assetData.asset = asset;
             assetData.type = type;
@@ -301,7 +285,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             const key = `${this.createAssetMapKey({
               bundle: bundleName,
               path: path,
-            })}/${asset.name}${type ? `_${type?.name}` : ""}`;
+            })}/${asset.name}${type ? `_${type?.name}` : ''}`;
 
             this.assetsMap.set(key, assetData);
 
@@ -311,7 +295,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
           cb?.(assetDataList);
           resolve(assetDataList);
         });
-      }
+      },
     );
   }
 
@@ -328,18 +312,18 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const bundleName = assetProperty.bundle || FW.Entry.bundleName;
     const path = assetProperty.path;
 
-    if (!bundleName || bundleName === "") {
+    if (!bundleName || bundleName === '') {
       FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === "") {
+    if (!path || path === '') {
       FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
 
     if (!this.has(assetProperty)) {
-      FW.Log.error("获取资源失败,请先加载!");
+      FW.Log.error('获取资源失败,请先加载!');
       return undefined;
     }
 
@@ -363,12 +347,12 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const path = assetProperty.path;
     const autoRelease = assetProperty.autoRelease;
 
-    if (!bundleName || bundleName === "") {
+    if (!bundleName || bundleName === '') {
       FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === "") {
+    if (!path || path === '') {
       FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }

package/manager/FWSocketManager.ts

@@ -22,10 +22,10 @@ export default class FWSocketManager extends FWManager implements FW.SocketManag
   async createSocket(
     tag: string,
     address: string,
-    sender: FW.SocketSender,
-    handle: FW.SocketHandle,
+    sender: FW.Sender,
+    handle: FW.Handle,
     config: FW.SocketConfig,
-  ) {
+  ): Promise<FW.Socket> {
     const proxy = new FWSocket().createSocket(address, tag, sender, handle, {
       heartTimeout: config.heartTimeout,
       heartWeakTime: config.heartWeakTime,

package/package.json

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

package/service/socket/FWSocket.ts

@@ -137,7 +137,7 @@ export default class FWSocket extends FW.Service implements FW.Socket {
 
   public onDestroy(): void {
     this.messageEvents = cc.js.createMap();
-    this.socket.close();
+    this.socket?.close();
     this.socket = null;
   }
 

package/service/socket/mock/FWSocketMock.ts

@@ -168,10 +168,12 @@ class WebSocketMockServer {
 export class FWSocketMock {
   private isInitialized = false;
 
-  start(mockResponses: {}): void {
-    if (this.isInitialized) return;
-
+  updateMockResponses(mockResponses: {}) {
     WebSocketMockServer.getInstance().mockResponses = mockResponses;
+  }
+
+  start(): void {
+    if (this.isInitialized) return;
 
     const OriginalWebSocket = window.WebSocket;