queclink-parser 1.3.18 → 1.4.0

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+### 1.4.0 (2022-02-02)
+
+##### New Features
+
+* **gv55w:**  support for gv55w added ([6e6cde95](https://github.com/jaayesta/queclink-parser/commit/6e6cde95be791134f993059883db1184a52bac9a))
+
+#### 1.3.21 (2021-11-03)
+
+##### Bug Fixes
+
+* **buff:**  buff pattern fixed ([882ebc02](https://github.com/jaayesta/queclink-parser/commit/882ebc02c1a7a483937086cc8f0415cd3a346121))
+
+#### 1.3.20 (2021-09-23)
+
+##### Bug Fixes
+
+* **parse:**  add end character to all patterns ([44cf0796](https://github.com/jaayesta/queclink-parser/commit/44cf0796f07c5006f12e709a70e02e39b4188c6c))
+
+#### 1.3.19 (2021-08-05)
+
+##### Bug Fixes
+
+* **gv600w:**  fix parse gv600w GTDAT short format ([bd995505](https://github.com/jaayesta/queclink-parser/commit/bd99550501610c5b9c8843b268e415a3fcb26247))
+
 #### 1.3.18 (2021-06-22)
 
 ##### New Features

package/README.md

@@ -5,7 +5,7 @@
 [![dependency Status](https://img.shields.io/david/jaayesta/queclink-parser.svg?style=flat-square)](https://david-dm.org/jaayesta/queclink-parser#info=dependencies)
 [![devDependency Status](https://img.shields.io/david/dev/jaayesta/queclink-parser.svg?style=flat-square)](https://david-dm.org/jaayesta/queclink-parser#info=devDependencies)
 
-> Parses raw data from Queclink devices (TCP). Devices supported: GV55, GV200, GV300, GV75W, GV300W, GV500, GV600W GV800W, GMT100, GL50, GL50B, GL300, GL300W
+> Parses raw data from Queclink devices (TCP). Devices supported: GV55, GV55W, GV200, GV300, GV75W, GV300W, GV500, GV600W, GV800W, GMT100, GL50, GL50B, GL300, GL300W, GV50P
 
 ## Installation
 
@@ -24,45 +24,42 @@ const raw = new Buffer('+RESP:GTFRI,350302,867844003012625,,12372,10,1,0,0.0,0,8
 const data = queclink.parse(raw);
 
 /*
-{ 
-  raw: '+RESP:GTFRI,270100,135790246811220,,,00,1,1,4.3,92,70.0,121.354335,31.222073,20090214013254,0460,0000,18d8,6141,00,2000.0,12345:12:34,,,80,210100,,,,20090214093254,11F0$',
+{ raw: '+RESP:GTFRI,350302,867844003012625,,12372,10,1,0,0.0,0,820.8,-70.514872,-33.361021,20160811154617,0730,0002,7410,C789,00,0.0,00000:15:30,2788,705,164,0D,00,,,20160811154651,061D$',
   manufacturer: 'queclink',
-  device: 'Queclink-GV300W',
+  device: 'Queclink-GV200',
   type: 'data',
-  imei: '135790246811220',
-  protocolVersion: { raw: '270100', deviceType: 'GV300W', version: '1.0' },
+  imei: '867844003012625',
+  protocolVersion: { raw: '350302', deviceType: 'GV200', version: '3.2' },
   temperature: null,
   history: false,
-  sentTime: 2009-02-14T09:32:54.000Z,
-  serialId: 11,
+  sentTime: 2016-08-11T15:46:51.000Z,
+  serialId: 1565,
   alarm: { type: 'Gps' },
-  loc: { type: 'Point', coordinates: [ 121.354335, 31.222073 ] },
-  speed: 4.3,
+  loc: { type: 'Point', coordinates: [ -70.514872, -33.361021 ] },
+  speed: 0,
   gpsStatus: true,
-  hdop: 1,
+  hdop: 0,
   status: 
-   { raw: '210100',
+   { raw: '0D00',
      sos: false,
-     tow: false,
-     input: { '1': true, '2': false, '3': false, '4': false },
-     output: { '1': false, '2': false, '3': false },
-     charge: false 
-   },
-  azimuth: 92,
-  altitude: 70,
-  datetime: 2009-02-14T01:32:54.000Z,
-  voltage: { 
-    battery: 80, 
-    inputCharge: null, 
-    ada: null, 
-    adb: null 
-  },
-  mcc: 460,
-  mnc: 0,
-  lac: 6360,
-  cid: 24897,
-  odometer: 2000,
-  hourmeter: '12345:12:34' 
+     input: { '1': true, '2': false, '3': true, '4': true },
+     output: { '1': false, '2': false, '3': false, '4': false },
+     charge: true },
+  azimuth: 0,
+  altitude: 820.8,
+  datetime: 2016-08-11T15:46:17.000Z,
+  voltage: 
+   { battery: null,
+     inputCharge: 12.372,
+     ada: 2.788,
+     adb: 0.705,
+     adc: 0.164 },
+  mcc: 730,
+  mnc: 2,
+  lac: 29712,
+  cid: 51081,
+  odometer: 0,
+  hourmeter: 0.25833333333333336 
 }
 */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "queclink-parser",
-  "version": "1.3.18",
+  "version": "1.4.0",
   "description": "Parse raw data from Queclink devices",
   "main": "src",
   "scripts": {

package/src/gv55.js

@@ -4,7 +4,7 @@ const utils = require('./utils.js')
 /*
   Parses messages data from GV55 devices
 */
-const parse = raw => {
+const parse = (raw, d) => {
   raw = raw.substr(0, raw.length - 1)
 
   const parsedData = raw.split(',')
@@ -18,7 +18,7 @@ const parse = raw => {
   let data = {
     raw: `${raw.toString()}$`,
     manufacturer: 'queclink',
-    device: 'Queclink-GV55',
+    device: d === 'GV55W' ? 'Queclink-GV55W' : 'Queclink-GV55',
     type: 'data',
     imei: parsedData[2],
     protocolVersion: utils.getProtocolVersion(parsedData[1]),

package/src/gv600w.js

@@ -882,104 +882,65 @@ const parse = raw => {
       }
     })
   } else if (command[1] === 'GTDAT') {
-    data = Object.assign(data, {
-      loc: {
-        type: 'Point',
-        coordinates: [parseFloat(parsedData[12]), parseFloat(parsedData[13])]
-      },
-      speed: parsedData[9] !== '' ? parseFloat(parsedData[9]) : null,
-      gpsStatus: utils.checkGps(
-        parseFloat(parsedData[12]),
-        parseFloat(parsedData[13])
-      ),
-      hdop: parsedData[8] !== '' ? parseFloat(parsedData[8]) : null,
-      status: null,
-      azimuth: parsedData[10] !== '' ? parseFloat(parsedData[10]) : null,
-      altitude: parsedData[11] !== '' ? parseFloat(parsedData[11]) : null,
-      datetime: parsedData[14] !== '' ? utils.parseDate(parsedData[14]) : null,
-      voltage: {
-        battery: null,
-        inputCharge: null,
-        ada: null,
-        adb: null,
-        adc: null,
-        add: null
-      },
-      mcc: parsedData[15] !== '' ? parseInt(parsedData[15], 10) : null,
-      mnc: parsedData[16] !== '' ? parseInt(parsedData[16], 10) : null,
-      lac: parsedData[17] !== '' ? parseInt(parsedData[17], 16) : null,
-      cid: parsedData[18] !== '' ? parseInt(parsedData[18], 16) : null,
-      odometer: null,
-      hourmeter: null,
-      serialData: parsedData[7] !== '' ? parsedData[7] : null
-    })
-
-    // Checks if its a temperature GTDAT -> DT
-    if (/^>DT/.test(parsedData[7])) {
-      const parsedSerialData =
-        parsedData[7] !== '' ? parsedData[7].split('|') : ''
-      let externalData = {
-        eriMask: {
-          raw: '00000000',
-          digitFuelSensor: false,
-          AC100: false,
-          reserved: false,
-          fuelLevelPercentage: false,
-          fuelVolume: false
-        },
-        uartDeviceType: 'Camaleon',
-        fuelSensorData: null
-      }
-      let AC100Devices = [
-        {
-          deviceNumber: `${parsedData[2]}|1`,
-          deviceType: '1',
-          deviceData:
-            parsedSerialData[3] !== '' ? parseFloat(parsedSerialData[3]) : null
-        }
-      ]
-      if (parsedSerialData[4] !== '') {
-        AC100Devices.push({
-          deviceNumber: `${parsedData[2]}|2`,
-          deviceType: '1',
-          deviceData:
-            parsedSerialData[4] !== '' ? parseFloat(parsedSerialData[4]) : null
-        })
-      }
-      externalData = Object.assign(externalData, {
-        AC100Devices: AC100Devices
-      })
-      data = Object.assign(data, {
-        alarm: utils.getAlarm('GTERI', null),
-        externalData: externalData
-      })
-    } else if (/^>ET/.test(parsedData[7])) {
-      // Temp Alarms
-      // GTTMP
-      const parsedSerialData =
-        parsedData[7] !== '' ? parsedData[7].split('|') : ''
-      const alarm = utils.getAlarm('GTTMP', `${parsedSerialData[2]}0`, [
-        `${parsedData[2]}|${parsedSerialData[2]}`,
-        parsedSerialData[4]
-      ])
+    if (parsedData.length > 8) {
+      // Long format
       data = Object.assign(data, {
-        alarm: alarm
-      })
-    } else if (/^>ID/.test(parsedData[7])) {
-      // Checks if its a iButton GTDAT -> DT
-      const parsedSerialData =
-        parsedData[7] !== '' ? parsedData[7].split('|') : ''
-      const driverID = parsedSerialData[2] ? parsedSerialData[2] : ''
-      const alarm = utils.getAlarm('GTIDA', `${driverID},1`)
-      data = Object.assign(data, {
-        alarm: alarm
+        loc: {
+          type: 'Point',
+          coordinates: [parseFloat(parsedData[12]), parseFloat(parsedData[13])]
+        },
+        speed: parsedData[9] !== '' ? parseFloat(parsedData[9]) : null,
+        gpsStatus: utils.checkGps(
+          parseFloat(parsedData[12]),
+          parseFloat(parsedData[13])
+        ),
+        hdop: parsedData[8] !== '' ? parseFloat(parsedData[8]) : null,
+        status: null,
+        azimuth: parsedData[10] !== '' ? parseFloat(parsedData[10]) : null,
+        altitude: parsedData[11] !== '' ? parseFloat(parsedData[11]) : null,
+        datetime:
+          parsedData[14] !== '' ? utils.parseDate(parsedData[14]) : null,
+        voltage: {
+          battery: null,
+          inputCharge: null,
+          ada: null,
+          adb: null,
+          adc: null,
+          add: null
+        },
+        mcc: parsedData[15] !== '' ? parseInt(parsedData[15], 10) : null,
+        mnc: parsedData[16] !== '' ? parseInt(parsedData[16], 10) : null,
+        lac: parsedData[17] !== '' ? parseInt(parsedData[17], 16) : null,
+        cid: parsedData[18] !== '' ? parseInt(parsedData[18], 16) : null,
+        odometer: null,
+        hourmeter: null,
+        serialData: parsedData[7] !== '' ? parsedData[7] : null
       })
     } else {
-      // Normal GTDAT
+      // Short format
       data = Object.assign(data, {
-        alarm: utils.getAlarm(command[1], null)
+        loc: null,
+        speed: null,
+        gpsStatus: null,
+        hdop: null,
+        status: null,
+        azimuth: null,
+        altitude: null,
+        datetime: null,
+        voltage: null,
+        mcc: null,
+        mnc: null,
+        lac: null,
+        cid: null,
+        odometer: null,
+        hourmeter: null,
+        serialData: parsedData[4] !== '' ? parsedData[4] : null
       })
     }
+
+    data = Object.assign(data, {
+      alarm: utils.getAlarm(command[1], null)
+    })
   } else if (command[1] === 'GTDOS') {
     data = Object.assign(data, {
       alarm: utils.getAlarm(command[1], `${parsedData[4]},${parsedData[5]}`),

package/src/index.js

@@ -106,8 +106,8 @@ const parse = (raw, options) => {
       result = gv200.parse(raw.toString())
     } else if (device === 'GV500') {
       result = gv500.parse(raw.toString())
-    } else if (device === 'GV55') {
-      result = gv55.parse(raw.toString())
+    } else if (device === 'GV55' || device === 'GV55W') {
+      result = gv55.parse(raw.toString(), device)
     } else if (device === 'GMT100') {
       result = gmt100.parse(raw.toString())
     } else if (device === 'GL300' || device === 'GL300W') {

package/src/utils.js

@@ -8,10 +8,10 @@ const langs = { es: langEs, en: langEn }
   Data patterns
 */
 const patterns = {
-  message: /^\+RESP/,
-  ack: /^\+ACK/,
+  message: /^\+RESP.+\$$/,
+  ack: /^\+ACK.+\$$/,
   buffer: /^\+BUFF/,
-  heartbeat: /^\+ACK:GTHBD/
+  heartbeat: /^\+ACK:GTHBD.+\$$/
 }
 
 /*
@@ -26,6 +26,7 @@ const devices = {
   '08': 'GMT100',
   '09': 'GV50P', // GV50 Plus
   '0F': 'GV55',
+  '50': 'GV55W',
   '10': 'GV55 LITE',
   '11': 'GL500',
   '1A': 'GL300',