@alicloud/alfa-core 1.6.0-beta.1 → 1.6.0-beta.10

package/es/index.js

@@ -1,5 +1,5 @@
 export { createMicroApp } from './createMicroApp';
-export { addRequestInterceptor } from './utils/interceptors';
+export { addRequestInterceptor, normalizeCdnUrl } from './utils/interceptors';
 export { getRelease } from './utils/getRelease';
 export { getManifest } from './utils/getManifest';
 export { getConfig, getConfigV2 } from './utils/getConfig';

package/es/utils/channel.js

@@ -15,11 +15,21 @@ export function getChannel(value) {
   }
 
   // 尝试根据域名判断
-  if (['alibabacloud.com', 'idptcloud01cs.com', 'idptcloud01-inc.com'].find(function (domain) {
+  if (['alibabacloud.com'].find(function (domain) {
     return location.hostname.endsWith(domain);
   })) {
     return 'SIN';
   }
+  if (['idptcloud01.com', 'idptcloud01cs.com', 'idptcloud01-inc.com'].find(function (domain) {
+    return location.hostname.endsWith(domain);
+  })) {
+    return 'EA134';
+  }
+  if (['idptcloud.com'].find(function (domain) {
+    return location.hostname.endsWith(domain);
+  })) {
+    return 'CM10';
+  }
 
   // 默认返回 OFFICIAL
   return 'OFFICIAL';

package/es/utils/env.js

@@ -1,3 +1,15 @@
+// 无预发环境的域名后缀（一国一云及类似环境）
+var noPrepubDomains = ['idptcloud01.com', 'idptcloud01-inc.com', 'uscloud.alibaba', 'idptcloud03.alibaba', 'idptcloud03-inc.alibaba'];
+var isNoPrepubDomain = function isNoPrepubDomain() {
+  try {
+    return noPrepubDomains.some(function (domain) {
+      return location.hostname.endsWith(domain);
+    });
+  } catch (e) {
+    return false;
+  }
+};
+
 /**
  * get alfa env
  * @returns
@@ -11,7 +23,11 @@ export var getEnv = function getEnv(value) {
       return 'local';
     }
   }
+  var env = ((_window = window) === null || _window === void 0 ? void 0 : (_window$ALIYUN_CONSOL = _window.ALIYUN_CONSOLE_CONFIG) === null || _window$ALIYUN_CONSOL === void 0 ? void 0 : _window$ALIYUN_CONSOL.fEnv) || 'prod';
 
-  // default return prod
-  return ((_window = window) === null || _window === void 0 ? void 0 : (_window$ALIYUN_CONSOL = _window.ALIYUN_CONSOLE_CONFIG) === null || _window$ALIYUN_CONSOL === void 0 ? void 0 : _window$ALIYUN_CONSOL.fEnv) || 'prod';
+  // 无预发环境的域名强制使用 prod
+  if ((env === 'pre' || env === 'daily') && isNoPrepubDomain()) {
+    return 'prod';
+  }
+  return env;
 };

package/es/utils/getConfig.js

@@ -93,7 +93,7 @@ export var getConfig = /*#__PURE__*/function () {
  */
 export var getConfigV2 = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(config) {
-    var releaseConfig, _ref5, relatedConsoleAppId, currentConfig, _ALIYUN_CONSOLE_CONFI, res, _t3;
+    var releaseConfig, _ref5, relatedConsoleAppId, currentConfig, _ALIYUN_CONSOLE_CONFI, mainDomain, res, _t3;
     return _regeneratorRuntime.wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -117,8 +117,11 @@ export var getConfigV2 = /*#__PURE__*/function () {
           return _context2.abrupt("return", currentConfig);
         case 2:
           _context2.prev = 2;
+          // 内网域名(如 aliyun-inc.com / alibaba-inc.com)的 fecs 服务实际部署在去掉 `-inc` 的公网域名上,
+          // 这里剥离一级域名结尾的 `-inc` 后缀,确保 fecs 请求命中正确域名
+          mainDomain = parseEnv().MAIN_DOMAIN.replace(/-inc(?=\.[^.]+$)/, '');
           _context2.next = 3;
-          return request.get("https://".concat(config.env !== 'prod' ? 'pre-' : '', "fecs.console.").concat(parseEnv().MAIN_DOMAIN, "/api/alfa/console/config?appId=").concat(relatedConsoleAppId), {
+          return request.get("https://".concat(config.env !== 'prod' ? 'pre-' : '', "fecs.console.").concat(mainDomain, "/api/alfa/console/config?appId=").concat(relatedConsoleAppId), {
             withCredentials: true
           });
         case 3:

package/es/utils/getRelease.js

@@ -4,10 +4,32 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+import parseEnv from '@alicloud/console-base-conf-parse-env';
 import cache from './cacheManager';
 import { getMicroAppRelease } from './oss';
 import { getEnv } from './env';
 import { getChannel } from './channel';
+var idptcloud03CdnHost = 'idptcloud03asset.alibaba';
+var getMainResourceCdn = function getMainResourceCdn() {
+  try {
+    var _parseEnv;
+    return ((_parseEnv = parseEnv()) === null || _parseEnv === void 0 ? void 0 : _parseEnv.MAIN_RESOURCE_CDN) || '';
+  } catch (e) {
+    return '';
+  }
+};
+var isIdptcloud03Cdn = function isIdptcloud03Cdn() {
+  return getMainResourceCdn().includes(idptcloud03CdnHost);
+};
+var getCwsHost = function getCwsHost(channel) {
+  if (isIdptcloud03Cdn()) {
+    return "cws.".concat(idptcloud03CdnHost);
+  }
+  if (['SIN', 'EA134', 'CM10'].includes(channel)) {
+    return 'cws.alcasset.com';
+  }
+  return 'cws.alyasset.com';
+};
 
 /**
  * get alfa release url
@@ -17,15 +39,10 @@ import { getChannel } from './channel';
  */
 export var getReleaseUrl = function getReleaseUrl(name, env, channel) {
   var _process;
-  var cdnUrl = "https://cws.alicdn.com/Release/alfa/".concat(name, "/release.json");
-  var cdnPreUrl = "https://cws2.alicdn.com/Prepub/alfa/".concat(name, "/release.json");
-  if (channel === 'OFFICIAL') {
-    cdnUrl = "htts://cws.alyasset.com/Release/alfa/".concat(name, "/release.json");
-    cdnPreUrl = "https://cws.alyasset.com/Prepub/alfa/".concat(name, "/release.json");
-  } else if (channel === 'SIN') {
-    cdnUrl = "https://cws.alcasset.com/Release/alfa/".concat(name, "/release.json");
-    cdnPreUrl = "https://cws.alcasset.com/Prepub/alfa/".concat(name, "/release.json");
-  }
+  var cwsHost = getCwsHost(channel);
+  var path = isIdptcloud03Cdn() ? 'Release' : 'Prepub';
+  var cdnUrl = "https://".concat(cwsHost, "/Release/alfa/").concat(name, "/release.json");
+  var cdnPreUrl = "https://".concat(cwsHost, "/").concat(path, "/alfa/").concat(name, "/release.json");
   switch (env) {
     case 'local':
       return ((_process = process) === null || _process === void 0 ? void 0 : _process.env.ALFA_RELEASE_URL) || cdnPreUrl;
@@ -48,12 +65,8 @@ function patchReleaseResult(releaseConfig, channel) {
     if (!domain) {
       return domain;
     }
-    if (channel === 'OFFICIAL') {
-      return domain.replace(/cws2?\.alicdn\.com/, 'cws.alyasset.com');
-    } else if (channel === 'SIN') {
-      return domain.replace(/cws2?\.alicdn\.com/, 'cws.alcasset.com');
-    }
-    return domain;
+    var path = isIdptcloud03Cdn() ? '/Release/' : '/Prepub/';
+    return domain.replace(/cws2?\.alicdn\.com/, getCwsHost(channel)).replace(/\/Prepub\//g, path);
   };
   var mapObject = function mapObject(obj, fn) {
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
@@ -109,7 +122,7 @@ export var getRelease = /*#__PURE__*/function () {
           _context.next = 6;
           return getMicroAppRelease(name, env);
         case 6:
-          return _context.abrupt("return", _t2(_context.sent));
+          return _context.abrupt("return", _t2(_context.sent, channel));
         case 7:
           _context.prev = 7;
           _t3 = _context["catch"](5);

package/es/utils/index.js

@@ -76,8 +76,9 @@ export var getRelativePath = function getRelativePath(from, to, base) {
       toHost = _URL2.host,
       toPath = _URL2.pathname;
 
-    // from 'g.alicdn.com' to 'dev.g.alicdn.com' regarded as same host
-    if (fromHost !== toHost && (toHost !== 'g.alicdn.com' || fromHost !== 'dev.g.alicdn.com')) return to;
+    // g.xxx and dev.g.xxx / dev-g.xxx regarded as same host
+    var isSameHost = fromHost === toHost || /^dev[.-]g\./.test(fromHost) && toHost === fromHost.replace(/^dev[.-]g\./, 'g.');
+    if (!isSameHost) return to;
     var fromParts = trimArray(fromPath.split('/'));
     var toParts = trimArray(toPath.split('/'));
     var length = Math.min(fromParts.length, toParts.length);

package/es/utils/interceptors/index.js

@@ -1,4 +1,5 @@
 import instance from '../request';
+export { normalizeCdnUrl } from './requestInterceptor';
 export var addRequestInterceptor = function addRequestInterceptor(fn) {
   var interceptor = function interceptor(config) {
     try {

package/es/utils/interceptors/requestInterceptor.js

@@ -1,11 +1,13 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-var _window$ALIYUN_CONSOL;
+var _ALIYUN_CONSOLE_CONFI;
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 // 支持的主权云 CDN Host
-// @ts-ignore
-var whiteList = ['idptcloud01cdn.com', ((_window$ALIYUN_CONSOL = window.ALIYUN_CONSOLE_CONFIG) === null || _window$ALIYUN_CONSOL === void 0 ? void 0 : _window$ALIYUN_CONSOL.MAIN_RESOURCE_CDN) || 'alicdn.com'];
+var whiteList = ['idptcloud01cdn.com', 'uscasset.alibaba', 'idptcloud03asset.alibaba', ((_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.MAIN_RESOURCE_CDN) || 'alicdn.com'];
 var win = window;
 
+// 无预发环境的 CDN 域名（一国一云及类似环境）
+var noPrepubCdnHosts = ['idptcloud01cdn.com', 'uscasset.alibaba', 'idptcloud03asset.alibaba'];
+
 // 兼容非公有云环境，用于替换请求的 hostname
 var getCurrentCdnHost = function getCurrentCdnHost() {
   try {
@@ -24,6 +26,8 @@ var getCurrentCdnHost = function getCurrentCdnHost() {
     var _URL = new URL(scriptUrl),
       hostname = _URL.hostname;
     var parts = hostname.split('.');
+
+    // 支持 .com 和 .alibaba 等多种顶级域名：取最后两段作为 CDN host
     var _currentCdnHost = parts.length > 2 ? parts.slice(-2).join('.') : hostname;
     if (!win.__alfa_cdn_host__) {
       win.__alfa_cdn_host__ = _currentCdnHost;
@@ -37,6 +41,22 @@ var currentCdnHost = getCurrentCdnHost();
 
 // 如果 host 被 o2 插件替换，则可以被用来判断是否需要替换 cdnHost
 var gCdnHost = '//g.alicdn.com/';
+var noDevGCdnPattern = /dev\.g\.(idptcloud01cdn\.com|uscasset\.alibaba|idptcloud03asset\.alibaba)/g;
+export var normalizeCdnUrl = function normalizeCdnUrl(url) {
+  var isSupportedCdnHost = currentCdnHost && currentCdnHost !== 'alicdn.com' && (whiteList.includes(currentCdnHost) || gCdnHost.includes(currentCdnHost));
+  if (isSupportedCdnHost) {
+    return url.replace(/\.alicdn\.com/g, ".".concat(currentCdnHost))
+    // 预发域名也需替换（非公有云无独立预发域名）
+    .replace(/\.aliyun-inc\.com/g, ".".concat(currentCdnHost))
+    // 非公有云下无 cws2
+    .replace('cws2.', 'cws.')
+    // 无预发环境时使用 Release 路径
+    .replace(/\/Prepub\//g, noPrepubCdnHosts.includes(currentCdnHost) ? '/Release/' : '/Prepub/')
+    // 这些域名无 dev.g 子域名
+    .replace(noDevGCdnPattern, 'dev-g.$1');
+  }
+  return url;
+};
 
 // 根据不同环境替换 cdn 的域名
 export default function requestInterceptor(_x) {
@@ -47,12 +67,8 @@ function _requestInterceptor() {
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (currentCdnHost && currentCdnHost !== 'alicdn.com' && (whiteList.includes(currentCdnHost) || gCdnHost.includes(currentCdnHost))) {
-            // if cdn is not alicdn, replace it
-            if (config.url) {
-              config.url = config.url.replace(new RegExp('.alicdn.com'), ".".concat(currentCdnHost)).replace('cws2.', 'cws.') // 非公有云下无 cws2
-              .replace('dev.g.idptcloud01cdn.com', 'dev-g.idptcloud01cdn.com'); // idptcloud01cdn 无 dev.g 子域名
-            }
+          if (config.url) {
+            config.url = normalizeCdnUrl(config.url);
           }
           return _context.abrupt("return", config);
         case 1:

package/es/utils/interceptors/responseInterceptor.js

@@ -10,7 +10,8 @@ function isManifest(url, data) {
   return false;
 }
 function isRelease(url, data) {
-  var pathname = new URL(url).pathname;
+  var _URL = new URL(url),
+    pathname = _URL.pathname;
   if (!data) return false;
 
   // central cws release.json
@@ -65,6 +66,9 @@ function isLegal(url, data) {
   return false;
 }
 
+// 无 cws2 fallback 的 CDN 域名（一国一云及类似环境）
+var noCws2FallbackHosts = ['idptcloud01cdn.com', 'uscasset.alibaba', 'idptcloud03asset.alibaba'];
+
 // check response content after networkErrorInterceptor
 // if it legal, cache it
 // if it is illegal, fallback cws.alicdn.com to cws2.alicdn.com.
@@ -73,7 +77,7 @@ export default function responseInterceptor(_x) {
 }
 function _responseInterceptor() {
   _responseInterceptor = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(response) {
-    var data, config, url, newResponse, error;
+    var data, config, url, shouldSkipFallback, newResponse, error;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -85,15 +89,25 @@ function _responseInterceptor() {
           }
           return _context.abrupt("return", response);
         case 1:
+          // 非公有云域名（一国一云等）没有 cws2 fallback，直接跳过
+          shouldSkipFallback = url && noCws2FallbackHosts.some(function (host) {
+            return url.includes(host);
+          });
+          if (shouldSkipFallback) {
+            _context.next = 3;
+            break;
+          }
           if (['cws.alyasset.com', 'cws.alcasset.com'].some(function (domain) {
             return url === null || url === void 0 ? void 0 : url.includes("://".concat(domain, "/"));
           })) {
-            _context.next = 3;
-            break;
+            config.url = url === null || url === void 0 ? void 0 : url.replace(/:\/\/cws\.al[yc]asset\.com\//, function () {
+              return '://cws2.alicdn.com/';
+            });
+          } else {
+            config.url = url === null || url === void 0 ? void 0 : url.replace(/:\/\/cws\.([a-z0-9-]+\.(?:com|alibaba))\//, function (match, p1) {
+              return "://cws2.".concat(p1, "/");
+            });
           }
-          config.url = url === null || url === void 0 ? void 0 : url.replace(/:\/\/cws\.([a-z0-9-]+)\.com\//, function (match, p1) {
-            return "://cws2.".concat(p1, ".com/");
-          });
           _context.next = 2;
           return axios(config);
         case 2:

package/es/utils/logger.js

@@ -75,8 +75,8 @@ var Logger = /*#__PURE__*/function () {
     value: function track(method, topic, params) {
       var data = this.mergeData(params);
 
-      // just report in aliyun.com && alibabacloud.com
-      if (!['aliyun.com', 'alibabacloud.com', 'aliyun-inc.com', 'alibaba-inc.com'].find(function (domain) {
+      // 国内站、国际站、idpt、一国一云允许上报
+      if (!['aliyun.com', 'alibabacloud.com', 'aliyun-inc.com', 'alibaba-inc.com', 'idptcloud01.com', 'idptcloud01-inc.com', 'uscloud.alibaba', 'idptcloud03.alibaba', 'idptcloud03-inc.alibaba'].find(function (domain) {
         return location.hostname.endsWith(domain);
       })) return false;
 

package/lib/index.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 var _exportNames = {
   createMicroApp: true,
   addRequestInterceptor: true,
+  normalizeCdnUrl: true,
   getRelease: true,
   getManifest: true,
   getConfig: true,
@@ -106,6 +107,12 @@ Object.defineProperty(exports, "loadExposedModule", {
     return _consoleOsKernal.loadExposedModule;
   }
 });
+Object.defineProperty(exports, "normalizeCdnUrl", {
+  enumerable: true,
+  get: function get() {
+    return _interceptors.normalizeCdnUrl;
+  }
+});
 Object.defineProperty(exports, "prefetch", {
   enumerable: true,
   get: function get() {

package/lib/utils/channel.js

@@ -21,11 +21,21 @@ function getChannel(value) {
   }
 
   // 尝试根据域名判断
-  if (['alibabacloud.com', 'idptcloud01cs.com', 'idptcloud01-inc.com'].find(function (domain) {
+  if (['alibabacloud.com'].find(function (domain) {
     return location.hostname.endsWith(domain);
   })) {
     return 'SIN';
   }
+  if (['idptcloud01.com', 'idptcloud01cs.com', 'idptcloud01-inc.com'].find(function (domain) {
+    return location.hostname.endsWith(domain);
+  })) {
+    return 'EA134';
+  }
+  if (['idptcloud.com'].find(function (domain) {
+    return location.hostname.endsWith(domain);
+  })) {
+    return 'CM10';
+  }
 
   // 默认返回 OFFICIAL
   return 'OFFICIAL';

package/lib/utils/env.js

@@ -4,6 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getEnv = void 0;
+// 无预发环境的域名后缀（一国一云及类似环境）
+var noPrepubDomains = ['idptcloud01.com', 'idptcloud01-inc.com', 'uscloud.alibaba', 'idptcloud03.alibaba', 'idptcloud03-inc.alibaba'];
+var isNoPrepubDomain = function isNoPrepubDomain() {
+  try {
+    return noPrepubDomains.some(function (domain) {
+      return location.hostname.endsWith(domain);
+    });
+  } catch (e) {
+    return false;
+  }
+};
+
 /**
  * get alfa env
  * @returns
@@ -17,7 +29,11 @@ var getEnv = exports.getEnv = function getEnv(value) {
       return 'local';
     }
   }
+  var env = ((_window = window) === null || _window === void 0 ? void 0 : (_window$ALIYUN_CONSOL = _window.ALIYUN_CONSOLE_CONFIG) === null || _window$ALIYUN_CONSOL === void 0 ? void 0 : _window$ALIYUN_CONSOL.fEnv) || 'prod';
 
-  // default return prod
-  return ((_window = window) === null || _window === void 0 ? void 0 : (_window$ALIYUN_CONSOL = _window.ALIYUN_CONSOLE_CONFIG) === null || _window$ALIYUN_CONSOL === void 0 ? void 0 : _window$ALIYUN_CONSOL.fEnv) || 'prod';
+  // 无预发环境的域名强制使用 prod
+  if ((env === 'pre' || env === 'daily') && isNoPrepubDomain()) {
+    return 'prod';
+  }
+  return env;
 };

package/lib/utils/getConfig.js

@@ -100,7 +100,7 @@ var getConfig = exports.getConfig = /*#__PURE__*/function () {
  */
 var getConfigV2 = exports.getConfigV2 = /*#__PURE__*/function () {
   var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(config) {
-    var releaseConfig, _ref5, relatedConsoleAppId, currentConfig, _ALIYUN_CONSOLE_CONFI, res, _t3;
+    var releaseConfig, _ref5, relatedConsoleAppId, currentConfig, _ALIYUN_CONSOLE_CONFI, mainDomain, res, _t3;
     return _regenerator.default.wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -124,8 +124,11 @@ var getConfigV2 = exports.getConfigV2 = /*#__PURE__*/function () {
           return _context2.abrupt("return", currentConfig);
         case 2:
           _context2.prev = 2;
+          // 内网域名(如 aliyun-inc.com / alibaba-inc.com)的 fecs 服务实际部署在去掉 `-inc` 的公网域名上,
+          // 这里剥离一级域名结尾的 `-inc` 后缀,确保 fecs 请求命中正确域名
+          mainDomain = (0, _consoleBaseConfParseEnv.default)().MAIN_DOMAIN.replace(/-inc(?=\.[^.]+$)/, '');
           _context2.next = 3;
-          return _request.default.get("https://".concat(config.env !== 'prod' ? 'pre-' : '', "fecs.console.").concat((0, _consoleBaseConfParseEnv.default)().MAIN_DOMAIN, "/api/alfa/console/config?appId=").concat(relatedConsoleAppId), {
+          return _request.default.get("https://".concat(config.env !== 'prod' ? 'pre-' : '', "fecs.console.").concat(mainDomain, "/api/alfa/console/config?appId=").concat(relatedConsoleAppId), {
             withCredentials: true
           });
         case 3:

package/lib/utils/getRelease.js

@@ -9,12 +9,35 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _consoleBaseConfParseEnv = _interopRequireDefault(require("@alicloud/console-base-conf-parse-env"));
 var _cacheManager = _interopRequireDefault(require("./cacheManager"));
 var _oss = require("./oss");
 var _env = require("./env");
 var _channel = require("./channel");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var idptcloud03CdnHost = 'idptcloud03asset.alibaba';
+var getMainResourceCdn = function getMainResourceCdn() {
+  try {
+    var _parseEnv;
+    return ((_parseEnv = (0, _consoleBaseConfParseEnv.default)()) === null || _parseEnv === void 0 ? void 0 : _parseEnv.MAIN_RESOURCE_CDN) || '';
+  } catch (e) {
+    return '';
+  }
+};
+var isIdptcloud03Cdn = function isIdptcloud03Cdn() {
+  return getMainResourceCdn().includes(idptcloud03CdnHost);
+};
+var getCwsHost = function getCwsHost(channel) {
+  if (isIdptcloud03Cdn()) {
+    return "cws.".concat(idptcloud03CdnHost);
+  }
+  if (['SIN', 'EA134', 'CM10'].includes(channel)) {
+    return 'cws.alcasset.com';
+  }
+  return 'cws.alyasset.com';
+};
+
 /**
  * get alfa release url
  * @param appId
@@ -23,15 +46,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  */
 var getReleaseUrl = exports.getReleaseUrl = function getReleaseUrl(name, env, channel) {
   var _process;
-  var cdnUrl = "https://cws.alicdn.com/Release/alfa/".concat(name, "/release.json");
-  var cdnPreUrl = "https://cws2.alicdn.com/Prepub/alfa/".concat(name, "/release.json");
-  if (channel === 'OFFICIAL') {
-    cdnUrl = "htts://cws.alyasset.com/Release/alfa/".concat(name, "/release.json");
-    cdnPreUrl = "https://cws.alyasset.com/Prepub/alfa/".concat(name, "/release.json");
-  } else if (channel === 'SIN') {
-    cdnUrl = "https://cws.alcasset.com/Release/alfa/".concat(name, "/release.json");
-    cdnPreUrl = "https://cws.alcasset.com/Prepub/alfa/".concat(name, "/release.json");
-  }
+  var cwsHost = getCwsHost(channel);
+  var path = isIdptcloud03Cdn() ? 'Release' : 'Prepub';
+  var cdnUrl = "https://".concat(cwsHost, "/Release/alfa/").concat(name, "/release.json");
+  var cdnPreUrl = "https://".concat(cwsHost, "/").concat(path, "/alfa/").concat(name, "/release.json");
   switch (env) {
     case 'local':
       return ((_process = process) === null || _process === void 0 ? void 0 : _process.env.ALFA_RELEASE_URL) || cdnPreUrl;
@@ -54,12 +72,8 @@ function patchReleaseResult(releaseConfig, channel) {
     if (!domain) {
       return domain;
     }
-    if (channel === 'OFFICIAL') {
-      return domain.replace(/cws2?\.alicdn\.com/, 'cws.alyasset.com');
-    } else if (channel === 'SIN') {
-      return domain.replace(/cws2?\.alicdn\.com/, 'cws.alcasset.com');
-    }
-    return domain;
+    var path = isIdptcloud03Cdn() ? '/Release/' : '/Prepub/';
+    return domain.replace(/cws2?\.alicdn\.com/, getCwsHost(channel)).replace(/\/Prepub\//g, path);
   };
   var mapObject = function mapObject(obj, fn) {
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
@@ -115,7 +129,7 @@ var getRelease = exports.getRelease = /*#__PURE__*/function () {
           _context.next = 6;
           return (0, _oss.getMicroAppRelease)(name, env);
         case 6:
-          return _context.abrupt("return", _t2(_context.sent));
+          return _context.abrupt("return", _t2(_context.sent, channel));
         case 7:
           _context.prev = 7;
           _t3 = _context["catch"](5);

package/lib/utils/index.js

@@ -106,8 +106,9 @@ var getRelativePath = exports.getRelativePath = function getRelativePath(from, t
       toHost = _URL2.host,
       toPath = _URL2.pathname;
 
-    // from 'g.alicdn.com' to 'dev.g.alicdn.com' regarded as same host
-    if (fromHost !== toHost && (toHost !== 'g.alicdn.com' || fromHost !== 'dev.g.alicdn.com')) return to;
+    // g.xxx and dev.g.xxx / dev-g.xxx regarded as same host
+    var isSameHost = fromHost === toHost || /^dev[.-]g\./.test(fromHost) && toHost === fromHost.replace(/^dev[.-]g\./, 'g.');
+    if (!isSameHost) return to;
     var fromParts = trimArray(fromPath.split('/'));
     var toParts = trimArray(toPath.split('/'));
     var length = Math.min(fromParts.length, toParts.length);

package/lib/utils/interceptors/index.js

@@ -5,7 +5,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.addRequestInterceptor = void 0;
+Object.defineProperty(exports, "normalizeCdnUrl", {
+  enumerable: true,
+  get: function get() {
+    return _requestInterceptor.normalizeCdnUrl;
+  }
+});
 var _request = _interopRequireDefault(require("../request"));
+var _requestInterceptor = require("./requestInterceptor");
 var addRequestInterceptor = exports.addRequestInterceptor = function addRequestInterceptor(fn) {
   var interceptor = function interceptor(config) {
     try {

package/lib/utils/interceptors/requestInterceptor.js

@@ -5,14 +5,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = requestInterceptor;
+exports.normalizeCdnUrl = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _window$ALIYUN_CONSOL;
+var _ALIYUN_CONSOLE_CONFI;
 // 支持的主权云 CDN Host
-// @ts-ignore
-var whiteList = ['idptcloud01cdn.com', ((_window$ALIYUN_CONSOL = window.ALIYUN_CONSOLE_CONFIG) === null || _window$ALIYUN_CONSOL === void 0 ? void 0 : _window$ALIYUN_CONSOL.MAIN_RESOURCE_CDN) || 'alicdn.com'];
+var whiteList = ['idptcloud01cdn.com', 'uscasset.alibaba', 'idptcloud03asset.alibaba', ((_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.MAIN_RESOURCE_CDN) || 'alicdn.com'];
 var win = window;
 
+// 无预发环境的 CDN 域名（一国一云及类似环境）
+var noPrepubCdnHosts = ['idptcloud01cdn.com', 'uscasset.alibaba', 'idptcloud03asset.alibaba'];
+
 // 兼容非公有云环境，用于替换请求的 hostname
 var getCurrentCdnHost = function getCurrentCdnHost() {
   try {
@@ -31,6 +34,8 @@ var getCurrentCdnHost = function getCurrentCdnHost() {
     var _URL = new URL(scriptUrl),
       hostname = _URL.hostname;
     var parts = hostname.split('.');
+
+    // 支持 .com 和 .alibaba 等多种顶级域名：取最后两段作为 CDN host
     var _currentCdnHost = parts.length > 2 ? parts.slice(-2).join('.') : hostname;
     if (!win.__alfa_cdn_host__) {
       win.__alfa_cdn_host__ = _currentCdnHost;
@@ -44,6 +49,22 @@ var currentCdnHost = getCurrentCdnHost();
 
 // 如果 host 被 o2 插件替换，则可以被用来判断是否需要替换 cdnHost
 var gCdnHost = '//g.alicdn.com/';
+var noDevGCdnPattern = /dev\.g\.(idptcloud01cdn\.com|uscasset\.alibaba|idptcloud03asset\.alibaba)/g;
+var normalizeCdnUrl = exports.normalizeCdnUrl = function normalizeCdnUrl(url) {
+  var isSupportedCdnHost = currentCdnHost && currentCdnHost !== 'alicdn.com' && (whiteList.includes(currentCdnHost) || gCdnHost.includes(currentCdnHost));
+  if (isSupportedCdnHost) {
+    return url.replace(/\.alicdn\.com/g, ".".concat(currentCdnHost))
+    // 预发域名也需替换（非公有云无独立预发域名）
+    .replace(/\.aliyun-inc\.com/g, ".".concat(currentCdnHost))
+    // 非公有云下无 cws2
+    .replace('cws2.', 'cws.')
+    // 无预发环境时使用 Release 路径
+    .replace(/\/Prepub\//g, noPrepubCdnHosts.includes(currentCdnHost) ? '/Release/' : '/Prepub/')
+    // 这些域名无 dev.g 子域名
+    .replace(noDevGCdnPattern, 'dev-g.$1');
+  }
+  return url;
+};
 
 // 根据不同环境替换 cdn 的域名
 function requestInterceptor(_x) {
@@ -54,12 +75,8 @@ function _requestInterceptor() {
     return _regenerator.default.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (currentCdnHost && currentCdnHost !== 'alicdn.com' && (whiteList.includes(currentCdnHost) || gCdnHost.includes(currentCdnHost))) {
-            // if cdn is not alicdn, replace it
-            if (config.url) {
-              config.url = config.url.replace(new RegExp('.alicdn.com'), ".".concat(currentCdnHost)).replace('cws2.', 'cws.') // 非公有云下无 cws2
-              .replace('dev.g.idptcloud01cdn.com', 'dev-g.idptcloud01cdn.com'); // idptcloud01cdn 无 dev.g 子域名
-            }
+          if (config.url) {
+            config.url = normalizeCdnUrl(config.url);
           }
           return _context.abrupt("return", config);
         case 1:

package/lib/utils/interceptors/responseInterceptor.js

@@ -17,7 +17,8 @@ function isManifest(url, data) {
   return false;
 }
 function isRelease(url, data) {
-  var pathname = new URL(url).pathname;
+  var _URL = new URL(url),
+    pathname = _URL.pathname;
   if (!data) return false;
 
   // central cws release.json
@@ -72,6 +73,9 @@ function isLegal(url, data) {
   return false;
 }
 
+// 无 cws2 fallback 的 CDN 域名（一国一云及类似环境）
+var noCws2FallbackHosts = ['idptcloud01cdn.com', 'uscasset.alibaba', 'idptcloud03asset.alibaba'];
+
 // check response content after networkErrorInterceptor
 // if it legal, cache it
 // if it is illegal, fallback cws.alicdn.com to cws2.alicdn.com.
@@ -80,7 +84,7 @@ function responseInterceptor(_x) {
 }
 function _responseInterceptor() {
   _responseInterceptor = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(response) {
-    var data, config, url, newResponse, error;
+    var data, config, url, shouldSkipFallback, newResponse, error;
     return _regenerator.default.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -92,15 +96,25 @@ function _responseInterceptor() {
           }
           return _context.abrupt("return", response);
         case 1:
+          // 非公有云域名（一国一云等）没有 cws2 fallback，直接跳过
+          shouldSkipFallback = url && noCws2FallbackHosts.some(function (host) {
+            return url.includes(host);
+          });
+          if (shouldSkipFallback) {
+            _context.next = 3;
+            break;
+          }
           if (['cws.alyasset.com', 'cws.alcasset.com'].some(function (domain) {
             return url === null || url === void 0 ? void 0 : url.includes("://".concat(domain, "/"));
           })) {
-            _context.next = 3;
-            break;
+            config.url = url === null || url === void 0 ? void 0 : url.replace(/:\/\/cws\.al[yc]asset\.com\//, function () {
+              return '://cws2.alicdn.com/';
+            });
+          } else {
+            config.url = url === null || url === void 0 ? void 0 : url.replace(/:\/\/cws\.([a-z0-9-]+\.(?:com|alibaba))\//, function (match, p1) {
+              return "://cws2.".concat(p1, "/");
+            });
           }
-          config.url = url === null || url === void 0 ? void 0 : url.replace(/:\/\/cws\.([a-z0-9-]+)\.com\//, function (match, p1) {
-            return "://cws2.".concat(p1, ".com/");
-          });
           _context.next = 2;
           return (0, _axios.default)(config);
         case 2:

package/lib/utils/logger.js

@@ -82,8 +82,8 @@ var Logger = exports.default = /*#__PURE__*/function () {
     value: function track(method, topic, params) {
       var data = this.mergeData(params);
 
-      // just report in aliyun.com && alibabacloud.com
-      if (!['aliyun.com', 'alibabacloud.com', 'aliyun-inc.com', 'alibaba-inc.com'].find(function (domain) {
+      // 国内站、国际站、idpt、一国一云允许上报
+      if (!['aliyun.com', 'alibabacloud.com', 'aliyun-inc.com', 'alibaba-inc.com', 'idptcloud01.com', 'idptcloud01-inc.com', 'uscloud.alibaba', 'idptcloud03.alibaba', 'idptcloud03-inc.alibaba'].find(function (domain) {
         return location.hostname.endsWith(domain);
       })) return false;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/alfa-core",
-  "version": "1.6.0-beta.1",
+  "version": "1.6.0-beta.10",
   "description": "MicroFront End SDK for alicloud",
   "main": "lib/index.js",
   "module": "es/index.js",

package/types/index.d.ts

@@ -1,5 +1,5 @@
 export { createMicroApp } from './createMicroApp';
-export { addRequestInterceptor } from './utils/interceptors';
+export { addRequestInterceptor, normalizeCdnUrl } from './utils/interceptors';
 export { getRelease } from './utils/getRelease';
 export { getManifest } from './utils/getManifest';
 export { getConfig, getConfigV2 } from './utils/getConfig';

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

@@ -1,4 +1,5 @@
 import { AxiosRequestConfig } from 'axios';
+export { normalizeCdnUrl } from './requestInterceptor';
 export interface RequestInterceptor {
     (config: AxiosRequestConfig): AxiosRequestConfig | Promise<AxiosRequestConfig>;
 }

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

@@ -1,2 +1,3 @@
 import type { AxiosRequestConfig } from 'axios';
+export declare const normalizeCdnUrl: (url: string) => string;
 export default function requestInterceptor(config: AxiosRequestConfig): Promise<AxiosRequestConfig>;