@gct-paas/api 0.1.4-test.0 → 0.1.5-dev.1

package/es/service/api-service.d.ts

@@ -101,4 +101,17 @@ export declare class ApiService {
      * @returns {Promise<T>} 请求结果
      */
     protected _head<T = unknown>(method: string, pathParams?: IParams, query?: IParams, data?: IObject, config?: Partial<AxiosRequestConfig>): Promise<T>;
+    /**
+     * 文件上传方法
+     *
+     * @protected
+     * @template T
+     * @param {string} method 请求方法路径
+     * @param {IObject} [pathParams] 路径参数
+     * @param {IParams} [query] 查询参数
+     * @param {Partial<UploadFileData>} [data] 上传数据
+     * @param {Partial<AxiosRequestConfig>} [config] 请求配置
+     * @return {*}  {Promise<T>} 请求结果
+     */
+    protected _upload<T = unknown>(method: string, pathParams?: IObject, query?: IParams, data?: Partial<UploadFileData>, config?: Partial<AxiosRequestConfig>): Promise<T>;
 }

package/es/service/api-service.interface.d.ts

@@ -98,6 +98,12 @@ export interface ApiItem {
      * @type {boolean}
      */
     hasData?: boolean;
+    /**
+     * 是否为文件上传
+     *
+     * @type {boolean}
+     */
+    hasUpload?: boolean;
 }
 /**
  * 接口配置项

package/es/service/api-service.mjs

@@ -16,7 +16,7 @@ export class ApiService {
         if (!(property in api)) {
           const cfg = config.apis.find((item) => item.method === property);
           if (cfg) {
-            const modeFn = `_${cfg.mode}`;
+            const modeFn = cfg.hasUpload ? "_upload" : `_${cfg.mode}`;
             if (cfg.hasPathParams && cfg.hasData && cfg.hasQuery) {
               api[property] = (path, query, data, config2) => {
                 return api[modeFn](cfg.path, path, query, data, config2);
@@ -74,6 +74,10 @@ export class ApiService {
                 );
               };
             }
+          } else {
+            console.warn(
+              `API method ${property} is not defined in the configuration.`
+            );
           }
         }
         return api[property];
@@ -220,4 +224,25 @@ export class ApiService {
       config
     );
   }
+  /**
+   * 文件上传方法
+   *
+   * @protected
+   * @template T
+   * @param {string} method 请求方法路径
+   * @param {IObject} [pathParams] 路径参数
+   * @param {IParams} [query] 查询参数
+   * @param {Partial<UploadFileData>} [data] 上传数据
+   * @param {Partial<AxiosRequestConfig>} [config] 请求配置
+   * @return {*}  {Promise<T>} 请求结果
+   */
+  _upload(method, pathParams, query, data, config) {
+    return HttpUtil.upload(
+      joinPath(this.url, method),
+      pathParams,
+      data,
+      query,
+      config
+    );
+  }
 }

package/es/service/http.util.d.ts

@@ -6,6 +6,13 @@ import type { AxiosInstance, AxiosRequestConfig } from 'axios';
  * @class HttpUtil
  */
 export declare class HttpUtil {
+    /**
+     * Axios 实例，供外部使用和挂载中间件
+     *
+     * @static
+     * @type {AxiosInstance}
+     */
+    static _instance: AxiosInstance;
     /**
      * 挂载中间件
      *

package/es/service/http.util.mjs

@@ -3,6 +3,13 @@ import { ContentTypeEnum } from "./http.enum.mjs";
 import { BackendError } from "./http.error.mjs";
 const instance = axios.create();
 export class HttpUtil {
+  /**
+   * Axios 实例，供外部使用和挂载中间件
+   *
+   * @static
+   * @type {AxiosInstance}
+   */
+  static _instance = instance;
   /**
    * 挂载中间件
    *
@@ -10,7 +17,7 @@ export class HttpUtil {
    * @param {(_axios: AxiosInstance) => void} fn 中间件函数
    */
   static use(fn) {
-    fn(instance);
+    fn(this._instance);
   }
   /**
    * GET 请求方法
@@ -164,7 +171,8 @@ export class HttpUtil {
       headers: {
         "Content-Type": ContentTypeEnum.FORM_DATA,
         ...config.headers
-      }
+      },
+      nativeData: true
     });
   }
   /**

package/es/service/index.mjs

@@ -1,10 +1,12 @@
 import { apiConfig as aPaasConfig } from "../apaas/index.mjs";
 import { apiConfig as platformConfig } from "../platform/index.mjs";
 import { ApiManage } from "./api-manage.mjs";
+import { installHttpUtil } from "./request.client.mjs";
 export const api = {
   apaas: new ApiManage("/gct-apaas/api", aPaasConfig),
   platform: new ApiManage("/gct-platform/api", platformConfig)
 };
+installHttpUtil();
 export {
   ResultEnum,
   RequestEnum,

package/es/service/request.client.d.ts

@@ -0,0 +1,6 @@
+/**
+ * 安装 HTTP 工具类，配置 android 原生适配器和拦截器
+ *
+ * @export
+ */
+export declare function installHttpUtil(): void;

package/es/service/request.client.mjs

@@ -0,0 +1,35 @@
+import { NativeHTTP } from "../utils/index.mjs";
+import { HttpUtil } from "./http.util.mjs";
+export function installHttpUtil() {
+  if (window.location.host !== "appassets.androidplatform.net") {
+    console.debug("\u5F53\u524D\u73AF\u5883\u975E Android\uFF0C\u5DF2\u8DF3\u8FC7 HTTP \u5DE5\u5177\u7C7B\u5B89\u88C5");
+    return;
+  }
+  const nativeAdapter = async (config) => {
+    const response = await NativeHTTP.request(config);
+    return response;
+  };
+  HttpUtil._instance.defaults.adapter = nativeAdapter;
+  const errorHandler = (error) => {
+    if (error?.response?.status === 401) {
+      console.log("\u767B\u5F55\u4FE1\u606F\u5931\u6548\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55");
+    } else {
+      console.log("\u7F51\u7EDC\u5F02\u5E38\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5");
+    }
+    return Promise.reject(error);
+  };
+  HttpUtil._instance.interceptors.request.use((config) => {
+    config.headers["App-Tag"] = "__platform__";
+    return config;
+  }, errorHandler);
+  HttpUtil._instance.interceptors.response.use((response) => {
+    if (response.data.code === 200) {
+      return response.data.data;
+    }
+    const errorMessageMode = response.config?.errorMessageMode;
+    if (errorMessageMode !== "none") {
+      console.log(response.data.message);
+    }
+    return Promise.reject(response.data);
+  }, errorHandler);
+}

package/es/utils/index.d.ts

@@ -1,3 +1,4 @@
+export { NativeHTTP } from './native-http/native-http';
 /**
  * 拼接 URL 路径片段，处理多余的斜杠
  *

package/es/utils/index.mjs

@@ -1,3 +1,4 @@
+export { NativeHTTP } from "./native-http/native-http.mjs";
 import { cloneDeep, isEqual, mergeWith, unionWith } from "lodash-es";
 export function joinPath(...segments) {
   return segments.map((seg, i) => {

package/es/utils/native-http/native-http.d.ts

@@ -0,0 +1,6 @@
+import type { InternalAxiosRequestConfig } from 'axios';
+export declare const NativeHTTP: {
+    request(querydata: InternalAxiosRequestConfig): Promise<unknown>;
+    urlDecode(arg: string): Promise<string>;
+    urlDecodeSync(arg: string): string;
+};

package/es/utils/native-http/native-http.mjs

@@ -0,0 +1,63 @@
+import dsBridge from "dsbridge";
+import qs from "qs";
+export const NativeHTTP = {
+  request(querydata) {
+    const { method, url, timeout, params, headers, data, baseURL } = querydata;
+    const pathparam = "?" + qs.stringify(params);
+    const allurl = (baseURL + url).replace(/([^:])\/\//g, "$1/") + pathparam;
+    console.info(allurl + ">>HTTP", querydata);
+    const startTime = performance.now();
+    return new Promise((resolve, reject) => {
+      dsBridge.call(
+        "HTTP." + method,
+        {
+          url: allurl,
+          timeout,
+          headers,
+          data: data && typeof data === "string" ? JSON.parse(data) : data
+        },
+        function(res) {
+          const nativeData = JSON.parse(res);
+          console.info(
+            allurl + `>>HTTP.response-\u8017\u65F6\uFF1A${performance.now() - startTime}`,
+            nativeData
+          );
+          if (nativeData.code === 0 && nativeData.http_code === 200) {
+            resolve({ ...nativeData, config: querydata });
+          } else {
+            const response = {
+              message: nativeData.message,
+              status: nativeData.http_code
+            };
+            reject({ response, config: querydata });
+          }
+        }
+      );
+    });
+  },
+  urlDecode(arg) {
+    return new Promise((resolve, reject) => {
+      return dsBridge.call("HTTP.urlDecode", arg, function(res) {
+        if (res) {
+          const data = JSON.parse(res);
+          if (data.code === 0) {
+            resolve(data.data);
+            return;
+          }
+        }
+        reject();
+      });
+    });
+  },
+  urlDecodeSync(arg) {
+    if (!arg) return "";
+    const res = dsBridge.call("HTTP.urlDecodeSync", arg);
+    if (res) {
+      const data = JSON.parse(res);
+      if (data.code === 0) {
+        return data.data;
+      }
+    }
+    return "";
+  }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/api",
-  "version": "0.1.4-test.0",
+  "version": "0.1.5-dev.1",
   "description": "paas 平台底包",
   "type": "module",
   "keywords": [
@@ -70,6 +70,7 @@
   },
   "dependencies": {
     "axios": "^1.13.2",
+    "dsbridge": "^3.1.4",
     "lodash-es": "^4.17.23",
     "qs": "^6.14.1"
   },
@@ -79,8 +80,8 @@
   "devDependencies": {
     "@babel/preset-env": "^7.28.6",
     "@commitlint/cli": "^20.3.1",
-    "@gct-paas/build": "^0.1.6-dev.6",
-    "@gct-paas/cli": "^0.1.6-dev.6",
+    "@gct-paas/build": "^0.1.8",
+    "@gct-paas/cli": "^0.1.16",
     "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",