Merge pull request #187 from clue-labs/cancel-promise

Automatically cancel pending promises once client connection closes

Author: WyriHaximus

README.md

@@ -471,6 +471,11 @@ This example shows that you need a promise,
 if your response needs time to created.
 The `ReactPHP Promise` will resolve in a `Response` object when the request
 body ends.
+If the client closes the connection while the promise is still pending, the
+promise will automatically be cancelled.
+The promise cancellation handler can be used to clean up any pending resources
+allocated in this case (if applicable).
+If a promise is resolved after the client closes, it will simply be ignored.
 
 The `Response` class in this project supports to add an instance which implements the
 [ReactPHP ReadableStreamInterface](https://github.com/reactphp/stream#readablestreaminterface)

composer.json

@@ -8,7 +8,7 @@
         "ringcentral/psr7": "^1.2",
         "react/socket": "^1.0 || ^0.8 || ^0.7 || ^0.6 || ^0.5",
         "react/stream": "^1.0 || ^0.7 || ^0.6 || ^0.5 || ^0.4.6",
-        "react/promise": "^2.0 || ^1.1",
+        "react/promise": "^2.1 || ^1.2.1",
         "evenement/evenement": "^2.0 || ^1.0"
     },
     "autoload": {

examples/04-count-visitors.php examples/02-count-visitors.phpexamples/04-count-visitors.php renamed to examples/02-count-visitors.php

@@ -0,0 +1,29 @@
+<?php
+
+use Psr\Http\Message\ServerRequestInterface;
+use React\EventLoop\Factory;
+use React\Http\Response;
+use React\Promise\Promise;
+use React\Socket\Server;
+
+require __DIR__ . '/../vendor/autoload.php';
+
+$loop = Factory::create();
+$socket = new Server(isset($argv[1]) ? $argv[1] : '0.0.0.0:0', $loop);
+
+$server = new \React\Http\Server($socket, function (ServerRequestInterface $request) use ($loop) {
+    return new Promise(function ($resolve, $reject) use ($request, $loop) {
+        $loop->addTimer(1.5, function() use ($loop, $resolve) {
+            $response = new Response(
+                200,
+                array('Content-Type' => 'text/plain'),
+                "Hello world"
+            );
+            $resolve($response);
+        });
+    });
+});
+
+echo 'Listening on http://' . $socket->getAddress() . PHP_EOL;
+
+$loop->run();

examples/02-client-ip.php examples/03-client-ip.phpexamples/02-client-ip.php renamed to examples/03-client-ip.php

@@ -32,7 +32,7 @@
     });
 
     // try to connect to given target host
-    $promise = $connector->connect($request->getRequestTarget())->then(
+    return $connector->connect($request->getRequestTarget())->then(
         function (ConnectionInterface $remote) use ($body, &$buffer) {
             // connection established => forward data
             $body->pipe($remote);
@@ -57,13 +57,6 @@ function ($e) {
             );
         }
     );
-
-    // cancel pending connection if request closes prematurely
-    $body->on('close', function () use ($promise) {
-        $promise->cancel();
-    });
-
-    return $promise;
 });
 
 //$server->on('error', 'printf');