Feat: save cache to disk

xtrime-ru · Aug 14, 2021 · bf28e0c · bf28e0c
1 parent 48aebbc
commit bf28e0c
Show file tree

Hide file tree

Showing 10 changed files with 94 additions and 52 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,3 +1,4 @@
 .*
 !.env.docker.example
-log/
+log/*
+cache/*
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ vendor
 *.madeline
 *.madeline.lock
 composer.phar
-log
+log/*
+cache/*
diff --git a/app/AccessControl/AccessControl.php b/app/AccessControl/AccessControl.php
@@ -12,6 +12,11 @@ class AccessControl
     /** @var User[] */
     private array $mediaUsers = [];
 
+    private const FILES = [
+        ROOT_DIR . '/cache/users.cache' => 'users',
+        ROOT_DIR . '/cache/media-users.cache' => 'mediaUsers',
+    ];
+
     /** @var int Interval to remove old clients: 60 seconds */
     private const CLEANUP_INTERVAL_MS = 60*1000;
     private int $rpmLimit;
@@ -33,8 +38,11 @@ public function __construct()
 
         $this->clientsSettings = (array) Config::getInstance()->get('access.clients_settings');
 
+        $this->loadUsers();
+
         Timer::tick(static::CLEANUP_INTERVAL_MS, function () {
             $this->removeOldUsers();
+            $this->saveUsers();
         });
     }
 
@@ -53,6 +61,34 @@ private function removeOldUsers(): void
         }
     }
 
+    private function saveUsers(): void {
+        foreach (self::FILES as $path => $object) {
+            file_put_contents($path, '');
+            foreach ($this->{$object} as $key => $value) {
+                file_put_contents($path, serialize([$key=>$value]) . PHP_EOL,FILE_APPEND);
+            }
+
+        }
+    }
+
+    private function loadUsers(): void {
+        foreach (self::FILES as $path => $object) {
+            if(file_exists($path)) {
+                $file = fopen($path, 'rb');
+                while(!feof($file)) {
+                    $line = fgets($file);
+                    if ($line) {
+                        $line = trim($line);
+                        $item = unserialize($line, ['allowed_classes'=>[User::class]]);
+                        $this->{$object}[array_key_first($item)] = reset($item);
+                    }
+                }
+            } else {
+                $this->{$object} = [];
+            }
+        }
+    }
+
     public function getOrCreateUser(string $ip, string $type = 'default'): User
     {
         if ($type === 'media') {

diff --git a/app/AccessControl/ForbiddenPeers.php b/app/AccessControl/ForbiddenPeers.php
@@ -2,30 +2,36 @@
 
 namespace TelegramRSS\AccessControl;
 
+use TelegramRSS\Client;
 use TelegramRSS\Config;
 
 final class ForbiddenPeers
 {
-    private static ?string $regex = null;
 
-    private static $errorTypes = [
-        'USERNAME_INVALID',
-        'CHANNEL_PRIVATE',
-        'This peer is not present in the internal peer database',
-    ];
+    private static ?string $regex = null;
 
     /** @var array<string, string> */
-    private static array $peers = [];
+    private static ?array $peers = null;
+
+    private const FILE = ROOT_DIR . '/cache/forbidden-peers.csv';
+    /** @var resource|null */
+    private static $filePointer = null;
 
     public static function add(string $peer, string $error): void {
+        if (
+            $error === Client::MESSAGE_CLIENT_UNAVAILABLE ||
+            $error === 'Empty message' ||
+            $error === 'Connection closed unexpectedly' ||
+            stripos($error, Client::MESSAGE_FLOOD_WAIT) !== false ||
+            stripos($error, 'Media') !== false
+        ) {
+            return;
+        }
+
         $peer = mb_strtolower($peer);
 
-        foreach (self::$errorTypes as $errorType) {
-            if ($errorType === $error) {
-                self::$peers[$peer] = $error;
-                break;
-            }
-        }
+        self::$peers[$peer] = $error;
+        fputcsv(self::getFilePointer(), [$peer, $error]);
     }
 
     /**
@@ -42,11 +48,34 @@ public static function check(string $peer): ?string {
             self::$regex = (string)Config::getInstance()->get('access.forbidden_peer_regex');
         }
 
+        if (self::$peers === null) {
+            if (file_exists(self::FILE)) {
+                $file = self::getFilePointer();
+                while(!feof($file)){
+                    [$oldPeer, $error] = fgetcsv($file);
+                    if ($oldPeer && $error) {
+                        self::$peers[$oldPeer] = $error;
+                    }
+                }
+            }
+        }
+
         $regex = self::$regex;
         if ($regex && preg_match("/{$regex}/i", $peer)) {
             return "PEER NOT ALLOWED";
         }
 
         return self::$peers[$peer] ?? null;
     }
+
+    /**
+     * @return false|resource|null
+     */
+    private static function getFilePointer() {
+        if (self::$filePointer === null) {
+            self::$filePointer = fopen(self::FILE, 'cb+');
+        }
+
+        return self::$filePointer;
+    }
 }
diff --git a/app/Client.php b/app/Client.php
@@ -9,7 +9,8 @@ class Client
     private const RETRY = 5;
     private const RETRY_INTERVAL = 3;
     private const TIMEOUT = 1;
-    public const CLIENT_UNAVAILABLE_MESSAGE = 'Telegram client connection error';
+    public const MESSAGE_CLIENT_UNAVAILABLE = 'Telegram client connection error';
+    public const MESSAGE_FLOOD_WAIT = 'FLOOD_WAIT';
 
     /**
      * Client constructor.
@@ -177,11 +178,11 @@ private function get(string $method, $parameters = [], array $headers = [], stri
             if ($errorMessage) {
                 throw new \UnexpectedValueException($errorMessage, $body->errors[0]->code ?? 400);
             }
-            throw new \UnexpectedValueException(static::CLIENT_UNAVAILABLE_MESSAGE, $curl->statusCode);
+            throw new \UnexpectedValueException(static::MESSAGE_CLIENT_UNAVAILABLE, $curl->statusCode);
         }
 
         if (!$result = $body->response ?? null) {
-            throw new \UnexpectedValueException(static::CLIENT_UNAVAILABLE_MESSAGE, $curl->statusCode);
+            throw new \UnexpectedValueException(static::MESSAGE_CLIENT_UNAVAILABLE, $curl->statusCode);
         }
         return $result;
 

diff --git a/app/Controller.php b/app/Controller.php
@@ -227,7 +227,6 @@ private function validate(): self
      */
     private function generateResponse(Client $client, Request $request): self
     {
-
         if ($this->response['errors']) {
             return $this;
         }
@@ -278,14 +277,10 @@ private function generateResponse(Client $client, Request $request): self
                     );
                 }
             }
-
-
-
-
         } catch (Exception $e) {
             $this->response['code'] = $e->getCode() ?: 400;
             $this->response['errors'][] = $e->getMessage();
-            if ($e->getMessage() !== Client::CLIENT_UNAVAILABLE_MESSAGE) {
+            if ($e->getMessage() !== Client::MESSAGE_CLIENT_UNAVAILABLE) {
                 $this->user->addError($e->getMessage(), $this->request['url']);
             }
             ForbiddenPeers::add($this->request['peer'], $e->getMessage());

diff --git a/app/Log.php b/app/Log.php
@@ -34,7 +34,6 @@ private function __construct() {
         if ($this->file) {
             $this->echoLog = false;
         }
-        $this->createDirIfNotExists();
     }
 
 
@@ -75,22 +74,6 @@ private function send(string $text): self
         return $this;
     }
 
-    /**
-     * @return Log
-     */
-    private function createDirIfNotExists(): self
-    {
-        if ($this->echoLog) {
-            return $this;
-        }
-        if (!is_dir($this->dir)) {
-            if (!mkdir($this->dir, 0755, true) && !is_dir($this->dir)) {
-                throw new \RuntimeException("Directory {$this->dir} was not created");
-            }
-        }
-        return $this;
-    }
-
     /**
      * @return string
      */

diff --git a/cache/.gitkeep b/cache/.gitkeep
diff --git a/composer.lock b/composer.lock
diff --git a/log/.gitkeep b/log/.gitkeep