@cloudbase/cli 1.12.7-alpha.4 → 2.0.0

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

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./cloud-api-service"), exports);

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

@@ -0,0 +1,40 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+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"));
+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);
+        }
+        const escapeUrl = new url_1.URL(url).toString();
+        const res = yield (0, node_fetch_1.default)(escapeUrl, config);
+        return res.json();
+    });
+}
+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);
+        }
+        const escapeUrl = new url_1.URL(url).toString();
+        return (0, node_fetch_1.default)(escapeUrl, config);
+    });
+}
+exports.fetchStream = fetchStream;

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

@@ -0,0 +1,61 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CloudApiService = void 0;
+const toolbox_1 = require("@cloudbase/toolbox");
+const index_1 = require("./tcbr-cloud-api/index");
+const error_1 = require("../../error");
+const constant_1 = require("../../constant");
+let commonCredential;
+const isTokenExpired = (credential, gap = 120) => credential.accessTokenExpired && Number(credential.accessTokenExpired) < Date.now() + gap * 1000;
+class CloudApiService {
+    constructor(service, baseParams, version = '') {
+        this.apiService = new index_1.CloudApiService({
+            service,
+            version: service === 'tcr'
+                ? version
+                : service === 'tcbr'
+                    ? '2022-02-17'
+                    : '2019-09-24',
+            baseParams,
+            proxy: (0, toolbox_1.getProxy)(),
+            timeout: constant_1.REQUEST_TIMEOUT,
+            getCredential: () => __awaiter(this, void 0, void 0, function* () {
+                if ((commonCredential === null || commonCredential === void 0 ? void 0 : commonCredential.secretId) && !isTokenExpired(commonCredential)) {
+                    return commonCredential;
+                }
+                const credential = yield (0, toolbox_1.getCredentialWithoutCheck)();
+                if (!credential) {
+                    throw new error_1.CloudBaseError('无有效身份信息，请使用 cloudbase login 登录');
+                }
+                commonCredential = credential;
+                return Object.assign(Object.assign({}, credential), { tokenExpired: Number(credential.accessTokenExpired) });
+            })
+        });
+    }
+    static getInstance(service) {
+        var _a;
+        if ((_a = CloudApiService.serviceCacheMap) === null || _a === void 0 ? void 0 : _a[service]) {
+            return CloudApiService.serviceCacheMap[service];
+        }
+        const apiService = new CloudApiService(service);
+        CloudApiService.serviceCacheMap[service] = apiService;
+        return apiService;
+    }
+    request(action, data = {}, method = 'POST') {
+        return __awaiter(this, void 0, void 0, function* () {
+            const region = this.region || (yield (0, toolbox_1.getRegion)());
+            return this.apiService.request({ action, data, method, region });
+        });
+    }
+}
+exports.CloudApiService = CloudApiService;
+CloudApiService.serviceCacheMap = {};

package/lib/utils/validator.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateIp = exports.assertHas = exports.assertTruthy = void 0;
+exports.validateCpuMem = exports.validateIp = exports.assertHas = exports.assertTruthy = void 0;
 const error_1 = require("../error");
+const constant_1 = require("../constant");
+const run_1 = require("../run");
 function assertTruthy(val, errMsg) {
     let ok;
     if (Array.isArray(val)) {
@@ -31,3 +33,32 @@ const validateIp = (ip) => {
     return true;
 };
 exports.validateIp = validateIp;
+const validateCpuMem = (cpuInput, memInput) => {
+    if (cpuInput !== undefined && memInput !== undefined) {
+        let cpuSet = (0, run_1.convertNumber)(cpuInput);
+        let memSet = (0, run_1.convertNumber)(memInput);
+        let validMemSet = constant_1.CPU_MEM_OPTS.find(({ cpu }) => cpu === cpuSet);
+        if (!validMemSet || !validMemSet.mems.length || !validMemSet.mems.includes(memSet)) {
+            throw new error_1.CloudBaseError(`cpu 与 mem 规格不匹配，当前规格：cpu: ${cpuInput}, mem: ${memInput}
+请使用下列规格组合之一：${constant_1.CPU_MEM_OPTS.map(({ cpu, mems }) => `${cpu}-${mems.join('/')}`).join('，')}`);
+        }
+        return { cpuOutput: cpuSet, memOutput: memSet };
+    }
+    if (cpuInput) {
+        let cpuSet = (0, run_1.convertNumber)(cpuInput);
+        let validSet = constant_1.CPU_MEM_OPTS.find(({ cpu }) => cpu === cpuSet);
+        if (!validSet) {
+            throw new error_1.CloudBaseError(`不支持当前 cpu 规格，请使用下列 cpu 规格之一：${constant_1.CPU_MEM_OPTS.map(({ cpu }) => cpu).join('，')}`);
+        }
+        return { cpuOutput: cpuSet, memOutput: constant_1.CPU_MEM_OPTS.find(({ cpu }) => cpu === cpuSet).mems[0] };
+    }
+    if (memInput) {
+        let memSet = (0, run_1.convertNumber)(memInput);
+        let validSet = constant_1.CPU_MEM_OPTS.find(({ mems }) => mems.includes(memSet));
+        if (!validSet) {
+            throw new error_1.CloudBaseError(`不支持当前 mem 规格，请使用下列 mem 规格之一：${constant_1.CPU_MEM_OPTS.map(({ mems }) => mems.join('/')).join('，')}`);
+        }
+        return { cpuOutput: validSet.cpu, memOutput: memSet };
+    }
+};
+exports.validateCpuMem = validateCpuMem;

package/package.json

@@ -1,88 +1,88 @@
-{
-    "name": "@cloudbase/cli",
-    "version": "1.12.7-alpha.4",
-    "description": "cli tool for cloudbase",
-    "main": "lib/index.js",
-    "scripts": {
-        "build": "rimraf lib types && tsc",
-        "watch": "rimraf lib types && tsc -w",
-        "dev": "rimraf lib types && tsc -w",
-        "eslint": "eslint \"./**/*.ts\"",
-        "test": "jest --runInBand --forceExit --detectOpenHandles --coverage --verbose --testTimeout=10000",
-        "tsc": "tsc",
-        "pkg": "pkg ./bin/cloudbase.js --out-path ./pkg",
-        "postinstall": "node ./post-install.js || exit 0"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/TencentCloudBase/cloud-base-cli.git"
-    },
-    "bin": {
-        "tcb": "bin/tcb.js",
-        "cloudbase": "bin/cloudbase.js"
-    },
-    "husky": {
-        "hooks": {
-            "pre-commit": "npm run build && git add ."
-        }
-    },
-    "author": "cwuyiqing@gmail.com",
-    "license": "ISC",
-    "dependencies": {
-        "@cloudbase/cloud-api": "^0.4.0",
-        "@cloudbase/framework-core": "^1.6.1",
-        "@cloudbase/lowcode-cli": "^0.12.26-alpha.4",
-        "@cloudbase/manager-node": "3.12.1",
-        "@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",
-        "enquirer": "^2.3.6",
-        "execa": "^4.0.3",
-        "fs-extra": "^8.1.0",
-        "https-proxy-agent": "^2.2.4",
-        "inquirer": "^6.5.0",
-        "lodash": "^4.17.19",
-        "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",
-        "progress": "^2.0.3",
-        "query-string": "^6.8.1",
-        "reflect-metadata": "^0.1.13",
-        "semver": "^7.3.5",
-        "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"
-    },
-    "devDependencies": {
-        "@types/jest": "^25.1.4",
-        "@types/koa__router": "^8.0.4",
-        "@types/lodash": "^4.14.149",
-        "@types/node": "^12.12.38",
-        "@types/node-fetch": "^2.5.4",
-        "@types/react": "^17.0.37",
-        "@types/semver": "^7.3.9",
-        "@types/webpack-dev-server": "^3.11.1",
-        "@typescript-eslint/eslint-plugin": "^4.8.1",
-        "@typescript-eslint/parser": "^4.8.1",
-        "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"
-    }
-}
+{
+    "name": "@cloudbase/cli",
+    "version": "2.0.0",
+    "description": "cli tool for cloudbase",
+    "main": "lib/index.js",
+    "scripts": {
+        "build": "rimraf lib types && tsc",
+        "watch": "rimraf lib types && tsc -w",
+        "dev": "rimraf lib types && tsc -w",
+        "eslint": "eslint \"./**/*.ts\"",
+        "test": "jest --runInBand --forceExit --detectOpenHandles --coverage --verbose --testTimeout=10000",
+        "tsc": "tsc",
+        "pkg": "pkg ./bin/cloudbase.js --out-path ./pkg",
+        "postinstall": "node ./post-install.js || exit 0"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/TencentCloudBase/cloud-base-cli.git"
+    },
+    "bin": {
+        "tcb": "bin/tcb.js",
+        "cloudbase": "bin/cloudbase.js"
+    },
+    "husky": {
+        "hooks": {
+            "pre-commit": "npm run build && git add ."
+        }
+    },
+    "author": "cwuyiqing@gmail.com",
+    "license": "ISC",
+    "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/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",
+        "enquirer": "^2.3.6",
+        "execa": "^4.0.3",
+        "fs-extra": "^8.1.0",
+        "https-proxy-agent": "^2.2.4",
+        "inquirer": "^6.5.0",
+        "lodash": "^4.17.19",
+        "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",
+        "progress": "^2.0.3",
+        "query-string": "^6.8.1",
+        "reflect-metadata": "^0.1.13",
+        "semver": "^7.3.5",
+        "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"
+    },
+    "devDependencies": {
+        "@types/jest": "^25.1.4",
+        "@types/koa__router": "^8.0.4",
+        "@types/lodash": "^4.14.149",
+        "@types/node": "^12.12.38",
+        "@types/node-fetch": "^2.5.4",
+        "@types/react": "^17.0.37",
+        "@types/semver": "^7.3.9",
+        "@types/webpack-dev-server": "^3.11.1",
+        "@typescript-eslint/eslint-plugin": "^4.8.1",
+        "@typescript-eslint/parser": "^4.8.1",
+        "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"
+    }
+}

package/post-install.js

@@ -1,61 +1,61 @@
-/* eslint-disable */
-const chalk = require('chalk')
-const { execSync } = require('child_process')
-
-const isWin32 = process.platform === 'win32'
-
-const print = (color = null) => (str = '') => {
-    const terminalCols = retrieveCols()
-    const strLength = str.replace(/\u001B\[[0-9]{2}m/g, '').length
-    const leftPaddingLength = Math.floor((terminalCols - strLength) / 2)
-    const leftPadding = ' '.repeat(Math.max(leftPaddingLength, 0))
-    if (color) {
-        str = chalk[color](str)
-    }
-
-    console.log(leftPadding, str)
-}
-
-const retrieveCols = (() => {
-    let result = false
-
-    return () => {
-        if (result) {
-            return result
-        }
-        const defaultCols = 80
-
-        try {
-            const terminalCols = execSync('tput cols', { stdio: ['pipe', 'pipe', 'ignore'] })
-            result = parseInt(terminalCols.toString()) || defaultCols
-        } catch (e) {
-            result = defaultCols
-        }
-
-        return result
-    }
-})()
-
-// 只在 osx 系统上展示 emoji
-const emoji = (emoji) => (process.stdout.isTTY && !isWin32 ? emoji : '')
-
-function printFooter() {
-    const yellow = print('yellow')
-    // const yellow = str => console.log(chalk.yellow(str))
-    const emptyLine = print()
-
-    emptyLine()
-
-    yellow('了解如何使用 CloudBase CLI')
-    yellow('请查看使用文档')
-
-    print()(
-        ' '.repeat(15) +
-            `${chalk.bold(emoji('👉'))} ${chalk.underline(
-                'https://docs.cloudbase.net/cli-v1/quick-start.html'
-            )}`
-    )
-    emptyLine()
-}
-
-printFooter()
+/* eslint-disable */
+const chalk = require('chalk')
+const { execSync } = require('child_process')
+
+const isWin32 = process.platform === 'win32'
+
+const print = (color = null) => (str = '') => {
+    const terminalCols = retrieveCols()
+    const strLength = str.replace(/\u001B\[[0-9]{2}m/g, '').length
+    const leftPaddingLength = Math.floor((terminalCols - strLength) / 2)
+    const leftPadding = ' '.repeat(Math.max(leftPaddingLength, 0))
+    if (color) {
+        str = chalk[color](str)
+    }
+
+    console.log(leftPadding, str)
+}
+
+const retrieveCols = (() => {
+    let result = false
+
+    return () => {
+        if (result) {
+            return result
+        }
+        const defaultCols = 80
+
+        try {
+            const terminalCols = execSync('tput cols', { stdio: ['pipe', 'pipe', 'ignore'] })
+            result = parseInt(terminalCols.toString()) || defaultCols
+        } catch (e) {
+            result = defaultCols
+        }
+
+        return result
+    }
+})()
+
+// 只在 osx 系统上展示 emoji
+const emoji = (emoji) => (process.stdout.isTTY && !isWin32 ? emoji : '')
+
+function printFooter() {
+    const yellow = print('yellow')
+    // const yellow = str => console.log(chalk.yellow(str))
+    const emptyLine = print()
+
+    emptyLine()
+
+    yellow('了解如何使用 CloudBase CLI')
+    yellow('请查看使用文档')
+
+    print()(
+        ' '.repeat(15) +
+            `${chalk.bold(emoji('👉'))} ${chalk.underline(
+                'https://docs.cloudbase.net/cli-v1/quick-start.html'
+            )}`
+    )
+    emptyLine()
+}
+
+printFooter()