Update elephantio to latest version and use 'wait' instead of 'drain'

Gared · Nov 6, 2024 · 82ae18b · 82ae18b
1 parent f2baf74
commit 82ae18b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     "ext-json": "*",
     "guzzlehttp/guzzle": "^7.8",
     "symfony/console": "^6.4|^7.0",
-    "elephantio/elephant.io": "4.8.*"
+    "elephantio/elephant.io": "^4.8"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10"

diff --git a/composer.lock b/composer.lock
diff --git a/src/Service/ScannerService.php b/src/Service/ScannerService.php
@@ -376,12 +376,8 @@ private function doSocketWebsocket(
             'protocolVersion' => 2,
         ]);
 
-        $expirationTime = microtime(true) + 2;
-
-        while (microtime(true) < $expirationTime) {
-            usleep(10000);
-            $result = $socketIoClient->drain();
-            if ($result !== null && is_array($result->data)) {
+        while ($result = $socketIoClient->wait('message', 2)) {
+            if (is_array($result->data)) {
                 $accessStatus = $result->data['accessStatus'] ?? null;
                 if ($accessStatus === 'deny') {
                     $callback->onScanPadException(new EtherpadServiceNotPublicException('Pads are not publicly accessible'));