ads-client 1.14.1 → 1.14.2

package/CHANGELOG.md

@@ -4,13 +4,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.14.2] - 02.05.2023
+### Changed
+- Bug fix: `ADS_DATA_TYPE_FLAGS` (`dataType.flags`) were parsed incorrectly. 
+  - See [issue #109](https://github.com/jisotalo/ads-client/issues/109)
+  - Thank you [Michael Croes](https://github.com/mycroes) for contribution!
+- Bug fix: If calling `unsubcribeAll()` when client is already unsubcribing and disconnecting, an error might be thrown
+  - See [issue #103](https://github.com/jisotalo/ads-client/issues/103#issuecomment-1450640160)
+- Bug fix: Check that subscription callback exists before calling it
+  - Fixes unecessary error if receiving notification data (for subscription) but it's being unsubscribed at the same time
+- Bump json5 from 2.2.1 to 2.2.3
+  - See [pull request 101](https://github.com/jisotalo/ads-client/pull/101)
+  - Not used in production code, only when running tests
+
+### Added
+- New test for [issue #103](https://github.com/jisotalo/ads-client/issues/103)
+
 ## [1.14.1] - 13.09.2022
 ### Changed
 - Bug fix: Connecting to local router failed with ECONNREFUSED error on Node.js version 17 and newer
   - See [https://github.com/nodejs/node/issues/40702](https://github.com/nodejs/node/issues/40702)
   - Fixed by using `127.0.0.1` instead of `localhost`
 
-
 ## [1.14.0] - 23.07.2022
 ### Added
 - Created end-to-end testing for the library using Jest

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ads-client",
-  "version": "1.14.1",
+  "version": "1.14.2",
   "description": "Beckhoff TwinCAT ADS client library for Node.js (unofficial). Connects to Beckhoff TwinCAT automation systems using ADS protocol.",
   "main": "./src/ads-client.js",
   "scripts": {

package/src/ads-client.js

@@ -1224,7 +1224,11 @@ class Client extends EventEmitter {
           unSubCount++
 
         } catch (err) {
-          debug(`unsubscribeAll(): Unsubscribing from notification ${JSON.stringify(this._internals.activeSubscriptions[sub].target)} failed`)
+          if (this._internals.activeSubscriptions[sub] && this._internals.activeSubscriptions[sub].target !== undefined) {
+            debug(`unsubscribeAll(): Unsubscribing from notification ${JSON.stringify(this._internals.activeSubscriptions[sub].target)} failed`)
+          } else {
+            debug(`unsubscribeAll(): Unsubscribing from notification with handle ${sub} failed`)
+          }
 
           firstError = new ClientException(this, 'unsubscribeAll()', err)
         }
@@ -4722,32 +4726,32 @@ async function _parseDataType(data) {
   dataType.adsDataTypeStr = ADS.ADS_DATA_TYPES.toString(dataType.adsDataType)
   pos += 4
 
-  //27..30 Flags (AdsDataTypeFlags)
-  dataType.flags = data.readUInt16LE(pos)
+  //28..31 Flags (AdsDataTypeFlags)
+  dataType.flags = data.readUInt32LE(pos)
   dataType.flagsStr = ADS.ADS_DATA_TYPE_FLAGS.toStringArray(dataType.flags)
   pos += 4
 
-  //31..32 Name length
+  //32..33 Name length
   dataType.nameLength = data.readUInt16LE(pos)
   pos += 2
 
-  //33..34 Type length
+  //34..35 Type length
   dataType.typeLength = data.readUInt16LE(pos)
   pos += 2
 
-  //35..36 Comment length
+  //36..37 Comment length
   dataType.commentLength = data.readUInt16LE(pos)
   pos += 2
 
-  //37..40 Array dimension
+  //38..39 Array dimension
   dataType.arrayDimension = data.readUInt16LE(pos)
   pos += 2
 
-  //41..42 Subitem count
+  //40..41 Subitem count
   dataType.subItemCount = data.readUInt16LE(pos)
   pos += 2
 
-  //43.... Name
+  //42.... Name
   dataType.name = _trimPlcString(iconv.decode(data.slice(pos, pos + dataType.nameLength + 1), 'cp1252'))
   pos += dataType.nameLength + 1
 
@@ -6327,7 +6331,7 @@ async function _onAdsCommandReceived(packet) {
               parsedValue.timeStamp = stamp.timeStamp
 
               //Then lets call the users callback
-              sub.callback(
+              sub.callback && sub.callback(
                 parsedValue,
                 sub
               )