feat: parse error for multiapi

Author: Boelroy

packages/console-utils/xconsole-service/src/interceptors/armsInterceptor/response.ts

@@ -2,6 +2,53 @@ import URLSearchParams from '@ungap/url-search-params';
 import { IResponse, IResponseData } from '../../types';
 import logger from '../../utils/logger';
 
+const logArmsForMultiApi = ({targetUrl, traceId, startTime, duration, success, code, msg}, response: IResponse<IResponseData>) => {
+  let api = targetUrl;
+  const { config, data } = response;
+  const { data: dataStr } = config;
+  const requestData = new URLSearchParams(dataStr);
+  try {
+    const actions: { action: string }[] = JSON.parse(
+      requestData.get('actions') || '[]'
+    );
+    let apiIdentifier = '';
+    const actionSet: any = {};
+    for (const item of actions) {
+      if (!actionSet[item.action]) {
+        actionSet[item.action] = 1;
+      }
+    }
+    apiIdentifier = Object.keys(actionSet).join(',');
+    api = `${targetUrl}?product=${requestData.get(
+      'product'
+    )}&action=${apiIdentifier}`;
+  } catch (err) {
+    api = targetUrl;
+  }
+
+  // 如果是 mutiapi 一起失败了, 直接上报
+  if (!success) {
+    logger({ api, success, duration, code, msg, startTime, traceId });
+  } else {
+    const responseData = (data?.data || {});
+    Object.keys(responseData).forEach((key) => {
+      const respForSingleApi = responseData[key];
+      if (respForSingleApi.Code && respForSingleApi.Code !== '200') {
+        const apiWithIdentifier = `${api}&identifier=${key}&requestId=${respForSingleApi.RequestId}`;
+        console.log({
+          api: apiWithIdentifier, success: false, duration, code: respForSingleApi.Code,
+          msg: respForSingleApi?.Message, startTime, traceId
+        })
+        logger({ 
+          api: apiWithIdentifier, success: false, duration, code: respForSingleApi.Code,
+          msg: respForSingleApi?.Message, startTime, traceId
+        });
+      }
+    })
+  }
+}
+
+
 function armsResponseInterceptor(
   response: IResponse<IResponseData>
 ): IResponse<IResponseData> {
@@ -40,40 +87,30 @@ function armsResponseInterceptor(
   const [targetUrl, targetApiType] = matches;
   let api = targetUrl;
   if (targetApiType.includes('multi')) {
-    try {
-      const actions: { action: string }[] = JSON.parse(
-        requestData.get('actions') || '[]'
-      );
-      let apiIdentifier = '';
-      const actionSet: any = {};
-      for (const item of actions) {
-        if (!actionSet[item.action]) {
-          actionSet[item.action] = 1;
-        }
-      }
-      apiIdentifier = Object.keys(actionSet).join(',');
-      api = `${targetUrl}?product=${requestData.get(
-        'product'
-      )}&action=${apiIdentifier}`;
-    } catch (err) {
-      api = targetUrl;
-    }
+    logArmsForMultiApi({
+      targetUrl,
+      success: isSuccess,
+      duration,
+      code: apiCode,
+      msg,
+      startTime,
+      traceId,
+    }, response)
   } else {
     api = `${targetUrl}?product=${requestData.get(
       'product'
     )}&action=${requestData.get('action')}`;
+    logger({
+      api,
+      success: isSuccess,
+      duration,
+      code: apiCode,
+      msg,
+      startTime,
+      traceId,
+    });
   }
 
-  logger({
-    api,
-    success: isSuccess,
-    duration,
-    code: apiCode,
-    msg,
-    startTime,
-    traceId,
-  });
-
   return response;
 }
 

packages/console-utils/xconsole-service/stories/index.stories.tsx

@@ -3,7 +3,7 @@ import { select, withKnobs } from '@storybook/addon-knobs';
 // import withAxiosDecorator from 'storybook-axios';
 import { storiesOf } from '@storybook/react';
 import { createService, useOpenApi, useRoaApi, defaultAxiosRequest } from '../src/index'
-import { getOssDownloadUrl, genOssUploadSignature } from '../src/oss/index'
+import { getOssDownloadUrl } from '../src/oss/index'
 import { ApiType } from '../src/const';
 import '@alicloud/console-components/dist/wind.css'
 
@@ -12,6 +12,10 @@ defaultAxiosRequest.interceptors.request.handlers.unshift({
   fulfilled: (config) => {
     config.baseURL = 'https://oneapi.alibaba-inc.com/mock/oneconsole';
     config.method = 'GET'
+    if(config.url.indexOf('multiApi.json')) {
+      config.url = config.url.replace(/multiApi.json/, 'api.json')
+      config.url = config.url.replace(/action=undefined/, 'action=DescribeMultiApi')
+    }
     return config;
   }
 });

packages/console-utils/xconsole-service/stories/multiApi.stories.tsx

@@ -15,7 +15,7 @@ storiesOf('XConsole Mulit Api', module)
   .add('createService', () => {
     useEffect(() => {
       try {
-        createService('slb')(actions)
+        createService('consoledemo')(actions)
       } catch(e) {
         console.log(e)
       }