remove new

schlawg · Dec 31, 2023 · 61cfe67 · 61cfe67
1 parent c832d40
commit 61cfe67
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/main/scala/netty/FrameHandler.scala b/src/main/scala/netty/FrameHandler.scala
@@ -25,9 +25,7 @@ final private class FrameHandler(connector: ActorChannelConnector)(using Executo
         if txt.nonEmpty then
           val endpoint = ctx.channel.attr(key.endpoint).get
           if endpoint != null && !endpoint.rateLimit(txt) then
-            ctx.channel
-              .writeAndFlush(new CloseWebSocketFrame(1008, "rate limit exceeded"))
-              .addListener(_ => ctx.channel.close())
+            shutdown(ctx.channel, 1008, "rate limit exceeded")
           else
             ClientOut parse txt foreach:
 
@@ -37,25 +35,35 @@ final private class FrameHandler(connector: ActorChannelConnector)(using Executo
               case ClientOut.Unexpected(msg) =>
                 Monitor.clientOutUnexpected.increment()
                 logger.info(s"Unexpected $msg")
+                shutdown(ctx.channel, 1011, "unexpected message")
 
               case ClientOut.WrongHole =>
                 Monitor.clientOutWrongHole.increment()
+              // choice of hole is a personal decision
 
               case out => withClientOf(ctx.channel)(_ tell out)
+
       case frame: PongWebSocketFrame =>
         val lagMillis = (System.currentTimeMillis() - frame.content().getLong(0)).toInt
         val pong      = ClientOut.RoundPongFrame(lagMillis)
         Option(ctx.channel.attr(key.client).get) foreach { _.value foreach { _ foreach (_ ! pong) } }
+
       case frame =>
         logger.info("unsupported frame type: " + frame.getClass.getName)
+        shutdown(ctx.channel, 1003, s"${frame.getClass.getName} unsupported")
 
   private def withClientOf(channel: Channel)(f: Client => Unit): Unit =
     Option(channel.attr(key.client).get) match
       case Some(clientFu) =>
         clientFu.value match
           case Some(client) => client foreach f
           case None         => clientFu foreach f
-      case None => logger.warn(s"No client actor on channel $channel")
+      case None =>
+        logger.warn(s"No client actor on channel $channel")
+        shutdown(channel, 1011, s"no actor on $channel")
+
+  private def shutdown(channel: Channel, code: Int, reason: String): Unit =
+    channel.writeAndFlush(CloseWebSocketFrame(code, reason)).addListener(_ => channel.close())
 
 private object FrameHandler:
 

diff --git a/src/main/scala/util/RateLimit.scala b/src/main/scala/util/RateLimit.scala
@@ -16,7 +16,8 @@ final class RateLimit(
   private var logged: Boolean = false
 
   def apply(msg: => String = ""): Boolean =
-    if credits > 0 then
+    if msg == "null" then true
+    else if credits > 0 then
       credits -= 1
       true
     else if clearAt < nowMillis then