get iohost in bucket manager

Author: rwifeng

src/Qiniu/Auth.php

@@ -15,6 +15,11 @@ public function __construct($accessKey, $secretKey)
         $this->secretKey = $secretKey;
     }
 
+    public function getAccessKey()
+    {
+        return $this->accessKey;
+    }
+
     public function sign($data)
     {
         $hmac = hash_hmac('sha1', $data, $this->secretKey, true);
@@ -72,7 +77,8 @@ public function uploadToken(
         $key = null,
         $expires = 3600,
         $policy = null,
-        $strictPolicy = true
+        $strictPolicy = true,
+        Zone $zone = null
     ) {
         $deadline = time() + $expires;
         $scope = $bucket;
@@ -84,7 +90,10 @@ public function uploadToken(
         $args['scope'] = $scope;
         $args['deadline'] = $deadline;
 
-        $zone = new Zone();
+        if ($zone === null) 
+        {
+            $zone = new Zone();
+        }
         $args['upHosts'] = $zone->getUpHosts($this->accessKey, $bucket);
         $b = json_encode($args);
         return $this->signWithData($b);

src/Qiniu/Storage/BucketManager.php

@@ -3,6 +3,7 @@
 
 use Qiniu\Auth;
 use Qiniu\Config;
+use Qiniu\Zone;
 use Qiniu\Http\Client;
 use Qiniu\Http\Error;
 
@@ -14,10 +15,15 @@
 final class BucketManager
 {
     private $auth;
+    private $zone;
 
-    public function __construct(Auth $auth)
+    public function __construct(Auth $auth, Zone $zone = null)
     {
         $this->auth = $auth;
+        if ($zone === null)
+        {
+            $this->zone = new Zone();
+        }
     }
 
     /**
@@ -206,7 +212,12 @@ public function fetch($url, $bucket, $key = null)
         $resource = \Qiniu\base64_urlSafeEncode($url);
         $to = \Qiniu\entry($bucket, $key);
         $path = '/fetch/' . $resource . '/to/' . $to;
-        return $this->ioPost($path);
+
+        $ak = $this->auth->getAccessKey();
+        $ioHost = $this->zone->getIoHost($ak, $bucket);
+
+        $url = $ioPost . $path;
+        return $this->post($url, null);
     }
 
     /**
@@ -222,7 +233,12 @@ public function prefetch($bucket, $key)
     {
         $resource = \Qiniu\entry($bucket, $key);
         $path = '/prefetch/' . $resource;
-        list(, $error) = $this->ioPost($path);
+
+        $ak = $this->auth->getAccessKey();
+        $ioHost = $this->zone->getIoHost($ak, $bucket);
+
+        $url = $ioPost . $path;
+        list(, $error) = $this->post($url, null);
         return $error;
     }
 

src/Qiniu/Storage/FormUploader.php

@@ -99,7 +99,7 @@ public static function putFile(
         $fields['key'] = $key;
         $headers =array('Content-Type' => 'multipart/form-data');
 
-        $upHost = $config->zone->getBucketHostsByUpToken($upToken);
+        $upHost = $config->zone->getUpHostByToken($upToken);
         $response = client::post($upHost, $fields, $headers);
         if (!$response->ok()) {
             return array(null, new Error($upHost, $response));

src/Qiniu/Storage/UploadManager.php

@@ -2,7 +2,6 @@
 namespace Qiniu\Storage;
 
 use Qiniu\Config;
-use Qiniu\Zone;
 use Qiniu\Http\HttpClient;
 use Qiniu\Storage\ResumeUploader;
 use Qiniu\Storage\FormUploader;

src/Qiniu/Zone.php

@@ -25,28 +25,34 @@ public function __construct($scheme = null)
     public function getUpHostByToken($uptoken)
     {
         list($ak, $bucket) = $this->unmarshalUpToken($uptoken);
-        $upHosts = $this->getUpHosts($ak, $bucket);
+        list($upHosts,) = $this->getUpHosts($ak, $bucket);
         return $upHosts[0];
     }
 
     public function getBackupUpHostByToken($uptoken)
     {
         list($ak, $bucket) = $this->unmarshalUpToken($uptoken);
-        $upHosts = $this->getUpHosts($ak, $bucket);
+        list($upHosts,) = $this->getUpHosts($ak, $bucket);
         return $upHosts[1];
     }
 
-    public function getUpHosts($ak, $bucket)
+    public function getIoHost($ak, $bucket)
     {
-        $bucketHosts = $this->getBucketHosts($ak, $bucket);
-        $upHosts = $bucketHosts['upHosts'];
-        return $upHosts;
+        list($bucketHosts, ) = $this->getBucketHosts($ak, $bucket);
+        $ioHost = $bucketHosts['ioHost'];
+        return $upHost;
     }
 
-    public function getBucketHostsByUpToken($uptoken) 
+    public function getUpHosts($ak, $bucket)
     {
-        list($ak, $bucket) = $this->unmarshalUpToken($uptoken);
-        return $this->getBucketHosts($ak, $bucket);
+        list($bucketHosts, $err) = $this->getBucketHosts($ak, $bucket);
+        if ($err !== null)
+        {
+            return array(null, $err);
+        }
+
+        $upHosts = $bucketHosts['upHosts'];
+        return array($upHosts, null);
     }
 
     private function unmarshalUpToken($uptoken)
@@ -61,7 +67,11 @@ private function unmarshalUpToken($uptoken)
         $policy = base64_urlSafeDecode($token[2]);
         $policy = json_decode($policy, true);
 
-        list($bucket, $_) = split(':', $policy['scope']);
+        $bucket = $policy['scope'];
+        if (strpos($bucket, ':'))
+        {
+            $bucket = split(':', $bucket)[0];
+        }
 
         return array($ak, $bucket);
     }
@@ -81,14 +91,17 @@ public function getBucketHosts($ak, $bucket)
             return $this->hostCache[$key];
         }
 
-        list($hosts, $_) = $this->bucketHosts($ak, $bucket);
+        list($hosts, $err) = $this->bucketHosts($ak, $bucket);
+        if ($err !== null) 
+        {
+            return array(null , $err);
+        }
 
-        var_dump($hosts);
         $schemeHosts = $hosts[$this->scheme];
         $bucketHosts = array('upHosts' => $schemeHosts['up'], 'ioHost' => $schemeHosts['io'], 'deadline' => time() + $hosts['ttl']);
 
         $this->hostCache[$key] = $bucketHosts;
-        return $bucketHosts;
+        return array($bucketHosts, null);
     }