Pre-release: updated copyrighted content

cloudtay · Nov 13, 2024 · a0407bf · a0407bf
1 parent 562907b
commit a0407bf
Show file tree

Hide file tree

Showing 11 changed files with 257 additions and 262 deletions.
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -1,4 +1,5 @@
 <?php declare(strict_types=1);
+
 /*
  * Copyright (c) 2023-2024.
  *

diff --git a/src/Client.php b/src/Client.php
@@ -12,15 +12,15 @@
 
 namespace Ripple\Http;
 
-use Co\IO;
 use GuzzleHttp\Psr7\Response;
 use Psr\Http\Message\RequestInterface;
 use Ripple\Http\Client\Capture;
 use Ripple\Http\Client\Connection;
 use Ripple\Http\Client\ConnectionPool;
-use Ripple\Socket\Tunnel\Http;
-use Ripple\Socket\Tunnel\Socks5;
+use Ripple\Socket;
 use Ripple\Stream\Exception\ConnectionException;
+use Ripple\Tunnel\Http;
+use Ripple\Tunnel\Socks5;
 use Throwable;
 
 use function getenv;
@@ -145,28 +145,28 @@ private function pullConnection(string $host, int $port, bool $ssl, int $timeout
                 switch ($parse['scheme']) {
                     case 'socks':
                     case 'socks5':
-                        $tunnelSocket = Socks5::connect("tcp://{$parse['host']}:{$parse['port']}", $payload)->getSocketStream();
-                        $ssl && IO::Socket()->enableSSL($tunnelSocket, $timeout);
+                        $tunnelSocket = Socks5::connect("tcp://{$parse['host']}:{$parse['port']}", $payload)->getSocket();
+                        $ssl && $tunnelSocket->enableSSL();
                         $connection = new Connection($tunnelSocket);
                         break;
                     case 'http':
-                        $tunnelSocket = Http::connect("tcp://{$parse['host']}:{$parse['port']}", $payload)->getSocketStream();
-                        $ssl && IO::Socket()->enableSSL($tunnelSocket, $timeout);
+                        $tunnelSocket = Http::connect("tcp://{$parse['host']}:{$parse['port']}", $payload)->getSocket();
+                        $ssl && $tunnelSocket->enableSSL();
                         $connection = new Connection($tunnelSocket);
                         break;
                     case 'https':
-                        $tunnel       = IO::Socket()->connectWithSSL("tcp://{$parse['host']}:{$parse['port']}", $timeout);
-                        $tunnelSocket = Http::connect($tunnel, $payload)->getSocketStream();
-                        $ssl && IO::Socket()->enableSSL($tunnelSocket, $timeout);
+                        $tunnel       = Socket::connectWithSSL("tcp://{$parse['host']}:{$parse['port']}", $timeout);
+                        $tunnelSocket = Http::connect($tunnel, $payload)->getSocket();
+                        $ssl && $tunnelSocket->enableSSL();
                         $connection = new Connection($tunnelSocket);
                         break;
                     default:
                         throw new ConnectionException('Unsupported proxy protocol', ConnectionException::CONNECTION_ERROR);
                 }
             } else {
                 $connection = $ssl
-                    ? new Connection(IO::Socket()->connectWithSSL("ssl://{$host}:{$port}", $timeout))
-                    : new Connection(IO::Socket()->connect("tcp://{$host}:{$port}", $timeout));
+                    ? new Connection(Socket::connectWithSSL("ssl://{$host}:{$port}", $timeout))
+                    : new Connection(Socket::connect("tcp://{$host}:{$port}", $timeout));
             }
         }
 

diff --git a/src/Client/Capture/ServerSentEvents.php b/src/Client/Capture/ServerSentEvents.php
@@ -16,7 +16,7 @@
 use Exception;
 use GuzzleHttp\Psr7\Response;
 use Iterator;
-use Ripple\Coroutine;
+use Ripple\Coroutine\Coroutine;
 use Ripple\Http\Client\Capture;
 use Throwable;
 
@@ -35,9 +35,14 @@
  */
 class ServerSentEvents extends Capture
 {
+    /*** @var \Closure|null */
+    public Closure|null $onEvent = null;
+    /*** @var \Closure|null */
+    public Closure|null $onComplete = null;
+    /*** @var array */
+    protected array $iterators = [];
     /*** @var string */
     private string $status = 'pending';
-
     /*** @var string */
     private string $buffer = '';
 
@@ -138,15 +143,6 @@ public function processContent(string $content): void
         }
     }
 
-    /*** @return string */
-    public function getStatus(): string
-    {
-        return $this->status;
-    }
-
-    /*** @var array */
-    protected array $iterators = [];
-
     /**
      * @return iterable
      */
@@ -238,9 +234,9 @@ public function rewind(): void
         };
     }
 
-    /*** @var \Closure|null */
-    public Closure|null $onEvent = null;
-
-    /*** @var \Closure|null */
-    public Closure|null $onComplete = null;
+    /*** @return string */
+    public function getStatus(): string
+    {
+        return $this->status;
+    }
 }