Restructure files

Author: nekudo

client/test_server.php renamed to cli/client_demo.php

@@ -2,13 +2,13 @@
 ini_set('display_errors', 1);
 error_reporting(E_ALL);
 
-require_once 'lib/class.websocket_client.php';
+require_once __DIR__ . '/../src/Client.php';
 
 $clients = [];
 $testClients = 30;
 $testMessages = 500;
 for ($i = 0; $i < $testClients; $i++) {
-    $clients[$i] = new WebsocketClient;
+    $clients[$i] = new \Bloatless\WebSocket\Client;
     $clients[$i]->connect('127.0.0.1', 8000, '/demo', 'foo.lh');
 }
 usleep(5000);

cli/server.php

@@ -0,0 +1,28 @@
+<?php
+
+ini_set('display_errors', 1);
+error_reporting(E_ALL);
+
+require __DIR__ . '/../src/Connection.php';
+require __DIR__ . '/../src/Socket.php';
+require __DIR__ . '/../src/Server.php';
+
+require __DIR__ . '/../src/Application/ApplicationInterface.php';
+require __DIR__ . '/../src/Application/Application.php';
+require __DIR__ . '/../src/Application/DemoApplication.php';
+require __DIR__ . '/../src/Application/StatusApplication.php';
+
+$server = new \Bloatless\WebSocket\Server('127.0.0.1', 8000);
+
+// server settings:
+$server->setMaxClients(100);
+$server->setCheckOrigin(false);
+$server->setAllowedOrigin('foo.lh');
+$server->setMaxConnectionsPerIp(100);
+$server->setMaxRequestsPerMinute(2000);
+
+// Hint: Status application should not be removed as it displays usefull server informations:
+$server->registerApplication('status', \Bloatless\WebSocket\Application\StatusApplication::getInstance());
+$server->registerApplication('demo', \Bloatless\WebSocket\Application\DemoApplication::getInstance());
+
+$server->run();

client/js/.gitignore

@@ -87,12 +87,6 @@ h2 {
 	width: 200px;
 	margin: 0 0 5px 0;
 }
-#file {
-	display: inline-block;
-	width: 410px;
-	margin: 0 0 5px 0;
-}
-
 .bold {
 	font-weight: bold;
 }

client/css/client.css renamed to public/css/client.css

@@ -3,7 +3,6 @@ body {
 	padding-top: 65px;
 	text-align: center;
 	font-family: Arial, Helvetica, sans-serif;
-	text-align: center;
 	font-size: 16px;
 	line-height: 25px;
 	color: #444;

client/css/status.css renamed to public/css/status.css

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace WebSocket\Application;
+namespace Bloatless\WebSocket\Application;
 
 /**
  * WebSocket Server Application

client/index.html renamed to public/index.html

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace WebSocket\Application;
+namespace Bloatless\WebSocket\Application;
 
-use WebSocket\Connection;
+use Bloatless\WebSocket\Connection;
 
 interface ApplicationInterface
 {

client/js/client.js renamed to public/js/client.js

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace WebSocket\Application;
+namespace Bloatless\WebSocket\Application;
 
-use WebSocket\Connection;
+use Bloatless\WebSocket\Connection;
 
 /**
  * Websocket-Server demo and test application.

client/js/status.js renamed to public/js/status.js

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace WebSocket\Application;
+namespace Bloatless\WebSocket\Application;
 
-use WebSocket\Connection;
+use Bloatless\WebSocket\Connection;
 
 /**
  * Shiny WSS Status Application

client/status.html renamed to public/status.html

@@ -1,7 +1,8 @@
 <?php
 
-ini_set('display_errors', 1);
-error_reporting(E_ALL);
+declare(strict_types=1);
+
+namespace Bloatless\WebSocket;
 
 /**
  * Very basic websocket client.
@@ -10,7 +11,7 @@
  * @author Simon Samtleben <[email protected]>
  * @version 2011-10-18
  */
-class WebsocketClient
+class Client
 {
     /**
      * @var string $host

server/server.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace WebSocket;
+namespace Bloatless\WebSocket;
 
-use WebSocket\Application\ApplicationInterface;
+use Bloatless\WebSocket\Application\ApplicationInterface;
 
 /**
  * WebSocket Connection class

server/lib/WebSocket/Application/Application.php renamed to src/Application/Application.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace WebSocket;
+namespace Bloatless\WebSocket;
 
-use WebSocket\Application\ApplicationInterface;
+use Bloatless\WebSocket\Application\ApplicationInterface;
 
 /**
  * Shiny WSS

server/lib/WebSocket/Application/ApplicationInterface.php renamed to src/Application/ApplicationInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace WebSocket;
+namespace Bloatless\WebSocket;
 
 /**
  * Socket class