From e1be2ab4297ba7a84489c87799857d986086df3d Mon Sep 17 00:00:00 2001
From: Kae <80987908+Novaenia@users.noreply.github.com>
Date: Sat, 27 Jul 2024 20:04:34 +1000
Subject: [PATCH] finalize network improvements

can now disable zstd stream compression via config, peer-to-peer uses stream compression now, also made the server commands script a bit nicer
---
 .../opensb/servercommands/servercommands.lua  | 40 +++++++++++++------
 source/game/StarNetPacketSocket.cpp           |  1 +
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/assets/opensb/scripts/opensb/servercommands/servercommands.lua b/assets/opensb/scripts/opensb/servercommands/servercommands.lua
index ca30435..8df7928 100644
--- a/assets/opensb/scripts/opensb/servercommands/servercommands.lua
+++ b/assets/opensb/scripts/opensb/servercommands/servercommands.lua
@@ -3,41 +3,57 @@ local logHelp = "Available OpenStarbound server commands:\n"
 local userHelp = logHelp .. "^cyan;"
 local adminHelp = userHelp
 
-local function cmd(name, description, permission, func)
+local function cmd(meta, func)
   local first = next(commands) == nil
-  logHelp   =   logHelp .. (first and name or ", "       .. name)
-  userHelp  =  userHelp .. (first and name or ", ^cyan;" .. name)
-  adminHelp = adminHelp .. (first and name or ", ^cyan;" .. name)
+  local name        = meta.name
+  local description = meta.description
+  local permission  = meta.permission
+  if not meta.hidden then
+    logHelp   =   logHelp .. (first and name or ", "       .. name)
+    userHelp  =  userHelp .. (first and name or ", ^cyan;" .. name)
+    adminHelp = adminHelp .. (first and name or ", ^cyan;" .. name)
+  end
 
   local keyName = name:lower()
   if permission == "tell" then
-    commands[keyName] = function(connectionId, ...)
+    commands[keyName] = {meta = meta, func = function(connectionId, ...)
       return func(universe.isAdmin(connectionId), connectionId, ...)
-    end
+    end}
   elseif permission == "admin" then
-    commands[keyName] = function(connectionId, ...)
+    commands[keyName] = {meta = meta, func = function(connectionId, ...)
       local error = CommandProcessor.adminCheck(connectionId, description:sub(1, 1):lower() .. description:sub(2))
       if error then
         return error
       else
         return func(connectionId, ...)
       end
-    end
+    end}
   elseif permission == "user" then
-    commands[keyName] = func
+    commands[keyName] = {meta = meta, func = func}
   else
     error(string.format("Command '%s' has invalid permission", name))
   end
 end
 
-cmd("openhelp", "Get help", "tell", function(isAdmin, connectionId)
+cmd({
+  name = "openhelp",
+  description = "Get help",
+  permission = "tell"
+},
+function(isAdmin, connectionId)
   return isAdmin and adminHelp or userHelp
 end)
 
 do
 
 local objects = nil
-cmd("packetTest", "Do science", "admin", function(connectionId)
+cmd({
+  name = "packetTest",
+  description = "Do science",
+  permission = "admin",
+  hidden = true
+},
+function(connectionId)
   if not objects then
     objects = {}
     local paths = root.assetsByExtension("object")
@@ -69,7 +85,7 @@ function command(commandName, connectionId, args)
 
   local command = commands[commandName:lower()]
   if command then
-    local success, ret = pcall(command, connectionId, table.unpack(args))
+    local success, ret = pcall(command.func, connectionId, table.unpack(args))
     if not success then
       sb.logError("Error in OpenStarbound server command /%s: %s", commandName, ret)
       return "command error: " .. ret
diff --git a/source/game/StarNetPacketSocket.cpp b/source/game/StarNetPacketSocket.cpp
index 2dd6f92..4caeea0 100644
--- a/source/game/StarNetPacketSocket.cpp
+++ b/source/game/StarNetPacketSocket.cpp
@@ -467,6 +467,7 @@ bool P2PPacketSocket::writeData() {
   if (m_socket) {
     while (!m_outputMessages.empty()) {
       if (m_socket->sendMessage(m_outputMessages.first())) {
+        m_outgoingStats.mix(m_outputMessages.first().size());
         m_outputMessages.removeFirst();
         workDone = true;
       } else {