@lingxiteam/ebe-utils 0.2.16 → 0.2.17

package/lib/public/src/utils/service/defaultResponseInterceptor.ts

@@ -25,27 +25,85 @@ type InterceptorResponseTypeCtx = {
   hookCtx: Record<string, any>;
 };
 
-type InterceptorResponseType = (url: string, ctx: InterceptorResponseTypeCtx) => any;
+type InterceptorResponseType = (
+  url: string,
+  ctx: InterceptorResponseTypeCtx,
+) => any;
 
-export const defaultResponense: ResponseInterceptor = async (response, options) => {
+export const defaultResponense: ResponseInterceptor = async (
+  response:Response,
+  options:RequestOptionsInit,
+) => {
   const { url } = response;
-  const data = await response.clone().json();
+  const contentType: string = response.headers.get('content-type') || 'text/plain';
+  let data;
+  if(contentType === 'application/json'){
+    data = await response.clone().json();
+  }
   if (url.indexOf('/static') !== -1) {
-    if (typeof data === 'object' && Object.hasOwnProperty.call(data, 'resultCode') && +data.resultCode !== 0) {
+    if (
+      typeof data === 'object' &&
+      Object.hasOwnProperty.call(data, 'resultCode') &&
+      +data.resultCode !== 0
+    ) {
       return Promise.reject(data.resultMsg);
     }
     return data;
   }
 
-  // 下载文件
-  if (Object.prototype.toString.call(data) === '[object Blob]' || url.indexOf('/app/file/download') !== -1) {
+  // responseType指定Blob时直接返回umi-request处理后的data
+  if (Object.prototype.toString.call(data) === '[object Blob]') {
     return data;
   }
 
+  // 如果内容为非json类型并没有配置指定响应内容类型时，根据content-type进行二次处理
+  if (contentType !== 'application/json' && !options.responseType) {
+    // Blob解析
+    if (url.indexOf('/app/file/download') !== -1 || [
+      /^application\/octet-stream/,
+      /^application\/(zip|x-rar-compressed|x-7z-compressed)/,
+      /^application\/vnd\./,
+      /^application\/pdf/,
+      /^application\/msword/,
+      /^image\//,
+      /^audio\//,
+      /^video\//,
+    ].find(regType => regType.test(contentType))) {
+      return response.blob().then((resBlob:any) => {
+        // 从请求头上获取文件名称
+        const disposition = response.headers.get('content-disposition');
+        let fileName: string;
+        if (disposition) {
+          const result = disposition.match(/(?:.*filename\*|filename)=(?:([^'"]*)''|("))([^;]+)\2(?:[;`\n]|$)/);
+          if (result && result[3]) {
+            fileName = decodeURIComponent(result[3].replace(/['"]/g, '').replace(/[+]/g, '%20'));
+          }
+        }
+        // 兼容文件类型服务编排出参字段
+        Object.defineProperty(resBlob, 'fileName', {
+          get() {
+            return fileName;
+          },
+        });
+        Object.defineProperty(resBlob, 'fileContent', {
+          get() {
+            return resBlob;
+          },
+        });
+
+        return resBlob;
+      });
+    }
+  }
   if (data.resultCode === '0') {
     const successData = data.resultData || data.resultObject;
     // 如果resultObject中有错误码抛出异常
-    if (successData && successData.error && typeof successData.status === 'number' && isErrorStatus(successData.status)) {
+    if (
+      successData &&
+      successData.error &&
+      typeof successData.status === 'number' &&
+      isErrorStatus(successData.status)
+    ) {
       // eslint-disable-next-line prefer-promise-reject-errors
       return Promise.reject({ response: successData });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/ebe-utils",
-  "version": "0.2.16",
+  "version": "0.2.17",
   "description": "",
   "keywords": [],
   "author": "",
@@ -19,7 +19,7 @@
     "@babel/types": "^7.12.12",
     "cac": "^6.7.14",
     "fs-extra": "9.x",
-    "@lingxiteam/ebe": "0.2.16"
+    "@lingxiteam/ebe": "0.2.17"
   },
   "publishConfig": {
     "access": "public"