Catch Connection Exception (#4)

Fixed: Catch connection exceptions in addition to errors from the API itself

Author: aarondfrancis

config/torchlight.php

@@ -2,11 +2,12 @@
 
 return [
     // The Torchlight client caches highlighted code blocks. Here
-    // you can define which cache driver you'd like to use.
+    // you can define which cache driver you'd like to use. If
+    // leave this blank your default app cache will be used.
     'cache' => env('TORCHLIGHT_CACHE_DRIVER'),
 
     // Which theme you want to use. You can find all of the themes at
-    // https://torchlight.dev/themes, or you can provide your own.
+    // https://torchlight.dev/themes.
     'theme' => env('TORCHLIGHT_THEME', 'material-theme-palenight'),
 
     // Your API token from torchlight.dev.

src/Client.php

@@ -9,6 +9,7 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
+use Throwable;
 use Torchlight\Exceptions\ConfigurationException;
 use Torchlight\Exceptions\RequestException;
 use Torchlight\Exceptions\TorchlightException;
@@ -45,12 +46,18 @@ protected function request(Collection $blocks)
 
         $host = Torchlight::config('host', 'https://api.torchlight.dev');
 
-        $response = Http::timeout(5)
-            ->withToken($this->getToken())
-            ->post($host . '/highlight', [
-                'blocks' => $this->blocksAsRequestParam($blocks)->values()->toArray(),
-            ])
-            ->json();
+        try {
+            $response = Http::timeout(5)
+                ->withToken($this->getToken())
+                ->post($host . '/highlight', [
+                    'blocks' => $this->blocksAsRequestParam($blocks)->values()->toArray(),
+                ])
+                ->json();
+        } catch (Throwable $e) {
+            $response = [
+                'error' => $e->getMessage()
+            ];
+        }
 
         $this->potentiallyThrowRequestException($response);
 

tests/ClientTimeoutTest.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @author Aaron Francis <[email protected]|https://twitter.com/aarondfrancis>
+ */
+
+namespace Torchlight\Tests;
+
+use Torchlight\Block;
+use Torchlight\Exceptions\RequestException;
+use Torchlight\Torchlight;
+
+class ClientTimeoutTest extends BaseTest
+{
+    public function getEnvironmentSetUp($app)
+    {
+        config()->set('torchlight', [
+            'theme' => 'material',
+            'token' => 'token',
+            'bust' => 0,
+            'host' => 'https://nonexistent.torchlight.dev'
+        ]);
+    }
+
+    /** @test */
+    public function it_catches_the_connect_exception()
+    {
+        // Our exception, not the default Laravel one.
+        $this->expectException(RequestException::class);
+
+        Torchlight::highlight(
+            Block::make('id')->language('php')->code('echo "hello world";')
+        );
+    }
+
+    /** @test */
+    public function it_catches_the_connect_exception_in_prod()
+    {
+        Torchlight::overrideEnvironment('production');
+
+        Torchlight::highlight(
+            Block::make('id')->language('php')->code('echo "hello world";')
+        );
+
+        // Just want to make sure we got past the highlight with no exception.
+        $this->assertTrue(true);
+    }
+}