keytops-game-framework 1.0.24 → 1.0.26

package/dist/app/module/net/http/HttpNode.d.ts

@@ -43,10 +43,11 @@ type HttpSendParams = {
     jsonReviver?: JsonReviver | JsonReviver[];
 };
 /**
- * Http节点，实现接口简化，request复用池
+ * Http节点，实现接口简化。
+ * Cocos Creator Android Native 的 XMLHttpRequest 复用存在旧回调串包风险，
+ * 因此这里每次请求和每次 retry 都创建新的 HttpRequest。
  */
 export declare class HttpNode {
-    private _pool;
     /**
      * 发送 Get 请求。
      * @param	url				请求的地址。大多数浏览器实施了一个同源安全策略，并且要求这个 URL 与包含脚本的文本具有相同的主机名和端口。

package/dist/app/module/net/http/HttpRequest.d.ts

@@ -36,6 +36,10 @@ export declare class HttpRequest extends EventDispatcher implements IRecoverable
     /**@private */
     protected _url: string;
     protected _jsonReviver: JsonReviver | JsonReviver[];
+    /**@private */
+    protected _requestId: number;
+    /**@private */
+    protected _activeRequestId: number;
     /**
      * 发送 HTTP 请求。
      * @param	url				请求的地址。大多数浏览器实施了一个同源安全策略，并且要求这个 URL 与包含脚本的文本具有相同的主机名和端口。
@@ -46,6 +50,7 @@ export declare class HttpRequest extends EventDispatcher implements IRecoverable
      * @param	jsonRever		(default = null) 请求结果JSON转化特殊处理，参考Json.xxxReviver
      */
     send(url: string, data?: any, method?: string, responseType?: "text" | "json" | "xml" | "arraybuffer", headers?: any[] | null, jsonRever?: JsonReviver | JsonReviver[]): void;
+    protected isCurrentRequest(requestId: number, http: XMLHttpRequest): boolean;
     /**
      * @private
      * 请求进度的侦听处理函数。
@@ -82,7 +87,7 @@ export declare class HttpRequest extends EventDispatcher implements IRecoverable
      * 请求成功完成的处理函数。
      */
     protected complete(): void;
-    protected parseJson(): boolean;
+    protected parseJson(responseText?: string, response?: any): boolean;
     reset(): void;
     destroy(): void;
     /**

package/dist/index.js

@@ -4125,6 +4125,10 @@ class HttpRequest extends EventDispatcher {
         super(...arguments);
         /**@private */
         this._http = new XMLHttpRequest();
+        /**@private */
+        this._requestId = 0;
+        /**@private */
+        this._activeRequestId = 0;
     }
     /**
      * 发送 HTTP 请求。
@@ -4136,6 +4140,12 @@ class HttpRequest extends EventDispatcher {
      * @param	jsonRever		(default = null) 请求结果JSON转化特殊处理，参考Json.xxxReviver
      */
     send(url, data = null, method = "get", responseType = "text", headers = null, jsonRever = null) {
+        const timeout = this._http ? this._http.timeout : 0;
+        this.clear();
+        const requestId = ++this._requestId;
+        this._activeRequestId = requestId;
+        this._http = new XMLHttpRequest();
+        this._http.timeout = timeout;
         this._responseType = responseType;
         this._data = null;
         this._jsonReviver = jsonRever;
@@ -4177,23 +4187,31 @@ class HttpRequest extends EventDispatcher {
             http.dataType = restype;
         }
         http.onerror = function (e) {
-            _this._onError(e);
+            if (_this.isCurrentRequest(requestId, http))
+                _this._onError(e);
         };
         http.onabort = function (e) {
-            _this._onAbort(e);
+            if (_this.isCurrentRequest(requestId, http))
+                _this._onAbort(e);
         };
         http.onprogress = function (e) {
-            _this._onProgress(e);
+            if (_this.isCurrentRequest(requestId, http))
+                _this._onProgress(e);
         };
         http.onload = function (e) {
-            _this._onLoad(e);
+            if (_this.isCurrentRequest(requestId, http))
+                _this._onLoad(e);
         };
         http.ontimeout = function (e) {
-            _this._onTimeout(e);
+            if (_this.isCurrentRequest(requestId, http))
+                _this._onTimeout(e);
         };
         // if(Browser.onBLMiniGame&&Browser.onAndroid&&!data)data={};
         http.send(isJson ? JSON.stringify(data) : data);
     }
+    isCurrentRequest(requestId, http) {
+        return this._activeRequestId === requestId && this._http === http;
+    }
     /**
      * @private
      * 请求进度的侦听处理函数。
@@ -4240,11 +4258,13 @@ class HttpRequest extends EventDispatcher {
      * @param	message 错误信息。
      */
     error(message) {
+        this._activeRequestId = 0;
         this.clear();
         console.error(`[网络请求错误] 地址:${this.url} 错误: ${message}`);
         this.event(HttpRequest.Event.ERROR, message);
     }
     _onTimeout(e) {
+        this._activeRequestId = 0;
         this.clear();
         console.error(`[网络请求错误] 地址:${this.url} 超时`);
         this.event(HttpRequest.Event.TIMEOUT);
@@ -4254,14 +4274,20 @@ class HttpRequest extends EventDispatcher {
      * 请求成功完成的处理函数。
      */
     complete() {
+        var http = this._http;
+        var responseText = http.responseText;
+        var response = http.response;
+        var flag = this.parseJson(responseText, response);
+        var data = this._data;
+        this._activeRequestId = 0;
         this.clear();
-        var flag = this.parseJson();
-        flag && this.event(HttpRequest.Event.COMPLETE, this._data instanceof Array ? [this._data] : this._data);
+        this._data = data;
+        flag && this.event(HttpRequest.Event.COMPLETE, data instanceof Array ? [data] : data);
     }
-    parseJson() {
+    parseJson(responseText = this._http.responseText, response = this._http.response) {
         try {
             if (this._responseType === "json") {
-                this._data = JSON.parse(this._http.responseText, (key, value) => {
+                this._data = JSON.parse(responseText, (key, value) => {
                     if (this._jsonReviver == null) {
                         return value;
                     }
@@ -4278,7 +4304,7 @@ class HttpRequest extends EventDispatcher {
                 });
             }
             else {
-                this._data = this._http.response || this._http.responseText;
+                this._data = response || responseText;
             }
             return true;
         }
@@ -4288,11 +4314,14 @@ class HttpRequest extends EventDispatcher {
         }
     }
     reset() {
-        this.offAllEvent();
+        this.offAll();
+        this._activeRequestId = 0;
         this.clear();
+        this._http = new XMLHttpRequest();
     }
     destroy() {
-        this.offAllEvent();
+        this.offAll();
+        this._activeRequestId = 0;
         this.clear();
     }
     /**
@@ -4330,12 +4359,11 @@ HttpRequest.Event = Event$3;
 HttpRequest._urlEncode = encodeURI;
 
 /**
- * Http节点，实现接口简化，request复用池
+ * Http节点，实现接口简化。
+ * Cocos Creator Android Native 的 XMLHttpRequest 复用存在旧回调串包风险，
+ * 因此这里每次请求和每次 retry 都创建新的 HttpRequest。
  */
 class HttpNode {
-    constructor() {
-        this._pool = new Pool(HttpRequest);
-    }
     /**
      * 发送 Get 请求。
      * @param	url				请求的地址。大多数浏览器实施了一个同源安全策略，并且要求这个 URL 与包含脚本的文本具有相同的主机名和端口。
@@ -4376,35 +4404,52 @@ class HttpNode {
      * @param   onError         (default = null) 请求发生错误时的响应Handler
      */
     send(url, { data = null, method = "get", responseType = "text", headers = null, timeout = 10000, retryTimes = 0, onComplete = null, onProgress = null, onError = null, jsonReviver = null, } = {}) {
-        let sender = this._pool.allocate();
-        sender.timeout = timeout;
-        sender.once(HttpRequest.Event.COMPLETE, this, (e) => {
-            this._pool.recover(sender);
-            if (onComplete) {
-                onComplete.runWith(e);
-                onComplete.clear();
-            }
-        });
-        let _onError = (e) => {
-            if (retryTimes-- > 0) {
-                sender.send(url, data, method, responseType, headers);
-                return;
-            }
-            this._pool.recover(sender);
-            if (onError) {
-                onError.runWith(e);
-                onError.clear();
+        let remainingRetries = retryTimes;
+        const progressCaller = onProgress && onProgress.caller;
+        const progressMethod = onProgress && onProgress.method;
+        const progressArgs = onProgress && onProgress.args;
+        onProgress && onProgress.clear();
+        const sendAttempt = () => {
+            const sender = new HttpRequest();
+            sender.timeout = timeout;
+            sender.once(HttpRequest.Event.COMPLETE, this, (e) => {
+                try {
+                    if (onComplete) {
+                        onComplete.runWith(e);
+                    }
+                }
+                finally {
+                    onComplete && onComplete.clear();
+                    sender.destroy();
+                }
+            });
+            let _onError = (e) => {
+                try {
+                    sender.destroy();
+                    if (remainingRetries-- > 0) {
+                        sendAttempt();
+                        return;
+                    }
+                    if (onError) {
+                        onError.runWith(e);
+                    }
+                }
+                finally {
+                    if (remainingRetries < 0) {
+                        onError && onError.clear();
+                    }
+                }
+            };
+            sender.once(HttpRequest.Event.ERROR, this, _onError);
+            sender.once(HttpRequest.Event.TIMEOUT, this, (e) => {
+                _onError(HttpRequest.Event.TIMEOUT);
+            });
+            if (progressMethod) {
+                sender.on(HttpRequest.Event.PROGRESS, progressCaller, progressMethod, progressArgs);
             }
+            sender.send(url, data, method, responseType, headers, jsonReviver);
         };
-        sender.on(HttpRequest.Event.ERROR, this, _onError);
-        sender.on(HttpRequest.Event.TIMEOUT, this, (e) => {
-            _onError(HttpRequest.Event.TIMEOUT);
-        });
-        if (onProgress) {
-            sender.on(HttpRequest.Event.PROGRESS, onProgress.caller, onProgress.method, onProgress.args);
-            onProgress.clear();
-        }
-        sender.send(url, data, method, responseType, headers, jsonReviver);
+        sendAttempt();
     }
     /**
      * 发送 Post 请求。
@@ -7598,11 +7643,33 @@ let View = View_1 = class View extends cc.Component {
     addView(view, index) {
         view.setControl(this._control);
         view.node.parent = this.node;
-        (view.node.getComponent(cc.UITransform) || view.node.addComponent(cc.UITransform)).priority = index;
+        (view.node.getComponent(cc.UITransform) || view.node.addComponent(cc.UITransform)).priority = index !== null && index !== void 0 ? index : 0;
+        this._sortChildrenByViewPriority();
         viewManager.event("open", view);
         viewManager.reportViewAnalytics("open", view);
         analytics.session.updateSessionDuration();
     }
+    /**
+     * 兼容 UITransform.priority 的旧层级语义，避免不同平台延迟排序导致同级 View 渲染顺序不稳定。
+     */
+    _sortChildrenByViewPriority() {
+        const sortedChildren = this.node.children.map((child, originalSiblingIndex) => {
+            var _a, _b;
+            return {
+                child,
+                originalSiblingIndex,
+                priority: (_b = (_a = child.getComponent(cc.UITransform)) === null || _a === void 0 ? void 0 : _a.priority) !== null && _b !== void 0 ? _b : 0,
+            };
+        }).sort((a, b) => {
+            if (a.priority !== b.priority) {
+                return a.priority - b.priority;
+            }
+            return a.originalSiblingIndex - b.originalSiblingIndex;
+        });
+        sortedChildren.forEach(({ child }, sortedIndex) => {
+            child.setSiblingIndex(sortedIndex);
+        });
+    }
     /**
      * 移除子视图
      * @param view 子视图

package/dist/view/View.d.ts

@@ -62,6 +62,10 @@ export declare class View extends cc.Component implements IView {
      * @param index 视图索引
      */
     addView(view: View, index?: number): void;
+    /**
+     * 兼容 UITransform.priority 的旧层级语义，避免不同平台延迟排序导致同级 View 渲染顺序不稳定。
+     */
+    private _sortChildrenByViewPriority;
     /**
      * 移除子视图
      * @param view 子视图

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "keytops-game-framework",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "description": "cocos creator game framework library",
   "main": "./dist/index.js",
   "module": "./dist/index.js",