Skip to content

Add subscription error codes to mid groups #42

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

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

Add subscription error codes to mid groups #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f134e6
add subscription error codes to mid groups
May 27, 2022
24d4fd7
fix: error handling when un/subscribe not supported
Oct 18, 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: 35 additions & 1 deletion src/midGroups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,43 @@
"data": 15,
"subscribe": 14,
"unsubscribe": 17,
"errSubExist": 13,
"errNoSub": 14,
"ack": 16,
"generic": true
},
"lockAtBatchDoneUpload": {
"data": 22,
"subscribe": 21,
"unsubscribe": 24,
"errSubExist": 88,
"errNoSub": 89,
"ack": 23,
"generic": true
},
"jobInfo": {
"data": 35,
"subscribe": 34,
"unsubscribe": 37,
"errSubExist": 18,
"errNoSub": 19,
"ack": 36,
"generic": true
},
"vin": {
"data": 52,
"subscribe": 51,
"unsubscribe": 54,
"errSubExist": 6,
"errNoSub": 7,
"ack": 53,
"generic": true
},
"lastTightening": {
"data": 61,
"subscribe": 60,
"errSubExist": 9,
"errNoSub": 10,
"unsubscribe": 63,
"ack": 62,
"generic": true
Expand All @@ -38,6 +48,8 @@
"data": 71,
"subscribe": 70,
"unsubscribe": 73,
"errSubExist": 11,
"errNoSub": 12,
"ack": 72,
"generic": true
},
Expand All @@ -55,13 +67,17 @@
"data": 91,
"subscribe": 90,
"unsubscribe": 93,
"errSubExist": 31,
"errNoSub": 32,
"ack": 92,
"generic": true
},
"multiSpindleResult": {
"data": 101,
"subscribe": 100,
"unsubscribe": 103,
"errSubExist": 33,
"errNoSub": 34,
"ack": 102,
"generic": true
},
Expand All @@ -76,34 +92,44 @@
"data": 121,
"subscribe": 120,
"unsubscribe": 126,
"errSubExist": 40,
"errNoSub": 41,
"ack": 125,
"generic": true
},
"multipleIdentifierResultParts": {
"data": 152,
"subscribe": 151,
"unsubscribe": 154,
"errSubExist": 43,
"errNoSub": 44,
"ack": 153,
"generic": true
},
"statusExternallyMonitoredInputs": {
"data": 211,
"subscribe": 210,
"unsubscribe": 213,
"errSubExist": 50,
"errNoSub": 51,
"ack": 212,
"generic": true
},
"relayFunction": {
"data": 217,
"subscribe": 216,
"unsubscribe": 219,
"errSubExist": 84,
"errNoSub": 85,
"ack": 218,
"generic": true
},
"digitalInputFunction": {
"data": 221,
"subscribe": 220,
"unsubscribe": 223,
"errSubExist": 88,
"errNoSub": 89,
"ack": 222,
"generic": true
},
Expand All @@ -118,27 +144,35 @@
"data": 251,
"subscribe": 250,
"unsubscribe": 253,
"errSubExist": 86,
"errNoSub": 87,
"ack": 252,
"generic": true
},
"toolTagID": {
"data": 262,
"subscribe": 261,
"unsubscribe": 264,
"errSubExist": 55,
"errNoSub": 56,
"ack": 263,
"generic": true
},
"automaticManualMode": {
"data": 401,
"subscribe": 400,
"unsubscribe": 403,
"errSubExist": 82,
"errNoSub": 83,
"ack": 402,
"generic": true
},
"openProtocolCommandsDisabled": {
"data": 421,
"subscribe": 420,
"unsubscribe": 423,
"errSubExist": 93,
"errNoSub": 94,
"ack": 422,
"generic": true
},
Expand All @@ -149,4 +183,4 @@
"ack": 502,
"generic": true
}
}
}
14 changes: 14 additions & 0 deletions src/sessionControlClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,13 @@ class SessionControlClient extends EventEmitter {
return;
}

if (midGroupList[midGroup].subscribe === undefined) {
let err = new Error(`[Session Control Client] [Subscribe] subscribing to midGroup [${midGroup}] is not supported`);
debug("SessionControlClient _subscribe err_unsupported_midGroup");
cb(err);
return;
}

let mid = opts || {};

let type = SUBSCRIBE;
Expand Down Expand Up @@ -748,6 +755,13 @@ class SessionControlClient extends EventEmitter {
return;
}

if (midGroupList[midGroup].unsubscribe === undefined) {
let err = new Error(`[Session Control Client] [Unsubscribe] unsubscribing from midGroup [${midGroup}] is not supported`);
debug("SessionControlClient _unsubscribe err_unsupported_midGroup");
cb(err);
return;
}

if (cb === undefined) {
if (typeof opts === "function") {
cb = opts;
Expand Down