[cache] Adjust Dns component to use cache component

Author: igorw

Query/CachedExecutor.php

@@ -19,25 +19,28 @@ public function __construct(ExecutorInterface $executor, RecordCache $cache)
 
     public function query($nameserver, Query $query)
     {
-        $cachedRecords = $this->cache->lookup($query);
-
-        if (count($cachedRecords)) {
-            $cachedResponse = $this->buildResponse($query, $cachedRecords);
-
-            return When::resolve($cachedResponse);
-        }
-
+        $that = $this;
+        $executor = $this->executor;
         $cache = $this->cache;
 
-        return $this->executor
-            ->query($nameserver, $query)
-            ->then(function ($response) use ($cache, $query) {
-                $cache->storeResponseMessage($query->currentTime, $response);
-                return $response;
-            });
+        return $this->cache
+            ->lookup($query)
+            ->then(
+                function ($cachedRecords) use ($that, $query) {
+                    return $that->buildResponse($query, $cachedRecords);
+                },
+                function () use ($executor, $cache, $nameserver, $query) {
+                    return $executor
+                        ->query($nameserver, $query)
+                        ->then(function ($response) use ($cache, $query) {
+                            $cache->storeResponseMessage($query->currentTime, $response);
+                            return $response;
+                        });
+                }
+            );
     }
 
-    private function buildResponse(Query $query, array $cachedRecords)
+    public function buildResponse(Query $query, array $cachedRecords)
     {
         $response = new Message();
 

Query/RecordBag.php

@@ -24,14 +24,4 @@ function ($value) {
             $this->records
         ));
     }
-
-    public function expire($currentTime)
-    {
-        foreach ($this->records as $key => $value) {
-            list($expiresAt, $record) = $value;
-            if ($expiresAt <= $currentTime) {
-                unset($this->records[$key]);
-            }
-        }
-    }
 }

Query/RecordCache.php

@@ -2,19 +2,38 @@
 
 namespace React\Dns\Query;
 
+use React\Cache\CacheInterface;
 use React\Dns\Model\Message;
 use React\Dns\Model\Record;
+use React\Promise\When;
 
 class RecordCache
 {
-    private $records = array();
+    private $cache;
+    private $expiredAt;
+
+    public function __construct(CacheInterface $cache)
+    {
+        $this->cache = $cache;
+    }
 
     public function lookup(Query $query)
     {
         $id = $this->serializeQueryToIdentity($query);
-        $records = isset($this->records[$id]) ? $this->records[$id]->all() : array();
 
-        return $records;
+        $expiredAt = $this->expiredAt;
+
+        return $this->cache
+            ->get($id)
+            ->then(function ($value) use ($query, $expiredAt) {
+                $recordBag = unserialize($value);
+
+                if (null !== $expiredAt && $expiredAt <= $query->currentTime) {
+                    return When::reject();
+                }
+
+                return $recordBag->all();
+            });
     }
 
     public function storeResponseMessage($currentTime, Message $message)
@@ -27,15 +46,28 @@ public function storeResponseMessage($currentTime, Message $message)
     public function storeRecord($currentTime, Record $record)
     {
         $id = $this->serializeRecordToIdentity($record);
-        $this->records[$id] = isset($this->records[$id]) ? $this->records[$id] : new RecordBag();
-        $this->records[$id]->set($currentTime, $record);
+
+        $cache = $this->cache;
+
+        $this->cache
+            ->get($id)
+            ->then(
+                function ($value) {
+                    return unserialize($value);
+                },
+                function ($e) {
+                    return new RecordBag();
+                }
+            )
+            ->then(function ($recordBag) use ($id, $currentTime, $record, $cache) {
+                $recordBag->set($currentTime, $record);
+                $cache->set($id, serialize($recordBag));
+            });
     }
 
     public function expire($currentTime)
     {
-        foreach ($this->records as $recordBag) {
-            $recordBag->expire($currentTime);
-        }
+        $this->expiredAt = $currentTime;
     }
 
     public function serializeQueryToIdentity(Query $query)

Resolver/Factory.php

@@ -2,6 +2,7 @@
 
 namespace React\Dns\Resolver;
 
+use React\Cache\ArrayCache;
 use React\Dns\Query\Executor;
 use React\Dns\Query\CachedExecutor;
 use React\Dns\Query\RecordCache;
@@ -40,7 +41,7 @@ protected function createRetryExecutor(LoopInterface $loop)
 
     protected function createCachedExecutor(LoopInterface $loop)
     {
-        return new CachedExecutor($this->createRetryExecutor($loop), new RecordCache());
+        return new CachedExecutor($this->createRetryExecutor($loop), new RecordCache(new ArrayCache()));
     }
 
     protected function addPortToServerIfMissing($nameserver)

composer.json

@@ -5,6 +5,7 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3.2",
+        "react/cache": "0.2.*",
         "react/socket": "0.2.*",
         "react/promise": "1.0.*"
     },