Merge pull request #910 from Yurunsoft/fix-sse

Fix the SSE response data format
walkor · Apr 28, 2023 · 977822c · 977822c
2 parents 4462291 + f3eec6f
commit 977822c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/Protocols/Http/ServerSentEvents.php b/src/Protocols/Http/ServerSentEvents.php
@@ -55,15 +55,15 @@ public function __toString()
         if (isset($data['event'])) {
             $buffer .= "event: {$data['event']}\n";
         }
-        if (isset($data['data'])) {
-            $buffer .= 'data: ' . str_replace("\n", "\ndata: ", $data['data']) . "\n\n";
-        }
         if (isset($data['id'])) {
             $buffer .= "id: {$data['id']}\n";
         }
         if (isset($data['retry'])) {
             $buffer .= "retry: {$data['retry']}\n";
         }
-        return $buffer;
+        if (isset($data['data'])) {
+            $buffer .= 'data: ' . str_replace("\n", "\ndata: ", $data['data']) . "\n";
+        }
+        return $buffer . "\n";
     }
-}
+}
diff --git a/tests/Unit/Protocols/Http/ServerSentEventsTest.php b/tests/Unit/Protocols/Http/ServerSentEventsTest.php
@@ -10,6 +10,6 @@
         'retry' => 5000,
     ];
     $sse = new ServerSentEvents($data);
-    $expected = "event: {$data['event']}\ndata: {$data['data']}\n\nid: {$data['id']}\nretry: {$data['retry']}\n";
+    $expected = "event: {$data['event']}\nid: {$data['id']}\nretry: {$data['retry']}\ndata: {$data['data']}\n\n";
     expect((string)$sse)->toBe($expected);
-});
+});