node-red-contrib-mobius-flow-base 2.5.86-beta.90 → 2.5.86-beta.91
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -232,17 +232,18 @@ module.exports = function (RED) {
|
|
|
232
232
|
* @param {Object} mobiusNode - The node whos status is to be updated
|
|
233
233
|
*/
|
|
234
234
|
node.updateNodeStatus = function (mobiusNode) {
|
|
235
|
-
console.log('Update');
|
|
236
|
-
console.log(node.users[mobiusNode.id].statusType);
|
|
237
235
|
node.users[mobiusNode.id] = mobiusNode;
|
|
238
|
-
let statusText = '
|
|
236
|
+
let statusText = 'Connected';
|
|
239
237
|
let statusColour = 'green';
|
|
240
238
|
if (node.users[mobiusNode.id].statusType === 'timeSinceLastActive') {
|
|
241
239
|
let result = node.getLastActiveTimeStatus(node.users[mobiusNode.id].lastActiveTime);
|
|
242
240
|
statusText = result.text;
|
|
243
241
|
statusColour = result.colour;
|
|
244
242
|
} else {
|
|
245
|
-
|
|
243
|
+
const uri = node.users[mobiusNode.id].latestUri;
|
|
244
|
+
if (uri !== '') {
|
|
245
|
+
statusText = node.users[mobiusNode.id].latestUri;
|
|
246
|
+
}
|
|
246
247
|
}
|
|
247
248
|
node.users[mobiusNode.id].status({
|
|
248
249
|
fill: statusColour,
|
|
@@ -251,6 +252,16 @@ module.exports = function (RED) {
|
|
|
251
252
|
});
|
|
252
253
|
};
|
|
253
254
|
|
|
255
|
+
/**
|
|
256
|
+
* Update a given node's node latest URI record
|
|
257
|
+
* @param {Object} mobiusNode - The node whos last URI record is to be updated
|
|
258
|
+
*/
|
|
259
|
+
node.updateLatestUri = function (mobiusNode) {
|
|
260
|
+
node.users[mobiusNode.id] = mobiusNode;
|
|
261
|
+
node.users[mobiusNode.id].latestUri = Date.now();
|
|
262
|
+
node.updateNodeStatus(mobiusNode);
|
|
263
|
+
};
|
|
264
|
+
|
|
254
265
|
/**
|
|
255
266
|
* Update a given node's node last active time
|
|
256
267
|
* @param {Object} mobiusNode - The node whos last active time is to be updated
|
|
@@ -48,12 +48,9 @@ module.exports = function (RED) {
|
|
|
48
48
|
shape: 'ring',
|
|
49
49
|
text: 'Disconnected',
|
|
50
50
|
});
|
|
51
|
-
|
|
52
|
-
console.log(node);
|
|
53
51
|
node.serviceConn.subscribeToObjectCOV(node.object, this.id, (response) => {
|
|
54
|
-
|
|
55
|
-
node.
|
|
56
|
-
node.serviceConn.updateNodeStatus(node);
|
|
52
|
+
node.serviceConn.updateLatestUri(node);
|
|
53
|
+
node.serviceConn.updateLastActiveTime(node);
|
|
57
54
|
let allResources = _.keyBy(
|
|
58
55
|
response.value.resources,
|
|
59
56
|
node.format === 'name' ? 'name' : 'rid'
|
|
@@ -69,10 +66,8 @@ module.exports = function (RED) {
|
|
|
69
66
|
{ topic: response.uri, payload: response.value },
|
|
70
67
|
{ topic: response.uri, payload: { response: response } },
|
|
71
68
|
]);
|
|
72
|
-
node.serviceConn.updateLastActiveTime(node);
|
|
73
69
|
} else {
|
|
74
70
|
node.send({ topic: response.uri, payload: allResources });
|
|
75
|
-
node.serviceConn.updateLastActiveTime(node);
|
|
76
71
|
}
|
|
77
72
|
});
|
|
78
73
|
|