From 2ff7a20ebac578e5822e88d21b6fada678742b54 Mon Sep 17 00:00:00 2001
From: f1d094 <f1d094@example.com>
Date: Sat, 24 Feb 2024 18:26:43 -0800
Subject: [PATCH] Modified func Close in pkg/isapi/client.go to call
 '/ISAPI/System/TwoWayAudio/channels/<channel id>/close' instead of
 '/ISAPI/System/TwoWayAudio/channels/<channel id/close/open'

Modified pkg/isapi/client.go to call 'close' before 'open' to prevent channel left open from prior connection blocking with 401 or 403 errors.
---
 pkg/isapi/client.go | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/pkg/isapi/client.go b/pkg/isapi/client.go
index ab903481..bffe62f5 100644
--- a/pkg/isapi/client.go
+++ b/pkg/isapi/client.go
@@ -84,30 +84,23 @@ func (c *Client) Dial() (err error) {
 }
 
 func (c *Client) Open() (err error) {
-	link := c.url + "/ISAPI/System/TwoWayAudio/channels/" + c.channel
-
    // Hikvision ISAPI may not accept a new open request if the previous one was not closed (e.g.
    // using the test button on-camera or via curl command) but a close request can be sent even if
    // the audio is already closed. So, we send a close request first and then open it again. Seems
    // janky but it works.
-	req, err := http.NewRequest("PUT", link+"/close", nil)
+
+   err = c.Close()
+   if err != nil {
+      return err
+   }
+
+	link := c.url + "/ISAPI/System/TwoWayAudio/channels/" + c.channel
+	req, err := http.NewRequest("PUT", link+"/open", nil)
 	if err != nil {
 		return err
 	}
 
 	res, err := tcp.Do(req)
-	if err != nil {
-		return err
-	}
-
-	tcp.Close(res)
-
-	req, err = http.NewRequest("PUT", link+"/open", nil)
-	if err != nil {
-		return err
-	}
-
-	res, err = tcp.Do(req)
 	if err != nil {
 		return
 	}