no message

Nall-chan · Jul 20, 2023 · 8afcaba · 8afcaba
1 parent 21f51f5
commit 8afcaba
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/ONVIF IO/form.json b/ONVIF IO/form.json
@@ -281,6 +281,11 @@
             "code": 203,
             "icon": "error",
             "caption": "Connection lost"
+        },
+        {
+            "code": 204,
+            "icon": "error",
+            "caption": "No events received (check firewall)"
         }
     ]
 }
diff --git a/ONVIF IO/module.php b/ONVIF IO/module.php
@@ -15,6 +15,7 @@
  * @property integer $MyPort
  * @property bool $MyHTTPS
  * @property bool $isSubscribed
+ * @property bool $WaitForFirstEvent
  * @property \ONVIF\Profile $Profile
  * @property array $Warnings
  * @method void RegisterAttributeArray(string $name, mixed $Value, int $Size = 0)
@@ -77,6 +78,7 @@ public function Create(): void
         $this->isSubscribed = false;
         $this->Profile = new \ONVIF\Profile();
         $this->Warnings = [];
+        $this->WaitForFirstEvent = false;
         if (IPS_GetKernelRunlevel() == KR_READY) {
             $this->RegisterMessage($this->InstanceID, FM_CHILDREMOVED);
         } else {
@@ -872,11 +874,13 @@ protected function Subscribe(): bool
             'InitialTerminationTime' => 'PT1M'
         ];
         $Response = '';
+        $this->WaitForFirstEvent = true;
         $SubscribeResult = $this->SendData($XAddr[\ONVIF\NS::Event], \ONVIF\WSDL::Event, 'Subscribe', true, $Params, $Response);
         if (is_a($SubscribeResult, 'SoapFault')) {
             $this->SetStatus(IS_EBASE + 3);
             $this->LogMessage($this->Translate('Connection lost'), KL_ERROR);
             $this->ShowLastError($SubscribeResult->getMessage());
+            $this->WaitForFirstEvent = false;
             return false;
         }
         $SubscriptionReference = $SubscribeResult->SubscriptionReference->Address->{'_'};
@@ -903,14 +907,22 @@ protected function Subscribe(): bool
         }
         $this->isSubscribed = true;
         $this->SetTimerInterval('RenewSubscription', 55 * 1000);
-        $this->SetStatus(IS_ACTIVE);
         $this->UpdateFormField('DeviceData', 'items', json_encode($this->GetDeviceDataForForm()));
         $this->UpdateFormField('DeviceDataPanel', 'visible', true);
         $this->UpdateFormField('DeviceDataPanel', 'expanded', true);
         $this->UpdateFormField('Events', 'visible', true);
 
         $this->SetSynchronizationPoint();
-        return true;
+        for ($i = 0; $i < 400; $i++) {
+            if (!$this->WaitForFirstEvent) {
+                $this->SetStatus(IS_ACTIVE);
+                return true;
+            }
+            IPS_Sleep(5);
+        }
+        $this->WaitForFirstEvent = false;
+        $this->SetStatus(IS_EBASE + 4);
+        return false;
     }
     protected function SetSynchronizationPoint(): bool
     {
@@ -1717,6 +1729,9 @@ protected function ProcessHookData()
             return;
         }
         $this->SendDebug('Event', $Data, 0);
+        if ($this->WaitForFirstEvent) {
+            $this->WaitForFirstEvent = false;
+        }
         $this->DecodeNotificationMessage($Data);
     }
     protected function DecodeNotificationMessage(string $NotificationMessageXML): bool