tencentcloud-sdk-nodejs-intl-en 3.0.683 → 3.0.690

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tencentcloud-sdk-nodejs-intl-en",
-  "version": "3.0.683",
+  "version": "3.0.690",
   "description": "腾讯云 API NODEJS SDK",
   "main": "index.js",
   "scripts": {
@@ -20,7 +20,11 @@
   "author": "tencentcloudapi",
   "license": "Apache-2.0",
   "dependencies": {
-    "request": "^2.85.0"
+    "form-data": "^2.3.3",
+    "get-stream": "^4.1.0",
+    "https-proxy-agent": "^2.2.1",
+    "is-stream": "^1.1.0",
+    "node-fetch": "^2.2.0"
   },
   "directories": {
     "example": "examples",

package/tencentcloud/common/abstract_client.js

@@ -68,43 +68,80 @@ class AbstractClient {
     /**
      * @inner
      */
-    request(action, req, resp, cb) {
-        this.doRequest(action, req).then(data => this.succRequest(resp, cb, data), error => this.failRequest(error, cb));
+    request(action, req, resp, options, cb) {
+        if (typeof options === 'function') {
+            cb = options
+            options = {}
+        }
+        if (this.profile.signMethod === 'TC3-HMAC-SHA256') {
+            this.doRequestWithSign3(action, req, options).then(data => this.succRequest(resp, cb, data), error => this.failRequest(error, cb));
+        } else {
+            this.doRequest(action, req).then(data => this.succRequest(resp, cb, data), error => this.failRequest(error, cb));
+        }
     }
 
     /**
      * @inner
      */
-    doRequest(action, req) {
+    async doRequest(action, req) {
         let params = this.mergeData(req);
         params = this.formatRequestData(action, params);
-        let optional = {
-            timeout: this.profile.httpProfile.reqTimeout * 1000
-        };
-        return new Promise(
-            (resolve, reject) => {
-            HttpConnection.doRequest(this.profile.httpProfile.reqMethod,
-                this.profile.httpProfile.protocol + this.getEndpoint() + this.path,
-                params, (error, response, data) => {
-                    if (error) {
-                        reject(new TencentCloudSDKHttpException(error.message));
-                    } else if (response.statusCode !== 200) {
-                        const tcError = new TencentCloudSDKHttpException(response.statusMessage)
-                        tcError.httpCode = response.statusCode
-                        reject(tcError);
-                    } else {
-                        data = JSON.parse(data);
-                        if (data.Response.Error) {
-                            const tcError = new TencentCloudSDKHttpException(data.Response.Error.Message, data.Response.RequestId)
-                            tcError.code = data.Response.Error.Code
-                            reject(tcError);
-                        } else {
-                            resolve(data.Response);
-                        }
-                    }
-                },  // callback
-                optional) // doRequest
-            ;})
+        let res;
+        try {
+            res = await HttpConnection.doRequest({
+                method: this.profile.httpProfile.reqMethod,
+                url: this.profile.httpProfile.protocol + this.getEndpoint() + this.path,
+                data: params,
+                timeout: this.profile.httpProfile.reqTimeout * 1000
+            });
+        } catch (error) {
+            throw new TencentCloudSDKHttpException(error.message);
+        }
+        return await this.parseResponse(res)
+    }
+
+    /**
+     * @inner
+     */
+    async doRequestWithSign3(action, params, options) {
+        let res;
+        try {
+            res = await HttpConnection.doRequestWithSign3({
+                method: this.profile.httpProfile.reqMethod,
+                url: this.profile.httpProfile.protocol + this.getEndpoint() + this.path,
+                secretId: this.credential.secretId,
+                secretKey: this.credential.secretKey,
+                region: this.region,
+                data: params,
+                service: this.getEndpoint().split('.')[0],
+                action: action,
+                version: this.apiVersion,
+                multipart: options.multipart,
+                timeout: this.profile.httpProfile.reqTimeout * 1000,
+                token: this.credential.token,
+                requestClient: this.sdkVersion
+            })
+        } catch (e) {
+            throw new TencentCloudSDKHttpException(e.message)
+        }
+        return await this.parseResponse(res)
+    }
+
+    async parseResponse(res) {
+        if (res.status !== 200) {
+            const tcError = new TencentCloudSDKHttpException(res.statusText)
+            tcError.httpCode = res.status
+            throw tcError;
+        } else {
+            const data = await res.json();
+            if (data.Response.Error) {
+                const tcError = new TencentCloudSDKHttpException(data.Response.Error.Message, data.Response.RequestId)
+                tcError.code = data.Response.Error.Code
+                throw tcError;
+            } else {
+                return data.Response;
+            }
+        }
     }
 
     /**

package/tencentcloud/common/http/fetch.js

@@ -0,0 +1,12 @@
+const fetch = require('node-fetch');
+const HttpsProxyAgent = require('https-proxy-agent');
+
+module.exports = (url, options) => {
+  const instanceOptions = options || {};
+
+  if (!options.agent && process.env.http_proxy) {
+    instanceOptions.agent = new HttpsProxyAgent(process.env.http_proxy);
+  }
+
+  return fetch(url, instanceOptions);
+};

package/tencentcloud/common/http/http_connection.js

@@ -1,32 +1,170 @@
-const request = require('request');
 const QueryString = require("querystring");
+const { URL } = require('url');
+const isStream = require('is-stream');
+const getStream = require('get-stream');
+const FormData = require('form-data');
+const Sign = require('../sign');
+const fetch = require('./fetch');
 
 /**
  * @inner
  */
 class HttpConnection {
-    static doRequest(method, url, data, callback, opt={}) {
-        let req = {
+    static async doRequest({ method, url, data, timeout }) {
+        let config = {
             method: method,
-            url: url,
+            headers: {},
+            timeout
         };
         if (method === "GET") {
-            req.url += "?" + QueryString.stringify(data);
+            url += "?" + QueryString.stringify(data);
         } else {
-            req.form = data;
-        }
-        Object.assign(req, opt);
-        request(req, function (error, response, body) {
-            /**
-            * callback of `.request`
-            * @callback requestCallback
-            * @param {Error} error Error of the request.
-            * @param {Object} response Response of the request.
-            * @param {String} body Result of the API request.
-            */
-
-            callback(error, response, body);
+            config.headers['Content-Type'] = 'application/x-www-form-urlencoded'
+            config.body = QueryString.stringify(data);
+        }
+        return await fetch(url, config)
+    }
+
+    static async doRequestWithSign3({
+        method,
+        url,
+        data,
+        service,
+        action,
+        region,
+        version,
+        secretId,
+        secretKey,
+        multipart = false,
+        timeout = 60000,
+        token,
+        requestClient
+    }) {
+        // data 中可能带有 readStream，由于需要计算整个 body 的 hash，
+        // 所以这里把 readStream 转为 Buffer
+        await convertReadStreamToBuffer(data)
+
+        data = deepRemoveNull(data)
+
+        const timestamp = parseInt(new Date().getTime() / 1000)
+        method = method.toUpperCase()
+
+        let payload = ''
+        if (method === 'GET') {
+            data = mergeData(data)
+            url += '?' + QueryString.stringify(data)
+        }
+        if (method === 'POST') {
+            payload = data
+        }
+
+        const config = {
+            method,
+            timeout,
+            headers: {
+                'Host': new URL(url).host,
+                'X-TC-Action': action,
+                'X-TC-Region': region,
+                'X-TC-Timestamp': timestamp,
+                'X-TC-Version': version,
+                'X-TC-Token': token,
+                'X-TC-RequestClient': requestClient
+            }
+        }
+
+        if (token === null) {
+            delete config.headers["X-TC-Token"]
+        }
+
+        let form
+        if (method === 'GET') {
+            config.headers['Content-Type'] = 'application/x-www-form-urlencoded'
+        }
+        if (method === 'POST' && !multipart) {
+            config.body = JSON.stringify(data)
+            config.headers['Content-Type'] = 'application/json'
+        }
+        if (method === 'POST' && multipart) {
+            form = new FormData();
+            for (var key in data) {
+                form.append(key, data[key])
+            }
+            config.body = form
+            config.headers = Object.assign({}, config.headers, form.getHeaders())
+        }
+
+        const signature = Sign.sign3({
+            method,
+            url,
+            payload,
+            timestamp,
+            service,
+            secretId,
+            secretKey,
+            multipart,
+            boundary: form ? form.getBoundary() : undefined
         })
+
+        config.headers['Authorization'] = signature
+
+        return await fetch(url, config)
+    }
+}
+
+async function convertReadStreamToBuffer(data) {
+    for (let key in data) {
+        if (isStream(data[key])) {
+            data[key] = await getStream.buffer(data[key])
+        }
     }
 }
+
+function mergeData(data, prefix = "") {
+    let ret = {};
+    for (let k in data) {
+        if (data[k] === null) {
+            continue;
+        }
+        if (data[k] instanceof Array || data[k] instanceof Object) {
+            Object.assign(ret, mergeData(data[k], prefix + k + "."));
+        } else {
+            ret[prefix + k] = data[k];
+        }
+    }
+    return ret;
+}
+
+function deepRemoveNull(obj) {
+    if (isArray(obj)) {
+        return obj.map(deepRemoveNull)
+    } else if (isObject(obj)) {
+        let result = {}
+        for (let key in obj) {
+            const value = obj[key]
+            if (!isNull(value)) {
+                result[key] = deepRemoveNull(value)
+            }
+        }
+        return result
+    } else {
+        return obj
+    }
+}
+
+function isBuffer(x) {
+    return Buffer.isBuffer(x)
+}
+
+function isArray(x) {
+    return Array.isArray(x)
+}
+
+function isObject(x) {
+    return typeof x === 'object' && !isArray(x) && !isStream(x) && !isBuffer(x) && x !== null
+}
+
+function isNull(x) {
+    return x === null
+}
+
 module.exports = HttpConnection;

package/tencentcloud/common/sdk_version.js

@@ -1,2 +1,2 @@
-const sdkVersion = "3.0.683";
+const sdkVersion = "3.0.690";
 module.exports = sdkVersion

package/tencentcloud/common/sign.js

@@ -1,5 +1,6 @@
 const TencentCloudSDKHttpException = require("./exception/tencent_cloud_sdk_exception");
 const crypto = require('crypto');
+const { URL } = require('url')
 
 /**
  * @inner
@@ -18,5 +19,103 @@ class Sign {
         let hmac = crypto.createHmac(signMethodMap[signMethod], secretKey || "");
         return hmac.update(Buffer.from(signStr, 'utf8')).digest('base64')
     }
+
+    static sign3({
+        method = 'POST',
+        url = '',
+        payload,
+        timestamp,
+        service,
+        secretId,
+        secretKey,
+        multipart,
+        boundary
+    }) {
+        const urlObj = new URL(url)
+    
+        // 通用头部
+        let headers = ''
+        let signedHeaders = ''
+        if (method === 'GET') {
+            signedHeaders = 'content-type'
+            headers = 'content-type:application/x-www-form-urlencoded\n'
+        } else if (method === 'POST') {
+            signedHeaders = 'content-type'
+            if (multipart) {
+                headers = `content-type:multipart/form-data; boundary=${boundary}\n`
+            } else {
+                headers = 'content-type:application/json\n'
+            }
+        }
+        headers += `host:${urlObj.hostname}\n`
+        signedHeaders += ';host'
+    
+        const path = urlObj.pathname
+        const querystring = urlObj.search.slice(1)
+    
+        let payload_hash = ''
+        if (multipart) {
+            const hash = crypto.createHash('sha256')
+            hash.update(`--${boundary}`)
+            for (let key in payload) {
+                const content = payload[key]
+                if (Buffer.isBuffer(content)) {
+                    hash.update(`\r\nContent-Disposition: form-data; name="${key}"\r\nContent-Type: application/octet-stream\r\n\r\n`)
+                    hash.update(content)
+                    hash.update('\r\n')
+                } else if (typeof content === 'string') {
+                    hash.update(`\r\nContent-Disposition: form-data; name="${key}"\r\n\r\n`)
+                    hash.update(`${content}\r\n`)
+                }
+                hash.update(`--${boundary}`)
+            }
+            hash.update(`--\r\n`)
+            payload_hash = hash.digest('hex')
+        } else {
+            payload_hash = payload ? getHash(JSON.stringify(payload)) : getHash('')
+        }
+    
+        const canonicalRequest =
+            method + '\n' +
+            path + '\n' +
+            querystring + '\n' +
+            headers + '\n' +
+            signedHeaders + '\n' +
+            payload_hash
+        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}`
+    }
+}
+
+
+function sha256(message, secret = '', encoding) {
+    const hmac = crypto.createHmac('sha256', secret)
+    return hmac.update(message).digest(encoding)
+}
+
+function getHash(message, encoding = 'hex') {
+    const hash = crypto.createHash('sha256')
+    return hash.update(message).digest(encoding)
 }
+
+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}`
+}
+
 module.exports = Sign;

package/tencentcloud/faceid/v20180301/models.js

@@ -1226,13 +1226,13 @@ Default value: `4`.
         this.SecureLevel = null;
 
         /**
-         * The image for comparison in the `compare` (liveness detection and face comparison) mode. This parameter is required when the value of `CheckMode` is `compare`.
+         * The photo (in Base64) to compare. This parameter is required when the value of `CheckMode` is `compare`.
          * @type {string || null}
          */
         this.Image = null;
 
         /**
-         * The pass-through parameter.
+         * The pass-through parameter, which can be omitted if there are no special requirements.
          * @type {string || null}
          */
         this.Extra = null;

package/tencentcloud/live/v20180801/live_client.js

@@ -17,9 +17,10 @@
 const models = require("./models");
 const AbstractClient = require('../../common/abstract_client')
 const CreateLiveSnapshotRuleRequest = models.CreateLiveSnapshotRuleRequest;
-const TimeShiftBillData = models.TimeShiftBillData;
+const BillDataInfo = models.BillDataInfo;
 const EnableLiveDomainResponse = models.EnableLiveDomainResponse;
 const DescribeUploadStreamNumsResponse = models.DescribeUploadStreamNumsResponse;
+const HlsSpecialParam = models.HlsSpecialParam;
 const TranscodeTotalInfo = models.TranscodeTotalInfo;
 const StopRecordTaskResponse = models.StopRecordTaskResponse;
 const DescribeDeliverBandwidthListResponse = models.DescribeDeliverBandwidthListResponse;
@@ -27,6 +28,7 @@ const DeleteLiveRecordRuleRequest = models.DeleteLiveRecordRuleRequest;
 const ResumeLiveStreamRequest = models.ResumeLiveStreamRequest;
 const DeleteLiveTranscodeTemplateResponse = models.DeleteLiveTranscodeTemplateResponse;
 const FlvSpecialParam = models.FlvSpecialParam;
+const DescribeBillBandwidthAndFluxListResponse = models.DescribeBillBandwidthAndFluxListResponse;
 const CreateScreenshotTaskResponse = models.CreateScreenshotTaskResponse;
 const DeleteLiveCallbackRuleResponse = models.DeleteLiveCallbackRuleResponse;
 const ResumeDelayLiveStreamRequest = models.ResumeDelayLiveStreamRequest;
@@ -117,6 +119,7 @@ const DescribeConcurrentRecordStreamNumResponse = models.DescribeConcurrentRecor
 const DescribeLiveTimeShiftBillInfoListRequest = models.DescribeLiveTimeShiftBillInfoListRequest;
 const DescribeLiveCertsResponse = models.DescribeLiveCertsResponse;
 const CommonMixInputParam = models.CommonMixInputParam;
+const WatermarkInfo = models.WatermarkInfo;
 const DescribeLiveWatermarkRulesResponse = models.DescribeLiveWatermarkRulesResponse;
 const DescribeLiveRecordTemplatesResponse = models.DescribeLiveRecordTemplatesResponse;
 const PlayDataInfoByStream = models.PlayDataInfoByStream;
@@ -176,7 +179,7 @@ const DescribeStreamPushInfoListResponse = models.DescribeStreamPushInfoListResp
 const DescribeLiveStreamPushInfoListRequest = models.DescribeLiveStreamPushInfoListRequest;
 const StopLiveRecordResponse = models.StopLiveRecordResponse;
 const DescribeLiveWatermarksResponse = models.DescribeLiveWatermarksResponse;
-const WatermarkInfo = models.WatermarkInfo;
+const TimeShiftBillData = models.TimeShiftBillData;
 const DescribeLiveForbidStreamListRequest = models.DescribeLiveForbidStreamListRequest;
 const DescribeTopClientIpSumInfoListRequest = models.DescribeTopClientIpSumInfoListRequest;
 const CreateLiveCallbackRuleRequest = models.CreateLiveCallbackRuleRequest;
@@ -253,7 +256,7 @@ const DescribeVisitTopSumInfoListResponse = models.DescribeVisitTopSumInfoListRe
 const CallBackRuleInfo = models.CallBackRuleInfo;
 const PlaySumStatInfo = models.PlaySumStatInfo;
 const DescribeLiveTranscodeTemplatesRequest = models.DescribeLiveTranscodeTemplatesRequest;
-const HlsSpecialParam = models.HlsSpecialParam;
+const DescribeBillBandwidthAndFluxListRequest = models.DescribeBillBandwidthAndFluxListRequest;
 const DescribeLiveRecordRulesResponse = models.DescribeLiveRecordRulesResponse;
 const CreateLiveSnapshotTemplateRequest = models.CreateLiveSnapshotTemplateRequest;
 const TemplateInfo = models.TemplateInfo;
@@ -1387,6 +1390,17 @@ Note:
         this.request("CreateLiveRecordTemplate", req, resp, cb);
     }
 
+    /**
+     * This API is used to query the data of billable LVB bandwidth and traffic.
+     * @param {DescribeBillBandwidthAndFluxListRequest} req
+     * @param {function(string, DescribeBillBandwidthAndFluxListResponse):void} cb
+     * @public
+     */
+    DescribeBillBandwidthAndFluxList(req, cb) {
+        let resp = new DescribeBillBandwidthAndFluxListResponse();
+        this.request("DescribeBillBandwidthAndFluxList", req, resp, cb);
+    }
+
     /**
      * This API is used to disable an LVB domain name.
      * @param {ForbidLiveDomainRequest} req