fix ack payload rendering

src/Message/Ack.php

@@ -7,13 +7,10 @@
 class Ack extends Prototype
 {
     public string $subject;
-    public string $command = '+ACK';
-
-    public ?Payload $payload = null;
 
     public function render(): string
     {
-        $payload = ($this->payload ?: Payload::parse(''))->render();
-        return "PUB $this->subject $this->command $payload";
+        $payload = Payload::parse('')->render();
+        return "PUB $this->subject  $payload";
     }
 }

src/Message/Msg.php

@@ -77,12 +77,9 @@ public function getClient(): ?Client
 
     public function nack(float $delay = 0): void
     {
-        $this->reply(new Ack([
-            'command' => '-NAK',
+        $this->reply(new Nak([
             'subject' => $this->replyTo,
-            'payload' => Payload::parse([
-                'delay' => $delay,
-            ]),
+            'delay' => $delay,
         ]));
     }
 
@@ -125,8 +122,7 @@ public function parse($payload): self
 
     public function progress(): void
     {
-        $this->reply(new Ack([
-            'command' => '+WPI',
+        $this->reply(new Progress([
             'subject' => $this->replyTo,
         ]));
     }

src/Message/Nak.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Basis\Nats\Message;
+
+class Nak extends Prototype
+{
+    public string $subject;
+    public float $delay;
+
+    public function render(): string
+    {
+        $data = ['-NAK'];
+        if (isset($this->delay) && $this->delay > 0) {
+            $data[] = json_encode(['delay' => $this->delay * 10 ** 9]);
+        }
+        $payload = Payload::parse(implode(' ', $data))->render();
+        return "PUB $this->subject  $payload";
+    }
+}

src/Message/Progress.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Basis\Nats\Message;
+
+class Progress extends Prototype
+{
+    public string $subject;
+
+    public function render(): string
+    {
+        $payload = Payload::parse('+WPI')->render();
+        return "PUB $this->subject  $payload";
+    }
+}

tests/Functional/StreamTest.php

@@ -44,7 +44,7 @@ public function testNack()
         $message = $queue->fetch();
         $this->assertNotNull($message);
         $this->assertSame((string) $message->payload, 'first');
-        $message->nack(1);
+        $message->nack(30);
 
         $this->assertSame(1, $consumer->info()->num_ack_pending);
         $this->assertSame(1, $consumer->info()->num_pending);

tests/Unit/Message/AckTest.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Tests\Unit\Message;
+
+use Basis\Nats\Message\Ack;
+use Tests\TestCase;
+
+class AckTest extends TestCase
+{
+    public function testAck()
+    {
+        $ack = new Ack([
+            'subject' => '$JS.ACK.stream.consumer.1.3.18.1719992702186105579.0'
+        ]);
+
+        $this->assertEquals("PUB \$JS.ACK.stream.consumer.1.3.18.1719992702186105579.0  0\r\n", $ack->render());
+    }
+
+}

tests/Unit/Message/NakTest.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Tests\Unit\Message;
+
+use Basis\Nats\Message\Nak;
+use Tests\TestCase;
+
+class NakTest extends TestCase
+{
+    public function testNak()
+    {
+        $nak = new Nak([
+            'subject' => '$JS.ACK.stream.consumer.1.3.18.1719992702186105579.0'
+        ]);
+
+        $this->assertEquals("PUB \$JS.ACK.stream.consumer.1.3.18.1719992702186105579.0  4\r\n-NAK", $nak->render());
+    }
+
+    public function testNakDelay()
+    {
+        $nak = new Nak([
+            'subject' => '$JS.ACK.stream.consumer.1.3.18.1719992702186105579.0',
+            'delay' => 10
+        ]);
+
+        $this->assertEquals("PUB \$JS.ACK.stream.consumer.1.3.18.1719992702186105579.0  26\r\n-NAK {\"delay\":10000000000}", $nak->render());
+    }
+
+    public function testNakFloatDelay()
+    {
+        $nak = new Nak([
+            'subject' => '$JS.ACK.stream.consumer.1.3.18.1719992702186105579.0',
+            'delay' => 1.1
+        ]);
+
+        $this->assertEquals("PUB \$JS.ACK.stream.consumer.1.3.18.1719992702186105579.0  25\r\n-NAK {\"delay\":1100000000}", $nak->render());
+    }
+    public function testNakZeroDelay()
+    {
+        $nak = new Nak([
+            'subject' => '$JS.ACK.stream.consumer.1.3.18.1719992702186105579.0',
+            'delay' => 0
+        ]);
+
+        $this->assertEquals("PUB \$JS.ACK.stream.consumer.1.3.18.1719992702186105579.0  4\r\n-NAK", $nak->render());
+    }
+}

tests/Unit/Message/ProgressTest.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Tests\Unit\Message;
+
+use Basis\Nats\Message\Progress;
+use Tests\TestCase;
+
+class ProgressTest extends TestCase
+{
+    public function testProgress()
+    {
+        $progress = new Progress([
+            'subject' => '$JS.ACK.stream.consumer.1.3.18.1719992702186105579.0'
+        ]);
+
+        $this->assertEquals("PUB \$JS.ACK.stream.consumer.1.3.18.1719992702186105579.0  4\r\n+WPI", $progress->render());
+    }
+
+}