fix: yun api qps limit

package.json

@@ -66,7 +66,6 @@
     "performance-now": "2.1.0",
     "qs": "6.5.2",
     "safe-buffer": "5.1.2",
-    "sleep": "^6.3.0",
     "tough-cookie": "2.5.0",
     "tunnel-agent": "0.6.0",
     "uuid": "3.3.2",

src/client.js

@@ -5,7 +5,6 @@ const request = require('../lib/request/index')
 const crypto = require('crypto')
 const cos = require('../lib/cos/cos')
 const _ = require('lodash')
-const sleep = require('sleep')
 
 const DEFAULTS = {
   signatureMethod: 'HmacSHA1',
@@ -465,7 +464,7 @@ class SlsMonitor {
     responses.push(newP50)
   }
 
-  async describeCCMInstanceDatas(id, instances, startTime, endTime) {
+  async describeCCMInstanceDatas(id, instances, startTime, endTime, i, limit) {
     const client = new TencentCloudClient(this.credentials, {
       host: 'monitor.tencentcloudapi.com',
       path: '/'
@@ -479,7 +478,21 @@ class SlsMonitor {
       EndTime: endTime,
       TypeId: 'SCF'
     }
-    return client.doCloudApiRequest(req)
+
+    const timeCost = 1000
+    let sleep = false
+    if (!((i + 1) % limit)) {
+      sleep = true
+    }
+
+    return new Promise(function(resolve) {
+      if (!sleep) {
+        return resolve(client.doCloudApiRequest(req))
+      }
+      setTimeout(function() {
+        resolve(client.doCloudApiRequest(req))
+      }, timeCost)
+    })
   }
 
   async describeAttributes(offset, limit) {
@@ -498,7 +511,7 @@ class SlsMonitor {
   }
 
   async getCustomMetrics(region, announceInstance, rangeTime, period) {
-    const apiQPSLimit = 80
+    const apiQPSLimit = 100
     const metricsRule = [
       /^(GET|POST|DEL|DELETE|PUT|OPTIONS|HEAD)_([a-zA-Z0-9]+)_latency$/i,
       /^(GET|POST|DEL|DELETE|PUT|OPTIONS|HEAD)_([a-zA-Z0-9]+)_(\d+)$/i,
@@ -510,18 +523,6 @@ class SlsMonitor {
       /^5xx$/i
     ]
 
-    const getMetricsResponse = (promiseHandlers) => {
-      return new Promise((resolve, reject) => {
-        Promise.all(promiseHandlers)
-          .then((results) => {
-            resolve(results)
-          })
-          .catch((error) => {
-            reject(error)
-          })
-      })
-    }
-
     const filterAttributeName = function(name, mRule) {
       const len = mRule.length
       for (var i = 0; i < len; i++) {
@@ -533,50 +534,43 @@ class SlsMonitor {
     }
 
     const metricAttributeHash = {}
-    let requestHandlers = []
-    let responses = []
-    let results
-    let firstRequestFlag = true
+    const responses = []
     const attributes = await this.describeAttributes(0, 200)
-    for (var i = 0; i < attributes.Response.Data.TotalCount; i++) {
-      const metricAttribute = attributes.Response.Data.Data[i]
-
-      if (!filterAttributeName(metricAttribute.AttributeName, metricsRule)) {
-        continue
-      }
-      metricAttributeHash[metricAttribute.AttributeId] = metricAttribute
-      requestHandlers.push(
-        this.describeCCMInstanceDatas(
-          metricAttribute.AttributeId,
-          announceInstance,
-          rangeTime.rangeStart,
-          rangeTime.rangeEnd
-        )
-      )
-
-      if (!((i + 1) % apiQPSLimit)) {
-        if (i + 1 != apiQPSLimit) {
-          sleep.sleep(1)
+    attributes.Response.Data.Data.push(attributes.Response.Data.Data[10])
+
+    let i = 0
+    const _this = this
+    function run() {
+      if (attributes.Response.Data.Data.length > 0) {
+        const metricAttribute = attributes.Response.Data.Data.shift()
+        metricAttributeHash[metricAttribute.AttributeId] = metricAttribute
+        if (!filterAttributeName(metricAttribute.AttributeName, metricsRule)) {
+          return run()
         }
-        firstRequestFlag = false
-        results = await getMetricsResponse(requestHandlers)
-        responses = responses.concat(results)
-        requestHandlers = []
+        return _this
+          .describeCCMInstanceDatas(
+            metricAttribute.AttributeId,
+            announceInstance,
+            rangeTime.rangeStart,
+            rangeTime.rangeEnd,
+            i++,
+            apiQPSLimit
+          )
+          .then((res) => {
+            responses.push(res)
+            return run()
+          })
       }
     }
-    if (requestHandlers.length === 0) {
-      responses = this.cleanEmptyMetric(responses, metricAttributeHash)
+
+    const promiseList = Array(Math.min(apiQPSLimit, attributes.Response.Data.Data.length))
+      .fill(Promise.resolve())
+      .map((promise) => promise.then(run))
+
+    return Promise.all(promiseList).then(() => {
       this.aggrCustomDatas(responses, period, metricAttributeHash)
       return responses
-    }
-    if (!firstRequestFlag) {
-      sleep.sleep(1)
-    }
-    results = await getMetricsResponse(requestHandlers)
-    results = this.cleanEmptyMetric(results, metricAttributeHash)
-    responses = responses.concat(results)
-    this.aggrCustomDatas(responses, period, metricAttributeHash)
-    return responses
+    })
   }
 
   cleanEmptyMetric(datas, metricAttributeHash) {