X-Git-Url: https://gitweb.ps.run/autorec/blobdiff_plain/f0e7eee62c3b7c71a7accfb7a2cb6e1ed1f566bc..HEAD:/src/ws.h

diff --git a/src/ws.h b/src/ws.h
index 058f69b..d3acb27 100644
--- a/src/ws.h
+++ b/src/ws.h
@@ -11,13 +11,16 @@ namespace ws
   mg_mgr mgr;
   mg_connection *c = nullptr;
 
-  bool done = false;
+  bool isConnected = false;
 
   std::function<void()> onConnect;
+  std::function<void()> onClose;
+  std::function<void()> onError;
 
   static void cb(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
     if (ev == MG_EV_WS_OPEN) {
       puts("Open");
+      isConnected = true;
     } else if (ev == MG_EV_WS_MSG) {
       struct mg_ws_message *wm = (struct mg_ws_message *) ev_data;
       printf("Msg: %.*s\n", (int)wm->data.len, wm->data.ptr);
@@ -44,12 +47,16 @@ namespace ws
     }
 
     if (ev == MG_EV_ERROR) {
-      puts("Error");
-      done = true;
+      printf("Error: %s\n", (char*)ev_data);
+      isConnected = false;
+      if (onError)
+          onError();
     }
     if (ev == MG_EV_CLOSE) {
       puts("Close");
-      done = true;
+      isConnected = false;
+      if (onClose)
+        onClose();
     }
   }
 
@@ -65,7 +72,7 @@ namespace ws
 
   void update()
   {
-    if (c && !done)
+    if (c)
       mg_mgr_poll(&mgr, 10);
   }
 
@@ -75,7 +82,7 @@ namespace ws
                       { "d",
                         {
                           { "requestType", requestType },
-                          { "requestId", std::to_string(NULL).c_str() }
+                          { "requestId", std::to_string(time(nullptr)).c_str() }
                         } } };
     auto requestStr = request.dump();
     mg_ws_send(c, requestStr.c_str(), requestStr.size(), WEBSOCKET_OP_TEXT);