Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add RTU slave address filtering. #308

Open
wants to merge 1 commit into
base: v4.0-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/modbus-rtu-server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ export default class ModbusRTUServer extends ModbusServer {

const fromBuffer = ModbusRTURequest.fromBuffer
const fromRequest = ModbusRTUResponse.fromRequest as any
const client = new ModbusServerClient(this, socket, fromBuffer, fromRequest)
const slaveId = options && typeof options.slaveId !== 'undefined' ? options.slaveId : -1
const client = new ModbusServerClient(this, socket, fromBuffer, fromRequest, slaveId)
this.emit('connection', client)
}
}
5 changes: 3 additions & 2 deletions src/modbus-server-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@ export default class ModbusServerClient<
server: ModbusServer,
socket: S,
fromBufferMethod: ReqFromBufferMethod,
fromRequestMethod: ResFromRequestMethod
fromRequestMethod: ResFromRequestMethod,
slaveId: number = -1
) {
this._server = server
this._socket = socket

this._requestHandler = new ModbusServerRequestHandler(fromBufferMethod)
this._requestHandler = new ModbusServerRequestHandler(fromBufferMethod, slaveId)
this._responseHandler = new ModbusServerResponseHandler(this._server, fromRequestMethod)

this._socket.on('data', this._onData.bind(this))
Expand Down
6 changes: 5 additions & 1 deletion src/modbus-server-request-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ export default class ModbusServerRequestHandler<FB extends ModbusAbstractRequest
public _fromBuffer: FB
public _requests: ModbusAbstractRequest[]
public _buffer: Buffer
public _slaveId: number

constructor (fromBufferMethod: FB) {
constructor (fromBufferMethod: FB, slaveId: number = -1) {
this._fromBuffer = fromBufferMethod
this._requests = []
this._buffer = Buffer.alloc(0)
this._slaveId = slaveId
}

public shift () {
Expand All @@ -33,6 +35,8 @@ export default class ModbusServerRequestHandler<FB extends ModbusAbstractRequest
if (request instanceof ModbusRTURequest && request.corrupted) {
const corruptDataDump = this._buffer.slice(0, request.byteCount).toString('hex')
debug(`request message was corrupt: ${corruptDataDump}`)
} else if (request instanceof ModbusRTURequest && this._slaveId !== -1 && request.slaveId !== this._slaveId) {
debug('request message not for this address')
} else {
this._requests.unshift(request)
}
Expand Down
4 changes: 3 additions & 1 deletion src/modbus-server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ export interface IModbusServerOptions {
discrete: Buffer
holding: Buffer
input: Buffer
slaveId: number
}

const DEFAULT_MODBUS_SERVER_OPTIONS: IModbusServerOptions = {
coils: Buffer.alloc(1024),
discrete: Buffer.alloc(1024),
holding: Buffer.alloc(1024),
input: Buffer.alloc(1024)
input: Buffer.alloc(1024),
slaveId: -1
}

export type BufferCB = (buffer: Buffer) => void
Expand Down