no message

Nall-chan · Jan 24, 2024 · cd66127 · cd66127
1 parent 0631da5
commit cd66127
Show file tree

Hide file tree

Showing 7 changed files with 327 additions and 318 deletions.
diff --git a/.style b/.style
diff --git a/ONVIF Discovery/module.php b/ONVIF Discovery/module.php
@@ -223,8 +223,6 @@ protected function Discover(): void
     }
     protected function DiscoverDevices(): array
     {
-        //IPS_Sleep(5000);
-        //return []; // testing
         $Interfaces = $this->getIPAdresses();
         $uuid = self::uuidV4();
         $discoveryMessage = str_replace('[UUID]', $uuid, self::WS_DISCOVERY_MESSAGE);
@@ -527,6 +525,8 @@ private function getIPAdresses(): array
         $InterfaceDescriptions = array_column($Interfaces, 'Description', 'InterfaceIndex');
         $Networks = net_get_interfaces();
         $Addresses = [];
+        $Addresses['ipv6'] = [];
+        $Addresses['ipv4'] = [];
         foreach ($Networks as $InterfaceDescription => $Interface) {
             if (!$Interface['up']) {
                 continue;

diff --git a/ONVIF IO/module.php b/ONVIF IO/module.php
diff --git a/ONVIF Media Stream/module.php b/ONVIF Media Stream/module.php
@@ -1212,7 +1212,7 @@ protected function WritePTZInHTMLBox(): void
             file_get_contents(__DIR__ . '/../libs/PTZControl.js')
         );
 
-        $JSCode = '<script>' . $JS . /*'initPTZ(' . $this->InstanceID . ');*/'</script>';
+        $JSCode = '<script>' . $JS . /*'initPTZ(' . $this->InstanceID . ');*/ '</script>';
         $HTMLData = '<div class="extended"><div class="ipsContainer media">' .
         $ImgSrc .
         '<div style="position:absolute; right:0px; bottom:0px; margin:10px">' .

diff --git a/library.json b/library.json
@@ -7,6 +7,6 @@
         "version": "7.0"
     },
     "version": "2.13",
-    "build": 213,
-    "date": 1702047058
+    "build": 214,
+    "date": 1706077404
 }
diff --git a/libs/ONVIFModuleBase.php b/libs/ONVIFModuleBase.php
@@ -63,33 +63,13 @@ public function Destroy(): void
 
     public function ApplyChanges(): void
     {
-        $EventTopic = $this->ReadPropertyString(\ONVIF\Device\Property::EventTopic);
-        $SyncEvents = ($EventTopic != $this->EventTopic);
         //Never delete this line!
         parent::ApplyChanges();
+
         $this->RegisterMessage($this->InstanceID, FM_CONNECT);
         $this->RegisterMessage($this->InstanceID, FM_DISCONNECT);
-
-        if ($EventTopic == '') {
-            $TopicFilter = '.*"Topic":"NOTHING".*';
-        } else {
-            $TopicFilter = '.*"Topic":"' . preg_quote(substr(json_encode($EventTopic), 1, -1)) . '.*';
-        }
-        $this->SetReceiveDataFilter($TopicFilter);
-        $this->SendDebug('SetReceiveDataFilter', $TopicFilter, 0);
-
-        if (IPS_GetKernelRunlevel() != KR_READY) {
-            return;
-        }
-        $this->RegisterParent();
-        $Events = $this->GetEvents($EventTopic);
-        $this->WriteAttributeArray(\ONVIF\Device\Attribute::EventProperties, $Events);
-        if ($SyncEvents && ($this->HasActiveParent())) {
-            $this->$EventTopic = $EventTopic;
-            IPS_RunScriptText('IPS_RequestAction(' . $this->InstanceID . ',"SetSynchronizationPoint",true);');
-        }
+        $this->InitFilterAndEvents();
     }
-
     public function RequestAction(string $Ident, mixed $Value, bool &$done = false): void
     {
         $done = false;
@@ -115,12 +95,35 @@ public function MessageSink(int $TimeStamp, int $SenderID, int $Message, array $
                 break;
         }
     }
+    protected function InitFilterAndEvents()
+    {
+        $EventTopic = $this->ReadPropertyString(\ONVIF\Device\Property::EventTopic);
+        $SyncEvents = ($EventTopic != $this->EventTopic);
+        if ($EventTopic == '') {
+            $TopicFilter = '.*"Topic":"NOTHING".*';
+        } else {
+            $TopicFilter = '.*"Topic":"' . preg_quote(substr(json_encode($EventTopic), 1, -1)) . '.*';
+        }
+        $this->SetReceiveDataFilter($TopicFilter);
+        $this->SendDebug('SetReceiveDataFilter', $TopicFilter, 0);
+
+        if (IPS_GetKernelRunlevel() != KR_READY) {
+            return;
+        }
+        $this->RegisterParent();
+        $Events = $this->GetEvents($EventTopic);
+        $this->WriteAttributeArray(\ONVIF\Device\Attribute::EventProperties, $Events);
+        if ($SyncEvents && ($this->HasActiveParent())) {
+            $this->$EventTopic = $EventTopic;
+            IPS_RunScriptText('IPS_RequestAction(' . $this->InstanceID . ',"SetSynchronizationPoint",true);');
+        }
+    }
 
     protected function KernelReady(): void
     {
         $this->RegisterParent();
         if ($this->HasActiveParent()) {
-            $this->ApplyChanges();
+            $this->InitFilterAndEvents();
         }
     }
 
@@ -136,7 +139,7 @@ protected function IOChangeState(int $State): void
     {
         if ($State == IS_ACTIVE) {
             $this->EventTopic = $this->ReadPropertyString(\ONVIF\Device\Property::EventTopic);
-            $this->ApplyChanges();
+            $this->InitFilterAndEvents();
             $this->ReloadForm();
         }
     }

diff --git a/libs/wsdl.php b/libs/wsdl.php
@@ -107,7 +107,7 @@ public function __sleep(): array
         }
         public function toString(): string
         {
-            switch($this->Type) {
+            switch ($this->Type) {
                 case self::Subscribe:
                     return 'Subscription';
                 case self::PullPoint: