Merge pull request #16 from rubyqorn/1.0.0

Migrated to stream socket

Author: rubyqorn

src/AbstractSocket.php

@@ -26,21 +26,4 @@ public function __construct(SocketFacade $facade)
      * @return string|bool 
      */ 
     abstract public function send(string $message);
-
-    /**
-     * Close created socket connection
-     * @throws \Qonsillium\Exceptions\FailedCloseSocket
-     * @return void
-     */ 
-    abstract public function close();
-
-    /**
-     * Destruct AbstractSocket class and 
-     * close socket connection
-     * @return void 
-     */ 
-    public function __destruct()
-    {
-        $this->close();
-    }
 }

src/ActionFactory.php

@@ -5,11 +5,8 @@
 use Qonsillium\Credential\SocketCredentials;
 use Qonsillium\Actions\{
     SocketAcceptor,
-    SocketBinder,
     SocketCloser,
     SocketConnector,
-    SocketCreator,
-    SocketListener,
     SocketReader,
     SocketWriter
 };
@@ -33,93 +30,20 @@ public function __construct(SocketCredentials $credentials)
     }
 
     /**
-     * Returns socket domain setting from config file
+     * Returns socket connection address
      * @return string 
      */ 
-    private function getDomain()
+    public function getAddress()
     {
-        return $this->credentials->getCredential('domain');
-    }
-
-    /**
-     * Returns socket type setting from config file
-     * @return string 
-     */ 
-    private function getType()
-    {
-        return $this->credentials->getCredential('type');
-    }
-
-    /**
-     * Returns socket protocol setting from config file
-     * @return string 
-     */ 
-    private function getProtocol()
-    {
-        return $this->credentials->getCredential('protocol');
-    }
-
-    /**
-     * Return setted host or socket file name from 
-     * credentials handler
-     * @return string 
-     */ 
-    private function getAddress()
-    {
-        if ($this->credentials->validateExistence('socket_file')) {
-            return $this->credentials->getCredential('socket_file');
-        }
-        
         return $this->credentials->getCredential('host');
     }
 
     /**
-     * Return setted socket port from
-     * credentials handler
-     * @return string 
-     */ 
-    private function getPort()
-    {
-        if ($this->credentials->validateExistence('port')) {
-            return $this->credentials->getCredential('port');
-        }
-
-        return 0;
-    }
-
-    /**
-     * Returns number of incoming backlogs
-     * @return int 
-     */ 
-    private function getBacklog()
-    {
-        return $this->credentials->getCredential('backlog');
-    }
-
-    /**
-     * Bytes length which will be fetched from remote host
-     * @return int 
-     */ 
-    private function getReadLength()
-    {
-        return $this->credentials->getCredential('read_length');
-    }
-
-    /**
-     * Return flag value responded for reading status
-     * @return int
-     */ 
-    private function getReadFlag()
-    {
-        return $this->credentials->getCredential('read_flag');
-    }
-
-    /**
-     * @return \Qonsillium\Actions\SocketCreator 
+     * @return \Qonsillium\Actions\SocketConnector 
      */ 
-    public function getCreator(): SocketCreator
+    public function getConnector(string $type)
     {
-        return new SocketCreator($this->getDomain(), $this->getType(), $this->getProtocol());
+        return new SocketConnector($this->getAddress(), $type);
     }
 
     /**
@@ -130,36 +54,12 @@ public function getAcceptor(): SocketAcceptor
         return new SocketAcceptor();
     }
 
-    /**
-     * @return \Qonsillium\Actions\SocketConnector 
-     */ 
-    public function getConnector(): SocketConnector
-    {
-        return new SocketConnector($this->getAddress(), $this->getPort());
-    }
-
-    /**
-     * @return \Qonsillium\Actions\SocketListener 
-     */ 
-    public function getListener(): SocketListener
-    {
-        return new SocketListener($this->getBacklog());
-    }
-
-    /**
-     * @return \Qonsillium\Actions\SocketBinder
-     */ 
-    public function getBinder(): SocketBinder
-    {   
-        return new SocketBinder($this->getAddress(), $this->getPort());
-    }
-
     /**
      * @return \Qonsillium\Actions\SocketReader 
      */ 
     public function getReader(): SocketReader
     {
-        return new SocketReader($this->getReadLength(), $this->getReadFlag());
+        return new SocketReader();
     }
 
     /**

src/Actions/AbstractSocketAction.php

@@ -4,6 +4,12 @@
 
 abstract class AbstractSocketAction
 {
+    /**
+     * Created socket resource
+     * @var resource 
+     */ 
+    protected $socket;
+
     /**
      * Make socket action when need
      * to make class like function 
@@ -14,6 +20,23 @@ public function __invoke()
         return $this->make();
     }
 
+    /**
+     * @param resource $socket 
+     * @return void 
+     */ 
+    public function setSocket($socket)
+    {
+        $this->socket = $socket;
+    }
+
+    /**
+     * @return resource 
+     */ 
+    public function getSocket()
+    {
+        return $this->socket;
+    }
+
     /**
      * Make socket action
      * @return mixed 

src/Actions/Connections/ClientConnection.php

@@ -0,0 +1,19 @@
+<?php 
+
+namespace Qonsillium\Actions\Connections;
+
+class ClientConnection extends Connection
+{
+    /**
+     * Create client connection to server socket 
+     * @return resource
+     */ 
+    public function create()
+    {
+        return stream_socket_client(
+            $this->getAddress(),
+            $errno,
+            $errstr
+        );
+    }
+}

src/Actions/Connections/Connection.php

@@ -0,0 +1,58 @@
+<?php 
+
+namespace Qonsillium\Actions\Connections;
+
+abstract class Connection
+{
+    /**
+     * Address where will be connected socket
+     * @var string
+     */ 
+    protected string $address;
+
+    /**
+     * Socket connection timeout
+     * @var int 
+     */ 
+    protected int $timeout;
+
+    /**
+     * @param string $address
+     * @return void 
+     */ 
+    public function setAddress(string $address)
+    {
+        $this->address = $address;
+    }
+
+    /**
+     * @return string 
+     */ 
+    public function getAddress()
+    {
+        return $this->address;
+    }
+
+    /**
+     * @param int $timeout
+     * @return void 
+     */ 
+    public function setTimeout(int $timeout)
+    {   
+        $this->timeout = $timeout;
+    }
+
+    /**
+     * @return int 
+     */ 
+    public function getTimeout()
+    {
+        return $this->timeout;
+    }
+
+    /**
+     * Create client or server socket connection
+     * @return resource 
+     */ 
+    abstract public function create(); 
+}

src/Actions/Connections/ConnectionFactory.php

@@ -0,0 +1,20 @@
+<?php 
+
+namespace Qonsillium\Actions\Connections;
+
+class ConnectionFactory
+{
+    /**
+     * Get server or client connection creator
+     * @param string $type
+     * @return \Qonsillium\Actions\Connections\Connection
+     */ 
+    public static function getConnection(string $type): Connection
+    {
+        if ($type === 'server') {
+            return new ServerConnection();
+        } elseif ($type === 'client') {
+            return new ClientConnection();
+        }
+    }
+}

src/Actions/Connections/ServerConnection.php

@@ -0,0 +1,19 @@
+<?php 
+
+namespace Qonsillium\Actions\Connections;
+
+class ServerConnection extends Connection
+{
+    /**
+     * Create server socket connection 
+     * @return resource
+     */ 
+    public function create()
+    {
+        return stream_socket_server(
+            $this->getAddress(),
+            $errno,
+            $errstr
+        );
+    }
+}

src/Actions/SocketAcceptor.php

@@ -2,39 +2,14 @@
 
 namespace Qonsillium\Actions;
 
-use \Socket;
-
 class SocketAcceptor extends AbstractSocketAction
 {
     /**
-     * Accepted socket connection
-     * @var \Socket 
-     */ 
-    private $acceptedSocket;
-
-    /**
-     * @param \Socket $socket
-     * @return void 
-     */ 
-    public function setAcceptSocket(Socket $socket)
-    {
-        $this->acceptedSocket = $socket;
-    }
-
-    /**
-     * @return \Socket 
-     */ 
-    public function getAcceptedSocket()
-    {
-        return $this->acceptedSocket;
-    }
-
-    /**
-     * Accept socket connection
+     * Accept socket connections
      * @return resource 
      */ 
     public function make()
     {
-        return socket_accept($this->getAcceptedSocket());
+        return stream_socket_accept($this->getSocket());
     }
 }