@tmsfe/tms-core 0.0.156 → 0.0.158

package/package.json

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

package/src/encrypt/encrypt-util.ts

@@ -149,6 +149,7 @@ const eccUtil = {
     return eccUtil._privateKeyInfo;
   },
   // 解析gwCode
+  /* eslint-disable complexity */
   resolveGwCode: async (codeStr: string): Promise<{ retry: boolean, success: boolean }> => {
     if (!codeStr) return { retry: false, success: true };
     const code = parseInt(codeStr, 10);
@@ -166,10 +167,17 @@ const eccUtil = {
       }
       case 11307:  // 加密未开启
         return { retry: false, success: false };
-      default:
+      case 11301:
+      case 11302:
+      case 11303:
+      case 11304:
+      case 11308:
         return { retry: false, success: false };
+      default:     // 其他网关错误码
+        return { retry: false, success: true };
     }
   },
+  /* eslint-enable complexity */
   execEncrypt: (input: string, ignoreNull = false): BaseResp<{
     cryptoKeyInfo: CryptoKeyInfo,
     encryptedContent: any } | null> => {
@@ -380,7 +388,12 @@ const resDecrypt = async (header, data, cryptoKeyInfo: CryptoKeyInfo): Promise<B
       'content-type': contentType,                            // 响应内容类型
     } = formatHeader;
     if (!encryptResponseMode || encryptResponseMode === '0') { // 不需要解密，直接返回
-      return new baseUtil.BaseRespFac({ header, data, retry: false });
+      const dataStr = base64Util.encodeUTF8(new Uint8Array(data));
+      return new baseUtil.BaseRespFac({
+        header,
+        data: JSON.parse(dataStr),
+        retry: false,
+      });
     }
     const { retry, success: gwSuccess } = await eccUtil.resolveGwCode(gatewayCode);
     if (!gwSuccess) {

package/src/encrypt/index.ts

@@ -87,7 +87,8 @@ function proxyWxRequest(): void {
         return;
       }
       // 加密请求数据
-      const { data: formatData, header: formatHeader, msg, cryptoKeyInfo } = util.reqEncrypt({ url, method, data, header });
+      const { data: formatData, header: formatHeader, msg, cryptoKeyInfo } = util
+        .reqEncrypt({ url, method, data, header });
       if (!cryptoKeyInfo) {
         // 如果没有加密信息，则不走加密
         util.logInfo(url, traceparent, msg);
@@ -103,8 +104,9 @@ function proxyWxRequest(): void {
       }
 
       let completeResolver;
-      const completePromp = new Promise(resolve => { completeResolver = resolve; });
-
+      const completePromp = new Promise((resolve) => {
+        completeResolver = resolve;
+      });
       originalRequestApi.call(this, {
         ...originalOptions,
         data: formatData,
@@ -116,6 +118,7 @@ function proxyWxRequest(): void {
           const { success: resSuccess, msg, res } = await encryptUtil.resDecrypt(resHeader, resData, cryptoKeyInfo);
           if (resSuccess) {
             util.logInfo(url, traceparent, '解密成功');
+            encryptUtil.dealEncryptionSwitch(url, resHeader);
             success?.call(this, res);
             const completeRes: any = await completePromp;
             completeRes.header = resHeader;