iarv/meshstream
1
0
Fork 1
mirror of https://github.com/dpup/meshstream.git synced 2026-03-28 17:42:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Send complete packet object to SSE clients

Browse Source
This commit is contained in:
Daniel Pupius
2025-04-21 10:13:30 -07:00
parent ed1e719bca
commit 52ed85ed23
2 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
server/server.go
View File

@@ -129,34 +129,20 @@ func (s *Server) handleStream(w http.ResponseWriter, r *http.Request) {
continue
}
// Create a simplified packet for the frontend
packetData := map[string]interface{}{
"from": packet.From,
"to": packet.To,
"port": packet.PortNum.String(),
"timestamp": time.Now().Unix(),
"hop_limit": packet.HopLimit,
"hop_start": packet.HopStart,
"id": packet.ID,
"channel_id": packet.ChannelID,
// Create a serializable wrapper for the packet
// That includes both the entire packet and some extra fields for convenience
packetWrapper := struct {
*mqtt.Packet
ReceivedAt int64 `json:"received_at"`
PortString string `json:"port_string"`
}{
Packet: packet,
ReceivedAt: time.Now().Unix(),
PortString: packet.PortNum.String(),
}
// Add payload information if available
switch v := packet.Payload.(type) {
case string:
packetData["payload_type"] = "text"
packetData["payload"] = v
case []byte:
packetData["payload_type"] = "binary"
packetData["payload_size"] = len(v)
case nil:
packetData["payload_type"] = "none"
default:
packetData["payload_type"] = fmt.Sprintf("%T", v)
}
// Convert the packet to JSON
data, err := json.Marshal(packetData)
// Convert the entire packet to JSON
data, err := json.Marshal(packetWrapper)
if err != nil {
log.Printf("Error marshaling packet to JSON: %v", err)

49
server/static/index.html
View File

@@ -100,27 +100,48 @@
eventSource.addEventListener('message', (e) => {
console.log('Message event:', e.data);
try {
const data = JSON.parse(e.data);
const timestamp = new Date(data.timestamp * 1000).toLocaleTimeString();
const packet = JSON.parse(e.data);
const timestamp = new Date(packet.received_at * 1000).toLocaleTimeString();
let msgText = `[${timestamp}] From Node ${data.from} to ${data.to} (${data.port})`;
// Store the full packet data for later reference if needed
console.log('Full packet:', packet);
// Format the message with essential information
let msgText = `[${timestamp}] From Node ${packet.from} to ${packet.to} (${packet.port_string})`;
// Add packet ID and hop info if available
if (data.id) {
msgText += ` • ID: ${data.id}`;
if (packet.id) {
msgText += ` • ID: ${packet.id}`;
}
if (data.hop_limit && data.hop_limit > 0) {
msgText += ` • Hop: ${data.hop_start}/${data.hop_limit}`;
if (packet.hop_limit && packet.hop_limit > 0) {
msgText += ` • Hop: ${packet.hop_start}/${packet.hop_limit}`;
}
// Add payload info
if (data.payload_type === 'text' && data.payload) {
msgText += ` • Message: "${data.payload}"`;
} else if (data.payload_type === 'binary' && data.payload_size) {
msgText += ` • Binary data: ${data.payload_size} bytes`;
} else if (data.payload_type && data.payload_type !== 'none') {
msgText += ` • Payload: ${data.payload_type}`;
// Determine payload type and add appropriate info
const payloadType = typeof packet.payload;
if (payloadType === 'string') {
// Text message
msgText += ` • Message: "${packet.payload}"`;
} else if (packet.payload && typeof packet.payload === 'object') {
// Handle various object payload types
if (Array.isArray(packet.payload)) {
// Binary data as array
msgText += ` • Binary data: ${packet.payload.length} bytes`;
} else {
// Structured data (protobuf object)
msgText += ` • Data: ${Object.keys(packet.payload).length} fields`;
}
} else if (packet.payload === null) {
msgText += ` • No payload`;
} else {
msgText += ` • Payload type: ${payloadType}`;
}
// Add channel ID if available
if (packet.channel_id) {
msgText += ` • Channel: ${packet.channel_id}`;
}
addMessage(msgText);