refactor: instate stream-to-promise converter

Author: ace411

src/internal/proc.php

@@ -14,7 +14,7 @@
 
 use React\ChildProcess\Process;
 use React\EventLoop\LoopInterface;
-use React\Promise\Deferred;
+use React\Promise\Promise;
 use React\Promise\PromiseInterface;
 
 const proc = __NAMESPACE__ . '\\proc';
@@ -41,54 +41,31 @@
  */
 function proc(string $process, ?LoopInterface $loop = null): PromiseInterface
 {
-  $proc   = new Process($process);
-  $result = new Deferred();
+  $proc = new Process($process);
   $proc->start($loop);
 
-  if (!$proc->stdout->isReadable()) {
-    $result->reject(
-      new \Exception(
-        \sprintf('Could not process "%s"', $process)
-      )
-    );
+  $data   = '';
+  $action = function (string $chunk) use (&$data) {
+    $data .= $chunk;
+  };
 
-    return $result;
-  }
+  $proc->stdout->on('data', $action);
 
-  $proc->stdout->on(
-    'data',
-    function ($chunk) use (&$result) {
-      $result->resolve($chunk);
-    }
-  );
-
-  // reject promise in the event of failure
-  $proc->stdout->on(
-    'error',
-    function (\Throwable $err) use (&$result, &$proc) {
-      $result->reject($err);
-    }
-  );
-
-  // handle successful closure of the process stream
-  $proc->stdout->on(
-    'end',
-    function () use (&$result) {
-      $result->resolve(true);
-    }
-  );
+  return new Promise(
+    function (callable $resolve, callable $reject) use (&$data, $proc) {
+      $proc->stdout->on(
+        'error',
+        function (\Throwable $err) use ($reject) {
+          $reject($err);
+        }
+      );
 
-  // handle unsuccessful closure of process stream
-  $proc->stdout->on(
-    'close',
-    function () use (&$result, $process) {
-      $result->reject(
-        new \Exception(
-          \sprintf('Closed process "%s"', $process)
-        )
+      $proc->stdout->on(
+        'end',
+        function () use (&$data, $resolve) {
+          $resolve($data);
+        }
       );
     }
   );
-
-  return $result->promise();
 }

tests/Internal/InternalTest.php

@@ -7,7 +7,6 @@
 use PHPUnit\Framework\TestCase;
 
 use function Chemem\Asyncify\Internal\proc;
-use function Chemem\Bingo\Functional\toException;
 use function React\Async\await;
 
 class InternalTest extends TestCase
@@ -20,7 +19,7 @@ public function procProvider(): array
       // php commandline process
       [['php -r \'echo "foo";\''], 'foo'],
       // invalid input
-      [['kat --foo'], 'Closed process "kat --foo"'],
+      [['kat --foo'], ''],
     ];
   }
 
@@ -29,14 +28,14 @@ public function procProvider(): array
    */
   public function testprocExecutesCommandAsynchronouslyInChildProcess($args, $result): void
   {
-    $exec = toException(
-      function (...$args) {
-        return await(proc(...$args));
-      },
-      function ($err) {
-        return $err->getMessage();
-      }
-    )(...$args);
+    $exec = null;
+    try {
+      $exec = await(
+        proc(...$args)
+      );
+    } catch (\Throwable $err) {
+      $exec = $err->getMessage();
+    }
 
     $this->assertEquals($result, $exec);
   }