@aliyun-obv/api 0.0.48 → 0.0.50

package/dist/api.es.js

@@ -95,6 +95,8 @@ class BaseFetch {
     let newInit = init;
     if (hasBaseURL) {
       url = `${this.defaults.baseURL}${url}`;
+    }
+    if ((url.startsWith("http:") || url.startsWith("https:")) && !url.startsWith(window.location.host)) {
       newInit = __spreadValues$4({}, Object.assign({}, init, { credentials: "include" }));
     }
     if (this.defaults.beforeRequest) {
@@ -153,7 +155,12 @@ class BaseFetch {
         const fetchInit = _.merge({}, defaultInit, {
           body: contentType.includes("application/json") ? JSON.stringify(params) : getPostParam(params)
         });
-        const { url: newApi, init: newInit } = yield this.beforeRequest(api, params, fetchInit, options);
+        const { url: newApi, init: newInit } = yield this.beforeRequest(
+          api,
+          params,
+          fetchInit,
+          options
+        );
         const res = yield this.callFetch(newApi, newInit, options);
         if (this.defaults.afterResponse) {
           return yield this.defaults.afterResponse(res, options);
@@ -557,12 +564,13 @@ var __async$4 = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var _a;
 let slsAccessToken = window.ALIYUN_SLS_CONSOLE_CONFIG.slsAccessToken;
 let slsAccessTokenMode = false;
 const urlQueryObj = urijs(location.search).escapeQuerySpace(false).query(true);
 const supportRefreshToken = urlQueryObj.supportRefreshToken === "true" && window.top !== window.self && parent != null;
 try {
-  if (window.ALIYUN_CONSOLE_CONFIG.ENV === "pre") {
+  if (((_a = window.ALIYUN_CONSOLE_CONFIG) == null ? void 0 : _a.ENV) === "pre") {
     if (urlQueryObj.slsAccessToken) {
       slsAccessToken = urlQueryObj.slsAccessToken;
     }
@@ -583,9 +591,9 @@ function waitRefreshToken() {
       window.addEventListener(
         "message",
         (event) => {
-          var _a, _b, _c;
+          var _a2, _b, _c;
           try {
-            if (((_a = event == null ? void 0 : event.data) == null ? void 0 : _a.type) === "applyAccessToken" && ((_b = event == null ? void 0 : event.data) == null ? void 0 : _b.ticket) === urlQueryObj.sls_ticket) {
+            if (((_a2 = event == null ? void 0 : event.data) == null ? void 0 : _a2.type) === "applyAccessToken" && ((_b = event == null ? void 0 : event.data) == null ? void 0 : _b.ticket) === urlQueryObj.sls_ticket) {
               slsAccessToken = (_c = event == null ? void 0 : event.data) == null ? void 0 : _c.accessToken;
               tokenRefreshing = false;
               const queue = refreshPromisesQueue;
@@ -756,9 +764,20 @@ slsEasyFetch.defaults.afterResponse = (r, options) => __async$3(void 0, null, fu
   return composedData;
 });
 
+function getBaseUrl() {
+  var _a, _b;
+  if ((_a = window.ALIYUN_CONSOLE_CONFIG) == null ? void 0 : _a.LOCAL) {
+    return `http://pre-observability:${window.location.port}`;
+  }
+  if (((_b = window.ALIYUN_CONSOLE_CONFIG) == null ? void 0 : _b.ENV) === "pre") {
+    return `https://pre-observability.console.aliyun.com`;
+  }
+  return `https://observability.console.aliyun.com`;
+}
 const obsEasyFetch = new BaseFetch(finalFetch);
 obsEasyFetch.defaults.postDefaultInit.headers["Content-Type"] = "application/x-www-form-urlencoded";
 obsEasyFetch.defaults.postDefaultInit.headers["Accept"] = "application/json";
+obsEasyFetch.defaults.baseURL = getBaseUrl();
 obsEasyFetch.defaults.errorHandler = errorHandler;
 obsEasyFetch.defaults.beforeRequest = slsEasyFetch.defaults.beforeRequest;
 obsEasyFetch.defaults.afterResponse = slsEasyFetch.defaults.afterResponse;

package/package.json

@@ -10,11 +10,11 @@
     "urijs": "^1.19.1",
     "lodash": "^4.17.21",
     "@alicloud/console-base-error-prompt-proxy": "^1.9.12",
-    "@aliyun-obv/i18n": "0.0.48",
-    "@aliyun-obv/utils": "0.0.48",
+    "@aliyun-obv/i18n": "0.0.50",
+    "@aliyun-obv/utils": "0.0.50",
     "@alifd/next": "^1.27.11",
     "styled-components": "^5.2.0"
   },
   "devDependencies": {},
-  "version": "0.0.48"
+  "version": "0.0.50"
 }