X-Git-Url: https://gitweb.ps.run/autorec/blobdiff_plain/e90fc8a9809127820252a09dd7bfbbbc7a6f295d..refs/heads/main:/src/ws.h?ds=sidebyside

diff --git a/src/ws.h b/src/ws.h
index ecc88b3..d3acb27 100644
--- a/src/ws.h
+++ b/src/ws.h
@@ -4,18 +4,26 @@
 using json = nlohmann::json;
 
 #include <string>
+#include <functional>
 
 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);
       std::string jsonStr(wm->data.ptr, wm->data.len);
       auto msg = json::parse(jsonStr);
       int op = msg["op"].get<int>();
@@ -32,17 +40,23 @@ namespace ws
       }
       else if (op == 2)
       {
-        MessageBoxA(NULL, "hura", "connected", MB_OK);
+        puts("Connected");
+        if (onConnect)
+          onConnect();
       }
     }
 
     if (ev == MG_EV_ERROR) {
-      MessageBoxA(NULL, "", "Error", MB_OK);
-      done = true;
+      printf("Error: %s\n", (char*)ev_data);
+      isConnected = false;
+      if (onError)
+          onError();
     }
     if (ev == MG_EV_CLOSE) {
-      MessageBoxA(NULL, "", "Close", MB_OK);
-      done = true;
+      puts("Close");
+      isConnected = false;
+      if (onClose)
+        onClose();
     }
   }
 
@@ -58,7 +72,7 @@ namespace ws
 
   void update()
   {
-    if (c && !done)
+    if (c)
       mg_mgr_poll(&mgr, 10);
   }
 
@@ -68,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);