Mutex

craftcms · Nov 20, 2023 · be22e05 · be22e05
1 parent 095f43e
commit be22e05
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 8 deletions.
diff --git a/src/Helper.php b/src/Helper.php
@@ -11,7 +11,6 @@
 use craft\db\Table;
 use craft\helpers\App;
 use craft\helpers\ConfigHelper;
-use craft\mutex\Mutex;
 use craft\queue\Queue as CraftQueue;
 use yii\web\DbSession;
 

diff --git a/src/Module.php b/src/Module.php
@@ -23,12 +23,12 @@
 use craft\services\ImageTransforms;
 use craft\utilities\ClearCaches;
 use craft\web\Application as WebApplication;
-use craft\web\Response;
+use craft\web\Response as WebResponse;
 use craft\web\twig\variables\CraftVariable;
 use craft\web\View;
 use Illuminate\Support\Collection;
 use yii\base\InvalidConfigException;
-use yii\web\Response as YiiResponse;
+use yii\web\Response as YiiWebResponse;
 
 /**
  * @property-read Config $config
@@ -197,6 +197,13 @@ protected function bootstrapCloud(ConsoleApplication|WebApplication $app): void
             ],
         );
 
+        Event::on(
+            WebResponse::class,
+            YiiWebResponse::EVENT_BEFORE_SEND,
+            [$this->get('mutex'), 'handleBeforeSend'],
+        );
+
+
         $this->setComponents([
             'staticCaching' => StaticCaching::class,
         ]);
@@ -226,8 +233,8 @@ protected function bootstrapCloud(ConsoleApplication|WebApplication $app): void
         );
 
         Event::on(
-            Response::class,
-            YiiResponse::EVENT_BEFORE_SEND,
+            WebResponse::class,
+            YiiWebResponse::EVENT_BEFORE_SEND,
             [$this->get('staticCaching'), 'handleBeforeSend'],
         );
     }

diff --git a/src/Mutex.php b/src/Mutex.php
@@ -5,6 +5,7 @@
 use Craft;
 use craft\mutex\MutexTrait;
 use GuzzleHttp\Exception\RequestException;
+use Illuminate\Support\Collection;
 use yii\base\Exception;
 
 class Mutex extends \yii\mutex\Mutex
@@ -25,7 +26,7 @@ protected function acquireLock($name, $timeout = 0): bool
 
             try {
                 Craft::createGuzzleClient()
-                    ->request('HEAD', $url, [
+                    ->request('HEAD', (string) $url, [
                         'headers' => [
                             HeaderEnum::MUTEX_ACQUIRE_LOCK->value => $name,
                         ],
@@ -60,11 +61,13 @@ protected function releaseLock($name): bool
 
             try {
                 Craft::createGuzzleClient()
-                    ->request('HEAD', $url, [
+                    ->request('HEAD', (string) $url, [
                         'headers' => [
                             HeaderEnum::MUTEX_RELEASE_LOCK->value => $name,
                         ],
                     ]);
+
+                return true;
             } catch (RequestException $e) {
                 Craft::error('Unable to release mutex lock: ' . $e->getMessage());
 
@@ -78,4 +81,24 @@ protected function releaseLock($name): bool
 
         return true;
     }
+
+    public function handleBeforeSend(): void
+    {
+        $headers = Collection::make(Craft::$app->getRequest()->getHeaders())
+            ->only([
+                HeaderEnum::MUTEX_ACQUIRE_LOCK->value,
+                HeaderEnum::MUTEX_RELEASE_LOCK->value,
+            ]);
+
+        if ($headers->isNotEmpty()) {
+            Craft::$app->getResponse()->setNoCacheHeaders();
+        }
+
+        $headers->each(function($value, $key) {
+            Craft::$app->getResponse()->getHeaders()->setDefault(
+                $key,
+                $value,
+            );
+        });
+    }
 }
diff --git a/src/StaticCaching.php b/src/StaticCaching.php
@@ -99,7 +99,7 @@ public function purgeAll(): void
             // TODO: should this hit a ping/healthcheck controller instead?
             // TODO: send authorization header
             Craft::createGuzzleClient()
-                ->request('HEAD', $url, [
+                ->request('HEAD', (string) $url, [
                     'headers' => [
                         HeaderEnum::CACHE_PURGE->value => '*',
                     ],