mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
cleanup and first implementation of server side message sytem
This commit is contained in:
parent
30bb0ba828
commit
2e9344bba7
|
@ -6,14 +6,9 @@ setActivePinia(pinia);
|
||||||
import { useChatStore } from "../store/chatStore.js";
|
import { useChatStore } from "../store/chatStore.js";
|
||||||
const chat = useChatStore(pinia);
|
const chat = useChatStore(pinia);
|
||||||
|
|
||||||
import {
|
|
||||||
getNewMessagesByDXCallsign,
|
|
||||||
resetIsNewMessage,
|
|
||||||
} from "../js/chatHandler";
|
|
||||||
|
|
||||||
function chatSelected(callsign) {
|
function chatSelected(callsign) {
|
||||||
chat.selectedCallsign = callsign.toUpperCase();
|
chat.selectedCallsign = callsign.toUpperCase();
|
||||||
|
|
||||||
// scroll message container to bottom
|
// scroll message container to bottom
|
||||||
var messageBody = document.getElementById("message-container");
|
var messageBody = document.getElementById("message-container");
|
||||||
if (messageBody != null) {
|
if (messageBody != null) {
|
||||||
|
@ -21,27 +16,6 @@ function chatSelected(callsign) {
|
||||||
messageBody.scrollTop = messageBody.scrollHeight - messageBody.clientHeight;
|
messageBody.scrollTop = messageBody.scrollHeight - messageBody.clientHeight;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getNewMessagesByDXCallsign(callsign)[1] > 0) {
|
|
||||||
let messageArray = getNewMessagesByDXCallsign(callsign)[2];
|
|
||||||
console.log(messageArray);
|
|
||||||
|
|
||||||
for (const key in messageArray) {
|
|
||||||
resetIsNewMessage(messageArray[key].uuid, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
chat.beaconLabelArray = Object.values(
|
|
||||||
chat.sorted_beacon_list[chat.selectedCallsign].timestamp,
|
|
||||||
);
|
|
||||||
chat.beaconDataArray = Object.values(
|
|
||||||
chat.sorted_beacon_list[chat.selectedCallsign].snr,
|
|
||||||
);
|
|
||||||
} catch (e) {
|
|
||||||
console.log("beacon data not fetched: " + e);
|
|
||||||
chat.beaconLabelArray = [];
|
|
||||||
chat.beaconDataArray = [];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
|
@ -50,33 +24,30 @@ function chatSelected(callsign) {
|
||||||
id="chat-list-tab"
|
id="chat-list-tab"
|
||||||
role="chat-tablist"
|
role="chat-tablist"
|
||||||
>
|
>
|
||||||
<template v-for="(item, key) in chat.callsign_list" :key="item.dxcallsign">
|
|
||||||
|
<template v-for="(details, callsign, key) in chat.callsign_list" :key="callsign">
|
||||||
<a
|
<a
|
||||||
class="list-group-item list-group-item-action list-group-item-dark rounded-2 border-0 mb-2"
|
class="list-group-item list-group-item-action list-group-item-dark rounded-2 border-0 mb-2"
|
||||||
:class="{ active: key == 0 }"
|
:class="{ active: key == 0 }"
|
||||||
:id="`list-chat-list-${item}`"
|
:id="`list-chat-list-${callsign}`"
|
||||||
data-bs-toggle="list"
|
data-bs-toggle="list"
|
||||||
:href="`#list-${item}-messages`"
|
:href="`#list-${callsign}-messages`"
|
||||||
role="tab"
|
role="tab"
|
||||||
aria-controls="list-{{item}}-messages"
|
aria-controls="list-{{callsign}}-messages"
|
||||||
@click="chatSelected(item)"
|
@click="chatSelected(callsign)"
|
||||||
>
|
>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-9">
|
<div class="col-9">
|
||||||
<strong>{{ item }}</strong>
|
<strong>{{ callsign }}</strong>
|
||||||
<span
|
<!--<small> {{details.timestamp}} </small>-->
|
||||||
class="badge rounded-pill bg-danger"
|
|
||||||
v-if="getNewMessagesByDXCallsign(item)[1] > 0"
|
|
||||||
>
|
|
||||||
{{ getNewMessagesByDXCallsign(item)[1] }} new messages
|
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-3">
|
<div class="col-3">
|
||||||
<button
|
<button
|
||||||
class="btn btn-sm btn-outline-secondary ms-2 border-0"
|
class="btn btn-sm btn-outline-secondary ms-2 border-0"
|
||||||
data-bs-target="#deleteChatModal"
|
data-bs-target="#deleteChatModal"
|
||||||
data-bs-toggle="modal"
|
data-bs-toggle="modal"
|
||||||
@click="chatSelected(item)"
|
@click="chatSelected(callsign)"
|
||||||
>
|
>
|
||||||
<i class="bi bi-three-dots-vertical"></i>
|
<i class="bi bi-three-dots-vertical"></i>
|
||||||
</button>
|
</button>
|
||||||
|
|
|
@ -30,7 +30,7 @@ function getDateTime(timestampRaw) {
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="tab-content" id="nav-tabContent-chat-messages">
|
<div class="tab-content" id="nav-tabContent-chat-messages">
|
||||||
<template v-for="(callsign, key) in chat.callsign_list">
|
<template v-for="(details, callsign, key) in chat.callsign_list" :key="callsign">
|
||||||
<div
|
<div
|
||||||
class="tab-pane fade show"
|
class="tab-pane fade show"
|
||||||
:class="{ active: key == 0 }"
|
:class="{ active: key == 0 }"
|
||||||
|
@ -38,38 +38,44 @@ function getDateTime(timestampRaw) {
|
||||||
role="tabpanel"
|
role="tabpanel"
|
||||||
:aria-labelledby="`list-chat-list-${callsign}`"
|
:aria-labelledby="`list-chat-list-${callsign}`"
|
||||||
>
|
>
|
||||||
|
|
||||||
|
|
||||||
<template
|
<template
|
||||||
v-for="item in chat.sorted_chat_list[callsign]"
|
v-for="item in chat.sorted_chat_list[callsign]"
|
||||||
:key="item._id"
|
|
||||||
>
|
>
|
||||||
|
<!--
|
||||||
<div v-if="prevChatMessageDay !== getDateTime(item.timestamp)">
|
<div v-if="prevChatMessageDay !== getDateTime(item.timestamp)">
|
||||||
<div class="separator my-2">
|
<div class="separator my-2">
|
||||||
{{ (prevChatMessageDay = getDateTime(item.timestamp)) }}
|
{{ (prevChatMessageDay = getDateTime(item.timestamp)) }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
-->
|
||||||
|
|
||||||
<div v-if="item.type === 'beacon' && item.status === 'received'">
|
|
||||||
<!-- {{ item }} -->
|
|
||||||
|
{{item}}
|
||||||
|
<hr>
|
||||||
|
<div v-if="item.direction === 'transmit'">
|
||||||
|
{{ console.log('Item direction:', item.direction) }}
|
||||||
|
<!--<sent-message :message="item" />-->
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="item.type === 'ping'">{{ item.snr }} dB ping received</div>
|
|
||||||
|
|
||||||
<div v-if="item.type === 'ping-ack'">
|
|
||||||
{{ item.snr }} dB ping-ack received
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="item.type === 'transmit'">
|
<div v-else-if="item.direction === 'receive'">
|
||||||
<sent-message :message="item" />
|
{{ console.log('Item direction:', item.direction) }}
|
||||||
</div>
|
|
||||||
<div v-else-if="item.type === 'received'">
|
|
||||||
<received-message :message="item" />
|
<!--<received-message :message="item" />-->
|
||||||
</div>
|
</div>
|
||||||
|
<!--
|
||||||
<div v-if="item.type === 'broadcast_transmit'">
|
<div v-if="item.type === 'broadcast_transmit'">
|
||||||
<sent-broadcast-message :message="item" />
|
<sent-broadcast-message :message="item" />
|
||||||
</div>
|
</div>
|
||||||
<div v-else-if="item.type === 'broadcast_received'">
|
<div v-else-if="item.type === 'broadcast_received'">
|
||||||
<received-broadcast-message :message="item" />
|
<received-broadcast-message :message="item" />
|
||||||
</div>
|
</div>
|
||||||
|
-->
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
|
|
||||||
<div class="row justify-content-start mb-2">
|
<div class="row justify-content-start mb-2">
|
||||||
<div :class="messageWidthClass">
|
<div :class="messageWidthClass">
|
||||||
<div class="card bg-light border-0 text-dark">
|
<div class="card bg-light border-0 text-dark">
|
||||||
|
@ -11,7 +12,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<p class="card-text">{{ message.msg }}</p>
|
<p class="card-text">{{ message.body }}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="card-footer p-0 bg-light border-top-0">
|
<div class="card-footer p-0 bg-light border-top-0">
|
||||||
|
@ -70,20 +71,20 @@ export default {
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
showMessageInfo() {
|
showMessageInfo() {
|
||||||
requestMessageInfo(this.message._id);
|
requestMessageInfo(this.message.id);
|
||||||
//let infoModal = Modal.getOrCreateInstance(document.getElementById('messageInfoModal'))
|
//let infoModal = Modal.getOrCreateInstance(document.getElementById('messageInfoModal'))
|
||||||
//console.log(this.infoModal)
|
//console.log(this.infoModal)
|
||||||
//this.infoModal.show()
|
//this.infoModal.show()
|
||||||
},
|
},
|
||||||
deleteMessage() {
|
deleteMessage() {
|
||||||
deleteMessageFromDB(this.message._id);
|
deleteMessageFromDB(this.message.id);
|
||||||
},
|
},
|
||||||
async downloadAttachment() {
|
async downloadAttachment() {
|
||||||
try {
|
try {
|
||||||
// reset file store
|
// reset file store
|
||||||
chat.downloadFileFromDB = [];
|
chat.downloadFileFromDB = [];
|
||||||
|
|
||||||
const attachment = await getMessageAttachment(this.message._id);
|
const attachment = await getMessageAttachment(this.message.id);
|
||||||
const blob = new Blob([atob_FD(attachment[2])], {
|
const blob = new Blob([atob_FD(attachment[2])], {
|
||||||
type: `${attachment[1]};charset=utf-8`,
|
type: `${attachment[1]};charset=utf-8`,
|
||||||
});
|
});
|
||||||
|
@ -121,6 +122,8 @@ export default {
|
||||||
},
|
},
|
||||||
|
|
||||||
getDateTime() {
|
getDateTime() {
|
||||||
|
|
||||||
|
console.log(this.message.timestamp)
|
||||||
var datetime = new Date(this.message.timestamp * 1000).toLocaleString(
|
var datetime = new Date(this.message.timestamp * 1000).toLocaleString(
|
||||||
navigator.language,
|
navigator.language,
|
||||||
{
|
{
|
||||||
|
|
|
@ -108,14 +108,11 @@ function newChat() {
|
||||||
let callsign = this.newChatCall.value;
|
let callsign = this.newChatCall.value;
|
||||||
callsign = callsign.toUpperCase().trim();
|
callsign = callsign.toUpperCase().trim();
|
||||||
if (callsign === "") return;
|
if (callsign === "") return;
|
||||||
startChatWithNewStation(callsign);
|
//startChatWithNewStation(callsign);
|
||||||
//updateAllChat(false);
|
//updateAllChat(false);
|
||||||
this.newChatCall.value = "";
|
this.newChatCall.value = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
function syncWithModem() {
|
|
||||||
getRxBuffer();
|
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
@ -123,26 +120,15 @@ function syncWithModem() {
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row w-100">
|
<div class="row w-100">
|
||||||
<div class="col-3 p-0 me-2">
|
<div class="col-3 p-0 me-2">
|
||||||
<div class="input-group bottom-0 m-0 ms-1">
|
<button
|
||||||
<input
|
class="btn btn-outline-primary"
|
||||||
class="form-control"
|
data-bs-target="#newChatModal"
|
||||||
maxlength="9"
|
data-bs-toggle="modal"
|
||||||
style="text-transform: uppercase"
|
|
||||||
placeholder="callsign"
|
|
||||||
@keypress.enter="newChat()"
|
|
||||||
ref="newChatCall"
|
|
||||||
/>
|
|
||||||
<button
|
|
||||||
class="btn btn-sm btn-outline-success"
|
|
||||||
id="createNewChatButton"
|
|
||||||
type="button"
|
|
||||||
title="Start a new chat (enter dx call sign first)"
|
|
||||||
@click="newChat()"
|
|
||||||
>
|
>
|
||||||
new chat
|
<i class="bi bi-pencil-square"> Start a new chat</i>
|
||||||
<i class="bi bi-pencil-square" style="font-size: 1.2rem"></i>
|
|
||||||
</button>
|
</button>
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-5 ms-2 p-0">
|
<div class="col-5 ms-2 p-0">
|
||||||
<!-- right side of chat nav bar-->
|
<!-- right side of chat nav bar-->
|
||||||
|
@ -164,18 +150,6 @@ function syncWithModem() {
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-2 ms-2 p-0">
|
|
||||||
<div class="input-group mb-0 p-0">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="btn btn-outline-secondary"
|
|
||||||
@click="syncWithModem()"
|
|
||||||
>
|
|
||||||
Modem Sync {{ state.rx_buffer_length }}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
|
@ -17,8 +17,7 @@ import chat_navbar from './chat_navbar.vue'
|
||||||
import chat_conversations from './chat_conversations.vue'
|
import chat_conversations from './chat_conversations.vue'
|
||||||
import chat_messages from './chat_messages.vue'
|
import chat_messages from './chat_messages.vue'
|
||||||
|
|
||||||
import {updateAllChat, newMessage, newBroadcast} from '../js/chatHandler'
|
import { newMessage } from '../js/messagesHandler.ts'
|
||||||
|
|
||||||
|
|
||||||
import {
|
import {
|
||||||
Chart as ChartJS,
|
Chart as ChartJS,
|
||||||
|
@ -54,10 +53,11 @@ function transmitNewMessage(){
|
||||||
return;
|
return;
|
||||||
if (chat.selectedCallsign.startsWith("BC-")) {
|
if (chat.selectedCallsign.startsWith("BC-")) {
|
||||||
|
|
||||||
newBroadcast(chat.selectedCallsign, chat.inputText)
|
return "new broadcast"
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
newMessage(chat.selectedCallsign, chat.inputText, chat.inputFile, chat.inputFileName, chat.inputFileSize, chat.inputFileType)
|
//newMessage(chat.selectedCallsign, chat.inputText, chat.inputFile, chat.inputFileName, chat.inputFileSize, chat.inputFileType)
|
||||||
|
newMessage(chat.selectedCallsign, chat.inputText)
|
||||||
}
|
}
|
||||||
// finally do a cleanup
|
// finally do a cleanup
|
||||||
//chatModuleMessage.reset();
|
//chatModuleMessage.reset();
|
||||||
|
@ -195,9 +195,11 @@ const speedChartData = computed(() => ({
|
||||||
|
|
||||||
|
|
||||||
<!-- trigger file selection modal -->
|
<!-- trigger file selection modal -->
|
||||||
|
<!--
|
||||||
<button type="button" class="btn btn-outline-secondary border-0 rounded-pill me-1" data-bs-toggle="modal" data-bs-target="#fileSelectionModal">
|
<button type="button" class="btn btn-outline-secondary border-0 rounded-pill me-1" data-bs-toggle="modal" data-bs-target="#fileSelectionModal">
|
||||||
<i class="bi bi-paperclip" style="font-size: 1.2rem"></i>
|
<i class="bi bi-paperclip" style="font-size: 1.2rem"></i>
|
||||||
</button>
|
</button>
|
||||||
|
-->
|
||||||
|
|
||||||
|
|
||||||
<textarea
|
<textarea
|
||||||
|
|
|
@ -9,19 +9,16 @@ import { useChatStore } from "../store/chatStore.js";
|
||||||
const chat = useChatStore(pinia);
|
const chat = useChatStore(pinia);
|
||||||
|
|
||||||
import { settingsStore as settings, onChange } from "../store/settingsStore.js";
|
import { settingsStore as settings, onChange } from "../store/settingsStore.js";
|
||||||
|
|
||||||
import { sendModemTestFrame } from "../js/api";
|
import { sendModemTestFrame } from "../js/api";
|
||||||
|
|
||||||
import {
|
|
||||||
deleteChatByCallsign,
|
|
||||||
getNewMessagesByDXCallsign,
|
|
||||||
} from "../js/chatHandler";
|
|
||||||
|
|
||||||
import main_startup_check from "./main_startup_check.vue";
|
import main_startup_check from "./main_startup_check.vue";
|
||||||
|
import { newMessage } from '../js/messagesHandler.ts'
|
||||||
|
|
||||||
|
function newChat(){
|
||||||
|
newMessage(chat.newChatCallsign, chat.newChatMessage)
|
||||||
|
}
|
||||||
|
|
||||||
function deleteChat() {
|
function deleteChat() {
|
||||||
//console.log(chat.selectedCallsign)
|
return
|
||||||
deleteChatByCallsign(chat.selectedCallsign);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
import {
|
import {
|
||||||
|
@ -181,16 +178,12 @@ const transmissionSpeedChartDataMessageInfo = computed(() => ({
|
||||||
<span class="input-group-text" id="basic-addon1"
|
<span class="input-group-text" id="basic-addon1"
|
||||||
>Total Messages</span
|
>Total Messages</span
|
||||||
>
|
>
|
||||||
<span class="input-group-text" id="basic-addon1">{{
|
<span class="input-group-text" id="basic-addon1">...</span>
|
||||||
getNewMessagesByDXCallsign(chat.selectedCallsign)[0]
|
|
||||||
}}</span>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="input-group mb-3">
|
<div class="input-group mb-3">
|
||||||
<span class="input-group-text" id="basic-addon1">New Messages</span>
|
<span class="input-group-text" id="basic-addon1">New Messages</span>
|
||||||
<span class="input-group-text" id="basic-addon1">{{
|
<span class="input-group-text" id="basic-addon1">...</span>
|
||||||
getNewMessagesByDXCallsign(chat.selectedCallsign)[1]
|
|
||||||
}}</span>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
|
@ -316,6 +309,75 @@ const transmissionSpeedChartDataMessageInfo = computed(() => ({
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
class="modal fade"
|
||||||
|
ref="modalEle"
|
||||||
|
id="newChatModal"
|
||||||
|
tabindex="-1"
|
||||||
|
aria-hidden="true"
|
||||||
|
>
|
||||||
|
<div class="modal-dialog">
|
||||||
|
<div class="modal-content">
|
||||||
|
<div class="modal-header">
|
||||||
|
<h1 class="modal-title fs-5" id="deleteChatModalLabel">
|
||||||
|
Start a new chat
|
||||||
|
</h1>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="btn-close"
|
||||||
|
data-bs-dismiss="modal"
|
||||||
|
aria-label="Close"
|
||||||
|
></button>
|
||||||
|
</div>
|
||||||
|
<div class="modal-body">
|
||||||
|
|
||||||
|
<div class="alert alert-info" role="alert">
|
||||||
|
1. Enter destination callsign
|
||||||
|
<br>
|
||||||
|
2. Enter a first message
|
||||||
|
<br>
|
||||||
|
3. Pressing "START NEW CHAT"
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-floating mb-3">
|
||||||
|
<input type="text" class="form-control" id="floatingInputDestination" placeholder="dxcallsign / destination" maxlength="9"
|
||||||
|
style="text-transform: uppercase" @keypress.enter="newChat()" v-model="chat.newChatCallsign">
|
||||||
|
<label for="floatingInputDestination">dxcallsign / destination</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-floating">
|
||||||
|
<textarea class="form-control" placeholder="Your first message" id="floatingTextareaNewChatMessage" style="height: 100px" v-model="chat.newChatMessage"></textarea>
|
||||||
|
<label for="floatingTextareaNewChatMessage">First message</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div class="modal-footer">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="btn btn-secondary"
|
||||||
|
data-bs-dismiss="modal"
|
||||||
|
>
|
||||||
|
Close
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
class="btn btn-sm btn-outline-success"
|
||||||
|
id="createNewChatButton"
|
||||||
|
type="button"
|
||||||
|
data-bs-dismiss="modal"
|
||||||
|
title="Start a new chat (enter dx call sign first)"
|
||||||
|
@click="newChat()"
|
||||||
|
>
|
||||||
|
START NEW CHAT
|
||||||
|
<i class="bi bi-pencil-square" style="font-size: 1.2rem"></i>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<!-- HELP MODALS AUDIO -->
|
<!-- HELP MODALS AUDIO -->
|
||||||
<div
|
<div
|
||||||
class="modal fade"
|
class="modal fade"
|
||||||
|
|
|
@ -4,6 +4,10 @@ import {
|
||||||
validateCallsignWithoutSSID,
|
validateCallsignWithoutSSID,
|
||||||
} from "./freedata";
|
} from "./freedata";
|
||||||
|
|
||||||
|
import {
|
||||||
|
processFreedataMessages
|
||||||
|
} from "./messagesHandler"
|
||||||
|
|
||||||
function buildURL(params, endpoint) {
|
function buildURL(params, endpoint) {
|
||||||
const url = "http://" + params.host + ":" + params.port + endpoint;
|
const url = "http://" + params.host + ":" + params.port + endpoint;
|
||||||
return url;
|
return url;
|
||||||
|
@ -15,8 +19,7 @@ async function apiGet(endpoint) {
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error(`REST response not ok: ${response.statusText}`);
|
throw new Error(`REST response not ok: ${response.statusText}`);
|
||||||
}
|
}
|
||||||
const data = await response.json();
|
return await response.json();
|
||||||
return data;
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error getting from REST:", error);
|
console.error("Error getting from REST:", error);
|
||||||
}
|
}
|
||||||
|
@ -127,3 +130,15 @@ export function setRadioParameters(frequency, mode, rf_level) {
|
||||||
export function getRadioStatus() {
|
export function getRadioStatus() {
|
||||||
return apiGet("/radio");
|
return apiGet("/radio");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function getFreedataMessages(){
|
||||||
|
let res = await apiGet("/freedata/messages")
|
||||||
|
processFreedataMessages(res)
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function sendFreedataMessage(dxcall, body) {
|
||||||
|
return await apiPost("/freedata/messages", {
|
||||||
|
dxcall: dxcall,
|
||||||
|
body: body,
|
||||||
|
});
|
||||||
|
}
|
File diff suppressed because it is too large
Load diff
|
@ -1,886 +0,0 @@
|
||||||
var net = require("net");
|
|
||||||
import { atob_FD, btoa_FD, sortByPropertyDesc } from "./freedata";
|
|
||||||
import { addDataToWaterfall } from "../js/waterfallHandler.js";
|
|
||||||
|
|
||||||
import {
|
|
||||||
newMessageReceived,
|
|
||||||
newBeaconReceived,
|
|
||||||
updateTransmissionStatus,
|
|
||||||
setStateSuccess,
|
|
||||||
setStateFailed,
|
|
||||||
} from "./chatHandler";
|
|
||||||
import { displayToast } from "./popupHandler";
|
|
||||||
|
|
||||||
// ----------------- init pinia stores -------------
|
|
||||||
import { setActivePinia } from "pinia";
|
|
||||||
import pinia from "../store/index";
|
|
||||||
setActivePinia(pinia);
|
|
||||||
import { useStateStore } from "../store/stateStore.js";
|
|
||||||
const stateStore = useStateStore(pinia);
|
|
||||||
|
|
||||||
import { settingsStore as settings } from "../store/settingsStore.js";
|
|
||||||
|
|
||||||
var client = new net.Socket();
|
|
||||||
var socketchunk = ""; // Current message, per connection.
|
|
||||||
|
|
||||||
// split character
|
|
||||||
//const split_char = "\0;\1;";
|
|
||||||
const split_char = "0;1;";
|
|
||||||
|
|
||||||
// global to keep track of Modem connection error emissions
|
|
||||||
var modemShowConnectStateError = 1;
|
|
||||||
var setTxAudioLevelOnce = true;
|
|
||||||
var setRxAudioLevelOnce = true;
|
|
||||||
|
|
||||||
// network connection Timeout
|
|
||||||
//setTimeout(connectModem, 2000);
|
|
||||||
|
|
||||||
function connectModem() {
|
|
||||||
//exports.connectModem = function(){
|
|
||||||
//console.log('connecting to Modem...')
|
|
||||||
|
|
||||||
//clear message buffer after reconnecting or initial connection
|
|
||||||
socketchunk = "";
|
|
||||||
|
|
||||||
client.connect(settings.modem_port, settings.modem_host);
|
|
||||||
}
|
|
||||||
|
|
||||||
client.on("connect", function () {
|
|
||||||
console.log("Modem connection established");
|
|
||||||
stateStore.modem_running_state = "running";
|
|
||||||
stateStore.busy_state = "-";
|
|
||||||
stateStore.arq_state = "-";
|
|
||||||
stateStore.frequency = "-";
|
|
||||||
stateStore.mode = "-";
|
|
||||||
stateStore.bandwidth = "-";
|
|
||||||
stateStore.dbfs_level = 0;
|
|
||||||
stateStore.updateTncState(client.readyState);
|
|
||||||
|
|
||||||
modemShowConnectStateError = 1;
|
|
||||||
});
|
|
||||||
|
|
||||||
client.on("error", function (err) {
|
|
||||||
if (modemShowConnectStateError == 1) {
|
|
||||||
console.log("Modem connection error");
|
|
||||||
console.log(err);
|
|
||||||
modemShowConnectStateError = 0;
|
|
||||||
stateStore.modem_running_state = "stopped";
|
|
||||||
}
|
|
||||||
|
|
||||||
setTimeout(connectModem, 500);
|
|
||||||
client.destroy();
|
|
||||||
stateStore.busy_state = "-";
|
|
||||||
stateStore.arq_state = "-";
|
|
||||||
stateStore.frequency = "-";
|
|
||||||
stateStore.mode = "-";
|
|
||||||
stateStore.bandwidth = "-";
|
|
||||||
stateStore.dbfs_level = 0;
|
|
||||||
stateStore.updateTncState(client.readyState);
|
|
||||||
});
|
|
||||||
|
|
||||||
/*
|
|
||||||
client.on('close', function(data) {
|
|
||||||
console.log(' Modem connection closed');
|
|
||||||
setTimeout(connectModem, 2000)
|
|
||||||
});
|
|
||||||
*/
|
|
||||||
|
|
||||||
client.on("end", function (data) {
|
|
||||||
console.log("Modem connection ended");
|
|
||||||
console.log(data);
|
|
||||||
stateStore.busy_state = "-";
|
|
||||||
stateStore.arq_state = "-";
|
|
||||||
stateStore.frequency = "-";
|
|
||||||
stateStore.mode = "-";
|
|
||||||
stateStore.bandwidth = "-";
|
|
||||||
stateStore.dbfs_level = 0;
|
|
||||||
stateStore.updateTncState(client.readyState);
|
|
||||||
client.destroy();
|
|
||||||
stateStore.modem_running_state = "stopped";
|
|
||||||
|
|
||||||
setTimeout(connectModem, 500);
|
|
||||||
});
|
|
||||||
|
|
||||||
function writeTncCommand(command) {
|
|
||||||
console.log(command);
|
|
||||||
// we use the writingCommand function to update our TCPIP state because we are calling this function a lot
|
|
||||||
// if socket opened, we are able to run commands
|
|
||||||
|
|
||||||
if (client.readyState == "open") {
|
|
||||||
client.write(command + "\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (client.readyState == "closed") {
|
|
||||||
console.log("Modem SOCKET CONNECTION CLOSED!");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (client.readyState == "opening") {
|
|
||||||
console.log("connecting to Modem...");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
client.on("data", function (socketdata) {
|
|
||||||
stateStore.updateTncState(client.readyState);
|
|
||||||
|
|
||||||
/*
|
|
||||||
inspired by:
|
|
||||||
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
|
|
||||||
|
|
||||||
// check if we received begin and end of json data
|
|
||||||
if (socketchunk.startsWith('{"') && socketchunk.endsWith('"}\n')) {
|
|
||||||
var data = "";
|
|
||||||
|
|
||||||
// split data into chunks if we received multiple commands
|
|
||||||
socketchunk = socketchunk.split("\n");
|
|
||||||
//don't think this is needed anymore
|
|
||||||
//data = JSON.parse(socketchunk[0])
|
|
||||||
|
|
||||||
// search for empty entries in socketchunk and remove them
|
|
||||||
for (let i = 0; i < socketchunk.length; i++) {
|
|
||||||
if (socketchunk[i] === "") {
|
|
||||||
socketchunk.splice(i, 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//iterate through socketchunks array to execute multiple commands in row
|
|
||||||
for (let i = 0; i < socketchunk.length; i++) {
|
|
||||||
//check if data is not empty
|
|
||||||
if (socketchunk[i].length > 0) {
|
|
||||||
//try to parse JSON
|
|
||||||
try {
|
|
||||||
data = JSON.parse(socketchunk[i]);
|
|
||||||
} catch (e) {
|
|
||||||
console.log("Throwing away data!!!!\n" + e); // "SyntaxError
|
|
||||||
//console.log(e); // "SyntaxError
|
|
||||||
console.log(socketchunk[i]);
|
|
||||||
socketchunk = "";
|
|
||||||
//If we're here, I don't think we want to process any data that may be in data variable
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//console.log(data)
|
|
||||||
if (data["command"] == "modem_state") {
|
|
||||||
//console.log(data)
|
|
||||||
|
|
||||||
stateStore.rx_buffer_length = data["rx_buffer_length"];
|
|
||||||
stateStore.frequency = data["frequency"];
|
|
||||||
stateStore.busy_state = data["modem_state"];
|
|
||||||
stateStore.arq_state = data["arq_state"];
|
|
||||||
stateStore.mode = data["mode"];
|
|
||||||
stateStore.bandwidth = data["bandwidth"];
|
|
||||||
stateStore.tx_audio_level = data["tx_audio_level"];
|
|
||||||
stateStore.rx_audio_level = data["rx_audio_level"];
|
|
||||||
// if audio level is different from config one, send new audio level to modem
|
|
||||||
//console.log(parseInt(stateStore.tx_audio_level))
|
|
||||||
//console.log(parseInt(settings.tx_audio_level))
|
|
||||||
if (
|
|
||||||
parseInt(stateStore.tx_audio_level) !==
|
|
||||||
parseInt(settings.tx_audio_level) &&
|
|
||||||
setTxAudioLevelOnce === true
|
|
||||||
) {
|
|
||||||
setTxAudioLevelOnce = false;
|
|
||||||
console.log(setTxAudioLevelOnce);
|
|
||||||
setTxAudioLevel(settings.tx_audio_level);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (
|
|
||||||
parseInt(stateStore.rx_audio_level) !==
|
|
||||||
parseInt(settings.rx_audio_level) &&
|
|
||||||
setRxAudioLevelOnce === true
|
|
||||||
) {
|
|
||||||
setRxAudioLevelOnce = false;
|
|
||||||
console.log(setRxAudioLevelOnce);
|
|
||||||
setRxAudioLevel(settings.rx_audio_level);
|
|
||||||
}
|
|
||||||
|
|
||||||
stateStore.dbfs_level = data["audio_dbfs"];
|
|
||||||
stateStore.ptt_state = data["ptt_state"];
|
|
||||||
stateStore.speed_level = data["speed_level"];
|
|
||||||
stateStore.fft = JSON.parse(data["fft"]);
|
|
||||||
stateStore.channel_busy = data["channel_busy"];
|
|
||||||
stateStore.channel_busy_slot = data["channel_busy_slot"];
|
|
||||||
|
|
||||||
addDataToWaterfall(JSON.parse(data["fft"]));
|
|
||||||
|
|
||||||
if (data["scatter"].length > 0) {
|
|
||||||
stateStore.scatter = data["scatter"];
|
|
||||||
}
|
|
||||||
// s meter strength
|
|
||||||
stateStore.s_meter_strength_raw = data["strength"];
|
|
||||||
if (stateStore.s_meter_strength_raw == "") {
|
|
||||||
stateStore.s_meter_strength_raw = "Unsupported";
|
|
||||||
stateStore.s_meter_strength_percent = 0;
|
|
||||||
} else {
|
|
||||||
// https://www.moellerstudios.org/converting-amplitude-representations/
|
|
||||||
stateStore.s_meter_strength_percent = Math.round(
|
|
||||||
Math.pow(10, stateStore.s_meter_strength_raw / 20) * 100,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
stateStore.dbfs_level_percent = Math.round(
|
|
||||||
Math.pow(10, stateStore.dbfs_level / 20) * 100,
|
|
||||||
);
|
|
||||||
stateStore.dbfs_level = Math.round(stateStore.dbfs_level);
|
|
||||||
|
|
||||||
stateStore.arq_total_bytes = data["total_bytes"];
|
|
||||||
stateStore.heard_stations = data["stations"].sort(
|
|
||||||
sortByPropertyDesc("timestamp"),
|
|
||||||
);
|
|
||||||
stateStore.dxcallsign = data["dxcallsign"];
|
|
||||||
|
|
||||||
stateStore.beacon_state = data["beacon_state"];
|
|
||||||
stateStore.audio_recording = data["audio_recording"];
|
|
||||||
|
|
||||||
stateStore.hamlib_status = data["hamlib_status"];
|
|
||||||
stateStore.alc = data["alc"];
|
|
||||||
stateStore.rf_level = data["rf_level"];
|
|
||||||
|
|
||||||
stateStore.is_codec2_traffic = data["is_codec2_traffic"];
|
|
||||||
|
|
||||||
stateStore.arq_session_state = data["arq_session"];
|
|
||||||
stateStore.arq_state = data["arq_state"];
|
|
||||||
stateStore.arq_transmission_percent = data["arq_transmission_percent"];
|
|
||||||
stateStore.arq_seconds_until_finish = data["arq_seconds_until_finish"];
|
|
||||||
stateStore.arq_seconds_until_timeout =
|
|
||||||
data["arq_seconds_until_timeout"];
|
|
||||||
stateStore.arq_seconds_until_timeout_percent =
|
|
||||||
(stateStore.arq_seconds_until_timeout / 180) * 100;
|
|
||||||
|
|
||||||
if (data["speed_list"].length > 0) {
|
|
||||||
prepareStatsDataForStore(data["speed_list"]);
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: Remove ported objects
|
|
||||||
/*
|
|
||||||
let Data = {
|
|
||||||
mycallsign: data["mycallsign"],
|
|
||||||
mygrid: data["mygrid"],
|
|
||||||
//channel_state: data['CHANNEL_STATE'],
|
|
||||||
|
|
||||||
info: data["info"],
|
|
||||||
rx_msg_buffer_length: data["rx_msg_buffer_length"],
|
|
||||||
tx_n_max_retries: data["tx_n_max_retries"],
|
|
||||||
arq_tx_n_frames_per_burst: data["arq_tx_n_frames_per_burst"],
|
|
||||||
arq_tx_n_bursts: data["arq_tx_n_bursts"],
|
|
||||||
arq_tx_n_current_arq_frame: data["arq_tx_n_current_arq_frame"],
|
|
||||||
arq_tx_n_total_arq_frames: data["arq_tx_n_total_arq_frames"],
|
|
||||||
arq_rx_frame_n_bursts: data["arq_rx_frame_n_bursts"],
|
|
||||||
arq_rx_n_current_arq_frame: data["arq_rx_n_current_arq_frame"],
|
|
||||||
arq_n_arq_frames_per_data_frame:
|
|
||||||
data["arq_n_arq_frames_per_data_frame"],
|
|
||||||
arq_bytes_per_minute: data["arq_bytes_per_minute"],
|
|
||||||
arq_compression_factor: data["arq_compression_factor"],
|
|
||||||
routing_table: data["routing_table"],
|
|
||||||
mesh_signalling_table: data["mesh_signalling_table"],
|
|
||||||
listen: data["listen"],
|
|
||||||
//speed_table: [{"bpm" : 5200, "snr": -3, "timestamp":1673555399},{"bpm" : 2315, "snr": 12, "timestamp":1673555500}],
|
|
||||||
};
|
|
||||||
*/
|
|
||||||
//continue to next for loop iteration, nothing else needs to be done here
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// ----------- catch modem messages START -----------
|
|
||||||
//init message variable
|
|
||||||
var message = "";
|
|
||||||
if (data["freedata"] == "modem-message") {
|
|
||||||
// break early if we received a dummy callsign
|
|
||||||
// thats a kind of hotfix, as long as the modem isnt handling this better
|
|
||||||
if (
|
|
||||||
data["dxcallsign"] == "AA0AA-0" ||
|
|
||||||
data["dxcallsign"] == "ZZ9YY-0"
|
|
||||||
) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log(data);
|
|
||||||
|
|
||||||
switch (data["fec"]) {
|
|
||||||
case "is_writing":
|
|
||||||
// RX'd FECiswriting
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "broadcast":
|
|
||||||
// RX'd FEC BROADCAST
|
|
||||||
var encoded_data = atob_FD(data["data"]);
|
|
||||||
var splitted_data = encoded_data.split(split_char);
|
|
||||||
var messageArray = [];
|
|
||||||
if (splitted_data[0] == "m") {
|
|
||||||
messageArray.push(data);
|
|
||||||
console.log(data);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (data["cq"]) {
|
|
||||||
case "transmitting":
|
|
||||||
// CQ TRANSMITTING
|
|
||||||
displayToast(
|
|
||||||
"success",
|
|
||||||
"bi-arrow-left-right",
|
|
||||||
"Transmitting CQ",
|
|
||||||
5000,
|
|
||||||
);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "received":
|
|
||||||
// CQ RECEIVED
|
|
||||||
message = "CQ from " + data["dxcallsign"];
|
|
||||||
displayToast("success", "bi-person-arms-up", message, 5000);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (data["qrv"]) {
|
|
||||||
case "transmitting":
|
|
||||||
// QRV TRANSMITTING
|
|
||||||
displayToast(
|
|
||||||
"info",
|
|
||||||
"bi-person-raised-hand",
|
|
||||||
"Transmitting QRV ",
|
|
||||||
5000,
|
|
||||||
);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "received":
|
|
||||||
// QRV RECEIVED
|
|
||||||
message = "QRV from " + data["dxcallsign"] + " | " + data["dxgrid"];
|
|
||||||
displayToast("success", "bi-person-raised-hand", message, 5000);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (data["beacon"]) {
|
|
||||||
case "transmitting":
|
|
||||||
// BEACON TRANSMITTING
|
|
||||||
displayToast(
|
|
||||||
"success",
|
|
||||||
"bi-broadcast-pin",
|
|
||||||
"Transmitting beacon",
|
|
||||||
5000,
|
|
||||||
);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "received":
|
|
||||||
// BEACON RECEIVED
|
|
||||||
newBeaconReceived(data);
|
|
||||||
|
|
||||||
message =
|
|
||||||
"Beacon from " + data["dxcallsign"] + " | " + data["dxgrid"];
|
|
||||||
displayToast("info", "bi-broadcast", message, 5000);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (data["ping"]) {
|
|
||||||
case "transmitting":
|
|
||||||
// PING TRANSMITTING
|
|
||||||
message = "Sending ping to " + data["dxcallsign"];
|
|
||||||
displayToast("success", "bi-arrow-right", message, 5000);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "received":
|
|
||||||
// PING RECEIVED
|
|
||||||
message =
|
|
||||||
"Ping request from " +
|
|
||||||
data["dxcallsign"] +
|
|
||||||
" | " +
|
|
||||||
data["dxgrid"];
|
|
||||||
displayToast("success", "bi-arrow-right-short", message, 5000);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "acknowledge":
|
|
||||||
// PING ACKNOWLEDGE
|
|
||||||
message =
|
|
||||||
"Received ping-ack from " +
|
|
||||||
data["dxcallsign"] +
|
|
||||||
" | " +
|
|
||||||
data["dxgrid"];
|
|
||||||
displayToast("success", "bi-arrow-left-right", message, 5000);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
// ARQ SESSION && freedata == modem-message
|
|
||||||
if (data["arq"] == "session") {
|
|
||||||
switch (data["status"]) {
|
|
||||||
case "connecting":
|
|
||||||
// ARQ Open
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "connected":
|
|
||||||
// ARQ Opening
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "waiting":
|
|
||||||
// ARQ Opening
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "close":
|
|
||||||
// ARQ Closing
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "failed":
|
|
||||||
// ARQ Failed
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// ARQ TRANSMISSION && freedata == modem-message
|
|
||||||
if (data["arq"] == "transmission") {
|
|
||||||
switch (data["status"]) {
|
|
||||||
case "opened":
|
|
||||||
// ARQ Open
|
|
||||||
message = "ARQ session opened: " + data["dxcallsign"];
|
|
||||||
displayToast("success", "bi-arrow-left-right", message, 5000);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "opening":
|
|
||||||
// ARQ Opening IRS/ISS
|
|
||||||
if (data["irs"] == "False") {
|
|
||||||
message = "ARQ session opening: " + data["dxcallsign"];
|
|
||||||
displayToast("info", "bi-arrow-left-right", message, 5000);
|
|
||||||
break;
|
|
||||||
} else {
|
|
||||||
message = "ARQ sesson request from: " + data["dxcallsign"];
|
|
||||||
displayToast("success", "bi-arrow-left-right", message, 5000);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case "waiting":
|
|
||||||
// ARQ waiting
|
|
||||||
message = "Channel busy | ARQ protocol is waiting";
|
|
||||||
displayToast("warning", "bi-hourglass-split", message, 5000);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "receiving":
|
|
||||||
// ARQ RX
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "failed":
|
|
||||||
// ARQ TX Failed
|
|
||||||
if (data["reason"] == "protocol version missmatch") {
|
|
||||||
message = "Protocol version mismatch!";
|
|
||||||
displayToast("danger", "bi-chevron-bar-expand", message, 5000);
|
|
||||||
setStateFailed();
|
|
||||||
|
|
||||||
break;
|
|
||||||
} else {
|
|
||||||
message = "Transmission failed";
|
|
||||||
displayToast("danger", "bi-x-octagon", message, 5000);
|
|
||||||
updateTransmissionStatus(data);
|
|
||||||
setStateFailed();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
switch (data["irs"]) {
|
|
||||||
case "True":
|
|
||||||
updateTransmissionStatus(data);
|
|
||||||
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
updateTransmissionStatus(data);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "received":
|
|
||||||
// ARQ data received
|
|
||||||
|
|
||||||
console.log(data);
|
|
||||||
// we need to encode here to do a deep check for checking if file or message
|
|
||||||
//var encoded_data = atob(data['data'])
|
|
||||||
var encoded_data = atob_FD(data["data"]);
|
|
||||||
var splitted_data = encoded_data.split(split_char);
|
|
||||||
|
|
||||||
// new message received
|
|
||||||
if (splitted_data[0] == "m") {
|
|
||||||
console.log(splitted_data);
|
|
||||||
newMessageReceived(splitted_data, data);
|
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "transmitting":
|
|
||||||
// ARQ transmitting
|
|
||||||
updateTransmissionStatus(data);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "transmitted":
|
|
||||||
// ARQ transmitted
|
|
||||||
message = "Data transmitted";
|
|
||||||
displayToast("success", "bi-check-sqaure", message, 5000);
|
|
||||||
updateTransmissionStatus(data);
|
|
||||||
setStateSuccess();
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//finally delete message buffer
|
|
||||||
socketchunk = "";
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Send Ping
|
|
||||||
//exports.sendPing = function (dxcallsign) {
|
|
||||||
export function sendPing(dxcallsign) {
|
|
||||||
var command =
|
|
||||||
'{"type" : "ping", "command" : "ping", "dxcallsign" : "' +
|
|
||||||
dxcallsign +
|
|
||||||
'"}';
|
|
||||||
writeTncCommand(command);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send Mesh Ping
|
|
||||||
//exports.sendMeshPing = function (dxcallsign) {
|
|
||||||
function sendMeshPing(dxcallsign) {
|
|
||||||
var command =
|
|
||||||
'{"type" : "mesh", "command" : "ping", "dxcallsign" : "' +
|
|
||||||
dxcallsign +
|
|
||||||
'"}';
|
|
||||||
writeTncCommand(command);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send CQ
|
|
||||||
//exports.sendCQ = function () {
|
|
||||||
export function sendCQ() {
|
|
||||||
var command = '{"type" : "broadcast", "command" : "cqcqcq"}';
|
|
||||||
writeTncCommand(command);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set AUDIO Level
|
|
||||||
export function setTxAudioLevel(value) {
|
|
||||||
var command =
|
|
||||||
'{"type" : "set", "command" : "tx_audio_level", "value" : "' + value + '"}';
|
|
||||||
writeTncCommand(command);
|
|
||||||
}
|
|
||||||
export function setRxAudioLevel(value) {
|
|
||||||
var command =
|
|
||||||
'{"type" : "set", "command" : "rx_audio_level", "value" : "' + value + '"}';
|
|
||||||
writeTncCommand(command);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send Message
|
|
||||||
export function sendMessage(obj) {
|
|
||||||
let dxcallsign = obj.dxcallsign;
|
|
||||||
let checksum = obj.checksum;
|
|
||||||
let uuid = obj.uuid;
|
|
||||||
let command = obj.command;
|
|
||||||
|
|
||||||
let filename = Object.keys(obj._attachments)[0];
|
|
||||||
//let filetype = filename.split(".")[1]
|
|
||||||
let filetype = obj._attachments[filename].content_type;
|
|
||||||
let file = obj._attachments[filename].data;
|
|
||||||
|
|
||||||
//console.log(obj._attachments)
|
|
||||||
//console.log(filename)
|
|
||||||
//console.log(filetype)
|
|
||||||
//console.log(file)
|
|
||||||
|
|
||||||
let data_with_attachment =
|
|
||||||
obj.timestamp +
|
|
||||||
split_char +
|
|
||||||
obj.msg +
|
|
||||||
split_char +
|
|
||||||
filename +
|
|
||||||
split_char +
|
|
||||||
filetype +
|
|
||||||
split_char +
|
|
||||||
file;
|
|
||||||
|
|
||||||
let data = btoa_FD(
|
|
||||||
"m" +
|
|
||||||
split_char +
|
|
||||||
command +
|
|
||||||
split_char +
|
|
||||||
checksum +
|
|
||||||
split_char +
|
|
||||||
uuid +
|
|
||||||
split_char +
|
|
||||||
data_with_attachment,
|
|
||||||
);
|
|
||||||
|
|
||||||
// TODO: REMOVE mode and frames from Modem!
|
|
||||||
var mode = 255;
|
|
||||||
var frames = 5;
|
|
||||||
|
|
||||||
command =
|
|
||||||
'{"type" : "arq", "command" : "send_raw", "uuid" : "' +
|
|
||||||
uuid +
|
|
||||||
'", "parameter" : [{"dxcallsign" : "' +
|
|
||||||
dxcallsign +
|
|
||||||
'", "mode" : "' +
|
|
||||||
mode +
|
|
||||||
'", "n_frames" : "' +
|
|
||||||
frames +
|
|
||||||
'", "data" : "' +
|
|
||||||
data +
|
|
||||||
'", "attempts": "10"}]}';
|
|
||||||
console.log(command);
|
|
||||||
writeTncCommand(command);
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
// Send Request message
|
|
||||||
//It would be then „m + split + request + split + request-type“
|
|
||||||
function sendRequest(dxcallsign, mode, frames, data, command) {
|
|
||||||
data = btoa_FD("m" + split_char + command + split_char + data);
|
|
||||||
command =
|
|
||||||
'{"type" : "arq", "command" : "send_raw", "parameter" : [{"dxcallsign" : "' +
|
|
||||||
dxcallsign +
|
|
||||||
'", "mode" : "' +
|
|
||||||
mode +
|
|
||||||
'", "n_frames" : "' +
|
|
||||||
frames +
|
|
||||||
'", "data" : "' +
|
|
||||||
data +
|
|
||||||
'", "attempts": "10"}]}';
|
|
||||||
console.log(command);
|
|
||||||
console.log("--------------REQ--------------------");
|
|
||||||
writeTncCommand(command);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send Response message
|
|
||||||
//It would be then „m + split + request + split + request-type“
|
|
||||||
function sendResponse(dxcallsign, mode, frames, data, command) {
|
|
||||||
data = btoa_FD("m" + split_char + command + split_char + data);
|
|
||||||
command =
|
|
||||||
'{"type" : "arq", "command" : "send_raw", "parameter" : [{"dxcallsign" : "' +
|
|
||||||
dxcallsign +
|
|
||||||
'", "mode" : "' +
|
|
||||||
mode +
|
|
||||||
'", "n_frames" : "' +
|
|
||||||
frames +
|
|
||||||
'", "data" : "' +
|
|
||||||
data +
|
|
||||||
'", "attempts": "10"}]}';
|
|
||||||
console.log(command);
|
|
||||||
console.log("--------------RES--------------------");
|
|
||||||
writeTncCommand(command);
|
|
||||||
}
|
|
||||||
|
|
||||||
//Send station info request
|
|
||||||
//exports.sendRequestInfo = function (dxcallsign) {
|
|
||||||
function sendRequestInfo(dxcallsign) {
|
|
||||||
//Command 0 = user/station information
|
|
||||||
//Command 1 = shared folder list
|
|
||||||
//Command 2 = shared file transfer
|
|
||||||
sendRequest(dxcallsign, 255, 1, "0", "req");
|
|
||||||
}
|
|
||||||
|
|
||||||
//Send shared folder file list request
|
|
||||||
//exports.sendRequestSharedFolderList = function (dxcallsign) {
|
|
||||||
function sendRequestSharedFolderList(dxcallsign) {
|
|
||||||
//Command 0 = user/station information
|
|
||||||
//Command 1 = shared folder list
|
|
||||||
//Command 2 = shared file transfer
|
|
||||||
sendRequest(dxcallsign, 255, 1, "1", "req");
|
|
||||||
}
|
|
||||||
|
|
||||||
//Send shared file request
|
|
||||||
//exports.sendRequestSharedFile = function (dxcallsign, file) {
|
|
||||||
function sendRequestSharedFile(dxcallsign, file) {
|
|
||||||
//Command 0 = user/station information
|
|
||||||
//Command 1 = shared folder list
|
|
||||||
//Command 2 = shared file transfer
|
|
||||||
sendRequest(dxcallsign, 255, 1, "2" + file, "req");
|
|
||||||
}
|
|
||||||
|
|
||||||
//Send station info response
|
|
||||||
//exports.sendResponseInfo = function (dxcallsign, userinfo) {
|
|
||||||
function sendResponseInfo(dxcallsign, userinfo) {
|
|
||||||
//Command 0 = user/station information
|
|
||||||
//Command 1 = shared folder list
|
|
||||||
//Command 2 = shared file transfer
|
|
||||||
sendResponse(dxcallsign, 255, 1, userinfo, "res-0");
|
|
||||||
}
|
|
||||||
|
|
||||||
//Send shared folder response
|
|
||||||
//exports.sendResponseSharedFolderList = function (dxcallsign, sharedFolderList) {
|
|
||||||
function sendResponseSharedFolderList(dxcallsign, sharedFolderList) {
|
|
||||||
//Command 0 = user/station information
|
|
||||||
//Command 1 = shared folder list
|
|
||||||
//Command 2 = shared file transfer
|
|
||||||
sendResponse(dxcallsign, 255, 1, sharedFolderList, "res-1");
|
|
||||||
}
|
|
||||||
|
|
||||||
//Send shared file response
|
|
||||||
//exports.sendResponseSharedFile = function (
|
|
||||||
function sendResponseSharedFile(dxcallsign, sharedFile, sharedFileData) {
|
|
||||||
console.log(
|
|
||||||
"In sendResponseSharedFile",
|
|
||||||
dxcallsign,
|
|
||||||
sharedFile,
|
|
||||||
sharedFileData,
|
|
||||||
);
|
|
||||||
//Command 0 = user/station information
|
|
||||||
//Command 1 = shared folder list
|
|
||||||
//Command 2 = shared file transfer
|
|
||||||
sendResponse(dxcallsign, 255, 1, sharedFile + "/" + sharedFileData, "res-2");
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Get RX BUffer
|
|
||||||
export function getRxBuffer() {
|
|
||||||
var command = '{"type" : "get", "command" : "rx_buffer"}';
|
|
||||||
|
|
||||||
writeTncCommand(command);
|
|
||||||
}
|
|
||||||
|
|
||||||
// OPEN ARQ SESSION
|
|
||||||
export function connectARQ(dxcallsign) {
|
|
||||||
var command =
|
|
||||||
'{"type" : "arq", "command" : "connect", "dxcallsign": "' +
|
|
||||||
dxcallsign +
|
|
||||||
'", "attempts": "10"}';
|
|
||||||
writeTncCommand(command);
|
|
||||||
}
|
|
||||||
|
|
||||||
// CLOSE ARQ SESSION
|
|
||||||
export function disconnectARQ() {
|
|
||||||
var command = '{"type" : "arq", "command" : "disconnect"}';
|
|
||||||
writeTncCommand(command);
|
|
||||||
}
|
|
||||||
|
|
||||||
// SEND TEST FRAME
|
|
||||||
export function sendTestFrame() {
|
|
||||||
var command = '{"type" : "set", "command" : "send_test_frame"}';
|
|
||||||
writeTncCommand(command);
|
|
||||||
}
|
|
||||||
|
|
||||||
// SEND FEC
|
|
||||||
export function sendFEC(mode, payload) {
|
|
||||||
var command =
|
|
||||||
'{"type" : "fec", "command" : "transmit", "mode" : "' +
|
|
||||||
mode +
|
|
||||||
'", "payload" : "' +
|
|
||||||
payload +
|
|
||||||
'"}';
|
|
||||||
writeTncCommand(command);
|
|
||||||
}
|
|
||||||
|
|
||||||
// SEND FEC IS WRITING
|
|
||||||
export function sendFecIsWriting(mycallsign) {
|
|
||||||
var command =
|
|
||||||
'{"type" : "fec", "command" : "transmit_is_writing", "mycallsign" : "' +
|
|
||||||
mycallsign +
|
|
||||||
'"}';
|
|
||||||
writeTncCommand(command);
|
|
||||||
}
|
|
||||||
|
|
||||||
// SEND FEC TO BROADCASTCHANNEL
|
|
||||||
//export function sendBroadcastChannel(channel, data_out, uuid) {
|
|
||||||
export function sendBroadcastChannel(obj) {
|
|
||||||
//let checksum = obj.checksum;
|
|
||||||
let command = obj.command;
|
|
||||||
let uuid = obj.uuid;
|
|
||||||
let channel = obj.dxcallsign;
|
|
||||||
let data_out = obj.msg;
|
|
||||||
|
|
||||||
let data = btoa_FD(
|
|
||||||
"m" +
|
|
||||||
split_char +
|
|
||||||
channel +
|
|
||||||
//split_char +
|
|
||||||
//checksum +
|
|
||||||
split_char +
|
|
||||||
uuid +
|
|
||||||
split_char +
|
|
||||||
data_out,
|
|
||||||
);
|
|
||||||
console.log(data.length);
|
|
||||||
let payload = data;
|
|
||||||
command =
|
|
||||||
'{"type" : "fec", "command" : "transmit", "mode": "datac4", "wakeup": "True", "payload" : "' +
|
|
||||||
payload +
|
|
||||||
'"}';
|
|
||||||
writeTncCommand(command);
|
|
||||||
}
|
|
||||||
|
|
||||||
// RECORD AUDIO
|
|
||||||
export function record_audio() {
|
|
||||||
var command = '{"type" : "set", "command" : "record_audio"}';
|
|
||||||
writeTncCommand(command);
|
|
||||||
}
|
|
||||||
|
|
||||||
// SET FREQUENCY
|
|
||||||
export function set_frequency(frequency) {
|
|
||||||
var command =
|
|
||||||
'{"type" : "set", "command" : "frequency", "frequency": ' + frequency + "}";
|
|
||||||
writeTncCommand(command);
|
|
||||||
}
|
|
||||||
|
|
||||||
// SET MODE
|
|
||||||
export function set_mode(mode) {
|
|
||||||
var command = '{"type" : "set", "command" : "mode", "mode": "' + mode + '"}';
|
|
||||||
writeTncCommand(command);
|
|
||||||
}
|
|
||||||
|
|
||||||
// SET rf_level
|
|
||||||
export function set_rf_level(rf_level) {
|
|
||||||
var command =
|
|
||||||
'{"type" : "set", "command" : "rf_level", "rf_level": "' + rf_level + '"}';
|
|
||||||
writeTncCommand(command);
|
|
||||||
}
|
|
||||||
|
|
||||||
// https://stackoverflow.com/a/50579690
|
|
||||||
// crc32 calculation
|
|
||||||
//console.log(crc32('abc'));
|
|
||||||
//console.log(crc32('abc').toString(16).toUpperCase()); // hex
|
|
||||||
/*
|
|
||||||
function crc32(r) {
|
|
||||||
for (var a, o = [], c = 0; c < 256; c++) {
|
|
||||||
a = c;
|
|
||||||
for (var f = 0; f < 8; f++) a = 1 & a ? 3988292384 ^ (a >>> 1) : a >>> 1;
|
|
||||||
o[c] = a;
|
|
||||||
}
|
|
||||||
for (var n = -1, t = 0; t < r.length; t++)
|
|
||||||
n = (n >>> 8) ^ o[255 & (n ^ r.charCodeAt(t))];
|
|
||||||
return (-1 ^ n) >>> 0;
|
|
||||||
};
|
|
||||||
*/
|
|
||||||
|
|
||||||
// TODO Maybe moving this to another module
|
|
||||||
function prepareStatsDataForStore(data) {
|
|
||||||
// dummy data
|
|
||||||
//state.arq_speed_list = [{"snr":0.0,"bpm":104,"timestamp":1696189769},{"snr":0.0,"bpm":80,"timestamp":1696189778},{"snr":0.0,"bpm":70,"timestamp":1696189783},{"snr":0.0,"bpm":58,"timestamp":1696189792},{"snr":0.0,"bpm":52,"timestamp":1696189797},{"snr":"NaN","bpm":42,"timestamp":1696189811},{"snr":0.0,"bpm":22,"timestamp":1696189875},{"snr":0.0,"bpm":21,"timestamp":1696189881},{"snr":0.0,"bpm":17,"timestamp":1696189913},{"snr":0.0,"bpm":15,"timestamp":1696189932},{"snr":0.0,"bpm":15,"timestamp":1696189937},{"snr":0.0,"bpm":14,"timestamp":1696189946},{"snr":-6.1,"bpm":14,"timestamp":1696189954},{"snr":-6.1,"bpm":14,"timestamp":1696189955},{"snr":-5.5,"bpm":28,"timestamp":1696189963},{"snr":-5.5,"bpm":27,"timestamp":1696189963}]
|
|
||||||
|
|
||||||
var speed_listSize = 0;
|
|
||||||
if (typeof data == "undefined") {
|
|
||||||
speed_listSize = 0;
|
|
||||||
} else {
|
|
||||||
speed_listSize = data.length;
|
|
||||||
}
|
|
||||||
|
|
||||||
var speed_list_bpm = [];
|
|
||||||
|
|
||||||
for (let i = 0; i < speed_listSize; i++) {
|
|
||||||
speed_list_bpm.push(data[i].bpm);
|
|
||||||
}
|
|
||||||
|
|
||||||
var speed_list_timestamp = [];
|
|
||||||
|
|
||||||
for (let i = 0; i < speed_listSize; i++) {
|
|
||||||
let timestamp = data[i].timestamp * 1000;
|
|
||||||
let h = new Date(timestamp).getHours();
|
|
||||||
let m = new Date(timestamp).getMinutes();
|
|
||||||
let s = new Date(timestamp).getSeconds();
|
|
||||||
let time = h + ":" + m + ":" + s;
|
|
||||||
speed_list_timestamp.push(time);
|
|
||||||
}
|
|
||||||
|
|
||||||
var speed_list_snr = [];
|
|
||||||
for (let i = 0; i < speed_listSize; i++) {
|
|
||||||
let snr = NaN;
|
|
||||||
if (data[i].snr !== 0) {
|
|
||||||
snr = data[i].snr;
|
|
||||||
} else {
|
|
||||||
snr = NaN;
|
|
||||||
}
|
|
||||||
speed_list_snr.push(snr);
|
|
||||||
}
|
|
||||||
|
|
||||||
stateStore.arq_speed_list_bpm = speed_list_bpm;
|
|
||||||
stateStore.arq_speed_list_timestamp = speed_list_timestamp;
|
|
||||||
stateStore.arq_speed_list_snr = speed_list_snr;
|
|
||||||
}
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
/*
|
||||||
import {
|
import {
|
||||||
newMessageReceived,
|
newMessageReceived,
|
||||||
newBeaconReceived,
|
newBeaconReceived,
|
||||||
|
@ -5,7 +6,10 @@ import {
|
||||||
setStateSuccess,
|
setStateSuccess,
|
||||||
setStateFailed,
|
setStateFailed,
|
||||||
} from "./chatHandler";
|
} from "./chatHandler";
|
||||||
|
*/
|
||||||
import { displayToast } from "./popupHandler";
|
import { displayToast } from "./popupHandler";
|
||||||
|
import { getFreedataMessages } from "./api"
|
||||||
|
import { processFreedataMessages } from "./messagesHandler.ts"
|
||||||
|
|
||||||
// ----------------- init pinia stores -------------
|
// ----------------- init pinia stores -------------
|
||||||
import { setActivePinia } from "pinia";
|
import { setActivePinia } from "pinia";
|
||||||
|
@ -58,6 +62,14 @@ export function eventDispatcher(data) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
switch (data["message-db"]) {
|
||||||
|
case "changed":
|
||||||
|
console.log("fetching new messages...")
|
||||||
|
var messages = getFreedataMessages()
|
||||||
|
processFreedataMessages(messages)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
switch (data["ptt"]) {
|
switch (data["ptt"]) {
|
||||||
case true:
|
case true:
|
||||||
case false:
|
case false:
|
||||||
|
@ -97,6 +109,9 @@ export function eventDispatcher(data) {
|
||||||
message = "Connected to server";
|
message = "Connected to server";
|
||||||
displayToast("success", "bi-ethernet", message, 5000);
|
displayToast("success", "bi-ethernet", message, 5000);
|
||||||
stateStore.modem_connection = "connected";
|
stateStore.modem_connection = "connected";
|
||||||
|
|
||||||
|
getFreedataMessages()
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
case "arq":
|
case "arq":
|
||||||
|
|
66
gui/src/js/messagesHandler.ts
Normal file
66
gui/src/js/messagesHandler.ts
Normal file
|
@ -0,0 +1,66 @@
|
||||||
|
// pinia store setup
|
||||||
|
import { setActivePinia } from "pinia";
|
||||||
|
import pinia from "../store/index";
|
||||||
|
setActivePinia(pinia);
|
||||||
|
|
||||||
|
import { useChatStore } from "../store/chatStore.js";
|
||||||
|
const chatStore = useChatStore(pinia);
|
||||||
|
|
||||||
|
import { sendFreedataMessage } from "./api"
|
||||||
|
|
||||||
|
interface Message {
|
||||||
|
id: string;
|
||||||
|
timestamp: string;
|
||||||
|
origin: string;
|
||||||
|
destination: string;
|
||||||
|
direction: string;
|
||||||
|
body: string;
|
||||||
|
attachments: any[];
|
||||||
|
status: any;
|
||||||
|
statistics: any;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export function processFreedataMessages(data){
|
||||||
|
let jsondata = JSON.parse(data);
|
||||||
|
chatStore.callsign_list = createCallsignListFromAPI(jsondata)
|
||||||
|
chatStore.sorted_chat_list = createSortedMessagesList(jsondata)
|
||||||
|
}
|
||||||
|
|
||||||
|
function createCallsignListFromAPI(data: { total_messages: number, messages: Message[] }): {[key: string]: {timestamp: string, body: string}} {
|
||||||
|
const callsignList: {[key: string]: {timestamp: string, body: string}} = {};
|
||||||
|
|
||||||
|
data.messages.forEach(message => {
|
||||||
|
let callsign = message.direction === 'receive' ? message.origin : message.destination;
|
||||||
|
|
||||||
|
if (!callsignList[callsign] || callsignList[callsign].timestamp < message.timestamp) {
|
||||||
|
callsignList[callsign] = { timestamp: message.timestamp, body: message.body };
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return callsignList;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
function createSortedMessagesList(data: { total_messages: number, messages: Message[] }): {[key: string]: Message[]} {
|
||||||
|
const callsignMessages: {[key: string]: Message[]} = {};
|
||||||
|
|
||||||
|
data.messages.forEach(message => {
|
||||||
|
let callsign = message.direction === 'receive' ? message.origin : message.destination;
|
||||||
|
|
||||||
|
if (!callsignMessages[callsign]) {
|
||||||
|
callsignMessages[callsign] = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
callsignMessages[callsign].push(message);
|
||||||
|
});
|
||||||
|
|
||||||
|
return callsignMessages;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
export function newMessage(dxcall, body){
|
||||||
|
sendFreedataMessage(dxcall, body)
|
||||||
|
}
|
|
@ -2,6 +2,16 @@ import { defineStore } from "pinia";
|
||||||
import { ref } from "vue";
|
import { ref } from "vue";
|
||||||
|
|
||||||
export const useChatStore = defineStore("chatStore", () => {
|
export const useChatStore = defineStore("chatStore", () => {
|
||||||
|
|
||||||
|
var callsign_list = ref();
|
||||||
|
var sorted_chat_list = ref();
|
||||||
|
var newChatCallsign = ref();
|
||||||
|
var newChatMessage = ref();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* ------------------------------------------------ */
|
||||||
|
|
||||||
var chat_filter = ref([
|
var chat_filter = ref([
|
||||||
{ type: "newchat" },
|
{ type: "newchat" },
|
||||||
{ type: "received" },
|
{ type: "received" },
|
||||||
|
@ -46,9 +56,6 @@ export const useChatStore = defineStore("chatStore", () => {
|
||||||
var inputFileType = ref("-");
|
var inputFileType = ref("-");
|
||||||
var inputFileSize = ref("-");
|
var inputFileSize = ref("-");
|
||||||
|
|
||||||
var callsign_list = ref();
|
|
||||||
var sorted_chat_list = ref();
|
|
||||||
var unsorted_chat_list = ref([]);
|
|
||||||
|
|
||||||
var sorted_beacon_list = ref({});
|
var sorted_beacon_list = ref({});
|
||||||
var unsorted_beacon_list = ref({});
|
var unsorted_beacon_list = ref({});
|
||||||
|
@ -68,12 +75,13 @@ export const useChatStore = defineStore("chatStore", () => {
|
||||||
|
|
||||||
return {
|
return {
|
||||||
selectedCallsign,
|
selectedCallsign,
|
||||||
|
newChatCallsign,
|
||||||
|
newChatMessage,
|
||||||
selectedMessageObject,
|
selectedMessageObject,
|
||||||
inputText,
|
inputText,
|
||||||
chat_filter,
|
chat_filter,
|
||||||
callsign_list,
|
callsign_list,
|
||||||
sorted_chat_list,
|
sorted_chat_list,
|
||||||
unsorted_chat_list,
|
|
||||||
inputFileName,
|
inputFileName,
|
||||||
inputFileSize,
|
inputFileSize,
|
||||||
inputFileType,
|
inputFileType,
|
||||||
|
|
Loading…
Reference in a new issue