Merge branch 'release/2.1.0' into feature/periodic-tasks

Author: nekudo

public/js/status.js

@@ -36,7 +36,7 @@
          * @param {Object} data
          */
         const clientConnected = (data) => {
-            elClientList.append(new Option(`${data.ip}:${data.port}`, data.port));
+            elClientList.append(new Option(data.client, data.client));
             elClientCount.textContent = data.clientCount;
         };
 
@@ -46,7 +46,7 @@
          */
         const clientDisconnected = (data) => {
             [...elClientList.options].some((option, index) => {
-                if (parseInt(option.value) === data.port) {
+                if (option.value === data.client) {
                     elClientList.options[index].remove();
                     return true;
                 }
@@ -63,19 +63,21 @@
             elMaxClients.textContent = serverinfo.maxClients;
             elMaxConnections.textContent = serverinfo.maxConnectionsPerIp;
             elMaxRequetsPerMinute.textContent = serverinfo.maxRequetsPerMinute;
-            for (let port in serverinfo.clients) {
-                let ip = serverinfo.clients[port];
-                elClientList.append(new Option(ip + ':' + port, port));
+            for (let client in serverinfo.clients) {
+                if (!serverinfo.clients.hasOwnProperty(client)) {
+                    continue;
+                }
+                elClientList.append(new Option(client, client));
             }
         };
 
         /**
          * Indicate client activity by animating/blinking entry in clients-list.
-         * @param {int} port
+         * @param {string} port
          */
-        const clientActivity = (port) => {
+        const clientActivity = (client) => {
             [...elClientList.options].some((option, index) => {
-                if (parseInt(option.value) === port) {
+                if (option.value === client) {
                     elClientList.options[index].style.color = 'red';
                     setTimeout(() => {
                         if (elClientList.options[index]) {

src/Application/StatusApplication.php

@@ -97,12 +97,12 @@ public function setServerInfo(array $serverInfo): bool
      */
     public function clientConnected(string $ip, int $port): void
     {
-        $this->serverClients[$port] = $ip;
+        $client = $ip . ':' . $port;
+        $this->serverClients[$client] = true;
         $this->serverClientCount++;
-        $this->statusMsg('Client connected: ' . $ip . ':' . $port);
+        $this->statusMsg('Client connected: ' . $client);
         $data = [
-            'ip' => $ip,
-            'port' => $port,
+            'client' => $client,
             'clientCount' => $this->serverClientCount,
         ];
         $encodedData = $this->encodeData('clientConnected', $data);
@@ -118,14 +118,15 @@ public function clientConnected(string $ip, int $port): void
      */
     public function clientDisconnected(string $ip, int $port): void
     {
-        if (!isset($this->serverClients[$port])) {
+        $client = $ip . ':' . $port;
+        if (!isset($this->serverClients[$client])) {
             return;
         }
-        unset($this->serverClients[$port]);
+        unset($this->serverClients[$client]);
         $this->serverClientCount--;
-        $this->statusMsg('Client disconnected: ' . $ip . ':' . $port);
+        $this->statusMsg('Client disconnected: ' . $client);
         $data = [
-            'port' => $port,
+            'client' => $client,
             'clientCount' => $this->serverClientCount,
         ];
         $encodedData = $this->encodeData('clientDisconnected', $data);
@@ -135,12 +136,12 @@ public function clientDisconnected(string $ip, int $port): void
     /**
      * This method will be called by server whenever there is activity on a port.
      *
-     * @param int $port
+     * @param string $client
      * @return void
      */
-    public function clientActivity(int $port): void
+    public function clientActivity(string $client): void
     {
-        $encodedData = $this->encodeData('clientActivity', $port);
+        $encodedData = $this->encodeData('clientActivity', $client);
         $this->sendAll($encodedData);
     }
 

src/Connection.php

@@ -249,7 +249,8 @@ private function handle(string $data): bool
 
         // trigger status application:
         if ($this->server->hasApplication('status')) {
-            $this->server->getApplication('status')->clientActivity($this->port);
+            $client = $this->ip . ':' . $this->port;
+            $this->server->getApplication('status')->clientActivity($client);
         }
 
         if (!isset($decodedData['type'])) {

src/Server.php

@@ -96,9 +96,10 @@ protected function createConnection($resource): Connection
     public function run(): void
     {
         while (true) {
-            $changed_sockets = $this->allsockets;
-            @stream_select($changed_sockets, $write = null, $except = null, 0, 5000);
             $this->timers->runAll();
+          
+            $changed_sockets = $this->allsockets;
+            @stream_select($changed_sockets, $write, $except, 0, 5000);
             foreach ($changed_sockets as $socket) {
                 if ($socket == $this->master) {
                     if (($ressource = stream_socket_accept($this->master)) === false) {