Make Automatic Persisted Queries work with hybrid cache mode (#2727)

Author: Kauto

CHANGELOG.md

@@ -9,6 +9,10 @@ You can find and compare releases at the [GitHub release page](https://github.co
 
 ## Unreleased
 
+### Fixed
+
+- Automatic Persisted Queries work with hybrid cache mode https://github.com/nuwave/lighthouse/pull/2727
+
 ## v6.63.1
 
 ### Fixed

src/GraphQL.php

@@ -313,21 +313,19 @@ public function toSerializableArray(ExecutionResult $result): array
     public function loadPersistedQuery(string $sha256hash): DocumentNode
     {
         $lighthouseConfig = $this->configRepository->get('lighthouse');
-        $queryCacheConfig = $lighthouseConfig['query_cache'];
         if (
             ! $lighthouseConfig['persisted_queries']
-            || ! $queryCacheConfig['enable']
+            || ! $this->queryCache->isEnabled()
         ) {
             // https://github.com/apollographql/apollo-server/blob/37a5c862261806817a1d71852c4e1d9cdb59eab2/packages/apollo-server-errors/src/index.ts#L240-L248
             throw new Error(message: 'PersistedQueryNotSupported', extensions: ['code' => 'PERSISTED_QUERY_NOT_SUPPORTED']);
         }
 
-        $cacheFactory = Container::getInstance()->make(CacheFactory::class);
-        $store = $cacheFactory->store($queryCacheConfig['store']);
-
-        return $store->get("lighthouse:query:{$sha256hash}")
+        return $this->queryCache->fromCacheOrParse(
+            hash: $sha256hash,
             // https://github.com/apollographql/apollo-server/blob/37a5c862261806817a1d71852c4e1d9cdb59eab2/packages/apollo-server-errors/src/index.ts#L230-L239
-            ?? throw new Error(message: 'PersistedQueryNotFound', extensions: ['code' => 'PERSISTED_QUERY_NOT_FOUND']);
+            parse: fn () => throw new Error(message: 'PersistedQueryNotFound', extensions: ['code' => 'PERSISTED_QUERY_NOT_FOUND']),
+        );
     }
 
     /** @return ErrorsHandler */

tests/Integration/AutomaticPersistedQueriesTest.php

@@ -1,16 +1,20 @@
 <?php declare(strict_types=1);
 
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
+use Illuminate\Filesystem\FilesystemAdapter;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Storage;
 use Tests\TestCase;
 use Tests\Utils\Queries\Foo;
 
 final class AutomaticPersistedQueriesTest extends TestCase
 {
-    public function testEnabled(): void
+    public function testEnabledWithStoreMode(): void
     {
         $config = $this->app->make(ConfigRepository::class);
         $config->set('lighthouse.query_cache.enable', true);
         $config->set('lighthouse.persisted_queries', true);
+        $config->set('lighthouse.query_cache.mode', 'store');
 
         $query = /** @lang GraphQL */ <<<'GRAPHQL'
         {
@@ -68,6 +72,77 @@ public function testEnabled(): void
         ]);
     }
 
+    public function testEnabledWithHybridStore(): void
+    {
+        $filesystem = Storage::fake();
+        $this->assertInstanceOf(FilesystemAdapter::class, $filesystem);
+
+        $config = $this->app->make(ConfigRepository::class);
+        $config->set('lighthouse.query_cache.enable', true);
+        $config->set('lighthouse.persisted_queries', true);
+        $config->set('lighthouse.query_cache.mode', 'hybrid');
+        $config->set('lighthouse.query_cache.opcache_path', $filesystem->path(''));
+
+        $query = /** @lang GraphQL */ <<<'GRAPHQL'
+        {
+            foo
+        }
+        GRAPHQL;
+
+        $sha256 = hash('sha256', $query);
+
+        $this->postGraphQL([
+            'extensions' => [
+                'persistedQuery' => [
+                    'version' => 1,
+                    'sha256Hash' => $sha256,
+                ],
+            ],
+        ])->assertJson([
+            'errors' => [
+                [
+                    'message' => 'PersistedQueryNotFound',
+                    'extensions' => [
+                        'code' => 'PERSISTED_QUERY_NOT_FOUND',
+                    ],
+                ],
+            ],
+        ]);
+
+        // run sending the query
+        $this->postGraphQL([
+            'query' => $query,
+            'extensions' => [
+                'persistedQuery' => [
+                    'version' => 1,
+                    'sha256Hash' => $sha256,
+                ],
+            ],
+        ])->assertExactJson([
+            'data' => [
+                'foo' => Foo::THE_ANSWER,
+            ],
+        ]);
+
+        $filesystem->assertExists('lighthouse-query-' . $sha256 . '.php');
+        // Simulate different server by deleting the local file - cache will fall back now
+        $filesystem->delete('lighthouse-query-' . $sha256 . '.php');
+
+        // run without query, the query should still be cached
+        $this->postGraphQL([
+            'extensions' => [
+                'persistedQuery' => [
+                    'version' => 1,
+                    'sha256Hash' => $sha256,
+                ],
+            ],
+        ])->assertExactJson([
+            'data' => [
+                'foo' => Foo::THE_ANSWER,
+            ],
+        ]);
+    }
+
     public function testConfigDisabled(): void
     {
         $config = $this->app->make(ConfigRepository::class);