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.

Sign up for GitHub

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

Jump to bottom

Multi Response (Read/Write) Packets #93

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Multi Response (Read/Write) Packets #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3831b8c
Handle cases when data has multiple responses
Mudrekh Nov 19, 2021
c77d61c
Always remove listeners after commands
Mudrekh Nov 19, 2021
79db7bb
Missing semicolon
Mudrekh Nov 19, 2021
8f60311
Use proper buffer subarray syntax
Mudrekh Nov 22, 2021
4db71a6
merge read and write queues
Jun 16, 2022
368074b
Merge pull request #1 from PetroCloud/mergeQueues
Mudrekh Jun 16, 2022
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
36 changes: 14 additions & 22 deletions src/controller/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ class Controller extends ENIP {
};

this.workers = {
read: new Queue(compare, queue_max_size),
write: new Queue(compare, queue_max_size),
readWrite: new Queue(compare, queue_max_size),
group: new Queue(compare, queue_max_size)
};
}
Expand Down Expand Up @@ -336,7 +335,7 @@ class Controller extends ENIP {
* @memberof Controller
*/
readTag(tag, size = null) {
return this.workers.read.schedule(this._readTag.bind(this), [tag, size], {
return this.workers.readWrite.schedule(this._readTag.bind(this), [tag, size], {
priority: 1,
timestamp: new Date()
});
Expand All @@ -352,7 +351,7 @@ class Controller extends ENIP {
* @memberof Controller
*/
writeTag(tag, value = null, size = 0x01) {
return this.workers.write.schedule(this._writeTag.bind(this), [tag, value, size], {
return this.workers.readWrite.schedule(this._writeTag.bind(this), [tag, value, size], {
priority: 1,
timestamp: new Date()
});
Expand Down Expand Up @@ -476,7 +475,6 @@ class Controller extends ENIP {
async _readTag(tag, size = null) {
const MR = tag.generateReadMessageRequest(size);

this.write_cip(MR);

const readTagErr = new Error(`TIMEOUT occurred while writing Reading Tag: ${tag.name}.`);

Expand All @@ -487,12 +485,11 @@ class Controller extends ENIP {
if (err) reject(err);
resolve(data);
});
this.write_cip(MR);
}),
10000,
readTagErr
);

this.removeAllListeners("Read Tag");
).finally(() => this.removeAllListeners("Read Tag"));

tag.parseReadMessageResponse(data);
}
Expand All @@ -509,14 +506,11 @@ class Controller extends ENIP {
async _writeTag(tag, value = null, size = 0x01) {
const MR = tag.generateWriteMessageRequest(value, size);

this.write_cip(MR);

const writeTagErr = new Error(`TIMEOUT occurred while writing Writing Tag: ${tag.name}.`);

// Wait for Response
await promiseTimeout(
new Promise((resolve, reject) => {

// Full Tag Writing
this.on("Write Tag", (err, data) => {
if (err) reject(err);
Expand All @@ -532,13 +526,15 @@ class Controller extends ENIP {
tag.unstageWriteRequest();
resolve(data);
});
this.write_cip(MR);
}),
10000,
writeTagErr
);
).finally(() => {
this.removeAllListeners("Write Tag");
this.removeAllListeners("Read Modify Write Tag");
});

this.removeAllListeners("Write Tag");
this.removeAllListeners("Read Modify Write Tag");
}

/**
Expand All @@ -555,7 +551,6 @@ class Controller extends ENIP {

// Send Each Multi Service Message
for (let msg of messages) {
this.write_cip(msg.data);

// Wait for Controller to Respond
const data = await promiseTimeout(
Expand All @@ -565,12 +560,11 @@ class Controller extends ENIP {

resolve(data);
});
this.write_cip(msg.data);
}),
10000,
readTagGroupErr
);

this.removeAllListeners("Multiple Service Packet");
).finally(() => this.removeAllListeners("Multiple Service Packet"));

// Parse Messages
group.parseReadMessageResponses(data, msg.tag_ids);
Expand All @@ -591,7 +585,6 @@ class Controller extends ENIP {

// Send Each Multi Service Message
for (let msg of messages) {
this.write_cip(msg.data);

// Wait for Controller to Respond
const data = await promiseTimeout(
Expand All @@ -601,12 +594,11 @@ class Controller extends ENIP {

resolve(data);
});
this.write_cip(msg.data);
}),
10000,
writeTagGroupErr
);

this.removeAllListeners("Multiple Service Packet");
).finally(() => this.removeAllListeners("Multiple Service Packet"));

group.parseWriteMessageRequests(data, msg.tag_ids);
}
Expand Down
5 changes: 5 additions & 0 deletions src/enip/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,11 @@ class ENIP extends Socket {
const encapsulatedData = header.parse(data);
const { statusCode, status, commandCode } = encapsulatedData;

// Handle buffers with multiple responses
if(data.length > 24 + encapsulatedData.length) {
setImmediate(() => this._handleDataEvent(data.subarray(24 + encapsulatedData.length)));
}

if (statusCode !== 0) {
console.log(`Error <${statusCode}>:`.red, status.red);

Expand Down