Merge pull request #20 from athombv/master

mmip

Author: nozols

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@athombv/dsmr-parser",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "DSMR Parser for Smart Meters",
   "type": "module",
   "main": "dist/index.js",

package.json

@@ -73,6 +73,8 @@ export const DSMRParser = (options: DSMRParserOptions): DSMRParserResult => {
     mBus: {},
   };
 
+  let objectsParsed = 0;
+
   for (const [lineNumber, line] of lines.entries()) {
     if (line.startsWith('/')) {
       // Beginning of telegram
@@ -102,6 +104,8 @@ export const DSMRParser = (options: DSMRParserOptions): DSMRParserResult => {
       if (!isLineParsed) {
         result.metadata.unknownLines = result.metadata.unknownLines ?? [];
         result.metadata.unknownLines.push(line);
+      } else {
+        objectsParsed++;
       }
     }
   }
@@ -114,8 +118,8 @@ export const DSMRParser = (options: DSMRParserOptions): DSMRParserResult => {
     });
   }
 
-  if (result.header.identifier === '' || result.header.xxx === '' || result.header.z === '') {
-    throw new DSMRParserError('Invalid telegram. Missing header');
+  if (objectsParsed === 0) {
+    throw new DSMRParserError('Invalid telegram. No COSEM objects found.');
   }
 
   return result;

src/parsers/dsmr.ts

@@ -0,0 +1,56 @@
+{
+  "raw": "/KAM5\r\n\r\n0-0:1.0.0(250000000000W)\r\n1-0:1.8.0(00000123.321*kWh)\r\n1-0:2.8.0(00000456.654*kWh)\r\n1-0:3.8.0(00001234.432*kVArh)\r\n1-0:4.8.0(00005678.765*kVArh)\r\n1-0:1.7.0(0002.424*kW)\r\n1-0:2.7.0(0000.000*kW)\r\n1-0:3.7.0(0001.229*kVAr)\r\n1-0:4.7.0(0000.000*kVAr)\r\n1-0:21.7.0(0000.682*kW)\r\n1-0:41.7.0(0000.750*kW)\r\n1-0:61.7.0(0000.992*kW)\r\n1-0:22.7.0(0000.000*kW)\r\n1-0:42.7.0(0000.000*kW)\r\n1-0:62.7.0(0000.000*kW)\r\n1-0:23.7.0(0000.391*kVAr)\r\n1-0:43.7.0(0000.490*kVAr)\r\n1-0:63.7.0(0000.348*kVAr)\r\n1-0:24.7.0(0000.000*kVAr)\r\n1-0:44.7.0(0000.000*kVAr)\r\n1-0:64.7.0(0000.000*kVAr)\r\n1-0:32.7.0(225.4*V)\r\n1-0:52.7.0(229.4*V)\r\n1-0:72.7.0(225.9*V)\r\n1-0:31.7.0(003.4*A)\r\n1-0:51.7.0(003.9*A)\r\n1-0:71.7.0(004.6*A)\r\n!3AF8\r\n",
+  "header": {
+    "identifier": "",
+    "xxx": "KAM",
+    "z": "5"
+  },
+  "metadata": {
+    "timestamp": "250000000000W",
+    "unknownLines": [
+      "1-0:3.8.0(00001234.432*kVArh)",
+      "1-0:4.8.0(00005678.765*kVArh)",
+      "1-0:3.7.0(0001.229*kVAr)",
+      "1-0:4.7.0(0000.000*kVAr)",
+      "1-0:23.7.0(0000.391*kVAr)",
+      "1-0:43.7.0(0000.490*kVAr)",
+      "1-0:63.7.0(0000.348*kVAr)",
+      "1-0:24.7.0(0000.000*kVAr)",
+      "1-0:44.7.0(0000.000*kVAr)",
+      "1-0:64.7.0(0000.000*kVAr)"
+    ]
+  },
+  "electricity": {
+    "total": {
+      "received": 123.321,
+      "returned": 456.654
+    },
+    "powerReceivedTotal": 2.424,
+    "powerReturnedTotal": 0,
+    "powerReceived": {
+      "l1": 0.682,
+      "l2": 0.75,
+      "l3": 0.992
+    },
+    "powerReturned": {
+      "l1": 0,
+      "l2": 0,
+      "l3": 0
+    },
+    "voltage": {
+      "l1": 225.4,
+      "l2": 229.4,
+      "l3": 225.9
+    },
+    "current": {
+      "l1": 3.4,
+      "l2": 3.9,
+      "l3": 4.6
+    }
+  },
+  "mBus": {},
+  "crc": {
+    "value": 15096,
+    "valid": false
+  }
+}

tests/telegrams/kamstrup-OMNIA-e-meter-three-phase.json

@@ -0,0 +1,30 @@
+/KAM5
+
+0-0:1.0.0(250000000000W)
+1-0:1.8.0(00000123.321*kWh)
+1-0:2.8.0(00000456.654*kWh)
+1-0:3.8.0(00001234.432*kVArh)
+1-0:4.8.0(00005678.765*kVArh)
+1-0:1.7.0(0002.424*kW)
+1-0:2.7.0(0000.000*kW)
+1-0:3.7.0(0001.229*kVAr)
+1-0:4.7.0(0000.000*kVAr)
+1-0:21.7.0(0000.682*kW)
+1-0:41.7.0(0000.750*kW)
+1-0:61.7.0(0000.992*kW)
+1-0:22.7.0(0000.000*kW)
+1-0:42.7.0(0000.000*kW)
+1-0:62.7.0(0000.000*kW)
+1-0:23.7.0(0000.391*kVAr)
+1-0:43.7.0(0000.490*kVAr)
+1-0:63.7.0(0000.348*kVAr)
+1-0:24.7.0(0000.000*kVAr)
+1-0:44.7.0(0000.000*kVAr)
+1-0:64.7.0(0000.000*kVAr)
+1-0:32.7.0(225.4*V)
+1-0:52.7.0(229.4*V)
+1-0:72.7.0(225.9*V)
+1-0:31.7.0(003.4*A)
+1-0:51.7.0(003.9*A)
+1-0:71.7.0(004.6*A)
+!3AF8

tests/telegrams/kamstrup-OMNIA-e-meter-three-phase.txt

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 /**
  * This scripts reads all .txt files in the tests/telegrams folder, parses them and writes the
  * result to a .json file. Only run this script if you want to update the expected output of the
@@ -12,6 +13,7 @@ const testCases = [...new Set(files.map((file) => file.replace('.txt', '').repla
 for (const file of testCases) {
   let input = await fs.readFile(`./tests/telegrams/${file}.txt`, 'utf-8');
   input = input.replace(/\r?\n/g, '\r\n');
+  console.log(`Parsing ${file}.txt`);
   const parsed = DSMR.parse({ telegram: input });
   const json = JSON.stringify(parsed, null, 2);
   await fs.writeFile(`./tests/telegrams/${file}.json`, json);