optimize proxy config && fix command get envId error

Author: chhpt

.vscode/launch.json

@@ -1,20 +1,22 @@
 {
-    // 使用 IntelliSense 了解相关属性。 
+    // 使用 IntelliSense 了解相关属性。
     // 悬停以查看现有属性的描述。
     // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Launch Program",
+            "program": "${workspaceFolder}/src/utils/runtime/nodejs/bootstrap.js"
+        },
         {
             "type": "node",
             "request": "launch",
             "name": "Debug: cloudbase logout",
             "program": "${workspaceFolder}/bin/cloudbase.js",
-            "args": [
-                "logout"
-            ],
-            "outFiles": [
-                "${workspaceFolder}/lib/**/*.js"
-            ]
+            "args": ["logout"],
+            "outFiles": ["${workspaceFolder}/lib/**/*.js"]
         }
     ]
-}
+}

bin/cloudbase.js

@@ -10,6 +10,22 @@ const pkg = require('../package.json')
 
 const isBeta = pkg.version.indexOf('-') > -1
 
+const userNodeVersion = Number(
+    process.versions.node
+        .split('.')
+        .slice(0, 2)
+        .join('.')
+)
+
+// Node 版本检验提示
+if (userNodeVersion < 8.6) {
+    console.log(
+        chalk.bold.red(
+            '您的 Node 版本较低，CloudBase CLI 可能无法正常运行，请升级 Node 到 v8.6.0 以上！\n'
+        )
+    )
+}
+
 // Sentry 错误上报
 Sentry.init({
     release: pkg.version,
@@ -54,10 +70,12 @@ Sentry.configureScope(scope => {
     }
 })
 
+// 设置 options 选项
 program.option(
     '--config-file <path>',
     '设置配置文件，默认为 ./cloudbaserc.js 或 .cloudbaserc.json'
 )
+program.option('--debug', 'open debug mode')
 
 program.version(pkg.version, '-V, --version', '输出当前 CloudBase CLI 版本')
 
@@ -93,6 +111,8 @@ if (process.argv.length < 3) {
 
 program.parse(process.argv)
 
+process.IS_DEBUG = program.debug
+
 function errorHandler(err) {
     const stackIngoreErrors = ['TencentCloudSDKHttpException', 'CloudBaseError']
     // 忽略自定义错误的错误栈

deps/tencentcloud-sdk-nodejs/tencentcloud/common/http/fetch.js

@@ -6,8 +6,10 @@ module.exports = (url, options) => {
     ...options
   };
 
-  if (!options.agent && process.env.http_proxy) {
-    instanceOptions.agent = new HttpsProxyAgent(process.env.http_proxy);
+  const proxy = process.env.http_proxy || process.env.HTTP_PROXY
+
+  if (!options.agent && proxy) {
+    instanceOptions.agent = new HttpsProxyAgent(proxy);
   }
 
   return fetch(url, instanceOptions);

lib/commands/init.js

@@ -13,8 +13,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
-const tar_fs_1 = __importDefault(require("tar-fs"));
+const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
+const tar_fs_1 = __importDefault(require("tar-fs"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const inquirer_1 = __importDefault(require("inquirer"));
 const commander_1 = __importDefault(require("commander"));
@@ -46,6 +47,12 @@ function copyServerTemplate(projectPath) {
         fs_extra_1.default.copySync(templatePath, projectPath);
     });
 }
+function initSuccessOutput(projectName) {
+    logger_1.successLog(`创建项目 ${projectName} 成功！\n`);
+    const command = chalk_1.default.bold.cyan(`cd ${projectName}`);
+    console.log(`👉 运行 ${command} 开始您的项目！\n`);
+    console.log('🎉 欢迎贡献你的模板 👉 https://github.com/TencentCloudBase/cloudbase-examples');
+}
 commander_1.default
     .command('init')
     .option('--server', '创建 node 项目')
@@ -129,12 +136,11 @@ commander_1.default
         const configFileJSPath = path_1.default.join(projectPath, 'cloudbaserc.js');
         const configFilePath = [configFileJSPath, configFileJSONPath].find(item => fs_1.default.existsSync(item));
         if (!configFilePath) {
-            logger_1.successLog(`创建项目 ${projectName} 成功`);
+            initSuccessOutput(projectName);
             return;
         }
         const configContent = fs_1.default.readFileSync(configFilePath).toString();
         fs_1.default.writeFileSync(configFilePath, configContent.replace('{{envId}}', env));
-        logger_1.successLog(`创建项目 ${projectName} 成功！\n`);
-        console.log('🎉 欢迎贡献你的模板 👉 https://github.com/TencentCloudBase/cloudbase-examples');
+        initSuccessOutput(projectName);
     });
 });

lib/utils/cloudbase-config.js

@@ -55,7 +55,7 @@ function resolveCloudBaseConfig(configPath = '') {
         if (!cloudbasePath ||
             !fs_1.default.existsSync(cloudbasePath) ||
             !cloudbasePath.match(/.js$|.json$/g)) {
-            throw new error_1.CloudBaseError('配置文件不存在');
+            return {};
         }
         const localCloudBaseConfig = yield Promise.resolve().then(() => __importStar(require(cloudbasePath)));
         if (!localCloudBaseConfig.envId) {

lib/utils/http-request.js

@@ -16,8 +16,9 @@ const node_fetch_1 = __importDefault(require("node-fetch"));
 const https_proxy_agent_1 = __importDefault(require("https-proxy-agent"));
 function fetch(url, config = {}) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (process.env.http_proxy) {
-            config.agent = new https_proxy_agent_1.default(process.env.http_proxy);
+        const proxy = process.env.http_proxy || process.env.HTTP_PROXY;
+        if (proxy) {
+            config.agent = new https_proxy_agent_1.default(proxy);
         }
         const res = yield node_fetch_1.default(url, config);
         return res.json();
@@ -26,8 +27,9 @@ function fetch(url, config = {}) {
 exports.fetch = fetch;
 function fetchStream(url, config = {}) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (process.env.http_proxy) {
-            config.agent = new https_proxy_agent_1.default(process.env.http_proxy);
+        const proxy = process.env.http_proxy || process.env.HTTP_PROXY;
+        if (proxy) {
+            config.agent = new https_proxy_agent_1.default(proxy);
         }
         return node_fetch_1.default(url, config);
     });