merge code

Author: syzh

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tencent-cloud-sdk",
   "description": "Tencent Cloud SDK For Serverless Framework",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "main": "./index.js",
   "publishConfig": {
     "access": "public"
@@ -18,13 +18,10 @@
   "author": "Dfounderliu",
   "license": "Apache",
   "dependencies": {
-    "configstore": "3.1.2",
-    "dot-qs": "0.2.0",
-    "mime-types": "2.1.24",
-    "object-assign": "3.0.0",
-    "xml2js": "0.4.19",
     "caseless": "0.12.0",
     "combined-stream": "1.0.6",
+    "configstore": "3.1.2",
+    "dot-qs": "0.2.0",
     "extend": "3.0.2",
     "forever-agent": "0.6.1",
     "form-data": "2.3.2",
@@ -33,13 +30,17 @@
     "is-typedarray": "1.0.0",
     "isstream": "0.1.2",
     "json-stringify-safe": "5.0.1",
+    "mime-types": "2.1.24",
+    "moment": "^2.24.0",
     "oauth-sign": "0.9.0",
+    "object-assign": "3.0.0",
     "performance-now": "2.1.0",
     "qs": "6.5.2",
     "safe-buffer": "5.1.2",
     "tough-cookie": "2.5.0",
     "tunnel-agent": "0.6.0",
-    "uuid": "3.3.2"
+    "uuid": "3.3.2",
+    "xml2js": "0.4.19"
   },
   "devDependencies": {
     "babel-eslint": "9.0.0",

src/client.js

@@ -127,6 +127,18 @@ class TagClient {
   }
 }
 
+class TcbClient {
+  constructor(credentials = {}) {
+    this.credentials = credentials
+  }
+  async request(data) {
+    return await new TencentCloudClient(this.credentials, {
+      host: 'tcb.tencentcloudapi.com',
+      path: '/'
+    }).doCloudApiRequest(data)
+  }
+}
+
 class ApigwClient {
   constructor(credentials = {}) {
     this.credentials = credentials
@@ -151,6 +163,18 @@ class CamClient {
   }
 }
 
+class CamV2Client {
+  constructor(credentials = {}) {
+    this.credentials = credentials
+  }
+  async request(data) {
+    return await new TencentCloudClient(this.credentials, {
+      host: 'cam.api.qcloud.com',
+      path: '/v2/index.php'
+    }).doCloudApiRequest(data)
+  }
+}
+
 class CnsClient {
   constructor(credentials = {}) {
     this.credentials = credentials
@@ -182,23 +206,6 @@ class SlsMonitor {
     this.credentials = credentials
   }
 
-  static rfc3339(t) {
-    const year = t.getFullYear()
-    const month = t.getMonth() + 1
-    const day = t.getDate()
-    const hours = t.getHours()
-    const minutes = t.getMinutes()
-    const sec = t.getSeconds()
-
-    const offset = Math.abs(t.getTimezoneOffset())
-    const offsetH = Math.floor(offset / 60)
-    const offsetM = offset % 60
-
-    return util.format('%d-%s-%sT%s:%s:%s+%s:%s', year, month.toString().padStart(2, 0),
-      day.toString().padStart(2, 0), hours.toString().padStart(2, 0), minutes.toString().padStart(2, 0), sec.toString().padStart(2, 0), offsetH.toString().padStart(2, 0),
-      offsetM.toString().padStart(2, 0))
-  }
-
   async request(data) {
     return await new TencentCloudClient(this.credentials, {
       host: 'monitor.tencentcloudapi.com',
@@ -231,7 +238,7 @@ class SlsMonitor {
     }
   }
 
-  async getScfMetrics(region, rangeTime, funcName, ns, version) {
+  async getScfMetrics(region, rangeTime, period, funcName, ns, version) {
     const client = new TencentCloudClient(this.credentials, {
       host: 'monitor.tencentcloudapi.com',
       path: '/'
@@ -240,32 +247,17 @@ class SlsMonitor {
       Action: 'GetMonitorData',
       Version: '2018-07-24',
     }
-    if (rangeTime.rangeEnd <= rangeTime.rangeStart) {
-      throw new Error('The rangeStart provided is after the rangeEnd')
-    }
 
     const metrics = ['Duration', 'Invocation', 'Error', 'ConcurrentExecutions', 'ConfigMem', 'FunctionErrorPercentage', 'Http2xx', 'Http432', 'Http433', 'Http434', 'Http4xx', 'Mem', 'MemDuration', 'Syserr'];
 
-    const diffMinutes = (rangeTime.rangeEnd - rangeTime.rangeStart) / 1000 / 60
-    let period, 
-        aggrFlag = false
-
-    if (diffMinutes <= 16) {
-      // 16 mins
-      period = 60 // 1 min
-    } else if (diffMinutes <= 61) {
-      // 1 hour
-      period = 300 // 5 mins
-    } else if (diffMinutes <= 1500) {
-      // 24 hours
-      period = 3600 // hour
-    } else {
+    let aggrFlag = false
+    if (period == 86400) {
       period = 3600 // day
       aggrFlag = true
     }
     const result = {
-        rangeStart: SlsMonitor.rfc3339(rangeTime.rangeStart),
-        rangeEnd: SlsMonitor.rfc3339(rangeTime.rangeEnd),
+        rangeStart: rangeTime.rangeStart,
+        rangeEnd: rangeTime.rangeEnd,
         metrics: []
     }
 
@@ -274,8 +266,8 @@ class SlsMonitor {
         req.Namespace = 'qce/scf_v2';
         req.MetricName = metrics[i];
         req.Period = period;
-        req.StartTime = SlsMonitor.rfc3339(rangeTime.rangeStart);
-        req.EndTime = SlsMonitor.rfc3339(rangeTime.rangeEnd);
+        req.StartTime = rangeTime.rangeStart;
+        req.EndTime = rangeTime.rangeEnd;
         req.Instances = [{ 
             Dimensions: [
                 {
@@ -311,9 +303,11 @@ module.exports = {
   ScfClient,
   TagClient,
   CamClient,
+  CamV2Client,
   CnsClient,
   ApigwClient,
   DomainClient,
   CosClient,
-  SlsMonitor
+  SlsMonitor,
+  TcbClient
 }

src/index.js

@@ -1,10 +1,12 @@
 module.exports = {
   scf: require('./client').ScfClient,
   cam: require('./client').CamClient,
+  camv2: require('./client').CamV2Client,
   cns: require('./client').CnsClient,
   tag: require('./client').TagClient,
   apigw: require('./client').ApigwClient,
   domain: require('./client').DomainClient,
   cos: require('./client').CosClient,
-  slsMonitor: require('./client').SlsMonitor
+  slsMonitor: require('./client').SlsMonitor,
+  tcb: require('./client').TcbClient
 }