Merge branch 'master' into ai_server

Author: connortechnology

.eslintignore

@@ -1,4 +1,5 @@
 *.min.js
+eslint.config.js
 
 # libraries
 web/api/lib

.gitmodules

@@ -8,3 +8,6 @@
 [submodule "dep/RtspServer"]
 	path = dep/RtspServer
 	url = https://github.com/ZoneMinder/RtspServer
+[submodule "dep/CxxUrl"]
+	path = dep/CxxUrl
+	url = https://github.com/chmike/CxxUrl.git

CMakeLists.txt

@@ -404,6 +404,9 @@ else()
     "ZoneMinder requires jpeg but it was not found on your system")
 endif()
 
+list(APPEND ZM_BIN_LIBS chmike::CxxUrl)
+
+
 # libjwt
 if (${ZM_JWT_BACKEND} STREQUAL "libjwt")
   find_package(LibJWT REQUIRED COMPONENTS ${ZM_CRYPTO_BACKEND})

dep/CMakeLists.txt

@@ -2,3 +2,4 @@ add_subdirectory(jwt-cpp)
 add_subdirectory(libbcrypt)
 add_subdirectory(RtspServer)
 add_subdirectory(span-lite)
+add_subdirectory(CxxUrl)

dep/CxxUrl

@@ -385,22 +385,22 @@ Return a list of events for a specific monitor within a specific date/time range
 
 ::
 
-  http://server/zm/api/events/index/MonitorId:5/StartTime >=:2015-05-15 18:43:56/EndTime <=:2015-05-16 18:43:56.json
+  http://server/zm/api/events/index/MonitorId:5/StartDateTime >=:2015-05-15 18:43:56/EndDateTime <=:2015-05-16 18:43:56.json
 
 
 To try this in CuRL, you need to URL escape the spaces like so:
 
 ::
 
-  curl -XGET  "http://server/zm/api/events/index/MonitorId:5/StartTime%20>=:2015-05-15%2018:43:56/EndTime%20<=:2015-05-16%2018:43:56.json"
+  curl -XGET  "http://server/zm/api/events/index/MonitorId:5/StartDateTime%20>=:2015-05-15%2018:43:56/EndDateTime%20<=:2015-05-16%2018:43:56.json"
 
 
 Return a list of events for all monitors within a specified date/time range
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 ::
 
-  curl -XGET "http://server/zm/api/events/index/StartTime%20>=:2015-05-15%2018:43:56/EndTime%20<=:208:43:56.json"
+  curl -XGET "http://server/zm/api/events/index/StartDateTime%20>=:2015-05-15%2018:43:56/EndDateTime%20<=:208:43:56.json"
 
 
 Return event count based on times and conditions
@@ -430,7 +430,7 @@ This returns a list of events within a time range and also sorts it by descendin
 
 ::
 
-  curl -XGET "http://server/zm/api/events/index/StartTime%20>=:2015-05-15%2018:43:56/EndTime%20<=:208:43:56.json?sort=StartTime&direction=desc"
+  curl -XGET "http://server/zm/api/events/index/StartDateTime%20>=:2015-05-15%2018:43:56/EndDateTime%20<=:208:43:56.json?sort=StartDateTime&direction=desc"
 
 
 Configuration Apis

docs/api.rst

@@ -405,6 +405,7 @@ sub guess_credentials {
   my $self = shift;
 
   require URI;
+  my $uri;
 
   # Extract the username/password host/port from ControlAddress
   if ($self->{Monitor}{ControlAddress}
@@ -414,7 +415,7 @@ sub guess_credentials {
     $self->{Monitor}{ControlAddress} ne 'user:port@ip'
   ) {
     Debug("Using ControlAddress for credentials: $self->{Monitor}{ControlAddress}");
-    my $uri = URI->new($self->{Monitor}->{ControlAddress});
+    $uri = URI->new($self->{Monitor}->{ControlAddress});
     $uri = URI->new('http://'.$self->{Monitor}->{ControlAddress}) if ref($uri) eq 'URI::_foreign';
     $$self{host} = $uri->host();
     if ( $uri->userinfo()) {
@@ -443,7 +444,7 @@ sub guess_credentials {
       $$self{username}= $self->{Monitor}->{User} if $self->{Monitor}->{User} and !$$self{username};
       $$self{password} = $self->{Monitor}->{Pass} if $self->{Monitor}->{Pass} and !$$self{password};
     }
-    my $uri = URI->new($self->{Monitor}->{Path});
+    $uri = URI->new($self->{Monitor}->{Path});
     $uri->scheme('http');
     $uri->port(80);
     $uri->path('');
@@ -452,6 +453,7 @@ sub guess_credentials {
   } else {
     Debug('Unable to guess credentials');
   }
+  return $uri;
 }
 
 sub get_realm {
@@ -501,7 +503,10 @@ sub get_realm {
 sub ping {
   my $self = shift;
   my $ip = @_ ? shift : $$self{host};
-  return undef if ! $ip;
+  if (!$ip) {
+    Warning("No ip to ping. Please either pass ip or populate self{host}");
+    return undef;
+  }
 
   require Net::Ping;
   Debug("Pinging $ip");

scripts/ZoneMinder/lib/ZoneMinder/Control.pm

@@ -53,35 +53,20 @@ sub open {
 
   $self->loadMonitor();
 
-  if ($self->{Monitor}->{ControlAddress} and ($self->{Monitor}->{ControlAddress} ne 'user:pass@ip')) {
-    Debug("Getting connection details from Control Address " . $self->{Monitor}->{ControlAddress});
-    if ( $self->{Monitor}->{ControlAddress} !~ /^\w+:\/\// ) {
-      # Has no scheme at the beginning, so won't parse as a URI
-      $self->{Monitor}->{ControlAddress} = 'http://'.$self->{Monitor}->{ControlAddress};
-    }
-    $uri = URI->new($self->{Monitor}->{ControlAddress});
-  } elsif ($self->{Monitor}->{Path}) {
-    Debug("Getting connection details from Path " . $self->{Monitor}->{Path});
-    $uri = URI->new($self->{Monitor}->{Path});
-    $uri->scheme('http');
-    $uri->port(80);
-    $uri->path('');
-  }
+  my $uri = $self->guess_credentials();
+  $uri = new URI() if ! $uri;;
+  # For parent get
+  $$self{BaseURL} = $uri->canonical();
 
   use LWP::UserAgent;
   $self->{ua} = LWP::UserAgent->new;
   $self->{ua}->cookie_jar( {} );
   $self->{ua}->agent('ZoneMinder Control Agent/'.ZoneMinder::Base::ZM_VERSION);
   $self->{state} = 'closed';
 
-  my ( $username, $password, $host ) = ( $uri->authority() =~ /^([^:]+):([^@]*)@(.+)$/ );
-  Debug("Have username: $username password: $password host: $host from authority:" . $uri->authority());
-  
-  $uri->userinfo(undef);
-
   my $realm = $self->{Monitor}->{ControlDevice};
 
-  $self->{ua}->credentials($uri->host_port(), $realm, $username, $password);
+  $self->{ua}->credentials($uri->host_port(), $realm, $$self{username}, $$self{password});
   my $url = '/axis-cgi/param.cgi?action=list&group=Properties.PTZ.PTZ';
 
   # test auth
@@ -92,7 +77,7 @@ sub open {
       Warning('Response suggests that camera doesn\'t support PTZ. Content:('.$res->content().')');
     }
     $self->{state} = 'open';
-    return;
+    return !undef;
   }
   if ($res->status_line() eq '404 Not Found') {
     #older style
@@ -113,12 +98,12 @@ sub open {
         if ( $tokens =~ /\w+="([^"]+)"/i ) {
           if ( $realm ne $1 ) {
             $realm = $1;
-            $self->{ua}->credentials($uri->host_port(), $realm, $username, $password);
+            $self->{ua}->credentials($uri->host_port(), $realm, $$self{username}, $$self{password});
             $res = $self->{ua}->get($uri->canonical().$url);
             if ( $res->is_success() ) {
               Info("Auth succeeded after setting realm to $realm.  You can set this value in the Control Device field to speed up connections and remove these log entries.");
               $self->{state} = 'open';
-              return;
+              return !undef;
             }
             Error('Authentication still failed after updating REALM status: '.$res->status_line);
           } else {
@@ -131,11 +116,10 @@ sub open {
     } else {
       Debug('No headers line');
     } # end if headers
-    # For parent get
-    $$self{BaseURL} = $uri->canonical();
   } else {
     Debug('Failed to open '.$uri->canonical().$url.' status: '.$res->status_line());
   } # end if $res->status_line() eq '401 Unauthorized'
+  return undef;
 } # end sub open
 
 sub sendCmd {
@@ -352,13 +336,10 @@ sub moveStop {
   my $speed = 0;
   Debug('Move Stop');
   # we have to stop both pans and zooms
-  my $cmd = "/axis-cgi/com/ptz.cgi?continuouspantiltmove=$speed,$speed";
-  $self->sendCmd($cmd);
-  my $cmd = "/axis-cgi/com/ptz.cgi?continuouszoommove=$speed";
-  $self->sendCmd($cmd);
+  $self->sendCmd("/axis-cgi/com/ptz.cgi?continuouspantiltmove=$speed,$speed");
+  $self->sendCmd("/axis-cgi/com/ptz.cgi?continuouszoommove=$speed");
 }
 
-
 sub zoomRelTele {
   my $self = shift;
   my $params = shift;

scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm

@@ -423,11 +423,15 @@ class Monitor : public std::enable_shared_from_this<Monitor> {
     Monitor *parent;
     bool alarmed;
     bool healthy;
-    std::string amcrest_response;
+    std::string last_topic;
+    std::string last_value;
+
+    std::string response;
     CURLM *curl_multi = nullptr;
     CURL *Amcrest_handle = nullptr;
-    static size_t WriteCallback(void *contents, size_t size, size_t nmemb,
-                                void *userp);
+    static size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp);
+    std::mutex   alarms_mutex;
+    std::mutex   response_mutex;
 
    public:
     explicit AmcrestAPI(Monitor *parent_);