Support for sreamed output #13

roadrunner-php · Mar 21, 2022 · 6813452 · 6813452
2 parents 2c50b64 + 9767044
commit 6813452
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 12 deletions.
diff --git a/src/Frame.php b/src/Frame.php
@@ -11,6 +11,8 @@
  * @psalm-type FrameType = Frame::CONTROL | Frame::ERROR
  * @psalm-type FrameCodec = Frame::CODEC_*
  * @psalm-type FrameCodecValue = int-mask-of<FrameCodec>
+ * @psalm-type FrameByte10 = Frame::BYTE10_*
+ * @psalm-type FrameByte10Value = int-mask-of<FrameByte10>
  */
 final class Frame
 {
@@ -48,6 +50,15 @@ final class Frame
     public const CODEC_PROTO   = 0x80;
     /**#@-*/
 
+    /**#@+
+     * BYTE10 flags, it means, that we can set multiply flags from this group
+     * using bitwise OR.
+     *
+     * @var positive-int Flags for {@see $byte10}
+     */
+    public const BYTE10_STREAM = 0x01;
+    /**#@-*/
+
     /**
      * @var string|null
      */
@@ -58,15 +69,17 @@ final class Frame
      */
     public array $options = [];
 
+    public int $flags;
+
     /**
-     * @var int
+     * @psalm-var FrameByte10Value
      */
-    public int $flags;
+    public int $byte10 = 0;
+
+    public int $byte11 = 0;
 
     /**
-     * @param string|null $body
      * @param array<int> $options
-     * @param int $flags
      */
     public function __construct(?string $body, array $options = [], int $flags = 0)
     {
@@ -85,7 +98,7 @@ public function setFlag(int ...$flag): void
                 throw new InvalidArgumentException('Flags can be byte only');
             }
 
-            $this->flags = $this->flags | $f;
+            $this->flags |= $f;
         }
     }
 
@@ -117,17 +130,17 @@ public function setOptions(int ...$options): void
      */
     public static function packFrame(Frame $frame): string
     {
-        $header = pack(
+        $header = \pack(
             'CCL',
-            self::VERSION << 4 | (count($frame->options) + 3),
+            self::VERSION << 4 | (\count($frame->options) + 3),
             $frame->flags,
-            strlen((string)$frame->payload)
+            \strlen((string)$frame->payload)
         );
 
         if ($frame->options !== []) {
-            $header .= pack('LCCL*', crc32($header), 0, 0, ...$frame->options);
+            $header .= \pack('LCCL*', \crc32($header), $frame->byte10, $frame->byte11, ...$frame->options);
         } else {
-            $header .= pack('LCC', crc32($header), 0, 0);
+            $header .= \pack('LCC', \crc32($header), $frame->byte10, $frame->byte11);
         }
 
         return $header . (string)$frame->payload;
@@ -157,7 +170,7 @@ public static function readHeader(string $header): array
      */
     public static function initFrame(array $header, string $body): Frame
     {
-        assert(count($header) >= 2);
+        \assert(\count($header) >= 2);
 
         /**
          * optimize?

diff --git a/tests/Goridge/FrameTest.php b/tests/Goridge/FrameTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Goridge;
+
+use PHPUnit\Framework\TestCase;
+use Spiral\Goridge\Frame;
+
+class FrameTest extends TestCase
+{
+    public function testByte10DefaultValue(): void
+    {
+        $frame = new Frame('');
+        $this->assertSame(0, $frame->byte10);
+    }
+
+    public function testByte10DefaultValuePacked(): void
+    {
+        $string = Frame::packFrame(new Frame(''));
+        $this->assertSame(\chr(0), $string[10]);
+    }
+
+    public function testByte10StreamedOutputPacked(): void
+    {
+        $frame = new Frame('');
+        $frame->byte10 = Frame::BYTE10_STREAM;
+        $string = Frame::packFrame($frame);
+        $this->assertSame(Frame::BYTE10_STREAM, \ord($string[10]));
+    }
+}
diff --git a/tests/Goridge/MsgPackRPCTest.php b/tests/Goridge/MsgPackRPCTest.php
@@ -5,7 +5,6 @@
 namespace Spiral\Goridge\Tests;
 
 use Spiral\Goridge\RPC\Codec\MsgpackCodec;
-use Spiral\Goridge\RPC\Exception\CodecException;
 use Spiral\Goridge\RPC\Exception\ServiceException;
 use Spiral\Goridge\RPC\RPC;