Prod config (#2)

* Windows deploy config
* Switch to openjdk11 and scala 2.12.7

Author: jendakol

.travis.yml

@@ -1,7 +1,7 @@
 language: scala
 scala:
-- 2.12.6
+- 2.12.7
 jdk:
-- oraclejdk8
+- oraclejdk11
 script: ./.travis.sh
 skip_cleanup: true

app/AppModule.scala

@@ -1,20 +1,23 @@
 import java.util.concurrent.Executors
 
 import com.avast.metrics.scalaapi.Monitor
-import com.typesafe.config._
 import com.typesafe.scalalogging.StrictLogging
 import lib._
 import monix.execution.Scheduler
 import monix.execution.schedulers.SchedulerService
 import net.codingwell.scalaguice.ScalaModule
+import play.api.{Configuration, Environment}
 import scalikejdbc._
 import scalikejdbc.config.DBs
-import utils.AllowedApiOrigins
+import utils.AllowedWsApiOrigins
 
 import scala.collection.JavaConverters._
 
-class AppModule extends ScalaModule with PropertiesConfiguration with StrictLogging {
-  private lazy val config = ConfigFactory.load()
+class AppModule(environment: Environment, configuration: Configuration)
+    extends ScalaModule
+    with PropertiesConfiguration
+    with StrictLogging {
+  private val config = configuration.underlying
 
   DBs.setupAll()
 
@@ -30,7 +33,7 @@ class AppModule extends ScalaModule with PropertiesConfiguration with StrictLogg
 
     val rootMonitor = Monitor.noOp()
 
-    bind[AllowedApiOrigins].toInstance(AllowedApiOrigins(config.getStringList("allowedWsApiOrigins").asScala))
+    bind[AllowedWsApiOrigins].toInstance(AllowedWsApiOrigins(config.getStringList("allowedWsApiOrigins").asScala))
 
     val cloudConnector = CloudConnector.fromConfig(config.getConfig("cloudConnector"))
     val dao = new Dao(executorService)

app/controllers/FrontController.scala

@@ -1,17 +1,14 @@
 package controllers
 
-import java.io.File
-
 import com.google.inject.Inject
-import com.typesafe.config.{Config, ConfigFactory}
 import lib.WebpackBuildFile
 import play.Environment
 import play.api.mvc._
+import utils.ConfigProperty
 
-class FrontController @Inject() (cc: ControllerComponents, env: Environment) extends AbstractController(cc){
-  val config: Config = ConfigFactory.parseFile(new File("conf/frontend.conf")).resolve()
-
+class FrontController @Inject()(cc: ControllerComponents, env: Environment, @ConfigProperty("webpack.port") port: Int)
+    extends AbstractController(cc) {
   def index = Action {
-    Ok(views.html.index.render(env, config.getInt("webpack.port"), WebpackBuildFile.jsBundle, WebpackBuildFile.cssBundle))
+    Ok(views.html.index.render(env, port, WebpackBuildFile.jsBundleName, WebpackBuildFile.cssBundleName))
   }
 }

app/controllers/SameOriginCheck.scala

@@ -2,12 +2,12 @@ package controllers
 
 import com.typesafe.scalalogging.StrictLogging
 import play.api.mvc.RequestHeader
-import utils.AllowedApiOrigins
+import utils.AllowedWsApiOrigins
 
 // imported from https://github.com/playframework/play-scala-websocket-example
 trait SameOriginCheck extends StrictLogging {
 
-  protected def allowedOrigins: AllowedApiOrigins
+  protected def allowedOrigins: AllowedWsApiOrigins
 
   /**
     * Checks that the WebSocket comes from the same origin.  This is necessary to protect

app/controllers/WsApiController.scala

@@ -18,13 +18,13 @@ import monix.eval.Task
 import play.api.libs.circe.Circe
 import play.api.libs.streams.ActorFlow
 import play.api.mvc._
-import utils.AllowedApiOrigins
+import utils.AllowedWsApiOrigins
 
 import scala.concurrent.Future
 import scala.util.Try
 
 @Singleton
-class WsApiController @Inject()(cc: ControllerComponents, protected override val allowedOrigins: AllowedApiOrigins)(
+class WsApiController @Inject()(cc: ControllerComponents, protected override val allowedOrigins: AllowedWsApiOrigins)(
     implicit system: ActorSystem,
     mat: Materializer)
     extends AbstractController(cc)

app/lib/WebpackBuildFile.scala

@@ -1,15 +1,56 @@
 package lib
 
-import java.io.File
+import java.net.URI
+import java.nio.file.{FileSystems, Files, Paths}
+import java.util
 
-object WebpackBuildFile {
-  private val d = new File("public/bundle")
-  val jsBundle: String = if (d.exists && d.isDirectory) {
-    d.listFiles.filter(_.isFile).toList.find(f => f.getName.contains("js.bundle.")).get.getName.replace(".gz", "")
-  } else ""
+import com.typesafe.scalalogging.StrictLogging
 
-  val cssBundle: String = if (d.exists && d.isDirectory) {
-    d.listFiles.filter(_.isFile).toList.find(f => f.getName.contains("style.bundle.")).get.getName.replace(".gz", "")
-  } else ""
+import scala.collection.JavaConverters._
+
+object WebpackBuildFile extends StrictLogging {
+
+  private val bundleDir = if (Files.exists(Paths.get("public", "bundle"))) {
+    Paths.get("public", "bundle")
+  } else {
+    val uri: URI = getClass.getClassLoader.getResource("public/bundle").toURI
+    logger.debug(s"Found bundle resources @ $uri")
+
+    val uriParts: Array[String] = uri.toString.split("!")
+    val fs = FileSystems.newFileSystem(URI.create(uriParts.head), new util.HashMap[String, Object]())
+    fs.getPath(uriParts(1))
+  }
+
+  logger.info(s"Locating built bundle at ${bundleDir.toUri}")
+
+  val jsBundleName: String = {
+    val packedFile = Files
+      .list(bundleDir)
+      .iterator()
+      .asScala
+      .filter(Files.isRegularFile(_))
+      .toList
+      .collectFirst {
+        case f if f.toString.contains("js.bundle.") && !f.toString.contains("gz") => f
+      }
+      .getOrElse(sys.error("Could not locate JS bundle"))
+
+    packedFile.getFileName.toString
+  }
+
+  val cssBundleName: String = {
+    val packedFile = Files
+      .list(bundleDir)
+      .iterator()
+      .asScala
+      .filter(Files.isRegularFile(_))
+      .toList
+      .collectFirst {
+        case f if f.toString.contains("style.bundle.") && !f.toString.contains("gz") => f
+      }
+      .getOrElse(sys.error("Could not locate styles bundle"))
+
+    packedFile.getFileName.toString
+  }
 
 }

app/utils/AllowedApiOrigins.scala

@@ -0,0 +1,3 @@
+package utils
+
+case class AllowedWsApiOrigins(values: Seq[String])

app/utils/AllowedWsApiOrigins.scala

@@ -1,10 +1,13 @@
+import java.io.{File, FileOutputStream}
+
 import com.typesafe.sbt.packager.MappingsHelper._
+import sbtassembly.MergeStrategy
 
 import scala.sys.process.Process
 
 lazy val Versions = new {
   val monix = "3.0.0-RC1"
-  val http4s = "0.18.15"
+  val http4s = "0.18.18"
   val scalikeJdbc = "3.3.1"
   val metricsVersion = "2.4.4"
 }
@@ -15,7 +18,7 @@ name := "rbackup-client"
 
 version := "0.1"
 
-scalaVersion := "2.12.6"
+scalaVersion := "2.12.7"
 
 lazy val `rbackup-client` = (project in file(".")).enablePlugins(PlayScala)
 
@@ -41,6 +44,15 @@ libraryDependencies ++= Seq(
   "org.scalatest" %% "scalatest" % "3.0.5" % "test"
 )
 
+libraryDependencies ~= {
+  //noinspection UnnecessaryPartialFunction
+  _ map {
+    case m =>
+      m.exclude("commons-logging", "commons-logging")
+        .exclude("com.typesafe.play", "sbt-link")
+  }
+}
+
 // Play framework hooks for development
 PlayKeys.playRunHooks += WebpackServer(file("./front"))
 
@@ -70,4 +82,10 @@ frontEndBuild := {
 
 frontEndBuild := (frontEndBuild dependsOn cleanFrontEndBuild).value
 
+sources in (Compile,doc) := Seq.empty
+publishArtifact in (Compile, packageDoc) := false
+
 dist := (dist dependsOn frontEndBuild).value
+
+PlayKeys.playDefaultPort := 3370
+PlayKeys.devSettings := Seq("play.server.http.port" -> "3370")

build.sbt

@@ -15,26 +15,32 @@ fileHandler {
   retries = 2
 }
 
-allowedWsApiOrigins = ["http://localhost:9000", "https://www.websocket.org"]
+allowedWsApiOrigins = ["http://localhost:3370"]
 
-play.filters.hosts {
-  # Allow requests to localhost:9000.
-  allowed=["localhost:9000","127.0.0.1:9000"]
+play.filters {
+  headers.contentSecurityPolicy = "font-src 'https://fonts.googleapis.com'; img-src 'self'; style-src 'self' https://use.fontawesome.com"
+
+  hosts {
+    allowed = ["localhost:3370", "127.0.0.1:3370", "localhost:3370", "127.0.0.1:3370"]
+  }
 }
 
-play.http.secret.key="%APPLICATION_SECRET%"
+play.http.secret.key = "%APPLICATION_SECRET%"
 
-play.i18n.langs=["cs"]
+play.i18n.langs = ["cs"]
 
-play.filters.enabled=[play.filters.hosts.AllowedHostsFilter]
+play.filters.enabled = [play.filters.hosts.AllowedHostsFilter]
 
 play.modules.enabled += "AppModule"
 
+webpack.port = 8080
+
+dbFilePath = "./filecache"
 
 # JDBC settings
 db.default.driver = "org.h2.Driver"
-db.default.url = "jdbc:h2:file:./filecache"
-db.default.user = "rbackup"
+db.default.url = "jdbc:h2:file:"${dbFilePath}
+db.default.username = "rbackup"
 db.default.password = "secretPass"
 
 # Connection Pool settings

conf/application.conf

@@ -3,5 +3,4 @@ html, body {
 }
 
 @import "variables.scss";
-@import "~bootstrap/scss/bootstrap.scss";
 @import "~vue-snotify/styles/material";

conf/reference.conf

@@ -16,7 +16,7 @@
             </div>
         </div>
 
-        <vue-snotify></vue-snotify>
+        <vue-snotify/>
     </v-app>
 
 </template>
@@ -34,7 +34,7 @@
         },
         data() {
             return {
-                hostUrl: "localhost:9000",
+                hostUrl: "localhost:3370",
                 clientStatus: null,
             }
         },

front/sass/style.scss

@@ -2,7 +2,7 @@ import Vue from 'vue';
 import App from './components/App.vue';
 import Vuetify from 'vuetify'
 import '../sass/style.scss';
-import Snotify, { SnotifyPosition } from 'vue-snotify'
+import Snotify, { SnotifyPosition } from 'vue-snotify/vue-snotify.min.js'
 
 const options = {
     toast: {

front/src/components/App.vue

@@ -0,0 +1,70 @@
+'use strict';
+
+const path = require('path');
+const webpack = require('webpack');
+const ExtractTextPlugin = require("extract-text-webpack-plugin");
+const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
+const CompressionPlugin = require('compression-webpack-plugin');
+
+module.exports = {
+    entry: path.resolve('./src/main.js'),
+    output: {
+        path: path.resolve('../public/bundle'),
+        filename: 'js.bundle.[hash].js'
+    },
+    module: {
+        rules: [
+            {
+                test: /\.js$/,
+                loader: 'babel-loader',
+                exclude: /node_modules/
+            },
+            {
+                test: /\.vue$/,
+                loader: 'vue-loader',
+                options: {
+                }
+            },
+            {
+                test:  /\.s[a|c]ss$/,
+                use: ExtractTextPlugin.extract({
+                    fallback: 'style-loader',
+                    use: ['css-loader', 'sass-loader']
+                })
+            },
+            {
+                test: /\.css$/,
+                use: [
+                    'style-loader',
+                    'css-loader'
+                ]
+            },
+            {
+                test: /\.(png|jpg|gif|svg)$/,
+                loader: 'file-loader',
+                options: {
+                    name: '[name].[ext]?[hash]'
+                }
+            }
+        ]
+    },
+    plugins:[
+        new webpack.DefinePlugin({
+            'process.env.NODE_ENV': JSON.stringify('production')
+        }),
+        new webpack.optimize.UglifyJsPlugin({
+            sourceMap: true
+        }),
+        new ExtractTextPlugin("style.bundle.[contentHash].css"),
+        new OptimizeCssAssetsPlugin({
+            cssProcessor: require('cssnano'),
+            cssProcessorOptions: { discardComments: {removeAll: true } }
+        }),
+        new CompressionPlugin({
+            asset: "[path].gz[query]",
+            test: /\.(js|css)$/,
+            minRatio: 0.8,
+            deleteOriginalAssets: false
+        })
+    ]
+};

front/src/main.js

@@ -3,3 +3,4 @@ logLevel := Level.Warn
 resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
 
 addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.17")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.8")

front/webpack.production.config.js

@@ -0,0 +1 @@
+-Xmx1024m