@ives_xxz/framework 2.0.15 → 2.0.17

package/Framework.ts

@@ -219,7 +219,6 @@ export class Framework implements FW.Framework {
       defaultScope: 'Singleton',
       autoBindInjectable: true,
     });
-
     this.reregisterAllComponents();
   }
 

package/manager/FWPromiseManager.ts

@@ -1,11 +1,11 @@
 import { FWManager } from './FWManager';
 
 export default class FWPromiseManager extends FWManager implements FW.PromiseManager {
-  private promiseRegistry: Map<number, FW.PromiseProxy>;
+  private promiseRegistry: Map<number, FW.PromiseProxy<any>>;
   private uniqueId: number = 0;
 
   public initialize(): void {
-    this.promiseRegistry = new Map<number, FW.PromiseProxy>();
+    this.promiseRegistry = new Map<number, FW.PromiseProxy<any>>();
   }
 
   public onDestroy(): void {
@@ -129,7 +129,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
   public all<T = any>(
     promises: FW.PromiseProxy<T>[],
     options: FW.PromiseExecuteOptions = {},
-  ): FW.PromiseProxy<FW.PromiseResult<T>> {
+  ): FW.PromiseProxy<FW.PromiseAllResult<T>> {
     const id = this.uniqueId++;
     const abortController = new AbortController();
     const maxRetryTimes = options.retryCount || 0;
@@ -137,8 +137,8 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
     let timerSchedule: FW.TimerSchedule;
     let retryCount = 0;
 
-    const createPromise = (): Promise<FW.PromiseResult<T>> => {
-      return new Promise<FW.PromiseResult<T>>((resolve, reject) => {
+    const createPromise = (): Promise<FW.PromiseAllResult<T>> => {
+      return new Promise<FW.PromiseAllResult<T>>((resolve, reject) => {
         if (options.timeout && options.timeout > 0) {
           timerSchedule?.unSchedule();
           timerSchedule = FW.Entry.timeMgr.scheduleOnce(() => {
@@ -178,8 +178,8 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
 
         abortController.signal.addEventListener('abort', onAbort);
 
-        const processAll = async () => {
-          const result: FW.PromiseResult<T> = {
+        const processAll = async (): Promise<FW.PromiseAllResult<T>> => {
+          const result: FW.PromiseAllResult<T> = {
             success: [],
             failed: [],
             cancelled: [],
@@ -187,21 +187,24 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
 
           for (const promiseProxy of promises) {
             if (abortController.signal.aborted) {
-              result.cancelled.push(
-                ...promises
-                  .map((p) => p.id)
-                  .filter(
-                    (id) =>
-                      !result.success.some((s) => s.id === id) &&
-                      !result.failed.some((f) => f.id === id),
-                  ),
-              );
+              // 找出所有尚未处理的任务标记为取消
+              const remainingIds = promises
+                .filter(
+                  (p) =>
+                    !result.success.some((s) => s.id === p.id) &&
+                    !result.failed.some((f) => f.id === p.id),
+                )
+                .map((p) => p.id);
+              result.cancelled.push(...remainingIds);
               break;
             }
 
             try {
               const value = await promiseProxy.promise;
-              result.success.push(value);
+              result.success.push({
+                id: promiseProxy.id,
+                value: value,
+              });
             } catch (error) {
               if (promiseProxy.status === FW.SystemDefine.FWPromiseStatus.CANCELLED) {
                 result.cancelled.push(promiseProxy.id);
@@ -256,7 +259,7 @@ export default class FWPromiseManager extends FWManager implements FW.PromiseMan
     };
 
     const promise = createPromise();
-    const promiseProxy: FW.PromiseProxy<FW.PromiseResult<T>> = {
+    const promiseProxy: FW.PromiseProxy<FW.PromiseAllResult<T>> = {
       id,
       promise,
       status: FW.SystemDefine.FWPromiseStatus.PENDING,

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.15",
+  "version": "2.0.17",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
   "keywords": ["123456"],

package/types/FW.d.ts

@@ -1837,11 +1837,9 @@ declare namespace FW {
     retryCondition?: (error: any, retryCount: number) => boolean;
   };
 
-  type Promise = (resolve: (value: any) => void, reject: (reason?: any) => void) => void;
-
-  type PromiseResult<T = any> = {
-    success: PromiseProxy<T>[];
-    failed: { id: number; reason: any }[];
+  type PromiseAllResult<T = any> = {
+    success: Array<{ id: number; value: T }>;
+    failed: Array<{ id: number; reason: any }>;
     cancelled: number[];
   };
 
@@ -2301,12 +2299,12 @@ declare namespace FW {
     initialize?();
     onDestroy?();
     onWeakNetWork?(): void;
-    abstract onMessage(msg: any): void;
     onHeart?(msg: any): Promise<boolean>;
     onClose?(): void;
     onOpen?(): void;
     onError?(msg: any): void;
     onTimeout?(): void;
+    abstract onMessage(msg: any): void;
     abstract getProtocolKey?(msg: any): string;
     abstract onBeforeReceivingMessage?(msg: any): Promise<FW.SocketMessage>;
   }
@@ -2317,7 +2315,8 @@ declare namespace FW {
     public abstract initialize(): void;
     public abstract onDestroy(): void;
   }
-  export class Http extends FWService {
+
+  export class Http extends Service {
     public initialize() {}
     public onDestroy(): void {}
 
@@ -2342,7 +2341,6 @@ declare namespace FW {
 
 declare namespace FW {
   export class SocketMock {
-    static createMockData<T>(msgId: string, data: T);
     public static start(mockResponses: {}): void;
     public static stop(): void;
   }