Merge pull request #194 from liangchaoboy/multiZone

Multi zone

Author: longbai

CHANGELOG.md

@@ -1,5 +1,11 @@
 ## CHANGE LOG
 
+### v6.1.12
+
+2016-10-10
+
+- 增加多机房接口调用支持
+
 ### v6.1.11
 
 2016-05-06

index.js

@@ -11,5 +11,6 @@ module.exports = {
   fop: require(libpath + '/fop.js'),
   conf: require(libpath + '/conf.js'),
   rpc: require(libpath + '/rpc.js'),
-  util: require(libpath + '/util.js')
+  util: require(libpath + '/util.js'),
+  zone: require(libpath + '/zone.js')
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "qiniu",
-  "version": "6.1.11",
+  "version": "6.1.12",
   "description": "Node wrapper for Qiniu Resource (Cloud) Storage API",
   "main": "index.js",
   "directories": {
@@ -58,7 +58,8 @@
     "mime": "1.2.9",
     "formstream": "0.0.7",
     "crc32": "0.2.2",
-    "urllib": "0.5.1"
+    "urllib": "0.5.1",
+    "sync-request":"3.0.1"
   },
   "devDependencies": {
     "should": "1.2.2",

qiniu/conf.js

@@ -11,9 +11,14 @@ var ua = function() {
 }
 
 exports.USER_AGENT = ua();
-
 exports.UP_HOST = 'http://upload.qiniu.com';
 exports.RS_HOST = 'http://rs.qbox.me';
 exports.RSF_HOST = 'http://rsf.qbox.me';
 exports.API_HOST = 'http://api.qiniu.com';
 exports.RPC_TIMEOUT = 3600000; // default rpc timeout: one hour
+exports.UC_HOST  = 'http://uc.qbox.me'; 
+exports.UP_HTTPS_HOST = 'https://up-z1.qbox.me';
+exports.SCHEME = 'http'; // 上传使用的协议 
+exports.AUTOZONE = true; // 自动获取不同机房空间的上传域名
+exports.BUCKET = null ; // 上传空间
+exports.EXPIRE = 0;

qiniu/io.js

@@ -7,6 +7,8 @@ var url = require('url');
 var mime = require('mime');
 var Readable = require('stream').Readable;
 var formstream = require('formstream');
+var urllib = require('urllib');
+var zone = require('./zone');
 
 exports.UNDEFINED_KEY = '?'
 exports.PutExtra = PutExtra;
@@ -49,10 +51,13 @@ function putReadable (uptoken, key, rs, extra, onret) {
   });
 
   var form = getMultipart(uptoken, key, rs, extra);
+  // 设置上传域名
+  zone.up_host(uptoken, conf);
 
   return rpc.postMultipart(conf.UP_HOST, form, onret);
 }
 
+
 function put(uptoken, key, body, extra, onret) {
   var rs = new Readable();
   rs.push(body);

qiniu/zone.js

@@ -0,0 +1,59 @@
+var request = require('sync-request');
+
+//conf 为全局变量
+exports.up_host = function (uptoken, conf){
+
+    var version = process.versions;
+    var num = version.node.split(".")[0];
+
+    // node 版本号低于 1.0.0, 使用默认域名上传，可以在conf中指定上传域名
+    if(num < 1 ){
+        conf.AUTOZONE = false;
+    }
+
+    if(!conf.AUTOZONE){
+        return;
+    }
+
+    var ak = uptoken.toString().split(":")[0];
+    var tokenPolicy = uptoken.toString().split(":")[2];
+    var tokenPolicyStr = new Buffer(tokenPolicy, 'base64').toString();
+    var json_tokenPolicyStr = JSON.parse(tokenPolicyStr);
+    var bucket = json_tokenPolicyStr.scope;
+
+    // bucket 相同，上传域名仍在过期时间内
+    if((new Date().getTime() < conf.EXPIRE) && bucket == conf.BUCKET){
+        return;
+    }
+    
+    //记录bucket名
+    conf.BUCKET = bucket;
+
+    var res = request('GET', 'http://uc.qbox.me/v1/query?ak=' + ak + '&bucket=' + bucket, {
+      'headers': {
+        'Content-Type': 'application/json'
+      }
+    });
+
+    if(res.statusCode == 200){
+        
+        var json_str = JSON.parse(res.body.toString());
+
+        //判断设置使用的协议, 默认使用http
+        if(conf.SCHEME == 'http'){
+            conf.UP_HOST = json_str.http.up[1];
+        }else{
+            conf.UP_HOST = json_str.https.up[0];
+        }
+
+        conf.EXPIRE = 86400 + new Date().getTime(); 
+
+    }else{
+        var err = new Error('Server responded with status code ' + res.statusCode + ':\n' + res.body.toString());
+        err.statusCode = res.statusCode;
+        err.headers = res.headers;
+        err.body = res.body;
+        throw err;
+    }
+
+}