Pevent missing packet.to from crashing Log UI #19

Affirmatech · Oct 10, 2024 · 5f7383b · 5f7383b
1 parent 6201b12
commit 5f7383b
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 8 deletions.
diff --git a/api/src/vars.ts b/api/src/vars.ts
@@ -93,6 +93,7 @@ export type DeviceMetrics = {
   voltage: number
   channelUtilization: number
   airUtilTx: number
+  uptimeSeconds?: number
 }
 
 export type NodeInfo = {
@@ -132,7 +133,7 @@ export type MeshPacket = {
   channel: number
   encrypted?: string
   decoded?: any
-  payloadVariant: any
+  payloadVariant?: any
   // {
   // case: 'decoded',
   // value: Data {
@@ -150,11 +151,13 @@ export type MeshPacket = {
   rxSnr: number
   hopLimit: number
   wantAck: boolean
-  priority: number
+  priority: any
   rxRssi: number
-  delayed: number
+  delayed: any
   viaMqtt: boolean
   hopStart: number
+  publicKey?: string
+  pkiEncrypted?: boolean
   data?: string
   message?: Message
   deviceMetrics?: DeviceMetrics

diff --git a/electron/package.json b/electron/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshsense",
-  "version": "1.0.15-beta.2",
+  "version": "1.0.15-beta.3",
   "description": "MeshSense is a simple, open-source application that monitors, maps and graphically displays all the vital stats of your area's Meshtastic network including connected nodes, signal reports, trace routes and more!",
   "main": "./out/main/index.js",
   "author": "Affirmatech Inc.",

diff --git a/ui/src/Log.svelte b/ui/src/Log.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import { broadcastId, channels, myNodeNum, nodes, packets, type MeshPacket } from 'api/src/vars'
+  import { broadcastId, channels, myNodeNum, nodes, packets, version, type MeshPacket } from 'api/src/vars'
   import Card from './lib/Card.svelte'
-  import { getNodeNameById, scrollToBottom } from './lib/util'
+  import { getNodeNameById, scrollToBottom, testPacket } from './lib/util'
   import Modal from './lib/Modal.svelte'
   import { messageDestination } from './Message.svelte'
   import { tick } from 'svelte'
@@ -87,7 +87,7 @@
               <img class="h-4 inline-block" src="https://icongaga-api.bytedancer.workers.dev/api/genHexer?name={packet.from}" alt="Node {packet.from}" />
               {getNodeNameById(packet.from)}
             </div>
-            {#if packet.to != 4294967295}
+            {#if packet.to && packet.to != 4294967295}
               <div>to</div>
               <div class="">{getNodeNameById(packet.to)}</div>
             {/if}
@@ -150,6 +150,9 @@
       {#if filterText}<button on:click={() => (filterText = '')} class="btn text-sm !py-0">Clear</button>{/if}
       <button class="btn btn-sm text-xs" on:click={() => generateCSV()}>CSV</button>
       {#if unseenMessages}<button class="btn !py-0 bottom-10" on:click={() => scrollToBottom(packetsDiv, true, (unseen) => (unseenMessages = unseen))}>Jump to new messages</button>{/if}
+      {#if !$version}
+        <button class="btn text-xs" on:click={testPacket}>Test Packet</button>
+      {/if}
     </label>
   </h2>
 </Card>
diff --git a/ui/src/lib/util.ts b/ui/src/lib/util.ts
@@ -83,10 +83,48 @@ packets.on('upsert', (e) => {
 
 export function getNodeNameById(id: number) {
   if (id == broadcastId) return 'all'
+  if (id == undefined) return 'unknown'
   let node = nodes.value.find((node) => node.num == id)
-  return node ? getNodeName(node) : `!${id.toString(16)}`
+  return node ? getNodeName(node) : `!${id?.toString(16)}`
 }
 
 export function getNodeName(node: NodeInfo) {
   return node?.user?.shortName || node?.user?.id || '!' + node?.num?.toString(16)
 }
+
+export function testPacket() {
+  packets.push({
+    from: 2171857383,
+    to: 4294967295,
+    channel: 0,
+    decoded: {
+      portnum: 'TELEMETRY_APP',
+      payload: 'DTHrB2cSFQhlFXnpgkAd6LSBPyXxhoc/KNjmCA==',
+      wantResponse: false,
+      dest: 0,
+      source: 0,
+      requestId: 0,
+      replyId: 0,
+      emoji: 0
+    },
+    id: 1727925148,
+    rxTime: 1728572132,
+    rxSnr: 6,
+    hopLimit: 7,
+    wantAck: false,
+    priority: 'UNSET',
+    rxRssi: -84,
+    delayed: 'NO_DELAY',
+    viaMqtt: false,
+    hopStart: 7,
+    publicKey: '',
+    pkiEncrypted: false,
+    deviceMetrics: {
+      batteryLevel: 101,
+      voltage: 4.091000080108643,
+      channelUtilization: 1.0133333206176758,
+      airUtilTx: 1.0588055849075317,
+      uptimeSeconds: 144216
+    }
+  })
+}