Merge pull request #409 from qiniu/fix/configurable-uc-and-update-query-region

configurable uc and update query region

Author: bachue

CHANGELOG.md

@@ -1,6 +1,8 @@
 ## CHANGE LOG
 ## NEXT VERSION
 - 对象存储，修复无法对 key 为空字符串的对象进行操作
+- 对象存储，查询区域域名支持配置 UC 地址
+- 对象存储，查询区域域名接口升级
 
 ## 7.8.0
 - 移除不推荐域名，并增加 亚太-首尔 和 华东-浙江2 固定区域

qiniu/util.js

@@ -332,7 +332,7 @@ exports.prepareZone = function (ctx, accessKey, bucket, callback) {
             }
             // update object
             ctx.config.zone = cZoneInfo;
-            ctx.config.zoneExpire = cZoneExpire + parseInt(Date.now() / 1000);
+            ctx.config.zoneExpire = cZoneExpire + Math.trunc(Date.now() / 1000);
             callback(null, ctx);
         });
     }

qiniu/zone.js

@@ -74,7 +74,8 @@ exports.Zone_ap_northeast_1 = new conf.Zone([
 
 exports.getZoneInfo = function (accessKey, bucket, callbackFunc) {
     const apiAddr = util.format(
-        'https://uc.qbox.me/v2/query?ak=%s&bucket=%s',
+        'https://%s/v4/query?ak=%s&bucket=%s',
+        conf.UC_HOST,
         accessKey,
         bucket
     );
@@ -91,37 +92,35 @@ exports.getZoneInfo = function (accessKey, bucket, callbackFunc) {
             return;
         }
 
-        const zoneData = JSON.parse(respData);
-        const srcUpHosts = [];
-        const cdnUpHosts = [];
+        let zoneData;
+        try {
+            const hosts = JSON.parse(respData).hosts;
+            if (!hosts || !hosts.length) {
+                respErr = new Error('no host available: ' + respData);
+                callbackFunc(respErr, null, null);
+                return;
+            }
+            zoneData = hosts[0];
+        } catch (err) {
+            callbackFunc(err, null, null);
+            return;
+        }
+        let srcUpHosts = [];
+        let cdnUpHosts = [];
         let zoneExpire = 0;
 
         try {
             zoneExpire = zoneData.ttl;
             // read src hosts
-            zoneData.up.src.main.forEach(function (host) {
-                srcUpHosts.push(host);
-            });
-            if (zoneData.up.src.backup) {
-                zoneData.up.src.backup.forEach(function (host) {
-                    srcUpHosts.push(host);
-                });
-            }
+            srcUpHosts = zoneData.up.domains;
 
             // read acc hosts
-            zoneData.up.acc.main.forEach(function (host) {
-                cdnUpHosts.push(host);
-            });
-            if (zoneData.up.acc.backup) {
-                zoneData.up.acc.backup.forEach(function (host) {
-                    cdnUpHosts.push(host);
-                });
-            }
+            cdnUpHosts = zoneData.up.domains;
 
-            const ioHost = zoneData.io.src.main[0];
-            const rsHost = zoneData.rs.acc.main[0];
-            const rsfHost = zoneData.rsf.acc.main[0];
-            const apiHost = zoneData.api.acc.main[0];
+            const ioHost = zoneData.io.domains[0];
+            const rsHost = zoneData.rs.domains[0];
+            const rsfHost = zoneData.rsf.domains[0];
+            const apiHost = zoneData.api.domains[0];
             const zoneInfo = new conf.Zone(
                 srcUpHosts,
                 cdnUpHosts,