Consolidated parsers (#352)

- removed Label_1J_2J_FTX, Label_2P_POS, and Label_4J_POS
- added check in Label 80
- added labels to Label_H1
- improved Label_H1 decoding

Author: makrsmark

lib/MessageDecoder.ts

@@ -31,7 +31,6 @@ export class MessageDecoder {
     this.registerPlugin(new Plugins.Label_16_N_Space(this));
     this.registerPlugin(new Plugins.Label_16_POSA1(this));
     this.registerPlugin(new Plugins.Label_16_TOD(this));
-    this.registerPlugin(new Plugins.Label_1J_2J_FTX(this));
     this.registerPlugin(new Plugins.Label_1L_3Line(this));
     this.registerPlugin(new Plugins.Label_1L_070(this));
     this.registerPlugin(new Plugins.Label_1L_660(this));
@@ -44,7 +43,6 @@ export class MessageDecoder {
     this.registerPlugin(new Plugins.Label_2P_FM3(this));
     this.registerPlugin(new Plugins.Label_2P_FM4(this));
     this.registerPlugin(new Plugins.Label_2P_FM5(this));
-    this.registerPlugin(new Plugins.Label_2P_POS(this));
     this.registerPlugin(new Plugins.Label_30_Slash_EA(this));
     this.registerPlugin(new Plugins.Label_44_ETA(this));
     this.registerPlugin(new Plugins.Label_44_IN(this));
@@ -57,7 +55,6 @@ export class MessageDecoder {
     this.registerPlugin(new Plugins.Label_4A_DIS(this));
     this.registerPlugin(new Plugins.Label_4A_DOOR(this));
     this.registerPlugin(new Plugins.Label_4A_Slash_01(this));
-    this.registerPlugin(new Plugins.Label_4J_POS(this));
     this.registerPlugin(new Plugins.Label_4N(this));
     this.registerPlugin(new Plugins.Label_4T_AGFSR(this));
     this.registerPlugin(new Plugins.Label_4T_ETA(this));

lib/plugins/Label_1J_2J_FTX.test.ts

@@ -1,13 +1,13 @@
 import { MessageDecoder } from '../MessageDecoder';
-import { Label_1J_2J_FTX } from './Label_1J_2J_FTX';
+import { Label_H1 } from './Label_H1';
 
 describe('Label 1J/2J FTX', () => {
-  let plugin: Label_1J_2J_FTX;
+  let plugin: Label_H1;
   let message = { label: '1J', text: '' };
 
   beforeEach(() => {
     const decoder = new MessageDecoder();
-    plugin = new Label_1J_2J_FTX(decoder);
+    plugin = new Label_H1(decoder);
   });
 
   test('decodes Label 1J', () => {

lib/plugins/Label_1J_2J_FTX.ts

@@ -1,13 +1,13 @@
 import { MessageDecoder } from '../MessageDecoder';
-import { Label_2P_POS } from './Label_2P_POS';
+import { Label_H1 } from './Label_H1';
 
 describe('Label_2P Preamble POS', () => {
-  let plugin: Label_2P_POS;
+  let plugin: Label_H1;
   const message = { label: '2P', text: '' };
 
   beforeEach(() => {
     const decoder = new MessageDecoder();
-    plugin = new Label_2P_POS(decoder);
+    plugin = new Label_H1(decoder);
   });
 
   test('variant 1', () => {

lib/plugins/Label_2P_POS.test.ts

@@ -1,23 +1,13 @@
 import { MessageDecoder } from '../MessageDecoder';
-import { Label_4J_POS } from './Label_4J_POS';
+import { Label_H1 } from './Label_H1';
 
 describe('Label 4J POS', () => {
-  let plugin: Label_4J_POS;
+  let plugin: Label_H1;
   const message = { label: '4J', text: '' };
 
   beforeEach(() => {
     const decoder = new MessageDecoder();
-    plugin = new Label_4J_POS(decoder);
-  });
-
-  test('matches qualifiers', () => {
-    expect(plugin.decode).toBeDefined();
-    expect(plugin.name).toBe('label-4j-pos');
-    expect(plugin.qualifiers).toBeDefined();
-    expect(plugin.qualifiers()).toEqual({
-      labels: ['4J'],
-      preambles: ['POS/'],
-    });
+    plugin = new Label_H1(decoder);
   });
 
   test('decodes inmarsat', () => {

lib/plugins/Label_2P_POS.ts

@@ -147,6 +147,16 @@ describe('Label 80', () => {
     expect(decodeResult.remaining.text).toBe('3701 INRANG//ERT');
   });
 
+  test('does not decode INR variant 1', () => {
+    // decoded by another parser
+    message.text =
+      'INR/ID91511S,,/DC04032026,143534/MR19,/NR,,,,,,,,950,0/ET041505/FB983/VR32BF4C';
+    const decodeResult = plugin.decode(message);
+
+    expect(decodeResult.decoded).toBe(false);
+    expect(decodeResult.decoder.decodeLevel).toBe('none');
+  });
+
   test('does not decode invalid messages', () => {
     message.text = '3N01 POSRPT Bogus message';
     const decodeResult = plugin.decode(message);

lib/plugins/Label_4J_POS.test.ts

@@ -182,6 +182,9 @@ export class Label_80 extends DecoderPlugin {
   }
   private parseCsvFormat(text: string, results: DecodeResult) {
     const csvParts = text.split(',');
+    if(csvParts.length !== 9) {
+      return;
+    }
     const header = csvParts[0].trim().split(/\s+/);
     ResultFormatter.unknown(results, header[0], ' ');
     ResultFormatter.unknown(results, header[1], ' ');

lib/plugins/Label_4J_POS.ts

@@ -0,0 +1,32 @@
+import { decode } from 'node:punycode';
+import { MessageDecoder } from '../MessageDecoder';
+import { Label_H1 } from './Label_H1';
+
+describe('Label 80 Preamble INR', () => {
+  let plugin: Label_H1;
+  const message = { label: '80', text: '' };
+
+  beforeEach(() => {
+    const decoder = new MessageDecoder();
+    plugin = new Label_H1(decoder);
+  });
+
+  test('decodes variant 1', () => {
+    message.text =
+      'INR/ID91511S,,/DC04032026,143534/MR19,/NR,,,,,,,,950,0/ET041505/FB983/VR32BF4C';
+    const decodeResult = plugin.decode(message);
+
+    expect(decodeResult.decoded).toBe(true);
+    expect(decodeResult.decoder.decodeLevel).toBe('partial');
+    expect(decodeResult.raw.tail).toBe('91511S');
+    expect(decodeResult.raw.message_timestamp).toBe(1772634934);
+    expect(decodeResult.raw.day).toBe(4);
+    expect(decodeResult.raw.eta_time).toBe(54300);
+    expect(decodeResult.raw.fuel_on_board).toBe(983);
+    expect(decodeResult.raw.version).toBe(3.2);
+    expect(decodeResult.raw.checksum).toBe(0xbf4c);
+    expect(decodeResult.formatted.description).toBe('In-Range Report');
+    expect(decodeResult.formatted.items.length).toBe(6);
+    expect(decodeResult.remaining.text).toBe('MR19,/NR,,,,,,,,950,0');
+  });
+});