hermes/meshtastic-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix device lastInterraction timestamp

Browse Source
This commit is contained in:
Sacha Weatherstone
2022-11-06 20:40:28 +10:00
parent ba7257ebf2
commit 367912e27e
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/stores/deviceStore.ts
+22 -17
View File
@@ -227,11 +227,11 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
data: Protobuf.NodeInfo.create({ data: Protobuf.NodeInfo.create({
num: metrics.packet.from, num: metrics.packet.from,
snr: metrics.packet.rxSnr, snr: metrics.packet.rxSnr,
lastHeard: new Date().getSeconds(), lastHeard: Date.now()
}), }),
metadata: undefined, metadata: undefined,
deviceMetrics: [], deviceMetrics: [],
environmentMetrics: [], environmentMetrics: []
}; };
device.nodes.push(node); device.nodes.push(node);
@@ -264,7 +264,7 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
timestamp: timestamp:
metrics.packet.rxTime === 0 metrics.packet.rxTime === 0
? new Date() ? new Date()
: new Date(metrics.packet.rxTime * 1000), : new Date(metrics.packet.rxTime * 1000)
}); });
break; break;
case "environmentMetrics": case "environmentMetrics":
@@ -273,7 +273,7 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
timestamp: timestamp:
metrics.packet.rxTime === 0 metrics.packet.rxTime === 0
? new Date() ? new Date()
: new Date(metrics.packet.rxTime * 1000), : new Date(metrics.packet.rxTime * 1000)
}); });
break; break;
} }
@@ -338,17 +338,22 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
); );
if (node) { if (node) {
node.data = nodeInfo.data; node.data = nodeInfo.data;
// if (action.payload.packet.rxTime) { node.data.lastHeard =
// node.data.lastHeard = new Date( nodeInfo.packet.rxTime !== 0
// action.payload.packet.rxTime * 1000, ? nodeInfo.packet.rxTime * 1000
// ).getTime(); : Date.now();
// }
} else { } else {
device.nodes.push({ device.nodes.push({
data: Protobuf.NodeInfo.create(nodeInfo.data), data: Protobuf.NodeInfo.create({
...nodeInfo.data,
lastHeard:
nodeInfo.packet.rxTime !== 0
? nodeInfo.packet.rxTime * 1000
: Date.now()
}),
metadata: undefined, metadata: undefined,
deviceMetrics: [], deviceMetrics: [],
environmentMetrics: [], environmentMetrics: []
}); });
} }
} }
@@ -395,11 +400,11 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
data: Protobuf.NodeInfo.create({ data: Protobuf.NodeInfo.create({
num: user.packet.from, num: user.packet.from,
snr: user.packet.rxSnr, snr: user.packet.rxSnr,
user: user.data, user: user.data
}), }),
metadata: undefined, metadata: undefined,
deviceMetrics: [], deviceMetrics: [],
environmentMetrics: [], environmentMetrics: []
}); });
} }
} }
@@ -425,11 +430,11 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
device.nodes.push({ device.nodes.push({
data: Protobuf.NodeInfo.create({ data: Protobuf.NodeInfo.create({
num: position.packet.from, num: position.packet.from,
position: position.data, position: position.data
}), }),
metadata: undefined, metadata: undefined,
deviceMetrics: [], deviceMetrics: [],
environmentMetrics: [], environmentMetrics: []
}); });
} }
} }
@@ -518,7 +523,7 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
} }
}) })
); );
}, }
}); });
}) })
); );
@@ -540,7 +545,7 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
getDevices: () => Array.from(get().devices.values()), getDevices: () => Array.from(get().devices.values()),
getDevice: (id) => get().devices.get(id), getDevice: (id) => get().devices.get(id)
})); }));
export const DeviceContext = createContext<Device | undefined>(undefined); export const DeviceContext = createContext<Device | undefined>(undefined);