package refactoring

build.sbt

@@ -2,7 +2,7 @@ name := "proxychain"
 
 organization := "com.karasiq"
 
-version := "1.3"
+version := "1.4"
 
 scalaVersion := "2.11.7"
 
@@ -12,7 +12,6 @@ libraryDependencies ++= Seq(
   "commons-io" % "commons-io" % "2.4",
   "org.apache.httpcomponents" % "httpclient" % "4.3.3",
   "com.typesafe.akka" %% "akka-actor" % "2.3.11",
-  "com.typesafe.akka" %% "akka-kernel" % "2.3.11",
   "com.karasiq" %% "cryptoutils" % "1.0",
   "com.karasiq" %% "proxyutils" % "1.0",
   "org.scalatest" %% "scalatest" % "2.2.4" % "test",
@@ -23,4 +22,10 @@ scalacOptions ++= Seq("-optimize", "-deprecation", "-feature")
 
 mainClass in Compile := Some("com.karasiq.proxychain.app.Boot")
 
-enablePlugins(AkkaAppPackaging)
+enablePlugins(JavaServerAppPackaging, LinuxPlugin)
+
+maintainer := "Karasiq <[email protected]>"
+
+packageSummary := "Proxychain"
+
+packageDescription := "Proxy-chaining SOCKS/HTTP/TLS proxy server"

project/build.properties

@@ -1 +1 @@
-sbt.version = 0.13.8
+sbt.version = 0.13.9

project/plugins.sbt

@@ -1,3 +1,3 @@
 logLevel := Level.Warn
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.5-M3")

setup/setup.iss

@@ -1,6 +1,6 @@
 #define OutputName "proxychain"
 #define MyAppName "Proxychain"
-#define MyAppVersion "1.3"
+#define MyAppVersion "1.4"
 #define MyAppPublisher "Karasiq, Inc."
 #define MyAppURL "http://www.github.com/Karasiq"
 #define MyAppExeName "bin\proxychain.bat"

src/main/scala/com/karasiq/proxychain/app/Boot.scala

@@ -6,45 +6,46 @@ import akka.actor.{ActorSystem, Props}
 import akka.event.Logging
 import akka.io.Tcp.Bind
 import akka.io.{IO, Tcp}
-import akka.kernel.Bootable
 import com.karasiq.fileutils.PathUtils._
 import com.karasiq.proxychain.AppConfig
 import com.karasiq.proxychain.script.ScriptEngine
 import com.typesafe.config.Config
 
-final class Boot extends Bootable {
+object Boot extends App {
   val configFile: Config = AppConfig.externalConfig()
   val actorSystem: ActorSystem = ActorSystem("ProxyChain", configFile.resolve())
 
-  override def startup(): Unit = {
-    val cfg = configFile.getConfig("proxyChain")
-    val host = cfg.getString("host")
+  val cfg = configFile.getConfig("proxyChain")
+  val host = cfg.getString("host")
 
-    val config: AppConfig = asPath(cfg.getString("script")) match {
-      case script if script.isRegularFile ⇒
-        actorSystem.log.debug("Loading script: {}", script)
-        val scriptEngine = new ScriptEngine(Logging.getLogger(actorSystem, "ScriptEngine"))
-        scriptEngine.asConfig(script)
+  val config: AppConfig = asPath(cfg.getString("script")) match {
+    case script if script.isRegularFile ⇒
+      actorSystem.log.debug("Loading script: {}", script)
+      val scriptEngine = new ScriptEngine(Logging.getLogger(actorSystem, "ScriptEngine"))
+      scriptEngine.asConfig(script)
 
-      case _ ⇒
-        AppConfig(cfg) // Default
-    }
-
-    // Start server
+    case _ ⇒
+      AppConfig(cfg) // Default
+  }
 
-    val port = cfg.getInt("port")
-    if (port != 0) {
-      val server = actorSystem.actorOf(Props(classOf[Server], config))
-      IO(Tcp)(actorSystem).tell(Bind(server, new InetSocketAddress(host, port)), server)
-    }
+  // Start server
 
-    val tlsPort = cfg.getInt("tls-port")
-    if (tlsPort != 0) {
-      val server = actorSystem.actorOf(Props(classOf[TLSServer], new InetSocketAddress(host, tlsPort), config))
-    }
+  val port = cfg.getInt("port")
+  if (port != 0) {
+    val server = actorSystem.actorOf(Props(classOf[Server], config))
+    IO(Tcp)(actorSystem).tell(Bind(server, new InetSocketAddress(host, port)), server)
   }
 
-  override def shutdown(): Unit = {
-    actorSystem.shutdown()
+  val tlsPort = cfg.getInt("tls-port")
+  if (tlsPort != 0) {
+    val server = actorSystem.actorOf(Props(classOf[TLSServer], new InetSocketAddress(host, tlsPort), config))
   }
+
+  Runtime.getRuntime.addShutdownHook(new Thread(new Runnable {
+    override def run(): Unit = {
+      actorSystem.log.debug("Shutting down ActorSystem")
+      actorSystem.shutdown()
+      actorSystem.awaitTermination()
+    }
+  }))
 }

src/main/scala/com/karasiq/proxychain/app/Server.scala

@@ -1,5 +1,6 @@
 package com.karasiq.proxychain.app
 
+import java.io.IOException
 import java.net.InetSocketAddress
 import java.nio.channels.{ServerSocketChannel, SocketChannel}
 import java.util.concurrent.Executors
@@ -49,8 +50,10 @@ class TLSServer(address: InetSocketAddress, cfg: AppConfig) extends Actor with A
     serverSocket.bind(address)
     acceptor.execute(new Runnable {
       override def run(): Unit = {
-        while (serverSocket.isOpen) {
-          self ! Accepted(serverSocket.accept())
+        control.Exception.ignoring(classOf[IOException]) {
+          while (serverSocket.isOpen) {
+            self ! Accepted(serverSocket.accept())
+          }
         }
       }
     })