@cloudbase/cli 2.0.3 → 2.0.5

package/tsconfig.test.json

@@ -1,13 +1,13 @@
-{
-    "compileOnSave": true,
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "ES2017",
-        "moduleResolution": "node",
-        "outDir": "lib",
-        "types": ["node", "jest"],
-        "esModuleInterop": true
-    },
-    "include": ["src/**/*", "test/**/*"],
-    "exclude": ["node_modules", "test"]
-}
+{
+    "compileOnSave": true,
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "ES2017",
+        "moduleResolution": "node",
+        "outDir": "lib",
+        "types": ["node", "jest"],
+        "esModuleInterop": true
+    },
+    "include": ["src/**/*", "test/**/*"],
+    "exclude": ["node_modules", "test"]
+}

package/.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "typescript.tsdk": "node_modules\\typescript\\lib"
-}

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

@@ -1,268 +0,0 @@
-"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.CloudApiService = exports.nodeFetch = exports.fetchStream = exports.fetch = void 0;
-const crypto_1 = __importDefault(require("crypto"));
-const url_1 = require("url");
-const query_string_1 = __importDefault(require("query-string"));
-const request_1 = require("./request");
-const error_1 = require("./error");
-function isObject(x) {
-    return typeof x === 'object' && !Array.isArray(x) && x !== null;
-}
-function deepRemoveVoid(obj) {
-    if (Array.isArray(obj)) {
-        return obj.map(deepRemoveVoid);
-    }
-    else if (isObject(obj)) {
-        let result = {};
-        for (const key in obj) {
-            if (Object.prototype.hasOwnProperty.call(obj, key)) {
-                const value = obj[key];
-                if (typeof value !== 'undefined' && value !== null) {
-                    result[key] = deepRemoveVoid(value);
-                }
-            }
-        }
-        return result;
-    }
-    else {
-        return obj;
-    }
-}
-function sha256(message, secret, encoding) {
-    const hmac = crypto_1.default.createHmac('sha256', secret);
-    return hmac.update(message).digest(encoding);
-}
-function getHash(message) {
-    const hash = crypto_1.default.createHash('sha256');
-    return hash.update(message).digest('hex');
-}
-function getDate(timestamp) {
-    const date = new Date(timestamp * 1000);
-    const year = date.getUTCFullYear();
-    const month = ('0' + (date.getUTCMonth() + 1)).slice(-2);
-    const day = ('0' + date.getUTCDate()).slice(-2);
-    return `${year}-${month}-${day}`;
-}
-const ServiceVersionMap = {
-    tcb: '2018-06-08',
-    scf: '2018-04-16',
-    flexdb: '2018-11-27',
-    cam: '2019-01-16',
-    vpc: '2017-03-12',
-    ssl: '2019-12-05',
-    tcbr: '2022-02-17',
-};
-exports.fetch = request_1.fetch;
-exports.fetchStream = request_1.fetchStream;
-exports.nodeFetch = request_1.nodeFetch;
-const isTokenExpired = (credential, gap = 120) => credential.tokenExpired && Number(credential.tokenExpired) < Date.now() + gap * 1000;
-class CloudApiService {
-    constructor(options) {
-        if (!options) {
-            throw new error_1.CloudBaseError('Options cloud not be empty!');
-        }
-        const { service, baseParams, version, proxy, region, credential, getCredential, timeout = 60000 } = options;
-        this.service = service;
-        this.timeout = timeout;
-        if (this.service === 'tcb' && process.env.CLOUDBASE_TCB_CLOUDAPI_PROXY) {
-            this.proxy = process.env.CLOUDBASE_TCB_CLOUDAPI_PROXY;
-        }
-        else {
-            this.proxy = proxy;
-        }
-        if (this.service === 'tcb' && process.env.CLOUDBASE_TCB_CLOUDAPI_REGION) {
-            this.region = process.env.CLOUDBASE_TCB_CLOUDAPI_REGION;
-        }
-        else {
-            this.region = region || process.env.TENCENTCLOUD_REGION || 'ap-shanghai';
-        }
-        this.credential = credential;
-        this.baseParams = baseParams || {};
-        this.getCredential = getCredential;
-        this.version = ServiceVersionMap[service] || version;
-    }
-    static getInstance(options) {
-        var _a;
-        const { service } = options;
-        if ((_a = CloudApiService.serviceCacheMap) === null || _a === void 0 ? void 0 : _a[service]) {
-            return CloudApiService.serviceCacheMap[service];
-        }
-        const apiService = new CloudApiService(options);
-        CloudApiService.serviceCacheMap = Object.assign({}, CloudApiService.serviceCacheMap);
-        CloudApiService.serviceCacheMap[service] = apiService;
-        return apiService;
-    }
-    get baseUrl() {
-        const urlMap = {
-            tcb: 'https://tcb.tencentcloudapi.com',
-            flexdb: 'https://flexdb.tencentcloudapi.com',
-            lowcode: `${process.env.CLOUDBASE_LOWCODE_ENDPOINT || 'https://lcap.cloud.tencent.com'}/api/v1/cliapi`,
-            tcbr: 'https://tcbr.tencentcloudapi.com',
-        };
-        if (this.service === 'tcb' && process.env.CLOUDBASE_TCB_CLOUDAPI_HOST) {
-            return `http://${process.env.CLOUDBASE_TCB_CLOUDAPI_HOST}`;
-        }
-        if (urlMap[this.service]) {
-            return urlMap[this.service];
-        }
-        else {
-            return `https://${this.service}.tencentcloudapi.com`;
-        }
-    }
-    request(actionOrOptions, assignData = {}, assignMethod = 'POST') {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            let action;
-            let data;
-            let method;
-            let region;
-            if (typeof actionOrOptions === 'string') {
-                action = actionOrOptions;
-                data = assignData;
-                method = assignMethod;
-            }
-            else {
-                action = actionOrOptions === null || actionOrOptions === void 0 ? void 0 : actionOrOptions.action;
-                data = (actionOrOptions === null || actionOrOptions === void 0 ? void 0 : actionOrOptions.data) || {};
-                method = (actionOrOptions === null || actionOrOptions === void 0 ? void 0 : actionOrOptions.method) || 'POST';
-                region = actionOrOptions === null || actionOrOptions === void 0 ? void 0 : actionOrOptions.region;
-            }
-            this.action = action;
-            this.data = deepRemoveVoid(Object.assign(Object.assign({}, data), this.baseParams));
-            this.method = method;
-            this.url = this.baseUrl;
-            if (!((_a = this.credential) === null || _a === void 0 ? void 0 : _a.secretId) || isTokenExpired(this.credential)) {
-                if (!this.getCredential) {
-                    throw new error_1.CloudBaseError('You must provide credential info!');
-                }
-                if (typeof this.getCredential !== 'function') {
-                    throw new error_1.CloudBaseError('The getCredential option must be a function!');
-                }
-                const credential = yield this.getCredential();
-                if (!credential) {
-                    throw new error_1.CloudBaseError('Calling getCredential function get no credential info!');
-                }
-                this.credential = credential;
-            }
-            try {
-                const data = yield this.requestWithSign(region);
-                if (data.Response.Error) {
-                    const tcError = new error_1.CloudBaseError(data.Response.Error.Message, {
-                        action,
-                        requestId: data.Response.RequestId,
-                        code: data.Response.Error.Code,
-                        original: data.Response.Error
-                    });
-                    throw tcError;
-                }
-                else {
-                    return data.Response;
-                }
-            }
-            catch (e) {
-                if (e.name === 'CloudBaseError') {
-                    throw e;
-                }
-                else {
-                    throw new error_1.CloudBaseError(e.message, {
-                        action,
-                        code: e.code,
-                        type: e.type
-                    });
-                }
-            }
-        });
-    }
-    requestWithSign(region) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const timestamp = Math.floor(Date.now() / 1000);
-            const { method, timeout, data } = this;
-            if (method === 'GET') {
-                this.url += '?' + query_string_1.default.stringify(data);
-            }
-            if (method === 'POST') {
-                this.payload = data;
-            }
-            const { CLOUDBASE_TCB_CLOUDAPI_HOST } = process.env;
-            if (this.service === 'tcb' && CLOUDBASE_TCB_CLOUDAPI_HOST) {
-                this.host = CLOUDBASE_TCB_CLOUDAPI_HOST;
-            }
-            else {
-                this.host = new url_1.URL(this.url).host;
-            }
-            const config = {
-                method,
-                timeout,
-                headers: {
-                    Host: this.host,
-                    'X-TC-Action': this.action,
-                    'X-TC-Region': region || this.region,
-                    'X-TC-Timestamp': timestamp,
-                    'X-TC-Version': this.version
-                }
-            };
-            if (this.credential.token) {
-                config.headers['X-TC-Token'] = this.credential.token;
-            }
-            if (method === 'GET') {
-                config.headers['Content-Type'] = 'application/x-www-form-urlencoded';
-            }
-            if (method === 'POST') {
-                config.body = JSON.stringify(data);
-                config.headers['Content-Type'] = 'application/json';
-            }
-            const sign = this.getRequestSign(timestamp);
-            config.headers['Authorization'] = sign;
-            return (0, exports.fetch)(this.url, config, this.proxy);
-        });
-    }
-    getRequestSign(timestamp) {
-        const { method, url, service } = this;
-        const { secretId, secretKey } = this.credential;
-        const urlObj = new url_1.URL(url);
-        let headers = '';
-        const signedHeaders = 'content-type;host';
-        if (method === 'GET') {
-            headers = 'content-type:application/x-www-form-urlencoded\n';
-        }
-        if (method === 'POST') {
-            headers = 'content-type:application/json\n';
-        }
-        let path = urlObj.pathname;
-        if (path === '/api/v1/cliapi' && service === 'lowcode') {
-            path = '//lcap.cloud.tencent.com/api/v1/cliapi';
-            headers += 'host:lcap.cloud.tencent.com\n';
-        }
-        else {
-            headers += `host:${this.host}\n`;
-        }
-        const querystring = urlObj.search.slice(1);
-        const payloadHash = this.payload ? getHash(JSON.stringify(this.payload)) : getHash('');
-        const canonicalRequest = `${method}\n${path}\n${querystring}\n${headers}\n${signedHeaders}\n${payloadHash}`;
-        const date = getDate(timestamp);
-        const StringToSign = `TC3-HMAC-SHA256\n${timestamp}\n${date}/${service}/tc3_request\n${getHash(canonicalRequest)}`;
-        const kDate = sha256(date, `TC3${secretKey}`);
-        const kService = sha256(service, kDate);
-        const kSigning = sha256('tc3_request', kService);
-        const signature = sha256(StringToSign, kSigning, 'hex');
-        return `TC3-HMAC-SHA256 Credential=${secretId}/${date}/${service}/tc3_request, SignedHeaders=${signedHeaders}, Signature=${signature}`;
-    }
-    clearCredentialCache() {
-        this.credential = null;
-    }
-}
-exports.CloudApiService = CloudApiService;
-CloudApiService.serviceCacheMap = {};

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

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CloudBaseError = void 0;
-class CloudBaseError extends Error {
-    constructor(message, options = {}) {
-        super();
-        this.name = 'CloudBaseError';
-        const { code = '', action = '', original = null, requestId = '', type } = options;
-        this.message = `[${action}]\nRequestId：${requestId}\n${message}`;
-        this.original = original;
-        this.code = code;
-        this.requestId = requestId;
-        this.action = action;
-        this.type = type;
-    }
-}
-exports.CloudBaseError = CloudBaseError;

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

@@ -1,17 +0,0 @@
-"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

@@ -1,40 +0,0 @@
-"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 = 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.HttpsProxyAgent(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.HttpsProxyAgent(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

@@ -1,61 +0,0 @@
-"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 = {};