From b224229c73c1229d5f02bf6563af3a8179bf99ca Mon Sep 17 00:00:00 2001 From: Inhere Date: Fri, 24 Aug 2018 10:46:50 +0800 Subject: [PATCH] fix: ws server push method param is error --- src/websocket-server/src/WebSocketServer.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/websocket-server/src/WebSocketServer.php b/src/websocket-server/src/WebSocketServer.php index d9ef45484..85554f0de 100644 --- a/src/websocket-server/src/WebSocketServer.php +++ b/src/websocket-server/src/WebSocketServer.php @@ -112,17 +112,21 @@ public function log(string $msg, array $data = [], string $type = 'info') /** * @param string $fd * @param string $data - * @param bool $isBinary + * @param int $opcode The data type. + * allow: + * WEBSOCKET_OPCODE_TEXT = 1 + * WEBSOCKET_OPCODE_BINARY = 2 + * WEBSOCKET_OPCODE_PING = 9 * @param bool $finish * @return bool */ - public function push(string $fd, string $data, $isBinary = false, bool $finish = true): bool + public function push(string $fd, string $data, int $opcode = 1, bool $finish = true): bool { if (!$this->server->exist($fd)) { return false; } - return $this->server->push($fd, $data, $isBinary, $finish); + return $this->server->push($fd, $data, $opcode, $finish); } /** @@ -164,11 +168,11 @@ public function send(string $data, $receivers = 0, $excluded = 0, int $sender = * @param int $sender 发送者 fd * @return int */ - public function sendTo(int $receiver, string $data, int $sender = 0): int + public function sendTo(int $receiver, string $data, int $sender = -1): int { $finish = true; $opcode = 1; - $fromUser = $sender < 1 ? 'SYSTEM' : $sender; + $fromUser = $sender < 0 ? 'SYSTEM' : $sender; $this->log("(private)The #{$fromUser} send message to the user #{$receiver}. Data: {$data}");