@cloudbase/cli 2.0.4 → 2.0.5

package/lib/commands/run/list.js

@@ -27,7 +27,6 @@ const error_1 = require("../../error");
 const run_1 = require("../../run");
 const utils_1 = require("../../utils");
 const decorators_1 = require("../../decorators");
-const utils_2 = require("../../utils");
 const StatusMap = {
     succ: '正常'
 };
@@ -55,9 +54,9 @@ let ListRun = class ListRun extends common_1.Command {
     }
     execute(envId, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            let envCheckType = yield (0, utils_2.checkTcbrEnv)(options.envId, false);
+            let envCheckType = yield (0, utils_1.checkTcbrEnv)(options.envId, false);
             if (envCheckType !== 0) {
-                (0, utils_2.logEnvCheck)(envId, envCheckType);
+                (0, utils_1.logEnvCheck)(envId, envCheckType);
                 return;
             }
             let { limit = 20, offset = 0 } = options;

package/lib/utils/tcbrApi/callTcbrApi.js

@@ -11,8 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.callTcbrApi = void 0;
 const toolbox_1 = require("@cloudbase/toolbox");
-const tcbr_cloud_api_request_1 = require("./tcbr-cloud-api-request");
-const tcbrService = tcbr_cloud_api_request_1.CloudApiService.getInstance('tcbr');
+const net_1 = require("../net");
+const tcbrService = net_1.CloudApiService.getInstance('tcbr');
 function callTcbrApi(action, data) {
     return __awaiter(this, void 0, void 0, function* () {
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.0.4",
+    "version": "2.0.5",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -29,7 +29,7 @@
     "author": "cwuyiqing@gmail.com",
     "license": "ISC",
     "dependencies": {
-        "@cloudbase/cloud-api": "^0.4.0",
+        "@cloudbase/cloud-api": "^0.5.3",
         "@cloudbase/framework-core": "^1.6.1",
         "@cloudbase/lowcode-cli": "^0.13.2",
         "@cloudbase/manager-node": "4.0.0",

package/src/commands/run/list.ts

@@ -1,9 +1,8 @@
 import { Command, ICommand } from '../common'
 import { CloudBaseError } from '../../error'
-import { listRun, logCreate } from '../../run'
-import { printHorizontalTable, loadingFactory } from '../../utils'
+import { listRun } from '../../run'
+import { printHorizontalTable, loadingFactory, checkTcbrEnv, logEnvCheck} from '../../utils'
 import { InjectParams, EnvId, ArgsOptions } from '../../decorators'
-import { checkTcbrEnv, logEnvCheck } from '../../utils'
 import { EnumEnvCheck } from '../../constant'
 
 const StatusMap = {

package/src/utils/tcbrApi/callTcbrApi.ts

@@ -1,5 +1,5 @@
 import { CloudBaseError } from '@cloudbase/toolbox'
-import { CloudApiService } from './tcbr-cloud-api-request'
+import { CloudApiService } from '../net'
 
 const tcbrService = CloudApiService.getInstance('tcbr')
 

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 = {};

package/src/utils/tcbrApi/tcbr-cloud-api/cloud-api-service.ts

@@ -1,363 +0,0 @@
-import crypto from 'crypto'
-import { URL } from 'url'
-import QueryString from 'query-string'
-
-import { fetch as _fetch, fetchStream as _fetchStream, nodeFetch as _nodeFetch } from './request'
-import { CloudBaseError } from './error'
-
-function isObject(x) {
-  return typeof x === 'object' && !Array.isArray(x) && x !== null
-}
-
-// 移除对象中的空值，防止调用云 API 失败
-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
-  }
-}
-
-type HexBase64Latin1Encoding = 'latin1' | 'hex' | 'base64';
-
-function sha256(message: string, secret: string, encoding?: HexBase64Latin1Encoding) {
-  const hmac = crypto.createHmac('sha256', secret)
-  return hmac.update(message).digest(encoding)
-}
-
-function getHash(message: string): string {
-  const hash = crypto.createHash('sha256')
-  return hash.update(message).digest('hex')
-}
-
-function getDate(timestamp: number): string {
-  const date = new Date(timestamp * 1000)
-  const year = date.getUTCFullYear()
-  const month = ('0' + (date.getUTCMonth() + 1)).slice(-2)
-  // UTC 日期，非本地时间
-  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',
-}
-
-export interface ServiceOptions {
-    service: string;
-    version?: string;
-    proxy?: string;
-    timeout?: number;
-    region?: string;
-    baseParams?: Record<string, any>;
-    credential?: Credential;
-    getCredential?: () => Promise<Credential> | Credential;
-}
-
-export interface Credential {
-    secretId: string;
-    secretKey: string;
-    token?: string;
-    tokenExpired?: number;
-}
-
-export interface RequestOptions {
-    action: string;
-    data?: Record<string, any>;
-    method?: 'POST' | 'GET';
-    region?: string;
-}
-
-export const fetch = _fetch
-export const fetchStream = _fetchStream
-export const nodeFetch = _nodeFetch
-
-// token 将在 n 分钟内过期
-const isTokenExpired = (credential: Credential, gap = 120) =>
-  credential.tokenExpired && Number(credential.tokenExpired) < Date.now() + gap * 1000
-
-export class CloudApiService {
-    // 缓存请求实例
-    static serviceCacheMap: Record<string, CloudApiService> = {};
-
-    static getInstance(options: ServiceOptions) {
-      const { service } = options
-      if (CloudApiService.serviceCacheMap?.[service]) {
-        return CloudApiService.serviceCacheMap[service]
-      }
-      const apiService = new CloudApiService(options)
-      // 预防 serviceCacheMap 被置空导致的错误
-      CloudApiService.serviceCacheMap = {
-        ...CloudApiService.serviceCacheMap
-      }
-      CloudApiService.serviceCacheMap[service] = apiService
-      return apiService
-    }
-
-    service: string;
-    version: string;
-    proxy: string;
-    timeout: number;
-    region: string;
-    credential: Credential;
-    baseParams: Record<string, any>;
-    getCredential: () => Promise<Credential> | Credential;
-
-    url: string;
-    host: string;
-    action: string;
-    method: 'POST' | 'GET';
-    data: Record<string, any>;
-    payload: Record<string, any>;
-
-    constructor(options: ServiceOptions) {
-      if (!options) {
-        throw new 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
-    }
-
-    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`
-      }
-    }
-
-    // overload
-    async request(options: RequestOptions);
-    async request(action: string, data?: Record<string, any>, method?: 'POST' | 'GET');
-
-    async request(
-      actionOrOptions: string | RequestOptions,
-      assignData: Record<string, any> = {},
-      assignMethod: 'POST' | 'GET' = 'POST'
-    ) {
-      // 增加 region 参数，兼容之前的入参形式
-      let action
-      let data
-      let method
-      let region
-      if (typeof actionOrOptions === 'string') {
-        action = actionOrOptions
-        data = assignData
-        method = assignMethod
-      } else {
-        action = actionOrOptions?.action
-        data = actionOrOptions?.data || {}
-        method = actionOrOptions?.method || 'POST'
-        region = actionOrOptions?.region
-      }
-
-      this.action = action
-      this.data = deepRemoveVoid({ ...data, ...this.baseParams })
-      this.method = method
-
-      this.url = this.baseUrl
-
-      // 不存在密钥，或临时密钥过期
-      if (!this.credential?.secretId || isTokenExpired(this.credential)) {
-        if (!this.getCredential) {
-          throw new CloudBaseError('You must provide credential info!')
-        }
-
-        if (typeof this.getCredential !== 'function') {
-          throw new CloudBaseError('The getCredential option must be a function!')
-        }
-
-        const credential = await this.getCredential()
-
-        if (!credential) {
-          throw new CloudBaseError('Calling getCredential function get no credential info!')
-        }
-        this.credential = credential
-      }
-
-      try {
-        const data: Record<string, any> = await this.requestWithSign(region)
-        if (data.Response.Error) {
-          const tcError = new 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) {
-        // throw e
-        if (e.name === 'CloudBaseError') {
-          throw e
-        } else {
-          throw new CloudBaseError(e.message, {
-            action,
-            code: e.code,
-            type: e.type
-          })
-        }
-      }
-    }
-
-    async requestWithSign(region) {
-      // data 中可能带有 readStream，由于需要计算整个 body 的 hash，
-      // 所以这里把 readStream 转为 Buffer
-      // await convertReadStreamToBuffer(data)
-      const timestamp = Math.floor(Date.now() / 1000)
-
-      const { method, timeout, data } = this
-
-      if (method === 'GET') {
-        this.url += '?' + QueryString.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(this.url).host
-      }
-
-      const config: any = {
-        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 fetch(this.url, config, this.proxy)
-    }
-
-    getRequestSign(timestamp: number) {
-      const { method, url, service } = this
-      const { secretId, secretKey } = this.credential
-      const urlObj = new 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
-    }
-}

package/src/utils/tcbrApi/tcbr-cloud-api/error.ts

@@ -1,30 +0,0 @@
-interface Options {
-    exit?: number;
-    original?: Error | undefined;
-    code?: string | number;
-    requestId?: string;
-    action?: string;
-    type?: string;
-}
-
-export class CloudBaseError extends Error {
-    readonly exit: number;
-    readonly message: string;
-    readonly name = 'CloudBaseError';
-    readonly original: Error | undefined;
-    readonly code: string | number;
-    readonly requestId: string;
-    readonly action: string;
-    readonly type: string;
-
-    constructor(message: string, options: Options = {}) {
-      super()
-      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
-    }
-}

package/src/utils/tcbrApi/tcbr-cloud-api/index.ts

@@ -1 +0,0 @@
-export * from './cloud-api-service'

package/src/utils/tcbrApi/tcbr-cloud-api/request.ts

@@ -1,28 +0,0 @@
-import { URL } from 'url'
-import _fetch, { RequestInit } from 'node-fetch'
-import { HttpsProxyAgent } from 'https-proxy-agent'
-
-export const nodeFetch = _fetch
-
-// 使用 fetch + 代理
-export async function fetch(url: string, config: RequestInit = {}, proxy = '') {
-    if (proxy) {
-        config.agent = new HttpsProxyAgent(proxy)
-    }
-
-    // 解决中文编码问题
-    const escapeUrl = new URL(url).toString()
-
-    const res = await _fetch(escapeUrl, config)
-    return res.json()
-}
-
-export async function fetchStream(url: string, config: RequestInit = {}, proxy = '') {
-    if (proxy) {
-        config.agent = new HttpsProxyAgent(proxy)
-    }
-
-    const escapeUrl = new URL(url).toString()
-
-    return _fetch(escapeUrl, config)
-}

package/src/utils/tcbrApi/tcbr-cloud-api-request.ts

@@ -1,66 +0,0 @@
-import { getCredentialWithoutCheck, getRegion, Credential, getProxy } from '@cloudbase/toolbox'
-import { CloudApiService as _CloudApiService } from './tcbr-cloud-api/index'
-import { CloudBaseError } from '../../error'
-import { REQUEST_TIMEOUT } from '../../constant'
-
-let commonCredential: Credential
-
-// token 将在 n 分钟内过期
-const isTokenExpired = (credential: Credential, gap = 120) =>
-    credential.accessTokenExpired && Number(credential.accessTokenExpired) < Date.now() + gap * 1000
-
-export class CloudApiService {
-    // 缓存请求实例
-    static serviceCacheMap: Record<string, CloudApiService> = {}
-
-    // 单例模式
-    static getInstance(service: string) {
-        if (CloudApiService.serviceCacheMap?.[service]) {
-            return CloudApiService.serviceCacheMap[service]
-        }
-        const apiService = new CloudApiService(service)
-        CloudApiService.serviceCacheMap[service] = apiService
-        return apiService
-    }
-
-    region: string
-    apiService: _CloudApiService
-
-    constructor(service: string, baseParams?: Record<string, any>, version = '') {
-        // 初始化 API 实例
-        this.apiService = new _CloudApiService({
-            service,
-            version: service === 'tcr' 
-                    ? version 
-                    : service === 'tcbr'
-                    ? '2022-02-17'
-                    :'2019-09-24',
-            baseParams,
-            proxy: getProxy(),
-            timeout: REQUEST_TIMEOUT,
-            getCredential: async () => {
-                // 存在未过期的 token
-                if (commonCredential?.secretId && !isTokenExpired(commonCredential)) {
-                    return commonCredential
-                }
-
-                const credential = await getCredentialWithoutCheck()
-                if (!credential) {
-                    throw new CloudBaseError('无有效身份信息，请使用 cloudbase login 登录')
-                }
-
-                commonCredential = credential
-
-                return {
-                    ...credential,
-                    tokenExpired: Number(credential.accessTokenExpired)
-                }
-            }
-        })
-    }
-
-    async request(action: string, data: Record<string, any> = {}, method: 'POST' | 'GET' = 'POST') {
-        const region = this.region || (await getRegion())
-        return this.apiService.request({ action, data, method, region })
-    }
-}

package/types/utils/tcbrApi/tcbr-cloud-api/cloud-api-service.d.ts

@@ -1,51 +0,0 @@
-import { fetch as _fetch, fetchStream as _fetchStream } from './request';
-export interface ServiceOptions {
-    service: string;
-    version?: string;
-    proxy?: string;
-    timeout?: number;
-    region?: string;
-    baseParams?: Record<string, any>;
-    credential?: Credential;
-    getCredential?: () => Promise<Credential> | Credential;
-}
-export interface Credential {
-    secretId: string;
-    secretKey: string;
-    token?: string;
-    tokenExpired?: number;
-}
-export interface RequestOptions {
-    action: string;
-    data?: Record<string, any>;
-    method?: 'POST' | 'GET';
-    region?: string;
-}
-export declare const fetch: typeof _fetch;
-export declare const fetchStream: typeof _fetchStream;
-export declare const nodeFetch: typeof import("node-fetch").default;
-export declare class CloudApiService {
-    static serviceCacheMap: Record<string, CloudApiService>;
-    static getInstance(options: ServiceOptions): CloudApiService;
-    service: string;
-    version: string;
-    proxy: string;
-    timeout: number;
-    region: string;
-    credential: Credential;
-    baseParams: Record<string, any>;
-    getCredential: () => Promise<Credential> | Credential;
-    url: string;
-    host: string;
-    action: string;
-    method: 'POST' | 'GET';
-    data: Record<string, any>;
-    payload: Record<string, any>;
-    constructor(options: ServiceOptions);
-    get baseUrl(): any;
-    request(options: RequestOptions): any;
-    request(action: string, data?: Record<string, any>, method?: 'POST' | 'GET'): any;
-    requestWithSign(region: any): Promise<any>;
-    getRequestSign(timestamp: number): string;
-    clearCredentialCache(): void;
-}

package/types/utils/tcbrApi/tcbr-cloud-api/error.d.ts

@@ -1,20 +0,0 @@
-interface Options {
-    exit?: number;
-    original?: Error | undefined;
-    code?: string | number;
-    requestId?: string;
-    action?: string;
-    type?: string;
-}
-export declare class CloudBaseError extends Error {
-    readonly exit: number;
-    readonly message: string;
-    readonly name = "CloudBaseError";
-    readonly original: Error | undefined;
-    readonly code: string | number;
-    readonly requestId: string;
-    readonly action: string;
-    readonly type: string;
-    constructor(message: string, options?: Options);
-}
-export {};

package/types/utils/tcbrApi/tcbr-cloud-api/index.d.ts

@@ -1 +0,0 @@
-export * from './cloud-api-service';

package/types/utils/tcbrApi/tcbr-cloud-api/request.d.ts

@@ -1,4 +0,0 @@
-import _fetch, { RequestInit } from 'node-fetch';
-export declare const nodeFetch: typeof _fetch;
-export declare function fetch(url: string, config?: RequestInit, proxy?: string): Promise<any>;
-export declare function fetchStream(url: string, config?: RequestInit, proxy?: string): Promise<import("node-fetch").Response>;

package/types/utils/tcbrApi/tcbr-cloud-api-request.d.ts

@@ -1,9 +0,0 @@
-import { CloudApiService as _CloudApiService } from './tcbr-cloud-api/index';
-export declare class CloudApiService {
-    static serviceCacheMap: Record<string, CloudApiService>;
-    static getInstance(service: string): CloudApiService;
-    region: string;
-    apiService: _CloudApiService;
-    constructor(service: string, baseParams?: Record<string, any>, version?: string);
-    request(action: string, data?: Record<string, any>, method?: 'POST' | 'GET'): Promise<any>;
-}