+
{message.state === "ack" ? (
) : message.state === "waiting" ? (
@@ -46,7 +46,7 @@ export const Message = ({
message.state === "ack" ? "text-textPrimary" : "text-textSecondary"
}`}
>
- {message.text}
+ {message.data}
)}
@@ -63,14 +63,13 @@ export const Message = ({
{sender?.user?.longName ?? "UNK"}
- {new Date(message.packet.rxTime).toLocaleTimeString(undefined, {
+ {message.rxTime.toLocaleTimeString(undefined, {
hour: "2-digit",
minute: "2-digit"
})}
- {/*
*/}
+
{message.state === "ack" ? (
) : message.state === "waiting" ? (
@@ -88,7 +87,7 @@ export const Message = ({
: "text-textSecondary"
}`}
>
- {message.text}
+ {message.data}
)}
diff --git a/src/core/stores/deviceStore.ts b/src/core/stores/deviceStore.ts
index 2a13348a..860ca1b5 100644
--- a/src/core/stores/deviceStore.ts
+++ b/src/core/stores/deviceStore.ts
@@ -15,12 +15,12 @@ export type Page =
| "info"
| "logs";
-export interface MessageWithState extends Types.MessagePacket {
+export interface MessageWithState extends Types.PacketMetadata
{
state: MessageState;
}
export interface WaypointIDWithState
- extends Omit {
+ extends Omit, "data"> {
waypointID: number;
state: MessageState;
}
@@ -42,6 +42,12 @@ export interface Node {
data: Protobuf.NodeInfo;
}
+export interface processPacketParams {
+ from: number;
+ snr: number;
+ time: number;
+}
+
export interface Device {
id: number;
ready: boolean;
@@ -69,20 +75,22 @@ export interface Device {
setConfig: (config: Protobuf.Config) => void;
setModuleConfig: (config: Protobuf.ModuleConfig) => void;
setHardware: (hardware: Protobuf.MyNodeInfo) => void;
- setMetrics: (metrics: Types.TelemetryPacket) => void;
+ setMetrics: (metrics: Types.PacketMetadata) => void;
setActivePage: (page: Page) => void;
setPeerInfoOpen: (open: boolean) => void;
setActivePeer: (peer: number) => void;
setPendingSettingsChanges: (state: boolean) => void;
addChannel: (channel: Channel) => void;
addWaypoint: (waypoint: Protobuf.Waypoint) => void;
- addNodeInfo: (nodeInfo: Types.NodeInfoPacket) => void;
- addUser: (user: Types.UserPacket) => void;
- addPosition: (position: Types.PositionPacket) => void;
+ addNodeInfo: (nodeInfo: Protobuf.NodeInfo) => void;
+ addUser: (user: Types.PacketMetadata) => void;
+ addPosition: (position: Types.PacketMetadata) => void;
addConnection: (connection: Types.ConnectionType) => void;
addMessage: (message: MessageWithState) => void;
addWaypointMessage: (message: WaypointIDWithState) => void;
- addDeviceMetadataMessage: (metadata: Types.DeviceMetadataPacket) => void;
+ addDeviceMetadataMessage: (
+ metadata: Types.PacketMetadata
+ ) => void;
setMessageState: (
channelIndex: number,
messageId: number,
@@ -92,6 +100,7 @@ export interface Device {
setQRDialogOpen: (open: boolean) => void;
setShutdownDialogOpen: (open: boolean) => void;
setRebootDialogOpen: (open: boolean) => void;
+ processPacket: (data: processPacketParams) => void;
}
export interface DeviceState {
@@ -237,27 +246,13 @@ export const useDeviceStore = create((set, get) => ({
})
);
},
- setMetrics: (metrics: Types.TelemetryPacket) => {
+ setMetrics: (metrics: Types.PacketMetadata) => {
set(
produce((draft) => {
const device = draft.devices.get(id);
let node = device?.nodes.find(
- (n) => n.data.num === metrics.packet.from
+ (n) => n.data.num === metrics.from
);
- if (device && !node) {
- node = {
- data: Protobuf.NodeInfo.create({
- num: metrics.packet.from,
- snr: metrics.packet.rxSnr,
- lastHeard: Date.now()
- }),
- metadata: undefined,
- deviceMetrics: [],
- environmentMetrics: []
- };
-
- device.nodes.push(node);
- }
if (node) {
switch (metrics.data.variant.oneofKind) {
case "deviceMetrics":
@@ -283,19 +278,13 @@ export const useDeviceStore = create((set, get) => ({
}
node.deviceMetrics.push({
...metrics.data.variant.deviceMetrics,
- timestamp:
- metrics.packet.rxTime === 0
- ? new Date()
- : new Date(metrics.packet.rxTime * 1000)
+ timestamp: metrics.rxTime
});
break;
case "environmentMetrics":
node.environmentMetrics.push({
...metrics.data.variant.environmentMetrics,
- timestamp:
- metrics.packet.rxTime === 0
- ? new Date()
- : new Date(metrics.packet.rxTime * 1000)
+ timestamp: metrics.rxTime
});
break;
}
@@ -364,30 +353,18 @@ export const useDeviceStore = create((set, get) => ({
set(
produce((draft) => {
const device = draft.devices.get(id);
- if (device) {
- const node = device.nodes.find(
- (node) => node.data.num === nodeInfo.data.num
- );
- if (node) {
- node.data = nodeInfo.data;
- node.data.lastHeard =
- nodeInfo.packet.rxTime !== 0
- ? nodeInfo.packet.rxTime * 1000
- : Date.now();
- } else {
- device.nodes.push({
- data: Protobuf.NodeInfo.create({
- ...nodeInfo.data,
- lastHeard:
- nodeInfo.packet.rxTime !== 0
- ? nodeInfo.packet.rxTime * 1000
- : Date.now()
- }),
- metadata: undefined,
- deviceMetrics: [],
- environmentMetrics: []
- });
- }
+ const node = device?.nodes.find(
+ (node) => node.data.num === nodeInfo.num
+ );
+ if (node) {
+ node.data = nodeInfo;
+ } else {
+ device?.nodes.push({
+ data: nodeInfo,
+ metadata: undefined,
+ deviceMetrics: [],
+ environmentMetrics: []
+ });
}
})
);
@@ -416,29 +393,11 @@ export const useDeviceStore = create((set, get) => ({
set(
produce((draft) => {
const device = draft.devices.get(id);
- if (device) {
- const node = device.nodes.find(
- (node) => node.data.num === user.packet.from
- );
- if (node) {
- node.data.user = user.data;
- // if (action.payload.packet.rxTime) {
- // node.data.lastHeard = new Date(
- // action.payload.packet.rxTime * 1000,
- // ).getTime();
- // }
- } else {
- device.nodes.push({
- data: Protobuf.NodeInfo.create({
- num: user.packet.from,
- snr: user.packet.rxSnr,
- user: user.data
- }),
- metadata: undefined,
- deviceMetrics: [],
- environmentMetrics: []
- });
- }
+ const node = device?.nodes.find(
+ (node) => node.data.num === user.from
+ );
+ if (node) {
+ node.data.user = user.data;
}
})
);
@@ -447,28 +406,11 @@ export const useDeviceStore = create((set, get) => ({
set(
produce((draft) => {
const device = draft.devices.get(id);
- if (device) {
- const node = device.nodes.find(
- (node) => node.data.num === position.packet.from
- );
- if (node) {
- node.data.position = position.data;
- // if (action.payload.packet.rxTime) {
- // node.data.lastHeard = new Date(
- // action.payload.packet.rxTime * 1000,
- // ).getTime();
- // }
- } else {
- device.nodes.push({
- data: Protobuf.NodeInfo.create({
- num: position.packet.from,
- position: position.data
- }),
- metadata: undefined,
- deviceMetrics: [],
- environmentMetrics: []
- });
- }
+ const node = device?.nodes.find(
+ (node) => node.data.num === position.from
+ );
+ if (node) {
+ node.data.position = position.data;
}
})
);
@@ -487,11 +429,9 @@ export const useDeviceStore = create((set, get) => ({
set(
produce((draft) => {
const device = draft.devices.get(id);
- if (device) {
- device.channels
- .find((ch) => ch.config.index === message.packet.channel)
- ?.messages.push(message);
- }
+ device?.channels
+ .find((ch) => ch.config.index === message.channel)
+ ?.messages.push(message);
})
);
},
@@ -499,11 +439,9 @@ export const useDeviceStore = create((set, get) => ({
set(
produce((draft) => {
const device = draft.devices.get(id);
- if (device) {
- device.channels
- .find((ch) => ch.config.index === waypointID.packet.channel)
- ?.messages.push(waypointID);
- }
+ device?.channels
+ .find((ch) => ch.config.index === waypointID.channel)
+ ?.messages.push(waypointID);
})
);
},
@@ -511,15 +449,11 @@ export const useDeviceStore = create((set, get) => ({
set(
produce((draft) => {
const device = draft.devices.get(id);
- if (device) {
- const node = device.nodes.find(
- (n) => n.data.num === metadata.packet.from
- );
- if (node) {
- node.metadata = metadata.data;
- } else {
- console.log("Node not found!");
- }
+ const node = device?.nodes.find(
+ (n) => n.data.num === metadata.from
+ );
+ if (node) {
+ node.metadata = metadata.data;
}
})
);
@@ -537,7 +471,7 @@ export const useDeviceStore = create((set, get) => ({
(ch) => ch.config.index === channelIndex
);
const message = channel?.messages.find(
- (msg) => msg.packet.id === messageId
+ (msg) => msg.id === messageId
);
if (message) {
message.state = state;
@@ -584,6 +518,36 @@ export const useDeviceStore = create((set, get) => ({
}
})
);
+ },
+ processPacket(data: processPacketParams) {
+ set(
+ produce((draft) => {
+ const device = draft.devices.get(id);
+ if (!device) {
+ return;
+ }
+ const node = device.nodes.find((n) => n.data.num === data.from);
+ if (!node) {
+ device.nodes.push({
+ data: Protobuf.NodeInfo.create({
+ num: data.from,
+ lastHeard: data.time,
+ snr: data.snr
+ }),
+ metadata: undefined,
+ deviceMetrics: [],
+ environmentMetrics: []
+ });
+ return;
+ } else {
+ node.data = {
+ ...node.data,
+ lastHeard: data.time,
+ snr: data.snr
+ };
+ }
+ })
+ );
}
});
})
diff --git a/src/core/subscriptions.ts b/src/core/subscriptions.ts
index 36964d59..22322289 100644
--- a/src/core/subscriptions.ts
+++ b/src/core/subscriptions.ts
@@ -65,7 +65,7 @@ export const subscribeAll = (
device.addWaypoint(data);
device.addWaypointMessage({
waypointID: data.id,
- state: rest.packet.from !== myNodeNum ? "ack" : "waiting",
+ state: rest.from !== myNodeNum ? "ack" : "waiting",
...rest
});
});
@@ -84,7 +84,7 @@ export const subscribeAll = (
});
connection.events.onNodeInfoPacket.subscribe((nodeInfo) => {
- toast(`New Node Discovered: ${nodeInfo.data.user?.shortName ?? "UNK"}`, {
+ toast(`New Node Discovered: ${nodeInfo.user?.shortName ?? "UNK"}`, {
icon: "🔎"
});
device.addNodeInfo(nodeInfo);
@@ -92,26 +92,34 @@ export const subscribeAll = (
connection.events.onChannelPacket.subscribe((channel) => {
device.addChannel({
- config: channel.data,
+ config: channel,
lastInterraction: new Date(),
messages: []
});
});
connection.events.onConfigPacket.subscribe((config) => {
- device.setConfig(config.data);
+ device.setConfig(config);
});
connection.events.onModuleConfigPacket.subscribe((moduleConfig) => {
- device.setModuleConfig(moduleConfig.data);
+ device.setModuleConfig(moduleConfig);
});
connection.events.onMessagePacket.subscribe((messagePacket) => {
device.addMessage({
...messagePacket,
- state: messagePacket.packet.from !== myNodeNum ? "ack" : "waiting"
+ state: messagePacket.from !== myNodeNum ? "ack" : "waiting"
});
});
connection.events.onPendingSettingsChange.subscribe((state) => {
device.setPendingSettingsChanges(state);
});
+
+ connection.events.onMeshPacket.subscribe((meshPacket) => {
+ device.processPacket({
+ from: meshPacket.from,
+ snr: meshPacket.rxSnr,
+ time: meshPacket.rxTime
+ });
+ });
};
diff --git a/src/pages/Peers.tsx b/src/pages/Peers.tsx
index 8808e782..b8d0449c 100644
--- a/src/pages/Peers.tsx
+++ b/src/pages/Peers.tsx
@@ -12,6 +12,7 @@ import {
EllipsisHorizontalIcon
} from "@heroicons/react/24/outline";
import { Protobuf } from "@meshtastic/meshtasticjs";
+import TimeAgo from "timeago-react";
export const PeersPage = (): JSX.Element => {
const { connection, nodes } = useDevice();
@@ -98,7 +99,10 @@ export const PeersPage = (): JSX.Element => {
)}
- {new Date(node.data.lastHeard).toLocaleTimeString()}
+
|
{node.data.snr}db
|