[1.x] Improve redis exception (#168)

* improve redis exception

* Fix code styling

---------

Co-authored-by: timacdonald <[email protected]>

src/Support/RedisAdapter.php

@@ -112,13 +112,13 @@ public function pipeline(callable $closure): array
     protected function handle(array $args): mixed
     {
         try {
-            return tap($this->run($args), function ($result) {
+            return tap($this->run($args), function ($result) use ($args) {
                 if ($result === false && $this->client() instanceof PhpRedis) {
-                    throw new RedisClientException($this->client()->getLastError() ?? 'An unknown error occurred.');
+                    throw RedisServerException::whileRunningCommand(implode(' ', $args), $this->client()->getLastError() ?? 'An unknown error occurred.');
                 }
             });
         } catch (PredisServerException $e) {
-            throw new RedisClientException($e->getMessage(), previous: $e);
+            throw RedisServerException::whileRunningCommand(implode(' ', $args), $e->getMessage(), previous: $e);
         }
     }
 

src/Support/RedisServerException.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Laravel\Pulse\Support;
+
+use RuntimeException;
+use Throwable;
+
+/**
+ * @internal
+ */
+class RedisServerException extends RuntimeException
+{
+    /**
+     * Create an exception from the client's error message.
+     */
+    public static function whileRunningCommand(string $command, string $message, ?Throwable $previous = null): self
+    {
+        if (str_starts_with($message, 'ERR syntax error')) {
+            $message = "The Redis version does not support the command or some of its arguments [{$command}]. Redis error: [{$message}].";
+        } else {
+            $message = "Error running command [{$command}]. Redis error: [{$message}].";
+        }
+
+        return new self($message, previous: $previous);
+    }
+}

tests/Feature/RedisTest.php

@@ -11,7 +11,7 @@
 use Laravel\Pulse\Entry;
 use Laravel\Pulse\Ingests\RedisIngest;
 use Laravel\Pulse\Support\RedisAdapter;
-use Laravel\Pulse\Support\RedisClientException;
+use Laravel\Pulse\Support\RedisServerException;
 use Tests\StorageFake;
 
 beforeEach(function () {
@@ -137,4 +137,8 @@
     $redis = new RedisAdapter(Redis::connection(), App::make('config'));
 
     $redis->xtrim('stream-name', 'FOO', 'a', 'xyz');
-})->with(['predis', 'phpredis'])->throws(RedisClientException::class, 'ERR syntax error');
+})->with(['predis', 'phpredis'])->throws(RedisServerException::class, 'The Redis version does not support the command or some of its arguments [XTRIM laravel_database_stream-name FOO a xyz]. Redis error: [ERR syntax error].');
+
+it('prepends the error message with the run command', function () {
+    throw RedisServerException::whileRunningCommand('FOO BAR', 'Something happened');
+})->throws(RedisServerException::class, 'Error running command [FOO BAR]. Redis error: [Something happened].');