@alicloud/alfa-core 1.5.0-alpha.2 → 1.5.0-alpha.3

package/es/index.js

@@ -2,7 +2,7 @@ export { createMicroApp } from './createMicroApp';
 export { addRequestInterceptor } from './utils/interceptors';
 export { getRelease } from './utils/getRelease';
 export { getManifest } from './utils/getManifest';
-export { getConfig } from './utils/getConfig';
+export { getConfig, getConfigV2 } from './utils/getConfig';
 export { getI18nMessages } from './utils/getI18nMessages';
 export { getLocale, getEnv } from './utils';
 export { default as BaseLoader } from './base';

package/es/utils/getConfig.js

@@ -1,10 +1,12 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+import parseEnv from '@alicloud/console-base-conf-parse-env';
 import { getRelease } from './getRelease';
 import cache from './cacheManager';
 import { getMicroAppConfig } from './oss';
 import { getEnv } from './env';
+import request from './request';
 var defaultConfig = {
   ALL_CHANNEL_FEATURE_STATUS: {},
   ALL_CHANNEL_LINKS: {},
@@ -81,4 +83,53 @@ export var getConfig = /*#__PURE__*/function () {
   return function getConfig(_x) {
     return _ref.apply(this, arguments);
   };
+}();
+
+/**
+ * 支持从 fecs 接口获取业务配置，获取到的数据和控制台一致，不需要额外处理
+ */
+export var getConfigV2 = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(config) {
+    var releaseConfig, _ref5, relatedConsoleAppId, _ALIYUN_CONSOLE_CONFI, res;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.next = 2;
+          return getRelease(config);
+        case 2:
+          releaseConfig = _context2.sent;
+          _ref5 = releaseConfig.metadata || {}, relatedConsoleAppId = _ref5.relatedConsoleAppId;
+          if (!relatedConsoleAppId) {
+            _context2.next = 16;
+            break;
+          }
+          if (!(relatedConsoleAppId === ((_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.APP_ID))) {
+            _context2.next = 7;
+            break;
+          }
+          return _context2.abrupt("return", {
+            ALIYUN_CONSOLE_CONFIG: window.ALIYUN_CONSOLE_CONFIG,
+            ALIYUN_CONSOLE_GLOBAL: window.ALIYUN_CONSOLE_GLOBAL || {}
+          });
+        case 7:
+          _context2.prev = 7;
+          _context2.next = 10;
+          return request.get("//fecs.console.".concat(parseEnv().MAIN_DOMAIN, "/api/alfa/console/config?=appId=").concat(relatedConsoleAppId));
+        case 10:
+          res = _context2.sent;
+          return _context2.abrupt("return", res.data);
+        case 14:
+          _context2.prev = 14;
+          _context2.t0 = _context2["catch"](7);
+        case 16:
+          return _context2.abrupt("return", undefined);
+        case 17:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[7, 14]]);
+  }));
+  return function getConfigV2(_x2) {
+    return _ref4.apply(this, arguments);
+  };
 }();

package/es/utils/interceptors/requestInterceptor.js

@@ -0,0 +1,37 @@
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+// 兼容非公有云环境
+var getCurrentCdnHost = function getCurrentCdnHost() {
+  try {
+    var _document$currentScri;
+    var _URL = new URL(((_document$currentScri = document.currentScript) === null || _document$currentScri === void 0 ? void 0 : _document$currentScri.src) || ''),
+      hostname = _URL.hostname;
+    var parts = hostname.split('.');
+    return parts.length > 2 ? parts.slice(-2).join('.') : hostname;
+  } catch (e) {
+    return undefined;
+  }
+};
+export default function requestInterceptor(_x) {
+  return _requestInterceptor.apply(this, arguments);
+}
+function _requestInterceptor() {
+  _requestInterceptor = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(config) {
+    var hostname;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          hostname = getCurrentCdnHost(); // if cdn is not alicdn, replace it
+          if (hostname && config.url) {
+            // 非公有云下无 cws2
+            config.url = config.url.replace(new RegExp('.alicdn.com'), ".".concat(hostname)).replace('cws2.', 'cws.');
+          }
+          return _context.abrupt("return", config);
+        case 3:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _requestInterceptor.apply(this, arguments);
+}

package/es/utils/interceptors/responseInterceptor.js

@@ -78,7 +78,7 @@ function _responseInterceptor() {
           }
           return _context.abrupt("return", response);
         case 6:
-          config.url = url === null || url === void 0 ? void 0 : url.replace(/:\/\/cws\.alicdn\.com\//, '://cws2.alicdn.com/');
+          config.url = url === null || url === void 0 ? void 0 : url.replace(/:\/\/cws\.[a-z0-9-]+\.com\//, '://cws2.alicdn.com/');
           _context.next = 9;
           return axios(config);
         case 9:

package/es/utils/request.js

@@ -1,7 +1,9 @@
 import axios from 'axios';
+import requestInterceptor from './interceptors/requestInterceptor';
 import networkErrorInterceptor from './interceptors/networkErrorInterceptor';
 import responseInterceptor from './interceptors/responseInterceptor';
 var instance = axios.create();
+instance.interceptors.request.use(requestInterceptor, undefined);
 instance.interceptors.response.use(undefined, networkErrorInterceptor);
 instance.interceptors.response.use(responseInterceptor, undefined);
 instance.interceptors.response.use(undefined, networkErrorInterceptor);

package/es/utils/uid.js

@@ -6,7 +6,7 @@ import { getCookie } from '@alicloud/cookie';
  */
 export var getMainUid = function getMainUid() {
   var _ALIYUN_CONSOLE_CONFI;
-  return ((_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.MAIN_ACCOUNT_PK) || getCookie('login_aliyunid_pk') || undefined;
+  return ((_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.MAIN_ACCOUNT_PK) || getCookie('login_aliyunid_pk') || getCookie('login_apsaraid_pk') || undefined;
 };
 
 /**

package/lib/index.js

@@ -10,6 +10,7 @@ var _exportNames = {
   getRelease: true,
   getManifest: true,
   getConfig: true,
+  getConfigV2: true,
   getI18nMessages: true,
   getLocale: true,
   getEnv: true,
@@ -55,6 +56,12 @@ Object.defineProperty(exports, "getConfig", {
     return _getConfig.getConfig;
   }
 });
+Object.defineProperty(exports, "getConfigV2", {
+  enumerable: true,
+  get: function get() {
+    return _getConfig.getConfigV2;
+  }
+});
 Object.defineProperty(exports, "getEnv", {
   enumerable: true,
   get: function get() {

package/lib/utils/getConfig.js

@@ -4,14 +4,16 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getConfig = void 0;
+exports.getConfigV2 = exports.getConfig = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _consoleBaseConfParseEnv = _interopRequireDefault(require("@alicloud/console-base-conf-parse-env"));
 var _getRelease = require("./getRelease");
 var _cacheManager = _interopRequireDefault(require("./cacheManager"));
 var _oss = require("./oss");
 var _env = require("./env");
+var _request = _interopRequireDefault(require("./request"));
 var defaultConfig = {
   ALL_CHANNEL_FEATURE_STATUS: {},
   ALL_CHANNEL_LINKS: {},
@@ -88,4 +90,53 @@ var getConfig = exports.getConfig = /*#__PURE__*/function () {
   return function getConfig(_x) {
     return _ref.apply(this, arguments);
   };
+}();
+
+/**
+ * 支持从 fecs 接口获取业务配置，获取到的数据和控制台一致，不需要额外处理
+ */
+var getConfigV2 = exports.getConfigV2 = /*#__PURE__*/function () {
+  var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(config) {
+    var releaseConfig, _ref5, relatedConsoleAppId, _ALIYUN_CONSOLE_CONFI, res;
+    return _regenerator.default.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.next = 2;
+          return (0, _getRelease.getRelease)(config);
+        case 2:
+          releaseConfig = _context2.sent;
+          _ref5 = releaseConfig.metadata || {}, relatedConsoleAppId = _ref5.relatedConsoleAppId;
+          if (!relatedConsoleAppId) {
+            _context2.next = 16;
+            break;
+          }
+          if (!(relatedConsoleAppId === ((_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.APP_ID))) {
+            _context2.next = 7;
+            break;
+          }
+          return _context2.abrupt("return", {
+            ALIYUN_CONSOLE_CONFIG: window.ALIYUN_CONSOLE_CONFIG,
+            ALIYUN_CONSOLE_GLOBAL: window.ALIYUN_CONSOLE_GLOBAL || {}
+          });
+        case 7:
+          _context2.prev = 7;
+          _context2.next = 10;
+          return _request.default.get("//fecs.console.".concat((0, _consoleBaseConfParseEnv.default)().MAIN_DOMAIN, "/api/alfa/console/config?=appId=").concat(relatedConsoleAppId));
+        case 10:
+          res = _context2.sent;
+          return _context2.abrupt("return", res.data);
+        case 14:
+          _context2.prev = 14;
+          _context2.t0 = _context2["catch"](7);
+        case 16:
+          return _context2.abrupt("return", undefined);
+        case 17:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[7, 14]]);
+  }));
+  return function getConfigV2(_x2) {
+    return _ref4.apply(this, arguments);
+  };
 }();

package/lib/utils/interceptors/requestInterceptor.js

@@ -0,0 +1,44 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = requestInterceptor;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+// 兼容非公有云环境
+var getCurrentCdnHost = function getCurrentCdnHost() {
+  try {
+    var _document$currentScri;
+    var _URL = new URL(((_document$currentScri = document.currentScript) === null || _document$currentScri === void 0 ? void 0 : _document$currentScri.src) || ''),
+      hostname = _URL.hostname;
+    var parts = hostname.split('.');
+    return parts.length > 2 ? parts.slice(-2).join('.') : hostname;
+  } catch (e) {
+    return undefined;
+  }
+};
+function requestInterceptor(_x) {
+  return _requestInterceptor.apply(this, arguments);
+}
+function _requestInterceptor() {
+  _requestInterceptor = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(config) {
+    var hostname;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          hostname = getCurrentCdnHost(); // if cdn is not alicdn, replace it
+          if (hostname && config.url) {
+            // 非公有云下无 cws2
+            config.url = config.url.replace(new RegExp('.alicdn.com'), ".".concat(hostname)).replace('cws2.', 'cws.');
+          }
+          return _context.abrupt("return", config);
+        case 3:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _requestInterceptor.apply(this, arguments);
+}

package/lib/utils/interceptors/responseInterceptor.js

@@ -85,7 +85,7 @@ function _responseInterceptor() {
           }
           return _context.abrupt("return", response);
         case 6:
-          config.url = url === null || url === void 0 ? void 0 : url.replace(/:\/\/cws\.alicdn\.com\//, '://cws2.alicdn.com/');
+          config.url = url === null || url === void 0 ? void 0 : url.replace(/:\/\/cws\.[a-z0-9-]+\.com\//, '://cws2.alicdn.com/');
           _context.next = 9;
           return (0, _axios.default)(config);
         case 9:

package/lib/utils/request.js

@@ -6,9 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _axios = _interopRequireDefault(require("axios"));
+var _requestInterceptor = _interopRequireDefault(require("./interceptors/requestInterceptor"));
 var _networkErrorInterceptor = _interopRequireDefault(require("./interceptors/networkErrorInterceptor"));
 var _responseInterceptor = _interopRequireDefault(require("./interceptors/responseInterceptor"));
 var instance = _axios.default.create();
+instance.interceptors.request.use(_requestInterceptor.default, undefined);
 instance.interceptors.response.use(undefined, _networkErrorInterceptor.default);
 instance.interceptors.response.use(_responseInterceptor.default, undefined);
 instance.interceptors.response.use(undefined, _networkErrorInterceptor.default);

package/lib/utils/uid.js

@@ -13,7 +13,7 @@ var _cookie = require("@alicloud/cookie");
  */
 var getMainUid = exports.getMainUid = function getMainUid() {
   var _ALIYUN_CONSOLE_CONFI;
-  return ((_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.MAIN_ACCOUNT_PK) || (0, _cookie.getCookie)('login_aliyunid_pk') || undefined;
+  return ((_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.MAIN_ACCOUNT_PK) || (0, _cookie.getCookie)('login_aliyunid_pk') || (0, _cookie.getCookie)('login_apsaraid_pk') || undefined;
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/alfa-core",
-  "version": "1.5.0-alpha.2",
+  "version": "1.5.0-alpha.3",
   "description": "MicroFront End SDK for alicloud",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -23,7 +23,7 @@
     "typescript": "^4.0.0"
   },
   "dependencies": {
-    "@alicloud/console-base-conf-parse-env": "^1.4.5",
+    "@alicloud/console-base-conf-parse-env": "^1.4.6",
     "@alicloud/console-logger-sls": "^1.2.31",
     "@alicloud/cookie": "^1.5.3",
     "@babel/runtime": "^7.24.1",
@@ -32,9 +32,8 @@
     "crypto-js": "^4.1.1",
     "qs": "^6.14.0",
     "tslib": "^2.4.0",
-    "@alicloud/console-os-kernal": "^1.4.37"
+    "@alicloud/console-os-kernal": "^1.4.38-alpha.0"
   },
-  "gitHead": "6387c6b9e984da70641716a25ff92d382cc4d7ca",
   "scripts": {
     "build": "breezr build --engine webpack",
     "babel": "breezr build --engine babel",

package/stories/demos/constants.ts

@@ -1,11 +1,11 @@
 export const appManifest = {
-  name: "os-example",
+  name: 'os-example',
   entry: {
     styles: [
-      "//g.alicdn.com/ConsoleOS/OSExample/0.0.5/index.css"
+      '//g.alicdn.com/ConsoleOS/OSExample/0.0.5/index.css',
     ],
     scripts: [
-      "//g.alicdn.com/ConsoleOS/OSExample/0.0.5/index.js"
-    ]
-  }
-}
+      '//g.alicdn.com/ConsoleOS/OSExample/0.0.5/index.js',
+    ],
+  },
+};

package/types/index.d.ts

@@ -2,7 +2,7 @@ export { createMicroApp } from './createMicroApp';
 export { addRequestInterceptor } from './utils/interceptors';
 export { getRelease } from './utils/getRelease';
 export { getManifest } from './utils/getManifest';
-export { getConfig } from './utils/getConfig';
+export { getConfig, getConfigV2 } from './utils/getConfig';
 export { getI18nMessages } from './utils/getI18nMessages';
 export { getLocale, getEnv } from './utils';
 export { default as BaseLoader } from './base';

package/types/types/index.d.ts

@@ -35,6 +35,7 @@ export interface IWin {
         portalType: string;
         MAIN_ACCOUNT_PK: string;
         CURRENT_PK: string;
+        APP_ID?: string;
     }>;
 }
 export interface IAppManifest {
@@ -100,6 +101,9 @@ export interface AlfaReleaseConfig {
     'next-versions'?: Record<Version, {
         featureStatus: AlfaFeature;
     }>;
+    metadata?: {
+        relatedConsoleAppId?: string;
+    };
 }
 type AlfaChannelLinks = Partial<Record<Channel, ChannelLinks>>;
 type AlfaChannelFeatures = Partial<Record<Channel, ChannelFeatures>>;

package/types/utils/getConfig.d.ts

@@ -1,7 +1,34 @@
-import { AlfaDynamicConfig, IAppConfig } from '../types';
+import type { AlfaDynamicConfig, IAppConfig } from '../types';
 /**
  * 获取 Alfa 平台配置的 Config
  * @param config
  * @returns
  */
 export declare const getConfig: (config: IAppConfig) => Promise<AlfaDynamicConfig>;
+/**
+ * 支持从 fecs 接口获取业务配置，获取到的数据和控制台一致，不需要额外处理
+ */
+export declare const getConfigV2: (config: IAppConfig) => Promise<{
+    ALIYUN_CONSOLE_CONFIG: Partial<{
+        fEnv: import("../types").EnvEnum;
+        LOCALE: string;
+        CHANNEL: string;
+        CHANNEL_LINKS: Partial<Record<string, string>>;
+        CHANNEL_FEATURE_STATUS: Partial<Record<string, {
+            status: boolean;
+            attribute: {
+                customAttrs: Record<string, unknown>;
+                regions: string[] | {
+                    region: string[];
+                };
+            };
+        }>>;
+        FEATURE_STATUS: Partial<Record<string, boolean>>;
+        SEC_TOKEN: string;
+        portalType: string;
+        MAIN_ACCOUNT_PK: string;
+        CURRENT_PK: string;
+        APP_ID?: string | undefined;
+    }> | undefined;
+    ALIYUN_CONSOLE_GLOBAL: Record<string, any>;
+} | undefined>;

package/types/utils/interceptors/requestInterceptor.d.ts

@@ -0,0 +1,2 @@
+import type { AxiosRequestConfig } from 'axios';
+export default function requestInterceptor(config: AxiosRequestConfig): Promise<AxiosRequestConfig>;