[dahuadoor] Extend snapshot handling and align WebRTC URL (openhab#20759)

* Improve snapshot handling and add VTO file retrieval, align WebRTC URL

Signed-off-by: Sven Schad <svnsssd@gmail.com>
Signed-off-by: olemr <olemr@olemr.com>

Author: svnsssd

bundles/org.openhab.binding.dahuadoor/README.md

@@ -31,6 +31,16 @@ public class DahuaDoorConfiguration {
     public String password = "";
     public String snapshotPath = "";
     public int maxImages = 20;
+    public int maxEvents = 20;
+    public String snapshotMode = "api";
+    public boolean enableDoorRecordingDownload = true;
+    public boolean enableHangupSnapshotDownload = false;
+    public boolean enableUnlockSnapshotDownload = true;
+    public boolean enableVideoMessageDownload = true;
+    public String hangupSnapshotPath = "/var/lib/openhab/door-images/hangup";
+    public String unlockSnapshotPath = "/var/lib/openhab/door-images/unlock";
+    public String recordingPath = "/var/lib/openhab/door-images/recording";
+    public String videoMessagePath = "/var/lib/openhab/door-images/video-message";
     public boolean useHttps = false;
 
     // WebRTC / go2rtc settings

bundles/org.openhab.binding.dahuadoor/src/main/java/org/openhab/binding/dahuadoor/internal/DahuaDoorBaseHandler.java

@@ -13,7 +13,6 @@
 package org.openhab.binding.dahuadoor.internal;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.openhab.binding.dahuadoor.internal.dahuaeventhandler.DahuaEventClient;
 import org.openhab.binding.dahuadoor.internal.media.PlayStreamServlet;
 import org.openhab.core.thing.Channel;
 import org.openhab.core.thing.Thing;
@@ -57,24 +56,12 @@ protected void onButtonPressed(int lockNumber) {
         }
         triggerChannel(channel.getUID(), "PRESSED");
 
-        // Retrieve image asynchronously to avoid blocking the keepAlive event loop
-        DahuaEventClient localClient = client;
-        if (localClient == null) {
-            logger.warn("Client not initialized, cannot retrieve doorbell image");
+        if (isDhipSnapshotMode()) {
+            logger.debug("snapshotMode=dhip: waiting for NewFile snapshot event instead of active API snapshot");
             return;
         }
 
-        scheduler.submit(() -> {
-            byte[] buffer = localClient.requestImage();
-            if (buffer != null && buffer.length > 0) {
-                // Update image channel
-                updateImageChannel(DahuaDoorBindingConstants.CHANNEL_DOOR_IMAGE, buffer);
-
-                // Save snapshot
-                saveSnapshot(buffer);
-            } else {
-                logger.warn("Received empty or null image buffer from VTO2202");
-            }
-        });
+        // Retrieve image asynchronously to avoid blocking the keepAlive event loop
+        scheduler.submit(() -> requestApiSnapshotForChannel(DahuaDoorBindingConstants.CHANNEL_DOOR_IMAGE, "VTO2202"));
     }
 }

bundles/org.openhab.binding.dahuadoor/src/main/java/org/openhab/binding/dahuadoor/internal/DahuaDoorConfiguration.java

@@ -13,7 +13,6 @@
 package org.openhab.binding.dahuadoor.internal;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.openhab.binding.dahuadoor.internal.dahuaeventhandler.DahuaEventClient;
 import org.openhab.binding.dahuadoor.internal.media.PlayStreamServlet;
 import org.openhab.core.thing.Channel;
 import org.openhab.core.thing.Thing;
@@ -59,6 +58,17 @@ protected void restoreLastSnapshots() {
         updateImageChannel(DahuaDoorBindingConstants.CHANNEL_DOOR_IMAGE_2, buffer2);
     }
 
+    @Override
+    protected String getDoorImageChannelForLock(int lockNumber) {
+        return lockNumber == 2 ? DahuaDoorBindingConstants.CHANNEL_DOOR_IMAGE_2
+                : DahuaDoorBindingConstants.CHANNEL_DOOR_IMAGE_1;
+    }
+
+    @Override
+    protected String getDoorbellSnapshotSuffixForLock(int lockNumber) {
+        return lockNumber == 2 ? "-2" : "-1";
+    }
+
     @Override
     protected void onButtonPressed(int lockNumber) {
         int resolvedLockNumber = lockNumber == 2 ? 2 : 1;
@@ -85,25 +95,14 @@ protected void onButtonPressed(int lockNumber) {
         }
         triggerChannel(bellChannel.getUID(), "PRESSED");
 
-        // Retrieve image asynchronously to avoid blocking the keepAlive event loop
-        DahuaEventClient localClient = client;
-        if (localClient == null) {
-            logger.warn("Client not initialized, cannot retrieve doorbell image");
+        if (isDhipSnapshotMode()) {
+            logger.debug("snapshotMode=dhip: waiting for NewFile snapshot event for lock {}", lockNumber);
             return;
         }
 
+        // Retrieve image asynchronously to avoid blocking the keepAlive event loop
         final String doorImageChannelIdFinal = doorImageChannelId;
-        scheduler.submit(() -> {
-            byte[] buffer = localClient.requestImage();
-            if (buffer != null && buffer.length > 0) {
-                // Update image channel for the specific button
-                updateImageChannel(doorImageChannelIdFinal, buffer);
-
-                // Save snapshot image
-                saveSnapshot(buffer, resolvedLockNumber);
-            } else {
-                logger.warn("Received empty or null image buffer from VTO3211 button {}", resolvedLockNumber);
-            }
-        });
+        scheduler.submit(() -> requestApiSnapshotForChannel(doorImageChannelIdFinal, "VTO3211 button " + lockNumber,
+                resolvedLockNumber));
     }
 }