Merge pull request #10 from reactphp-parallel/revert-9-shared-channel

Revert "Shared channel"

Author: WyriHaximus

src/AbstractGeneratedProxy.php

@@ -10,12 +10,10 @@
 abstract class AbstractGeneratedProxy
 {
     private Channel $out;
-    private string $hash;
 
-    final public function __construct(Channel $out, string $hash)
+    final public function __construct(Channel $out)
     {
-        $this->out  = $out;
-        $this->hash = $hash;
+        $this->out = $out;
     }
 
     /**
@@ -28,7 +26,6 @@ final protected function proxyCallToMainThread(string $method, array $args)
         $input = new Channel(1);
         $this->out->send(new Call(
             $input,
-            $this->hash,
             $method,
             $args,
         ));

src/Message/Call.php

@@ -9,7 +9,6 @@
 final class Call
 {
     private Channel $channel;
-    private string $hash;
     private string $method;
 
     /** @var mixed[] */
@@ -18,10 +17,9 @@ final class Call
     /**
      * @param mixed[] $args
      */
-    public function __construct(Channel $channel, string $hash, string $method, array $args)
+    public function __construct(Channel $channel, string $method, array $args)
     {
         $this->channel = $channel;
-        $this->hash    = $hash;
         $this->method  = $method;
         $this->args    = $args;
     }
@@ -31,11 +29,6 @@ public function channel(): Channel
         return $this->channel;
     }
 
-    public function hash(): string
-    {
-        return $this->hash;
-    }
-
     public function method(): string
     {
         return $this->method;

src/Proxy.php

@@ -7,26 +7,21 @@
 use parallel\Channel;
 use ReactParallel\Factory;
 use ReactParallel\ObjectProxy\Generated\ProxyList;
-use ReactParallel\ObjectProxy\Message\Call;
 use ReactParallel\ObjectProxy\Proxy\CallHandler;
-use Rx\Observable;
 
 use function array_key_exists;
-use function spl_object_hash;
 
 final class Proxy extends ProxyList
 {
     private const HASNT_PROXYABLE_INTERFACE = false;
 
-    private Channel $output;
-    private Observable $outputStream;
+    private Factory $factory;
     private CallHandler $callHandler;
 
     public function __construct(Factory $factory)
     {
-        $this->output       = new Channel(Channel::Infinite);
-        $this->outputStream = $factory->streams()->channel($this->output)->share();
-        $this->callHandler  = new CallHandler($this);
+        $this->factory     = $factory;
+        $this->callHandler = new CallHandler($this);
     }
 
     public function has(string $interface): bool
@@ -40,14 +35,15 @@ public function create(object $object, string $interface): object
             throw NonExistentInterface::create($interface);
         }
 
-        $hash = spl_object_hash($object);
-        $this->outputStream->filter(static fn (Call $call): bool => $call->hash() === $hash)->subscribe(
+        $output = new Channel(Channel::Infinite);
+
+        $this->factory->streams()->channel($output)->subscribe(
             ($this->callHandler)($object, $interface)
         );
 
         $class = self::KNOWN_INTERFACE[$interface];
 
         /** @psalm-suppress InvalidStringClass */
-        return new $class($this->output, $hash);
+        return new $class($output);
     }
 }

tests/Message/CallTest.php

@@ -18,14 +18,12 @@ final class CallTest extends AsyncTestCase
     public function getters(): void
     {
         $channel = new Channel(1);
-        $hash    = 'haajshdkjlsajkl';
         $method  = 'hammer';
         $args    = [time()];
 
-        $call = new Call($channel, $hash, $method, $args);
+        $call = new Call($channel, $method, $args);
 
         self::assertSame($channel, $call->channel());
-        self::assertSame($hash, $call->hash());
         self::assertSame($method, $call->method());
         self::assertSame($args, $call->args());
     }

tests/Proxy/CallHandlerTest.php

@@ -40,9 +40,8 @@ public function logger(): void
         });
         $callHandler = new Proxy\CallHandler($proxy);
         $time        = time();
-        $hash        = 'asljdjaslkdhklasdslkadskl';
         $channel     = new Channel(1);
-        $call        = new Call($channel, $hash, 'get', [LoggerInterface::class]);
+        $call        = new Call($channel, 'get', [LoggerInterface::class]);
 
         $loop->futureTick(static function () use ($container, $callHandler, $call): void {
             ($callHandler)($container, ContainerInterface::class)($call);