Auto update #449 (#545)

* Add custom repository type for updates * Direct to self update module * Formatting
nabeelio · Feb 10, 2020 · 99118da · 99118da
1 parent 3fcd378
commit 99118da
Show file tree

Hide file tree

Showing 14 changed files with 279 additions and 47 deletions.
diff --git a/app/Http/Controllers/Admin/MaintenanceController.php b/app/Http/Controllers/Admin/MaintenanceController.php
@@ -5,6 +5,7 @@
 use App\Contracts\Controller;
 use App\Repositories\KvpRepository;
 use App\Services\CronService;
+use App\Services\VersionService;
 use Codedge\Updater\UpdaterManager;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Artisan;
@@ -16,23 +17,26 @@ class MaintenanceController extends Controller
     private $cronSvc;
     private $kvpRepo;
     private $updateManager;
+    private $versionSvc;
 
     public function __construct(
         CronService $cronSvc,
         KvpRepository $kvpRepo,
-        UpdaterManager $updateManager
+        UpdaterManager $updateManager,
+        VersionService $versionSvc
     ) {
         $this->cronSvc = $cronSvc;
         $this->kvpRepo = $kvpRepo;
         $this->updateManager = $updateManager;
+        $this->versionSvc = $versionSvc;
     }
 
     public function index()
     {
         return view('admin.maintenance.index', [
             'cron_path'           => $this->cronSvc->getCronExecString(),
             'cron_problem_exists' => $this->cronSvc->cronProblemExists(),
-            'new_version'         => $this->kvpRepo->get('new_version_available', false),
+            'new_version'         => true, //$this->kvpRepo->get('new_version_available', false),
             'new_version_tag'     => $this->kvpRepo->get('latest_version_tag'),
         ]);
     }
@@ -71,26 +75,41 @@ public function cache(Request $request)
     }
 
     /**
-     * Update the phpVMS install
+     * Force an update check
      *
      * @param \Illuminate\Http\Request $request
      *
      * @return mixed
      */
-    public function update(Request $request)
+    public function forcecheck(Request $request)
     {
+        $this->versionSvc->isNewVersionAvailable();
+
         $new_version_avail = $this->kvpRepo->get('new_version_available', false);
+        $new_version_tag = $this->kvpRepo->get('latest_version_tag');
+
+        Log::info('Force check, available='.$new_version_avail.', tag='.$new_version_tag);
+
         if (!$new_version_avail) {
-            Flash::error('A newer version is not available!');
-            return redirect(route('admin.maintenance.index'));
+            Flash::success('No new version available');
+        } else {
+            Flash::success('New version available: '.$new_version_tag);
         }
 
+        return redirect(route('admin.maintenance.index'));
+    }
+
+    /**
+     * Update the phpVMS install
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return mixed
+     */
+    public function update(Request $request)
+    {
         $new_version_tag = $this->kvpRepo->get('latest_version_tag');
         Log::info('Attempting to update to '.$new_version_tag);
-
-        $this->updateManager->source()->update($new_version_tag);
-
-        Flash::success('phpVMS was updated!');
-        return redirect(route('/update'));
+        return redirect('/update/downloader');
     }
 }
diff --git a/app/Http/Routes/admin.php b/app/Http/Routes/admin.php
@@ -165,6 +165,10 @@ static function () {
             ->name('maintenance.update')
             ->middleware('ability:admin,maintenance');
 
+        Route::match(['post'], 'maintenance/forcecheck', 'MaintenanceController@forcecheck')
+            ->name('maintenance.forcecheck')
+            ->middleware('ability:admin,maintenance');
+
         // subfleet
         Route::get('subfleets/export', 'SubfleetController@export')
             ->name('subfleets.export')

diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
@@ -13,8 +13,6 @@
 use App\Notifications\EventHandler;
 use Codedge\Updater\Events\UpdateAvailable;
 use Codedge\Updater\Events\UpdateSucceeded;
-use Codedge\Updater\Listeners\SendUpdateAvailableNotification;
-use Codedge\Updater\Listeners\SendUpdateSucceededNotification;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
@@ -38,13 +36,8 @@ class EventServiceProvider extends ServiceProvider
             AwardListener::class,
         ],
 
-        UpdateAvailable::class => [
-            SendUpdateAvailableNotification::class,
-        ],
-
-        UpdateSucceeded::class => [
-            SendUpdateSucceededNotification::class,
-        ],
+        UpdateAvailable::class => [],
+        UpdateSucceeded::class => [],
 
     ];
 

diff --git a/app/Services/VersionService.php b/app/Services/VersionService.php
@@ -96,6 +96,7 @@ private function getLatestVersionGithub()
         foreach ($releases as $release) {
             if ($release['prerelease'] === true) {
                 if ($include_prerelease) {
+                    Log::info('Found latest pre-release of '.$release['tag_name']);
                     return $this->setLatestRelease(
                         $release['tag_name'],
                         $this->getGithubAsset($release)
@@ -104,6 +105,7 @@ private function getLatestVersionGithub()
                 continue;
             }
 
+            Log::info('Found latest release of '.$release['tag_name']);
             return $this->setLatestRelease(
                 $release['tag_name'],
                 $this->getGithubAsset($release)

diff --git a/app/Support/HttpClient.php b/app/Support/HttpClient.php
@@ -44,4 +44,21 @@ public function get($uri, array $opts = [])
 
         return $body;
     }
+
+    /**
+     * Download a file to a given path
+     *
+     * @param $uri
+     * @param $local_path
+     *
+     * @return string
+     */
+    public function download($uri, $local_path)
+    {
+        $response = $this->httpClient->request('GET', $uri, [
+            'sink' => $local_path,
+        ]);
+
+        return $response;
+    }
 }
diff --git a/config/app.php b/config/app.php
@@ -118,6 +118,7 @@
         'Session'      => Illuminate\Support\Facades\Session::class,
         'Storage'      => Illuminate\Support\Facades\Storage::class,
         'Theme'        => Igaster\LaravelTheme\Facades\Theme::class,
+        'Updater'      => Codedge\Updater\UpdaterFacade::class,
         'URL'          => Illuminate\Support\Facades\URL::class,
         'Utils'        => App\Facades\Utils::class,
         'Validator'    => Illuminate\Support\Facades\Validator::class,

diff --git a/config/phpvms.php b/config/phpvms.php
@@ -75,6 +75,11 @@
      */
     'version_file' => 'https://api.github.com/repos/nabeelio/phpvms/releases',
 
+    /**
+     * The URL to download the latest phpVMS version from
+     */
+    'distrib_url' => 'http://downloads.phpvms.net/phpvms-{VERSION}.zip',
+
     /*
      * Where the KVP file is stored
      */

diff --git a/config/self-update.php b/config/self-update.php
@@ -1,28 +1,28 @@
 <?php
 
 return [
-    'default'           => 'http',
-    'version_installed' => env('SELF_UPDATER_VERSION_INSTALLED', ''),
+    'default'           => 'vms',
+    'version_installed' => '',
 
     'repository_types' => [
         'github' => [
             'type'                 => 'github',
             'repository_vendor'    => 'nabeelio',
             'repository_name'      => 'phpvms',
             'repository_url'       => 'https://github.com/nabeelio/phpvms',
-            'download_path'        => env('SELF_UPDATER_DOWNLOAD_PATH', '/tmp'),
+            'download_path'        => storage_path('app'),
             'private_access_token' => '',
-            'use_branch'           => 'master',
-        ],
-        'http' => [
-            'type'                 => 'http',
-            'repository_url'       => 'http://downloads.phpvms.net',
-            'pkg_filename_format'  => 'phpvms-_VERSION_.zip',
-            'download_path'        => env('SELF_UPDATER_DOWNLOAD_PATH', '/tmp'),
-            'private_access_token' => env('SELF_UPDATER_HTTP_PRIVATE_ACCESS_TOKEN', ''),
+            'use_branch'           => '',
         ],
     ],
 
+    'mail_to' => [
+        'address'                  => 'no-reply@phpvms.net',
+        'name'                     => 'no name',
+        'subject_update_available' => 'Update available',
+        'subject_update_succeeded' => 'Update succeeded',
+    ],
+
     'exclude_folders' => [
         'node_modules',
         'bootstrap/cache',

diff --git a/modules/Updater/Http/Controllers/UpdateController.php b/modules/Updater/Http/Controllers/UpdateController.php
@@ -3,32 +3,42 @@
 namespace Modules\Updater\Http\Controllers;
 
 use App\Contracts\Controller;
+use App\Repositories\KvpRepository;
 use App\Services\Installer\InstallerService;
 use App\Services\Installer\MigrationService;
 use App\Services\Installer\SeederService;
+use Codedge\Updater\UpdaterManager;
 use function count;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 
 class UpdateController extends Controller
 {
     private $installerSvc;
+    private $kvpRepo;
     private $migrationSvc;
     private $seederSvc;
+    private $updateManager;
 
     /**
      * @param InstallerService $installerSvc
      * @param MigrationService $migrationSvc
      * @param SeederService    $seederSvc
+     * @param KvpRepository    $kvpRepo
+     * @param UpdaterManager   $updateManager
      */
     public function __construct(
         InstallerService $installerSvc,
+        KvpRepository $kvpRepo,
         MigrationService $migrationSvc,
-        SeederService $seederSvc
+        SeederService $seederSvc,
+        UpdaterManager $updateManager
     ) {
         $this->migrationSvc = $migrationSvc;
         $this->seederSvc = $seederSvc;
         $this->installerSvc = $installerSvc;
+        $this->kvpRepo = $kvpRepo;
+        $this->updateManager = $updateManager;
     }
 
     /**
@@ -94,4 +104,36 @@ public function complete(Request $request)
     {
         return redirect('/login');
     }
+
+    /**
+     * Show the update page with the latest version
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function updater(Request $request)
+    {
+        $version = $this->kvpRepo->get('latest_version_tag');
+
+        return view('updater::downloader/downloader', [
+            'version' => $version,
+        ]);
+    }
+
+    /**
+     * Download the actual update and then forward the user to the updater page
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return mixed
+     */
+    public function update_download(Request $request)
+    {
+        $version = $this->kvpRepo->get('latest_version_tag');
+        $this->updateManager->source('github')->update($version);
+
+        Log::info('Update completed to '.$version.', redirecting');
+        return redirect('/update');
+    }
 }