Merge pull request #187 from frogcjn/master

fix missing crc32 form field

Author: longbai

index.js

@@ -2,6 +2,9 @@
 var libpath = process.env.QINIU_COV ? './lib-cov' : './qiniu';
 
 module.exports = {
+  auth: {
+    digest: require(libpath + '/auth' + '/digest.js')
+  },
   io: require(libpath + '/io.js'),
   rs: require(libpath + '/rs.js'),
   rsf: require(libpath + '/rsf.js'),

qiniu/io.js

@@ -33,21 +33,21 @@ function PutRet(hash, key) {
 
 // onret: callback function instead of ret
 function putReadable (uptoken, key, rs, extra, onret) {
-  if(!extra) {
+  if (!extra) {
     extra = new PutExtra();
   }
   if (!extra.mimeType) {
     extra.mimeType = 'application/octet-stream';
   }
 
-  if(!key) {
+  if (!key) {
     key = exports.UNDEFINED_KEY;
   }
 
   rs.on("error", function (err) {
       onret({code: -1, error: err.toString()}, {});
   });
-  
+
   var form = getMultipart(uptoken, key, rs, extra);
 
   return rpc.postMultipart(conf.UP_HOST, form, onret);
@@ -58,12 +58,14 @@ function put(uptoken, key, body, extra, onret) {
   rs.push(body);
   rs.push(null);
 
-  if(!extra) {
+  if (!extra) {
     extra = new PutExtra();
   }
   if (extra.checkCrc == 1) {
     var bodyCrc32 = getCrc32(body);
     extra.crc32 = '' + parseInt(bodyCrc32, 16);
+  } else if (extra.checkCrc == 2 && extra.crc32) {
+    extra.crc32 = '' + extra.crc32
   }
   return putReadable(uptoken, key, rs, extra, onret)
 }
@@ -77,11 +79,15 @@ function getMultipart(uptoken, key, rs, extra) {
   var form = formstream();
 
   form.field('token', uptoken);
-  if(key != exports.UNDEFINED_KEY) {
+  if (key != exports.UNDEFINED_KEY) {
     form.field('key', key);
   }
   form.stream('file', rs, key, extra.mimeType);
 
+  if (extra.crc32) {
+    form.field('crc32', extra.crc32);
+  }
+
   for (var k in extra.params) {
     form.field(k, extra.params[k]);
   }
@@ -93,14 +99,16 @@ function putFile(uptoken, key, loadFile, extra, onret) {
 
   var rs = fs.createReadStream(loadFile);
 
-  if(!extra) {
+  if (!extra) {
     extra = new PutExtra();
   }
   if (extra.checkCrc == 1) {
     var fileCrc32 = getCrc32(fs.readFileSync(loadFile));
     extra.crc32 = '' + parseInt(fileCrc32, 16);
+  } else if (extra.checkCrc == 2 && extra.crc32) {
+    extra.crc32 = '' + extra.crc32
   }
-  if(!extra.mimeType) {
+  if (!extra.mimeType) {
     extra.mimeType = mime.lookup(loadFile);
   }
 

qiniu/rs.js

@@ -51,10 +51,10 @@ Client.prototype.move = function(bucketSrc, keySrc, bucketDest, keyDest, onret)
 }
 
 Client.prototype.forceMove = function(bucketSrc, keySrc, bucketDest, keyDest, force, onret) {
-  
+
   var encodedEntryURISrc = getEncodedEntryUri(bucketSrc, keySrc);
   var encodedEntryURIDest = getEncodedEntryUri(bucketDest, keyDest);
-  var uri = conf.RS_HOST + '/move/' + encodedEntryURISrc + '/' + encodedEntryURIDest +'/force/'+force;  
+  var uri = conf.RS_HOST + '/move/' + encodedEntryURISrc + '/' + encodedEntryURIDest +'/force/'+force;
 
   var digest = util.generateAccessToken(uri, null);
   rpc.postWithoutForm(uri, digest, onret);
@@ -70,11 +70,11 @@ Client.prototype.copy = function(bucketSrc, keySrc, bucketDest, keyDest, onret)
 }
 
 Client.prototype.forceCopy = function(bucketSrc, keySrc, bucketDest, keyDest, force, onret) {
-  
+
     var encodedEntryURISrc = getEncodedEntryUri(bucketSrc, keySrc);
     var encodedEntryURIDest = getEncodedEntryUri(bucketDest, keyDest);
     var uri = conf.RS_HOST + '/copy/' + encodedEntryURISrc + '/' + encodedEntryURIDest +'/force/'+force;
-    
+
     var digest = util.generateAccessToken(uri, null);
     rpc.postWithoutForm(uri, digest, onret);
 }
@@ -117,7 +117,7 @@ function EntryPathPair(src, dest) {
 }
 
 EntryPathPair.prototype.toStr = function(op, force) {
-  if(typeof(force)=='undefined'){
+  if (typeof(force)=='undefined'){
 
     return 'op=/' + op + '/' + this.src.encode() + '/' + this.dest.encode() + '&';
 
@@ -151,7 +151,7 @@ Client.prototype.batchMove = function(entries, onret) {
 }
 
 Client.prototype.forceBatchMove = function(entries, force, onret) {
-  
+
   fileHandleForce('move', entries, force, onret);
 
 }
@@ -161,9 +161,9 @@ Client.prototype.batchCopy = function(entries, onret) {
 }
 
 Client.prototype.forceBatchCopy = function(entries, force, onret) {
-  
+
   fileHandleForce('copy', entries, force, onret);
-  
+
 }
 
 
@@ -256,6 +256,7 @@ function PutPolicy2(putPolicyObj) {
   this.callbackHost = putPolicyObj.callbackHost || null;
   this.callbackBody = putPolicyObj.callbackBody || null;
   this.callbackBodyType = putPolicyObj.callbackBodyType || null;
+  this.callbackFetchKey = putPolicyObj.callbackFetchKey || null;
 
   this.persistentOps = putPolicyObj.persistentOps || null;
   this.persistentNotifyUrl = putPolicyObj.persistentNotifyUrl || null;