@aliyun-obv/api 4.7.8 → 4.8.0

package/dist/api.d.ts

@@ -152,6 +152,11 @@ interface IErrorInfo {
  */
 declare function extractErrorInfo(response: any): IErrorInfo | null;
 
+type SlsAccessTokenValue = string | undefined | null;
+type GetSlsAccessToken = () => SlsAccessTokenValue | Promise<SlsAccessTokenValue>;
+declare function setSlsAccessTokenGetter(getter: GetSlsAccessToken): void;
+declare function getSlsAccessToken(): Promise<string | undefined>;
+
 declare namespace metaService {
     export interface GetMetaRecordParameters {
         name: string;
@@ -384,4 +389,4 @@ declare namespace dashbordService {
 
 declare function getConsoleDomain(isObv?: boolean): any;
 
-export { IResponseData, commonEasyFetch, dashbordService, diamondService, extractErrorInfo, getConsoleDomain, indexService, metaService, obsEasyFetch, projectService, showAlertDialog, showAlertDialogWhenNeedLogin, slsEasyFetch, sseClient, workSpaceService };
+export { GetSlsAccessToken, IResponseData, SlsAccessTokenValue, commonEasyFetch, dashbordService, diamondService, extractErrorInfo, getConsoleDomain, getSlsAccessToken, indexService, metaService, obsEasyFetch, projectService, setSlsAccessTokenGetter, showAlertDialog, showAlertDialogWhenNeedLogin, slsEasyFetch, sseClient, workSpaceService };

package/dist/api.es.js

@@ -38,7 +38,7 @@ var __spreadValues$6 = (a, b) => {
   return a;
 };
 var __publicField$1 = (obj, key, value) => __defNormalProp$6(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __async$a = (__this, __arguments, generator) => {
+var __async$b = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -131,7 +131,7 @@ class BaseFetch {
     return { url, init: newInit };
   }
   callFetch(_0, _1) {
-    return __async$a(this, arguments, function* (api, init, options = {}) {
+    return __async$b(this, arguments, function* (api, init, options = {}) {
       let headers = init == null ? void 0 : init.headers;
       if (options.headers) {
         headers = Object.assign({}, init == null ? void 0 : init.headers, options.headers);
@@ -143,7 +143,7 @@ class BaseFetch {
     });
   }
   get(_0) {
-    return __async$a(this, arguments, function* (api, params = {}, options = {}) {
+    return __async$b(this, arguments, function* (api, params = {}, options = {}) {
       var _a, _b, _c;
       if (isTest) return Promise.resolve({ res: void 0 });
       try {
@@ -182,7 +182,7 @@ class BaseFetch {
     });
   }
   _post(_0) {
-    return __async$a(this, arguments, function* (api, params = {}, options = {}, defaultInit) {
+    return __async$b(this, arguments, function* (api, params = {}, options = {}, defaultInit) {
       var _a;
       if (isTest) return Promise.resolve({ res: void 0 });
       try {
@@ -220,12 +220,12 @@ class BaseFetch {
     });
   }
   post(_0) {
-    return __async$a(this, arguments, function* (api, params = {}, options = {}) {
+    return __async$b(this, arguments, function* (api, params = {}, options = {}) {
       return this._post(api, params, options, this.defaults.postDefaultInit);
     });
   }
   put(_0) {
-    return __async$a(this, arguments, function* (api, params = {}, options = {}) {
+    return __async$b(this, arguments, function* (api, params = {}, options = {}) {
       return this._post(api, params, options, this.defaults.putDefaultInit);
     });
   }
@@ -460,7 +460,7 @@ var __spreadValues$5 = (a, b) => {
   return a;
 };
 var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
-var __async$9 = (__this, __arguments, generator) => {
+var __async$a = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -483,7 +483,7 @@ var __async$9 = (__this, __arguments, generator) => {
 const commonEasyFetch = new BaseFetch();
 commonEasyFetch.defaults.postDefaultInit.headers["Content-Type"] = "application/x-www-form-urlencoded";
 commonEasyFetch.defaults.postDefaultInit.headers["Accept"] = "application/json";
-commonEasyFetch.defaults.afterResponse = (response) => __async$9(void 0, null, function* () {
+commonEasyFetch.defaults.afterResponse = (response) => __async$a(void 0, null, function* () {
   if (response.status >= 200 && response.status < 300) {
     const data = yield response.json();
     return __spreadProps$5(__spreadValues$5({}, data != null ? data : {}), {
@@ -744,6 +744,72 @@ const errorHandler = (request, error, options) => {
   throw errorMessage;
 };
 
+var __async$9 = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+const GLOBAL_KEY = "__CONSOLE_OBVIZ_APP__";
+const GETTER_KEY = "getSlsAccessToken";
+let slsAccessTokenCache;
+function isValidSlsAccessToken(value) {
+  return typeof value === "string" && value.length > 0;
+}
+function getObvizGlobal() {
+  const win = window;
+  win[GLOBAL_KEY] = win[GLOBAL_KEY] || {};
+  return win[GLOBAL_KEY];
+}
+function getConfigGetter(config) {
+  const getter = config == null ? void 0 : config[GETTER_KEY];
+  return typeof getter === "function" ? getter : void 0;
+}
+function getWindowGetter() {
+  return getConfigGetter(getObvizGlobal()) || getConfigGetter(window == null ? void 0 : window.ALIYUN_SLS_CONSOLE_CONFIG) || getConfigGetter(window == null ? void 0 : window.ALIYUN_OBSERVABILITY_CONSOLE_CONFIG);
+}
+function setSlsAccessTokenGetter(getter) {
+  getObvizGlobal()[GETTER_KEY] = getter;
+  if (window.ALIYUN_SLS_CONSOLE_CONFIG) {
+    window.ALIYUN_SLS_CONSOLE_CONFIG[GETTER_KEY] = getter;
+  }
+  if (window.ALIYUN_OBSERVABILITY_CONSOLE_CONFIG) {
+    window.ALIYUN_OBSERVABILITY_CONSOLE_CONFIG[GETTER_KEY] = getter;
+  }
+}
+function setSlsAccessToken(accessToken) {
+  if (!isValidSlsAccessToken(accessToken)) {
+    return;
+  }
+  slsAccessTokenCache = accessToken;
+}
+function getSlsAccessToken() {
+  return __async$9(this, null, function* () {
+    var _a, _b, _c;
+    const getter = getWindowGetter();
+    const getterValue = getter ? yield getter() : void 0;
+    if (isValidSlsAccessToken(getterValue)) {
+      return getterValue;
+    }
+    const slsAccessToken = (_c = slsAccessTokenCache != null ? slsAccessTokenCache : (_a = window == null ? void 0 : window.ALIYUN_SLS_CONSOLE_CONFIG) == null ? void 0 : _a.slsAccessToken) != null ? _c : (_b = window == null ? void 0 : window.ALIYUN_OBSERVABILITY_CONSOLE_CONFIG) == null ? void 0 : _b.slsAccessToken;
+    return isValidSlsAccessToken(slsAccessToken) ? slsAccessToken : void 0;
+  });
+}
+
 var __defProp$3 = Object.defineProperty;
 var __defProps$3 = Object.defineProperties;
 var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
@@ -783,22 +849,17 @@ var __async$8 = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-var _a$1, _b;
-let slsAccessToken$1 = (_a$1 = window == null ? void 0 : window.ALIYUN_SLS_CONSOLE_CONFIG) == null ? void 0 : _a$1.slsAccessToken;
-let slsAccessTokenMode = false;
+var _a$1;
 const urlQueryObj = urijs(location.search).escapeQuerySpace(false).query(true);
 const supportRefreshToken = urlQueryObj.supportRefreshToken === "true" && window.top !== window.self && parent != null;
 try {
-  if (((_b = window.ALIYUN_CONSOLE_CONFIG) == null ? void 0 : _b.ENV) === "pre") {
+  if (((_a$1 = window.ALIYUN_CONSOLE_CONFIG) == null ? void 0 : _a$1.ENV) === "pre") {
     if (urlQueryObj.slsAccessToken) {
-      slsAccessToken$1 = urlQueryObj.slsAccessToken;
+      setSlsAccessToken(urlQueryObj.slsAccessToken);
     }
   }
 } catch (error) {
 }
-if (Object.prototype.toString.call(slsAccessToken$1) === "[object String]" && slsAccessToken$1.length > 0) {
-  slsAccessTokenMode = true;
-}
 let tokenRefreshing = false;
 let refreshPromisesQueue = [];
 function waitRefreshToken() {
@@ -810,10 +871,10 @@ function waitRefreshToken() {
       window.addEventListener(
         "message",
         (event) => {
-          var _a2, _b2, _c;
+          var _a2, _b, _c;
           try {
-            if (((_a2 = event == null ? void 0 : event.data) == null ? void 0 : _a2.type) === "applyAccessToken" && ((_b2 = event == null ? void 0 : event.data) == null ? void 0 : _b2.ticket) === urlQueryObj.sls_ticket) {
-              slsAccessToken$1 = (_c = event == null ? void 0 : event.data) == null ? void 0 : _c.accessToken;
+            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) {
+              setSlsAccessToken((_c = event == null ? void 0 : event.data) == null ? void 0 : _c.accessToken);
               tokenRefreshing = false;
               const queue = refreshPromisesQueue;
               refreshPromisesQueue = [];
@@ -836,9 +897,11 @@ function _finalFetch(api, fetchOptions, deep = 0) {
     if (tokenRefreshing) {
       yield waitRefreshToken();
     }
+    const slsAccessToken = yield getSlsAccessToken();
+    const slsAccessTokenMode = slsAccessToken != null;
     if (slsAccessTokenMode) {
       fetchOptions.headers = __spreadProps$3(__spreadValues$3({}, fetchOptions.headers || {}), {
-        slsAccessToken: slsAccessToken$1
+        slsAccessToken
       });
     }
     const response = yield fetch(requestApi, fetchOptions);
@@ -1764,4 +1827,4 @@ var dashbordService;
   dashbordService2.updateDashboard = updateDashboard;
 })(dashbordService || (dashbordService = {}));
 
-export { commonEasyFetch, dashbordService, diamondService, extractErrorInfo, getConsoleDomain, indexService, metaService, obsEasyFetch, projectService, showAlertDialog, showAlertDialogWhenNeedLogin, slsEasyFetch, sseClient, workSpaceService };
+export { commonEasyFetch, dashbordService, diamondService, extractErrorInfo, getConsoleDomain, getSlsAccessToken, indexService, metaService, obsEasyFetch, projectService, setSlsAccessTokenGetter, showAlertDialog, showAlertDialogWhenNeedLogin, slsEasyFetch, sseClient, workSpaceService };

package/package.json

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