Make update check more resilient to API being down (#2987)

NamelessMC · Aug 7, 2022 · 3726a17 · 3726a17
1 parent 46fd4b4
commit 3726a17
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/core/classes/Core/Util.php b/core/classes/Core/Util.php
@@ -237,7 +237,7 @@ public static function updateCheck() {
             return $update_check_response->getError();
         }
 
-        $update_check = new UpdateCheck($update_check_response->json(true));
+        $update_check = new UpdateCheck($update_check_response);
         if ($update_check->hasError()) {
             return $update_check->getErrorMessage();
         }

diff --git a/core/classes/DTO/UpdateCheck.php b/core/classes/DTO/UpdateCheck.php
@@ -9,18 +9,24 @@
  */
 class UpdateCheck {
 
-    private array $_response;
+    private ?string $_raw_response;
+    private ?array $_response;
 
-    public function __construct(array $response) {
-        $this->_response = $response;
+    public function __construct(HttpClient $update_check_response) {
+        $this->_raw_response = $update_check_response->contents();
+        $this->_response = json_decode($this->_raw_response, true);
     }
 
     public function hasError(): bool {
-        return !count($this->_response) || $this->_response['error'];
+        return $this->_response === null || !count($this->_response) || $this->_response['error'];
     }
 
     public function getErrorMessage(): string {
-        return $this->_response['message'] ?? 'Invalid response from server: ' . json_encode($this->_response);
+        if (isset($this->_response['message'])) {
+            return 'Error from server: ' . $this->_response['message'];
+        }
+
+         return 'Invalid response from server: ' . $this->_raw_response;
     }
 
     public function updateAvailable(): bool {