Merge pull request #221 from annexwu/fix/Nodejs12.16-COSRedisBackup-NoPutObject

修复 Redis 备份问题

Author: tianmeng0103

Nodejs12.16-COSRedisBackup/.code.yml

@@ -14,4 +14,4 @@ source:
   # 此处备注的第三方代码在后续统计代码量环节会被排除，若代码库中不存在需要排除的第三方代码，该项配置标识可为空
   third_party_source:
     #第三方代码文件的正则表达式，若无统一标识格式，可以指定具体目录，样例可参考test_source举例
-    filepath_regex: [".*/common/crc64/.*"]
+    filepath_regex: [".*/common/crc64/.*", "package-lock.json"]

Nodejs12.16-COSRedisBackup/config.json

@@ -18,7 +18,7 @@
 		},
 		"runtime": "Nodejs12.16",
 		"readme": "https://github.com/tencentyun/serverless-demo/tree/master/Nodejs12.16-COSRedisBackup",
-		"version": "1.0.4",
+		"version": "1.0.6",
 		"tags": [
 			"Nodejs12.16",
 			"Redis",

Nodejs12.16-COSRedisBackup/src/common/utils.js

@@ -126,12 +126,7 @@ async function getMetaFromUrl(url) {
 /**
  * get request stream with range
  */
-function getRangeStreamFromUrl({
-  url,
-  start,
-  end,
-  timeout = 24 * 60 * 60 * 1000,
-}) {
+function getRangeStreamFromUrl({ url, start, end, timeout = 5 * 60 * 1000 }) {
   const headers =    start || end
     ? {
       range: `bytes=${start}-${end - 1}`,
@@ -141,16 +136,21 @@ function getRangeStreamFromUrl({
     url,
     timeout,
     headers,
+    forever: false,
+    agentOptions: {
+      keepAlive: false,
+    },
   }).on('response', (response) => {
     if (!`${response.statusCode}`.startsWith('2')) {
       req.emit('error', {
+        url: url.replace(/(\?[\s\S]*)/g, ''),
         statusCode: response.statusCode,
         headers: response.headers || {},
       });
     }
     req = null;
   });
-  return req;
+  return readStreamAddPassThrough(req);
 }
 /**
  * ReadStream add PassThrough, when ReadStream emit error, proxy error to PassThrough