nodbus-plus 0.8.2 → 1.0.0

package/src/client/m_tcp_client.js

@@ -1,234 +0,0 @@
-/**
-** Modbus Tcp Client  module.
-* @module client/modbus_tcp_client
-* @author Hector E. Socarras.
-* @version 0.8.0
-*/
-
-const ModbusMaster = require('../protocol/modbus_master');
-const TcpClient = require('../net/tcpclient');
-const ADU = require('../protocol/tcp_adu');
-
-
-
-/**
- * Class representing a modbus tcp client.
- * @extends ModbusMaster
-*/
-class ModbusTCPClient extends  ModbusMaster {
-  /**
-  * Create a Modbus Tcp Client.
-  */
-    constructor(){
-        super();
-
-        var self = this;
-
-        var transactionCountValue = 1;
-
-        /**
-        * tcp layer
-        * @type {object}
-        */
-        this.netClient = new TcpClient();
-
-        //asociando el evento data del netClient con la funcion ProcessResponse
-        this.netClient.onData = this.ProcessResponse.bind(this);
-
-        /**
-        * Emit connect and ready events
-        * @param {object} target Socket object
-        * @fires ModbusTCPClient#connect {object}
-        * @fires ModbusTCPClient#ready
-        */
-        this.netClient.onConnect = self._EmitConnect.bind(this);
-
-
-        /**
-        *Emit disconnect event
-        * @param {string} id
-        * @param {object} had_error
-        * @fires ModbusTCPClient#disconnect {object}
-        */
-        function EmitDisconnect(id, had_error){
-
-          let slave = this.slaveList.get(id);
-            
-            /**
-           * disconnect event.
-           * @event ModbusTCPClient#disconnect
-           */
-            this.emit('disconnect',id, had_error);
-            slave.isReady = false;
-        }
-        this.netClient.onClose = EmitDisconnect.bind(this);
-
-        /**
-        *Emit error event
-        * @param {object} error
-        * @fires ModbusTCPClient#error {object}
-        */
-        function EmitError (id, err){
-
-          /**
-         * error event.
-         * @event ModbusTCPClient#error
-         * @type {object}
-         */
-            this.emit('error',id, err);
-        }
-        this.netClient.onError = EmitError.bind(this);
-
-        /**
-        * Emit timeout event        *
-        * @fires ModbusTCPClient#timeout
-        */
-        this.netClient.onTimeOut = self._EmitTimeout.bind(this);
-
-        /**
-        * Emit Indication event        *
-        * @fires ModbusTCPClient#indication
-        */
-        function EmitIndication(id, data){
-          /**
-         * indication event.
-         * @event ModbusTCPClient#indication
-         */
-          this.emit('indication',id, data);
-        }
-        this.netClient.onWrite = EmitIndication.bind(this);
-        
-        /**
-        * number of transaction
-        * @type {number}
-        */
-        Object.defineProperty(self, 'transactionCounter', {
-            get: function(){
-                return transactionCountValue;
-            },
-            set: function(value){
-                if(value <= 0xFFF0 ){
-                  if(value = transactionCountValue + 1){
-                    transactionCountValue = value;
-                  }                    
-                }
-                else{
-                    transactionCountValue = 1;
-                }
-            },
-            enumerable: false,
-            configurable: false
-        } )
-
-    }
-   
-
-    /**
-    * function to create a adu
-    * @param {object} pdu of request
-    * @return {object} adu request
-    */
-    CreateADU(id, pdu){
-      var adu = new ADU();
-      let slave = this.slaveList.get(id);
-      
-      adu.pdu = pdu;
-      adu.address = slave.modbusAddress;
-      adu.transactionCounter = this.transactionCounter++
-
-      adu.MakeBuffer();
-      return adu;
-    }
-
-    /**
-    * function to pasrse server response
-    * @param {Buffer} aduBuffer frame of response
-    * @return {object} map Object whit register:value pairs
-    * @fires ModbusTCPClient#modbus_exception {object}
-    * @fires ModbusTCPClient#error {object}
-    */
-    ParseResponse(id, aduBuffer) {
-
-      let resp = new ADU(aduBuffer);
-      let slave = this.slaveList.get(id);
-
-      try{
-        resp.ParseBuffer();
-        //chekeo el transactionID
-        if(resp.mbap.transactionID != slave.currentRequest.mbap.transactionID){
-          this.emit('modbus_exception', id, "Wrong Transaction ID");
-            return false;
-        }
-        else if((aduBuffer.length - 6) != resp.mbap.length) {
-            this.emit('modbus_exception',id,  "Header ByteCount Mismatch");
-            return false;
-        }
-        else {
-            return this.ParseResponsePDU(id, resp.pdu);
-        }
-      }
-      catch(err){
-        throw err;
-      }
-
-    }
-
-	  /**
-    *Stablish connection to servers
-    */
-	  Start(id){
-      let self = this;
-      let successPromise;
-
-      if(id){
-        let slave = self.slaveList.get(id);
-        if(slave == undefined){
-          return Promise.reject(id);
-        }
-        else if(slave.isReady){
-          return Promise.resolve(id);
-        }
-        else{
-          return self.netClient.Connect(slave);
-        }
-      }
-      else{
-        let promiseList = [];
-        this.slaveList.forEach(function(slave, key){
-          let promise;          
-          promise = self.netClient.Connect(slave);
-          promiseList.push(promise);
-        })
-        successPromise = Promise.all(promiseList);        
-        
-        return successPromise;
-      }
-		  
-	  }
-    /**
-    *disconnect from server
-    */
-	  Stop(id){
-		  if(id){
-        let slave = this.slaveList.get(id);
-        if(slave.isReady){
-          return this.netClient.Disconnet(id);          
-        }
-        else{
-          return Promise.resolve(id);
-        }        
-      }
-      else{
-        let promiseList = [];
-        this.slaveList.forEach(function(slave, key){
-          let promise;
-          promise = this.netClient.Disconnet(id);
-          promiseList.push(promise);
-        })
-        successPromise = Promise.all(promiseList);
-        return successPromise;
-      }
-	  }
-}
-
-module.exports = ModbusTCPClient;

package/src/net/tcpclient.js

@@ -1,173 +0,0 @@
-/**
-* Tcp Client  module.
-* @module net/tcpclient.
-* @author Hector E. Socarras.
-* @version 0.8.0
-*/
-
-const net = require('net');
-
-/**
- * Class representing a tcp client.
-*/
-class TcpClient {
-  /**
-  * Create a tcp client.
-  */
-    constructor(){
-
-        /**
-        *net.socket Object
-        * @type {object}
-        */
-        this.sockets = new Map();
-
-        /**
-        * prevent than server close de connection for idle time
-        * @type {bool}
-        */
-        this.keepAliveConnection = false;
-
-        //Funcion a ejecutar cuandose reciven datos
-        this.onData = function(data){console.log(data)};
-
-        //Funcion a ejecutar cuando se establece la coneccion
-        this.onConnect = function(){console.log('connection establish whit: ' + this.socket.remoteAddress)};
-
-        this.onError = function(err){ console.log(err)};
-
-        this.onEnd = function(){console.log('connection closed')};
-
-        this.onTimeOut = function(){console.log('timeout')};
-
-        this.onClose =  function(had_error){
-            if(had_error){
-                console.log('closed by error conexion')
-            }
-            else{
-                console.log('closed');
-            }
-        }
-
-        /**
-        *  function to executed when event write is emited
-        * @param {Buffer} buff
-        */
-        this.onWrite = null
-
-    }
-
-    isConnected(id){
-      return this.sockets.has(id);
-    }
-
-    Connect(Slave){      
-        let self = this;
-        let promise = new Promise(function(resolve, reject){
-          try{
-            var conn = net.createConnection(Slave.port,Slave.ipAddress);
-  
-            //add Slave id to socket object
-            conn.slaveID = Slave.id;
-            Object.defineProperty(conn, 'slaveID', {
-              writable: false,
-              enumerable: false,
-              configurable: false
-          } )
-            //add Slave timeout to socket
-            conn.slaveTimeout = Slave.timeout;
-  
-            //configurando el socket devuelto
-            conn.once('connect',function(){              
-              resolve(conn.slaveID)
-            })
-
-            conn.on('connect',function(){
-                 self.sockets.set(Slave.id, conn);
-                 self.onConnect(conn.slaveID);
-            });
-           
-  
-            conn.on('data', function(data){
-                conn.setTimeout(0);
-                self.onData(conn.slaveID, data);
-            });
-  
-            conn.on('error', function(err){
-              self.onError(conn.slaveID, err)
-            })
-
-            conn.once('error', function(err){
-              if(self.sockets.has(conn.slaveID)){
-                return
-              }
-              else{
-                reject(conn.slaveID);
-              }              
-            })
-  
-            conn.on('timeout', function(){
-                conn.setTimeout(0);
-                self.onTimeOut(conn.slaveID);
-            })
-  
-            conn.on('end', function(){
-              conn.end();
-              self.onEnd(conn.slaveID);
-            });
-  
-            conn.on('close',function(had_error){
-              let key = conn.slaveID;
-                self.sockets.delete(key);
-                self.onClose(conn.slaveID, had_error);
-            });            
-            
-          }
-          catch(e){
-            self.onError(e);
-            reject(conn.slaveID);
-          }
-        })
-
-        return promise;
-    }
-
-    Disconnet(id){
-      let self = this;
-      if(this.sockets.has(id) == false){
-        return Promise.resolve(id);
-      }
-      else{
-        let promise = new Promise(function(resolve, reject){
-          let socket = self.sockets.get(id);
-          socket.destroy();
-          self.sockets.delete(id);
-          resolve(id)
-        })
-        return promise;
-      }        
-    }
-
-    Write(id, data){
-      let self = this;
-        if(this.sockets.has(id) == false){
-            return false;
-        }
-        else{
-          let isSuccesfull
-          let socket = this.sockets.get(id);
-            isSuccesfull = socket.write(data, 'utf8', function(){
-              if(self.onWrite){
-                self.onWrite(id, data);
-              }
-            });
-            if(isSuccesfull){
-              socket.setTimeout(socket.slaveTimeout);
-            }
-
-            return isSuccesfull;
-        }
-    }
-}
-
-module.exports = TcpClient