Fix sending buffered messages when reconnecting

Author: clue

.travis.yml

@@ -1,19 +1,17 @@
 language: php
 
 php:
+  - 5.3
   - 5.4
   - 5.5
   - 5.6
   - 7.0
   - 7.1
   - 7.2
   - 7.3
-  - 7.4
 
 # lock distro so new future defaults will not break the build
-dist: trusty
-
-sudo: false
+dist: precise
 
 install:
   - composer install --no-interaction

examples/01-simple-periodic.php

@@ -11,7 +11,7 @@
 
 $channel = new BufferedChannel();
 
-$http = new React\Http\Server($loop, function (ServerRequestInterface $request) use ($channel) {
+$http = new React\Http\Server($loop, function (ServerRequestInterface $request) use ($channel, $loop) {
     if ($request->getUri()->getPath() === '/') {
         return new Response(
             200,
@@ -26,9 +26,12 @@
 
     echo 'connected' . PHP_EOL;
 
-    $id = $request->getHeaderLine('Last-Event-ID');
     $stream = new ThroughStream();
-    $channel->connect($stream, $id);
+
+    $id = $request->getHeaderLine('Last-Event-ID');
+    $loop->futureTick(function () use ($channel, $stream, $id) {
+        $channel->connect($stream, $id);
+    });
 
     $stream->on('close', function () use ($stream, $channel) {
         echo 'disconnected' . PHP_EOL;

examples/02-plaintext-chat.php

@@ -27,19 +27,18 @@
 
     echo 'connected' . PHP_EOL;
 
-    $id = $request->getHeaderLine('Last-Event-ID');
-
     $stream = new ThroughStream();
 
+    $id = $request->getHeaderLine('Last-Event-ID');
+    $loop->futureTick(function () use ($channel, $stream, $id) {
+        $channel->connect($stream, $id);
+    });
+
     $stream->on('close', function () use ($stream, $channel) {
         echo 'disconnected' . PHP_EOL;
         $channel->disconnect($stream);
     });
 
-    $loop->futureTick(function () use ($channel, $stream, $id) {
-        $channel->connect($stream, $id);
-    });
-
     return new Response(
         200,
         array('Content-Type' => 'text/event-stream'),

examples/03-redis-subscribe.php

@@ -12,7 +12,7 @@
 
 $channel = new BufferedChannel();
 
-$http = new React\Http\Server($loop, function (ServerRequestInterface $request) use ($channel) {
+$http = new React\Http\Server($loop, function (ServerRequestInterface $request) use ($channel, $loop) {
     if ($request->getUri()->getPath() === '/') {
         return new Response(
             '200',
@@ -27,10 +27,12 @@
 
     echo 'connected' . PHP_EOL;
 
-    $id = $request->getHeaderLine('Last-Event-ID');
-
     $stream = new ThroughStream();
-    $channel->connect($stream, $id);
+
+    $id = $request->getHeaderLine('Last-Event-ID');
+    $loop->futureTick(function () use ($channel, $stream, $id) {
+        $channel->connect($stream, $id);
+    });
 
     $stream->on('close', function () use ($stream, $channel) {
         echo 'disconnected' . PHP_EOL;

examples/11-chat.php

@@ -11,9 +11,7 @@
 
 $channel = new BufferedChannel();
 
-$http = new React\Http\Server($loop, function (ServerRequestInterface $request) use ($channel) {
-    $stream = new ThroughStream();
-
+$http = new React\Http\Server($loop, function (ServerRequestInterface $request) use ($channel, $loop) {
     switch ($request->getUri()->getPath()) {
         case '/':
             return new Response(
@@ -39,9 +37,12 @@
                 array('Content-Type' => 'text/json')
             );
         case '/chat':
-            $id = $request->getHeaderLine('Last-Event-ID');
+            $stream = new ThroughStream();
 
-            $channel->connect($stream, $id);
+            $id = $request->getHeaderLine('Last-Event-ID');
+            $loop->futureTick(function () use ($channel, $stream, $id) {
+                $channel->connect($stream, $id);
+            });
 
             $serverParams = $request->getServerParams();
             $message = array('message' => 'New person connected from '. $serverParams['REMOTE_ADDR']);

src/BufferedChannel.php

@@ -2,7 +2,6 @@
 
 namespace Clue\React\Sse;
 
-use React\Stream\Stream;
 use React\Stream\WritableStreamInterface;
 
 /**

src/Encoder.php

@@ -5,13 +5,14 @@
 class Encoder
 {
     const EOL = "\n";
+
     /**
      * write a single message field name and value pair (should not include newlines)
      *
      * should not be be used to write data field (multiline contents)
      *
      * @param string $name
-     * @param value $value
+     * @param string $value
      * @return string
      */
     public function encodeField($name, $value)