display copying errors in the CLI (#127)

* display copying errors in the CLI * fix style * Update CopyRequestFailedException.php Co-authored-by: Taylor Otwell <[email protected]>
laravel · May 24, 2021 · f807c52 · f807c52
1 parent accb920
commit f807c52
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 2 deletions.
diff --git a/src/Aws/AwsStorageProvider.php b/src/Aws/AwsStorageProvider.php
@@ -3,9 +3,11 @@
 namespace Laravel\VaporCli\Aws;
 
 use GuzzleHttp\Client;
+use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Pool;
 use GuzzleHttp\Psr7\Request;
 use Laravel\VaporCli\ConsoleVaporClient;
+use Laravel\VaporCli\Exceptions\CopyRequestFailedException;
 use Laravel\VaporCli\Helpers;
 use Symfony\Component\Console\Helper\ProgressBar;
 
@@ -108,7 +110,12 @@ public function executeCopyRequests($requests)
             }
         };
 
-        (new Pool(new Client(), $requests(), ['concurrency' => 10]))
+        (new Pool(new Client(), $requests(), [
+            'concurrency' => 10,
+            'rejected' => function (RequestException $reason, $index) {
+                throw new CopyRequestFailedException($reason->getMessage(), $index);
+            },
+        ]))
             ->promise()
             ->wait();
     }

diff --git a/src/Exceptions/CopyRequestFailedException.php b/src/Exceptions/CopyRequestFailedException.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Laravel\VaporCli\Exceptions;
+
+use RuntimeException;
+
+class CopyRequestFailedException extends RuntimeException
+{
+    /**
+     * The file index.
+     *
+     * @var int
+     */
+    public $index;
+
+    /**
+     * Create a new exception instance.
+     *
+     * @param  string  $message
+     * @param  int  $index
+     */
+    public function __construct($message = '', $index = 0)
+    {
+        parent::__construct($message);
+
+        $this->index = $index;
+    }
+
+    /**
+     * Get the file index.
+     *
+     * @return int
+     */
+    public function getIndex()
+    {
+        return $this->index;
+    }
+}
diff --git a/src/ServeAssets.php b/src/ServeAssets.php
@@ -3,6 +3,7 @@
 namespace Laravel\VaporCli;
 
 use Laravel\VaporCli\Aws\AwsStorageProvider;
+use Laravel\VaporCli\Exceptions\CopyRequestFailedException;
 
 class ServeAssets
 {
@@ -75,7 +76,16 @@ protected function executeCopyAssetRequests($requests, $assetPath)
         }
 
         if (! empty($requests)) {
-            $storage->executeCopyRequests($requests);
+            try {
+                $storage->executeCopyRequests($requests);
+            } catch (CopyRequestFailedException $e) {
+                $request = $requests[$e->getIndex()];
+
+                Helpers::line("<fg=red>Copying:</> {$request['path']}");
+                Helpers::write($e->getMessage());
+
+                exit(1);
+            }
         }
     }