@aliyun-obv/api 0.3.56 → 0.4.0-beta.0

package/dist/api.d.ts

@@ -351,4 +351,6 @@ declare namespace dashbordService {
     }): Promise<IResponseData>;
 }
 
-export { IResponseData, commonEasyFetch, dashbordService, diamondService, indexService, metaService, obsEasyFetch, projectService, showAlertDialog, showAlertDialogWhenNeedLogin, slsEasyFetch, sseClient, workSpaceService };
+declare function getConsoleDomain(isObv?: boolean): any;
+
+export { IResponseData, commonEasyFetch, dashbordService, diamondService, getConsoleDomain, indexService, metaService, obsEasyFetch, projectService, showAlertDialog, showAlertDialogWhenNeedLogin, slsEasyFetch, sseClient, workSpaceService };

package/dist/api.es.js

@@ -3,7 +3,6 @@ import errorPrompt from '@alicloud/console-base-error-prompt-proxy';
 import i18n, { getMsg } from '@aliyun-obv/i18n';
 import urijs from 'urijs';
 import { Dialog, Button, Message } from '@alifd/next';
-import { slsConsoleRuntime } from '@aliyun-obv/utils';
 import React from 'react';
 import merge from 'lodash/merge';
 import { fetchEventSource } from '@microsoft/fetch-event-source';
@@ -211,9 +210,18 @@ class BaseFetch {
   }
 }
 
-var _a$2, _b$1, _c;
-const isLocal = (_a$2 = window == null ? void 0 : window.ALIYUN_CONSOLE_CONFIG) == null ? void 0 : _a$2.LOCAL;
-const isPre = ((_b$1 = window == null ? void 0 : window.ALIYUN_CONSOLE_CONFIG) == null ? void 0 : _b$1.fEnv) === "pre" || ((_c = window == null ? void 0 : window.ALIYUN_CONSOLE_CONFIG) == null ? void 0 : _c.ENV) === "pre";
+function isLocal() {
+  var _a;
+  return (_a = window == null ? void 0 : window.ALIYUN_CONSOLE_CONFIG) == null ? void 0 : _a.LOCAL;
+}
+function isPre() {
+  var _a, _b;
+  return ((_a = window == null ? void 0 : window.ALIYUN_CONSOLE_CONFIG) == null ? void 0 : _a.fEnv) === "pre" || ((_b = window == null ? void 0 : window.ALIYUN_CONSOLE_CONFIG) == null ? void 0 : _b.ENV) === "pre";
+}
+function getLinks(key) {
+  var _a, _b;
+  return ((_a = window == null ? void 0 : window.ALIYUN_SLS_CONSOLE_LINKS) == null ? void 0 : _a[key]) || ((_b = window == null ? void 0 : window.ALIYUN_OBSERVABILITY_CONSOLE_LINKS) == null ? void 0 : _b[key]) || key;
+}
 function is4Service(location2) {
   return location2.hostname.match(
     /(4service|4bjzwy|4finance)(\.console)?(\.aliyun|\.alibabacloud)\.com$/
@@ -222,13 +230,20 @@ function is4Service(location2) {
 function is4Finance(location2) {
   return location2.hostname.match(/(4finance)(\.console)?(\.aliyun|\.alibabacloud)\.com$/);
 }
-function getSLSdomain() {
-  var _a2, _b2;
-  if ((_a2 = window == null ? void 0 : window.__CONSOLE_OBVIZ_DOMAIN__) == null ? void 0 : _a2.getSlsDomain) {
-    return window.__CONSOLE_OBVIZ_DOMAIN__.getSlsDomain();
-  }
-  const { slsHost } = urijs(window.location.search).escapeQuerySpace(false).query(true);
-  if (isLocal) {
+const { slsHost } = urijs(window.location.search).escapeQuerySpace(false).query(true);
+function getLocalDomain(isObv) {
+  if (isObv) {
+    if (location.hostname === "localhost") {
+      return `http://pre-cmsnext:${window.location.port}`;
+    }
+    if (location.hostname.includes("cmsnext")) {
+      return `http://${location.hostname}:${window.location.port}`;
+    }
+    if (window.location.hostname.includes("stg")) {
+      return `http://pre-stg-cmsnext:${window.location.port}`;
+    }
+    return `http://pre-cmsnext:${window.location.port}`;
+  } else {
     if (slsHost != null && slsHost != "") {
       return slsHost;
     }
@@ -240,77 +255,80 @@ function getSLSdomain() {
     }
     return window.location.origin;
   }
-  const host = window.location.host;
-  if (((_b2 = window == null ? void 0 : window.ALIYUN_SLS_CONSOLE_CONFIG) == null ? void 0 : _b2.isSlsConsole) || host.includes("sls") && host.includes("console.aliyun.com")) {
-    return void 0;
-  }
-  if (isPre) {
+}
+function getPreConfig(isObv, suffix) {
+  if (isObv) {
+    if (is4Service(window.location)) {
+      return `https://pre-cmsnext4service.${suffix}`;
+    }
+    if (window.location.hostname.includes("stg")) {
+      return `https://pre-stg-cmsnext.${suffix}`;
+    }
+    return `https://pre-cmsnext.${suffix}`;
+  } else {
     if (slsHost != null && slsHost != "") {
       return slsHost;
     }
     if (is4Service(window.location)) {
-      return `https://pre-sls4service.console.aliyun.com`;
+      return `https://pre-sls4service.${suffix}`;
     }
     if (window.location.hostname.includes("stg")) {
-      return `https://sls-stg.console.aliyun.com`;
+      return `https://sls-stg.${suffix}`;
     }
-    return "https://pre-sls.console.aliyun.com";
-  }
-  if (is4Finance(window.location)) {
-    return `https://log4finance.console.aliyun.com`;
+    return `https://pre-sls.${suffix}`;
   }
-  if (is4Service(window.location)) {
-    return `https://sls4service.console.aliyun.com`;
-  }
-  return "https://sls.console.aliyun.com";
 }
-function getObvDomain() {
-  var _a2, _b2;
-  if ((_a2 = window == null ? void 0 : window.__CONSOLE_OBVIZ_DOMAIN__) == null ? void 0 : _a2.getObvDomain) {
-    return window.__CONSOLE_OBVIZ_DOMAIN__.getObvDomain();
-  }
-  if ((_b2 = window.ALIYUN_CONSOLE_CONFIG) == null ? void 0 : _b2.LOCAL) {
-    if (location.hostname === "localhost") {
-      return `http://pre-cmsnext:${window.location.port}`;
-    }
-    if (location.hostname.includes("observability") || location.hostname.includes("cmsnext")) {
-      return `http://${location.hostname}:${window.location.port}`;
+function getProdConfig(isObv, suffix) {
+  if (isObv) {
+    if (is4Finance(window.location)) {
+      return `https://log4finance.${suffix}`;
     }
-    if (window.location.hostname.includes("stg")) {
-      return `http://pre-stg-cmsnext:${window.location.port}`;
-    }
-    return `http://pre-cmsnext:${window.location.port}`;
-  }
-  if (isPre) {
     if (is4Service(window.location)) {
-      return `https://pre-cmsnext4service.console.aliyun.com`;
+      return `https://sls4service.${suffix}`;
     }
-    if (location.hostname.includes("observability") || location.hostname.includes("cmsnext")) {
-      return location.origin;
+    return `https://sls.${suffix}`;
+  } else {
+    if (is4Finance(window.location)) {
+      return `https://cmsnext.${suffix}`;
     }
-    if (window.location.hostname.includes("stg")) {
-      return `https://pre-stg-cmsnext.console.aliyun.com`;
+    if (is4Service(window.location)) {
+      return `https://cmsnext4service.${suffix}`;
     }
-    return `https://pre-cmsnext.console.aliyun.com`;
+    return `https://cmsnext.${suffix}`;
+  }
+}
+function getConsoleDomain(isObv = true) {
+  var _a, _b, _c, _d, _e, _f, _g;
+  if ((_a = window == null ? void 0 : window.__CONSOLE_OBVIZ_DOMAIN__) == null ? void 0 : _a.getConsoleDomain) {
+    return window.__CONSOLE_OBVIZ_DOMAIN__.getConsoleDomain();
   }
-  if (is4Finance(window.location)) {
-    return `https://cmsnext.console.aliyun.com`;
+  if (isLocal()) {
+    return getLocalDomain(isObv);
   }
-  if (is4Service(window.location)) {
-    return `https://cmsnext4service.console.aliyun.com`;
+  const host = window.location.host;
+  if (((_b = window == null ? void 0 : window.ALIYUN_SLS_CONSOLE_CONFIG) == null ? void 0 : _b.isSlsConsole) || ((_c = window == null ? void 0 : window.ALIYUN_OBSERVABILITY_CONSOLE_CONFIG) == null ? void 0 : _c.isCmsConsole) || host.includes("sls") && host.includes("console.aliyun.com")) {
+    return void 0;
   }
-  if (location.hostname.includes("observability") || location.hostname.includes("cmsnext")) {
-    return location.origin;
+  const hostSuffix = window.location.hostname.includes("alibabacloud") ? "console.alibabacloud.com" : "console.aliyun.com";
+  const suffix = (_g = (_f = (_d = window == null ? void 0 : window.ALIYUN_CONSOLE_CONFIG) == null ? void 0 : _d.SLS_CONSOLE_DOMAIN) != null ? _f : (_e = window == null ? void 0 : window.ALIYUN_CONSOLE_CONFIG) == null ? void 0 : _e.CMS_CONSOLE_DOMAIN) != null ? _g : hostSuffix;
+  if (isPre()) {
+    return getPreConfig(isObv, suffix);
   }
-  return `https://cmsnext.console.aliyun.com`;
+  return getProdConfig(isObv, suffix);
+}
+function getSLSdomain() {
+  return getConsoleDomain(false);
+}
+function getObvDomain() {
+  return getConsoleDomain(true);
 }
 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) {
-  var _a2;
-  const arr = (_a2 = message.match(/denied by sts or ram[\S\s]+action:\s(\S+:\S+),[\S\s]+resource:\s(\S+)/)) != null ? _a2 : [];
+  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],
@@ -355,7 +373,7 @@ const errorMsgHandler = (err) => {
   return createNoXSS(msg || err.message || i18n.ERRMESSAGE3);
 };
 function getOauthCallbackUrl(url = window.location.href) {
-  return `https:${slsConsoleRuntime.links.ACCOUNT}/login/login.htm?oauth_callback=${url}`;
+  return `https:${getLinks("sls.domain.account.url")}/login/login.htm?oauth_callback=${url}`;
 }
 function createNoPermissionContent() {
   return /* @__PURE__ */ React.createElement("div", null, /* @__PURE__ */ React.createElement("div", { className: "sls-custom-container" }, /* @__PURE__ */ React.createElement("div", { className: "sls-custom-title" }, i18n.UNAUTHORIZEDOPERMSG)));
@@ -378,11 +396,11 @@ function getParentUrl() {
 }
 const TOP_WINDOW = new Function("return window;")();
 function addRUMLog(log) {
-  var _a2;
+  var _a;
   if (TOP_WINDOW.SLS_CLIENT && TOP_WINDOW.SLS_CLIENT.addLog) {
     TOP_WINDOW.SLS_CLIENT.addLog(log);
   }
-  if ((_a2 = window == null ? void 0 : window.RUM_API) == null ? void 0 : _a2.addRUMLog) {
+  if ((_a = window == null ? void 0 : window.RUM_API) == null ? void 0 : _a.addRUMLog) {
     window.RUM_API.addRUMLog(log);
   }
 }
@@ -872,7 +890,7 @@ slsEasyFetch.defaults.beforeRequest = (url, params, init, options) => __async$7(
   const method = (_a = init.method) == null ? void 0 : _a.toLowerCase();
   if (method === "post" || method === "put") {
     let token = getConfig("SEC_TOKEN");
-    if (!token && !isLocal) {
+    if (!token && !isLocal()) {
       const response = yield fetch(`${getSLSdomain()}/console/getConfigData.json`, {
         method: "get",
         credentials: "include"
@@ -1637,4 +1655,4 @@ var dashbordService;
   dashbordService2.updateDashboard = updateDashboard;
 })(dashbordService || (dashbordService = {}));
 
-export { commonEasyFetch, dashbordService, diamondService, indexService, metaService, obsEasyFetch, projectService, showAlertDialog, showAlertDialogWhenNeedLogin, slsEasyFetch, sseClient, workSpaceService };
+export { commonEasyFetch, dashbordService, diamondService, 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": "0.3.56"
+  "version": "0.4.0-beta.0"
 }