From 020091e2274eef5a6c0a24188bb552a7700f8c86 Mon Sep 17 00:00:00 2001
From: topilski <atopilski@gmail.com>
Date: Tue, 3 Sep 2019 09:40:47 -0400
Subject: [PATCH] Fixed requests

---
 app/service/service_manager.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/service/service_manager.py b/app/service/service_manager.py
index 9d35a06..edcf58f 100644
--- a/app/service/service_manager.py
+++ b/app/service/service_manager.py
@@ -16,6 +16,7 @@ class SubscriberConnection(SubscriberClient):
         self._current_stream_id = str()
         self._device = None
         self._last_ping_ts = make_utc_timestamp() / 1000
+        self._request_id = 0
 
     @property
     def info(self) -> Subscriber:
@@ -57,6 +58,11 @@ class SubscriberConnection(SubscriberClient):
         self.process_commands(data)
         return True
 
+    def gen_request_id(self) -> int:
+        current_value = self._request_id
+        self._request_id += 1
+        return current_value
+
 
 class ServiceManager(IClientHandler):
     SUBSCRIBER_PORT = 6000
@@ -123,7 +129,7 @@ class ServiceManager(IClientHandler):
 
             for client in self._subscribers:
                 if ts_sec - client.last_ping_ts > ServiceManager.PING_SUBSCRIBERS_SEC:
-                    client.ping()
+                    client.ping(client.gen_request_id())
                     client.last_ping_ts = ts_sec
 
     def process_response(self, client, req: Request, resp: Response):
@@ -216,7 +222,7 @@ class ServiceManager(IClientHandler):
             client.disconnect()
             return
 
-        client.pong()
+        client.pong(cid)
 
     def _handle_get_channels(self, client, cid: str, params: dict):
         if not self._check_is_auth_client(client):