fold enable cache lua inside of redis store

Author: kai-init

src/CacheManager.php

@@ -9,7 +9,6 @@
 use NormCache\Planning\TableIdentityResolver;
 use NormCache\Support\CacheKeyBuilder;
 use NormCache\Support\QueryIdentity;
-use NormCache\Support\RedisScripts;
 use NormCache\Support\RedisStore;
 use NormCache\Values\CacheConfig;
 use NormCache\Values\TableIdentity;
@@ -133,12 +132,10 @@ public function enableCache(): ?int
         $this->runtime->forgetEpoch();
 
         try {
-            $epoch = $this->store->script(
-                RedisScripts::get('enable_cache'),
-                [$this->keys->epoch(), $this->keys->disabled()],
+            return $this->store->enableCache(
+                $this->keys->epoch(),
+                $this->keys->disabled(),
             );
-
-            return (int) $epoch;
         } catch (\Throwable $exception) {
             $this->runtime->fail($exception);
 

src/Support/RedisStore.php

@@ -254,6 +254,14 @@ public function invalidateTableState(
         );
     }
 
+    public function enableCache(string $epochKey, string $disabledKey): int
+    {
+        return (int) $this->script(
+            RedisScripts::get('enable_cache'),
+            [$epochKey, $disabledKey],
+        );
+    }
+
     public function brpop(string $key, float $timeoutSeconds): bool
     {
         return $this->withRawValues(static function (Connection $connection) use ($key, $timeoutSeconds): bool {
@@ -269,7 +277,7 @@ public function brpop(string $key, float $timeoutSeconds): bool
      * @param  list<string>  $keys
      * @param  list<mixed>  $args
      */
-    public function script(string $script, array $keys, array $args = []): mixed
+    private function script(string $script, array $keys, array $args = []): mixed
     {
         $connection = $this->connection();
         $keyCount = count($keys);

tests/Integration/RuntimeKillSwitchTest.php

@@ -76,6 +76,21 @@ public function test_enable_advances_the_epoch_and_clears_the_flag(): void
         $this->assertFalse(NormCache::cacheDisabled());
     }
 
+    public function test_store_enable_returns_the_advanced_epoch_and_clears_the_flag(): void
+    {
+        $epochKey = $this->cacheKeys()->epoch();
+        $disabledKey = $this->cacheKeys()->disabled();
+        $this->assertTrue(NormCache::disableCache());
+        $before = (int) ($this->cacheStore()->getRaw($epochKey) ?? '0');
+        $this->assertNotNull($this->cacheStore()->getRaw($disabledKey));
+
+        $epoch = $this->cacheStore()->enableCache($epochKey, $disabledKey);
+
+        $this->assertSame($before + 1, $epoch);
+        $this->assertSame((string) ($before + 1), $this->cacheStore()->getRaw($epochKey));
+        $this->assertNull($this->cacheStore()->getRaw($disabledKey));
+    }
+
     public function test_payloads_cached_before_a_disable_are_not_served_after_enable(): void
     {
         $read = fn() => DB::table('posts')->where('id', 1)->value('title');