Fix download and update

Author: craigrileyuk

src/Actions/DownloadLatestReleaseAction.php

@@ -26,6 +26,7 @@ public function execute()
         $url = $releaseDetails['url'];
 
         $response = Http::accept('application/octet-stream')->withToken($this->key)->get($url);
+
         if ($response->successful() === true) {
             $disk = Install::getDisk();
             $disk->put($zipPath, $response->body());

src/Actions/GetLatestReleaseDetailsAction.php

@@ -4,6 +4,7 @@
 
 use AdminUI\AdminUIInstaller\Facades\Json;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
 
 class GetLatestReleaseDetailsAction
 {
@@ -27,6 +28,7 @@ public function execute()
             }
         });
 
+
         $releaseDetails = $response->json();
         Json::setField('releaseDetails', $releaseDetails);
 

src/Controllers/UpdateController.php

@@ -132,6 +132,9 @@ public function update(
         UpdateVersionEntryAction $versionAction
     ) {
         $log = [];
+        $log[] = "Running preliminary composer update";
+        // $composerAction->execute();
+
         $isMaintenance = App::isDownForMaintenance() === true;
         $validated = $request->validate([
             'url' => ['required', 'url'],
@@ -140,9 +143,12 @@ public function update(
         ]);
 
         try {
+            $log[] = "Running cleanup action";
             $cleanupAction->execute();
+            $log[] = "Downloading AdminUI package";
             $downloadAction->execute();
             $isValid = $validateDownloadAction->execute(checksum: $validated['shasum']);
+            $log[] = "Package valid: " . $isValid;
         } catch (\Exception $err) {
             return $this->sendFailed($err->getMessage(), $log);
         }

src/Services/JsonService.php

@@ -2,15 +2,18 @@
 
 namespace AdminUI\AdminUIInstaller\Services;
 
+use Illuminate\Contracts\Filesystem\Filesystem;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Contracts\Filesystem\Filesystem;
 
 class JsonService
 {
     protected string $file;
+
     protected Filesystem $disk;
 
+    protected ?array $cache = null;
+
     public function __construct()
     {
         $this->disk = Storage::disk('local');
@@ -20,6 +23,7 @@ public function __construct()
         if (file_exists($oldPath)) {
             $contents = file_get_contents($oldPath);
             $this->disk->put('adminui-installer/status.json', $contents);
+            unlink($oldPath);
         }
         $this->checkStatusFile();
     }
@@ -40,23 +44,40 @@ private function getDefault()
 
     public function get(): array
     {
+        if ($this->cache !== null) {
+            return $this->cache;
+        }
+
         try {
             $string = $this->disk->get($this->file);
         } catch (\Exception $e) {
-            return $this->getDefault();
+            return $this->cache = $this->getDefault();
         }
         if (empty($string)) {
-            return $this->getDefault();
+            return $this->cache = $this->getDefault();
         }
 
-        return json_decode($string, true);
+        return $this->cache = json_decode($string, true);
     }
 
     public function set(array|object $json): void
     {
-        $string = json_encode($json, JSON_PRETTY_PRINT);
-        $this->checkStatusFile();
-        $this->disk->put($this->file, $string);
+        $array = (array) $json;
+
+        $this->cache = $array;
+
+        $path = $this->disk->path($this->file);
+
+        $fp = fopen($path, 'c+');
+
+        if (flock($fp, LOCK_EX)) {
+            ftruncate($fp, 0);
+            fwrite($fp, json_encode($array, JSON_PRETTY_PRINT));
+            fflush($fp);
+            flock($fp, LOCK_UN);
+        }
+
+        fclose($fp);
     }
 
     public function getField(string $field): mixed
@@ -69,7 +90,7 @@ public function getField(string $field): mixed
     public function setField(string $field, mixed $data): void
     {
         $array = $this->get();
-        $array[$field] = $data;
+        $array = Arr::set($array, $field, $data);
         $this->set($array);
     }
 }