Enforce unsubscribe event when user disconnects -> now RemoteEvents responsibility

Author: Devristo

src/Devristo/Phpws/RemoteEvent/RemoteEvents.php

@@ -42,20 +42,30 @@ public function listenTo(StackTransport $transport)
 
             $event = $message->getEvent();
 
+
+
             if ($message->getEvent() == 'subscribe'){
                 $self->room($room)->subscribe($transport);
 
-                $transport->getWebSocketTransport()->on("close", function() use ($self, $transport){
-                    $self->emit("unsubscribe", array($transport));
+                // If the transport is disconnected, make sure we 'fake' the unsubscribe
+                $transport->getWebSocketTransport()->on("close", function() use ($self, $transport, $room){
+                    $self->room($room)->unsubscribe($transport);
+
+                    // Fake unsubscribe message
+                    $message = new RemoteEventMessage();
+                    $message->setEvent("unsubscribe");
+                    $message->setRoom($room);
+
+                    $self->emit("unsubscribe", array($transport, $message));
+                    $self->room($room)->emit("unsubscribe", array($transport, $message));
                 });
 
             } elseif ($message->getEvent() == 'unsubscribe'){
                 $self->room($room)->unsubscribe($transport);
-                return;
             }
 
 
-            $self->room($room)->emit($event, array($transport, $message));
+            $self->room($room)->emit("unsubscribe", array($transport, $message));
             $self->emit($event, array($transport, $message));
         });
     }

src/Devristo/Phpws/RemoteEvent/Room.php

@@ -19,13 +19,6 @@ public function __construct($name, \Zend\Log\LoggerInterface $logger)
     public function subscribe(StackTransport $transport)
     {
         $this->members[$transport->getId()] = $transport;
-
-        $self = $this;
-
-        $transport->getWebSocketTransport()->on("close", function () use ($self, $transport) {
-            $self->unsubscribe($transport);
-        });
-
         $this->logger->notice("[{$this->name}] User {$transport->getId()} has subscribed!");
     }