Merge remote-tracking branch 'origin/master'

hawkeye64 · Feb 25, 2021 · afaf54c · afaf54c
2 parents 1b12a7c + cdcb70b
commit afaf54c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/dist/camera.js b/dist/camera.js
@@ -312,7 +312,7 @@ class Camera {
               }
             }
 
-            if (this.events) {
+            if (this.events && this.analytics) {
               if ('WSPullPointSupport' in events && events.WSPullPointSupport === 'true') {
                 this.analytics.wsPullPointSupport = true;
               }

diff --git a/lib/camera.js b/lib/camera.js
@@ -386,7 +386,7 @@ class Camera {
                   this.events.init(this.timeDiff, serviceAddress, this.username, this.password)
                 }
               }
-              if (this.events) {
+              if (this.events && this.analytics) {
                 if ('WSPullPointSupport' in events && events.WSPullPointSupport === 'true') {
                   this.analytics.wsPullPointSupport = true
                 }

diff --git a/lib/modules/events.js b/lib/modules/events.js
@@ -398,8 +398,12 @@ class Events extends EventEmitter {
 
       let soapBody = ''
       soapBody = '<tev:PullMessages>'
-      soapBody += '<tev:Timeout>PT1M</tev:Timeout>'
-      soapBody += '<tev:MessageLimit>99</tev:MessageLimit>'
+      soapBody += '<tev:Timeout>'
+      soapBody += timeout
+      soapBody += '</tev:Timeout>'
+      soapBody += '<tev:MessageLimit>'
+      soapBody += messageLimit.toString()
+      soapBody += '</tev:MessageLimit>'
       soapBody += '</tev:PullMessages>'
 
       this.buildRequest('PullMessages', soapBody, subscriptionId)