UPDATE dependencies

Author: ggottwald

composer.json

@@ -4,7 +4,10 @@
   "type": "library",
   "require": {
     "php": ">=7.0",
-    "clue/multicast-react": "^1.0"
+    "ext-sockets": "*",
+    "ext-json": "*",
+    "react/event-loop": "^1.0",
+    "react/datagram": "^1.4"
   },
   "license": "GNU AFFERO GENERAL PUBLIC LICENSE",
   "authors": [

composer.lock

@@ -4,12 +4,13 @@
 
 use Aqara\Models\Gateway;
 use Aqara\Models\Response;
-use Clue\React\Multicast\Factory;
 use Evenement\EventEmitter;
+use React\Datagram\Socket;
 use React\EventLoop\ExtEventLoop;
 use React\EventLoop\LibEventLoop;
 use React\EventLoop\LibEvLoop;
 use React\EventLoop\StreamSelectLoop;
+use RuntimeException;
 
 class Aqara extends EventEmitter
 {
@@ -29,13 +30,16 @@ class Aqara extends EventEmitter
      */
     protected $loop;
 
+    /**
+     * @var Socket
+     */
     protected $socket;
 
     public function __construct()
     {
         $this->loop = \React\EventLoop\Factory::create();
-        $factory = new Factory($this->loop);
-        $this->socket = $factory->createReceiver(static::MULTICAST_ADDRESS . ':' . static::SERVER_PORT);
+
+        $this->createReceiver();
 
         $this->socket->on('message', function ($data) {
             $this->handleMessage($data);
@@ -44,6 +48,38 @@ public function __construct()
         $this->triggerWhois();
     }
 
+    protected function createReceiver()
+    {
+        $stream = @stream_socket_server('udp://0.0.0.0:' . static::SERVER_PORT, $errno, $errstr, STREAM_SERVER_BIND);
+        if ($stream === false) {
+            throw new RuntimeException('Unable to create receiving socket: ' . $errstr, $errno);
+        }
+
+        $socket = socket_import_stream($stream);
+        if ($stream === false) {
+            throw new RuntimeException('Unable to access underlying socket resource');
+        }
+
+        // allow multiple processes to bind to the same address
+        $ret = socket_set_option($socket, SOL_SOCKET, SO_REUSEADDR, 1);
+        if ($ret === false) {
+            throw new RuntimeException('Unable to enable SO_REUSEADDR');
+        }
+
+        // join multicast group and bind to port
+        $ret = socket_set_option(
+            $socket,
+            IPPROTO_IP,
+            MCAST_JOIN_GROUP,
+            ['group' => static::MULTICAST_ADDRESS, 'interface' => 0]
+        );
+        if ($ret === false) {
+            throw new RuntimeException('Unable to join multicast group');
+        }
+
+        $this->socket = new Socket($this->loop, $stream);
+    }
+
     protected function triggerWhois()
     {
         $message = '{"cmd": "whois"}';
@@ -64,7 +100,7 @@ protected function handleMessage($message)
 
         switch ($response->cmd) {
             case 'heartbeat':
-                if (!isset($this->gatewayList[$response->sid])) {
+                if ($parsed['model'] === 'gateway' && !isset($this->gatewayList[$response->sid])) {
                     $handled = true;
                     $this->triggerWhois();
                 }
@@ -111,6 +147,7 @@ public function tick()
 
     public function close()
     {
+        $this->loop->stop();
         $this->socket->close();
     }
 }