@alicloud/alfa-core 1.5.11 → 1.5.12-beta.2

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/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/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

@@ -65,6 +65,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 +76,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,8 +88,16 @@ function _responseInterceptor() {
           }
           return _context.abrupt("return", response);
         case 1:
-          config.url = url === null || url === void 0 ? void 0 : url.replace(/:\/\/cws\.([a-z0-9-]+)\.com\//, function (match, p1) {
-            return "://cws2.".concat(p1, ".com/");
+          // 非公有云域名（.alibaba 等）没有 cws2 fallback，直接跳过
+          shouldSkipFallback = url && noCws2FallbackHosts.some(function (host) {
+            return url.includes(host);
+          });
+          if (shouldSkipFallback) {
+            _context.next = 3;
+            break;
+          }
+          config.url = url === null || url === void 0 ? void 0 : url.replace(/:\/\/cws\.([a-z0-9-]+\.(?:com|alibaba))\//, function (match, p1) {
+            return "://cws2.".concat(p1, "/");
           });
           _context.next = 2;
           return axios(config);

package/es/utils/logger.js

@@ -80,8 +80,8 @@ var Logger = /*#__PURE__*/function () {
     value: function track(method, topic, params) {
       var data = this.mergeData(params);
 
-      // 国内站、国际站、idpt 允许上报
-      if (!['aliyun.com', 'alibabacloud.com', 'aliyun-inc.com', 'alibaba-inc.com', 'idptcloud01.com', 'idptcloud01-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/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/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

@@ -72,6 +72,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 +83,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,8 +95,16 @@ function _responseInterceptor() {
           }
           return _context.abrupt("return", response);
         case 1:
-          config.url = url === null || url === void 0 ? void 0 : url.replace(/:\/\/cws\.([a-z0-9-]+)\.com\//, function (match, p1) {
-            return "://cws2.".concat(p1, ".com/");
+          // 非公有云域名（.alibaba 等）没有 cws2 fallback，直接跳过
+          shouldSkipFallback = url && noCws2FallbackHosts.some(function (host) {
+            return url.includes(host);
+          });
+          if (shouldSkipFallback) {
+            _context.next = 3;
+            break;
+          }
+          config.url = url === null || url === void 0 ? void 0 : url.replace(/:\/\/cws\.([a-z0-9-]+\.(?:com|alibaba))\//, function (match, p1) {
+            return "://cws2.".concat(p1, "/");
           });
           _context.next = 2;
           return (0, _axios.default)(config);

package/lib/utils/logger.js

@@ -87,8 +87,8 @@ var Logger = exports.default = /*#__PURE__*/function () {
     value: function track(method, topic, params) {
       var data = this.mergeData(params);
 
-      // 国内站、国际站、idpt 允许上报
-      if (!['aliyun.com', 'alibabacloud.com', 'aliyun-inc.com', 'alibaba-inc.com', 'idptcloud01.com', 'idptcloud01-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.5.11",
+  "version": "1.5.12-beta.2",
   "description": "MicroFront End SDK for alicloud",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -33,7 +33,7 @@
     "crypto-js": "^4.1.1",
     "qs": "^6.14.0",
     "tslib": "^2.4.0",
-    "@alicloud/console-os-kernal": "^1.4.39"
+    "@alicloud/console-os-kernal": "^1.4.40-beta.2"
   },
   "scripts": {
     "build": "npm run babel && npm run babel:esm && npm run types",

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>;