@cc-component/cc-core 1.8.8 → 1.9.0

package/assets/core/interface/App.ts

@@ -132,6 +132,7 @@ export class App {
     static OnProgess(param: { open: (param: ISceneParam, finish: () => void) => void, close: (param: ISceneParam) => void, progess: (param: ISceneParam, progress: number, time?: number) => void }) { App.gui.progess = param; }
     static OnWindow(param: { willOpen: (comp: IBundleConfig) => void, open: (comp: IBundleConfig) => void, willClose: (comp: IBundleConfig) => void, close: (comp: IBundleConfig) => void }) { App.gui.window = param; }
     static async Requst<T>(config: IHttpConfig, params?: any, ext?: IExtData): Promise<{ code: number, data: T, msg: string }> { return App.http.Requst<T>(config, params, ext); }
+    static OnReadyState<T>(param: { error: (xhr: XMLHttpRequest, ret: HttpReturn<T>) => void }): void { App.http.OnReadyState<T>(param); }
     /**重置网络配置 */
     static ResetHttpServer(config: EnvironmentConfig) {
         let httpServer = config.httpServer!;

package/assets/core/interface/Interface.ts

@@ -62,6 +62,9 @@ declare global {
     /**=====================================✅✅Http请求======================= */
     /**网络接口 */
     function Requst<T>(config: IHttpConfig, params?: any, ext?: { is_show_alert?: boolean }): Promise<{ code: number, data: T, msg: string }>;
+    /**监听网络失败时数据处理 */
+    function OnReadyState(param: { error: (xhr: XMLHttpRequest, ret: HttpReturn<any>) => void }): void;
+
     /**重置网络配置 */
     function ResetHttpServer(config: EnvironmentConfig)
     /**=====================================✅✅消息发送======================= */

package/assets/core/lib/net/net/HttpManager.ts

@@ -68,6 +68,18 @@ export class HttpManager {
     timeout: number = 10000;
     /**内部使用 */
     param: any;
+
+    /** 自定义请求头信息 */
+    public headers: Map<string, string> = new Map<string, string>();
+
+    /**
+     * 添加自定义请求头信息
+     * @param name  信息名
+     * @param value 信息值
+     */
+    addHeader(name: string, value: string) {
+        this.headers.set(name, value);
+    }
     /**
      * GET请求获取文本格式数据
      * @param name      协议名
@@ -75,9 +87,8 @@ export class HttpManager {
      * @returns HTTP请求返回值
      */
     getText(name: string, params: BodyInit | null = null): Promise<HttpReturn<any>> {
-        let headers: Map<string, string> = new Map();
-        headers.set(HeaderName, HeaderValueText);
-        return this.request(name, params, HttpMethod.GET, HttpResponseType.Text, headers);
+        this.headers.set(HeaderName, HeaderValueText);
+        return this.request(name, params, HttpMethod.GET, HttpResponseType.Text, this.headers);
     }
 
     /**
@@ -87,9 +98,8 @@ export class HttpManager {
      * @returns HTTP请求返回值
      */
     getJson(name: string, params: BodyInit | null = null): Promise<HttpReturn<any>> {
-        let headers: Map<string, string> = new Map();
-        headers.set(HeaderName, HeaderValueJson);
-        return this.request(name, params, HttpMethod.GET, HttpResponseType.Json, headers);
+        this.headers.set(HeaderName, HeaderValueJson);
+        return this.request(name, params, HttpMethod.GET, HttpResponseType.Json, this.headers);
     }
 
     /**
@@ -99,9 +109,8 @@ export class HttpManager {
      * @returns HTTP请求返回值
      */
     postJson(name: string, params: BodyInit | null = null, ext?: IExtData): Promise<HttpReturn<any>> {
-        let headers: Map<string, string> = new Map();
-        headers.set(HeaderName, HeaderValueJson);
-        return this.request(name, params, HttpMethod.POST, HttpResponseType.Json, headers, ext);
+        this.headers.set(HeaderName, HeaderValueJson);
+        return this.request(name, params, HttpMethod.POST, HttpResponseType.Json, this.headers, ext);
     }
 
     /**
@@ -123,10 +132,8 @@ export class HttpManager {
                 pb = null;
             }
 
-            let headers: Map<string, string> = new Map();
-            headers.set(HeaderName, HeaderValuePb);
-
-            let r = await this.request<T>(cmd.toString(), pb, HttpMethod.POST, HttpResponseType.ArrayBuffer, headers);
+            this.headers.set(HeaderName, HeaderValuePb);
+            let r = await this.request<T>(cmd.toString(), pb, HttpMethod.POST, HttpResponseType.ArrayBuffer, this.headers);
             if (r.isSucc) {
                 let u8a = new Uint8Array(r.res as any);
                 let decode = pc[res].decode(u8a);
@@ -246,6 +253,11 @@ export class HttpManager {
 
                     ret.isSucc = true;
                     resolve(ret);
+                } else {
+                    // ret.res = { code: xhr.status, msg: xhr.statusText, data: xhr.response } as any
+                    // ret.isSucc = true;
+                    this.paramReady.error?.(xhr, ret)
+                    resolve(ret);
                 }
             };
 
@@ -254,6 +266,7 @@ export class HttpManager {
                 xhr.send();
             }
             else {
+
                 xhr.send(pss);
             }
         });
@@ -376,4 +389,8 @@ export class HttpManager {
         });
     }
 
+    paramReady: { error: (xhr: XMLHttpRequest, ret: HttpReturn<any>) => void }
+    OnReadyState<T>(param: { error: (xhr: XMLHttpRequest, ret: HttpReturn<any>) => void }): void {
+        this.paramReady = param;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cc-component/cc-core",
-    "version": "1.8.8",
+    "version": "1.9.0",
     "engine": ">=3.8.6",
     "description": "系统组件添加常用扩展方法",
     "main": "index.ts",