Merge pull request #383 from qiniu/features/resumable-upload-v2

Features/resumable upload v2

Author: xwen-winnie

.travis.yml

@@ -8,7 +8,7 @@ node_js:
 
 install:
   - npm install
-  - npm install -g codecov
+  - npm install -g codecov@3.8.1
   - npm install -g istanbul
 
 before_script:

index.d.ts

@@ -285,27 +285,50 @@ export declare namespace resume_up {
         /**
          * @default ''
          */
-        fname: string;
+        fname?: string;
 
         /**
          * @default {}
          */
-        params: any;
+        params?: any;
 
         /**
          * @default null
          */
         mimeType?: string;
 
+        /**
+         * @default null
+         */
+        resumeRecordFile?: string
+
+        /**
+         * @default null
+         */
+        progressCallback?: (uploadBytes: number, totalBytes: number) => void
+
+        /**
+         * @default v1
+         */
+        version?: string
+
+        /**
+         * @default 4 * 1024 * 1024
+         */
+        partSize?: number
+
         /**
          * 上传可选参数
          * @param fname 请求体中的文件的名称
          * @param params 额外参数设置，参数名称必须以x:开头
          * @param mimeType 指定文件的mimeType
          * @param resumeRecordFile
          * @param progressCallback
+         * @param version 分片上传版本 目前支持v1/v2版本 默认v1
+         * @param partSize 分片上传v2必传字段 默认大小为4MB 分片大小范围为1 MB - 1 GB
          */
-        constructor(fname?: string, params?: any, mimeType?: string, resumeRecordFile?: string, progressCallback?: (data: any) => void);
+        constructor(fname?: string, params?: any, mimeType?: string, resumeRecordFile?: string, version?:string, partSize?:number,
+                    progressCallback?: (uploadBytes: number, totalBytes: number) => void);
     }
 }
 

package.json

@@ -50,6 +50,7 @@
   ],
   "dependencies": {
     "agentkeepalive": "^4.0.2",
+    "before": "^0.0.1",
     "block-stream2": "^2.0.0",
     "crc32": "^0.2.2",
     "destroy": "^1.0.4",

qiniu/conf.js

@@ -17,7 +17,7 @@ exports.FormMimeUrl = 'application/x-www-form-urlencoded';
 exports.FormMimeJson = 'application/json';
 exports.FormMimeRaw = 'application/octet-stream';
 exports.RS_HOST = 'rs.qiniu.com';
-exports.RPC_TIMEOUT = 120000; // 120s
+exports.RPC_TIMEOUT = 600000; // 600s
 exports.UC_HOST = 'uc.qbox.me';
 
 // proxy

qiniu/rpc.js

@@ -2,15 +2,16 @@ var urllib = require('urllib');
 var conf = require('./conf');
 
 exports.post = post;
+exports.put = put;
 exports.postMultipart = postMultipart;
 exports.postWithForm = postWithForm;
 exports.postWithoutForm = postWithoutForm;
 
-function postMultipart (requestURI, requestForm, callbackFunc) {
+function postMultipart(requestURI, requestForm, callbackFunc) {
     return post(requestURI, requestForm, requestForm.headers(), callbackFunc);
 }
 
-function postWithForm (requestURI, requestForm, token, callbackFunc) {
+function postWithForm(requestURI, requestForm, token, callbackFunc) {
     var headers = {
         'Content-Type': 'application/x-www-form-urlencoded'
     };
@@ -20,7 +21,7 @@ function postWithForm (requestURI, requestForm, token, callbackFunc) {
     return post(requestURI, requestForm, headers, callbackFunc);
 }
 
-function postWithoutForm (requestURI, token, callbackFunc) {
+function postWithoutForm(requestURI, token, callbackFunc) {
     var headers = {
         'Content-Type': 'application/x-www-form-urlencoded'
     };
@@ -30,7 +31,7 @@ function postWithoutForm (requestURI, token, callbackFunc) {
     return post(requestURI, null, headers, callbackFunc);
 }
 
-function post (requestURI, requestForm, headers, callbackFunc) {
+function post(requestURI, requestForm, headers, callbackFunc) {
     // var start = parseInt(Date.now() / 1000);
     headers = headers || {};
     headers['User-Agent'] = headers['User-Agent'] || conf.USER_AGENT;
@@ -42,7 +43,7 @@ function post (requestURI, requestForm, headers, callbackFunc) {
         dataType: 'json',
         timeout: conf.RPC_TIMEOUT,
         gzip: true
-    //  timing: true,
+        //  timing: true,
     };
 
     if (conf.RPC_HTTP_AGENT) {
@@ -62,18 +63,47 @@ function post (requestURI, requestForm, headers, callbackFunc) {
     }
 
     var req = urllib.request(requestURI, data, function (respErr, respBody,
-        respInfo) {
-    // var end = parseInt(Date.now() / 1000);
-    // console.log((end - start) + " seconds");
-    // console.log("queuing:\t" + respInfo.timing.queuing);
-    // console.log("dnslookup:\t" + respInfo.timing.dnslookup);
-    // console.log("connected:\t" + respInfo.timing.connected);
-    // console.log("requestSent:\t" + respInfo.timing.requestSent);
-    // console.log("waiting:\t" + respInfo.timing.waiting);
-    // console.log("contentDownload:\t" + respInfo.timing.contentDownload);
-
+                                                         respInfo) {
         callbackFunc(respErr, respBody, respInfo);
     });
 
     return req;
 }
+
+function put(requestURL, requestForm, headers, callbackFunc) {
+    // var start = parseInt(Date.now() / 1000);
+    headers = headers || {};
+    headers['User-Agent'] = headers['User-Agent'] || conf.USER_AGENT;
+    headers.Connection = 'keep-alive';
+
+    var data = {
+        headers: headers,
+        method: 'PUT',
+        dataType: 'json',
+        timeout: conf.RPC_TIMEOUT,
+        gzip: true
+        //  timing: true,
+    };
+
+    if (conf.RPC_HTTP_AGENT) {
+        data.agent = conf.RPC_HTTP_AGENT;
+    }
+
+    if (conf.RPC_HTTPS_AGENT) {
+        data.httpsAgent = conf.RPC_HTTPS_AGENT;
+    }
+
+    if (Buffer.isBuffer(requestForm) || typeof requestForm === 'string') {
+        data.content = requestForm;
+    } else if (requestForm) {
+        data.stream = requestForm;
+    } else {
+        data.headers['Content-Length'] = 0;
+    }
+
+    var req = urllib.request(requestURL, data, function (err, ret, info) {
+        callbackFunc(err, ret, info);
+    });
+
+    return req;
+}