@alicloud/console-base-conf-parse-env 1.3.9 → 1.4.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.4.0 2023/12/11 @栗知
+
+* 根据预发/线上环境返回不同的 FECS_HOST
+
 ## 1.0.0 2021/07/20 @驳是
 
 * born from ashes

package/build/cjs/enum/index.js

@@ -7,11 +7,10 @@ exports.EEnv = void 0;
 /**
  * 环境枚举，互斥
  */
-var EEnv = /*#__PURE__*/function (EEnv) {
+var EEnv = exports.EEnv = /*#__PURE__*/function (EEnv) {
   EEnv["DEV"] = "dev";
   EEnv["DAILY"] = "daily";
   EEnv["PRE"] = "pre";
   EEnv["PROD"] = "prod";
   return EEnv;
-}({});
-exports.EEnv = EEnv;
+}({});

package/build/cjs/util/get-channel.js

@@ -20,7 +20,8 @@ function getFallbackChannel(site) {
 }
 function getChannel(site) {
   var _ref = window,
-    ALIYUN_ECS_CONSOLE_CONFIG = _ref.ALIYUN_ECS_CONSOLE_CONFIG;
+    ALIYUN_ECS_CONSOLE_CONFIG = _ref.ALIYUN_ECS_CONSOLE_CONFIG,
+    $BUY_CONFIG = _ref.$BUY_CONFIG;
   var channel = '';
   if (_consoleOneConfig.default.ONE) {
     // OneConsole 的场景
@@ -28,6 +29,9 @@ function getChannel(site) {
   } else if (ALIYUN_ECS_CONSOLE_CONFIG) {
     // ECS 不是 OneConsole 但，是大头，需要兼容一下
     channel = ALIYUN_ECS_CONSOLE_CONFIG.channel;
+  } else if ($BUY_CONFIG) {
+    // CommonBuy 环境
+    channel = $BUY_CONFIG.channelId;
   }
   return channel || getFallbackChannel(site);
 }

package/build/cjs/util/get-env.js

@@ -7,6 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = getEnv;
 var _consoleOneConfig = _interopRequireDefault(require("@alicloud/console-one-config"));
 var _enum = require("../enum");
+/**
+ * 是否是 CommonBuy 预发环境
+ */
+function isCommonBuyPre() {
+  var _$BUY_CONFIG;
+  return !_consoleOneConfig.default.ONE && ['pre', 'validate'].includes(((_$BUY_CONFIG = window.$BUY_CONFIG) === null || _$BUY_CONFIG === void 0 ? void 0 : _$BUY_CONFIG.env) || '');
+}
+
 /**
  * 获取当前运行的环境（线上 → 预发 → 日常 → 本地开发）
  */
@@ -44,10 +52,11 @@ function getEnv() {
    * 预发环境：
    * 
    * 1. OneConsole 的输出
+   * 2. CommonBuy 的输出
    * 2. hostname 中带 `pre-` 或 `-pre`
    * 3. 非 HTTPS （通常绑 host）的一般认为是预发
    */
-  if (_consoleOneConfig.default.ONE && _consoleOneConfig.default.ENV === 'pre' || /pre-|-pre/i.test(hostname) || protocol === 'http:') {
+  if (_consoleOneConfig.default.ONE && _consoleOneConfig.default.ENV === 'pre' || isCommonBuyPre() || /pre-|-pre/i.test(hostname) || protocol === 'http:') {
     return _enum.EEnv.PRE;
   }
   return _enum.EEnv.PROD;

package/build/cjs/util/parse-env.js

@@ -18,6 +18,10 @@ function parseEnv() {
     hostname = _ref.location.hostname;
   var ENV = (0, _getEnv.default)();
   var SITE = (0, _getSite.default)();
+  var ENV_IS_DEV = ENV === _enum.EEnv.DEV;
+  var ENV_IS_DAILY = ENV === _enum.EEnv.DAILY;
+  var ENV_IS_PRE = ENV === _enum.EEnv.PRE;
+  var ENV_IS_PROD = ENV === _enum.EEnv.PROD;
 
   /**
    * 是否虚商
@@ -26,23 +30,26 @@ function parseEnv() {
    */
   var DOMAIN_IS_4SERVICE = /4service/.test(hostname);
   var DOMAIN_IS_TEST = /\.test$/.test(hostname);
+  var FECS_FOR_4SERVICE = 'fecs4service';
+  var FECS_FOR_CONSOLE = ENV_IS_DEV || ENV_IS_DAILY || ENV_IS_PRE ? 'pre-fecs' : 'fecs';
   /**
    * 是否「标准」控制台
    * 
    * 有的控制台（甚至有些内部应用会用 console-base，它们的域名不是 .console.aliyun.com），有些逻辑（比如 CloudShell 是否本地打开）需要调整
    */
   var DOMAIN_IS_CONSOLE = /\.console\.aliyun\.(?:com|test)$/.test(hostname);
+  // fecs 域名必须和当前页面域名一致
   var DOMAIN_IS_ALIBABACLOUD = /\.alibabacloud\.(?:com|test)$/.test(hostname);
   // 不同的域名，保证可以获取到 SameSite 属性为 Lax 的 cookie，比如 login_aliyunid_ticket，避免误判成未登录
-  var FECS_HOST = "".concat(DOMAIN_IS_4SERVICE ? 'fecs4service' : 'fecs', ".console.").concat(DOMAIN_IS_ALIBABACLOUD ? 'alibabacloud' : 'aliyun', ".").concat(DOMAIN_IS_TEST ? 'test' : 'com');
+  var FECS_HOST = "".concat(DOMAIN_IS_4SERVICE ? FECS_FOR_4SERVICE : FECS_FOR_CONSOLE, ".console.").concat(DOMAIN_IS_ALIBABACLOUD ? 'alibabacloud' : 'aliyun', ".").concat(DOMAIN_IS_TEST ? 'test' : 'com');
   // 这个不推荐用 protocol-relative，Firefox 调用 CORS 时，有可能 request.header.Origin 是 null 而导致接口失败...
   var FECS_URL_BASE = "https://".concat(FECS_HOST);
   return {
     ENV: ENV,
-    ENV_IS_DEV: ENV === _enum.EEnv.DEV,
-    ENV_IS_DAILY: ENV === _enum.EEnv.DAILY,
-    ENV_IS_PRE: ENV === _enum.EEnv.PRE,
-    ENV_IS_PROD: ENV === _enum.EEnv.PROD,
+    ENV_IS_DEV: ENV_IS_DEV,
+    ENV_IS_DAILY: ENV_IS_DAILY,
+    ENV_IS_PRE: ENV_IS_PRE,
+    ENV_IS_PROD: ENV_IS_PROD,
     APP_ID: _consoleOneConfig.default.APP_ID,
     DOMAIN_IS_4SERVICE: DOMAIN_IS_4SERVICE,
     DOMAIN_IS_CONSOLE: DOMAIN_IS_CONSOLE,

package/build/{es → esm}/util/get-channel.js

@@ -13,7 +13,8 @@ function getFallbackChannel(site) {
 }
 export default function getChannel(site) {
   var _ref = window,
-    ALIYUN_ECS_CONSOLE_CONFIG = _ref.ALIYUN_ECS_CONSOLE_CONFIG;
+    ALIYUN_ECS_CONSOLE_CONFIG = _ref.ALIYUN_ECS_CONSOLE_CONFIG,
+    $BUY_CONFIG = _ref.$BUY_CONFIG;
   var channel = '';
   if (ONE_CONF.ONE) {
     // OneConsole 的场景
@@ -21,6 +22,9 @@ export default function getChannel(site) {
   } else if (ALIYUN_ECS_CONSOLE_CONFIG) {
     // ECS 不是 OneConsole 但，是大头，需要兼容一下
     channel = ALIYUN_ECS_CONSOLE_CONFIG.channel;
+  } else if ($BUY_CONFIG) {
+    // CommonBuy 环境
+    channel = $BUY_CONFIG.channelId;
   }
   return channel || getFallbackChannel(site);
 }

package/build/{es → esm}/util/get-env.js

@@ -1,5 +1,13 @@
 import ONE_CONF from '@alicloud/console-one-config';
 import { EEnv } from '../enum';
+/**
+ * 是否是 CommonBuy 预发环境
+ */
+function isCommonBuyPre() {
+  var _$BUY_CONFIG;
+  return !ONE_CONF.ONE && ['pre', 'validate'].includes(((_$BUY_CONFIG = window.$BUY_CONFIG) === null || _$BUY_CONFIG === void 0 ? void 0 : _$BUY_CONFIG.env) || '');
+}
+
 /**
  * 获取当前运行的环境（线上 → 预发 → 日常 → 本地开发）
  */
@@ -37,10 +45,11 @@ export default function getEnv() {
    * 预发环境：
    * 
    * 1. OneConsole 的输出
+   * 2. CommonBuy 的输出
    * 2. hostname 中带 `pre-` 或 `-pre`
    * 3. 非 HTTPS （通常绑 host）的一般认为是预发
    */
-  if (ONE_CONF.ONE && ONE_CONF.ENV === 'pre' || /pre-|-pre/i.test(hostname) || protocol === 'http:') {
+  if (ONE_CONF.ONE && ONE_CONF.ENV === 'pre' || isCommonBuyPre() || /pre-|-pre/i.test(hostname) || protocol === 'http:') {
     return EEnv.PRE;
   }
   return EEnv.PROD;

package/build/{es → esm}/util/parse-env.js

@@ -12,6 +12,10 @@ export default function parseEnv() {
     hostname = _ref.location.hostname;
   var ENV = getEnv();
   var SITE = getSite();
+  var ENV_IS_DEV = ENV === EEnv.DEV;
+  var ENV_IS_DAILY = ENV === EEnv.DAILY;
+  var ENV_IS_PRE = ENV === EEnv.PRE;
+  var ENV_IS_PROD = ENV === EEnv.PROD;
 
   /**
    * 是否虚商
@@ -20,23 +24,26 @@ export default function parseEnv() {
    */
   var DOMAIN_IS_4SERVICE = /4service/.test(hostname);
   var DOMAIN_IS_TEST = /\.test$/.test(hostname);
+  var FECS_FOR_4SERVICE = 'fecs4service';
+  var FECS_FOR_CONSOLE = ENV_IS_DEV || ENV_IS_DAILY || ENV_IS_PRE ? 'pre-fecs' : 'fecs';
   /**
    * 是否「标准」控制台
    * 
    * 有的控制台（甚至有些内部应用会用 console-base，它们的域名不是 .console.aliyun.com），有些逻辑（比如 CloudShell 是否本地打开）需要调整
    */
   var DOMAIN_IS_CONSOLE = /\.console\.aliyun\.(?:com|test)$/.test(hostname);
+  // fecs 域名必须和当前页面域名一致
   var DOMAIN_IS_ALIBABACLOUD = /\.alibabacloud\.(?:com|test)$/.test(hostname);
   // 不同的域名，保证可以获取到 SameSite 属性为 Lax 的 cookie，比如 login_aliyunid_ticket，避免误判成未登录
-  var FECS_HOST = "".concat(DOMAIN_IS_4SERVICE ? 'fecs4service' : 'fecs', ".console.").concat(DOMAIN_IS_ALIBABACLOUD ? 'alibabacloud' : 'aliyun', ".").concat(DOMAIN_IS_TEST ? 'test' : 'com');
+  var FECS_HOST = "".concat(DOMAIN_IS_4SERVICE ? FECS_FOR_4SERVICE : FECS_FOR_CONSOLE, ".console.").concat(DOMAIN_IS_ALIBABACLOUD ? 'alibabacloud' : 'aliyun', ".").concat(DOMAIN_IS_TEST ? 'test' : 'com');
   // 这个不推荐用 protocol-relative，Firefox 调用 CORS 时，有可能 request.header.Origin 是 null 而导致接口失败...
   var FECS_URL_BASE = "https://".concat(FECS_HOST);
   return {
     ENV: ENV,
-    ENV_IS_DEV: ENV === EEnv.DEV,
-    ENV_IS_DAILY: ENV === EEnv.DAILY,
-    ENV_IS_PRE: ENV === EEnv.PRE,
-    ENV_IS_PROD: ENV === EEnv.PROD,
+    ENV_IS_DEV: ENV_IS_DEV,
+    ENV_IS_DAILY: ENV_IS_DAILY,
+    ENV_IS_PRE: ENV_IS_PRE,
+    ENV_IS_PROD: ENV_IS_PROD,
     APP_ID: ONE_CONF.APP_ID,
     DOMAIN_IS_4SERVICE: DOMAIN_IS_4SERVICE,
     DOMAIN_IS_CONSOLE: DOMAIN_IS_CONSOLE,

package/build/types/enum/index.d.ts

@@ -2,8 +2,8 @@
  * 环境枚举，互斥
  */
 export declare enum EEnv {
-    DEV = "dev",
-    DAILY = "daily",
-    PRE = "pre",
+    DEV = "dev",// 本地开发
+    DAILY = "daily",// 日常
+    PRE = "pre",// 预发
     PROD = "prod"
 }

package/build/types/types/index.d.ts

@@ -1,8 +1,35 @@
 import { EEnv } from '../enum';
 export interface IWin extends Window {
+    /**
+     * ECS 控制台全局变量
+     */
     ALIYUN_ECS_CONSOLE_CONFIG?: {
         channel: string;
     };
+    /**
+     * CommonBuy 全局配置
+     */
+    $BUY_CONFIG?: {
+        /**
+         * CommonBuy 固定字段
+         */
+        channel: 'commonbuy';
+        /**
+         * 渠道:
+         * OFFICIAL - 国际站 | SIN - 国内站
+         */
+        channelId: 'OFFICIAL' | 'SIN';
+        /**
+         * 环境:
+         * pre - 预发 | validate - 验证 | prod - 线上
+         */
+        env: 'pre' | 'validate' | 'prod';
+        /**
+         * 不建议使用
+         * cn - 国内站 ｜ INTL - 国际站
+         */
+        site: 'cn' | 'INTL';
+    };
 }
 export interface IConfEnv {
     ENV: EEnv;

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@alicloud/console-base-conf-parse-env",
-  "version": "1.3.9",
+  "version": "1.4.0",
   "description": "ConsoleBase CONF.ENV parse",
   "license": "MIT",
   "sideEffects": false,
   "main": "build/cjs/index.js",
-  "module": "build/es/index.js",
+  "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
   "homepage": "https://github.com/aliyun/alibabacloud-console-base/tree/master/packages-conf/console-base-conf-parse-env",
   "author": {
@@ -19,22 +19,17 @@
   "publishConfig": {
     "access": "public"
   },
-  "keywords": [
-    "console-base",
-    "conf",
-    "parse",
-    "env"
-  ],
+  "keywords": [],
   "devDependencies": {
     "@alicloud/console-toolkit-cli": "^1.2.30",
     "@alicloud/console-toolkit-preset-component": "^1.2.61",
     "@alicloud/ts-config": "^1.1.3",
-    "@types/react": "^17.0.48",
+    "@types/react": "^17.0.58",
     "react": "^17.0.2",
-    "typescript": "^4.9.5"
+    "typescript": "^5.0.4"
   },
   "dependencies": {
-    "@alicloud/console-one-config": "^1.4.9",
+    "@alicloud/console-one-config": "^1.5.0",
     "@alicloud/cookie": "^1.5.3"
   },
   "scripts": {
@@ -43,10 +38,10 @@
     "build:esm": "breezr build --engine babel --es-module",
     "build:cjs": "breezr build --engine babel",
     "build:bundle": "breezr build --engine webpack",
-    "build:typings": "tsc --outDir build/types --declaration --emitDeclarationOnly",
-    "build": "yarn build:esm && yarn build:cjs && yarn build:typings",
+    "build:types": "tsc -p tsconfig-declaration.json --outDir build/types --declaration --emitDeclarationOnly",
+    "build": "yarn build:esm && yarn build:cjs && yarn build:types",
     "clean": "rm -rf build",
     "prepublishOnly": "yarn clean && yarn build"
   },
-  "gitHead": "056768173dd99b5af268df646c8a09eb08648920"
+  "gitHead": "e3daf0b177915f37e8beae4ecee204d8c62f9507"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 Alibaba Cloud
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.