Allow Ratchet/RFC6455 0.3

Author: mbonneau

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 2.1.4
+
+- Allow Ratchet/RFC6455 0.3
+
+# 2.1.3
+
+- Forward compatibility with voryx/event-loop 3.0 while supporting 2.0
+
 # 2.1.2
 
 - Update deps

composer.json

@@ -40,7 +40,7 @@
         "react/http": "^0.7.3 | ^0.8",
         "react/http-client": "^0.5.3",
         "voryx/event-loop": "^3.0 || ^2.0.2",
-        "ratchet/rfc6455": "^0.2.2",
+        "ratchet/rfc6455": "^0.2.2 || ^0.3",
         "reactivex/rxphp": "^2.0.1"
     },
     "require-dev": {

test/TestCase.php

@@ -7,7 +7,7 @@
 
 class TestCase extends FunctionalTestCase
 {
-    public function setup()
+    public function setup(): void
     {
         parent::setup();
 
@@ -29,4 +29,4 @@ public static function resetScheduler()
             $prop->setAccessible(false);
         }
     }
-}
+}

test/ab/clientRunner.php

@@ -12,7 +12,26 @@
     $reportUrl = "ws://127.0.0.1:9001/updateReports?agent=" . AGENT . "&shutdownOnComplete=true";
     $client    = new \Rx\Websocket\Client($reportUrl);
 
-    $client->subscribe();
+    $client->subscribe(
+        function (\Rx\Websocket\MessageSubject $messages) {
+            echo "Report runner connected.\n";
+            $messages->subscribe(new \Rx\Observer\CallbackObserver(
+                                     function ($x) use ($messages) {
+                                         echo "Message received by report runner connection: " . $x . "\n";;
+                                     },
+                                     [$messages, "onError"],
+                                     [$messages, "onCompleted"]
+                                 ));
+        },
+        function (Throwable $error) {
+            echo "Error on report runner connection:" . $error->getMessage() . "\n";
+            echo "Seeing an error here might be normal. Network trace shows that AB fuzzingserver\n";
+            echo "disconnects without sending an HTTP response.\n";
+        },
+        function () {
+            echo "Report runner connection completed.\n";
+        }
+    );
 };
 
 $runIndividualTest = function ($case, $timeout = 60000) {

test/ab/docker_bootstrap.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -x
+
+echo "Running $0"
+
+echo Adding "$1 host.ratchet.internal" to /etc/hosts file
+
+echo $1 host.ratchet.internal >> /etc/hosts
+
+echo /etc/hosts contains:
+cat /etc/hosts
+echo

test/ab/fuzzingclient.json

@@ -4,7 +4,7 @@
 
    "servers": [
                 {"agent": "RxWebsocketServer/0.0.0",
-                 "url": "ws://localhost:9001",
+                 "url": "ws://host.ratchet.internal:9001",
                  "options": {"version": 18}}
               ],
    "cases": ["*"],

test/ab/run_ab_tests.sh

@@ -1,12 +1,52 @@
-cd test/ab
+cd test/ab || exit
 
-wstest -m fuzzingserver -s fuzzingserver.json &
+docker run --rm \
+    -d \
+    -v ${PWD}:/config \
+    -v ${PWD}/reports:/reports \
+    -p 9001:9001 \
+    --name fuzzingserver \
+    crossbario/autobahn-testsuite wstest -m fuzzingserver -s /config/fuzzingserver.json
 sleep 5
-php clientRunner.php
+
+php -d memory_limit=256M clientRunner.php
+
+docker ps -a
+
+docker logs fuzzingserver
+
+docker stop fuzzingserver
 
 sleep 2
 
-php testServer.php 600 &
+
+php -d memory_limit=256M testServer.php &
+SERVER_PID=$!
 sleep 3
-wstest -m fuzzingclient -s fuzzingclient.json
-sleep 12
+
+if [ "$OSTYPE" = "linux-gnu" ]; then
+  IPADDR=`hostname -I | cut -f 1 -d ' '`
+else
+  IPADDR=`ifconfig | grep "inet " | grep -Fv 127.0.0.1 | awk '{print $2}' | head -1 | tr -d 'adr:'`
+fi
+
+docker run --rm \
+    -it \
+    -v ${PWD}:/config \
+    -v ${PWD}/reports:/reports \
+    --name fuzzingclient \
+    crossbario/autobahn-testsuite /bin/sh -c "sh /config/docker_bootstrap.sh $IPADDR; wstest -m fuzzingclient -s /config/fuzzingclient.json"
+sleep 1
+
+kill $SERVER_PID
+
+#wstest -m fuzzingserver -s fuzzingserver.json &
+#sleep 5
+#php clientRunner.php
+#
+#sleep 2
+
+#php testServer.php 600 &
+#sleep 3
+#wstest -m fuzzingclient -s fuzzingclient.json
+#sleep 12

test/ab/testServer.php

@@ -11,7 +11,7 @@
     $timerObservable = Observable::timer(1000 * $argv[1]);
 }
 
-$server = new \Rx\Websocket\Server("tcp://127.0.0.1:9001", true);
+$server = new \Rx\Websocket\Server("tcp://0.0.0.0:9001", true);
 
 $server
     ->takeUntil($timerObservable)