update: 调整信息输出

Author: NHZEX

src/Server.php

@@ -8,9 +8,10 @@
 use Workerman\Protocols\WebsocketEx;
 use Workerman\Worker;
 use function func\call_wrap;
+use function func\format_byte;
 use function func\log;
-use function func\str_starts_with;
 use function sprintf;
+use function str_starts_with;
 use function zlib_decode;
 
 class Server
@@ -78,23 +79,31 @@ public function onRequest(TcpConnection $connection, Request $request)
 
         if ($contentType === 'application/x-compress') {
             $message = zlib_decode($request->rawBody());
+            $messageSize = sprintf('%s (compress: %s)', format_byte(strlen($message)), format_byte(strlen($request->rawBody())));
         } else {
             $message = $request->rawBody();
+            $messageSize = format_byte(strlen($message));
         }
 
         $response = new Response(200);
         $connection->send($response);
 
-        log(sprintf('receive[#%s] message: send %s byte to %s', $connection->id, strlen($message), $request->uri()));
-        $this->broadcast($message, $request->uri());
+        log(sprintf(
+            'receive[%s] message[#%s]: send %s to %s',
+            $connection->getRemoteIp(),
+            $connection->id,
+            $messageSize,
+            $request->uri()
+        ));
+        $this->broadcast($message, $request->uri(), $connection->id);
     }
 
     public function onHandshake(TcpConnection $connection, string $http_header)
     {
         $request_uri = $_SERVER['REQUEST_URI'];
         $this->broadcastBind[$request_uri][$connection->id] = $connection->id;
         $this->wsClient[$connection->id] = $request_uri;
-        log("ws client join：{$request_uri}[{$connection->id}]");
+        log("client join：{$request_uri}[{$connection->id}]");
 
         /** @var WebsocketEx $protocol */
         $protocol = $connection->protocol;
@@ -123,10 +132,10 @@ public function onWsClose (TcpConnection $connection) {
         log("ws client disconnect：{$request_uri}[{$connection->id}]");
     }
 
-    protected function broadcast (string $data, string $uri)
+    protected function broadcast (string $data, string $uri, int $cid)
     {
         $clients = $this->broadcastBind[$uri] ?? [];
-        log("broadcast message to {$uri}, count: " . count($clients));
+        log("broadcast message[#{$cid}] to {$uri}, count: " . count($clients));
         foreach ($clients as $id) {
             /** @var TcpConnection $conn */
             $conn = $this->websocket->connections[$id];

src/function.php

@@ -5,19 +5,31 @@
 use Closure;
 use Workerman\Worker;
 use function date;
-use function strlen;
-use function strncmp;
 
 function call_wrap(callable $call)
 {
     return Closure::fromCallable($call);
 }
 
-function str_starts_with(string $haystack, string $needle): bool
+/**
+ * @param int $byte
+ * @param int $dec
+ * @return string
+ */
+function format_byte (int $byte, int $dec = 2): string
 {
-    return (strlen($haystack) !== 0 && $haystack[0] === $needle[0])
-        ? strncmp($haystack, $needle, strlen($needle)) === 0
-        : false;
+    $units = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB']; //
+    $count = count($units) - 1;
+    $pos  = 0;
+
+    while ($byte >= 1024 && $pos < $count) {
+        $byte /= 1024;
+        $pos++;
+    }
+
+    $result = sprintf('%.2f', round($byte, $dec));
+
+    return "{$result}{$units[$pos]}";
 }
 
 function log(string $msg)