Handle timeouts and other failures. Don't cache default responses

Author: aarondfrancis

config/torchlight.php

@@ -1,13 +1,17 @@
 <?php
 
 return [
+    // The Torchlight client caches highlighted code blocks. Here
+    // you can define which cache driver you'd like to use.
     'cache' => env('TORCHLIGHT_CACHE_DRIVER', 'default'),
 
-    'bust' => 1,
-
+    // Which theme you want to use. You can find all of the themes at
+    // https://torchlight.dev/themes, or you can provide your own.
     'theme' => 'material-theme-palenight',
 
+    // Your API token from torchlight.dev.
     'token' => env('TORCHLIGHT_TOKEN'),
 
+    // If you want to register the blade directives, set this to true.
     'blade_directives' => true,
 ];

src/Client.php

@@ -37,23 +37,23 @@ public function highlight($blocks)
 
     protected function request(Collection $blocks)
     {
-        // @TODO handle timeout
-        $response = Http::timeout(10)
+        $response = Http::timeout(5)
             ->withToken(config('torchlight.token'))
             ->post('https://torchlight.dev/api/highlight', [
                 'blocks' => $this->blocksAsRequestParam($blocks)->values(),
             ])
             ->json();
 
-        $response = collect($response['blocks'])->keyBy('id');
+        $response = collect(Arr::get($response, 'blocks', []))->keyBy('id');
 
         $blocks->each(function (Block $block) use ($response) {
             $block->setHtml(
                 $block->html ?? $this->getHtmlFromResponse($response, $block)
             );
         });
 
-        $this->setCacheFromBlocks($blocks);
+        // Only store the ones we got back from the API.
+        $this->setCacheFromBlocks($blocks, $response->keys());
 
         return $blocks;
     }
@@ -86,18 +86,16 @@ protected function blocksAsRequestParam(Collection $blocks)
         });
     }
 
-    protected function setCacheFromBlocks(Collection $blocks)
+    protected function setCacheFromBlocks(Collection $blocks, Collection $ids)
     {
-        return $blocks->each(function (Block $block) {
-            if (!$block->html) {
-                return;
+        $blocks->only($ids)->each(function (Block $block) use ($ids) {
+            if ($block->html) {
+                $this->cache()->put(
+                    $this->cacheKey($block),
+                    $block->html,
+                    now()->addDays(7)
+                );
             }
-
-            $this->cache()->put(
-                $this->cacheKey($block),
-                $block->html,
-                now()->addDays(30)
-            );
         });
     }
 
@@ -132,6 +130,6 @@ protected function getHtmlFromResponse(Collection $response, Block $block)
      */
     protected function defaultHtml(Block $block)
     {
-        return "<pre><code>" . $block->code . "</code></pre>";
+        return "<pre class='torchlight'><code>" . htmlentities($block->code) . "</code></pre>";
     }
 }

tests/BaseTest.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * @author Aaron Francis <aaron@hammerstone.dev|https://twitter.com/aarondfrancis>
+ */
+
+namespace Hammerstone\Torchlight\Tests;
+
+use Hammerstone\Torchlight\TorchlightServiceProvider;
+use Orchestra\Testbench\TestCase;
+
+abstract class BaseTest extends TestCase
+{
+    protected function getPackageProviders($app)
+    {
+        return [
+            TorchlightServiceProvider::class
+        ];
+    }
+}