fix event, cors api, supply their types and more reliable tests

Author: lihsai0

index.d.ts

@@ -578,6 +578,18 @@ export declare namespace rs {
         delimiter?: string;
     }
 
+    type BucketEventName = 'put'
+        | 'mkfile'
+        | 'delete'
+        | 'copy'
+        | 'move'
+        | 'append'
+        | 'disable'
+        | 'enable'
+        | 'deleteMarkerCreate'
+        | 'predelete'
+        | 'restore:completed';
+
     class BucketManager {
         mac: auth.digest.Mac;
         config: conf.Config;
@@ -866,6 +878,113 @@ export declare namespace rs {
          *  @param callbackFunc - 回调函数
          */
         getBucketLifecycleRule(bucket: string, callbackFunc: callback): void
+
+        /**
+         * 添加事件通知
+         * https://developer.qiniu.com/kodo/8610/dev-event-notification
+         * @param bucket - 空间名
+         * @param options - 配置项
+         * @param options.name - 规则名称 bucket 内唯一，长度小于50，不能为空，只能为字母、数字、下划线
+         * @param options.event - 事件类型，接受数组设置多个
+         * @param options.callbackUrl - 事件通知回调 URL，接受数组设置多个，失败依次重试
+         * @param options.prefix - 可选，文件配置的前缀
+         * @param options.suffix - 可选，文件配置的后缀
+         * @param options.access_key - 可选，设置的话会对通知请求用对应的ak、sk进行签名
+         * @param options.host - 可选，通知请求的host
+         * @param callbackFunc - 回调函数
+         */
+        putBucketEvent(
+            bucket: string,
+            options: {
+                name: string,
+                event: BucketEventName | BucketEventName[],
+                callbackUrl: string | string[],
+                prefix?: string,
+                suffix?: string,
+                access_key?: string,
+                host?: string,
+            },
+            callbackFunc: callback,
+        ): void
+
+        /**
+         * 更新事件通知
+         * https://developer.qiniu.com/kodo/8610/dev-event-notification
+         * @param bucket - 空间名
+         * @param options - 配置项
+         * @param options.name - 规则名称 bucket 内唯一，长度小于50，不能为空，只能为字母、数字、下划线
+         * @param options.event - 事件类型，接受数组设置多个
+         * @param options.callbackUrl - 事件通知回调 URL，接受数组设置多个，失败依次重试
+         * @param options.prefix - 可选，文件配置的前缀
+         * @param options.suffix - 可选，文件配置的后缀
+         * @param options.access_key - 可选，设置的话会对通知请求用对应的ak、sk进行签名
+         * @param options.host - 可选，通知请求的host
+         * @param callbackFunc - 回调函数
+         */
+        updateBucketEvent(
+            bucket: string,
+            options: {
+                name: string,
+                event?: BucketEventName | BucketEventName[],
+                callbackUrl?: string | string[],
+                prefix?: string,
+                suffix?: string,
+                access_key?: string,
+                host?: string,
+            },
+            callbackFunc: callback,
+        ): void
+
+        /**
+         * 获取事件通知规则
+         * https://developer.qiniu.com/kodo/8610/dev-event-notification
+         *
+         * @param bucket - 空间名
+         * @param callbackFunc - 回调函数
+         */
+        getBucketEvent(bucket: string, callbackFunc: callback): void
+
+        /**
+         * 删除事件通知规则
+         * https://developer.qiniu.com/kodo/8610/dev-event-notification
+         *
+         * @param bucket - 空间名
+         * @param name - 规则名称
+         * @param callbackFunc - 回调函数
+         */
+        deleteBucketEvent(bucket: string, name: string, callbackFunc: callback): void
+
+        /**
+         * 设置 bucket 的 cors（跨域）规则
+         * https://developer.qiniu.com/kodo/8539/set-the-cross-domain-resource-sharing
+         * @param bucket - 空间名
+         * @param body - 规则配置
+         * @param body[].allowed_origin - 允许的域名
+         * @param body[].allowed_method - 允许的请求方法；大小写不敏感
+         * @param body[].allowed_header - 可选，允许的 header；默认不允许任何 header；大小写不敏感
+         * @param body[].exposed_header - 可选，暴露的 header；默认 X-Log, X-Reqid；大小写不敏感
+         * @param body[].max_age - 可选，结果可以缓存的时间；默认不缓存
+         * @param callbackFunc - 回调函数
+         */
+        putCorsRules(
+            bucket: string,
+            body: {
+                allowed_origin: string[],
+                allowed_method: string[],
+                allowed_header?: string[],
+                exposed_header?: string[],
+                max_age?: number,
+            }[],
+            callbackFunc: callback
+        ): void
+
+        /**
+         * 获取 bucket 的 cors（跨域）规则
+         * https://developer.qiniu.com/kodo/8539/set-the-cross-domain-resource-sharing
+         * @param bucket - 空间名
+         * @param callbackFunc - 回调函数
+         */
+        getCorsRules(bucket: string, callbackFunc: callback): void
     }
 
     /**

qiniu/storage/resume.js

@@ -474,7 +474,7 @@ function resumeUploadV2 (
             blkStream.pause();
             partNumber = finishedBlock + 1;
             const bodyMd5 = util.getMd5(chunk);
-            uploadPart(bucket, upDomain, uploadToken, encodedObjectName, chunk, finishedEtags.uploadId, partNumber,
+            uploadPart(bucket, upDomain, uploadToken, encodedObjectName, chunk, finishedEtags.uploadId, partNumber, putExtra,
                 function (respErr, respBody, respInfo) {
                     if (respInfo.statusCode !== 200 || respBody.md5 !== bodyMd5) {
                         callbackFunc(respErr, respBody, respInfo);
@@ -515,15 +515,26 @@ function resumeUploadV2 (
     });
 }
 
-function uploadPart (bucket, upDomain, uploadToken, encodedObjectName, chunk, uploadId, partNumber, callbackFunc) {
+function uploadPart (bucket, upDomain, uploadToken, encodedObjectName, chunk, uploadId, partNumber, putExtra, callbackFunc) {
     const headers = {
         Authorization: 'UpToken ' + uploadToken,
         'Content-Type': 'application/octet-stream',
         'Content-MD5': util.getMd5(chunk)
     };
     const requestUrl = upDomain + '/buckets/' + bucket + '/objects/' + encodedObjectName + '/uploads/' + uploadId +
         '/' + partNumber.toString();
-    rpc.put(requestUrl, chunk, headers, callbackFunc);
+    rpc.put(requestUrl, chunk, headers, function (err, ret, info) {
+        if (info.statusCode === 612) {
+            if (putExtra.resumeRecordFile) {
+                try {
+                    fs.unlinkSync(putExtra.resumeRecordFile);
+                } catch (_e) {
+                    // ignore
+                }
+            }
+        }
+        callbackFunc(err, ret, info);
+    });
 }
 
 function completeParts (upDomain, bucket, encodedObjectName, uploadToken, finishedEtags,

qiniu/storage/rs.js

@@ -962,7 +962,7 @@ function PutBucketEvent(mac, config, options, bucket, callbackFunc) {
         requestURI,
         null,
         {
-            mac: this.mac
+            mac: mac
         },
         callbackFunc
     );
@@ -1011,7 +1011,7 @@ function UpdateBucketEvent(mac, config, options, bucket, callbackFunc) {
         requestURI,
         null,
         {
-            mac: this.mac
+            mac: mac
         },
         callbackFunc
     );
@@ -1098,7 +1098,7 @@ function PutReferAntiLeech(mac, config, bucket, options, callbackFunc) {
         requestURI,
         null,
         {
-            mac: this.mac
+            mac: mac
         },
         callbackFunc
     );
@@ -1115,9 +1115,9 @@ function PutCorsRules(mac, config, bucket, body, callbackFunc) {
     var requestURI = scheme + conf.UC_HOST + '/corsRules/set/' + bucket;
     rpc.postWithOptions(
         requestURI,
-        null,
+        reqBody,
         {
-            mac: this.mac
+            mac: mac
         },
         callbackFunc
     );
@@ -1135,7 +1135,7 @@ function GetCorsRules(mac, config, bucket, callbackFunc) {
         requestURI,
         null,
         {
-            mac: this.mac
+            mac: mac
         },
         callbackFunc
     );