Merge pull request #266 from KingfuChan/complement-callsign-for-ws

Complement callsign for ws `kStationStateUpdate` message
pierr3 · Jan 27, 2025 · cc4e9be · cc4e9be
2 parents 05f439e + 7bd2c42
commit cc4e9be
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 17 deletions.
diff --git a/backend/src/main.cpp b/backend/src/main.cpp
@@ -217,6 +217,7 @@ void RemoveFrequency(const Napi::CallbackInfo& info)
     RadioState newState {};
 
     newState.frequency = info[0].As<Napi::Number>().Int32Value();
+    auto callsign = info.Length() > 1 ? info[1].As<Napi::String>().Utf8Value() : "";
     newState.rx = false;
     newState.tx = false;
     newState.xc = false;
@@ -225,7 +226,7 @@ void RemoveFrequency(const Napi::CallbackInfo& info)
     newState.isOutputMuted = false;
     newState.outputVolume = 100;
 
-    RadioHelper::SetRadioState(MainThreadShared::mApiServer, newState, "", false);
+    RadioHelper::SetRadioState(MainThreadShared::mApiServer, newState, callsign, false);
     mClient->RemoveFrequency(newState.frequency);
 
     MainThreadShared::mApiServer->publishFrequencyRemoved(newState.frequency);
@@ -237,19 +238,20 @@ Napi::Boolean SetFrequencyState(const Napi::CallbackInfo& info)
 {
     RadioState newState {};
 
-    newState.frequency = info[0].As<Napi::Number>().Int32Value();
-    newState.rx = info[1].As<Napi::Boolean>().Value();
-    newState.tx = info[2].As<Napi::Boolean>().Value();
-    newState.xc = info[3].As<Napi::Boolean>().Value();
+    auto callsign = info[0].As<Napi::String>().Utf8Value();
+    newState.frequency = info[1].As<Napi::Number>().Int32Value();
+    newState.rx = info[2].As<Napi::Boolean>().Value();
+    newState.tx = info[3].As<Napi::Boolean>().Value();
+    newState.xc = info[4].As<Napi::Boolean>().Value();
     // Note the negation here, as the API uses the opposite of what is saved internally
-    newState.headset = !info[4].As<Napi::Boolean>().Value();
-    newState.xca = info[5].As<Napi::Boolean>().Value(); // Not used
-    newState.isOutputMuted = info.Length() > 6 ? info[6].As<Napi::Boolean>().Value() : false;
-    newState.outputVolume = info.Length() > 7 ? info[7].As<Napi::Number>().FloatValue() : 100;
+    newState.headset = !info[5].As<Napi::Boolean>().Value();
+    newState.xca = info[6].As<Napi::Boolean>().Value(); // Not used
+    newState.isOutputMuted = info.Length() > 7 ? info[7].As<Napi::Boolean>().Value() : false;
+    newState.outputVolume = info.Length() > 8 ? info[8].As<Napi::Number>().FloatValue() : 100;
 
     // SetGuardAndUnicomTransceivers();
 
-    auto result = RadioHelper::SetRadioState(MainThreadShared::mApiServer, newState, "");
+    auto result = RadioHelper::SetRadioState(MainThreadShared::mApiServer, newState, callsign);
     return Napi::Boolean::New(info.Env(), result);
 }
 

diff --git a/backend/types/index.d.ts b/backend/types/index.d.ts
@@ -64,13 +64,17 @@ declare namespace TrackAudioAfv {
     callign: string,
     outputVolume?: number,
   ): Promise<boolean>;
-  export function RemoveFrequency(frequency: number): void;
+  export function RemoveFrequency(
+    frequency: number,
+    callsign?: string,
+  ): void;
   export function IsFrequencyActive(frequency: number): boolean;
 
   export function GetStation(callsign: string): void;
   export function RefreshStation(callsign: string): void;
 
   export function SetFrequencyState(
+    callsign: string,
     frequency: number,
     rx: boolean,
     tx: boolean,

diff --git a/src/main/index.ts b/src/main/index.ts
@@ -578,14 +578,21 @@ ipcMain.handle(
   }
 );
 
-ipcMain.handle('audio-remove-frequency', (_, frequency: number) => {
-  TrackAudioAfv.RemoveFrequency(frequency);
-});
+ipcMain.handle(
+  'audio-remove-frequency',
+  (_, frequency: number, callsign?: string) => {
+    if (callsign) {
+      TrackAudioAfv.RemoveFrequency(frequency, callsign);
+    }
+    TrackAudioAfv.RemoveFrequency(frequency);
+  }
+);
 
 ipcMain.handle(
   'audio-set-frequency-state',
   (
     _,
+    callsign: string,
     frequency: number,
     rx: boolean,
     tx: boolean,
@@ -596,6 +603,7 @@ ipcMain.handle(
     outputVolume?: number
   ) => {
     return TrackAudioAfv.SetFrequencyState(
+      callsign,
       frequency,
       rx,
       tx,

diff --git a/src/preload/bindings.ts b/src/preload/bindings.ts
@@ -63,10 +63,19 @@ export const api = {
 
   addFrequency: (frequency: number, callsign: string, outputVolume?: number) =>
     ipcRenderer.invoke('audio-add-frequency', frequency, callsign, outputVolume),
-  removeFrequency: (frequency: number) => ipcRenderer.invoke('audio-remove-frequency', frequency),
+  removeFrequency: (
+    frequency: number,
+    callsign?: string
+  ) =>
+    ipcRenderer.invoke(
+      'audio-remove-frequency',
+      frequency,
+      callsign
+    ),
   IsFrequencyActive: (frequency: number) =>
     ipcRenderer.invoke('audio-is-frequency-active', frequency),
   setFrequencyState: (
+    callsign: string,
     frequency: number,
     rx: boolean,
     tx: boolean,
@@ -78,6 +87,7 @@ export const api = {
   ) =>
     ipcRenderer.invoke(
       'audio-set-frequency-state',
+      callsign,
       frequency,
       rx,
       tx,

diff --git a/src/renderer/src/components/delete-multiple-radios.tsx b/src/renderer/src/components/delete-multiple-radios.tsx
@@ -42,7 +42,7 @@ const DeleteMultipleRadios: React.FC = () => {
         }
 
         if (!radio.currentlyRx && !radio.currentlyTx) {
-          void window.api.removeFrequency(radio.frequency);
+          void window.api.removeFrequency(radio.frequency, radio.callsign);
           removeRadio(radio.frequency);
           clearInterval(interval);
         }

diff --git a/src/renderer/src/components/radio/radio.tsx b/src/renderer/src/components/radio/radio.tsx
@@ -136,6 +136,7 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
     const newState = !radio.isOutputMuted;
     window.api
       .setFrequencyState(
+        radio.callsign,
         radio.frequency,
         radio.rx,
         radio.tx,
@@ -195,6 +196,7 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
 
     window.api
       .setFrequencyState(
+        radio.callsign,
         radio.frequency,
         newState,
         newState ? radio.tx : false,
@@ -230,6 +232,7 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
 
     window.api
       .setFrequencyState(
+        radio.callsign,
         radio.frequency,
         newState ? true : radio.rx,
         newState,
@@ -263,6 +266,7 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
     const newState = !radio.xc;
     window.api
       .setFrequencyState(
+        radio.callsign,
         radio.frequency,
         newState ? true : radio.rx,
         newState ? true : radio.tx,
@@ -296,6 +300,7 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
     const newState = !radio.crossCoupleAcross;
     window.api
       .setFrequencyState(
+        radio.callsign,
         radio.frequency,
         newState ? true : radio.rx,
         newState ? true : radio.tx,
@@ -329,6 +334,7 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
     const newState = !radio.onSpeaker;
     window.api
       .setFrequencyState(
+        radio.callsign,
         radio.frequency,
         radio.rx,
         radio.tx,
@@ -370,7 +376,7 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
           }
 
           if (!radio.currentlyRx && !radio.currentlyTx) {
-            void window.api.removeFrequency(radio.frequency);
+            void window.api.removeFrequency(radio.frequency, radio.callsign);
             removeRadio(radio.frequency);
             clearInterval(interval);
           }

diff --git a/src/renderer/src/components/radio/unicom-guard.tsx b/src/renderer/src/components/radio/unicom-guard.tsx
@@ -70,6 +70,7 @@ const UnicomGuardBar = () => {
 
     window.api
       .setFrequencyState(
+        radio.callsign,
         radio.frequency,
         newState,
         newState ? radio.tx : false,
@@ -105,6 +106,7 @@ const UnicomGuardBar = () => {
 
     window.api
       .setFrequencyState(
+        radio.callsign,
         radio.frequency,
         newState ? true : radio.rx, // If tx is true, rx must be true
         newState,
@@ -139,6 +141,7 @@ const UnicomGuardBar = () => {
     const newState = !radio.onSpeaker;
     window.api
       .setFrequencyState(
+        radio.callsign,
         radio.frequency,
         radio.rx,
         radio.tx,
@@ -174,6 +177,7 @@ const UnicomGuardBar = () => {
     const newState = !radio.isOutputMuted;
     window.api
       .setFrequencyState(
+        radio.callsign,
         radio.frequency,
         radio.rx,
         radio.tx,