Optimize visit aggregation, prevent stale cache in limits, fix Redis exist check, edge mobile detection, and scheduling

resources/lang/en/default.php

@@ -199,7 +199,8 @@ return [
     'settings_site_name' => 'Site Name Override',
     'settings_site_name_helper' => 'Custom brand/site name displayed on redirect prompt screens. If empty, falls back to config("app.name").',
     'settings_route_prefix' => 'Route Prefix',
-    'settings_route_prefix_helper' => 'URL segment before the short key, e.g. "/s/abc123". Change requires a config:clear.',
+    'settings_route_prefix_helper' => 'URL segment before the short key, e.g. "/s/abc123". Leave empty to serve links directly from the root domain (e.g. "domain.com/abc123"). Change requires a config:clear.',
+    'settings_redirect_code_helper' => 'Temporary redirect (302) forces browsers to request the short URL every time, ensuring accurate tracking of all visits. Permanent redirect (301) is cached by browsers and search engines (better for SEO), but subsequent visits from the same device might not be logged in statistics.',
     'settings_key_length' => 'Auto-generated Key Length',
     'settings_key_length_helper' => 'Number of characters for auto-generated short keys (base62). 6 chars = ~56 billion unique keys.',
     'settings_cache_ttl' => 'Redirect Cache TTL',

resources/lang/pl/default.php

@@ -200,7 +200,8 @@ return [
     'settings_site_name' => 'Niestandardowa nazwa witryny',
     'settings_site_name_helper' => 'Własna nazwa witryny/marki wyświetlana na ekranach przekierowań (monit o hasło, ostrzeżenia, piksele). W przypadku braku wartości, zostanie użyta nazwa z konfiguracji config("app.name").',
     'settings_route_prefix' => 'Prefiks trasy',
-    'settings_route_prefix_helper' => 'Segment URL przed kluczem, np. "/s/abc123". Zmiana wymaga php artisan config:clear.',
+    'settings_route_prefix_helper' => 'Segment URL przed kluczem, np. "/s/abc123". Pozostaw puste, aby serwować linki bezpośrednio w głównej domenie (np. "domena.com/abc123"). Zmiana wymaga php artisan config:clear.',
+    'settings_redirect_code_helper' => 'Przekierowanie tymczasowe (302) zmusza przeglądarki do każdorazowego odpytywania serwera, co pozwala na dokładne zliczanie wszystkich wizyt. Przekierowanie stałe (301) jest zapisywane w pamięci podręcznej przeglądarek i wyszukiwarek (lepsze pod SEO), przez co kolejne przejścia tego samego użytkownika mogą nie być rejestrowane w statystykach.',
     'settings_key_length' => 'Długość auto-generowanego klucza',
     'settings_key_length_helper' => 'Liczba znaków klucza (base62). 6 znaków = ~56 miliardów unikalnych kluczy.',
     'settings_cache_ttl' => 'TTL cache przekierowania',

src/Console/Commands/AggregateAndPruneVisitsCommand.php

@@ -47,8 +47,26 @@ class AggregateAndPruneVisitsCommand extends Command
                     $statsByUrl = [];
                     $nextDate = Carbon::parse($date)->addDay()->toDateString();
 
-                    ShortUrlVisit::where('visited_at', '>=', $date.' 00:00:00')
+                    DB::table('short_url_visits')
+                        ->where('visited_at', '>=', $date.' 00:00:00')
                         ->where('visited_at', '<', $nextDate.' 00:00:00')
+                        ->select([
+                            'short_url_id',
+                            'is_qr_scan',
+                            'ip_hash',
+                            'device_type',
+                            'browser',
+                            'operating_system',
+                            'country',
+                            'country_code',
+                            'utm_source',
+                            'utm_medium',
+                            'utm_campaign',
+                            'browser_language',
+                            'city',
+                            'referer_host',
+                        ])
+                        ->orderBy('id')
                         ->chunk(1000, function ($chunk) use (&$statsByUrl): void {
                             foreach ($chunk as $visit) {
                                 $urlId = $visit->short_url_id;

src/Console/Commands/SyncBufferedCountersCommand.php

@@ -25,9 +25,13 @@ class SyncBufferedCountersCommand extends Command
         if (Cache::getDefaultDriver() === 'redis' && class_exists(Redis::class)) {
             $tempKey = "{$dirtyKey}:temp:".time();
             try {
-                Redis::rename($dirtyKey, $tempKey);
-                $dirtyIds = Redis::smembers($tempKey);
-                Redis::del($tempKey);
+                if (Redis::exists($dirtyKey)) {
+                    Redis::rename($dirtyKey, $tempKey);
+                    $dirtyIds = Redis::smembers($tempKey);
+                    Redis::del($tempKey);
+                } else {
+                    $dirtyIds = [];
+                }
             } catch (\Throwable) {
                 // If key does not exist or rename fails, fallback
                 $dirtyIds = [];

src/Filament/Resources/ShortUrlResource/Pages/ShortUrlSettingsPage.php

@@ -146,12 +146,13 @@ class ShortUrlSettingsPage extends Page implements HasForms
                                             ->label(__('filament-short-url::default.settings_route_prefix'))
                                             ->helperText(__('filament-short-url::default.settings_route_prefix_helper'))
                                             ->prefix(new HtmlString('<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" style="display: inline-block; vertical-align: middle; margin-right: 6px; margin-top: -3px; width: 15px; height: 15px;" class="text-emerald-600 dark:text-emerald-500"><path fill-rule="evenodd" d="M10 1a4.5 4.5 0 00-4.5 4.5V9H5a2 2 0 00-2 2v7a2 2 0 00 2 2h10a2 2 0 00 2-2v-7a2 2 0 00-2-2h-.5V5.5A4.5 4.5 0 00 10 1zm3 8V5.5a3 3 0 10-6 0V9h6z" clip-rule="evenodd" /></svg>https://'.request()->getHost().'/'))
-                                            ->required()
+                                            ->nullable()
                                             ->alphaDash()
                                             ->maxLength(20),
 
                                         Select::make('redirect_status_code')
                                             ->label(__('filament-short-url::default.redirect_code'))
+                                            ->helperText(__('filament-short-url::default.settings_redirect_code_helper'))
                                             ->options([
                                                 302 => __('filament-short-url::default.redirect_code_302'),
                                                 301 => __('filament-short-url::default.redirect_code_301'),

src/FilamentShortUrlServiceProvider.php

@@ -71,9 +71,7 @@ class FilamentShortUrlServiceProvider extends PackageServiceProvider
         $this->app->booted(function (): void {
             $schedule = $this->app->make(Schedule::class);
 
-            if (config('filament-short-url.pruning.enabled', true)) {
-                $schedule->command('short-url:aggregate-and-prune')->dailyAt('02:00');
-            }
+            $schedule->command('short-url:aggregate-and-prune')->dailyAt('02:00');
 
             if (config('filament-short-url.counter_buffering.enabled', false)) {
                 $schedule->command('short-url:sync-counters')->everyMinute();

src/Http/Controllers/ShortUrlRedirectController.php

@@ -89,20 +89,8 @@ class ShortUrlRedirectController extends Controller
             }
         }
 
-        // 4. Resolve Destination URL (evaluating targeting rules)
-        $destination = $shortUrl->resolveDestinationUrl($request);
-
-        // Forward query parameters if configured
-        if ($shortUrl->forward_query_params) {
-            $queryParams = $request->query();
-            // Remove routing/auth parameters so they don't leak to destination
-            unset($queryParams['confirmed'], $queryParams['password']);
-
-            if (! empty($queryParams)) {
-                $separator = str_contains($destination, '?') ? '&' : '?';
-                $destination .= $separator.http_build_query($queryParams);
-            }
-        }
+        // 4. Resolve Destination URL (evaluating targeting rules and forwarding query parameters)
+        $destination = $this->service->resolveRedirectUrl($shortUrl, $request);
 
         // 5. Warning / Intermediate Page Check
         if ($shortUrl->show_warning_page && ! $request->has('confirmed')) {

src/Models/ShortUrl.php

@@ -276,7 +276,21 @@ class ShortUrl extends Model
 
     public function getRealTimeTotalVisits(): int
     {
-        return $this->total_visits;
+        $buffered = 0;
+        if (config('filament-short-url.counter_buffering.enabled', false)) {
+            $prefix = config('filament-short-url.counter_buffering.cache_key_prefix', 'filament-short-url:buffer:');
+            $buffered = (int) cache()->get("{$prefix}total:{$this->id}", 0);
+        }
+
+        if ($this->max_visits !== null) {
+            $dbVal = (int) DB::table($this->table)
+                ->where('id', $this->id)
+                ->value('total_visits');
+
+            return $dbVal + $buffered;
+        }
+
+        return $this->total_visits + $buffered;
     }
 
     public function isActive(): bool
@@ -285,6 +299,13 @@ class ShortUrl extends Model
             return false;
         }
 
+        if ($this->single_use) {
+            $realEnabled = DB::table($this->table)->where('id', $this->id)->value('is_enabled');
+            if (! $realEnabled) {
+                return false;
+            }
+        }
+
         // Not yet active
         if ($this->activated_at && $this->activated_at->isFuture()) {
             return false;

src/Services/GeoIpService.php

@@ -91,7 +91,7 @@ class GeoIpService
 
         if (class_exists(\Locale::class)) {
             try {
-                $name = \Locale::getDisplayRegion('-'.$code, 'en');
+                $name = \Locale::getDisplayRegion('en-'.$code, 'en');
                 if ($name && $name !== $code) {
                     return $name;
                 }

src/Services/UserAgentParser.php

@@ -37,6 +37,8 @@ class UserAgentParser
         // Order matters — check specific first, generic last
         $patterns = [
             'Edg/' => 'Edge',
+            'EdgiOS' => 'Edge',
+            'EdgA' => 'Edge',
             'OPR/' => 'Opera',
             'Opera' => 'Opera',
             'SamsungBrowser' => 'Samsung Browser',
@@ -67,6 +69,8 @@ class UserAgentParser
     {
         $patterns = [
             '/Edg\/([0-9.]+)/',
+            '/EdgiOS\/([0-9.]+)/',
+            '/EdgA\/([0-9.]+)/',
             '/OPR\/([0-9.]+)/',
             '/SamsungBrowser\/([0-9.]+)/',
             '/CriOS\/([0-9.]+)/',