fix(nrplus): update parser

lambda/parseSinkMessages.ts

@@ -22,7 +22,11 @@ export const handler = async (event: KinesisStreamEvent): Promise<void> => {
 
 	for (const [clientId, lines] of Object.entries(buffer)) {
 		for (const line of lines.sort(ascending))
-			parserInstance.addLine(clientId, line)
+			parserInstance.addLine(
+				clientId,
+				// line is prefixed with counter + tab
+				line.split('\t', 2)[1] as string,
+			)
 	}
 }
 

nrplus/messageStreamParser.spec.ts

@@ -31,7 +31,7 @@ void describe('messageStreamParser', () => {
 				receiverId: '38',
 				sduLastSeenSeqNbr: '1',
 				sduDataLength: '40',
-				sduData: '{\\"data\\":\\"Yes, hello\\",\\"modem_temp\\":\\"33\\"}',
+				sduData: '{"data":"Yes, hello","modem_temp":"33"}',
 				ieType: 'none',
 			},
 		])
@@ -66,7 +66,7 @@ void describe('messageStreamParser', () => {
 				receiverId: '38',
 				sduLastSeenSeqNbr: '1',
 				sduDataLength: '40',
-				sduData: '{\\"data\\":\\"Yes, hello\\",\\"modem_temp\\":\\"33\\"}',
+				sduData: '{"data":"Yes, hello","modem_temp":"33"}',
 				ieType: 'none',
 			},
 		])

nrplus/messageStreamParser.ts

@@ -22,24 +22,24 @@ type PDCInfo = {
 	receiverId: string // e.g. '38'
 	sduLastSeenSeqNbr: string // e.g. '1'
 	sduDataLength: string // e.g. '40'
-	sduData: string // e.g. '{\\"data\\":\\"Yes, hello\\",\\"modem_temp\\":\\"33\\"}'
+	sduData: string // e.g. '{"data":"Yes, hello","modem_temp":"33"}'
 	ieType: string // e.g. 'none'
 }
 
 const PDCLines = [
 	/^PDC received \(time (?<time>[0-9]+)\): snr (?<snr>[0-9]+), RSSI (?<RSSI>[-0-9]+), len (?<len>[0-9]+)/,
 	/^Received data:/,
-	/^ +Type: +(?<type>.+)/,
-	/^ +Power control:/,
-	/^ +Expected RX RSSI level \(dBm\): +(?<expectedRXRSSI>[-0-9]+)/,
-	/^ +Seq nbr: +(?<seqNbr>[0-9]+)/,
-	/^ +Network ID: +(?<networkId>[0-9]+)/,
-	/^ +Transmitter long ID: +(?<transmitterId>[0-9]+)/,
-	/^ +Receiver long ID: +(?<receiverId>[0-9]+)/,
-	/^ +SDU last seen seq nbr: +(?<sduLastSeenSeqNbr>[0-9]+)/,
-	/^ +SDU data length: +(?<sduDataLength>[0-9]+)/,
-	/^ +SDU data: +(?<sduData>.+)/,
-	/^ +IE type: +(?<ieType>.+)/,
+	/^\s+Type:\s+(?<type>.+)/,
+	/^\s+Power control:/,
+	/^\s+Expected RX RSSI level \(dBm\):\s+(?<expectedRXRSSI>[-0-9]+)/,
+	/^\s+Seq nbr:\s+(?<seqNbr>[0-9]+)/,
+	/^\s+Network ID:\s+(?<networkId>[0-9]+)/,
+	/^\s+Transmitter long ID:\s+(?<transmitterId>[0-9]+)/,
+	/^\s+Receiver long ID:\s+(?<receiverId>[0-9]+)/,
+	/^\s+SDU last seen seq nbr:\s+(?<sduLastSeenSeqNbr>[0-9]+)/,
+	/^\s+SDU data length:\s+(?<sduDataLength>[0-9]+)/,
+	/^\s+SDU data:\s+(?<sduData>.+)/,
+	/^\s+IE type:\s+(?<ieType>.+)/,
 ] as const
 
 type PCCInfo = {
@@ -64,10 +64,10 @@ PCC received (time 359572555405): status: \"valid - PDC can be received\", snr 8
 */
 
 const PCCLines = [
-	/^PCC received \(time (?<time>[0-9]+)\): status: \\"(?<status>[^"]+)\\", snr (?<snr>[0-9]+), stf_start_time (?<stfStartTime>[0-9]+)/,
-	/^ +phy header: short nw id (?<networkId>[0-9]+), transmitter id (?<transmitterId>[0-9]+)/,
-	/^ +receiver id: (?<receiverId>[0-9]+)/,
-	/^ +MCS (?<mcs>[0-9]+), TX pwr: (?<txPowerDBm>-[0-9]+) dBm/,
+	/^PCC received \(time (?<time>[0-9]+)\): status: "(?<status>[^"]+)", snr (?<snr>[0-9]+), stf_start_time (?<stfStartTime>[0-9]+)/,
+	/^\s+phy header: short nw id (?<networkId>[0-9]+), transmitter id (?<transmitterId>[0-9]+)/,
+	/^\s+receiver id: (?<receiverId>[0-9]+)/,
+	/^\s+MCS (?<mcs>[0-9]+), TX pwr: (?<txPowerDBm>-[0-9]+) dBm/,
 ] as const
 
 type MessageListener = (deviceId: string, message: PDCInfo | PCCInfo) => void

nrplus/nrplus-logs.txt

@@ -11,9 +11,9 @@ Received data:
   Receiver long ID:     38
   SDU last seen seq nbr: 1
   SDU data length:       40
-  SDU data:              {\"data\":\"Yes, hello\",\"modem_temp\":\"33\"}
+  SDU data:              {"data":"Yes, hello","modem_temp":"33"}
   IE type:               none
-PCC received (time 359572555405): status: \"valid - PDC can be received\", snr 83, stf_start_time 359572537298
+PCC received (time 359572555405): status: "valid - PDC can be received", snr 83, stf_start_time 359572537298
   phy header: short nw id 22, transmitter id 39
   receiver id: 38
   MCS 0, TX pwr: -12 dBm
@@ -28,9 +28,9 @@ Received data:
   Receiver long ID:     38
   SDU last seen seq nbr: 1
   SDU data length:       40
-  SDU data:              {\"data\":\"Yes, hello\",\"modem_temp\":\"33\"}
+  SDU data:              {"data":"Yes, hello","modem_temp":"33"}
   IE type:               none
-PCC received (time 365111832209): status: \"valid - PDC can be received\", snr 61, stf_start_time 365111814178
+PCC received (time 365111832209): status: "valid - PDC can be received", snr 61, stf_start_time 365111814178
   phy header: short nw id 22, transmitter id 39
   receiver id: 38
-  MCS 0, TX pwr: -12 dBm
+  MCS 0, TX pwr: -12 dBm