Add connect context arg to Connection::connect() (amphp#82)

Addresses amphp#81.

Author: trowski

src/Connection.php

@@ -33,19 +33,23 @@ final class Connection implements Link
 
     /**
      * @param ConnectionConfig $config
-     * @param CancellationToken|null $config
+     * @param CancellationToken|null $token
+     * @param Socket\ClientConnectContext|null $context Note that TCP No Delay will be set to on automatically.
      *
      * @return Promise
      */
-    public static function connect(ConnectionConfig $config, CancellationToken $token = null): Promise
-    {
-        $token = $token ?? new NullCancellationToken();
-
-        return call(function () use ($config, $token) {
-            static $connectContext;
-
-            $connectContext = $connectContext ?? (new Socket\ClientConnectContext())->withTcpNoDelay();
-            $socket = yield Socket\connect($config->getConnectionString(), $connectContext, $token);
+    public static function connect(
+        ConnectionConfig $config,
+        CancellationToken $token = null,
+        Socket\ClientConnectContext $context = null
+    ): Promise {
+        $token = $token ?? new NullCancellationToken;
+
+        $context = $context ?? new Socket\ClientConnectContext;
+
+        return call(function () use ($config, $token, $context) {
+            $context = $context->withTcpNoDelay();
+            $socket = yield Socket\connect($config->getConnectionString(), $context, $token);
 
             $processor = new Internal\Processor($socket, $config);
             yield $processor->connect();

src/TimeoutConnector.php

@@ -3,24 +3,23 @@
 namespace Amp\Mysql;
 
 use Amp\Promise;
+use Amp\Socket\ClientConnectContext;
 use Amp\Sql\ConnectionConfig as SqlConnectionConfig;
 use Amp\Sql\Connector;
-use Amp\TimeoutCancellationToken;
-use function Amp\call;
 
 final class TimeoutConnector implements Connector
 {
     const DEFAULT_TIMEOUT = 5000;
 
-    /** @var int */
-    private $timeout;
+    /** @var ClientConnectContext */
+    private $context;
 
     /**
      * @param int $timeout Milliseconds until connections attempts are cancelled.
      */
     public function __construct(int $timeout = self::DEFAULT_TIMEOUT)
     {
-        $this->timeout = $timeout;
+        $this->context = (new ClientConnectContext())->withConnectTimeout($timeout);
     }
 
     /**
@@ -34,10 +33,6 @@ public function connect(SqlConnectionConfig $config): Promise
             throw new \TypeError(\sprintf("Must provide an instance of %s to MySQL connectors", ConnectionConfig::class));
         }
 
-        return call(function () use ($config) {
-            $token = new TimeoutCancellationToken($this->timeout);
-
-            return Connection::connect($config, $token);
-        });
+        return Connection::connect($config, null, $this->context);
     }
 }