node-mavlink 1.0.4 → 1.0.8

package/README.md

@@ -38,7 +38,10 @@ That's it! That is all it takes to read the raw data. But it doesn't end there -
 Each message consists of multiple fields that contain specific data. Parsing the data is also very easy.
 
 ```javascript
-import { minimal, common, ardupilotmega, uavionix, icarous } from 'node-mavlink'
+import {
+  minimal, common, ardupilotmega, uavionix, icarous,
+  asluav, development, matrixpilot, paparazzi, ualberta,
+} from 'node-mavlink'
 
 // create a registry of mappings between a message id and a data class
 const REGISTRY = {
@@ -47,6 +50,11 @@ const REGISTRY = {
   ...ardupilotmega.REGISTRY,
   ...uavionix.REGISTRY,
   ...icarous.REGISTRY,
+  ...asluav.REGISTRY,
+  ...development.REGISTRY,
+  ...matrixpilot.REGISTRY,
+  ...paparazzi.REGISTRY,
+  ...ualberta.REGISTRY,
 }
 
 reader.on('data', packet => {

package/dist/lib/mavlink.d.ts

@@ -194,6 +194,10 @@ export declare class MavLinkPacketSplitter extends Transform {
     private _invalidPackagesCount;
     constructor(opts?: {}, verbose?: boolean);
     _transform(chunk: Buffer, encoding: any, callback: TransformCallback): void;
+    private findStartOfPacket;
+    private getPacketProtocol;
+    private readPacketLength;
+    private validatePacket;
     /**
      * Checks if the buffer contains the entire message with signature
      *
@@ -204,6 +208,10 @@ export declare class MavLinkPacketSplitter extends Transform {
      * Number of invalid packages
      */
     get validPackages(): number;
+    /**
+     * Reset the number of valid packages
+     */
+    resetValidPackagesCount(): void;
     /**
      * Number of invalid packages
      */

package/dist/lib/mavlink.js

@@ -234,6 +234,13 @@ MavLinkProtocolV2.PAYLOAD_OFFSET = 10;
 MavLinkProtocolV2.INCOMPATIBILITY_FLAGS = 0;
 MavLinkProtocolV2.COMPATIBILITY_FLAGS = 0;
 MavLinkProtocolV2.IFLAG_SIGNED = 0x01;
+/**
+ * Registry of known protocols by STX
+ */
+const KNOWN_PROTOCOLS_BY_STX = {
+    [MavLinkProtocolV1.START_BYTE]: MavLinkProtocolV1,
+    [MavLinkProtocolV2.START_BYTE]: MavLinkProtocolV2,
+};
 /**
  * MavLink packet signature definition
  */
@@ -358,6 +365,15 @@ class MavLinkPacket {
     }
 }
 exports.MavLinkPacket = MavLinkPacket;
+/**
+ * This enum describes the different ways validation of a buffer can end
+ */
+var PacketValidationResult;
+(function (PacketValidationResult) {
+    PacketValidationResult[PacketValidationResult["VALID"] = 0] = "VALID";
+    PacketValidationResult[PacketValidationResult["INVALID"] = 1] = "INVALID";
+    PacketValidationResult[PacketValidationResult["UNKNOWN"] = 2] = "UNKNOWN";
+})(PacketValidationResult || (PacketValidationResult = {}));
 /**
  * A transform stream that splits the incomming data stream into chunks containing full MavLink messages
  */
@@ -373,97 +389,118 @@ class MavLinkPacketSplitter extends stream_1.Transform {
     }
     _transform(chunk, encoding, callback) {
         this.buffer = Buffer.concat([this.buffer, chunk]);
-        while (true) {
-            let Protocol = null;
-            // check for start byte
-            let startByteFirstOffset;
-            const stxv1 = this.buffer.indexOf(MavLinkProtocolV1.START_BYTE);
-            const stxv2 = this.buffer.indexOf(MavLinkProtocolV2.START_BYTE);
-            if (stxv1 >= 0 && stxv2 >= 0) {
-                // in the current buffer both STX v1 and v2 are found - get the first one
-                if (stxv1 < stxv2) {
-                    Protocol = MavLinkProtocolV1;
-                    startByteFirstOffset = stxv1;
-                }
-                else if (stxv2 < stxv1) {
-                    Protocol = MavLinkProtocolV2;
-                    startByteFirstOffset = stxv2;
-                }
-            }
-            else if (stxv1 >= 0) {
-                // in the current buffer both STX v1 is found
-                Protocol = MavLinkProtocolV1;
-                startByteFirstOffset = stxv1;
-            }
-            else if (stxv2 >= 0) {
-                // in the current buffer both STX v2 is found
-                Protocol = MavLinkProtocolV2;
-                startByteFirstOffset = stxv2;
-            }
-            else {
-                // no STX found - continue gathering the data
+        while (this.buffer.byteLength > 0) {
+            const offset = this.findStartOfPacket(this.buffer);
+            if (offset === null) {
+                // start of the package was not found - need more data
                 break;
             }
             // fast-forward the buffer to the first start byte
-            if (startByteFirstOffset > 0) {
-                this.buffer = this.buffer.slice(startByteFirstOffset);
+            if (offset > 0) {
+                this.buffer = this.buffer.slice(offset);
             }
+            // get protocol this buffer is encoded with
+            const Protocol = this.getPacketProtocol(this.buffer);
             // check if the buffer contains at least the minumum size of data
             if (this.buffer.length < Protocol.PAYLOAD_OFFSET + MavLinkProtocol.CHECKSUM_LENGTH) {
                 // current buffer shorter than the shortest message - skipping
                 break;
             }
             // check if the current buffer contains the entire message
-            const payloadLength = this.buffer.readUInt8(1);
-            const expectedBufferLength = Protocol.PAYLOAD_OFFSET
-                + payloadLength
-                + MavLinkProtocol.CHECKSUM_LENGTH
-                + (this.isV2Signed(this.buffer) ? MavLinkPacketSignature.SIGNATURE_LENGTH : 0);
+            const expectedBufferLength = this.readPacketLength(this.buffer, Protocol);
             if (this.buffer.length < expectedBufferLength) {
                 // current buffer is not fully retrieved yet - skipping
                 break;
             }
             // retrieve the buffer based on payload size
             const buffer = this.buffer.slice(0, expectedBufferLength);
-            // validate message checksum including the magic byte
-            const protocol = new Protocol();
-            const header = protocol.header(buffer);
-            const magic = mavlink_mappings_2.MSG_ID_MAGIC_NUMBER[header.msgid];
-            if (magic) {
-                const crc = protocol.crc(buffer);
-                const trim = this.isV2Signed(buffer)
-                    ? MavLinkPacketSignature.SIGNATURE_LENGTH + MavLinkProtocol.CHECKSUM_LENGTH
-                    : MavLinkProtocol.CHECKSUM_LENGTH;
-                const crc2 = (0, mavlink_mappings_1.x25crc)(buffer, 1, trim, magic);
-                if (crc === crc2) {
-                    // CRC matches - accept this packet
+            switch (this.validatePacket(buffer, Protocol)) {
+                case PacketValidationResult.VALID:
                     this._validPackagesCount++;
                     this.push(buffer);
                     // truncate the buffer to remove the current message
                     this.buffer = this.buffer.slice(expectedBufferLength);
-                }
-                else {
-                    // CRC mismatch - skip packet
+                    break;
+                case PacketValidationResult.INVALID:
                     this._invalidPackagesCount++;
-                    if (this.verbose) {
-                        console.error('CRC error; expected', crc2, `(0x${crc2.toString(16).padStart(4, '0')})`, 'got', crc, `(0x${crc.toString(16).padStart(4, '0')})`, '; msgid:', header.msgid, ', magic:', magic);
-                        (0, mavlink_mappings_1.dump)(buffer);
-                    }
-                    // truncate the buffer to remove the current message
+                    // truncate the buffer to remove the wrongly identified STX
                     this.buffer = this.buffer.slice(1);
-                }
+                    break;
+                case PacketValidationResult.UNKNOWN:
+                    this._unknownPackagesCount++;
+                    // truncate the buffer to remove the current message
+                    this.buffer = this.buffer.slice(expectedBufferLength);
+                    break;
+            }
+        }
+        callback(null);
+    }
+    findStartOfPacket(buffer) {
+        const stxv1 = buffer.indexOf(MavLinkProtocolV1.START_BYTE);
+        const stxv2 = buffer.indexOf(MavLinkProtocolV2.START_BYTE);
+        if (stxv1 >= 0 && stxv2 >= 0) {
+            // in the current buffer both STX v1 and v2 are found - get the first one
+            if (stxv1 < stxv2) {
+                return stxv1;
+            }
+            else {
+                return stxv2;
+            }
+        }
+        else if (stxv1 >= 0) {
+            // in the current buffer STX v1 is found
+            return stxv1;
+        }
+        else if (stxv2 >= 0) {
+            // in the current buffer STX v2 is found
+            return stxv2;
+        }
+        else {
+            // no STX found
+            return null;
+        }
+    }
+    getPacketProtocol(buffer) {
+        return KNOWN_PROTOCOLS_BY_STX[buffer.readUInt8(0)] || null;
+    }
+    readPacketLength(buffer, Protocol) {
+        // check if the current buffer contains the entire message
+        const payloadLength = buffer.readUInt8(1);
+        return Protocol.PAYLOAD_OFFSET
+            + payloadLength
+            + MavLinkProtocol.CHECKSUM_LENGTH
+            + (this.isV2Signed(buffer) ? MavLinkPacketSignature.SIGNATURE_LENGTH : 0);
+    }
+    validatePacket(buffer, Protocol) {
+        const protocol = new Protocol();
+        const header = protocol.header(buffer);
+        const magic = mavlink_mappings_2.MSG_ID_MAGIC_NUMBER[header.msgid];
+        if (magic) {
+            const crc = protocol.crc(buffer);
+            const trim = this.isV2Signed(buffer)
+                ? MavLinkPacketSignature.SIGNATURE_LENGTH + MavLinkProtocol.CHECKSUM_LENGTH
+                : MavLinkProtocol.CHECKSUM_LENGTH;
+            const crc2 = (0, mavlink_mappings_1.x25crc)(buffer, 1, trim, magic);
+            if (crc === crc2) {
+                // this is a proper message that is known and has been validated for corrupted data
+                return PacketValidationResult.VALID;
             }
             else {
-                // this meessage has not been generated - ignoring
-                this._unknownPackagesCount++;
-                // truncate the buffer to remove the current message
-                this.buffer = this.buffer.slice(expectedBufferLength);
+                // CRC mismatch
                 if (this.verbose) {
-                    console.error(`Unknown message with id ${header.msgid} (magic number not found) - skipping`);
+                    console.error('CRC error; expected', crc2, `(0x${crc2.toString(16).padStart(4, '0')})`, 'got', crc, `(0x${crc.toString(16).padStart(4, '0')})`, '; msgid:', header.msgid, ', magic:', magic);
+                    (0, mavlink_mappings_1.dump)(buffer);
                 }
+                return PacketValidationResult.INVALID;
             }
         }
-        callback(null);
+        else {
+            // unknown message (as in not generated from the XML sources)
+            if (this.verbose) {
+                console.error(`Unknown message with id ${header.msgid} (magic number not found) - skipping`);
+            }
+            return PacketValidationResult.UNKNOWN;
+        }
     }
     /**
      * Checks if the buffer contains the entire message with signature
@@ -483,6 +520,12 @@ class MavLinkPacketSplitter extends stream_1.Transform {
     get validPackages() {
         return this._validPackagesCount;
     }
+    /**
+     * Reset the number of valid packages
+     */
+    resetValidPackagesCount() {
+        this, this._validPackagesCount = 0;
+    }
     /**
      * Number of invalid packages
      */

package/examples/send-receive-file.ts

@@ -2,6 +2,7 @@
 
 import { createReadStream } from 'fs'
 import { MavLinkPacketSplitter, MavLinkPacketParser, MavLinkPacket } from '..'
+import { minimal, common, ardupilotmega, uavionix, icarous } from '..'
 
 const file = createReadStream('./mavlink-v2-3412-packets.bin')
 
@@ -11,8 +12,22 @@ const reader = file
   .pipe(splitter)
   .pipe(new MavLinkPacketParser())
 
-reader.on('data', (packet: MavLinkPacket) => {
-  console.log(packet.debug())
+
+// create a registry of mappings between a message id and a data class
+const REGISTRY = {
+  ...minimal.REGISTRY,
+  ...common.REGISTRY,
+  ...ardupilotmega.REGISTRY,
+  ...uavionix.REGISTRY,
+  ...icarous.REGISTRY,
+}
+
+reader.on('data', packet => {
+  const clazz = REGISTRY[packet.header.msgid]
+  if (clazz) {
+    const data = packet.protocol.data(packet.payload, clazz)
+    console.log(data)
+  }
 })
 
 file.on('close', () => {
@@ -20,3 +35,4 @@ file.on('close', () => {
   console.log('Number of unknown packages:', splitter.unknownPackagesCount)
   console.log('\nTotal number of consumed packets:', splitter.validPackages)
 })
+

package/lib/mavlink.ts

@@ -297,6 +297,14 @@ export class MavLinkProtocolV2 extends MavLinkProtocol {
   }
 }
 
+/**
+ * Registry of known protocols by STX
+ */
+const KNOWN_PROTOCOLS_BY_STX = {
+  [MavLinkProtocolV1.START_BYTE]: MavLinkProtocolV1,
+  [MavLinkProtocolV2.START_BYTE]: MavLinkProtocolV2,
+}
+
 /**
  * MavLink packet signature definition
  */
@@ -434,6 +442,11 @@ export class MavLinkPacket {
   }
 }
 
+/**
+ * This enum describes the different ways validation of a buffer can end
+ */
+enum PacketValidationResult { VALID, INVALID, UNKNOWN }
+
 /**
  * A transform stream that splits the incomming data stream into chunks containing full MavLink messages
  */
@@ -452,42 +465,21 @@ export class MavLinkPacketSplitter extends Transform {
   _transform(chunk: Buffer, encoding, callback: TransformCallback) {
     this.buffer = Buffer.concat([ this.buffer, chunk ])
 
-    while (true) {
-      let Protocol: MavLinkProtocolConstructor = null
-
-      // check for start byte
-      let startByteFirstOffset
-
-      const stxv1 = this.buffer.indexOf(MavLinkProtocolV1.START_BYTE)
-      const stxv2 = this.buffer.indexOf(MavLinkProtocolV2.START_BYTE)
-
-      if (stxv1 >= 0 && stxv2 >= 0) {
-        // in the current buffer both STX v1 and v2 are found - get the first one
-        if (stxv1 < stxv2) {
-          Protocol = MavLinkProtocolV1
-          startByteFirstOffset = stxv1
-        } else if (stxv2 < stxv1) {
-          Protocol = MavLinkProtocolV2
-          startByteFirstOffset = stxv2
-        }
-      } else if (stxv1 >= 0) {
-        // in the current buffer both STX v1 is found
-        Protocol = MavLinkProtocolV1
-        startByteFirstOffset = stxv1
-      } else if (stxv2 >= 0) {
-        // in the current buffer both STX v2 is found
-        Protocol = MavLinkProtocolV2
-        startByteFirstOffset = stxv2
-      } else {
-        // no STX found - continue gathering the data
+    while (this.buffer.byteLength > 0) {
+      const offset = this.findStartOfPacket(this.buffer)
+      if (offset === null) {
+        // start of the package was not found - need more data
         break
       }
 
       // fast-forward the buffer to the first start byte
-      if (startByteFirstOffset > 0) {
-        this.buffer = this.buffer.slice(startByteFirstOffset)
+      if (offset > 0) {
+        this.buffer = this.buffer.slice(offset)
       }
 
+      // get protocol this buffer is encoded with
+      const Protocol = this.getPacketProtocol(this.buffer)
+
       // check if the buffer contains at least the minumum size of data
       if (this.buffer.length < Protocol.PAYLOAD_OFFSET + MavLinkProtocol.CHECKSUM_LENGTH) {
         // current buffer shorter than the shortest message - skipping
@@ -495,12 +487,7 @@ export class MavLinkPacketSplitter extends Transform {
       }
 
       // check if the current buffer contains the entire message
-      const payloadLength = this.buffer.readUInt8(1)
-      const expectedBufferLength = Protocol.PAYLOAD_OFFSET
-        + payloadLength
-        + MavLinkProtocol.CHECKSUM_LENGTH
-        + (this.isV2Signed(this.buffer) ? MavLinkPacketSignature.SIGNATURE_LENGTH : 0)
-
+      const expectedBufferLength = this.readPacketLength(this.buffer, Protocol)
       if (this.buffer.length < expectedBufferLength) {
         // current buffer is not fully retrieved yet - skipping
         break
@@ -509,49 +496,97 @@ export class MavLinkPacketSplitter extends Transform {
       // retrieve the buffer based on payload size
       const buffer = this.buffer.slice(0, expectedBufferLength)
 
-      // validate message checksum including the magic byte
-      const protocol = new Protocol()
-      const header = protocol.header(buffer)
-      const magic = MSG_ID_MAGIC_NUMBER[header.msgid]
-      if (magic) {
-        const crc = protocol.crc(buffer)
-        const trim = this.isV2Signed(buffer)
-          ? MavLinkPacketSignature.SIGNATURE_LENGTH + MavLinkProtocol.CHECKSUM_LENGTH
-          : MavLinkProtocol.CHECKSUM_LENGTH
-        const crc2 = x25crc(buffer, 1, trim, magic)
-        if (crc === crc2) {
-          // CRC matches - accept this packet
+      switch (this.validatePacket(buffer, Protocol)) {
+        case PacketValidationResult.VALID:
           this._validPackagesCount++
           this.push(buffer)
           // truncate the buffer to remove the current message
           this.buffer = this.buffer.slice(expectedBufferLength)
-        } else {
-          // CRC mismatch - skip packet
+          break
+        case PacketValidationResult.INVALID:
           this._invalidPackagesCount++
-          if (this.verbose) {
-            console.error(
-              'CRC error; expected', crc2, `(0x${crc2.toString(16).padStart(4, '0')})`,
-              'got', crc, `(0x${crc.toString(16).padStart(4, '0')})`,
-              '; msgid:', header.msgid, ', magic:', magic
-            )
-            dump(buffer)
-          }
-          // truncate the buffer to remove the current message
+          // truncate the buffer to remove the wrongly identified STX
           this.buffer = this.buffer.slice(1)
-        }
+          break
+        case PacketValidationResult.UNKNOWN:
+          this._unknownPackagesCount++
+          // truncate the buffer to remove the current message
+          this.buffer = this.buffer.slice(expectedBufferLength)
+          break
+      }
+    }
+
+    callback(null)
+  }
+
+  private findStartOfPacket(buffer: Buffer) {
+    const stxv1 = buffer.indexOf(MavLinkProtocolV1.START_BYTE)
+    const stxv2 = buffer.indexOf(MavLinkProtocolV2.START_BYTE)
+
+    if (stxv1 >= 0 && stxv2 >= 0) {
+      // in the current buffer both STX v1 and v2 are found - get the first one
+      if (stxv1 < stxv2) {
+        return stxv1
       } else {
-        // this meessage has not been generated - ignoring
-        this._unknownPackagesCount++
-        // truncate the buffer to remove the current message
-        this.buffer = this.buffer.slice(expectedBufferLength)
+        return stxv2
+      }
+    } else if (stxv1 >= 0) {
+      // in the current buffer STX v1 is found
+      return stxv1
+    } else if (stxv2 >= 0) {
+      // in the current buffer STX v2 is found
+      return stxv2
+    } else {
+      // no STX found
+      return null
+    }
+  }
 
+  private getPacketProtocol(buffer: Buffer) {
+    return KNOWN_PROTOCOLS_BY_STX[buffer.readUInt8(0)] || null
+  }
+
+  private readPacketLength(buffer: Buffer, Protocol: MavLinkProtocolConstructor) {
+    // check if the current buffer contains the entire message
+    const payloadLength = buffer.readUInt8(1)
+    return Protocol.PAYLOAD_OFFSET
+      + payloadLength
+      + MavLinkProtocol.CHECKSUM_LENGTH
+      + (this.isV2Signed(buffer) ? MavLinkPacketSignature.SIGNATURE_LENGTH : 0)
+  }
+
+  private validatePacket(buffer: Buffer, Protocol: MavLinkProtocolConstructor) {
+    const protocol = new Protocol()
+    const header = protocol.header(buffer)
+    const magic = MSG_ID_MAGIC_NUMBER[header.msgid]
+    if (magic) {
+      const crc = protocol.crc(buffer)
+      const trim = this.isV2Signed(buffer)
+        ? MavLinkPacketSignature.SIGNATURE_LENGTH + MavLinkProtocol.CHECKSUM_LENGTH
+        : MavLinkProtocol.CHECKSUM_LENGTH
+      const crc2 = x25crc(buffer, 1, trim, magic)
+      if (crc === crc2) {
+        // this is a proper message that is known and has been validated for corrupted data
+        return PacketValidationResult.VALID
+      } else {
+        // CRC mismatch
         if (this.verbose) {
-          console.error(`Unknown message with id ${header.msgid} (magic number not found) - skipping`)
+          console.error(
+            'CRC error; expected', crc2, `(0x${crc2.toString(16).padStart(4, '0')})`,
+            'got', crc, `(0x${crc.toString(16).padStart(4, '0')})`,
+            '; msgid:', header.msgid, ', magic:', magic
+          )
+          dump(buffer)
         }
+        return PacketValidationResult.INVALID
+      }
+    } else {
+      // unknown message (as in not generated from the XML sources)
+      if (this.verbose) {
+        console.error(`Unknown message with id ${header.msgid} (magic number not found) - skipping`)
       }
+      return PacketValidationResult.UNKNOWN
     }
-
-    callback(null)
   }
 
   /**
@@ -574,6 +609,13 @@ export class MavLinkPacketSplitter extends Transform {
     return this._validPackagesCount
   }
 
+  /**
+   * Reset the number of valid packages
+   */
+  resetValidPackagesCount() {
+    this,this._validPackagesCount = 0
+  }
+
   /**
    * Number of invalid packages
    */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-mavlink",
-  "version": "1.0.4",
+  "version": "1.0.8",
   "author": "Matthias Hryniszak <padcom@gmail.com>",
   "license": "LGPL",
   "description": "MavLink definitions and parsing library",
@@ -22,7 +22,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
-    "mavlink-mappings": "^1.0.0"
+    "mavlink-mappings": "^1.0.6-20220104"
   },
   "scripts": {
     "build": "tsc"