fixup! fix: Add redis storage support, add bundle and deprecate brain…

…bits/blocking-bundle, require psr/clock, rework expiration to ttl mechanism implemented by storage
brainbits · Jul 21, 2023 · e39059a · e39059a
1 parent d72306c
commit e39059a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/src/Blocker.php b/src/Blocker.php
@@ -49,7 +49,7 @@ public function tryBlock(BlockIdentity $identifier, int|null $ttl = null): Block
                 return null;
             }
 
-            $this->storage->touch($block);
+            $this->storage->touch($block, $ttl ?? $this->defaultTtl);
 
             return $block;
         }

diff --git a/src/Storage/FilesystemStorage.php b/src/Storage/FilesystemStorage.php
@@ -78,7 +78,7 @@ public function write(Block $block, int $ttl): bool
         return true;
     }
 
-    public function touch(Block $block): bool
+    public function touch(Block $block, int $ttl): bool
     {
         $identity = $block->getIdentity();
 
@@ -89,13 +89,10 @@ public function touch(Block $block): bool
         $filename = $this->getFilename($block->getIdentity());
         $metaFilename = $filename . '.meta';
 
-        $metaContent = file_get_contents($metaFilename);
-        assert(is_string($metaContent));
-        assert($metaContent !== '');
-        $metaData = json_decode($metaContent, true);
-        assert(is_array($metaData));
-        $metaData['updatedAt'] = $this->clock->now()->format('c');
-        $metaContent = json_encode($metaData);
+        $metaContent = json_encode([
+            'ttl' => $ttl,
+            'updatedAt' => $this->clock->now()->format('c'),
+        ]);
 
         if (file_put_contents($metaFilename, $metaContent) === false) {
             throw IOException::writeFailed($metaFilename);

diff --git a/src/Storage/InMemoryStorage.php b/src/Storage/InMemoryStorage.php
@@ -52,12 +52,13 @@ public function write(Block $block, int $ttl): bool
         return true;
     }
 
-    public function touch(Block $block): bool
+    public function touch(Block $block, int $ttl): bool
     {
         if (!$this->exists($block->getIdentity())) {
             return false;
         }
 
+        $this->blocks[(string) $block->getIdentity()]['ttl'] = $ttl;
         $this->blocks[(string) $block->getIdentity()]['updatedAt'] = $this->clock->now();
 
         return true;

diff --git a/src/Storage/PredisStorage.php b/src/Storage/PredisStorage.php
@@ -55,7 +55,7 @@ public function write(Block $block, int $ttl): bool
         return true;
     }
 
-    public function touch(Block $block): bool
+    public function touch(Block $block, int $ttl): bool
     {
         $identity = $block->getIdentity();
 
@@ -64,7 +64,7 @@ public function touch(Block $block): bool
         }
 
         try {
-            $this->client->touch($this->createKey($identity));
+            $this->client->expire($this->createKey($identity), $ttl);
         } catch (PredisException) {
             throw IOException::touchFailed((string) $identity);
         }

diff --git a/src/Storage/StorageInterface.php b/src/Storage/StorageInterface.php
@@ -23,7 +23,7 @@ interface StorageInterface
 {
     public function write(Block $block, int $ttl): bool;
 
-    public function touch(Block $block): bool;
+    public function touch(Block $block, int $ttl): bool;
 
     public function remove(Block $block): bool;