Optimize rate limit

Author: guanguans

config/exception-notify.php

@@ -66,14 +66,23 @@
     |
     */
     'rate_limiter' => [
-        // Limit the number of exceptions.
-        'limit' => (int) env('EXCEPTION_NOTIFY_LIMIT', 1),
-
-        // Time interval.
-        'interval' => env('EXCEPTION_NOTIFY_INTERVAL', '1 minutes'),
+        // Config.
+        'config' => [
+            'limit' => (int) env('EXCEPTION_NOTIFY_LIMIT', 1),
+            'rate' => [
+                // https://www.php.net/manual/en/datetime.formats.php
+                'interval' => env('EXCEPTION_NOTIFY_INTERVAL', '1 minutes'),
+            ],
+        ],
 
-        // Cache adapter.
-        'cache_adapter' => \Symfony\Component\Cache\Adapter\FilesystemAdapter::class,
+        // Storage.
+        'storage' => [
+            // \Psr\Cache\CacheItemPoolInterface::class
+            'class' => \Symfony\Component\Cache\Adapter\PhpFilesAdapter::class,
+            'parameters' => [
+                'directory' => storage_path('framework/cache/exception-notify'),
+            ],
+        ],
     ],
 
     /*

src/ExceptionNotifyManager.php

@@ -113,11 +113,10 @@ public function shouldntReport(Throwable $e): bool
             }
         }
 
-        /* @var RateLimiterFactory $rateLimiterFactory */
-        $rateLimiterFactory = $this->container->make(RateLimiterFactory::class);
-
-        return ! $rateLimiterFactory
-            ->create(md5($e->getFile().$e->getLine().$e->getCode().$e->getMessage()))
+        return ! $this
+            ->container
+            ->make(RateLimiterFactory::class)
+            ->create(md5($e->getMessage().$e->getCode().$e->getFile().$e->getLine()))
             ->consume()
             ->isAccepted();
     }

src/ExceptionNotifyServiceProvider.php

@@ -51,7 +51,7 @@ public function register()
         $this->setupConfig();
         $this->registerExceptionNotifyManager();
         $this->registerCollectorManager();
-        $this->registerRateLimiterFactory();
+        $this->registerRateLimiter();
     }
 
     /**
@@ -99,20 +99,34 @@ protected function registerExceptionNotifyManager()
         $this->app->alias(ExceptionNotifyManager::class, 'exception.notifier');
     }
 
-    protected function registerRateLimiterFactory()
+    protected function registerRateLimiter()
     {
-        $this->app->singleton(RateLimiterFactory::class, function (Container $app) {
-            return new RateLimiterFactory([
-                'id' => 'exception_notify',
-                'policy' => 'token_bucket',
-                'limit' => $app['config']['exception-notify.rate_limiter.limit'],
-                'rate' => [
-                    'interval' => $app['config']['exception-notify.rate_limiter.interval'],
-                ],
-            ], new CacheStorage($app->make($app['config']['exception-notify.rate_limiter.cache_adapter'])));
+        $this->app->singleton(CacheStorage::class, function (Container $app) {
+            return new CacheStorage(
+                $app->make(
+                    $app['config']['exception-notify.rate_limiter.storage.class'],
+                    $app['config']['exception-notify.rate_limiter.storage.parameters']
+                )
+            );
         });
+        $this->app->alias(CacheStorage::class, 'exception.rate-limiter.storage');
 
-        $this->app->alias(RateLimiterFactory::class, 'exception.rate-limiter-factory');
+        $this->app->singleton(RateLimiterFactory::class, function (Container $app) {
+            return new RateLimiterFactory(
+                array_merge([
+                    'id' => 'exception-notify',
+                    'policy' => 'token_bucket',
+                    'limit' => 6,
+                    'interval' => '1 minutes',
+                    'rate' => [
+                        'amount' => 1,
+                        'interval' => '1 minutes',
+                    ],
+                ], $app['config']['exception-notify.rate_limiter.config']),
+                $this->app->make(CacheStorage::class)
+            );
+        });
+        $this->app->alias(RateLimiterFactory::class, 'exception.rate-limiter.factory');
     }
 
     protected function registerReportingEvent()