@aliyun-obv/api 4.7.2 → 4.7.4

package/dist/api.d.ts

@@ -122,6 +122,36 @@ declare const sseClient: (api: string, params: Record<string, any>, options: Iss
 declare function showAlertDialog(response: any, config?: ShowConfig, request?: any, extra?: any): boolean;
 declare function showAlertDialogWhenNeedLogin(response: any, config?: {}): void;
 
+interface IErrorDetailsAuth {
+    type?: string;
+    action?: string;
+    resource?: string;
+    userType?: string;
+    userName?: string;
+    userId?: string;
+    policyType?: string;
+    diagnosisInfo?: string;
+}
+interface IErrorInfo {
+    title: string;
+    message: string;
+    code: string;
+    requestId: string;
+    detailsAuth?: IErrorDetailsAuth;
+    details?: {
+        ACTION?: string;
+        RESOURCE?: string;
+    };
+    /** 是否需要登录 */
+    needLogin?: boolean;
+}
+/**
+ * 从 response 中提取错误信息，参考 showConsoleBaseAlertDialog 和 showNeedLoginDialog 的实现逻辑
+ * @param response easyFetch 返回体
+ * @returns 包含 title, message, code, requestId 等的错误信息对象，如果 response 为空或 code 为 200 则返回 null
+ */
+declare function extractErrorInfo(response: any): IErrorInfo | null;
+
 declare namespace metaService {
     export interface GetMetaRecordParameters {
         name: string;
@@ -354,4 +384,4 @@ declare namespace dashbordService {
 
 declare function getConsoleDomain(isObv?: boolean): any;
 
-export { IResponseData, commonEasyFetch, dashbordService, diamondService, getConsoleDomain, indexService, metaService, obsEasyFetch, projectService, showAlertDialog, showAlertDialogWhenNeedLogin, slsEasyFetch, sseClient, workSpaceService };
+export { IResponseData, commonEasyFetch, dashbordService, diamondService, extractErrorInfo, getConsoleDomain, indexService, metaService, obsEasyFetch, projectService, showAlertDialog, showAlertDialogWhenNeedLogin, slsEasyFetch, sseClient, workSpaceService };

package/dist/api.es.js

@@ -96,6 +96,16 @@ class BaseFetch {
         params.region = re[1];
       }
     }
+    if (params.region == null) {
+      try {
+        const url2 = new URL(window.location.href);
+        const defaultRegion = url2.searchParams.get("__default_region__");
+        if (defaultRegion) {
+          params.region = defaultRegion;
+        }
+      } catch (_e) {
+      }
+    }
     let url = api;
     let newInit = init;
     if (hasBaseURL && !(url.startsWith("http:") || url.startsWith("https:"))) {
@@ -340,7 +350,7 @@ function getConfig(key) {
   window.ALIYUN_SLS_CONSOLE_CONFIG = window.ALIYUN_SLS_CONSOLE_CONFIG || {};
   return window.ALIYUN_SLS_CONSOLE_CONFIG[key] !== void 0 ? window.ALIYUN_SLS_CONSOLE_CONFIG[key] : "";
 }
-function extraActionAndResource(message) {
+function extraActionAndResource$1(message) {
   var _a;
   const arr = (_a = message.match(/denied by sts or ram[\S\s]+action:\s(\S+:\S+),[\S\s]+resource:\s(\S+)/)) != null ? _a : [];
   if (arr.length === 3) {
@@ -355,7 +365,7 @@ function extraActionAndResource(message) {
     };
   }
 }
-function convertErrorDetaisAuth(o) {
+function convertErrorDetaisAuth$1(o) {
   if (!o) {
     return;
   }
@@ -503,7 +513,7 @@ var __spreadValues$4 = (a, b) => {
   return a;
 };
 var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
-const ERROR_TITLE = i18n.ERROR;
+const ERROR_TITLE$1 = i18n.ERROR;
 i18n.OK;
 let isGlobalAlertShow = false;
 function showConsoleBaseAlertDialog(response, config = {}, request, extra = {}) {
@@ -512,7 +522,7 @@ function showConsoleBaseAlertDialog(response, config = {}, request, extra = {})
     return false;
   }
   const errorConfig = {
-    title: ERROR_TITLE,
+    title: ERROR_TITLE$1,
     // 错误
     message: response.message,
     code: response.code,
@@ -525,12 +535,12 @@ function showConsoleBaseAlertDialog(response, config = {}, request, extra = {})
   const responseCode = (_a = response.code) == null ? void 0 : _a.toLowerCase();
   if (responseCode === "unauthorized" || responseCode === "nopermission") {
     if ((_b = response == null ? void 0 : response.rawResponseError) == null ? void 0 : _b.accessDeniedDetail) {
-      const detailsAuth = convertErrorDetaisAuth(response.rawResponseError.accessDeniedDetail);
+      const detailsAuth = convertErrorDetaisAuth$1(response.rawResponseError.accessDeniedDetail);
       errorConfig.detailsAuth = detailsAuth;
       errorConfig.code = ((_c = response == null ? void 0 : response.rawResponseError) == null ? void 0 : _c.errorCode) || "Unauthorized";
       errorPrompt(errorConfig);
     } else {
-      const { action, resource } = extraActionAndResource(response.message);
+      const { action, resource } = extraActionAndResource$1(response.message);
       if (errorConfig.details) {
         errorConfig.details.ACTION = action;
         errorConfig.details.RESOURCE = resource;
@@ -640,7 +650,7 @@ function showAlertDialog(response, config = {}, request, extra = {}) {
     return true;
   }
   const _params = {
-    title: ERROR_TITLE,
+    title: ERROR_TITLE$1,
     message: /* @__PURE__ */ React.createElement("div", null, config.content ? config.content : "")
   };
   showConsoleBaseAlertDialog(response, _params, request, extra);
@@ -1121,6 +1131,75 @@ const sseClient = (api, params, options) => {
   return new SSEClient(api, params, __spreadProps$1(__spreadValues$1({}, options), { headers }));
 };
 
+const ERROR_TITLE = i18n.ERROR;
+function extraActionAndResource(message) {
+  var _a;
+  const arr = (_a = message.match(/denied by sts or ram[\S\s]+action:\s(\S+:\S+),[\S\s]+resource:\s(\S+)/)) != null ? _a : [];
+  if (arr.length === 3) {
+    return {
+      action: arr[1],
+      resource: arr[2]
+    };
+  } else {
+    return {
+      action: "",
+      resource: ""
+    };
+  }
+}
+function convertErrorDetaisAuth(o) {
+  if (!o) {
+    return;
+  }
+  return {
+    type: o.NoPermissionType,
+    action: o.AuthAction,
+    resource: o.AuthResource,
+    userType: o.AuthPrincipalType,
+    userName: o.AuthPrincipalDisplayName,
+    userId: o.AuthPrincipalOwnerId,
+    policyType: o.PolicyType,
+    diagnosisInfo: o.EncodedDiagnosticMessage
+  };
+}
+function extractErrorInfo(response) {
+  var _a, _b, _c, _d;
+  if (response == null || (response == null ? void 0 : response.code) === "200") {
+    return null;
+  }
+  if (response.code === "ConsoleNeedLogin") {
+    return {
+      title: getMsg("lb.login_time_out_title"),
+      message: getMsg("lb.login_time_out_content"),
+      code: response.code || "",
+      requestId: response.requestId || "",
+      needLogin: true
+    };
+  }
+  const errorInfo = {
+    title: ERROR_TITLE,
+    message: response.message || "",
+    code: response.code || "",
+    requestId: response.requestId || ""
+  };
+  const responseCode = (_a = response.code) == null ? void 0 : _a.toLowerCase();
+  if (responseCode === "unauthorized" || responseCode === "nopermission") {
+    if ((_b = response == null ? void 0 : response.rawResponseError) == null ? void 0 : _b.accessDeniedDetail) {
+      const detailsAuth = convertErrorDetaisAuth(response.rawResponseError.accessDeniedDetail);
+      errorInfo.detailsAuth = detailsAuth;
+      errorInfo.code = ((_c = response == null ? void 0 : response.rawResponseError) == null ? void 0 : _c.errorCode) || "Unauthorized";
+    } else {
+      const { action, resource } = extraActionAndResource(response.message || "");
+      errorInfo.details = {
+        ACTION: action,
+        RESOURCE: resource
+      };
+      errorInfo.code = ((_d = response == null ? void 0 : response.rawResponseError) == null ? void 0 : _d.errorCode) || "Unauthorized";
+    }
+  }
+  return errorInfo;
+}
+
 var __defProp = Object.defineProperty;
 var __defProps = Object.defineProperties;
 var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
@@ -1685,4 +1764,4 @@ var dashbordService;
   dashbordService2.updateDashboard = updateDashboard;
 })(dashbordService || (dashbordService = {}));
 
-export { commonEasyFetch, dashbordService, diamondService, getConsoleDomain, indexService, metaService, obsEasyFetch, projectService, showAlertDialog, showAlertDialogWhenNeedLogin, slsEasyFetch, sseClient, workSpaceService };
+export { commonEasyFetch, dashbordService, diamondService, extractErrorInfo, getConsoleDomain, indexService, metaService, obsEasyFetch, projectService, showAlertDialog, showAlertDialogWhenNeedLogin, slsEasyFetch, sseClient, workSpaceService };

package/package.json

@@ -15,5 +15,5 @@
     "styled-components": "^5.2.0",
     "urijs": "^1.19.1"
   },
-  "version": "4.7.2"
+  "version": "4.7.4"
 }