ads-client 2.0.0-beta.4 → 2.0.0-beta.5

package/dist/ads-client.js

@@ -148,6 +148,7 @@ class Client extends events_1.default {
             plcSymbols: {},
             allPlcDataTypesCached: false,
             plcDataTypes: {},
+            adsSymbolsUseUtf8: false
         };
         /**
          * Buffer for received data.
@@ -233,7 +234,8 @@ class Client extends events_1.default {
             allowHalfOpen: false,
             rawClient: false,
             disableCaching: false,
-            deleteUnknownSubscriptions: true
+            deleteUnknownSubscriptions: true,
+            forceUtf8ForAdsSymbols: false
         };
         /**
          * Active connection information.
@@ -419,6 +421,8 @@ class Client extends events_1.default {
                 //When socket errors from now on, we will close the connection
                 this.socketErrorHandler = this.onSocketError.bind(this);
                 socket.on("error", this.socketErrorHandler);
+                //Force ADS UTF-8 (note: this is also set later at readPlcUploadInfo() if target is a PLC)
+                this.metaData.adsSymbolsUseUtf8 = this.settings.forceUtf8ForAdsSymbols;
                 //If rawClient setting is true, we are done here (just a connection is enough)
                 if (this.settings.rawClient !== true) {
                     try {
@@ -748,11 +752,9 @@ class Client extends events_1.default {
                 this.socketWrite(buffer);
             }
             catch (err) {
-                reject(err);
-            }
-            finally {
                 this.amsTcpCallback = undefined;
                 clearTimeout(this.portRegisterTimeoutTimer);
+                reject(err);
             }
         });
     }
@@ -878,29 +880,38 @@ class Client extends events_1.default {
      * @param subscription The subscription object (unused here)
      */
     onPlcRuntimeStateChanged(data, subscription) {
-        const res = {};
+        const state = {};
         let pos = 0;
         //0..1 ADS state
-        res.adsState = data.value.readUInt16LE(pos);
-        res.adsStateStr = ADS.ADS_STATE.toString(res.adsState);
+        state.adsState = data.value.readUInt16LE(pos);
+        state.adsStateStr = ADS.ADS_STATE.toString(state.adsState);
         pos += 2;
         //2..3 Device state
-        res.deviceState = data.value.readUInt16LE(pos);
+        state.deviceState = data.value.readUInt16LE(pos);
         pos += 2;
-        //Checking if PLC runtime state has changed
+        this.handlePlcRuntimeStateChange(state);
+    }
+    /**
+     * Checks if PLC runtime state has changed, and if so, emits an event.
+     *
+     * Call from `onPlcRuntimeStateChanged()` and `readPlcRuntimeState()`.
+     *
+     * @param state Active PLC runtime state
+     */
+    handlePlcRuntimeStateChange(state) {
         let stateChanged = false;
-        if (this.metaData.plcRuntimeState === undefined || this.metaData.plcRuntimeState.adsState !== res.adsState) {
-            this.debug(`onPlcRuntimeStateChanged(): PLC runtime state (adsState) changed from ${this.metaData.plcRuntimeState === undefined ? 'UNKNOWN' : this.metaData.plcRuntimeState.adsStateStr} to ${res.adsStateStr}`);
+        if (this.metaData.plcRuntimeState === undefined || this.metaData.plcRuntimeState.adsState !== state.adsState) {
+            this.debug(`handlePlcRuntimeStateChange(): PLC runtime state (adsState) changed from ${this.metaData.plcRuntimeState === undefined ? 'UNKNOWN' : this.metaData.plcRuntimeState.adsStateStr} to ${state.adsStateStr}`);
             stateChanged = true;
         }
-        if (this.metaData.plcRuntimeState === undefined || this.metaData.plcRuntimeState.deviceState !== res.deviceState) {
-            this.debug(`onPlcRuntimeStateChanged(): PLC runtime state (deviceState) changed from ${this.metaData.plcRuntimeState === undefined ? 'UNKNOWN' : this.metaData.plcRuntimeState.deviceState} to ${res.deviceState}`);
+        if (this.metaData.plcRuntimeState === undefined || this.metaData.plcRuntimeState.deviceState !== state.deviceState) {
+            this.debug(`handlePlcRuntimeStateChange(): PLC runtime state (deviceState) changed from ${this.metaData.plcRuntimeState === undefined ? 'UNKNOWN' : this.metaData.plcRuntimeState.deviceState} to ${state.deviceState}`);
             stateChanged = true;
         }
         let oldState = this.metaData.plcRuntimeState !== undefined
             ? { ...this.metaData.plcRuntimeState }
             : undefined;
-        this.metaData.plcRuntimeState = res;
+        this.metaData.plcRuntimeState = state;
         if (stateChanged) {
             this.emit('plcRuntimeStateChange', this.metaData.plcRuntimeState, oldState);
         }
@@ -1322,8 +1333,7 @@ class Client extends events_1.default {
                     ads.payload.versionBuild = data.readUInt16LE(pos);
                     pos += 2;
                     //8..24 Device name
-                    ads.payload.deviceName = ADS.decodePlcStringBuffer(data.subarray(pos, pos + 16));
-                    ;
+                    ads.payload.deviceName = ADS.decodePlcStringBuffer(data.subarray(pos, pos + 16), this.metaData.adsSymbolsUseUtf8);
                 }
                 break;
             case ADS.ADS_COMMAND.ReadState:
@@ -1877,13 +1887,13 @@ class Client extends events_1.default {
         const commentLength = data.readUInt16LE(pos);
         pos += 2;
         //30.... Symbol name
-        symbol.name = ADS.decodePlcStringBuffer(data.subarray(pos, pos + nameLength + 1));
+        symbol.name = ADS.decodePlcStringBuffer(data.subarray(pos, pos + nameLength + 1), this.metaData.adsSymbolsUseUtf8);
         pos += nameLength + 1;
         //.. Symbol type
-        symbol.type = ADS.decodePlcStringBuffer(data.subarray(pos, pos + typeLength + 1));
+        symbol.type = ADS.decodePlcStringBuffer(data.subarray(pos, pos + typeLength + 1), this.metaData.adsSymbolsUseUtf8);
         pos += typeLength + 1;
         //.. Symbol comment
-        symbol.comment = ADS.decodePlcStringBuffer(data.subarray(pos, pos + commentLength + 1));
+        symbol.comment = ADS.decodePlcStringBuffer(data.subarray(pos, pos + commentLength + 1), this.metaData.adsSymbolsUseUtf8);
         pos += commentLength + 1;
         //Array information
         symbol.arrayInfo = [];
@@ -1915,10 +1925,10 @@ class Client extends events_1.default {
                 const valueLength = data.readUInt8(pos);
                 pos += 1;
                 //Name
-                attr.name = ADS.decodePlcStringBuffer(data.subarray(pos, pos + nameLength + 1));
+                attr.name = ADS.decodePlcStringBuffer(data.subarray(pos, pos + nameLength + 1), this.metaData.adsSymbolsUseUtf8);
                 pos += nameLength + 1;
                 //Value
-                attr.value = ADS.decodePlcStringBuffer(data.subarray(pos, pos + valueLength + 1));
+                attr.value = ADS.decodePlcStringBuffer(data.subarray(pos, pos + valueLength + 1), this.metaData.adsSymbolsUseUtf8);
                 pos += valueLength + 1;
                 symbol.attributes.push(attr);
             }
@@ -1986,13 +1996,13 @@ class Client extends events_1.default {
         const subItemCount = data.readUInt16LE(pos);
         pos += 2;
         //38.. Data type name
-        dataType.name = ADS.decodePlcStringBuffer(data.subarray(pos, pos + nameLength + 1));
+        dataType.name = ADS.decodePlcStringBuffer(data.subarray(pos, pos + nameLength + 1), this.metaData.adsSymbolsUseUtf8);
         pos += nameLength + 1;
         //.. Data type type
-        dataType.type = ADS.decodePlcStringBuffer(data.subarray(pos, pos + typeLength + 1));
+        dataType.type = ADS.decodePlcStringBuffer(data.subarray(pos, pos + typeLength + 1), this.metaData.adsSymbolsUseUtf8);
         pos += typeLength + 1;
         //.. Data type comment
-        dataType.comment = ADS.decodePlcStringBuffer(data.subarray(pos, pos + commentLength + 1));
+        dataType.comment = ADS.decodePlcStringBuffer(data.subarray(pos, pos + commentLength + 1), this.metaData.adsSymbolsUseUtf8);
         pos += commentLength + 1;
         //Array information
         dataType.arrayInfos = [];
@@ -2076,13 +2086,13 @@ class Client extends events_1.default {
                 const parameterCount = data.readUInt16LE(pos);
                 pos += 2;
                 //56.. Name
-                method.name = ADS.decodePlcStringBuffer(data.subarray(pos, pos + nameLength + 1));
+                method.name = ADS.decodePlcStringBuffer(data.subarray(pos, pos + nameLength + 1), this.metaData.adsSymbolsUseUtf8);
                 pos += nameLength + 1;
                 //.. Return data type
-                method.retunDataType = ADS.decodePlcStringBuffer(data.subarray(pos, pos + returnTypeLength + 1));
+                method.retunDataType = ADS.decodePlcStringBuffer(data.subarray(pos, pos + returnTypeLength + 1), this.metaData.adsSymbolsUseUtf8);
                 pos += returnTypeLength + 1;
                 //.. Comment
-                method.comment = ADS.decodePlcStringBuffer(data.subarray(pos, pos + commentLength + 1));
+                method.comment = ADS.decodePlcStringBuffer(data.subarray(pos, pos + commentLength + 1), this.metaData.adsSymbolsUseUtf8);
                 pos += commentLength + 1;
                 //Parameters
                 method.parameters = [];
@@ -2125,13 +2135,13 @@ class Client extends events_1.default {
                     const commentLength = data.readUInt16LE(pos);
                     pos += 2;
                     //38.. Data type name
-                    param.name = ADS.decodePlcStringBuffer(data.subarray(pos, pos + nameLength + 1));
+                    param.name = ADS.decodePlcStringBuffer(data.subarray(pos, pos + nameLength + 1), this.metaData.adsSymbolsUseUtf8);
                     pos += nameLength + 1;
                     //.. Data type type
-                    param.type = ADS.decodePlcStringBuffer(data.subarray(pos, pos + typeLength + 1));
+                    param.type = ADS.decodePlcStringBuffer(data.subarray(pos, pos + typeLength + 1), this.metaData.adsSymbolsUseUtf8);
                     pos += typeLength + 1;
                     //.. Data type comment
-                    param.comment = ADS.decodePlcStringBuffer(data.subarray(pos, pos + commentLength + 1));
+                    param.comment = ADS.decodePlcStringBuffer(data.subarray(pos, pos + commentLength + 1), this.metaData.adsSymbolsUseUtf8);
                     pos += commentLength + 1;
                     //Attributes
                     param.attributes = [];
@@ -2148,18 +2158,19 @@ class Client extends events_1.default {
                             const valueLength = data.readUInt8(pos);
                             pos += 1;
                             //Name
-                            attr.name = ADS.decodePlcStringBuffer(data.subarray(pos, pos + nameLength + 1));
+                            attr.name = ADS.decodePlcStringBuffer(data.subarray(pos, pos + nameLength + 1), this.metaData.adsSymbolsUseUtf8);
                             pos += nameLength + 1;
                             //Value
-                            attr.value = ADS.decodePlcStringBuffer(data.subarray(pos, pos + valueLength + 1));
+                            attr.value = ADS.decodePlcStringBuffer(data.subarray(pos, pos + valueLength + 1), this.metaData.adsSymbolsUseUtf8);
                             pos += valueLength + 1;
-                            method.attributes.push(attr);
+                            param.attributes.push(attr);
                         }
                     }
                     if (pos - beginPosition > entryLength) {
                         //There is some additional data left
                         param.reserved2 = data.subarray(pos);
                     }
+                    pos = beginPosition + entryLength;
                     method.parameters.push(param);
                 }
                 //Attributes
@@ -2177,10 +2188,10 @@ class Client extends events_1.default {
                         const valueLength = data.readUInt8(pos);
                         pos += 1;
                         //Name
-                        attr.name = ADS.decodePlcStringBuffer(data.subarray(pos, pos + nameLength + 1));
+                        attr.name = ADS.decodePlcStringBuffer(data.subarray(pos, pos + nameLength + 1), this.metaData.adsSymbolsUseUtf8);
                         pos += nameLength + 1;
                         //Value
-                        attr.value = ADS.decodePlcStringBuffer(data.subarray(pos, pos + valueLength + 1));
+                        attr.value = ADS.decodePlcStringBuffer(data.subarray(pos, pos + valueLength + 1), this.metaData.adsSymbolsUseUtf8);
                         pos += valueLength + 1;
                         method.attributes.push(attr);
                     }
@@ -2205,18 +2216,19 @@ class Client extends events_1.default {
                 const valueLength = data.readUInt8(pos);
                 pos += 1;
                 //Name
-                attr.name = ADS.decodePlcStringBuffer(data.subarray(pos, pos + nameLength + 1));
+                attr.name = ADS.decodePlcStringBuffer(data.subarray(pos, pos + nameLength + 1), this.metaData.adsSymbolsUseUtf8);
                 pos += nameLength + 1;
                 //Value
-                attr.value = ADS.decodePlcStringBuffer(data.subarray(pos, pos + valueLength + 1));
+                attr.value = ADS.decodePlcStringBuffer(data.subarray(pos, pos + valueLength + 1), this.metaData.adsSymbolsUseUtf8);
                 pos += valueLength + 1;
                 dataType.attributes.push(attr);
             }
         }
         //If flag EnumInfos set
         dataType.enumInfos = [];
+        let enumInfoCount = 0;
         if ((dataType.flags & ADS.ADS_DATA_TYPE_FLAGS.EnumInfos) === ADS.ADS_DATA_TYPE_FLAGS.EnumInfos) {
-            const enumInfoCount = data.readUInt16LE(pos);
+            enumInfoCount = data.readUInt16LE(pos);
             pos += 2;
             for (let i = 0; i < enumInfoCount; i++) {
                 let enumInfo = {};
@@ -2224,7 +2236,7 @@ class Client extends events_1.default {
                 const nameLength = data.readUInt8(pos);
                 pos += 1;
                 //Enumeration name
-                enumInfo.name = ADS.decodePlcStringBuffer(data.subarray(pos, pos + nameLength + 1));
+                enumInfo.name = ADS.decodePlcStringBuffer(data.subarray(pos, pos + nameLength + 1), this.metaData.adsSymbolsUseUtf8);
                 pos += nameLength + 1;
                 //Enumeration value
                 enumInfo.value = data.subarray(pos, pos + dataType.size);
@@ -2251,9 +2263,43 @@ class Client extends events_1.default {
         }
         //If flag ExtendedEnumInfos set
         if ((dataType.flags & ADS.ADS_DATA_TYPE_FLAGS.ExtendedEnumInfos) === ADS.ADS_DATA_TYPE_FLAGS.ExtendedEnumInfos) {
-            //TODO: this is not working now
-            //Things probably break now
-            this.warn(`Data type ${dataType.name} (${dataType.type}) has flag "ExtendedEnumInfos" which is not supported. Things might not work now. Please open an issue at Github`);
+            for (let i = 0; i < enumInfoCount; i++) {
+                let beginPosition = pos;
+                //Total entry length (bytes)
+                const entryLength = data.readUInt16LE(pos);
+                pos += 2;
+                //Comment length
+                const commentLength = data.readUInt8(pos);
+                pos += 1;
+                //Attribute count
+                const attributeCount = data.readUInt8(pos);
+                pos += 1;
+                //Enumeration comment
+                dataType.enumInfos[i].comment = ADS.decodePlcStringBuffer(data.subarray(pos, pos + commentLength + 1), this.metaData.adsSymbolsUseUtf8);
+                pos += commentLength + 1;
+                //Enumeration attributes
+                dataType.enumInfos[i].attributes = [];
+                //console.log(enumInfoCount, num1, commentLength, attributeCount, test, attributes);
+                //Attributes
+                for (let i = 0; i < attributeCount; i++) {
+                    const attr = {};
+                    //Name length
+                    const nameLength = data.readUInt8(pos);
+                    pos += 1;
+                    //Value length
+                    const valueLength = data.readUInt8(pos);
+                    pos += 1;
+                    //Name
+                    attr.name = ADS.decodePlcStringBuffer(data.subarray(pos, pos + nameLength + 1), this.metaData.adsSymbolsUseUtf8);
+                    pos += nameLength + 1;
+                    //Value
+                    attr.value = ADS.decodePlcStringBuffer(data.subarray(pos, pos + valueLength + 1), this.metaData.adsSymbolsUseUtf8);
+                    pos += valueLength + 1;
+                    dataType.enumInfos[i].attributes.push(attr);
+                }
+                //If there are some reserved bytes -> skip
+                pos = beginPosition + entryLength;
+            }
         }
         //If flag SoftwareProtectionLevels set
         if ((dataType.flags & ADS.ADS_DATA_TYPE_FLAGS.SoftwareProtectionLevels) === ADS.ADS_DATA_TYPE_FLAGS.SoftwareProtectionLevels) {
@@ -2510,7 +2556,7 @@ class Client extends events_1.default {
      */
     convertBufferToPrimitiveType(buffer, dataType) {
         if (dataType.adsDataType === ADS.ADS_DATA_TYPES.ADST_STRING) {
-            return ADS.decodePlcStringBuffer(buffer);
+            return ADS.decodePlcStringBuffer(buffer); //TODO: If symbol has {attribute 'TcEncoding':='UTF-8'}
         }
         else if (dataType.adsDataType === ADS.ADS_DATA_TYPES.ADST_WSTRING) {
             return ADS.decodePlcWstringBuffer(buffer);
@@ -3015,6 +3061,8 @@ class Client extends events_1.default {
      * }
      * ```
      *
+     * @param command The ADS command to send
+     *
      * @template T In Typescript, the type of the ADS response. If omitted, generic {@link AdsResponse} type is used.
      *
      * @throws Throws an error if sending the command fails or if target responds with an error
@@ -3100,6 +3148,82 @@ class Client extends events_1.default {
             }
         });
     }
+    /**
+     * Sends a raw ADS command to the target with fallback. A wrapper for {@link Client.sendAdsCommand}().
+     *
+     * Calls `sendAdsCommand(command)` and if it fails with
+     * ADS error 1793 or 1808 then calls the `sendAdsCommand(fallback)`.
+     *
+     * See {@link Client.readPlcUploadInfo}() for use case.
+     *
+     * The ideas is copied from TwinCAT.Ads.dll (`TwinCAT.Ads.AdsClientExtensions.ReadWithFallbackAsync()`).
+     *
+     * @example
+     * ```js
+     * try {
+     *  const data = Buffer.alloc(12);
+     *  //...code omitted...
+     *
+     *  const command = {
+     *    adsCommand: ADS.ADS_COMMAND.Read,
+     *    targetAmsNetId: targetOpts.amsNetId,
+     *    targetAdsPort: targetOpts.adsPort,
+     *    payload: data
+     *  };
+     *
+     *  const fbData = Buffer.alloc(12);
+     *  //...code omitted...
+     *
+     *  const fallback = {
+     *    adsCommand: ADS.ADS_COMMAND.Read,
+     *    targetAmsNetId: targetOpts.amsNetId,
+     *    targetAdsPort: targetOpts.adsPort,
+     *    payload: fbData
+     *  };
+     *
+     *  const { response: res, fallbackUsed } = await this.sendAdsCommandWithFallback<AdsReadResponse>(command, fallback);
+     *
+     *  //If we are here, one of those commands was succcesful
+     *  if(fallbackUsed) {
+     *    console.log("Fallback was used. Result:", res.ads.payload);
+     *  } else {
+     *    console.log("Fallback was not used. Result:", res.ads.payload);
+     *  }
+     *
+     * } catch (err) {
+     *  console.log("Error:", err);
+     * }
+     * ```
+     *
+     * @param command The main ADS command to send
+     * @param fallback The fallback ADS command to send
+     *
+     * @template T In Typescript, the type of the ADS response. If omitted, generic {@link AdsResponse} type is used.
+     *
+     * @throws Throws an error if sending the command fails or if target responds with an error
+     */
+    async sendAdsCommandWithFallback(command, fallback) {
+        try {
+            this.debug(`sendAdsCommandWithFallback(): Sending ADS command with a fallback`);
+            return {
+                fallbackUsed: false,
+                response: await this.sendAdsCommand(command)
+            };
+        }
+        catch (err) {
+            const clientErr = err;
+            //If error is "Service is not supported by server" (1793) or "Symbol not found" (1808) then we should try the fallback
+            if (clientErr.adsError?.errorCode === 1793 || clientErr.adsError?.errorCode === 1808) {
+                this.debug(`sendAdsCommandWithFallback(): Sending ADS command failed with ADS error ${clientErr.adsError.errorCode} - trying fallback...`);
+                return {
+                    fallbackUsed: true,
+                    response: await this.sendAdsCommand(fallback)
+                };
+            }
+            this.debug(`sendAdsCommandWithFallback(): Sending ADS command failed - skipping fallback (ADS error is not 1793 or 1808)`);
+            throw err;
+        }
+    }
     /**
      * Sends an ADS `WriteControl` command to the target.
      *
@@ -3191,6 +3315,8 @@ class Client extends events_1.default {
             const state = await this.readPlcRuntimeState(targetOpts);
             await this.writeControl("Run", state.deviceState, undefined, targetOpts);
             this.debug(`startPlc(): PLC runtime started at ${this.targetToString(targetOpts)}`);
+            //Reading runtime state to make sure metaData is updated asap
+            await this.readPlcRuntimeState(targetOpts);
         }
         catch (err) {
             this.debug(`startPlc(): Starting PLC runtime at ${this.targetToString(targetOpts)} failed: %o`, err);
@@ -3223,6 +3349,8 @@ class Client extends events_1.default {
             const state = await this.readPlcRuntimeState(targetOpts);
             await this.writeControl("Reset", state.deviceState, undefined, targetOpts);
             this.debug(`resetPlc(): PLC runtime reset at ${this.targetToString(targetOpts)}`);
+            //Reading runtime state to make sure metaData is updated asap
+            await this.readPlcRuntimeState(targetOpts);
         }
         catch (err) {
             this.debug(`resetPlc(): Resetting PLC runtime at ${this.targetToString(targetOpts)} failed: %o`, err);
@@ -3255,6 +3383,8 @@ class Client extends events_1.default {
             const state = await this.readPlcRuntimeState(targetOpts);
             await this.writeControl("Stop", state.deviceState, undefined, targetOpts);
             this.debug(`stopPlc(): PLC runtime stopped at ${this.targetToString(targetOpts)}`);
+            //Reading runtime state to make sure metaData is updated asap
+            await this.readPlcRuntimeState(targetOpts);
         }
         catch (err) {
             this.debug(`stopPlc(): Stopping PLC runtime at ${this.targetToString(targetOpts)} failed: %o`, err);
@@ -3602,8 +3732,8 @@ class Client extends events_1.default {
             });
             this.debug(`readPlcRuntimeState(): Runtime state read successfully. State is %o`, res.ads.payload);
             if (!targetOpts.adsPort && !targetOpts.amsNetId) {
-                //Target is not overridden -> save to metadata
-                this.metaData.plcRuntimeState = res.ads.payload;
+                //Target is not overridden -> handle the result (check for change and update metadata)
+                this.handlePlcRuntimeStateChange(res.ads.payload);
             }
             return res.ads.payload;
         }
@@ -4096,36 +4226,90 @@ class Client extends events_1.default {
         data.writeUInt32LE(0, pos);
         pos += 4;
         //8..11 Read data length
-        data.writeUInt32LE(24, pos);
+        data.writeUInt32LE(64, pos); //64 = upload info version 3 size (works also for lower versions)
+        pos += 4;
+        const command = {
+            adsCommand: ADS.ADS_COMMAND.Read,
+            targetAmsNetId: targetOpts.amsNetId,
+            targetAdsPort: targetOpts.adsPort,
+            payload: data
+        };
+        //Fallback read command for version 1
+        //Allocating bytes for request
+        const fbData = Buffer.alloc(12);
+        pos = 0;
+        //0..3 IndexGroup 
+        fbData.writeUInt32LE(ADS.ADS_RESERVED_INDEX_GROUPS.SymbolUploadInfo, pos);
+        pos += 4;
+        //4..7 IndexOffset
+        fbData.writeUInt32LE(0, pos);
+        pos += 4;
+        //8..11 Read data length
+        fbData.writeUInt32LE(8, pos); //8 = upload info version 1 size
         pos += 4;
+        const fallback = {
+            adsCommand: ADS.ADS_COMMAND.Read,
+            targetAmsNetId: targetOpts.amsNetId,
+            targetAdsPort: targetOpts.adsPort,
+            payload: fbData
+        };
         try {
-            const res = await this.sendAdsCommand({
-                adsCommand: ADS.ADS_COMMAND.Read,
-                targetAmsNetId: targetOpts.amsNetId,
-                targetAdsPort: targetOpts.adsPort,
-                payload: data
-            });
+            const { response: res, fallbackUsed } = await this.sendAdsCommandWithFallback(command, fallback);
+            this.debug(`readPlcUploadInfo(): Upload info read - fallback was needed: ${fallbackUsed}`);
             const uploadInfo = {};
             let pos = 0;
             const response = res.ads.payload;
+            //If we are here, either the command or fallback was successful
+            //Detect version from byte count
+            if (response.byteLength === 8) {
+                uploadInfo.version = 1;
+            }
+            else if (response.byteLength === 24) {
+                uploadInfo.version = 2;
+            }
+            else if (response.byteLength === 64) {
+                uploadInfo.version = 3;
+            }
+            else {
+                //Shouldn't happen as we request max 64 bytes
+                throw new Error(`Upload info version is unknown (received ${response.byteLength} bytes) - create a GitHub issue`);
+            }
             //0..3 Symbol count
             uploadInfo.symbolCount = response.readUInt32LE(pos);
             pos += 4;
             //4..7 Symbol length
             uploadInfo.symbolLength = response.readUInt32LE(pos);
             pos += 4;
-            //8..11 Data type count
-            uploadInfo.dataTypeCount = response.readUInt32LE(pos);
-            pos += 4;
-            //12..15 Data type length
-            uploadInfo.dataTypeLength = response.readUInt32LE(pos);
-            pos += 4;
-            //16..19 Extra count
-            uploadInfo.extraCount = response.readUInt32LE(pos);
-            pos += 4;
-            //20..23 Extra length
-            uploadInfo.extraLength = response.readUInt32LE(pos);
-            pos += 4;
+            if (uploadInfo.version >= 2) {
+                //8..11 Data type count
+                uploadInfo.dataTypeCount = response.readUInt32LE(pos);
+                pos += 4;
+                //12..15 Data type length
+                uploadInfo.dataTypeLength = response.readUInt32LE(pos);
+                pos += 4;
+                //16..19 Max. allowed dynamic symbol count
+                uploadInfo.maxDynamicSymbolCount = response.readUInt32LE(pos);
+                pos += 4;
+                //20..23 Number of dynamic symbols used (version >= 2)
+                uploadInfo.dynamicSymbolCount = response.readUInt32LE(pos);
+                pos += 4;
+                if (uploadInfo.version >= 3) {
+                    //24..27 Invalid dynamic symbol count
+                    uploadInfo.invalidDynamicSymbolCount = response.readUInt32LE(pos);
+                    pos += 4;
+                    //28..31 Encoding code page used for STRING encoding
+                    uploadInfo.encodingCodePage = response.readUInt32LE(pos);
+                    pos += 4;
+                    //32..35 Upload info flags
+                    uploadInfo.flags = response.readUInt32LE(pos);
+                    uploadInfo.flagsStr = ADS.ADS_UPLOAD_INFO_FLAGS.toStringArray(uploadInfo.flags);
+                    pos += 4;
+                    //36..63 Reserved
+                    uploadInfo.reserved = response.subarray(pos);
+                }
+            }
+            //Target has UTF-8 encoded ADS symbols if encodingCodePage is 65001 (or if forced from settings)
+            this.metaData.adsSymbolsUseUtf8 = uploadInfo.encodingCodePage === 65001 || this.settings.forceUtf8ForAdsSymbols;
             if (!targetOpts.adsPort && !targetOpts.amsNetId) {
                 //Target is not overridden -> save to metadata
                 this.metaData.plcUploadInfo = uploadInfo;
@@ -4314,7 +4498,7 @@ class Client extends events_1.default {
         data.writeUInt32LE(0, pos);
         pos += 4;
         //8..11 Read data length
-        data.writeUInt32LE(uploadInfo.dataTypeLength, pos);
+        data.writeUInt32LE(uploadInfo.dataTypeLength ?? 0xFFFFFFFF, pos); //Using 0xFFFFFFFF is upload info is version 1 (= we don't know the length)
         pos += 4;
         try {
             const res = await this.sendAdsCommand({
@@ -4826,11 +5010,11 @@ class Client extends events_1.default {
      *
      * //Writing a POINTER value (Note the dereference operator ^)
      * const ptrValue = ...
-     * await client.writeRawByPath('GVL_Read.ComplexTypes.POINTER_^', ptrValue);
+     * await client.writeRawByPath('GVL_Write.ComplexTypes.POINTER_^', ptrValue);
      *
      * //Writing a REFERENCE value
      * const refValue = ...
-     * await client.readRawByPath('GVL_Read.ComplexTypes.REFERENCE_');
+     * await client.writeRawByPath('GVL_Write.ComplexTypes.REFERENCE_');
      *
      * } catch (err) {
      *  console.log("Error:", err);
@@ -5204,11 +5388,9 @@ class Client extends events_1.default {
      * @example
      * ```js
      * try {
-     *  const value = {
-     *    example: true
-     *  };
+     *  const res = await client.writeValue('GVL_Write.StandardTypes.INT_', 32767);
+     *  console.log('Value written:', res.value);
      *
-     *  const res = await client.writeValue('GVL_Read.StandardTypes.INT_', value);
      * } catch (err) {
      *  console.log("Error:", err);
      * }
@@ -5592,7 +5774,7 @@ class Client extends events_1.default {
             let dataTypeLength = response.readUInt16LE(pos);
             pos += 2;
             //10..n Data type
-            result.dataType = ADS.decodePlcStringBuffer(response.subarray(pos, pos + dataTypeLength + 1));
+            result.dataType = ADS.decodePlcStringBuffer(response.subarray(pos, pos + dataTypeLength + 1), this.metaData.adsSymbolsUseUtf8);
             this.debug(`createVariableHandle(): Variable handle created to ${path}`);
             return result;
         }
@@ -5730,7 +5912,7 @@ class Client extends events_1.default {
                     let dataTypeLength = response.readUInt16LE(pos);
                     pos += 2;
                     //10..n Data type
-                    result.dataType = ADS.decodePlcStringBuffer(response.subarray(pos, pos + dataTypeLength + 1));
+                    result.dataType = ADS.decodePlcStringBuffer(response.subarray(pos, pos + dataTypeLength + 1), this.metaData.adsSymbolsUseUtf8);
                     pos += dataTypeLength + 1;
                     results[i].handle = result;
                 }
@@ -6123,8 +6305,8 @@ class Client extends events_1.default {
                 throw new client_error_1.default(`invokeRpcMethod(): Method ${method} was not found from symbol ${path}. Available RPC methods are: ${dataType.rpcMethods.map(m => m.name).join(', ')}`);
             }
             //Method inputs and outputs
-            const inputs = rpcMethod.parameters.filter(p => p.flags === ADS.ADS_RCP_METHOD_PARAM_FLAGS.In);
-            const outputs = rpcMethod.parameters.filter(p => p.flags === ADS.ADS_RCP_METHOD_PARAM_FLAGS.Out);
+            const inputs = rpcMethod.parameters.filter(p => (p.flags & ADS.ADS_RCP_METHOD_PARAM_FLAGS.In) === ADS.ADS_RCP_METHOD_PARAM_FLAGS.In);
+            const outputs = rpcMethod.parameters.filter(p => (p.flags & ADS.ADS_RCP_METHOD_PARAM_FLAGS.Out) === ADS.ADS_RCP_METHOD_PARAM_FLAGS.Out);
             //Creating data buffer for inputs
             let inputsData = Buffer.alloc(0);
             for (const input of inputs) {