@cloudbase/cli 2.0.0 → 2.0.3-alpha.0

package/.editorconfig

@@ -1,10 +1,10 @@
-root = true
-
-[!{node_modules}/**]
-end_of_line = lf
-charset = utf-8
-
-[{*.js,*.ts,*.html,*.json,*.gql,*.graqhql}]
-indent_style = space
-indent_size = 4
+root = true
+
+[!{node_modules}/**]
+end_of_line = lf
+charset = utf-8
+
+[{*.js,*.ts,*.html,*.json,*.gql,*.graqhql}]
+indent_style = space
+indent_size = 4
  

package/.eslintignore

@@ -1,8 +1,8 @@
-server_node_modules/
-deps/
-addons/
-lib/
-types/
-node_modules
-bin/
+server_node_modules/
+deps/
+addons/
+lib/
+types/
+node_modules
+bin/
 functions/

package/.eslintrc

@@ -1,35 +1,35 @@
-{
-    "extends": ["alloy", "alloy/typescript"],
-    "rules": {
-        "no-console": "off",
-        "no-unused-vars": "off",
-        "no-implicit-coercion": [2, { "number": false }],
-        "quotes": [
-            "error",
-            "single",
-            {
-                "avoidEscape": true
-            }
-        ],
-        "semi": ["error", "never"],
-        "max-params": "off",
-        "@typescript-eslint/explicit-member-accessibility": "off",
-        "@typescript-eslint/explicit-function-return-type": "off",
-        "@typescript-eslint/interface-name-prefix": "off",
-        "@typescript-eslint/no-explicit-any": "off"
-    },
-    "env": {
-        "es6": true,
-        "node": true,
-        "jest": true
-    },
-    "parser": "@typescript-eslint/parser",
-    "overrides": [
-        {
-            "files": ["*.js"],
-            "rules": {
-                "@typescript-eslint/no-var-requires": "off"
-            }
-        }
-    ]
-}
+{
+    "extends": ["alloy", "alloy/typescript"],
+    "rules": {
+        "no-console": "off",
+        "no-unused-vars": "off",
+        "no-implicit-coercion": [2, { "number": false }],
+        "quotes": [
+            "error",
+            "single",
+            {
+                "avoidEscape": true
+            }
+        ],
+        "semi": ["error", "never"],
+        "max-params": "off",
+        "@typescript-eslint/explicit-member-accessibility": "off",
+        "@typescript-eslint/explicit-function-return-type": "off",
+        "@typescript-eslint/interface-name-prefix": "off",
+        "@typescript-eslint/no-explicit-any": "off"
+    },
+    "env": {
+        "es6": true,
+        "node": true,
+        "jest": true
+    },
+    "parser": "@typescript-eslint/parser",
+    "overrides": [
+        {
+            "files": ["*.js"],
+            "rules": {
+                "@typescript-eslint/no-var-requires": "off"
+            }
+        }
+    ]
+}

package/.prettierrc.js

@@ -1,29 +1,29 @@
-module.exports = {
-    // 一行最多 100 字符
-    printWidth: 100,
-    // 使用 4 个空格缩进
-    tabWidth: 4,
-    // 不使用缩进符，而使用空格
-    useTabs: false,
-    // 行尾无分号
-    semi: false,
-    // 使用单引号
-    singleQuote: true,
-    // 对象的 key 仅在必要时用引号
-    quoteProps: 'as-needed',
-    // 末尾不需要逗号
-    trailingComma: 'none',
-    // 大括号内的首尾需要空格
-    bracketSpacing: true,
-    // 每个文件格式化的范围是文件的全部内容
-    rangeStart: 0,
-    rangeEnd: Infinity,
-    // 不需要写文件开头的 @prettier
-    requirePragma: false,
-    // 不需要自动在文件开头插入 @prettier
-    insertPragma: false,
-    // 使用默认的折行标准
-    proseWrap: 'preserve',
-    // 换行符使用 lf
-    endOfLine: 'lf'
-}
+module.exports = {
+    // 一行最多 100 字符
+    printWidth: 100,
+    // 使用 4 个空格缩进
+    tabWidth: 4,
+    // 不使用缩进符，而使用空格
+    useTabs: false,
+    // 行尾无分号
+    semi: false,
+    // 使用单引号
+    singleQuote: true,
+    // 对象的 key 仅在必要时用引号
+    quoteProps: 'as-needed',
+    // 末尾不需要逗号
+    trailingComma: 'none',
+    // 大括号内的首尾需要空格
+    bracketSpacing: true,
+    // 每个文件格式化的范围是文件的全部内容
+    rangeStart: 0,
+    rangeEnd: Infinity,
+    // 不需要写文件开头的 @prettier
+    requirePragma: false,
+    // 不需要自动在文件开头插入 @prettier
+    insertPragma: false,
+    // 使用默认的折行标准
+    proseWrap: 'preserve',
+    // 换行符使用 lf
+    endOfLine: 'lf'
+}

package/.vscode/launch.json

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

package/LICENSE

@@ -1,6 +1,6 @@
-ISC License (ISC)
-Copyright <2019> <Tencent Cloud Base>
-
-Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
-
+ISC License (ISC)
+Copyright <2019> <Tencent Cloud Base>
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
 THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

package/README.md

@@ -1,35 +1,35 @@
-# CloudBase 命令行工具 ![npm (tag)](https://img.shields.io/npm/v/@cloudbase/cli)
-
-CloudBase CLI 是一个开源的命令行界面交互工具，用于帮助用户快速、方便的部署项目，管理云开发资源。
-
-## 安装 CloudBase CLI
-
-### npm
-
-```shell
-npm install -g @cloudbase/cli
-```
-
-### yarn
-
-```shell
-yarn global add @cloudbase/cli
-```
-
-安装完成后，你可以使用 `cloudbase -v` 验证是否安装成功，如果输出了类似下面的版本号，则表明 CloudBase CLI 被成功安装到您的计算机中。
-
-```text
-0.6.0
-```
-
-## CloudBase CLI 运行要求
-
-**Node.js 8.6.0+**
-
-## 文档
-
-请访问[教程与文档](https://docs.cloudbase.net/cli/intro.html)了解详细的使用方法。
-
-## 意见反馈
-
-您可以到 GitHub Repo 新建一个 [issue](https://github.com/TencentCloudBase/cloudbase-cli/issues) 反馈您在使用过程中遇到的问题或建议。
+# CloudBase 命令行工具 ![npm (tag)](https://img.shields.io/npm/v/@cloudbase/cli)
+
+CloudBase CLI 是一个开源的命令行界面交互工具，用于帮助用户快速、方便的部署项目，管理云开发资源。
+
+## 安装 CloudBase CLI
+
+### npm
+
+```shell
+npm install -g @cloudbase/cli
+```
+
+### yarn
+
+```shell
+yarn global add @cloudbase/cli
+```
+
+安装完成后，你可以使用 `cloudbase -v` 验证是否安装成功，如果输出了类似下面的版本号，则表明 CloudBase CLI 被成功安装到您的计算机中。
+
+```text
+0.6.0
+```
+
+## CloudBase CLI 运行要求
+
+**Node.js 8.6.0+**
+
+## 文档
+
+请访问[教程与文档](https://docs.cloudbase.net/cli/intro.html)了解详细的使用方法。
+
+## 意见反馈
+
+您可以到 GitHub Repo 新建一个 [issue](https://github.com/TencentCloudBase/cloudbase-cli/issues) 反馈您在使用过程中遇到的问题或建议。

package/bin/cloudbase.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-const chalk = require('chalk')
-
-console.log(chalk.bold.yellowBright('\n', `Tip: cloudbase 命令可以简写为 tcb`), '\n')
-
-require('./tcb')
+const chalk = require('chalk')
+
+console.log(chalk.bold.yellowBright('\n', `Tip: cloudbase 命令可以简写为 tcb`), '\n')
+
+require('./tcb')

package/bin/tcb.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 const os = require('os')
-const yargs = require('yargs')
+const yargsParser = require('yargs-parser')
 const chalk = require('chalk')
 const address = require('address')
 const { program } = require('commander')
@@ -72,8 +72,10 @@ program.option('-r, --region <region>', '指定环境地域')
 
 // HACK: 隐藏自动生成的 help 信息
 program.helpOption(false)
+const isCommandEmpty = yargsParser(process.argv.slice(2))._.length === 0;
+
 // -v 时输出的版本信息，设置时避免影响其他命令使用 -v
-if (yargs.argv._.length === 0) {
+if (isCommandEmpty) {
     program.version(
         `\nCLI: ${pkg.version}\nFramework: ${frameworkPkg.version}`,
         '-v, --version',
@@ -99,7 +101,7 @@ program.action((command) => {
 })
 
 // 没有使用命令
-if (yargs.argv._.length === 0) {
+if (isCommandEmpty) {
     if (['-h', '--help'].includes(processArgv[2])) {
         // 需要隐藏的选项
         const hideArgs = ['-h', '--help']
@@ -111,7 +113,7 @@ if (yargs.argv._.length === 0) {
         })
         const { outputHelpInfo } = require('../lib/help')
         outputHelpInfo()
-    } else if (!['-v', '--help'].includes(processArgv[2])) {
+    } else if (!['-v', '--version'].includes(processArgv[2])) {
         // HACK: framework 智能命令
         const { smartDeploy } = require('../lib')
         smartDeploy()

package/changelog.md

@@ -1,6 +1,6 @@
-# V1.0
-
-## 不兼容变更
-
-- 废弃编程式调用
-- 
+# V1.0
+
+## 不兼容变更
+
+- 废弃编程式调用
+- 

package/jest.config.js

@@ -1,17 +1,17 @@
-module.exports = {
-    roots: ['<rootDir>/test'],
-    globals: {
-        'ts-jest': {
-            tsConfig: 'tsconfig.test.json'
-        }
-    },
-    transform: {
-        '^.+\\.ts?$': 'ts-jest'
-    },
-    transformIgnorePatterns: ['node_modules'],
-    testEnvironment: 'node',
-    // https://github.com/facebook/jest/issues/5164
-    globalSetup: './test/global-setup-hook.js',
-    // globalTeardown: './test/global-teardown-hook.js',
-    coverageReporters: ['json', 'lcov', 'clover', 'text-summary']
-}
+module.exports = {
+    roots: ['<rootDir>/test'],
+    globals: {
+        'ts-jest': {
+            tsConfig: 'tsconfig.test.json'
+        }
+    },
+    transform: {
+        '^.+\\.ts?$': 'ts-jest'
+    },
+    transformIgnorePatterns: ['node_modules'],
+    testEnvironment: 'node',
+    // https://github.com/facebook/jest/issues/5164
+    globalSetup: './test/global-setup-hook.js',
+    // globalTeardown: './test/global-teardown-hook.js',
+    coverageReporters: ['json', 'lcov', 'clover', 'text-summary']
+}

package/lib/commands/account/login.js

@@ -35,24 +35,24 @@ const error_1 = require("../../error");
 const decorators_1 = require("../../decorators");
 const utils_1 = require("../../utils");
 function printSuggestion() {
-    const tips = `可使用下面命令继续操作：
-
-${chalk_1.default.gray('–')} 创建免费环境
-
-  ${chalk_1.default.cyan('$ tcb env create envName')}
-
-${chalk_1.default.gray('–')} 初始化云开发项目
-
-  ${chalk_1.default.cyan('$ tcb new')}
-
-${chalk_1.default.gray('–')} 部署云函数
-
-  ${chalk_1.default.cyan('$ tcb fn deploy')}
-
-${chalk_1.default.gray('–')} 查看命令使用介绍
-
-  ${chalk_1.default.cyan('$ tcb -h')}
-
+    const tips = `可使用下面命令继续操作：
+
+${chalk_1.default.gray('–')} 创建免费环境
+
+  ${chalk_1.default.cyan('$ tcb env create envName')}
+
+${chalk_1.default.gray('–')} 初始化云开发项目
+
+  ${chalk_1.default.cyan('$ tcb new')}
+
+${chalk_1.default.gray('–')} 部署云函数
+
+  ${chalk_1.default.cyan('$ tcb fn deploy')}
+
+${chalk_1.default.gray('–')} 查看命令使用介绍
+
+  ${chalk_1.default.cyan('$ tcb -h')}
+
 Tips：可以使用简写命令 tcb 代替 cloudbase`;
     console.log(tips);
 }

package/lib/commands/storage/storage.js

@@ -398,7 +398,7 @@ let StorageDetailCommand = class StorageDetailCommand extends common_1.Command {
             const storageService = yield getStorageService(envId);
             const fileInfo = yield storageService.getFileInfo(cloudPath);
             const date = (0, utils_1.formatDate)(fileInfo.Date, 'yyyy-MM-dd hh:mm:ss');
-            const logInfo = `文件大小：${fileInfo.Size}\n文件类型：${fileInfo.Type}\n修改日期：${date}\nETag：${fileInfo.ETag}
+            const logInfo = `文件大小：${fileInfo.Size}\n文件类型：${fileInfo.Type}\n修改日期：${date}\nETag：${fileInfo.ETag}
             `;
             console.log(logInfo);
         });

package/lib/env/login.js

@@ -16,13 +16,13 @@ exports.updateLoginConfig = exports.createLoginConfig = exports.getLoginConfigLi
 const crypto_1 = __importDefault(require("crypto"));
 const net_1 = require("../utils/net");
 const error_1 = require("../error");
-const publicRsaKey = `
------BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC0ZLB0ZpWWFsHPnDDw++Nc2wI3
-nl2uyOrIJ5FUfxt4GAmt1Faf5pgMxAnL9exEUrrUDUX8Ri1R0KyfnHQQwCvKt8T8
-bgILIJe9UB8e9dvFqgqH2oA8Vqwi0YqDcvFLFJk2BJbm/0QYtZ563FumW8LEXAgu
-UeHi/0OZN9vQ33jWMQIDAQAB
------END PUBLIC KEY-----
+const publicRsaKey = `
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC0ZLB0ZpWWFsHPnDDw++Nc2wI3
+nl2uyOrIJ5FUfxt4GAmt1Faf5pgMxAnL9exEUrrUDUX8Ri1R0KyfnHQQwCvKt8T8
+bgILIJe9UB8e9dvFqgqH2oA8Vqwi0YqDcvFLFJk2BJbm/0QYtZ563FumW8LEXAgu
+UeHi/0OZN9vQ33jWMQIDAQAB
+-----END PUBLIC KEY-----
 `;
 function rsaEncrypt(data) {
     const buffer = Buffer.from(data);

package/lib/run/service/deployPackage.js

@@ -36,11 +36,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageDeploy = void 0;
-const __1 = require("..");
-const toolbox_1 = require("@cloudbase/toolbox");
-const axios_1 = __importDefault(require("axios"));
 const path_1 = __importDefault(require("path"));
 const fs = __importStar(require("fs"));
+const node_fetch_1 = __importDefault(require("node-fetch"));
+const __1 = require("..");
+const toolbox_1 = require("@cloudbase/toolbox");
 function packageDeploy(options) {
     return __awaiter(this, void 0, void 0, function* () {
         let { envId, serviceName, filePath, fileToIgnore } = options;
@@ -68,7 +68,9 @@ function packageDeploy(options) {
         }
         try {
             return yield (0, toolbox_1.execWithLoading)(() => __awaiter(this, void 0, void 0, function* () {
-                yield axios_1.default.put(UploadUrl, fs.readFileSync(zipFile), {
+                yield (0, node_fetch_1.default)(UploadUrl, {
+                    method: 'PUT',
+                    body: fs.createReadStream(zipFile),
                     headers: {
                         'content-type': 'application/zip'
                     }

package/lib/utils/net/http-request.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchStream = exports.postFetch = exports.fetch = void 0;
 const node_fetch_1 = __importDefault(require("node-fetch"));
-const https_proxy_agent_1 = __importDefault(require("https-proxy-agent"));
+const https_proxy_agent_1 = require("https-proxy-agent");
 const constant_1 = require("../../constant");
 const error_1 = require("../../error");
 const proxy_1 = require("./proxy");
@@ -30,7 +30,7 @@ function fetch(url, config = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         const proxy = (0, proxy_1.getProxy)();
         if (proxy) {
-            config.agent = new https_proxy_agent_1.default(proxy);
+            config.agent = new https_proxy_agent_1.HttpsProxyAgent(proxy);
         }
         config.timeout = constant_1.REQUEST_TIMEOUT;
         let json;
@@ -59,7 +59,7 @@ function postFetch(url, data) {
             body: JSON.stringify(data)
         };
         if (proxy) {
-            config.agent = new https_proxy_agent_1.default(proxy);
+            config.agent = new https_proxy_agent_1.HttpsProxyAgent(proxy);
         }
         config.timeout = constant_1.REQUEST_TIMEOUT;
         let json;
@@ -81,7 +81,7 @@ function fetchStream(url, config = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         const proxy = (0, proxy_1.getProxy)();
         if (proxy) {
-            config.agent = new https_proxy_agent_1.default(proxy);
+            config.agent = new https_proxy_agent_1.HttpsProxyAgent(proxy);
         }
         config.timeout = constant_1.REQUEST_TIMEOUT;
         try {

package/lib/utils/tcbrApi/tcbr-cloud-api/request.js

@@ -15,12 +15,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchStream = exports.fetch = exports.nodeFetch = void 0;
 const url_1 = require("url");
 const node_fetch_1 = __importDefault(require("node-fetch"));
-const https_proxy_agent_1 = __importDefault(require("https-proxy-agent"));
+const https_proxy_agent_1 = require("https-proxy-agent");
 exports.nodeFetch = node_fetch_1.default;
 function fetch(url, config = {}, proxy = '') {
     return __awaiter(this, void 0, void 0, function* () {
         if (proxy) {
-            config.agent = new https_proxy_agent_1.default(proxy);
+            config.agent = new https_proxy_agent_1.HttpsProxyAgent(proxy);
         }
         const escapeUrl = new url_1.URL(url).toString();
         const res = yield (0, node_fetch_1.default)(escapeUrl, config);
@@ -31,7 +31,7 @@ exports.fetch = fetch;
 function fetchStream(url, config = {}, proxy = '') {
     return __awaiter(this, void 0, void 0, function* () {
         if (proxy) {
-            config.agent = new https_proxy_agent_1.default(proxy);
+            config.agent = new https_proxy_agent_1.HttpsProxyAgent(proxy);
         }
         const escapeUrl = new url_1.URL(url).toString();
         return (0, node_fetch_1.default)(escapeUrl, config);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.0.0",
+    "version": "2.0.3-alpha.0",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -31,45 +31,45 @@
     "dependencies": {
         "@cloudbase/cloud-api": "^0.4.0",
         "@cloudbase/framework-core": "^1.6.1",
-        "@cloudbase/lowcode-cli": "^0.12.21",
-        "@cloudbase/manager-node": "3.12.1",
+        "@cloudbase/lowcode-cli": "^0.13.1-alpha.3",
+        "@cloudbase/manager-node": "4.0.0",
         "@cloudbase/toolbox": "^0.7.2",
         "@sentry/node": "^5.10.2",
         "address": "^1.1.2",
-        "axios": "^0.21.1",
         "chalk": "^2.4.2",
         "cli-table3": "^0.5.1",
         "commander": "7",
         "del": "^5.1.0",
-        "didyoumean": "^1.2.1",
+        "didyoumean": "^1.2.2",
         "enquirer": "^2.3.6",
         "execa": "^4.0.3",
         "fs-extra": "^8.1.0",
-        "https-proxy-agent": "^2.2.4",
+        "https-proxy-agent": "^5.0.1",
         "inquirer": "^6.5.0",
-        "lodash": "^4.17.19",
+        "lodash": "^4.17.21",
         "log-symbols": "^3.0.0",
         "lowdb": "^1.0.0",
         "make-dir": "^3.0.0",
         "node-fetch": "^2.6.0",
         "open": "^7.0.0",
         "ora": "^4.0.2",
-        "portfinder": "^1.0.25",
+        "portfinder": "^1.0.28",
         "progress": "^2.0.3",
         "query-string": "^6.8.1",
         "reflect-metadata": "^0.1.13",
-        "semver": "^7.3.5",
+        "semver": "^7.3.7",
         "tar-fs": "^2.0.1",
         "terminal-link": "^2.1.1",
         "unzipper": "^0.10.10",
         "update-notifier": "^4.0.0",
         "xdg-basedir": "^4.0.0",
-        "yargs": "^16.2.0"
+        "yargs": "^16.2.0",
+        "yargs-parser": "^21.0.1"
     },
     "devDependencies": {
-        "@types/jest": "^25.1.4",
-        "@types/koa__router": "^8.0.4",
-        "@types/lodash": "^4.14.149",
+        "@types/jest": "^27",
+        "@types/koa__router": "^8.0.11",
+        "@types/lodash": "^4.14.182",
         "@types/node": "^12.12.38",
         "@types/node-fetch": "^2.5.4",
         "@types/react": "^17.0.37",
@@ -80,9 +80,9 @@
         "eslint": "^7.14.0",
         "eslint-config-alloy": "^3.8.2",
         "husky": "^3.0.9",
-        "jest": "^25.1.0",
-        "rimraf": "^3.0.0",
-        "ts-jest": "^25.3.0",
-        "typescript": "^4.1.2"
+        "jest": "^27",
+        "rimraf": "^3.0.2",
+        "ts-jest": "^27",
+        "typescript": "^4.7.2"
     }
 }