check for update

Author: iWirk

app/Console/Commands/TestGrpc.php

@@ -3,7 +3,6 @@
 namespace App\Console\Commands;
 
 use Bridge\BridgeClient;
-use Bridge\GetVersionRequest;
 use Bridge\HelloRequest;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
@@ -70,14 +69,6 @@ public function handle(): int
             exit(1);
         }
         echo $response->getMessage() . PHP_EOL;
-
-        $request2 = new GetVersionRequest();
-        list($response2, $status2) = $client->GetVersion($request2)->wait();
-        if ($status2->code !== \Grpc\STATUS_OK) {
-            echo "ERROR: " . $status2->code . ", " . $status2->details . PHP_EOL;
-            exit(1);
-        }
-        echo $response2->getVersion() . PHP_EOL;
         return 0;
     }
 }

app/Http/Controllers/SettingsController.php

@@ -7,6 +7,7 @@
 use App\Services\Bridge\BridgeClientService;
 use App\Settings\VoiceSettings;
 use Exception;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Inertia\Response;
@@ -19,6 +20,8 @@ public function __construct()
         $this->middleware('can:settings-edit')->only(['edit']);
 
         $this->middleware('can:settings-edit_voice')->only(['updateVoice']);
+
+        $this->middleware('can:settings-cp_update_check')->only(['checkForCpUpdate']);
     }
 
     /**
@@ -34,7 +37,7 @@ public function edit(VoiceSettings $voiceSettings)
 
             $version = $bridgeClient->getControlPanelVersion();
         } catch (Exception $e) {
-            flash('BRIDGE ERROR: ', $e->getMessage(), 'error');
+            flash('BRIDGE ERROR', $e->getMessage(), 'error');
         }
 
 
@@ -51,12 +54,37 @@ public function edit(VoiceSettings $voiceSettings)
      * @param  EditSettings  $editor
      * @return RedirectResponse
      */
-   public function updateVoice(EditVoiceSettingsRequest $request, EditSettings $editor): RedirectResponse
-   {
+    public function updateVoice(EditVoiceSettingsRequest $request, EditSettings $editor): RedirectResponse
+    {
         $editor->editVoiceSettings($request->all());
 
         flash('Voice Settings', "Your voice settings has been successfully saved.")->success();
 
         return redirect()->back();
-   }
+    }
+
+    /**
+     * Check for control panel updates
+     *
+     * @return JsonResponse
+     */
+    public function checkForCpUpdate(): JsonResponse
+    {
+        $target = 'none';
+        try {
+            $bridgeClient = new BridgeClientService();
+
+            $target = $bridgeClient->checkForControlPanelUpdate();
+        } catch (Exception $e) {
+            flash('BRIDGE ERROR', $e->getMessage(), 'error');
+        }
+
+        if ($target === 'none') {
+            flash('A new version of the Control Panel is available.', $target, 'info');
+        }
+
+        return response()->json([
+            $target
+        ]);
+    }
 }

app/Services/Bridge/BridgeClientService.php

@@ -3,7 +3,8 @@
 namespace App\Services\Bridge;
 
 use Bridge\BridgeClient;
-use Bridge\GetVersionRequest;
+use Bridge\CheckForCpUpdateRequest;
+use Bridge\GetCpVersionRequest;
 use Exception;
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Support\Facades\Storage;
@@ -35,11 +36,24 @@ public function __construct()
      * @return string
      */
     public function getControlPanelVersion(): string {
-        $request = new GetVersionRequest();
-        list($response, $status) = $this->client->getVersion($request)->wait();
+        $request = new GetCpVersionRequest();
+        list($response, $status) = $this->client->getCpVersion($request)->wait();
         if ($status->code !== \Grpc\STATUS_OK) {
-            throw new Exception('Error while getting version:' . $status->code . ", " . $status->details . PHP_EOL);
+            throw new Exception('Error while getting version: ' . $status->code . ", " . $status->details . PHP_EOL);
         }
         return $response->getVersion();
     }
+
+    /**
+     * @throws Exception
+     * @return string
+     */
+    public function checkForControlPanelUpdate(): string {
+        $request = new CheckForCpUpdateRequest();
+        list($response, $status) = $this->client->CheckForCpUpdate($request)->wait();
+        if ($status->code !== \Grpc\STATUS_OK) {
+            throw new Exception('Error while checking for Control Panel update: ' . $status->code . ", " . $status->details . PHP_EOL);
+        }
+        return $response->getTarget();
+    }
 }

bridge/Bridge/BridgeClient.php

@@ -34,16 +34,30 @@ public function SayHello(\Bridge\HelloRequest $argument,
 
     /**
      * Get the current version of the control panel
-     * @param \Bridge\GetVersionRequest $argument input argument
+     * @param \Bridge\GetCpVersionRequest $argument input argument
      * @param array $metadata metadata
      * @param array $options call options
      * @return \Grpc\UnaryCall
      */
-    public function GetVersion(\Bridge\GetVersionRequest $argument,
+    public function GetCpVersion(\Bridge\GetCpVersionRequest $argument,
       $metadata = [], $options = []) {
-        return $this->_simpleRequest('/bridge.Bridge/GetVersion',
+        return $this->_simpleRequest('/bridge.Bridge/GetCpVersion',
         $argument,
-        ['\Bridge\GetVersionReply', 'decode'],
+        ['\Bridge\GetCpVersionReply', 'decode'],
+        $metadata, $options);
+    }
+
+    /**
+     * @param \Bridge\CheckForCpUpdateRequest $argument input argument
+     * @param array $metadata metadata
+     * @param array $options call options
+     * @return \Grpc\UnaryCall
+     */
+    public function CheckForCpUpdate(\Bridge\CheckForCpUpdateRequest $argument,
+      $metadata = [], $options = []) {
+        return $this->_simpleRequest('/bridge.Bridge/CheckForCpUpdate',
+        $argument,
+        ['\Bridge\CheckForCpUpdateReply', 'decode'],
         $metadata, $options);
     }
 

bridge/Bridge/BridgeStub.php

@@ -25,15 +25,29 @@ public function SayHello(
 
     /**
      * Get the current version of the control panel
-     * @param \Bridge\GetVersionRequest $request client request
+     * @param \Bridge\GetCpVersionRequest $request client request
      * @param \Grpc\ServerContext $context server request context
-     * @return \Bridge\GetVersionReply for response data, null if if error occured
+     * @return \Bridge\GetCpVersionReply for response data, null if if error occured
      *     initial metadata (if any) and status (if not ok) should be set to $context
      */
-    public function GetVersion(
-        \Bridge\GetVersionRequest $request,
+    public function GetCpVersion(
+        \Bridge\GetCpVersionRequest $request,
         \Grpc\ServerContext $context
-    ): ?\Bridge\GetVersionReply {
+    ): ?\Bridge\GetCpVersionReply {
+        $context->setStatus(\Grpc\Status::unimplemented());
+        return null;
+    }
+
+    /**
+     * @param \Bridge\CheckForCpUpdateRequest $request client request
+     * @param \Grpc\ServerContext $context server request context
+     * @return \Bridge\CheckForCpUpdateReply for response data, null if if error occured
+     *     initial metadata (if any) and status (if not ok) should be set to $context
+     */
+    public function CheckForCpUpdate(
+        \Bridge\CheckForCpUpdateRequest $request,
+        \Grpc\ServerContext $context
+    ): ?\Bridge\CheckForCpUpdateReply {
         $context->setStatus(\Grpc\Status::unimplemented());
         return null;
     }
@@ -52,10 +66,16 @@ public final function getMethodDescriptors(): array
                 '\Bridge\HelloRequest',
                 \Grpc\MethodDescriptor::UNARY_CALL
             ),
-            '/bridge.Bridge/GetVersion' => new \Grpc\MethodDescriptor(
+            '/bridge.Bridge/GetCpVersion' => new \Grpc\MethodDescriptor(
+                $this,
+                'GetCpVersion',
+                '\Bridge\GetCpVersionRequest',
+                \Grpc\MethodDescriptor::UNARY_CALL
+            ),
+            '/bridge.Bridge/CheckForCpUpdate' => new \Grpc\MethodDescriptor(
                 $this,
-                'GetVersion',
-                '\Bridge\GetVersionRequest',
+                'CheckForCpUpdate',
+                '\Bridge\CheckForCpUpdateRequest',
                 \Grpc\MethodDescriptor::UNARY_CALL
             ),
         ];

bridge/Bridge/CheckForCpUpdateReply.php

@@ -141,5 +141,9 @@
             'slug' => 'settings-edit_voice',
             'description' => 'a user can edit voice provider settings'
         ],
+        [
+            'slug' => 'settings-cp_update_check',
+            'description' => 'a user can check if an update of the control panel is available'
+        ],
     ]
 ];

bridge/Bridge/CheckForCpUpdateRequest.php

@@ -52,6 +52,7 @@ import Spinner from '@/Shared/Svgs/Spinner.vue'
 import CheckMarkSolid from '@/Shared/Svgs/CheckMarkSolid.vue'
 import CloudDownload from '@/Shared/Svgs/CloudDownload.vue'
 import InfoCircleSolid from '@/Shared/Svgs/InfoCircleSolid.vue'
+import axios from 'axios'
 
 @Component({
   components: {
@@ -77,11 +78,27 @@ export default class UpdateSettingsForm extends Mixins(Route) {
 
   newVersion: string = ''
 
-  checkingVersion: boolean = false
+  checkingVersion: boolean = true
 
   isUpToDate: boolean = false
 
   isUpdateAvailable: boolean = !(this.checkingVersion && this.isUpToDate)
+
+  mounted() {
+    this.checkForUpdate()
+  }
+
+  async checkForUpdate() {
+    const res = await axios.get(this.route('settings.update.check'))
+
+    if (res.data.target !== this.currentVersion && res.data.target !== 'none') {
+      this.newVersion = res.data.target
+    } else {
+      this.isUpToDate = true
+    }
+
+    this.checkingVersion = false
+  }
 }
 
 </script>

bridge/Bridge/GetVersionReply.php renamed to bridge/Bridge/GetCpVersionReply.php

@@ -47,4 +47,5 @@
     // Settings
     Route::get('settings/edit', [SettingsController::class, 'edit'])->name('settings.edit');
     Route::put('settings/voices', [SettingsController::class, 'updateVoice'])->name('settings.update.voice');
+    Route::get('settings/update', [SettingsController::class, 'checkForCpUpdate'])->name('settings.update.check');
 });