@anonympins/fingerprint 0.5.2 → 0.5.4

package/src/php/Store/MongoDbStore.php

@@ -1,105 +1,185 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Anonympins\Fingerprint\Store;
-
-/**
- * Adaptateur de stockage MongoDB pour le moteur Fingerprint.
- * Utilise la bibliothèque officielle mongodb/mongodb.
- */
-class MongoDbStore implements IStore
-{
-    /**
-     * @var \MongoDB\Collection
-     */
-    private $collection;
-
-    /**
-     * @param \MongoDB\Collection $collection Collection dédiée au stockage des empreintes
-     */
-    public function __construct($collection)
-    {
-        $this->collection = $collection;
-    }
-
-    public function get(string $key)
-    {
-        $doc = $this->collection->findOne(['_id' => $key]);
-        if (!$doc) {
-            return null;
-        }
-
-        // Vérification d'expiration active pour bypasser le délai de 60s du démon de MongoDB
-        if (isset($doc['expiresAt'])) {
-            $expiresAt = $doc['expiresAt'];
-            if ($expiresAt instanceof \MongoDB\BSON\UTCDateTime) {
-                $expiresAtMs = $expiresAt->toDateTime()->getTimestamp() * 1000;
-                $nowMs = (int)(microtime(true) * 1000);
-                if ($expiresAtMs < $nowMs) {
-                    $this->delete($key);
-                    return null;
-                }
-            }
-        }
-
-        return isset($doc['value']) ? json_decode($doc['value'], true) : null;
-    }
-
-    public function set(string $key, $value, ?int $ttl = null): void
-    {
-        $doc = [
-            '_id' => $key,
-            'value' => json_encode($value),
-        ];
-
-        if ($ttl !== null && $ttl > 0) {
-            $doc['expiresAt'] = new \MongoDB\BSON\UTCDateTime((time() + $ttl) * 1000);
-        }
-
-        $this->collection->replaceOne(
-            ['_id' => $key],
-            $doc,
-            ['upsert' => true]
-        );
-    }
-
-    public function has(string $key): bool
-    {
-        $doc = $this->collection->findOne(
-            ['_id' => $key],
-            ['projection' => ['expiresAt' => 1]]
-        );
-
-        if (!$doc) {
-            return false;
-        }
-
-        if (isset($doc['expiresAt']) && $doc['expiresAt'] instanceof \MongoDB\BSON\UTCDateTime) {
-            $expiresAtMs = $doc['expiresAt']->toDateTime()->getTimestamp() * 1000;
-            $nowMs = (int)(microtime(true) * 1000);
-            if ($expiresAtMs < $nowMs) {
-                $this->delete($key);
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    public function delete(string $key): void
-    {
-        $this->collection->deleteOne(['_id' => $key]);
-    }
-
-    /**
-     * Automatise la configuration de l'index TTL nécessaire dans MongoDB.
-     */
-    public function init(): void
-    {
-        $this->collection->createIndex(
-            ['expiresAt' => 1],
-            ['expireAfterSeconds' => 0]
-        );
-    }
+<?php
+
+declare(strict_types=1);
+
+namespace Anonympins\Fingerprint\Store;
+
+/**
+ * Adaptateur de stockage MongoDB pour le moteur Fingerprint.
+ * Utilise la bibliothèque officielle mongodb/mongodb.
+ */
+class MongoDbStore implements IStore
+{
+    /**
+     * @var \MongoDB\Collection
+     */
+    private $collection;
+
+    /**
+     * @var InMemoryStore
+     */
+    private InMemoryStore $fallbackStore;
+
+    /**
+     * @var bool
+     */
+    private bool $isDown = false;
+
+    /**
+     * @var float
+     */
+    private float $lastReconnectAttempt = 0.0;
+
+    /**
+     * @param \MongoDB\Collection $collection Collection dédiée au stockage des empreintes
+     */
+    public function __construct($collection)
+    {
+        $this->collection = $collection;
+        $this->fallbackStore = new InMemoryStore();
+    }
+
+    private function checkConnection(): void
+    {
+        if (!$this->isDown) {
+            return;
+        }
+
+        $now = microtime(true);
+        if ($now - $this->lastReconnectAttempt > 5.0) {
+            $this->lastReconnectAttempt = $now;
+            try {
+                $this->collection->findOne([], ['projection' => ['_id' => 1]]);
+                $this->isDown = false;
+            } catch (\Throwable $e) {
+                $this->isDown = true;
+            }
+        }
+    }
+
+    public function get(string $key)
+    {
+        $this->checkConnection();
+        if ($this->isDown) {
+            return $this->fallbackStore->get($key);
+        }
+        try {
+            $doc = $this->collection->findOne(['_id' => $key]);
+            if (!$doc) {
+                return null;
+            }
+
+            // Vérification d'expiration active pour bypasser le délai de 60s du démon de MongoDB
+            if (isset($doc['expiresAt'])) {
+                $expiresAt = $doc['expiresAt'];
+                if ($expiresAt instanceof \MongoDB\BSON\UTCDateTime) {
+                    $expiresAtMs = $expiresAt->toDateTime()->getTimestamp() * 1000;
+                    $nowMs = (int)(microtime(true) * 1000);
+                    if ($expiresAtMs < $nowMs) {
+                        $this->delete($key);
+                        return null;
+                    }
+                }
+            }
+
+            return isset($doc['value']) ? json_decode($doc['value'], true) : null;
+        } catch (\Throwable $e) {
+            $this->isDown = true;
+            $this->lastReconnectAttempt = microtime(true);
+            return $this->fallbackStore->get($key);
+        }
+    }
+
+    public function set(string $key, $value, ?int $ttl = null): void
+    {
+        $this->checkConnection();
+        if ($this->isDown) {
+            $this->fallbackStore->set($key, $value, $ttl);
+            return;
+        }
+        try {
+            $doc = [
+                '_id' => $key,
+                'value' => json_encode($value),
+            ];
+
+            if ($ttl !== null && $ttl > 0) {
+                $doc['expiresAt'] = new \MongoDB\BSON\UTCDateTime((time() + $ttl) * 1000);
+            }
+
+            $this->collection->replaceOne(
+                ['_id' => $key],
+                $doc,
+                ['upsert' => true]
+            );
+        } catch (\Throwable $e) {
+            $this->isDown = true;
+            $this->lastReconnectAttempt = microtime(true);
+            $this->fallbackStore->set($key, $value, $ttl);
+        }
+    }
+
+    public function has(string $key): bool
+    {
+        $this->checkConnection();
+        if ($this->isDown) {
+            return $this->fallbackStore->has($key);
+        }
+        try {
+            $doc = $this->collection->findOne(
+                ['_id' => $key],
+                ['projection' => ['expiresAt' => 1]]
+            );
+
+            if (!$doc) {
+                return false;
+            }
+
+            if (isset($doc['expiresAt']) && $doc['expiresAt'] instanceof \MongoDB\BSON\UTCDateTime) {
+                $expiresAtMs = $doc['expiresAt']->toDateTime()->getTimestamp() * 1000;
+                $nowMs = (int)(microtime(true) * 1000);
+                if ($expiresAtMs < $nowMs) {
+                    $this->delete($key);
+                    return false;
+                }
+            }
+
+            return true;
+        } catch (\Throwable $e) {
+            $this->isDown = true;
+            $this->lastReconnectAttempt = microtime(true);
+            return $this->fallbackStore->has($key);
+        }
+    }
+
+    public function delete(string $key): void
+    {
+        $this->fallbackStore->delete($key);
+        $this->checkConnection();
+        if ($this->isDown) {
+            return;
+        }
+        try {
+            $this->collection->deleteOne(['_id' => $key]);
+        } catch (\Throwable $e) {
+            $this->isDown = true;
+            $this->lastReconnectAttempt = microtime(true);
+        }
+    }
+
+    /**
+     * Automatise la configuration de l'index TTL nécessaire dans MongoDB.
+     */
+    public function init(): void
+    {
+        try {
+            $this->collection->createIndex(
+                ['expiresAt' => 1],
+                ['expireAfterSeconds' => 0]
+            );
+        } catch (\Throwable $e) {
+            $this->isDown = true;
+            $this->lastReconnectAttempt = microtime(true);
+        }
+    }
 }

package/src/php/Store/RedisStore.php

@@ -15,40 +15,120 @@ class RedisStore implements IStore
      */
     private $redis;
 
+    /**
+     * @var InMemoryStore
+     */
+    private InMemoryStore $fallbackStore;
+
+    /**
+     * @var bool
+     */
+    private bool $isDown = false;
+
+    /**
+     * @var float
+     */
+    private float $lastReconnectAttempt = 0.0;
+
     /**
      * @param mixed $redis Client Redis déjà configuré et connecté
      */
     public function __construct($redis)
     {
         $this->redis = $redis;
+        $this->fallbackStore = new InMemoryStore();
+    }
+
+    private function checkConnection(): void
+    {
+        if (!$this->isDown) {
+            return;
+        }
+
+        $now = microtime(true);
+        // Tentative de reconnexion toutes les 5 secondes
+        if ($now - $this->lastReconnectAttempt > 5.0) {
+            $this->lastReconnectAttempt = $now;
+            try {
+                if (method_exists($this->redis, 'ping')) {
+                    $this->redis->ping();
+                } else {
+                    $this->redis->exists('connection_test');
+                }
+                $this->isDown = false;
+            } catch (\Throwable $e) {
+                $this->isDown = true;
+            }
+        }
     }
 
     public function get(string $key)
     {
-        $value = $this->redis->get($key);
-        if ($value === false || $value === null) {
-            return null;
+        $this->checkConnection();
+        if ($this->isDown) {
+            return $this->fallbackStore->get($key);
+        }
+        try {
+            $value = $this->redis->get($key);
+            if ($value === false || $value === null) {
+                return null;
+            }
+            return json_decode($value, true);
+        } catch (\Throwable $e) {
+            $this->isDown = true;
+            $this->lastReconnectAttempt = microtime(true);
+            return $this->fallbackStore->get($key);
         }
-        return json_decode($value, true);
     }
 
     public function set(string $key, $value, ?int $ttl = null): void
     {
-        $stringValue = json_encode($value);
-        if ($ttl !== null && $ttl > 0) {
-            $this->redis->setex($key, $ttl, $stringValue);
-        } else {
-            $this->redis->set($key, $stringValue);
+        $this->checkConnection();
+        if ($this->isDown) {
+            $this->fallbackStore->set($key, $value, $ttl);
+            return;
+        }
+        try {
+            $stringValue = json_encode($value);
+            if ($ttl !== null && $ttl > 0) {
+                $this->redis->setex($key, $ttl, $stringValue);
+            } else {
+                $this->redis->set($key, $stringValue);
+            }
+        } catch (\Throwable $e) {
+            $this->isDown = true;
+            $this->lastReconnectAttempt = microtime(true);
+            $this->fallbackStore->set($key, $value, $ttl);
         }
     }
 
     public function has(string $key): bool
     {
-        return (bool)$this->redis->exists($key);
+        $this->checkConnection();
+        if ($this->isDown) {
+            return $this->fallbackStore->has($key);
+        }
+        try {
+            return (bool)$this->redis->exists($key);
+        } catch (\Throwable $e) {
+            $this->isDown = true;
+            $this->lastReconnectAttempt = microtime(true);
+            return $this->fallbackStore->has($key);
+        }
     }
 
     public function delete(string $key): void
     {
-        $this->redis->del($key);
+        $this->fallbackStore->delete($key);
+        $this->checkConnection();
+        if ($this->isDown) {
+            return;
+        }
+        try {
+            $this->redis->del($key);
+        } catch (\Throwable $e) {
+            $this->isDown = true;
+            $this->lastReconnectAttempt = microtime(true);
+        }
     }
 }