Refactor beam msg, remove rtc message for now

Author: n9lsjr

src/backend/beam.cjs

@@ -133,7 +133,7 @@ const beam_event = (beam, chat, key) => {
         if (str === "Ping") return
         if (check_data_message(str, addr)) return
         let hash = str.substring(0,64)
-        decrpyt_beam_message(str, msgKey)
+        decrpyt_beam_message(str.substring(64), msgKey)
     })
 
     beam.on('end', () => {

src/backend/messages.cjs

@@ -208,6 +208,7 @@ const peer_dms = async () => {
     const contacts = await getConversations()
     for (const c of contacts) {
         const hashDerivation = await key_derivation_hash(c.chat)
+        console.log("hashDerivation", hashDerivation)
         const beam = await new_beam(hashDerivation, c.chat + c.key, false)
         if (beam === "Error") continue
         if (!beam) continue
@@ -627,18 +628,10 @@ async function send_message(message, receiver, off_chain = false, group = false,
         //Offchain messages
         let random_key = randomKey()
         let sentMsg = Buffer.from(payload_hex, 'hex')
-        let sendMsg = random_key + '99' + sentMsg
-        let messageArray = []
-        messageArray.push(sendMsg)
-        messageArray.push(address)
-        if (group) {
-            messageArray.push('group')
-        }
+        let sendMsg = random_key + sentMsg
         if (beam_this) {
             send_beam_message(sendMsg, address, timestamp)
             return
-        } else {
-            Hugin.send('rtc_message', [messageArray])
         }
         //Do not save invite message.
         if (message.msg && 'invite' in message.msg) {

src/backend/swarm.cjs

@@ -233,20 +233,20 @@ const new_connection = (connection, topic, dht_keys, peer) => {
 
     connection.on('error', () => {
         console.log("Got error connection signal")
-        connection_closed(connection, topic)
+        connection_closed(connection, topic, true)
     })
 
 }
 
-const connection_closed = (conn, topic) => {
+const connection_closed = (conn, topic, error = false) => {
     console.log("Closing connection...")
     const active = get_active_topic(topic)
     if (!active) return
     try {
-        conn.end()
-        conn.destroy()
+        conn.end();
+        conn.destroy();
     } catch (e) {
-        console.log("failed close connection")
+        console.log('failed close connection');
     }
     const user = active.connections.find(a => a.connection === conn)
     if (!user) return
@@ -337,11 +337,6 @@ const check_data_message = async (data, connection, topic, peer) => {
                 return "Ban"
             }
 
-            if (con.joined) {
-                //Connection is already joined
-                return true
-            }
-
             if (Hugin.banned(data.address, topic)) {
                 if (active.admin) admin_ban_user(data.address, active.key) 
                 else ban_user(data.address, topic)