Updated README.md

Author: Devristo

README.md

@@ -24,7 +24,6 @@ Client
 
 Known Issues
 -------------
-  * SSL support not well field tested.
   * Lacks ORIGIN checking (can be implemented manually in onConnect using getHeaders(), just disconnect the user when you dont like the Origin header)
   * No support for extension data from the HyBi specs.
 
@@ -35,6 +34,12 @@ Requirements
  * Open port for the server
  * PHP OpenSSL module to run a server over a encrypted connection
 
+* Composer dependencies *
+These will be installed automatically when using phpws as a composer package.
+
+ * Reactphp
+ * ZF2 Logger
+
 *Client*
  * PHP 5.3
  * Server that implements the HyBi (#8-#12) draft version
@@ -43,97 +48,61 @@ Requirements
 Server Example
 ---------------
 ```php
-	#!/php -q
-	<?php
-
-	// Run from command prompt > php demo.php
-
-	/**
-	 * This demo resource handler will respond to all messages sent to /echo/ on the socketserver below
-	 *
-	 * All this handler does is echoing the responds to the user
-	 * @author Chris
-	 *
-	 */
-	class DemoEchoHandler extends WebSocketUriHandler{
-		public function onMessage(IWebSocketConnection $user, IWebSocketMessage $msg){
-			echo "[ECHO] {$msg->getData()}\n";
-			// Echo
-			$user->sendMessage($msg);
-		}
-
-		public function onAdminMessage(IWebSocketConnection $user, IWebSocketMessage $obj){
-			echo "[DEMO] Admin TEST received!\n";
-
-			$frame = WebSocketFrame::create(WebSocketOpcode::PongFrame);
-			$user->sendFrame($frame);
-		}
-	}
-
-	/**
-	 * Demo socket server. Implements the basic eventlisteners and attaches a resource handler for /echo/ urls.
-	 *
-	 *
-	 * @author Chris
-	 *
-	 */
-	class DemoSocketServer implements IWebSocketServerObserver{
-		protected $debug = true;
-		protected $server;
-
-		public function __construct(){
-			$this->server = new WebSocketServer('tcp://0.0.0.0:12345', 'superdupersecretkey');
-			$this->server->addObserver($this);
-
-			$this->server->addUriHandler("echo", new DemoEchoHandler());
-		}
-
-		public function onConnect(IWebSocketConnection $user){
-			echo "[DEMO] {$user->getId()} connected\n";
-		}
-
-		public function onMessage(IWebSocketConnection $user, IWebSocketMessage $msg){
-			echo "[DEMO] {$user->getId()} says '{$msg->getData()}'\n";
-		}
-
-		public function onDisconnect(IWebSocketConnection $user){
-			echo "[DEMO] {$user->getId()} disconnected\n";
-		}
-
-		public function onAdminMessage(IWebSocketConnection $user, IWebSocketMessage $msg){
-			echo "[DEMO] Admin Message received!\n";
-
-			$frame = WebSocketFrame::create(WebSocketOpcode::PongFrame);
-			$user->sendFrame($frame);
-		}
-
-		public function run(){
-			$this->server->run();
-		}
-	}
-
-	// Start server
-	$server = new DemoSocketServer();
-	$server->run();
+require_once("vendor/autoload.php");            // Composer autoloader
+
+use Devristo\Phpws\Messaging\WebSocketMessageInterface;
+use Devristo\Phpws\Protocol\WebSocketConnectionInterface;
+use Devristo\Phpws\Server\WebSocketServer;
+
+$loop = \React\EventLoop\Factory::create();
+
+// Create a logger which writes everything to the STDOUT
+$logger = new \Zend\Log\Logger();
+$writer = new Zend\Log\Writer\Stream("php://output");
+$logger->addWriter($writer);
+
+// Create a WebSocket server using SSL
+$server = new WebSocketServer("tcp://0.0.0.0:12345", $loop, $logger);
+
+$server->on("connect", function(WebSocketConnectionInterface $user){
+    $user->sendString("Hey! I am the echo robot. I will repeat all your input!");
+});
+
+$server->on("message", function(WebSocketConnectionInterface $user, WebSocketMessageInterface $message) use($logger){
+    $logger->notice(sprintf("We have got '%s' from client %s", $message->getData(), $user->getId()));
+    $user->sendString($message->getData());
+});
+
+// Bind the server
+$server->bind();
+
+// Start the event loop
+$loop->run();
 ```
 
 Client Example
 ---------------------
 ```php
-      <?php
+require_once("vendor/autoload.php");                // Composer autoloader
+
+$loop = \React\EventLoop\Factory::create();
 
-	$input = "Hello World!";
-	$msg = WebSocketMessage::create($input);
+$logger = new \Zend\Log\Logger();
+$writer = new Zend\Log\Writer\Stream("php://output");
+$logger->addWriter($writer);
 
-	$client = new WebSocket("ws://127.0.0.1:12345/echo/");
-	$client->open();
-	$client->sendMessage($msg);
+$client = new \Devristo\Phpws\Client\WebSocket("ws://echo.websocket.org/?encoding=text", $loop, $logger);
+$client->on("connected", function($headers) use ($logger, $client){
+    $logger->notice("Connected!");
+    $client->send("Hello world!");
+});
 
-	// Wait for an incoming message
-	$msg = $client->readMessage();
+$client->on("message", function($message) use ($client, $logger){
+    $logger->notice("Got message: ".$message->getData());
+    $client->close();
+});
 
-	$client->close();
 
-	echo $msg->getData(); // Prints "Hello World!" when using the demo.php server
-       ?>
+$client->open();
+$loop->run();
 ```

examples/echo_client.php

@@ -10,7 +10,6 @@
 
 $loop = \React\EventLoop\Factory::create();
 
-
 $logger = new \Zend\Log\Logger();
 $writer = new Zend\Log\Writer\Stream("php://output");
 $logger->addWriter($writer);