Roll back pooling, as it's done at the API level now.

Author: aarondfrancis

src/Client.php

@@ -6,6 +6,7 @@
 namespace Torchlight;
 
 use GuzzleHttp\Promise\Promise;
+use Illuminate\Http\Client\ConnectionException;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Http;
@@ -42,35 +43,33 @@ public function highlight($blocks)
 
     protected function request(Collection $blocks)
     {
-        $error = false;
-        $response = [];
-
         try {
-            $response = $this->collectionOfBlocks($blocks)
-                ->chunk(Torchlight::config('request_chunk_size', 15))
-                ->pipe(function ($chunks) {
-                    return collect($this->requestChunks($chunks));
-                })
-                ->map(function ($response) use (&$error) {
-                    if ($response instanceof Throwable) {
-                        $error = $response;
-
-                        return [];
-                    }
-
-                    if ($response->failed()) {
-                        $error = $response->toException();
-
-                        return [];
-                    }
-
-                    return Arr::get($response->json(), 'blocks', []);
-                })
-                ->flatten(1);
+            $host = Torchlight::config('host', 'https://api.torchlight.dev');
+            $timeout = Torchlight::config('request_timeout', 5);
+
+            $response = Http::baseUrl($host)
+                ->timeout($timeout)
+                ->withToken($this->getToken())
+                ->post('highlight', [
+                    'blocks' => $this->blocksAsRequestParam($blocks)->values()->toArray(),
+                ]);
+
+            if ($response->failed()) {
+                $this->potentiallyThrowRequestException($response->toException());
+                $response = [];
+            } else {
+                $response = $response->json();
+            }
+
         } catch (Throwable $e) {
-            $this->throwUnlessProduction($e);
+            $e instanceof ConnectionException
+                ? $this->potentiallyThrowRequestException($e)
+                : $this->throwUnlessProduction($e);
+
+            $response = [];
         }
 
+        $response = Arr::get($response, 'blocks', []);
         $response = collect($response)->keyBy('id');
 
         $blocks->each(function (Block $block) use ($response) {
@@ -94,8 +93,6 @@ protected function request(Collection $blocks)
         // Only store the ones we got back from the API.
         $this->setCacheFromBlocks($blocks, $response->keys());
 
-        $this->potentiallyThrowRequestException($error);
-
         return $blocks;
     }
 
@@ -148,7 +145,9 @@ protected function getToken()
     protected function potentiallyThrowRequestException($exception)
     {
         if ($exception) {
-            $this->throwUnlessProduction(new RequestException($exception->getMessage()));
+            $wrapped = new RequestException('A Torchlight request exception has occurred.', 0, $exception);
+
+            $this->throwUnlessProduction($wrapped);
         }
     }
 

tests/ClientTest.php

@@ -194,63 +194,4 @@ public function a_500_error_returns_a_default_in_production()
         $this->assertEquals('<pre><code class=\'torchlight\'>echo &quot;hello world&quot;;</code></pre>', $block->wrapped);
     }
 
-    /** @test */
-    public function multiple_requests_get_chunked()
-    {
-        config()->set('torchlight.request_chunk_size', 2);
-
-        $this->fakeSuccessfulResponse('1');
-        $this->fakeSuccessfulResponse('2');
-        $this->fakeSuccessfulResponse('3');
-        $this->fakeSuccessfulResponse('4');
-
-        Torchlight::highlight([
-            Block::make('1')->language('php')->code('echo "hello world 1";'),
-            Block::make('2')->language('php')->code('echo "hello world 2";'),
-            Block::make('3')->language('php')->code('echo "hello world 3";'),
-            Block::make('4')->language('php')->code('echo "hello world 4";'),
-        ]);
-
-        // All these should be cached.
-        Torchlight::highlight([
-            Block::make('1')->language('php')->code('echo "hello world 1";'),
-            Block::make('2')->language('php')->code('echo "hello world 2";'),
-            Block::make('3')->language('php')->code('echo "hello world 3";'),
-            Block::make('4')->language('php')->code('echo "hello world 4";'),
-        ]);
-
-        // 2 chunks sent, second set was cached.
-        Http::assertSentCount(2);
-    }
-
-    /** @test */
-    public function blocks_still_get_cached_if_one_request_fails()
-    {
-        config()->set('torchlight.request_chunk_size', 1);
-
-        $this->fakeSuccessfulResponse('1');
-        $this->fakeSuccessfulResponse('2');
-        $this->fakeSuccessfulResponse('3');
-
-        $this->fakeTimeout('4');
-
-        try {
-            Torchlight::highlight([
-                $block1 = Block::make('1')->language('php')->code('echo "hello world 1";'),
-                $block2 = Block::make('2')->language('php')->code('echo "hello world 2";'),
-                $block3 = Block::make('3')->language('php')->code('echo "hello world 3";'),
-                $block4 = Block::make('4')->language('php')->code('echo "hello world 4";'),
-            ]);
-        } catch (RequestException $exception) {
-        }
-
-        // Exception should have been thrown.
-        $this->assertInstanceOf(RequestException::class, $exception);
-
-        $client = new Client;
-
-        $this->assertNotNull(Cache::get($client->cacheKey($block1)));
-        $this->assertNotNull(Cache::get($client->cacheKey($block2)));
-        $this->assertNotNull(Cache::get($client->cacheKey($block3)));
-    }
 }