add Lock heartbeat

src/lock/src/Driver/AbstractLock.php

@@ -12,10 +12,14 @@
 namespace FriendsOfHyperf\Lock\Driver;
 
 use FriendsOfHyperf\Lock\Exception\LockTimeoutException;
+use Hyperf\Context\ApplicationContext;
+use Hyperf\Contract\StdoutLoggerInterface;
+use Hyperf\Engine\Coroutine;
 use Hyperf\Stringable\Str;
 use Hyperf\Support\Traits\InteractsWithTime;
 use Override;
 
+use Throwable;
 use function Hyperf\Support\now;
 
 abstract class AbstractLock implements LockInterface
@@ -32,6 +36,8 @@ abstract class AbstractLock implements LockInterface
      */
     protected int $sleepMilliseconds = 250;
 
+    protected bool $isRun = true;
+
     /**
      * Create a new lock instance.
      */
@@ -45,6 +51,11 @@ public function __construct(protected string $name, protected int $seconds, ?str
      */
     abstract public function acquire(): bool;
 
+    /**
+     * Set the lock.
+     */
+    abstract protected function set(): bool;
+
     /**
      * Release the lock.
      */
@@ -55,10 +66,14 @@ abstract public function release(): bool;
      * {@inheritdoc}
      */
     #[Override]
-    public function get(?callable $callback = null)
+    public function get(?callable $callback = null, int $heartbeat = 0)
     {
         $result = $this->acquire();
 
+        if ($result && $heartbeat > 0){
+            $this->loop($heartbeat);
+        }
+
         if ($result && is_callable($callback)) {
             try {
                 return $callback();
@@ -75,7 +90,7 @@ public function get(?callable $callback = null)
      * {@inheritdoc}
      */
     #[Override]
-    public function block(int $seconds, ?callable $callback = null)
+    public function block(int $seconds, ?callable $callback = null, int $heartbeat = 0)
     {
         $starting = ((int) now()->format('Uu')) / 1000;
         $milliseconds = $seconds * 1000;
@@ -90,6 +105,10 @@ public function block(int $seconds, ?callable $callback = null)
             usleep($this->sleepMilliseconds * 1000);
         }
 
+        if ($heartbeat > 0){
+            $this->loop($heartbeat);
+        }
+
         if (is_callable($callback)) {
             try {
                 return $callback();
@@ -143,4 +162,24 @@ protected function isOwnedByCurrentProcess(): bool
     {
         return $this->isOwnedBy($this->owner);
     }
+
+    protected function loop(int $heartbeat = 5): void
+    {
+         Coroutine::create(
+            function () use ($heartbeat) {
+                while ($this->isRun) {
+                    sleep($heartbeat);
+                    if (!$this->isRun){
+                        return;
+                    }
+                    try {
+                        $this->set();
+                    } catch (Throwable $throwable){
+                        ApplicationContext::getContainer()->get(StdoutLoggerInterface::class)?->error((string) $throwable);
+                    }
+                }
+            }
+        );
+    }
+
 }

src/lock/src/Driver/CacheLock.php

@@ -49,12 +49,20 @@ public function acquire(): bool
         return $this->store->set($this->name, $this->owner, $this->seconds);
     }
 
+    #[Override]
+    public function set(): bool
+    {
+        return $this->store->set($this->name, $this->owner, $this->seconds);
+    }
+
     /**
      * Release the lock.
      */
     #[Override]
     public function release(): bool
     {
+        $this->isRun = false;
+
         if ($this->isOwnedByCurrentProcess()) {
             return $this->store->delete($this->name);
         }
@@ -68,6 +76,7 @@ public function release(): bool
     #[Override]
     public function forceRelease(): void
     {
+        $this->isRun = false;
         $this->store->delete($this->name);
     }
 

src/lock/src/Driver/CoroutineLock.php

@@ -85,12 +85,21 @@ public function acquire(): bool
         return true;
     }
 
+    #[Override]
+    protected function set(): bool
+    {
+        return false;
+    }
+
+
     /**
      * Release the lock.
      */
     #[Override]
     public function release(): bool
     {
+        $this->isRun = false;
+
         if ($this->isOwnedByCurrentProcess()) {
             return (self::$channels[$this->name] ?? null)?->pop(0.01) ? true : false;
         }
@@ -104,6 +113,8 @@ public function release(): bool
     #[Override]
     public function forceRelease(): void
     {
+        $this->isRun = false;
+
         if (! $chan = self::$channels[$this->name] ?? null) {
             return;
         }

src/lock/src/Driver/DatabaseLock.php

@@ -70,12 +70,32 @@ public function acquire(): bool
         return $acquired;
     }
 
+    /**
+     * Set the lock.
+     */
+    #[Override]
+    protected function set(): bool
+    {
+        $updated = $this->connection->table($this->table)
+            ->where('key', $this->name)
+            ->where('owner', $this->owner)
+            ->update(
+                [
+                    'expiration' => $this->expiresAt()
+                ]
+            );
+        return $updated >= 1;
+    }
+
+
     /**
      * Release the lock.
      */
     #[Override]
     public function release(): bool
     {
+        $this->isRun = false;
+
         if ($this->isOwnedByCurrentProcess()) {
             $this->connection->table($this->table)
                 ->where('key', $this->name)
@@ -94,6 +114,8 @@ public function release(): bool
     #[Override]
     public function forceRelease(): void
     {
+        $this->isRun = false;
+
         $this->connection->table($this->table)
             ->where('key', $this->name)
             ->delete();

src/lock/src/Driver/FileSystemLock.php

@@ -47,12 +47,22 @@ public function acquire(): bool
         return $this->store->set($this->name, $this->owner, $this->seconds) == true;
     }
 
+    /**
+     * Set the lock.
+     */
+    #[Override]
+    protected function set(): bool
+    {
+        return $this->store->set($this->name, $this->owner, $this->seconds) == true;
+    }
+
     /**
      * Release the lock.
      */
     #[Override]
     public function release(): bool
     {
+        $this->isRun = false;
         if ($this->isOwnedByCurrentProcess()) {
             return $this->store->delete($this->name);
         }
@@ -66,6 +76,7 @@ public function release(): bool
     #[Override]
     public function forceRelease(): void
     {
+        $this->isRun = false;
         $this->store->delete($this->name);
     }
 

src/lock/src/Driver/LockInterface.php

@@ -21,7 +21,7 @@ interface LockInterface
      * @param (callable(): T)|null $callback
      * @return ($callback is null ? bool : T)
      */
-    public function get(?callable $callback = null);
+    public function get(?callable $callback = null, int $heartbeat = 0);
 
     /**
      * Attempt to acquire the lock for the given number of seconds.
@@ -31,7 +31,7 @@ public function get(?callable $callback = null);
      * @return ($callback is null ? bool : T)
      * @throws LockTimeoutException
      */
-    public function block(int $seconds, ?callable $callback = null);
+    public function block(int $seconds, ?callable $callback = null, int $heartbeat = 0);
 
     /**
      * Release the lock.

src/lock/src/Driver/RedisLock.php

@@ -52,12 +52,26 @@ public function acquire(): bool
         return $this->store->setNX($this->name, $this->owner) === true;
     }
 
+    /**
+     * Set the lock.
+     */
+    #[Override]
+    protected function set(): bool
+    {
+        if ($this->seconds > 0) {
+            return $this->store->set($this->name, $this->owner, ['EX' => $this->seconds]) == true;
+        }
+        return $this->store->setNX($this->name, $this->owner) === true;
+    }
+
+
     /**
      * Release the lock.
      */
     #[Override]
     public function release(): bool
     {
+        $this->isRun = false;
         return (bool) $this->store->eval(LuaScripts::releaseLock(), [$this->name, $this->owner], 1);
     }
 
@@ -67,6 +81,7 @@ public function release(): bool
     #[Override]
     public function forceRelease(): void
     {
+        $this->isRun = false;
         $this->store->del($this->name);
     }