Add WebSocket Compression

README.md

@@ -1,7 +1,9 @@
 # SOCKO
 
+## This repository is not maintained or supported by Asana, and is not accepting patches
+
 Socko is an embedded [Scala](http://www.scala-lang.org/) web server powered by
-[Netty](http://netty.io/) networking and [Akka](http://akka.io/) processing.
+[Netty](http://netty.io/) networking and [Pekko](http://pekko.apache.org/) processing.
 
 **Please see our [web site](http://sockoweb.org/) for documentaiton and more information**
 
@@ -10,7 +12,7 @@ Socko is an embedded [Scala](http://www.scala-lang.org/) web server powered by
 ```scala
     object HelloApp extends Logger {
       //
-      // STEP #1 - Define Actors and Start Akka
+      // STEP #1 - Define Actors and Start Pekko
       // See `HelloHandler`
       //
       val actorSystem = ActorSystem("HelloExampleActorSystem")

build.sbt

@@ -0,0 +1,67 @@
+//
+// Socko Web Server build file
+//
+
+// import sbt.Project.Initialize
+// import sbtassembly.Plugin._
+// import AssemblyKeys._
+
+//
+// Build setup
+//
+
+//
+// Settings
+//
+val shared = Seq(
+  // Info
+  organization := "com.github.asana.socko-asana-fork",
+  version      := "0.8.0",
+  crossScalaVersions := Seq("2.12.17", "2.13.10"),
+
+  // Repositories
+  resolvers += "Typesafe Repository" at "https://repo.typesafe.com/typesafe/releases/",
+  resolvers += "Asana Maven" at "s3://asana-oss-cache/maven/release",
+  credentials += Credentials(Path.userHome / ".sbt" / ".credentials"),
+
+  Test / fork := true,
+)
+
+libraryDependencies ++= Seq(
+   "org.scala-lang" % "scala-reflect" % scalaVersion.value,
+)
+
+// Compile settings
+lazy val compileJdkSettings = Seq(
+  scalacOptions ++= Seq("-encoding", "UTF-8", "-deprecation", "-unchecked", "-opt:l:inline", "-opt-inline-from:**", "-feature", "-language:postfixOps"),
+  javacOptions ++= Seq("-Xlint:unchecked", "-Xlint:deprecation")
+)
+
+//
+// Projects
+//
+lazy val root = (project in file("."))
+  .settings(shared ++ compileJdkSettings ++ Seq(
+    publish / skip := true
+    )
+  ).aggregate(webserver)
+
+lazy val webserver = (project in file("socko-webserver"))
+  .settings(
+    shared ++ compileJdkSettings ++ Seq(
+      libraryDependencies ++= Dependencies.webserver ++ Seq(
+       "org.scala-lang" % "scala-reflect" % scalaVersion.value,
+      ),
+      licenses := List(
+          ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0"))
+        ),
+      homepage := Some(url("https://github.com/Asana/socko-asana-fork")),
+      publishMavenStyle := true,
+      publishTo := Some("Asana Maven" at "s3://asana-oss-cache/maven/release"),
+      Test / publishArtifact := false,
+    )
+  )
+
+
+
+

licenses/LICENSE.akka.txt → licenses/LICENSE.pekko.txt

@@ -1,8 +1,4 @@
-This software is licensed under the Apache 2 license, quoted below.
-
-Copyright 2009-2012 Typesafe Inc. [http://www.typesafe.com]
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
+Pekko is licensed under the Apache License, Version 2.0 (the "License"); you may not
 use this file except in compliance with the License. You may obtain a copy of
 the License at
 
@@ -13,8 +9,3 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 License for the specific language governing permissions and limitations under
 the License.
-
----------------
-
-Licenses for dependency projects can be found here:
-[http://akka.io/docs/akka/snapshot/project/licenses.html]

licenses/README.md

@@ -21,14 +21,14 @@ the License.
 Licenses for dependency projects
 ================================
 
-AKKA
+Pekko
 ----
-This product uses the Akka project:
+This product uses the Pekko project:
 
   * LICENSE FILE:
-    * LICENSE.akka.txt (Apache 2)
+    * LICENSE.pekko.txt (Apache 2)
   * HOMEPAGE:
-    * [http://akka.io/]
+    * [https://pekko.apache.org/]
 
 
 Netty

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.1
+sbt.version=1.9.6

project/dependencies.scala

@@ -0,0 +1,48 @@
+
+
+import sbt._
+
+import Dependencies._
+
+
+//
+// Dependencies
+//
+object Dependencies {
+  import Dependency._
+
+  val webserver = Seq(
+    Dependency.pekkoActor, Dependency.pekkoSlf4j, Dependency.pekkoTestKit,
+    Dependency.netty, Dependency.concurrentmap, Dependency.nextProtoNeg,
+    Dependency.logback, Dependency.scalatest
+  )
+
+  val buildtools = Seq(
+    Dependency.ant, Dependency.logback, Dependency.scalatest
+  )  
+
+  val rest = Seq(
+    Dependency.json4s, Dependency.logback, 
+    Dependency.scalatest, Dependency.pekkoTestKit
+  )  
+
+  val examples = Seq(
+    Dependency.logback
+  )  
+}
+
+object Dependency {
+  object V {
+    val Pekko        = "1.0.0"
+  }
+  val pekkoActor     = "org.apache.pekko"                       %% "pekko-actor"                  % V.Pekko
+  val pekkoSlf4j     = "org.apache.pekko"                       %% "pekko-slf4j"                  % V.Pekko
+  val pekkoTestKit   = "org.apache.pekko"                       %% "pekko-testkit"                % V.Pekko % "test"
+  val ant           = "org.apache.ant"                          % "ant"                          % "1.8.4"
+  val concurrentmap = "com.googlecode.concurrentlinkedhashmap"  % "concurrentlinkedhashmap-lru"  % "1.3.2"
+  val logback       = "ch.qos.logback"                          % "logback-classic"              % "1.2.3" % "runtime"
+  val netty         = "io.netty"                                % "netty-all"                    % "4.1.52.Final"
+  val nextProtoNeg  = "org.eclipse.jetty.npn"                   % "npn-api"                      % "1.1.0.v20120525"
+  val json4s        = "org.json4s"                              %% "json4s-native"               % "3.4.2"
+  val scalatest     = "org.scalatest"                           %% "scalatest"                   % "3.0.8" % "test"
+}

project/plugins.sbt

@@ -1,12 +1,15 @@
 
-resolvers += Resolver.url("artifactory", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases/"))(Resolver.ivyStylePatterns)
+// resolvers += Resolver.url("artifactory", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases/"))(Resolver.ivyStylePatterns)
+
+// resolvers += Resolver.sonatypeRepo("releases")
 
 // https://github.com/typesafehub/sbteclipse
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.3.0")
+// addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.3.0")
 
 // https://github.com/sbt/sbt-pgp
-addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.1")
+// addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.1")
 
 // https://github.com/sbt/sbt-assembly
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.9.2")
+// addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.9.2")
 
+addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.19.0")