nodbus-plus 0.8.2 → 1.0.0

package/src/nodbus-plus.js

@@ -1,110 +1,157 @@
-/**
- * Nodbus module.
- * @module nodbus
- * @author Hector E. Socarras Cabrera
- * @version 0.7.2
-*/
-
-
-const ModbusTcpServer = require('./server/m_tcp_server');
-const ModbusTcpClient = require('./client/m_tcp_client');
-const ModbusSTcpServer = require('./server/m_stcp_server');
-const ModbusSTcpClient = require('./client/m_stcp_client');
-const ModbusMaster = require('./protocol/modbus_master');
-const ModbusSlave = require('./protocol/modbus_slave');
-
-
-/**
- * ModbusTcpServer.
- * @module nodbus/ModbusTcpServer
- */
-/** Constructor for ModbusTcpServer Class. */
-module.exports.ModbusTcpServer = ModbusTcpServer;
-
-/**
- * ModbusSTcpServer.
- * @module nodbus/ModbusSTcpServer
- */
-/** Constructor for ModbusSTcpServer Class. */
-module.exports.ModbusSTcpServer = ModbusSTcpServer;
-
-/**
- * ModbusSlave.
- * @module nodbus/ModbusSlave
- */
-/** Constructor for ModbusSTcpServer Class. */
-module.exports.ModbusSlave = ModbusSlave;
-
-/**
- * ModbusTcpClient.
- * @module nodbus/ModbusTcpClient
- */
-/** Constructor for ModbusTcpClient Class. */
-module.exports.ModbusTcpClient = ModbusTcpClient;
-
-/**
- * ModbusSTcpClient.
- * @module nodbus/ModbusSTcpClient
- */
-/** Constructor for ModbusTcpClient Class. */
-module.exports.ModbusSTcpClient = ModbusSTcpClient;
-
-/**
- * ModbusMaster.
- * @module nodbus/ModbusMaster
- */
-/** Constructor for ModbusSTcpServer Class. */
-module.exports.ModbusMaster = ModbusMaster;
-
-/**
-* Create a Slave instance
-* @param {number|string} port tcp port or string indicating serial port.
-* @param {startAddres} modbusAddress modbus addres 1 to 247 for serial slave or tcp for ethernet.
-* @param {pointsQuantity} pointsQuantity
-* @param {number|Buffer} values values to write
-* @return {Object} PDU object
-*/
-module.exports.CreateSlave = function (port = 502, modbusAddress = 'tcp', mode = 'aut'){
-
-  if(typeof port == 'number'){
-    //tcp network
-    if(typeof modbusAddress == 'number'){
-      //serial protocol
-      return new ModbusSTcpServer(port, modbusAddress, mode)
-    }
-    else{
-      //tcp protocol
-      return new ModbusTcpServer(port);
-    }
-
-  }
-  else{
-    throw 'serial port no suported yet'
-  }
-
-}
-
-module.exports.CreateMaster = function (port = 'eth', mode = 'tcp'){
-
-  if(port == 'eth'){
-    //tcp network
-    switch (mode) {
-      case 'tcp':
-        return new ModbusTcpClient();
-        break;
-      case 'rtu':
-        return new ModbusSTcpClient('rtu');
-        break;
-      case 'ascii':
-        return new ModbusSTcpClient('ascii');
-        break
-      default:
-
-    }
-
-  }
-  else{
-    throw 'serial port no suported yet'
-  }
-
-}
+/**
+ * Nodbus module.
+ * @module nodbus
+ * @author Hector E. Socarras Cabrera
+ * @version 0.14.0
+*/
+
+//Modbus Protocol Stack**************************************************************************************************
+const ModbusTcpServer = require('./protocol/modbus_server_tcp.js');
+const ModbusTcpClient = require('./protocol/modbus_master_tcp.js');
+const ModbusSerialServer = require('./protocol/modbus_server_serial.js');
+const ModbusSerialClient = require('./protocol/modbus_master_serial.js');
+const ModbusClient = require('./protocol/modbus_master.js');
+const ModbusServer  = require( "./protocol/modbus_server.js");
+
+module.exports.ModbusSerialServer = ModbusSerialServer;
+module.exports.ModbusSerialClient = ModbusSerialClient;
+module.exports.ModbusTcpClient = ModbusTcpClient;
+module.exports.ModbusTcpServer = ModbusTcpServer;
+module.exports.ModbusClient = ModbusClient;
+module.exports.ModbusServer = ModbusServer;
+//***********************************************************************************************************************
+
+//Nodbus Server full implementation*********************************************************************************************
+const NodbusTcpServer = require('./server/nodbus_tcp_server.js');
+const NodbusSerialServer = require('./server/nodbus_serial_server.js');
+const NetTcpServer = require('./server/net/tcpserver.js');
+const NetUdpServer = require('./server/net/udpserver.js');
+const NetSerialServer = require('./server/net/serialserver.js');
+module.exports.NodbusTcpServer = NodbusTcpServer;
+module.exports.NodbusSerialServer = NodbusSerialServer;
+
+/**
+* Create a tcp server instance
+* @param {string} net:  Type of network to use, Can be 'tcp', 'udp4', 'udp6'. Default 'tcp'.
+* @param {Object} serverCfg: Serial transmition mode for serial slave. 'rtu', 'ascii', 'auto' default.
+* @return {Object} Slave object
+*/
+module.exports.createTcpServer = function (net = 'tcp', serverCfg){
+
+  let netType
+  switch(net){
+      case 'tcp':
+          netType = NetTcpServer;
+          break
+      case 'udp4':
+          netType = NetUdpServer;
+          serverCfg.udpType = 'udp4';
+          break
+      case 'udp6':
+          netType = NetUdpServer;
+          serverCfg.udpType = 'udp6';
+          break
+      default:
+          netType = NetTcpServer;
+  }
+  let server = new NodbusTcpServer(netType, serverCfg);
+
+  return server;
+
+}
+
+/**
+* Create a tcp server instance
+* @param {string} net:  Type of network to use, Can be 'tcp', 'udp4', 'udp6'. Default 'tcp'.
+* @param {Object} serverCfg: Serial transmition mode for serial slave. 'rtu', 'ascii', 'auto' default.
+* @return {Object} Slave object
+*/
+module.exports.createSerialServer = function (net = 'serial', serverCfg){
+
+    let netType
+    switch(net){
+        case 'tcp':
+            netType = NetTcpServer;
+            break
+        case 'udp4':
+            netType = NetUdpServer;
+            serverCfg.udpType = 'udp4';
+            break
+        case 'udp6':
+            netType = NetUdpServer;
+            serverCfg.udpType = 'udp6';
+            break
+        case 'serial':            
+            netType = NetSerialServer;
+            break
+        default:
+            netType = NetSerialServer;
+    }
+    let server = new NodbusSerialServer(netType, serverCfg);
+  
+    return server;
+  
+  }
+
+//Nodbus Plus clients full implementation***************************************************************************************
+
+const NodbusTcpClient = require('./client/nodbus_tcp_client.js');
+const NodbusSerialClient = require('./client/nodbus_serial_client.js')
+const NetTcpChannel = require('./client/net/tcpchannel.js');
+const NetUdpChannel = require('./client/net/udpchannel.js');
+const NetSerialChannel = require('./client/net/serialchannel.js');
+
+module.exports.createTcpClient = function (channel = 'tcp'){
+
+    let channelType
+    switch(channel){
+        case 'tcp':
+            channelType = NetTcpChannel;
+            break
+        case 'udp':
+            channelType = NetUdpChannel;
+            break
+        case 'udp4':
+            channelType = NetUdpChannel;            
+            break
+        case 'udp6':
+            channelType = NetUdpChannel;           
+            break
+        default:
+            channelType = NetTcpServer;
+    }
+    let client = new NodbusTcpClient(channelType);
+
+    return client;
+
+}
+
+module.exports.createSerialClient = function(channel = 'tcp'){
+
+    let channelType
+    switch(channel){
+        case 'tcp':
+            channelType = NetTcpChannel;
+            break
+        case 'udp':
+            channelType = NetUdpChannel;
+            break
+        case 'udp4':
+            channelType = NetUdpChannel;
+            break
+        case 'udp6':
+            channelType = NetUdpChannel;
+            break
+        case 'serial':            
+            channelType = NetSerialChannel;
+            break
+        default:
+            netType = NetSerialChannel;
+    }
+    let client = new NodbusSerialClient(channelType);
+
+  
+    return client;
+
+}
+