@tmsfe/tms-core 0.0.196 → 0.0.198

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tms-core",
-  "version": "0.0.196",
+  "version": "0.0.198",
   "description": "tms运行时框架",
   "repository": {
     "type": "git",

package/src/encrypt/index.ts

@@ -61,7 +61,8 @@ function proxyWxRequest(): void {
       // 如果用户自定义了dataType或者responseType，则不做处理
       if (dataType || responseType) {
         util.reportFunc(url, traceparent, '用户自定义了dataType和responseType');
-        originalRequestApi.call(this, {
+        // 出行业务请求流式接口时要求必须传responseType，所以这里返回 wx.request 的 requestTask，用于监听流式数据
+        return originalRequestApi.call(this, {
           ...originalOptions,
           success: (res) => {
             encryptUtil.dealEncryptionSwitch(url, traceId, res.header).then((msg) => {
@@ -71,7 +72,6 @@ function proxyWxRequest(): void {
           },
           header: { ...header, Traceparent: traceparent },
         });
-        return;
       }
       // 加密请求数据
       const { data: formatData, header: formatHeader, cryptoKeyInfo } = util

package/src/request.js

@@ -16,17 +16,7 @@ import reporter from './report/index';
 import logger from './logger';
 
 // 微信底层错误重试码 600001-微信cronet组件错误 600003-网络中断 5-接口超时
-export const RETRY_WX_ERRNO_MAP = {
-  600001: {
-    waitTime: 500,
-  },
-  600003: {
-    waitTime: 300,
-  },
-  5: {
-    waitTime: 500,
-  },
-};
+export const RETRY_WX_ERR_NOS = [600001, 600003, 5];
 
 /**
  * 用于序列化需要签名的参数
@@ -201,6 +191,9 @@ export default class Request {
   secretKey = '';
   withAuth = true;
   baseParam = {};
+  enableChunked = false;
+  responseType = '';
+  enableHttp2 = false;
 
   /**
    * Request 构造函数
@@ -218,6 +211,15 @@ export default class Request {
       this.withAuth = !!config.withAuth;
     }
     this.baseParam = config.baseParam || {};
+    if (config.enableChunked) {
+      this.enableChunked = !!config.enableChunked;
+    }
+    if (config.responseType) {
+      this.responseType = config.responseType;
+    }
+    if (config.enableHttp2) {
+      this.enableHttp2 = !!config.enableHttp2;
+    }
   }
 
   /**
@@ -309,6 +311,18 @@ export default class Request {
     return this.createRequestTask(path, param, 'POST', header);
   }
 
+  /**
+   * 发送post方式的请求（返回 wx.request 的 requestTask，用于监听流式数据）
+   * @memberof Request
+   * @param {string} path 请求接口路径
+   * @param {object} param 业务参数
+   * @param {object} header 自定义请求头
+   * @returns {Promise} Promise<WechatMiniprogram.RequestTask>
+   */
+  execPostTask(path, param, header) {
+    return this.createStreamRequestTask(path, param, 'POST', header);
+  }
+
   /**
    * @memberof Request
    * @param {String} path 请求接口路径
@@ -384,6 +398,7 @@ export default class Request {
    * @param {object} header 自定义的请求头
    * @returns {Promise} 接口返回结果
    */
+  // eslint-disable-next-line complexity
   async createRequestTask(path, param = {}, method = 'POST', header = {}) {
     try {
       const res = await this.invokeRequest(path, param, method, header);
@@ -400,18 +415,17 @@ export default class Request {
       return res;
     } catch (err) {
       // 微信系统errno：在重试码白名单内，重试
-      const { retryFlag, retryApiWhiteMap } = wx.tmsFlagMap || {};
+      const { retryFlag, retryApiWhiteMap, requestRetryCount } = wx.tmsFlagMap || {};
       const isWhiteApi = retryApiWhiteMap?.home === 'all' ? true : (retryApiWhiteMap?.home || []).includes(path);
-      const canRetry = errno => RETRY_WX_ERRNO_MAP[errno] && isWhiteApi;
+      const canRetry = errno => RETRY_WX_ERR_NOS.includes(errno) && isWhiteApi;
       if (retryFlag && canRetry(err?.errno)) {
-        const waitTime = RETRY_WX_ERRNO_MAP[err.errno]?.waitTime || 300;
         return await this.handleReTry(path, param, method, header, {
           reportMsg: {
             errno: err.errno,
             errMsg: err.errMsg,
           },
-          // maxRetryCount: 2, // 先立即重试一次，失败再延时重试一次
-          waitTime, // 微信底层错误300ms后重试一次
+          maxRetryCount: requestRetryCount, // 重试次数
+          waitTime: 300, // 微信底层错误300ms后重试一次
           isSuccess: retryRes => !canRetry(retryRes?.errno),
         });
       }
@@ -540,6 +554,33 @@ export default class Request {
       });
     });
   }
+
+  /**
+   * 创建发送请求任务（返回 requestTask，用于流式场景）
+   * 不封装为 Promise，直接返回 wx.request 的 requestTask，便于调用方绑定 onChunkReceived
+   * @memberof Request
+   * @param {string} path 请求接口路径
+   * @param {object} param 业务参数
+   * @param {string} method 请求方法 get/post
+   * @param {object} header 自定义的请求头
+   * @returns {Promise} 返回 wx.request 的 requestTask
+   */
+  async createStreamRequestTask(path, param = {}, method = 'POST', header = {}) {
+    const requestParam = await composeParam(param, this.withAuth, this.baseParam);
+    const data = sign(requestParam, this.secretKey);
+
+    // 返回原始 requestTask，供外部绑定 onChunkReceived
+    const requestTask = wx.request({
+      url: this.makeUrl(path),
+      header,
+      method,
+      data,
+      enableHttp2: this.enableHttp2,
+      enableChunked: this.enableChunked,
+      responseType: this.responseType,
+    });
+    return requestTask;
+  }
 }
 
 /**