Updater WIP

Windows updating

Author: jendakol

app/AppModule.scala

@@ -58,9 +58,11 @@ class AppModule(environment: Environment, configuration: Configuration)
     bind[StateManager].toInstance(stateManager)
 
     bind[GithubConnector].toInstance {
-      new GithubConnector(Http1Client[Task]().runSyncUnsafe(Duration.Inf),
-                          Uri.unsafeFromString("http://localhost:80/releases.json"),
-                          AppVersion(0, 1, 0))
+      new GithubConnector(
+        Http1Client[Task]().runSyncUnsafe(Duration.Inf),
+        Uri.unsafeFromString(config.getString("updater.releasesUrl")),
+        AppVersion(config.getString("appVersion")).getOrElse(throw new IllegalArgumentException("Could not parse appVersion"))
+      )
     }
 
     bind[Monitor].annotatedWithName("FilesHandler").toInstance(rootMonitor.named("fileshandler"))

app/lib/StateManager.scala

@@ -56,7 +56,7 @@ class StateManager(deviceId: DeviceId, cloudConnector: CloudConnector, dao: Dao,
   }
 
   def downloadRemoteFilesList(implicit session: ServerSession): Result[Unit] = {
-    logger.debug("Downloading remote files list")
+    logger.info("Downloading remote files list")
 
     for {
       allFiles <- cloudConnector.listFiles(Some(deviceId)).subflatMap {

app/lib/db/Dao.scala

@@ -159,7 +159,7 @@ class Dao(executor: ExecutorService) extends StrictLogging {
 
   def deleteAllFiles(): Result[Unit] = EitherT {
     Task {
-      logger.info(s"Deleting all files")
+      logger.debug(s"Deleting all files")
 
       DB.autoCommit { implicit session =>
         sql"DELETE FROM files".executeUpdate().apply()

app/updater/GithubConnector.scala

@@ -9,7 +9,7 @@ import cats.syntax.all._
 import io.circe.Decoder
 import lib.App.Result
 import lib.AppException
-import lib.AppException.{FileException, InvalidResponseException, ParsingFailure}
+import lib.AppException._
 import monix.eval.Task
 import monix.execution.Scheduler
 import org.http4s.client.Client
@@ -42,7 +42,7 @@ class GithubConnector(httpClient: Client[Task], uri: Uri, appVersion: AppVersion
     EitherT {
       httpClient
         .get(asset.browserDownloadUrl) { resp =>
-          val file = File("./update")
+          val file = File.temporaryFile("rbackup", s"update-${asset.name}").get
 
           resp.body
             .through(fs2.io.writeOutputStreamAsync(Task {
@@ -66,8 +66,6 @@ object GithubConnector {
   import io.circe.parser._
   import utils.CirceImplicits._
 
-  final val ReleasesUrl = Uri.uri("https://github.com/jendakol/rbackup-scala-client/releases")
-
   def parse(str: String): Either[ParsingFailure, Seq[Release]] = {
     decode[Seq[Release]](str).leftMap(ParsingFailure(str, _))
   }

app/updater/ServiceUpdater.scala

@@ -1,22 +1,39 @@
 package updater
 
 import better.files.File
+import com.typesafe.scalalogging.StrictLogging
 
 import scala.language.postfixOps
-import scala.sys.process._
 
 sealed trait ServiceUpdater {
   def restartAndReplace(dirWithUpdate: File): Unit
 }
 
-class WindowsServiceUpdater extends ServiceUpdater {
+class WindowsServiceUpdater extends ServiceUpdater with StrictLogging {
   override def restartAndReplace(dirWithUpdate: File): Unit = {
-    "%COMPSPEC% /C /D \"scripts\\restart_replace.cmd\" Arg1 Arg2 Arg3" !
+    Runtime.getRuntime.exec(
+      Array(
+        "cmd",
+        "/C",
+        "start",
+        "\"\"",
+        "restart_replace.cmd",
+        dirWithUpdate.pathAsString
+      ))
+    ()
   }
 }
 
 class LinuxServiceUpdater extends ServiceUpdater {
   override def restartAndReplace(dirWithUpdate: File): Unit = {
-    "/bin/bash -c \"restart_replace.sh\"" !
+    Runtime.getRuntime.exec(
+      Array(
+        "/bin/bash",
+        "-c",
+        "restart_replace.sh",
+        dirWithUpdate.pathAsString,
+        "&",
+      ))
+    ()
   }
 }

app/updater/Updater.scala

@@ -1,8 +1,10 @@
 package updater
 
+import java.util.concurrent.atomic.AtomicBoolean
+
 import better.files.File
 import com.typesafe.scalalogging.StrictLogging
-import javax.inject.Inject
+import javax.inject.{Inject, Singleton}
 import lib.App._
 import lib.AppException.UpdateException
 import monix.execution.{Cancelable, Scheduler}
@@ -11,16 +13,21 @@ import updater.GithubConnector.Release
 import scala.concurrent.duration._
 import scala.util.control.NonFatal
 
+@Singleton
 class Updater @Inject()(connector: GithubConnector, serviceUpdater: ServiceUpdater)(implicit scheduler: Scheduler) extends StrictLogging {
+  private val updateRunning = new AtomicBoolean(false)
+
   def start: Cancelable = {
     logger.info("Started updates checker")
 
-    scheduler.scheduleAtFixedRate(10.seconds, 10.seconds) {
+    scheduler.scheduleAtFixedRate(1.seconds, 10.seconds) {
       connector.checkUpdate
         .flatMap {
           case Some(rel) =>
-            logger.debug(s"Found update: $rel")
-            updateApp(rel)
+            if (updateRunning.compareAndSet(false, true)) {
+              logger.debug(s"Found update: $rel")
+              updateApp(rel)
+            } else pureResult(())
 
           case None =>
             logger.debug("Didn't find update for current version")
@@ -29,10 +36,12 @@ class Updater @Inject()(connector: GithubConnector, serviceUpdater: ServiceUpdat
         .value
         .onErrorRecover {
           case e: java.net.ConnectException =>
+            updateRunning.set(false)
             logger.warn("Could not check for update", e)
             Left(UpdateException("Could not update the app", e))
 
           case NonFatal(e) =>
+            updateRunning.set(false)
             logger.warn("Unknown error while updating the app", e)
             Left(UpdateException("Could not update the app", e))
         }
@@ -41,10 +50,20 @@ class Updater @Inject()(connector: GithubConnector, serviceUpdater: ServiceUpdat
   }
 
   private def updateApp(release: Release): Result[Unit] = {
+    logger.info(s"Downloading update file for version ${release.tagName}")
+
     downloadUpdate(release).map { file =>
       val dirWithUpdate = file.unzipTo(File(s"update-${release.tagName}"))
+      // the data are in subfolder, move them up
+      dirWithUpdate.children.next().children.foreach { sub =>
+        logger.debug(s"Moving $sub to $dirWithUpdate")
+        sub.moveToDirectory(dirWithUpdate)
+      }
+
+      file.delete(true)
       logger.debug(s"Updater unzipped the update to $dirWithUpdate")
 
+      logger.info("Starting the update")
       serviceUpdater.restartAndReplace(dirWithUpdate)
     }
   }

conf/reference.conf

@@ -1,5 +1,7 @@
 // deviceId = "" // REQUIRED
 
+appVersion = "0.1.0"
+
 cloudConnectorDefaults {
   requestTimeout = 30 minutes
   socketTimeout = 30 seconds
@@ -15,6 +17,10 @@ fileHandler {
   retries = 2
 }
 
+updater {
+  releasesUrl = "https://github.com/jendakol/rbackup-scala-client/releases"
+}
+
 allowedWsApiOrigins = ["http://localhost:3370"]
 
 play.filters {

scripts/restart_replace.cmd

@@ -0,0 +1,31 @@
+echo Stopping the service...
+net stop rbackup-client
+del RUNNING_PID > NUL
+
+echo Updating files...
+
+if exist %1\conf (
+    rd /s /q conf.old > NUL 2>&1
+    move conf conf.old
+    move %1\conf conf
+) && ^
+if exist %1\lib (
+    rd /s /q lib.old > NUL 2>&1
+    move lib lib.old
+    move %1\lib lib
+) && ^
+if exist %1\public (
+    rd /s /q public.old > NUL 2>&1
+    move public public.old
+    move %1\public public
+) && ^
+if exist %1\restart_replace.cmd (
+    del restart_replace.cmd.old > NUL 2>&1
+    move restart_replace.cmd restart_replace.cmd.old
+    move %1\restart_replace.cmd restart_replace.cmd
+)
+
+echo Starting the service...
+
+net start rbackup-client && ^
+rd /s /q %1 > NUL 2>&1