@cloudbase/manager-node 3.12.1 → 4.1.0

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 4.0.0
+- 升级 https-proxy-agent 3->5 修复 https://github.com/TencentCloud/tencentcloud-sdk-nodejs/issues/47
+
+
 # v3.9.2-beta
 -   扩展禁用用户接口为变更用户状态接口
 -   增加修改用户信息接口

package/lib/env/index.js

@@ -14,17 +14,12 @@ const cos_nodejs_sdk_v5_1 = __importDefault(require("cos-nodejs-sdk-v5"));
 const util_1 = __importDefault(require("util"));
 const error_1 = require("../error");
 const utils_1 = require("../utils");
-const cam_1 = require("../cam");
-const constant_1 = require("../constant");
-const billing_1 = require("../billing");
 class EnvService {
     constructor(environment) {
         this.environment = environment;
         this.envId = environment.getEnvId();
         this.envType = environment.getEnvType();
         this.cloudService = new utils_1.CloudService(environment.cloudBaseContext, 'tcb', '2018-06-08');
-        this.camService = new cam_1.CamService(environment.cloudBaseContext);
-        this.billService = new billing_1.BillingService(environment.cloudBaseContext);
     }
     /**
      * 列出所有环境
@@ -33,208 +28,6 @@ class EnvService {
     async listEnvs() {
         return this.cloudService.request('DescribeEnvs');
     }
-    /**
-     * 创建新环境
-     * @param {string} name 环境名称
-     * @returns {Promise<ICreateEnvRes>}
-     */
-    async createEnv(param) {
-        // 1. 检查是否开通过TCB服务,若未开通，跳2检查角色  开通则跳5 创建环境
-        // 2. 查询tcb 角色是否绑定该账户
-        // 3. 若未绑定，则创建角色并绑定角色
-        // 4. 开通TCB服务
-        // 5. 创建环境
-        // 6. 购买环境，选择预付费 或 后付费 套餐
-        // 7. 若购买失败，将当前环境销毁，若购买成功，返回envId
-        const { name, paymentMode, channel = 'qc_console' } = param;
-        // 1. 检查TCB服务是否开通
-        const { Initialized } = await this.checkTcbService();
-        if (!Initialized) {
-            // 跳2 查询TCB角色是否绑定
-            let hasTcbRole = false;
-            try {
-                const res = await this.camService.getRole(constant_1.ROLE_NAME.TCB);
-                hasTcbRole = true;
-            }
-            catch (e) {
-                // 判断是否为角色不存在错误
-                if (e.code !== 'InvalidParameter.RoleNotExist') {
-                    throw e;
-                }
-            }
-            if (!hasTcbRole) {
-                // 3. 当前账户没有tcbRole，创建角色并绑定
-                // 创建角色
-                const createRoleResult = await this.camService.createRole({
-                    RoleName: constant_1.ROLE_NAME.TCB,
-                    Description: '云开发(TCB)操作权限含在访问管理(CAM)创建角色，新增角色载体，给角色绑定策略；含读写对象存储(COS)数据；含读写无服务器云函数(SCF)数据；含读取云监控(Monitor)数据。',
-                    PolicyDocument: '{"version":"2.0","statement":[{"action":"sts:AssumeRole","effect":"allow","principal":{"service":["scf.qcloud.com","tcb.cloud.tencent.com", "cvm.qcloud.com"]}}]}'
-                });
-                const { RoleId } = createRoleResult;
-                // 绑定角色策略
-                // await this.camService.attachRolePolicy({
-                //     PolicyId: 8825032,
-                //     AttachRoleName: ROLE_NAME.TCB
-                // })
-                await this.camService.attachRolePolicies({
-                    RoleName: constant_1.ROLE_NAME.TCB,
-                    PolicyName: [
-                        'QcloudAccessForTCBRole',
-                        'QcloudAccessForTCBRoleInAccessCloudBaseRun'
-                    ]
-                });
-            }
-            // 4. 未开通则初始化TCB
-            await this.initTcb({ Channel: channel, Source: 'qcloud' });
-        }
-        // 5. 创建环境
-        const params = {
-            Alias: name,
-            EnvId: `${name}-${utils_1.guid6()}`,
-            Source: 'qcloud'
-        };
-        if (channel) {
-            params.Channel = channel;
-        }
-        const { EnvId } = await this.cloudService.request('CreateEnv', params);
-        const realPaymentMode = paymentMode ? paymentMode : 'postpay';
-        // 6. 购买环境
-        let prepayCreateDeal = false;
-        let prepayPayDeal = false;
-        let postpayDeal = false;
-        let payError = null;
-        if (realPaymentMode === 'prepay') {
-            // 预付费
-            // 1. 创建订单
-            // 2. 支付订单
-            const goods = [
-                {
-                    GoodsCategoryId: 101183,
-                    // action: 'purchase',
-                    // currency: 'CNY',
-                    RegionId: 1,
-                    ZoneId: 0,
-                    GoodsNum: 1,
-                    ProjectId: 0,
-                    PayMode: 1,
-                    Platform: 1,
-                    GoodsDetail: JSON.stringify({
-                        productCode: 'p_tcb',
-                        subProductCode: 'sp_tcb_basic',
-                        resourceId: EnvId,
-                        pid: 16677,
-                        timeUnit: 'm',
-                        timeSpan: 1,
-                        tcb_cos: 1,
-                        tcb_cdn: 1,
-                        tcb_scf: 1,
-                        tcb_mongodb: 1,
-                        region: 'ap-shanghai',
-                        zone: 'ap-shanghai-1',
-                        source: 'qcloud',
-                        envId: EnvId,
-                        packageId: 'basic',
-                        isAutoRenew: 'true',
-                        tranType: 1,
-                        productInfo: [
-                            {
-                                name: '套餐版本',
-                                value: '基础版 1'
-                            },
-                            {
-                                name: '存储空间',
-                                value: '5GB'
-                            },
-                            {
-                                name: 'CDN流量',
-                                value: '5GB'
-                            },
-                            {
-                                name: '云函数资源使用量',
-                                value: '4万GBs'
-                            },
-                            {
-                                name: '数据库容量',
-                                value: '2GB'
-                            },
-                            {
-                                name: '数据库同时连接数',
-                                value: '20个'
-                            }
-                        ]
-                    })
-                }
-            ];
-            let OrderIdsList = [];
-            try {
-                const { OrderIds } = await this.billService.GenerateDeals(goods);
-                OrderIdsList = OrderIds;
-                prepayCreateDeal = true;
-            }
-            catch (e) {
-                // 预付费下单失败
-                payError = e;
-            }
-            if (prepayCreateDeal) {
-                // 下单成功
-                try {
-                    // 购买环境套餐
-                    const { OrderIds: succOrderIds } = await this.billService.PayDeals(OrderIdsList);
-                    // 判断订单是否支付成功
-                    if (succOrderIds[0] === OrderIdsList[0]) {
-                        prepayPayDeal = true;
-                    }
-                    else {
-                        throw new error_1.CloudBaseError('支付成功的订单号不一致');
-                    }
-                }
-                catch (e) {
-                    // 预付费订单支付失败
-                    payError = new error_1.CloudBaseError('预付费订单支付失败，请进入订单管理页面(https://console.cloud.tencent.com/deal)重新支付', {
-                        original: e
-                    });
-                }
-            }
-        }
-        if (realPaymentMode === 'postpay') {
-            // 后付费
-            try {
-                const { TranId } = await this.CreatePostpayPackage(EnvId);
-                postpayDeal = true;
-            }
-            catch (e) {
-                payError = e;
-            }
-        }
-        // 检查支付状态
-        // 1. 预付费下单失败 删除环境
-        // 2. 预付费下单成功过，支付订单失败，提示用户
-        // 3. 后付费开通失败 删除环境
-        if (realPaymentMode === 'prepay') {
-            if (!prepayCreateDeal) {
-                // 情形1
-                await this.destroyEnv(EnvId);
-                throw payError;
-            }
-            else {
-                if (!prepayPayDeal) {
-                    // 情形2
-                    throw payError;
-                }
-            }
-        }
-        if (realPaymentMode === 'postpay') {
-            if (!postpayDeal) {
-                // 情形3
-                await this.destroyEnv(EnvId);
-                throw payError;
-            }
-        }
-        // 成功返回envId
-        return {
-            envId: EnvId
-        };
-    }
     /**
      * 拉取安全域名列表
      * @returns {Promise<IAuthDomainsRes>}

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

@@ -70,6 +70,14 @@ class CloudService {
             cam: 'https://cam.tencentcloudapi.com',
             cdn: 'https://cdn.tencentcloudapi.com'
         };
+        // 检测环境变量，云梯账号走内网域名
+        const USE_INTERNAL_ENDPOINT = "USE_INTERNAL_ENDPOINT";
+        const intranetUrlMap = Object.keys(urlMap).map((service) => ({
+            [service]: `https://${service}.internal.tencentcloudapi.com`,
+        })).reduce((acc, cur) => (Object.assign(Object.assign({}, acc), cur)), {});
+        if (USE_INTERNAL_ENDPOINT in process.env) {
+            return intranetUrlMap[this.service];
+        }
         if (urlMap[this.service]) {
             return urlMap[this.service];
         }

package/lib/utils/http-request.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchStream = exports.fetch = 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");
 const error_1 = require("../error");
 // 使用 fetch + 代理
 async function fetch(url, config = {}, proxy) {
     if (proxy || process.env.http_proxy) {
-        config.agent = new https_proxy_agent_1.default(proxy || process.env.http_proxy);
+        config.agent = new https_proxy_agent_1.HttpsProxyAgent(proxy || process.env.http_proxy);
     }
     // 解决中文编码问题
     const escapeUrl = new url_1.URL(url).toString();
@@ -35,7 +35,7 @@ async function fetch(url, config = {}, proxy) {
 exports.fetch = fetch;
 async function fetchStream(url, config = {}, proxy) {
     if (proxy || process.env.http_proxy) {
-        config.agent = new https_proxy_agent_1.default(proxy || process.env.http_proxy);
+        config.agent = new https_proxy_agent_1.HttpsProxyAgent(proxy || process.env.http_proxy);
     }
     // 解决中文编码问题
     const escapeUrl = new url_1.URL(url).toString();

package/package.json

@@ -1,13 +1,14 @@
 {
     "name": "@cloudbase/manager-node",
-    "version": "3.12.1",
+    "version": "4.1.0",
     "description": "The node manage service api for cloudbase.",
     "main": "lib/index.js",
     "scripts": {
         "build": "rimraf lib types && npx tsc",
         "test": "jest --runInBand --detectOpenHandles --coverage --testTimeout=50000",
         "lint": "eslint \"./**/*.ts\"",
-        "lint:fix": "eslint --fix \"./**/*.ts\""
+        "lint:fix": "eslint --fix \"./**/*.ts\"",
+        "prepublishOnly": "npm run build"
     },
     "repository": {
         "type": "git",
@@ -36,7 +37,7 @@
         "archiver": "^3.1.1",
         "cos-nodejs-sdk-v5": "2.9.0",
         "del": "^5.1.0",
-        "https-proxy-agent": "^2.2.4",
+        "https-proxy-agent": "^5.0.1",
         "make-dir": "^3.0.0",
         "micromatch": "^4.0.2",
         "node-fetch": "^2.6.0",

package/src/env/index.ts

@@ -10,28 +10,9 @@ import {
     ICreatePostpayRes
 } from '../interfaces'
 import { CloudBaseError } from '../error'
-import { guid6, rsaEncrypt, CloudService, preLazy } from '../utils'
-import { CamService } from '../cam'
-import { ROLE_NAME } from '../constant'
-import { BillingService } from '../billing'
-
-interface ICreateEnvParam {
-    name: string
-    paymentMode?: PAYMENT_MODE
-    channel?: QCLOUD_CHANNEL
-}
-
-interface ICreateEnvRes {
-    // 环境当前状态：NORMAL：正常可用 NOINITIALIZE：尚未初始化 INITIALIZING：初始化过程中
-    Status: 'NORMAL' | 'NOINITIALIZE' | 'INITIALIZING'
-    // 唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。
-    RequestId: string
-}
+import { rsaEncrypt, CloudService, preLazy } from '../utils'
 
-type PAYMENT_MODE = 'prepay' | 'postpay'
 type SOURCE = 'miniapp' | 'qcloud'
-type WX_CHANNEL = 'ide' | 'api'
-type QCLOUD_CHANNEL = 'cocos' | 'qq' | 'cloudgame' | 'qc_console' | 'dcloud'
 
 interface IDeleteDomainRes {
     RequestId: string
@@ -62,8 +43,6 @@ export class EnvService {
     private environment: Environment
     private envId: string
     private cloudService: CloudService
-    private camService: CamService
-    private billService: BillingService
     private envType?: string
 
     constructor(environment: Environment) {
@@ -71,8 +50,6 @@ export class EnvService {
         this.envId = environment.getEnvId()
         this.envType = environment.getEnvType()
         this.cloudService = new CloudService(environment.cloudBaseContext, 'tcb', '2018-06-08')
-        this.camService = new CamService(environment.cloudBaseContext)
-        this.billService = new BillingService(environment.cloudBaseContext)
     }
 
     /**
@@ -83,235 +60,6 @@ export class EnvService {
         return this.cloudService.request('DescribeEnvs')
     }
 
-    /**
-     * 创建新环境
-     * @param {string} name 环境名称
-     * @returns {Promise<ICreateEnvRes>}
-     */
-    async createEnv(
-        param: ICreateEnvParam
-    ): Promise<{
-        envId: string
-    }> {
-        // 1. 检查是否开通过TCB服务,若未开通，跳2检查角色  开通则跳5 创建环境
-        // 2. 查询tcb 角色是否绑定该账户
-        // 3. 若未绑定，则创建角色并绑定角色
-        // 4. 开通TCB服务
-        // 5. 创建环境
-        // 6. 购买环境，选择预付费 或 后付费 套餐
-        // 7. 若购买失败，将当前环境销毁，若购买成功，返回envId
-        const { name, paymentMode, channel = 'qc_console' } = param
-
-        // 1. 检查TCB服务是否开通
-        const { Initialized } = await this.checkTcbService()
-
-        if (!Initialized) {
-            // 跳2 查询TCB角色是否绑定
-            let hasTcbRole = false
-            try {
-                const res = await this.camService.getRole(ROLE_NAME.TCB)
-                hasTcbRole = true
-            } catch (e) {
-                // 判断是否为角色不存在错误
-                if (e.code !== 'InvalidParameter.RoleNotExist') {
-                    throw e
-                }
-            }
-
-            if (!hasTcbRole) {
-                // 3. 当前账户没有tcbRole，创建角色并绑定
-
-                // 创建角色
-                const createRoleResult = await this.camService.createRole({
-                    RoleName: ROLE_NAME.TCB,
-                    Description:
-                        '云开发(TCB)操作权限含在访问管理(CAM)创建角色，新增角色载体，给角色绑定策略；含读写对象存储(COS)数据；含读写无服务器云函数(SCF)数据；含读取云监控(Monitor)数据。',
-                    PolicyDocument:
-                        '{"version":"2.0","statement":[{"action":"sts:AssumeRole","effect":"allow","principal":{"service":["scf.qcloud.com","tcb.cloud.tencent.com", "cvm.qcloud.com"]}}]}'
-                })
-
-                const { RoleId } = createRoleResult
-
-                // 绑定角色策略
-                // await this.camService.attachRolePolicy({
-                //     PolicyId: 8825032,
-                //     AttachRoleName: ROLE_NAME.TCB
-                // })
-
-                await this.camService.attachRolePolicies({
-                    RoleName: ROLE_NAME.TCB,
-                    PolicyName: [
-                        'QcloudAccessForTCBRole',
-                        'QcloudAccessForTCBRoleInAccessCloudBaseRun'
-                    ]
-                })
-            }
-
-            // 4. 未开通则初始化TCB
-            await this.initTcb({ Channel: channel, Source: 'qcloud' })
-        }
-
-        // 5. 创建环境
-
-        const params: any = {
-            Alias: name,
-            EnvId: `${name}-${guid6()}`,
-            Source: 'qcloud'
-        }
-
-        if (channel) {
-            params.Channel = channel
-        }
-
-        const { EnvId } = await this.cloudService.request('CreateEnv', params)
-
-        const realPaymentMode = paymentMode ? paymentMode : 'postpay'
-        // 6. 购买环境
-
-        let prepayCreateDeal = false
-        let prepayPayDeal = false
-        let postpayDeal = false
-        let payError = null
-
-        if (realPaymentMode === 'prepay') {
-            // 预付费
-            // 1. 创建订单
-            // 2. 支付订单
-
-            const goods = [
-                {
-                    GoodsCategoryId: 101183,
-                    // action: 'purchase',
-                    // currency: 'CNY',
-                    RegionId: 1,
-                    ZoneId: 0,
-                    GoodsNum: 1,
-                    ProjectId: 0,
-                    PayMode: 1,
-                    Platform: 1,
-                    GoodsDetail: JSON.stringify({
-                        productCode: 'p_tcb',
-                        subProductCode: 'sp_tcb_basic',
-                        resourceId: EnvId,
-                        pid: 16677,
-                        timeUnit: 'm',
-                        timeSpan: 1,
-                        tcb_cos: 1,
-                        tcb_cdn: 1,
-                        tcb_scf: 1,
-                        tcb_mongodb: 1,
-                        region: 'ap-shanghai',
-                        zone: 'ap-shanghai-1',
-                        source: 'qcloud',
-                        envId: EnvId,
-                        packageId: 'basic',
-                        isAutoRenew: 'true',
-                        tranType: 1,
-                        productInfo: [
-                            {
-                                name: '套餐版本',
-                                value: '基础版 1'
-                            },
-                            {
-                                name: '存储空间',
-                                value: '5GB'
-                            },
-                            {
-                                name: 'CDN流量',
-                                value: '5GB'
-                            },
-                            {
-                                name: '云函数资源使用量',
-                                value: '4万GBs'
-                            },
-                            {
-                                name: '数据库容量',
-                                value: '2GB'
-                            },
-                            {
-                                name: '数据库同时连接数',
-                                value: '20个'
-                            }
-                        ]
-                    })
-                }
-            ]
-
-            let OrderIdsList = []
-            try {
-                const { OrderIds } = await this.billService.GenerateDeals(goods)
-                OrderIdsList = OrderIds
-                prepayCreateDeal = true
-            } catch (e) {
-                // 预付费下单失败
-                payError = e
-            }
-
-            if (prepayCreateDeal) {
-                // 下单成功
-                try {
-                    // 购买环境套餐
-                    const { OrderIds: succOrderIds } = await this.billService.PayDeals(OrderIdsList)
-
-                    // 判断订单是否支付成功
-                    if (succOrderIds[0] === OrderIdsList[0]) {
-                        prepayPayDeal = true
-                    } else {
-                        throw new CloudBaseError('支付成功的订单号不一致')
-                    }
-                } catch (e) {
-                    // 预付费订单支付失败
-                    payError = new CloudBaseError(
-                        '预付费订单支付失败，请进入订单管理页面(https://console.cloud.tencent.com/deal)重新支付',
-                        {
-                            original: e
-                        }
-                    )
-                }
-            }
-        }
-
-        if (realPaymentMode === 'postpay') {
-            // 后付费
-            try {
-                const { TranId } = await this.CreatePostpayPackage(EnvId)
-                postpayDeal = true
-            } catch (e) {
-                payError = e
-            }
-        }
-
-        // 检查支付状态
-        // 1. 预付费下单失败 删除环境
-        // 2. 预付费下单成功过，支付订单失败，提示用户
-        // 3. 后付费开通失败 删除环境
-        if (realPaymentMode === 'prepay') {
-            if (!prepayCreateDeal) {
-                // 情形1
-                await this.destroyEnv(EnvId)
-                throw payError
-            } else {
-                if (!prepayPayDeal) {
-                    // 情形2
-                    throw payError
-                }
-            }
-        }
-
-        if (realPaymentMode === 'postpay') {
-            if (!postpayDeal) {
-                // 情形3
-                await this.destroyEnv(EnvId)
-                throw payError
-            }
-        }
-
-        // 成功返回envId
-        return {
-            envId: EnvId
-        }
-    }
-
     /**
      * 拉取安全域名列表
      * @returns {Promise<IAuthDomainsRes>}

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

@@ -91,6 +91,18 @@ export class CloudService {
             cam: 'https://cam.tencentcloudapi.com',
             cdn: 'https://cdn.tencentcloudapi.com'
         }
+
+        // 检测环境变量，云梯账号走内网域名
+        const USE_INTERNAL_ENDPOINT = "USE_INTERNAL_ENDPOINT"
+
+        const intranetUrlMap = Object.keys(urlMap).map((service) => ({
+            [service]: `https://${service}.internal.tencentcloudapi.com`,
+        })).reduce((acc, cur) => ({ ...acc, ...cur }), {})
+
+        if(USE_INTERNAL_ENDPOINT in process.env) {
+            return intranetUrlMap[this.service]
+        }
+
         if (urlMap[this.service]) {
             return urlMap[this.service]
         } else {

package/src/utils/http-request.ts

@@ -1,6 +1,6 @@
 import { URL } from 'url'
 import _fetch from 'node-fetch'
-import HttpsProxyAgent from 'https-proxy-agent'
+import { HttpsProxyAgent } from 'https-proxy-agent'
 import { CloudBaseError } from '../error'
 
 // 使用 fetch + 代理

package/types/env/index.d.ts

@@ -1,13 +1,6 @@
 import { Environment } from '../environment';
 import { IResponseInfo, AuthDomain, EnvInfo, LoginConfigItem, ICheckTcbServiceRes, ICreatePostpayRes } from '../interfaces';
-interface ICreateEnvParam {
-    name: string;
-    paymentMode?: PAYMENT_MODE;
-    channel?: QCLOUD_CHANNEL;
-}
-declare type PAYMENT_MODE = 'prepay' | 'postpay';
 declare type SOURCE = 'miniapp' | 'qcloud';
-declare type QCLOUD_CHANNEL = 'cocos' | 'qq' | 'cloudgame' | 'qc_console' | 'dcloud';
 interface IDeleteDomainRes {
     RequestId: string;
     Deleted: number;
@@ -32,8 +25,6 @@ export declare class EnvService {
     private environment;
     private envId;
     private cloudService;
-    private camService;
-    private billService;
     private envType?;
     constructor(environment: Environment);
     /**
@@ -41,14 +32,6 @@ export declare class EnvService {
      * @returns {Promise<IListEnvRes>}
      */
     listEnvs(): Promise<IListEnvRes>;
-    /**
-     * 创建新环境
-     * @param {string} name 环境名称
-     * @returns {Promise<ICreateEnvRes>}
-     */
-    createEnv(param: ICreateEnvParam): Promise<{
-        envId: string;
-    }>;
     /**
      * 拉取安全域名列表
      * @returns {Promise<IAuthDomainsRes>}