Added debug log. Return result about websocket senderpushdisconnect. (#6648)

* Added debug log. Added return value about ws sender.

* Update CHANGELOG-3.1.md

---------

Co-authored-by: hzh <[email protected]>

Author: xuanyanwow

src/Sender.php

@@ -27,8 +27,8 @@
 use function Hyperf\Engine\swoole_get_flags_from_frame;
 
 /**
- * @method void push(int $fd, $data, int $opcode = null, $finish = null)
- * @method void disconnect(int $fd, int $code = null, string $reason = null)
+ * @method bool push(int $fd, $data, int $opcode = null, $finish = null)
+ * @method bool disconnect(int $fd, int $code = null, string $reason = null)
  */
 class Sender
 {
@@ -62,15 +62,22 @@ public function __call($name, $arguments)
                     $method = 'close';
                 }
 
-                $this->responses[$fd]->{$method}(...$arguments);
-                $this->logger->debug("[WebSocket] Worker send to #{$fd}");
+                $result = $this->responses[$fd]->{$method}(...$arguments);
+                $this->logger->debug(
+                    sprintf(
+                        "[WebSocket] Worker send to #{$fd}.Send %s",
+                        $result ? 'success' : 'failed'
+                    )
+                );
+                return $result;
             }
-            return;
+            return false;
         }
 
         if (! $this->proxy($fd, $method, $arguments)) {
             $this->sendPipeMessage($name, $arguments);
         }
+        return true;
     }
 
     public function pushFrame(int $fd, FrameInterface $frame): bool
@@ -97,8 +104,13 @@ public function proxy(int $fd, string $method, array $arguments): bool
         if ($result) {
             /** @var \Swoole\WebSocket\Server $server */
             $server = $this->getServer();
-            $server->{$method}(...$arguments);
-            $this->logger->debug("[WebSocket] Worker.{$this->workerId} send to #{$fd}");
+            $result = $server->{$method}(...$arguments);
+            $this->logger->debug(
+                sprintf(
+                    "[WebSocket] Worker.{$this->workerId} send to #{$fd}.Send %s",
+                    $result ? 'success' : 'failed'
+                )
+            );
         }
 
         return $result;

tests/SenderTest.php

@@ -16,6 +16,7 @@
 use Hyperf\Context\ApplicationContext;
 use Hyperf\Contract\ConfigInterface;
 use Hyperf\Contract\StdoutLoggerInterface;
+use Hyperf\Server\CoroutineServer;
 use Hyperf\WebSocketServer\Sender;
 use HyperfTest\ModelCache\Stub\StdoutLogger;
 use Mockery;
@@ -53,13 +54,44 @@ public function testSenderCheck()
         $this->assertTrue($sender->check(1));
     }
 
-    protected function getContainer()
+    public function testSenderResult()
+    {
+        $container = $this->getContainer([
+            'server' => [
+                'type' => CoroutineServer::class,
+            ],
+        ]);
+        $sender = new Sender($container);
+        $sender->setResponse(1, new class (){
+            public function push($data)
+            {
+                return true;
+            }
+
+            public function close()
+            {
+                return true;
+            }
+        });
+
+        $res = $sender->push(1, 'data');
+        $this->assertTrue($res);
+        $res = $sender->disconnect(1);
+        $this->assertTrue($res);
+
+        $res = $sender->push(2, 'data');
+        $this->assertFalse($res);
+        $res = $sender->disconnect(2);
+        $this->assertFalse($res);
+    }
+
+    protected function getContainer(array $config = [])
     {
         $container = Mockery::mock(ContainerInterface::class);
         ApplicationContext::setContainer($container);
 
         $container->shouldReceive('get')->with(StdoutLoggerInterface::class)->andReturn(new StdoutLogger());
-        $container->shouldReceive('get')->with(ConfigInterface::class)->andReturn(new Config([]));
+        $container->shouldReceive('get')->with(ConfigInterface::class)->andReturn(new Config($config));
 
         return $container;
     }