first release of chat

several bug fixes

gui/main.js

@@ -454,6 +454,9 @@ ipcMain.on('request-update-rx-msg-buffer', (event, arg) => {
 ipcMain.on('request-new-msg-received', (event, arg) => {
     chat.webContents.send('action-new-msg-received', arg);
 });
+ipcMain.on('request-update-transmission-status', (event, arg) => {
+    chat.webContents.send('action-update-transmission-status', arg);
+});
 
 ipcMain.on('request-open-tnc-log', (event) => {
     logViewer.show();

gui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "FreeDATA",
-  "version": "0.1.2-alpha",
+  "version": "0.2.0-alpha",
   "description": "FreeDATA ",
   "main": "main.js",
   "scripts": {
@@ -35,8 +35,12 @@
     "chartjs-plugin-annotation": "^1.0.2",
     "electron-log": "^4.4.6",
     "electron-updater": "^5.0.0",
+    "emoji-picker-element": "^1.11.0",
+    "emoji-picker-element-data": "^1.3.0",
     "pouchdb": "^7.2.2",
+    "pouchdb-find": "^7.2.2",
     "qth-locator": "^2.1.0",
+    "utf8": "^3.0.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {

gui/preload-chat.js

@@ -4,6 +4,7 @@ const {
 } = require('electron')
 
 const { v4: uuidv4 } = require('uuid');
+const utf8 = require('utf8');
 
 // https://stackoverflow.com/a/26227660
 var appDataFolder = process.env.APPDATA || (process.platform == 'darwin' ? process.env.HOME + '/Library/Application Support' : process.env.HOME + "/.config")
@@ -26,6 +27,7 @@ var chatDB = path.join(configFolder, 'chatDB')
 
 // ---- MessageDB
 var PouchDB = require('pouchdb');
+PouchDB.plugin(require('pouchdb-find'));
 var db = new PouchDB(chatDB);
 
 
@@ -37,18 +39,44 @@ var db = new PouchDB(chatDB);
 
 
 
+
+
 var dxcallsigns = new Set();
 
-db.allDocs({
+
-  include_docs: true,
+
-  attachments: true
+
+
+
+db.createIndex({
+  index: {
+    fields: ['timestamp', 'uuid', 'dxcallsign', 'dxgrid', 'msg', 'checksum', 'type', 'command', 'status']
+  }
 }).then(function (result) {
   // handle result
-  // get all dxcallsigns and append to list
+  console.log(result)
-  result.rows.forEach(function(item) {
+}).catch(function (err) {
-    update_chat(item.doc)
+  console.log(err);
 });
 
+
+          
+db.find({
+          selector: {
+            timestamp: {$exists: true}},
+          sort: [{'timestamp': 'asc'}]
+        }).then(function (result) {
+  // handle result
+  console.log(result);
+  console.log(typeof(result));
+  if(typeof(result) !== 'undefined'){
+  result.docs.forEach(function(item) {
+ 
+    update_chat(item);
+  
+    });
+    
+    }
 }).catch(function (err) {
   console.log(err);
 });
@@ -58,37 +86,74 @@ db.allDocs({
 // WINDOW LISTENER
 window.addEventListener('DOMContentLoaded', () => {
 
+ 
+    document.querySelector('emoji-picker').addEventListener("emoji-click", (event) => {  
+  document.getElementById('chatModuleMessage').setRangeText(event.detail.emoji.unicode)
+  
+  
+  console.log(event.detail);
+})
+  
+  
+  
+document.getElementById("emojipickerbutton").addEventListener("click", () => {  
+var element = document.getElementById("emojipickercontainer")
+
+    console.log(element.style.display);
+    
+    
+  if (element.style.display === "none") {
+    element.style.display = "block";
+  } else {
+    element.style.display = "none";
+  }
+
+
+
+
+})
+
+
     // SEND MSG
     document.getElementById("sendMessage").addEventListener("click", () => {
+            document.getElementById('emojipickercontainer').style.display = "none";
+            var dxcallsign = document.getElementById('chatModuleDxCall').value;
+            dxcallsign = dxcallsign.toUpperCase();
             
-            var dxcallsign = document.getElementById('chatModuleDxCall').value
+            var chatmessage = document.getElementById('chatModuleMessage').value;
-            dxcallsign = dxcallsign.toUpperCase()
+            //chatmessage = Buffer.from(chatmessage, 'utf-8').toString();
-            message = document.getElementById('chatModuleMessage').value
+
-            console.log(dxcallsign)
+            
+            
+            var uuid = uuidv4();
+            console.log(chatmessage)
             let Data = {
                 command: "send_message",
                 dxcallsign : dxcallsign, 
                 mode : 255, 
                 frames : 1, 
-                data : message, 
+                data : chatmessage, 
-                checksum : '123'
+                checksum : '123',
+                uuid : uuid
             };
             ipcRenderer.send('run-tnc-command', Data);
             
             
-        var uuid = uuidv4();
+        
         db.post({
           _id: uuid,
           timestamp: Math.floor(Date.now() / 1000),
           dxcallsign: dxcallsign,
           dxgrid: 'NULL',
-          msg: message,
+          msg: chatmessage,
           checksum: 'NULL',
-          type: "transmit"
+          type: "transmit",
+          status: 'transmit',
+          uuid: uuid
         }).then(function (response) {
           // handle response
-          console.log("new database entry")
+          console.log("new database entry");
-          console.log(response)
+          console.log(response);
      
         }).catch(function (err) {
           console.log(err);
@@ -112,10 +177,46 @@ window.addEventListener('DOMContentLoaded', () => {
         document.getElementById('chatModuleMessage').value = ''  
          
                 
-                
     })
 
 
+});
+
+
+
+ipcRenderer.on('action-update-transmission-status', (event, arg) => {
+
+    console.log(arg.status);
+    console.log(arg.uuid);
+
+
+db.get(arg.uuid).then(function(doc) {
+
+  return db.put({
+    _id: arg.uuid,
+    _rev: doc._rev,
+      timestamp: doc.timestamp,
+      dxcallsign: doc.dxcallsign,
+      dxgrid: doc.dxgrid,
+      msg: doc.msg,
+      checksum: doc.checksum,
+      type: "transmit",
+      status: arg.status,
+      uuid: doc.uuid
+  });
+}).then(function(response) {
+  // handle response
+          db.get(arg.uuid).then(function (doc) {
+          // handle doc
+          update_chat(doc);
+        }).catch(function (err) {
+          console.log(err);
+        });  
+}).catch(function (err) {
+  console.log(err);
+});
+
+    
     
     
     
@@ -123,29 +224,30 @@ window.addEventListener('DOMContentLoaded', () => {
 });
 
 ipcRenderer.on('action-new-msg-received', (event, arg) => {
-    console.log(arg.data)
+    console.log(arg);
+    console.log(arg.data);
+    
+    var new_msg = arg.data;
     
-    var new_msg = arg.data
     new_msg.forEach(function(item) {
-        console.log(item)
+        console.log(item);
     //for (i = 0; i < arg.data.length; i++) {
         
         let obj = new Object();
         
         var encoded_data = atob(item.data);
-        var splitted_data = encoded_data.split(split_char)
+        var splitted_data = encoded_data.split(split_char);
-
+        console.log(utf8.decode(splitted_data[3]));
         //obj.uuid = item.uuid;
-        item.checksum = splitted_data[2]
+        item.command = splitted_data[1];
-        item.msg = splitted_data[3]
+        item.checksum = splitted_data[2];
+        // convert message to unicode from utf8 because of emojis
+        item.uuid = utf8.decode(splitted_data[3]);
+        item.msg = utf8.decode(splitted_data[4]);
         //obj.dxcallsign = item.dxcallsign;
         //obj.dxgrid = item.dxgrid;
         //obj.timestamp = item.timestamp;
-     
+        item.status = 'null';
-        
-
-
-
 
 
         // check if message not exists in database.
@@ -161,15 +263,18 @@ ipcRenderer.on('action-new-msg-received', (event, arg) => {
         db.put({
           _id: item.uuid,
           timestamp: item.timestamp,
+          uuid: item.uuid,
           dxcallsign: item.dxcallsign,
           dxgrid: item.dxgrid,
           msg: item.msg,
           checksum: item.checksum,
-          type: "received"
+          type : "received",
+          command : item.command,
+          status : item.status
         }).then(function (response) {
           // handle response
-          console.log("new database entry")
+          console.log("new database entry");
-          console.log(response)
+          console.log(response);
      
         }).catch(function (err) {
           console.log(err);
@@ -182,7 +287,7 @@ ipcRenderer.on('action-new-msg-received', (event, arg) => {
           // handle doc
           
           // timestamp
-          update_chat(doc)
+          update_chat(doc);
         }).catch(function (err) {
           console.log(err);
         });
@@ -190,43 +295,26 @@ ipcRenderer.on('action-new-msg-received', (event, arg) => {
 console.log("...................................")
 return
 
-
-
-        
-        
-        
-       
-        
-        
     });
 
-
-      
-      
-      
-      
-
 });
 
 
-
-
-
-
-
-
 // Update chat list
 update_chat = function(obj) {
         
+console.log(obj);
         var dxcallsign = obj.dxcallsign;
+        var timestamp = dateFormat.format(obj.timestamp * 1000);
+        var dxgrid = obj.dxgrid;
     
     // CALLSIGN LIST
     if(!(document.getElementById('chat-' + dxcallsign + '-list'))){
         var new_callsign = `
-            <a class="list-group-item list-group-item-action" id="chat-${dxcallsign}-list" data-bs-toggle="list" href="#chat-${dxcallsign}" role="tab" aria-controls="chat-${dxcallsign}">
+            <a class="list-group-item list-group-item-action rounded-4 border-1 mb-2" id="chat-${dxcallsign}-list" data-bs-toggle="list" href="#chat-${dxcallsign}" role="tab" aria-controls="chat-${dxcallsign}">
                       <div class="d-flex w-100 justify-content-between">
                         <h5 class="mb-1">${dxcallsign}</h5>
-                        <!--<small>3 days ago</small>-->
+                        <small>${dxgrid}</small>
                       </div>
                       <!--<p class="mb-1">JN48ea</p>-->
                   </a>
@@ -252,9 +340,21 @@ update_chat = function(obj) {
     }
     
  
+    
     // APPEND MESSAGES TO CALLSIGN
 
-    var timestamp = dateFormat.format(obj.timestamp * 1000);
+            if (obj.status == 'transmit'){
+                var message_class = 'card text-right border-primary bg-primary';
+            }else if (obj.status == 'transmitting'){
+                var message_class = 'card text-right border-warning bg-warning';
+            }else if (obj.status == 'failed'){
+                var message_class = 'card text-right border-danger bg-danger';
+            }else if (obj.status == 'success'){
+                var message_class = 'card text-right border-success bg-success';   
+            } else {
+                var message_class = 'card text-right border-secondary bg-secondary';
+            }   
+            
     
     if(!(document.getElementById('msg-' + obj._id))){
         if (obj.type == 'received'){
@@ -276,9 +376,10 @@ update_chat = function(obj) {
             var new_message = `
                 <div class="ml-auto mt-3 mb-0 w-75" style="margin-left: auto;">
                     <p class="font-monospace text-right mb-0 text-muted" style="text-align: right;">${timestamp}</p> 
-                    <div class="card text-right border-primary bg-primary" id="msg-${obj._id}">
+                    <div class="${message_class}" id="msg-${obj._id}">
                       <div class="card-body">
                         <p class="card-text text-white text-break text-wrap">${obj.msg}</p>
+
                       </div>
                     </div>
                 </div>
@@ -290,6 +391,10 @@ update_chat = function(obj) {
     document.getElementById(id).insertAdjacentHTML("beforeend", new_message);
     var element = document.getElementById("message-container");
     element.scrollTo(0,element.scrollHeight);
+    } else if(document.getElementById('msg-' + obj._id)) {
+            id = "msg-" + obj._id;
+            document.getElementById(id).className = message_class;
+        }   
 }
 
-}
+

gui/preload-main.js

@@ -368,6 +368,7 @@ document.getElementById('openReceivedFilesFolder').addEventListener('click', ()
     // on change ping callsign
         document.getElementById("dataModalDxCall").addEventListener("change", () => {
         document.getElementById("dxCall").value = document.getElementById("dataModalDxCall").value;
+        
             });
         
     
@@ -763,6 +764,8 @@ document.getElementById('openReceivedFilesFolder').addEventListener('click', ()
             bstransmitFileSidebar.show()   
         */
         
+        
+    
         var fileList = document.getElementById("dataModalFile").files;
 
         var reader = new FileReader();
@@ -786,7 +789,10 @@ document.getElementById('openReceivedFilesFolder').addEventListener('click', ()
                 data: data,
                 checksum: '123123123',
             };
+            // only send command if dxcallsign entered and we have a file selected
+            if(document.getElementById("dataModalDxCall").value.length > 0){
                 ipcRenderer.send('run-tnc-command', Data);
+            }
         };
         reader.onerror = function(e) {
             // error occurred
@@ -794,7 +800,7 @@ document.getElementById('openReceivedFilesFolder').addEventListener('click', ()
         };
 
     })
-    // START TRANSMISSION
+    // STOP TRANSMISSION
     document.getElementById("stopTransmission").addEventListener("click", () => {
             let Data = {
                 command: "stop_transmission"
@@ -802,6 +808,16 @@ document.getElementById('openReceivedFilesFolder').addEventListener('click', ()
             ipcRenderer.send('run-tnc-command', Data);    
     })
     
+    // STOP TRANSMISSION AND CONNECRTION
+    document.getElementById("stop_transmission_connection").addEventListener("click", () => {
+            let Data = {
+                command: "stop_transmission"
+            };
+            ipcRenderer.send('run-tnc-command', Data);
+            sock.disconnectARQ();    
+    })
+    
+    
     // OPEN CHAT MODULE
     document.getElementById("openRFChat").addEventListener("click", () => {
             let Data = {
@@ -812,6 +828,9 @@ document.getElementById('openReceivedFilesFolder').addEventListener('click', ()
     
     
     
+    
+
+  
 })
 
   
@@ -1675,15 +1694,13 @@ ipcRenderer.on('action-update-rx-buffer', (event, arg) => {
         tbl.appendChild(row);
 
         // https://stackoverflow.com/a/26227660
-        var appDataFolder = process.env.HOME;
+        //var appDataFolder = process.env.HOME;
-        console.log("appDataFolder:" + appDataFolder);
+        //console.log("appDataFolder:" + appDataFolder);
-        var applicationFolder = path.join(appDataFolder, "FreeDATA");
+        //var applicationFolder = path.join(appDataFolder, "FreeDATA");
-        console.log(applicationFolder);
+        //console.log(applicationFolder);
         //var receivedFilesFolder = path.join(applicationFolder, "receivedFiles");
         var receivedFilesFolder = path.join(config.received_files_folder);
  
-        
-        
         console.log("receivedFilesFolder: " + receivedFilesFolder);
         // Creates receivedFiles folder if not exists
         // https://stackoverflow.com/a/13544465
@@ -1728,7 +1745,7 @@ ipcRenderer.on('run-tnc-command', (event, arg) => {
         sock.sendFile(arg.dxcallsign, arg.mode, arg.frames, arg.filename, arg.filetype, arg.data, arg.checksum);
     }
     if (arg.command == 'send_message') {
-        sock.sendMessage(arg.dxcallsign, arg.mode, arg.frames, arg.data, arg.checksum);
+        sock.sendMessage(arg.dxcallsign, arg.mode, arg.frames, arg.data, arg.checksum, arg.uuid, arg.command);
     }
     if (arg.command == 'stop_transmission') {
         sock.stopTransmission();

gui/sock.js

@@ -6,6 +6,8 @@ const {
 
 const log = require('electron-log');
 const socketLog = log.scope('tnc');
+const utf8 = require('utf8');
+    
     
 // https://stackoverflow.com/a/26227660
 var appDataFolder = process.env.APPDATA || (process.platform == 'darwin' ? process.env.HOME + '/Library/Application Support' : process.env.HOME + "/.config")
@@ -132,7 +134,6 @@ client.on('data', function(socketdata) {
     stackoverflow.com questions 9070700 nodejs-net-createserver-large-amount-of-data-coming-in
     */
 
-
     socketdata = socketdata.toString('utf8'); // convert data to string
     socketchunk += socketdata// append data to buffer so we can stick long data together
 
@@ -218,6 +219,20 @@ client.on('data', function(socketdata) {
                 ipcRenderer.send('request-update-tnc-state', Data);
             }
 
+            // update transmission status
+
+            if (data['arq'] == 'transmission'){
+            socketLog.info(data)
+            
+                let state = {
+                    status: data['status'],
+                    uuid: data['uuid'],
+                };
+            ipcRenderer.send('request-update-transmission-status', state);                
+                
+            
+            }
+
             /* A TEST WITH STREAMING DATA .... */       
             // if we received data through network stream, we get a single data item
             if (data['arq'] == 'received') {
@@ -359,17 +374,23 @@ exports.sendFile = function(dxcallsign, mode, frames, filename, filetype, data,
 }
 
 // Send Message
-exports.sendMessage = function(dxcallsign, mode, frames, data, checksum) {
+exports.sendMessage = function(dxcallsign, mode, frames, data, checksum, uuid, command) {
+    socketLog.info(data) 
+    // convert message to plain utf8 because of unicode emojis
+    data = utf8.encode(data)
     socketLog.info(data) 
     
     var datatype = "m"
-    data = datatype + split_char + split_char + checksum + split_char + data
+    data = datatype + split_char + command + split_char + checksum + split_char + uuid + split_char + data
     socketLog.info(data)
+    
+    
+    
     socketLog.info(btoa(data))
     data = btoa(data)
 
     //command = '{"type" : "arq", "command" : "send_message", "parameter" : [{ "dxcallsign" : "' + dxcallsign + '", "mode" : "' + mode + '", "n_frames" : "' + frames + '", "data" :  "' + data + '" , "checksum" : "' + checksum + '"}]}'
-    command = '{"type" : "arq", "command" : "send_raw",  "parameter" : [{"dxcallsign" : "' + dxcallsign + '", "mode" : "' + mode + '", "n_frames" : "' + frames + '", "data" : "' + data + '"}]}'
+    command = '{"type" : "arq", "command" : "send_raw",  "uuid" : "'+ uuid +'", "parameter" : [{"dxcallsign" : "' + dxcallsign + '", "mode" : "' + mode + '", "n_frames" : "' + frames + '", "data" : "' + data + '"}]}'
     socketLog.info(command)
     socketLog.info("-------------------------------------")
     writeTncCommand(command)

gui/src/chat-module.html

@@ -20,18 +20,24 @@
       <script src="../node_modules/chart.js/dist/chart.min.js"></script>
       <script src="../node_modules/chartjs-plugin-annotation/dist/chartjs-plugin-annotation.min.js"></script>
 
+<!--<script type="module" src="../node_modules/emoji-picker-element/index.js"></script>-->
+
+<script type="module" src="../node_modules/emoji-picker-element/picker.js"></script>
+<script type="module" src="../node_modules/emoji-picker-element/database.js"></script>
 
 
+<div class="position-absolute container w-100 h-100 bottom-0 end-0 mb-5" style="z-index:100; display: none" id="emojipickercontainer">
+<emoji-picker locale="en" class="position-absolute bottom-0 end-0 p-1 mb-2" data-source="../node_modules/emoji-picker-element-data/en/emojibase/data.json"></emoji-picker>
+</div> 
 
 <div class="container-fluid">
   <div class="row h-100">
-    <div class="col-4 p-0">
+    <div class="col-4 p-2">
       <! ------Chats area ---------------------------------------------------------------------->
           
-        <div class="list-group rounded-0" id="list-tab" role="tablist">       
+        <div class="list-group" id="list-tab" role="tablist">       
         </div>
 
-      
     </div>
     <div class="col-8 border vh-100 ">
       <! ------messages area ---------------------------------------------------------------------->
@@ -61,7 +67,16 @@
     <div class="input-group bottom-0 w-100">
     <input class="form-control" maxlength="8" style="max-width: 6rem; text-transform:uppercase" id="chatModuleDxCall" placeholder="DX CALL"></input>
             <input class="form-control" id="chatModuleMessage" placeholder="Message"></input>
-            <button class="btn btn-sm btn-primary me-2" id="sendMessage" type="button"><i class="bi bi-send" style="font-size: 1.2rem; color: white;"></i></button>
+            <button class="btn btn-sm btn-primary me-2" id="emojipickerbutton" type="button"><i class="bi bi-emoji-smile"></i></button>
+            <button class="btn btn-sm btn-secondary me-2" style="width: 5rem" id="sendMessage" type="button"><i class="bi bi-send" style="font-size: 1.2rem; color: white;"></i></button>
+            
+            
+            
+            
+            
+            
+            
+            
         </div>
     
   </div>

gui/src/index.html

@@ -60,7 +60,15 @@
 				</div>
 			</div>
 			<div class="btn-toolbar" role="toolbar">
-				<button class="btn btn-sm btn-primary me-4  position-relative" id="openRFChat" type="button" data-bs-placement="bottom" data-bs-toggle="tooltip" data-bs-html="false" title="Open the HF chat module. This is currently just a test and not finished, yet!" disabled> <strong>RF Chat</strong>
+			  <button class="btn btn-sm btn-danger" id="stop_transmission_connection" type="button">
+			    <i class="bi bi-x-octagon-fill" style="font-size: 1rem; color: white;"></i>
+			     STOP
+			   </button>
+			</div>
+			
+			
+			<div class="btn-toolbar" role="toolbar">
+				<button class="btn btn-sm btn-primary me-4  position-relative" id="openRFChat" type="button" data-bs-placement="bottom" data-bs-toggle="tooltip" data-bs-html="false" title="Open the HF chat module. This is currently just a test and not finished, yet!" > <strong>RF Chat</strong>
 				<i class="bi bi-chat-left-text-fill" style="font-size: 1rem; color: white;"></i>
 			    <span class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-danger">soon...</span>
 				</button>	
@@ -1269,7 +1277,7 @@
 					</div>
 					<div class="input-group input-group-sm mb-1"> <span class="input-group-text" id="basic-addon1">PTT Port</span>
 						<select class="form-select form-select-sm" aria-label=".form-select-sm" id="hamlib_ptt_port_advanced">
-							<option value="None">None</option>
+							<!--<option value="None">None</option>-->
 						</select>	
 							<!--
                            <option value="/dev/ttyUSB1">/dev/ttyUSB1</option>-->

tnc/data_handler.py

@@ -43,6 +43,7 @@ class DATA():
         self.arq_session_timeout = 30
         self.session_connect_max_retries = 3
 
+        self.transmission_uuid = ''
 
 
         self.data_channel_last_received      =   0.0         # time of last "live sign" of a frame      
@@ -151,7 +152,8 @@ class DATA():
                 # [1] DATA_OUT bytes
                 # [2] MODE int
                 # [3] N_FRAMES_PER_BURST int
-                self.open_dc_and_transmit(data[1], data[2], data[3])
+                # [4] self.transmission_uuid str
+                self.open_dc_and_transmit(data[1], data[2], data[3], data[4])
                 '''
                 print(static.ARQ_SESSION)
                 if not static.ARQ_SESSION:
@@ -443,7 +445,6 @@ class DATA():
                 # updated modes we are listening to
                 self.set_listening_modes(self.mode_list[self.speed_level])
 
-                                
                 # create an ack frame
                 ack_frame = bytearray(14)
                 ack_frame[:1] = bytes([60])
@@ -553,9 +554,8 @@ class DATA():
                 base64_data = base64_data.decode("utf-8")
                 static.RX_BUFFER.append([uniqueid, timestamp, static.DXCALLSIGN, static.DXGRID, base64_data])
                 jsondata = {"arq":"received", "uuid" : uniqueid,  "timestamp": timestamp, "dxcallsign": str(static.DXCALLSIGN, 'utf-8'), "dxgrid": str(static.DXGRID, 'utf-8'), "data": base64_data}
-                data_out = json.dumps(jsondata)
+                json_data_out = json.dumps(jsondata)
-                print(data_out)
+                sock.SOCKET_QUEUE.put(json_data_out)
-                sock.SOCKET_QUEUE.put(data_out)
                 static.INFO.append("ARQ;RECEIVING;SUCCESS")
                
                 # BUILDING ACK FRAME FOR DATA FRAME
@@ -645,6 +645,12 @@ class DATA():
         static.TOTAL_BYTES = len(data_out)
         frame_total_size = len(data_out).to_bytes(4, byteorder='big')
         static.INFO.append("ARQ;TRANSMITTING")
+        
+        jsondata = {"arq":"transmission", "status" :"transmitting", "uuid" : self.transmission_uuid}
+        json_data_out = json.dumps(jsondata)
+        sock.SOCKET_QUEUE.put(json_data_out)
+                
+                
         structlog.get_logger("structlog").info("[TNC] | TX | DATACHANNEL", mode=mode, Bytes=static.TOTAL_BYTES)
 
         
@@ -680,6 +686,7 @@ class DATA():
                 # force usage of selected mode
                 if mode != 255:
                     data_mode = mode
+                    
                     structlog.get_logger("structlog").debug("FIXED MODE", mode=data_mode)
 
                 else:
@@ -810,6 +817,9 @@ class DATA():
         if self.data_frame_ack_received:
         
             static.INFO.append("ARQ;TRANSMITTING;SUCCESS")
+            jsondata = {"arq":"transmission", "status" :"success", "uuid" : self.transmission_uuid}
+            json_data_out = json.dumps(jsondata)
+            sock.SOCKET_QUEUE.put(json_data_out)
         
             structlog.get_logger("structlog").info("ARQ | TX | DATA TRANSMITTED!", BytesPerMinute=static.ARQ_BYTES_PER_MINUTE, BitsPerSecond=static.ARQ_BITS_PER_SECOND, overflows=static.BUFFER_OVERFLOW_COUNTER)
 
@@ -817,6 +827,10 @@ class DATA():
                 
         else:
             static.INFO.append("ARQ;TRANSMITTING;FAILED")
+            jsondata = {"arq":"transmission", "status" :"failed", "uuid" : self.transmission_uuid}
+            json_data_out = json.dumps(jsondata)
+            sock.SOCKET_QUEUE.put(json_data_out)
+            
             structlog.get_logger("structlog").info("ARQ | TX | TRANSMISSION FAILED OR TIME OUT!", overflows=static.BUFFER_OVERFLOW_COUNTER)
             self.stop_transmission()
 
@@ -902,7 +916,9 @@ class DATA():
 
         """
         static.INFO.append("ARQ;TRANSMITTING;FAILED")
-        
+        jsondata = {"arq":"transmission", "status" : "failed", "uuid" : self.transmission_uuid}
+        json_data_out = json.dumps(jsondata)
+        sock.SOCKET_QUEUE.put(json_data_out)        
         self.arq_session_last_received = int(time.time()) # we need to update our timeout timestamp
         
         if not TESTMODE:
@@ -1133,7 +1149,7 @@ class DATA():
     # ARQ DATA CHANNEL HANDLER
     # ############################################################################################################
 
-    def open_dc_and_transmit(self, data_out:bytes, mode:int, n_frames_per_burst:int):
+    def open_dc_and_transmit(self, data_out:bytes, mode:int, n_frames_per_burst:int, transmission_uuid:str):
         """
 
         Args:
@@ -1147,6 +1163,8 @@ class DATA():
         static.TNC_STATE = 'BUSY'
         self.arq_file_transfer = True
         
+        self.transmission_uuid = transmission_uuid
+        
         # wait a moment for the case, an heartbeat is already on the way back to us
         if static.ARQ_SESSION:
             time.sleep(0.5)
@@ -1226,6 +1244,10 @@ class DATA():
 
                 if not static.ARQ_STATE and attempt == self.data_channel_max_retries:
                     static.INFO.append("DATACHANNEL;FAILED")
+                    print(self.transmission_uuid)
+                    jsondata = {"arq":"transmission", "status" :"failed", "uuid" : self.transmission_uuid}
+                    json_data_out = json.dumps(jsondata)
+                    sock.SOCKET_QUEUE.put(json_data_out)
                     
                     structlog.get_logger("structlog").warning("[TNC] ARQ | TX | DATA [" + str(static.MYCALLSIGN, 'utf-8') + "]>>X<<[" + str(static.DXCALLSIGN, 'utf-8') + "]")
                     self.datachannel_timeout = True
@@ -1582,6 +1604,9 @@ class DATA():
         """
         
         try: 
+            print(static.TOTAL_BYTES)
+            if static.TOTAL_BYTES == 0:
+                static.TOTAL_BYTES = 1
             static.ARQ_TRANSMISSION_PERCENT = int((receivedbytes*static.ARQ_COMPRESSION_FACTOR / (static.TOTAL_BYTES)) * 100)
 
             transmissiontime = time.time() - self.rx_start_of_transmission

tnc/modem.py

@@ -524,7 +524,8 @@ class RF():
         modem_stats_snr = modem_stats_snr.value
 
         try:
-            static.SNR = round(modem_stats_snr, 1)
+            snr = round(modem_stats_snr, 1)
+            static.SNR = np.clip(snr, 0, 255) #limit to max value of 255
             return static.SNR
         except:
             static.SNR = 0

tnc/rig.py

@@ -38,7 +38,7 @@ try:
     # this is not needed as python will be shipped with app bundle
     sys.path.append('/usr/local/lib/python3.6/site-packages')
     sys.path.append('/usr/local/lib/python3.7/site-packages')
-    #sys.path.append('/usr/local/lib/python3.8/site-packages')
+    sys.path.append('/usr/local/lib/python3.8/site-packages')
     sys.path.append('/usr/local/lib/python3.9/site-packages')
     sys.path.append('/usr/local/lib/python3.10/site-packages')
     

tnc/sock.py

@@ -302,10 +302,16 @@ def process_tnc_commands(data):
                 n_frames = int(received_json["parameter"][0]["n_frames"])
                 base64data = received_json["parameter"][0]["data"]
                 
+                # check if transmission uuid provided else set no-uuid
+                try:
+                    arq_uuid = received_json["uuid"]
+                except:
+                    arq_uuid = 'no-uuid'
+                    
                 if not len(base64data) % 4: 
                     binarydata = base64.b64decode(base64data)
 
-                    data_handler.DATA_QUEUE_TRANSMIT.put(['ARQ_RAW', binarydata, mode, n_frames])
+                    data_handler.DATA_QUEUE_TRANSMIT.put(['ARQ_RAW', binarydata, mode, n_frames, arq_uuid])
 
                 else:
                     raise TypeError

tnc/static.py

@@ -8,7 +8,7 @@ Here we are saving application wide variables and stats, which have to be access
 Not nice, suggestions are appreciated :-) 
 """
 
-VERSION = '0.1.0-alpha'
+VERSION = '0.2.0-alpha'
 
 # DAEMON
 DAEMONPORT = 3001