Forgive me Java for I have sinned

src/Room/Connector.php

@@ -7,6 +7,7 @@
 use Room11\StackChat\Auth\ActiveSessionTracker;
 use Room11\StackChat\Auth\Authenticator;
 use Room11\StackChat\Auth\Session;
+use Room11\StackChat\WebSocket\EventDispatcherFactory;
 use Room11\StackChat\WebSocket\HandlerFactory as WebSocketHandlerFactory;
 use function Amp\resolve;
 use function Amp\websocket;
@@ -15,15 +16,18 @@ class Connector
 {
     private $authenticator;
     private $sessions;
+    private $eventDispatcherFactory;
     private $handlerFactory;
 
     public function __construct(
         Authenticator $authenticator,
         ActiveSessionTracker $sessions,
+        EventDispatcherFactory $eventDispatcherFactory,
         WebSocketHandlerFactory $handlerFactory
     ) {
         $this->authenticator = $authenticator;
         $this->sessions = $sessions;
+        $this->eventDispatcherFactory = $eventDispatcherFactory;
         $this->handlerFactory = $handlerFactory;
     }
 
@@ -36,7 +40,9 @@ public function connect(Identifier $identifier, bool $permanent): Promise
 
             $handshake = (new Handshake($session->getWebSocketUrl()))
                 ->setHeader('Origin', 'https://' . $identifier->getHost());
-            $handler = $this->handlerFactory->build($identifier);
+
+            $eventDispatcher = $this->eventDispatcherFactory->createEventDispatcher($identifier);
+            $handler = $this->handlerFactory->build($identifier, $eventDispatcher);
 
             yield websocket($handler, $handshake);
 

src/WebSocket/EventDispatcherFactory.php

@@ -0,0 +1,13 @@
+<?php declare(strict_types = 1);
+
+namespace Room11\StackChat\WebSocket;
+
+use Room11\StackChat\Room\Identifier;
+
+/**
+ * @todo kill this before it lays eggs
+ */
+interface EventDispatcherFactory
+{
+    function createEventDispatcher(Identifier $room): EventDispatcher;
+}

src/WebSocket/Handler.php

@@ -35,13 +35,13 @@ class Handler implements Websocket
 
     public function __construct(
         EventBuilder $eventBuilder,
-        EventDispatcher $globalEventDispatcher,
+        EventDispatcher $eventDispatcher,
         EndpointCollection $endpoints,
         Logger $logger,
         ChatRoomIdentifier $roomIdentifier
     ) {
         $this->eventBuilder = $eventBuilder;
-        $this->eventDispatcher = $globalEventDispatcher;
+        $this->eventDispatcher = $eventDispatcher;
         $this->endpoints = $endpoints;
         $this->logger = $logger;
         $this->roomIdentifier = $roomIdentifier;

src/WebSocket/HandlerFactory.php

@@ -9,24 +9,21 @@
 class HandlerFactory
 {
     private $eventBuilder;
-    private $eventDispatcher;
     private $endpointCollection;
     private $logger;
 
     public function __construct(
         EventBuilder $eventBuilder,
-        EventDispatcher $eventDispatcher,
         EndpointCollection $endpointCollection,
         Logger $logger
     ) {
         $this->eventBuilder = $eventBuilder;
-        $this->eventDispatcher = $eventDispatcher;
         $this->endpointCollection = $endpointCollection;
         $this->logger = $logger;
     }
 
-    public function build(ChatRoomIdentifier $identifier)
+    public function build(ChatRoomIdentifier $identifier, EventDispatcher $eventDispatcher)
     {
-        return new Handler($this->eventBuilder, $this->eventDispatcher, $this->endpointCollection, $this->logger, $identifier);
+        return new Handler($this->eventBuilder, $eventDispatcher, $this->endpointCollection, $this->logger, $identifier);
     }
 }