Fix Ptt crash on mac #77

pierr3 · May 31, 2024 · 00ffcf4 · 00ffcf4
1 parent e7a1d99
commit 00ffcf4
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 24 deletions.
diff --git a/backend/include/RemoteData.hpp b/backend/include/RemoteData.hpp
@@ -1,3 +1,4 @@
+#pragma once
 #include <Poco/Timer.h>
 #include <absl/strings/match.h>
 #include <absl/strings/str_split.h>

diff --git a/backend/include/sdkWebsocketMessage.hpp b/backend/include/sdkWebsocketMessage.hpp
@@ -98,10 +98,8 @@ class Station {
 
 // Example of kTxBegin message:
 // @type the type of the message
-// @value the frequencies which are being transmitted on
-// JSON: {"type": "kTxBegin", "value": {"pFrequenciesHz": [123000000, 118000000]}}
+// JSON: {"type": "kTxBegin", "value": {}}
 
 // Example of kTxEnd message:
 // @type the type of the message
-// @value the frequencies which were being transmitted on
-// JSON: {"type": "kTxEnd", "value": {"pFrequenciesHz": [123000000, 118000000]}}
+// JSON: {"type": "kTxEnd", "value": {}}
diff --git a/backend/package.json b/backend/package.json
@@ -12,7 +12,7 @@
     },
     "types": "types/index.d.ts",
     "scripts": {
-        "build": "cmake-js compile -B Release && node custom_build.mjs && npm pack",
+        "build": "cmake-js compile -B Release -p 8 && node custom_build.mjs && npm pack",
         "format": "clang-format -i include/**.hpp && clang-format -i include/**.h && clang-format -i src/**.cpp"
     },
     "cmake-js": {

diff --git a/backend/src/main.cpp b/backend/src/main.cpp
@@ -303,6 +303,7 @@ void SetPtt(const Napi::CallbackInfo& info)
     }
 
     bool state = info[0].As<Napi::Boolean>().Value();
+
     mClient->SetPtt(state);
 }
 

diff --git a/backend/src/sdk.cpp b/backend/src/sdk.cpp
@@ -73,31 +73,33 @@ void SDK::handleAFVEventForWebsocket(sdk::types::Event event,
     }
 
     if (event == sdk::types::Event::kTxBegin) {
-        auto allRadios = mClient->getRadioState();
-        std::vector<unsigned int> allTxRadioFreqs;
-        for (const auto& [freq, state] : allRadios) {
-            if (state.tx) {
-                allTxRadioFreqs.push_back(freq);
-            }
-        }
+        // auto allRadios = mClient->getRadioState();
+        // std::vector<unsigned int> allTxRadioFreqs;
+        // for (const auto& [freq, state] : allRadios) {
+        //     if (state.tx) {
+        //         allTxRadioFreqs.push_back(freq);
+        //     }
+        // }
 
         nlohmann::json jsonMessage = WebsocketMessage::buildMessage(WebsocketMessageType::kTxBegin);
-        jsonMessage["value"]["pFrequenciesHz"] = allTxRadioFreqs;
+        // jsonMessage["value"]["pFrequenciesHz"] = allTxRadioFreqs;
         this->broadcastOnWebsocket(jsonMessage.dump());
+        return;
     }
 
     if (event == sdk::types::Event::kTxEnd) {
-        auto allRadios = mClient->getRadioState();
-        std::vector<unsigned int> allTxRadioFreqs;
-        for (const auto& [freq, state] : allRadios) {
-            if (state.tx) {
-                allTxRadioFreqs.push_back(freq);
-            }
-        }
+        // auto allRadios = mClient->getRadioState();
+        // std::vector<unsigned int> allTxRadioFreqs;
+        // for (const auto& [freq, state] : allRadios) {
+        //     if (state.tx) {
+        //         allTxRadioFreqs.push_back(freq);
+        //     }
+        // }
 
         nlohmann::json jsonMessage = WebsocketMessage::buildMessage(WebsocketMessageType::kTxEnd);
-        jsonMessage["value"]["pFrequenciesHz"] = allTxRadioFreqs;
+        // jsonMessage["value"]["pFrequenciesHz"] = allTxRadioFreqs;
         this->broadcastOnWebsocket(jsonMessage.dump());
+        return;
     }
 
     if (event == sdk::types::Event::kFrequencyStateUpdate) {
@@ -158,7 +160,7 @@ std::unique_ptr<restinio::router::express_router_t<>> SDK::buildRouter()
             .connection_close()
             .done();
     };
-
+    
     router->add_handler(
         restinio::router::none_of_methods(restinio::http_method_get()), "/", methodNotAllowed);
 

diff --git a/package-lock.json b/package-lock.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -303,6 +303,7 @@ void SetPtt(const Napi::CallbackInfo& info) @@
         }
         bool state = info[0].As<Napi::Boolean>().Value();
         mClient->SetPtt(state);
     }
@@ Expand Down @@