node-red-contrib-mobius-flow-base 3.0.0-rc.6 → 3.0.0-rc.8

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.
Files changed (14) hide show
  1. package/dist/engine-api-client.js +3 -1
  2. package/dist/nodes/common/mobsearch.js +8 -5
  3. package/dist/nodes/mobius-clear-resource.js +7 -7
  4. package/dist/nodes/mobius-discover-object-list.js +4 -0
  5. package/dist/nodes/mobius-discover.js +2 -2
  6. package/dist/nodes/mobius-filter-by-rid-value.js +4 -4
  7. package/dist/nodes/mobius-get-multi-object.js +1 -1
  8. package/dist/nodes/mobius-get-multi-resource.js +2 -2
  9. package/dist/nodes/mobius-get-object.js +5 -5
  10. package/dist/nodes/mobius-get-resource.js +7 -7
  11. package/dist/nodes/mobius-send-dcmd.js +2 -2
  12. package/dist/nodes/mobius-set-multi-resource.js +4 -4
  13. package/dist/nodes/mobius-set-resource.js +14 -14
  14. package/package.json +1 -1
package/dist/engine-api-client.js CHANGED
@@ -60,6 +60,7 @@ class EngineApiClient extends engine_api_calls_1.EngineApiCalls {
60
60
  this.client.interceptors.response.use((res) => {
61
61
  return res;
62
62
  }, async (error) => {
63
+ console.log(error);
63
64
  if (!error.response) {
64
65
  // notify
65
66
  }
@@ -70,7 +71,8 @@ class EngineApiClient extends engine_api_calls_1.EngineApiCalls {
70
71
  this.tokens = null;
71
72
  this.login();
72
73
  }
73
- return Promise.reject(error);
74
+ // Promise.reject(error);
75
+ throw error;
74
76
  });
75
77
  this.EngineWebSocket = new engine_websocket_1.EngineWebSocket(this.hostname, this.protocol);
76
78
  }
package/dist/nodes/common/mobsearch.js CHANGED
@@ -389,20 +389,23 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
389
389
  uri = uri.substring(0, uri.indexOf('#') + 1);
390
390
  }
391
391
  if (listed) {
392
- // opts.list[selectionIndex].uri = uri;
393
- tempList = JSON.parse(JSON.stringify(opts.list));
394
- tempList[selectionIndex].uri = uri;
392
+ tempList = JSON.parse(JSON.stringify(opts.list)); // Pre List
393
+ if (tempList.length === selectionIndex) {
394
+ tempList.push({uri, type: 'unknown'})
395
+ } else {
396
+ tempList[selectionIndex].uri = uri;
397
+ }
395
398
  updateList();
396
- opts.list = JSON.parse(JSON.stringify(tempList));
399
+ opts.list = JSON.parse(JSON.stringify(tempList)); // Set log
397
400
  } else {
398
401
  $(`#${opts.uriFieldName}`).val(uri);
399
402
  document.getElementById(opts.uriFieldName).dispatchEvent(new Event('change'));
403
+ $(`#${opts.searchButtonId}`).removeClass('disabled');
400
404
  }
401
405
  $('#node-search-accept').css('color', '#CCCCCC');
402
406
  readyToAccept = false;
403
407
  $('#node-search-return').addClass('disabled');
404
408
  $('#node-search-accept').addClass('disabled');
405
- $(`#${opts.searchButtonId}`).removeClass('disabled');
406
409
  $('#instance-search-row').hide();
407
410
  $('#instance-row').show();
408
411
  }
package/dist/nodes/mobius-clear-resource.js CHANGED
@@ -72,7 +72,7 @@ module.exports = function (RED) {
72
72
  null,
73
73
  null,
74
74
  null,
75
- { topic: uri, payload: { error: true, response: err } },
75
+ { ...msg, topic: uri, payload: { error: true, response: err } },
76
76
  ]);
77
77
  }
78
78
  } else {
@@ -83,15 +83,15 @@ module.exports = function (RED) {
83
83
  });
84
84
  if (node.detailedOutput === true) {
85
85
  node.send([
86
- { topic: uri, payload: response.data.pv },
87
- { topic: uri, payload: { pv: response.data.pv, name: response.data.name } },
88
- { topic: uri, payload: response.data },
89
- { topic: uri, payload: { error: false, response: response } },
86
+ { ...msg, topic: uri, payload: response.data.pv },
87
+ { ...msg, topic: uri, payload: { pv: response.data.pv, name: response.data.name } },
88
+ { ...msg, topic: uri, payload: response.data },
89
+ { ...msg, topic: uri, payload: { error: false, response: response } },
90
90
  ]);
91
91
  } else {
92
92
  node.send([
93
- { topic: uri, payload: response.data.pv },
94
- { topic: uri, payload: { pv: response.data.pv, name: response.data.name } },
93
+ { ...msg, topic: uri, payload: response.data.pv },
94
+ { ...msg, topic: uri, payload: { pv: response.data.pv, name: response.data.name } },
95
95
  ]);
96
96
  }
97
97
  }
package/dist/nodes/mobius-discover-object-list.js CHANGED
@@ -64,11 +64,13 @@ module.exports = function (RED) {
64
64
  objectList.forEach((mobiusObject) => {
65
65
  if (node.outputType === 'uris') {
66
66
  node.send({
67
+ ...msg,
67
68
  topic: mobiusObject.uri,
68
69
  payload: mobiusObject.uri,
69
70
  });
70
71
  } else {
71
72
  node.send({
73
+ ...msg,
72
74
  topic: mobiusObject.uri,
73
75
  payload: mobiusObject,
74
76
  });
@@ -81,11 +83,13 @@ module.exports = function (RED) {
81
83
  uris.push(mobiusObject.uri);
82
84
  });
83
85
  node.send({
86
+ ...msg,
84
87
  topic: msg.topic,
85
88
  payload: uris,
86
89
  });
87
90
  } else {
88
91
  node.send({
92
+ ...msg,
89
93
  topic: msg.topic,
90
94
  payload: objectList,
91
95
  });
package/dist/nodes/mobius-discover.js CHANGED
@@ -73,14 +73,14 @@ module.exports = function (RED) {
73
73
  shape: 'dot',
74
74
  text: 'Error: ' + JSON.stringify(err.code),
75
75
  });
76
- node.send({ topic: path, payload: { error: true, response: err } });
76
+ node.send({ ...msg, topic: path, payload: { error: true, response: err } });
77
77
  } else {
78
78
  node.status({
79
79
  fill: 'green',
80
80
  shape: 'dot',
81
81
  text: JSON.stringify(response.uri),
82
82
  });
83
- node.send({ topic: path, payload: { error: false, response: response } });
83
+ node.send({ ...msg, topic: path, payload: { error: false, response: response } });
84
84
  }
85
85
  });
86
86
  }
package/dist/nodes/mobius-filter-by-rid-value.js CHANGED
@@ -91,7 +91,7 @@ module.exports = function (RED) {
91
91
  text: 'Error: ' + JSON.stringify(err.code),
92
92
  });
93
93
  if (node.detailedOutput === true) {
94
- node.send([null, { topic: uri, payload: { error: true, response: err } }]);
94
+ node.send([null, { ...msg, topic: uri, payload: { error: true, response: err } }]);
95
95
  }
96
96
  } else {
97
97
  node.status({
@@ -105,11 +105,11 @@ module.exports = function (RED) {
105
105
  }
106
106
  if (node.detailedOutput === true) {
107
107
  node.send([
108
- { topic: uri, payload: uriList },
109
- { topic: uri, payload: { error: false, response: response } },
108
+ { ...msg, topic: uri, payload: uriList },
109
+ { ...msg, topic: uri, payload: { error: false, response: response } },
110
110
  ]);
111
111
  } else {
112
- node.send({ topic: uri, payload: uriList });
112
+ node.send({ ...msg, topic: uri, payload: uriList });
113
113
  }
114
114
  }
115
115
  }
package/dist/nodes/mobius-get-multi-object.js CHANGED
@@ -73,7 +73,7 @@ module.exports = function (RED) {
73
73
  shape: 'dot',
74
74
  text: 'Done'
75
75
  });
76
- node.send({topic: msg.topic, payload: values});
76
+ node.send({ ...msg, topic: msg.topic, payload: values});
77
77
  })
78
78
  .catch((err) => {
79
79
  node.status({
package/dist/nodes/mobius-get-multi-resource.js CHANGED
@@ -75,13 +75,13 @@ module.exports = function (RED) {
75
75
  text: 'Done',
76
76
  });
77
77
  if (node.sendFormat === 'array') {
78
- node.send({ topic: msg.topic, payload: values });
78
+ node.send({ ...msg, topic: msg.topic, payload: values });
79
79
  } else {
80
80
  let payload = values.reduce((obj, item) => {
81
81
  obj[item.uri] = { pv: item.pv, name: item.name };
82
82
  return obj;
83
83
  }, {});
84
- node.send({ topic: msg.topic, payload: payload });
84
+ node.send({ ...msg, topic: msg.topic, payload: payload });
85
85
  }
86
86
  })
87
87
  .catch((err) => {
package/dist/nodes/mobius-get-object.js CHANGED
@@ -65,7 +65,7 @@ module.exports = function (RED) {
65
65
  });
66
66
  node.error('Mobius error reading object ' + JSON.stringify(err));
67
67
  if (node.detailedOutput === true) {
68
- node.send([null, null, { topic: uri, payload: { error: true, response: err } }]);
68
+ node.send([null, null, { ...msg, topic: uri, payload: { error: true, response: err } }]);
69
69
  }
70
70
  } else {
71
71
  node.status({
@@ -80,12 +80,12 @@ module.exports = function (RED) {
80
80
  );
81
81
  if (node.detailedOutput === true) {
82
82
  node.send([
83
- { topic: uri, payload: allResources },
84
- { topic: uri, payload: response.data },
85
- { topic: uri, payload: { error: false, response: response } },
83
+ { ...msg, topic: uri, payload: allResources },
84
+ { ...msg, topic: uri, payload: response.data },
85
+ { ...msg, topic: uri, payload: { error: false, response: response } },
86
86
  ]);
87
87
  } else {
88
- node.send({ topic: uri, payload: allResources });
88
+ node.send({ ...msg, topic: uri, payload: allResources });
89
89
  }
90
90
  }
91
91
  });
package/dist/nodes/mobius-get-resource.js CHANGED
@@ -66,7 +66,7 @@ module.exports = function (RED) {
66
66
  null,
67
67
  null,
68
68
  null,
69
- { topic: uri, payload: { error: true, response: err } },
69
+ { ...msg, topic: uri, payload: { error: true, response: err } },
70
70
  ]);
71
71
  }
72
72
  } else {
@@ -77,15 +77,15 @@ module.exports = function (RED) {
77
77
  });
78
78
  if (node.detailedOutput === true) {
79
79
  node.send([
80
- { topic: uri, payload: response.data.pv },
81
- { topic: uri, payload: { pv: response.data.pv, name: response.data.name } },
82
- { topic: uri, payload: response.data },
83
- { topic: uri, payload: { error: false, response: response } },
80
+ { ...msg, topic: uri, payload: response.data.pv },
81
+ { ...msg, topic: uri, payload: { pv: response.data.pv, name: response.data.name } },
82
+ { ...msg, topic: uri, payload: response.data },
83
+ { ...msg, topic: uri, payload: { error: false, response: response } },
84
84
  ]);
85
85
  } else {
86
86
  node.send([
87
- { topic: uri, payload: response.data.pv },
88
- { topic: uri, payload: { pv: response.data.pv, name: response.data.name } },
87
+ { ...msg, topic: uri, payload: response.data.pv },
88
+ { ...msg, topic: uri, payload: { pv: response.data.pv, name: response.data.name } },
89
89
  ]);
90
90
  }
91
91
  }
package/dist/nodes/mobius-send-dcmd.js CHANGED
@@ -53,14 +53,14 @@ module.exports = function (RED) {
53
53
  text: 'Error: ' + JSON.stringify(err.code)
54
54
  });
55
55
  node.error('Mobius error sending DCMD command ' + JSON.stringify(err));
56
- node.send([null, {topic: node.uri, payload: { error: true, response: err }}]);
56
+ node.send([null, { ...msg, topic: node.uri, payload: { error: true, response: err }}]);
57
57
  } else {
58
58
  node.status({
59
59
  fill: 'green',
60
60
  shape: 'dot',
61
61
  text: 'OK'
62
62
  });
63
- node.send([{topic: node.uri, payload: response.value}, {topic: node.uri, payload: {error: false, response: response}}]);
63
+ node.send([{ ...msg, topic: node.uri, payload: response.data}, { ...msg, topic: node.uri, payload: {error: false, response: response}}]);
64
64
  }
65
65
  });
66
66
  }
package/dist/nodes/mobius-set-multi-resource.js CHANGED
@@ -67,7 +67,7 @@ module.exports = function (RED) {
67
67
  });
68
68
  node.error('Mobius error writing multiple resources ' + JSON.stringify(err));
69
69
  if (node.detailedOutput === true) {
70
- node.send([null, { topic: uri, payload: { error: true, response: err } }]);
70
+ node.send([null, { ...msg, topic: uri, payload: { error: true, response: err } }]);
71
71
  }
72
72
  } else {
73
73
  node.status({
@@ -77,11 +77,11 @@ module.exports = function (RED) {
77
77
  });
78
78
  if (node.detailedOutput === true) {
79
79
  node.send([
80
- { topic: uri, payload: response.data },
81
- { topic: uri, payload: { error: false, response: response } },
80
+ { ...msg, topic: uri, payload: response.data },
81
+ { ...msg, topic: uri, payload: { error: false, response: response } },
82
82
  ]);
83
83
  } else {
84
- node.send([{ topic: uri, payload: response.data }]);
84
+ node.send([{ ...msg, topic: uri, payload: response.data }]);
85
85
  }
86
86
  }
87
87
  });
package/dist/nodes/mobius-set-resource.js CHANGED
@@ -73,7 +73,7 @@ module.exports = function (RED) {
73
73
  });
74
74
  node.error('Mobius error clearing resource priority ' + JSON.stringify(err));
75
75
  if (node.detailedOutput === true) {
76
- node.send([null, null, null, {topic: uri, payload: { error: true, response: err }}]);
76
+ node.send([null, null, null, { ...msg, topic: uri, payload: { error: true, response: err }}]);
77
77
  }
78
78
  } else {
79
79
  node.status({
@@ -83,15 +83,15 @@ module.exports = function (RED) {
83
83
  });
84
84
  if (node.detailedOutput === true) {
85
85
  node.send([
86
- { topic: uri, payload: response.data.pv },
87
- { topic: uri, payload: { pv: response.data.pv, name: response.data.name } },
88
- { topic: uri, payload: response.data },
89
- { topic: uri, payload: { error: false, response: response } }
86
+ { ...msg, topic: uri, payload: response.data.pv },
87
+ { ...msg, topic: uri, payload: { pv: response.data.pv, name: response.data.name } },
88
+ { ...msg, topic: uri, payload: response.data },
89
+ { ...msg, topic: uri, payload: { error: false, response: response } }
90
90
  ]);
91
91
  } else {
92
92
  node.send([
93
- { topic: uri, payload: response.data.pv },
94
- { topic: uri, payload: { pv: response.data.pv, name: response.data.name } }
93
+ { ...msg, topic: uri, payload: response.data.pv },
94
+ { ...msg, topic: uri, payload: { pv: response.data.pv, name: response.data.name } }
95
95
  ]);
96
96
  }
97
97
  }
@@ -105,7 +105,7 @@ module.exports = function (RED) {
105
105
  text: 'Error: ' + JSON.stringify(err.code)
106
106
  });
107
107
  node.error('Mobius error writing resource ' + JSON.stringify(err));
108
- node.send([null, null, null, {topic: uri, payload: { error: true, response: err }}]);
108
+ node.send([null, null, null, { ...msg, topic: uri, payload: { error: true, response: err }}]);
109
109
  } else {
110
110
  node.status({
111
111
  fill: 'green',
@@ -114,15 +114,15 @@ module.exports = function (RED) {
114
114
  });
115
115
  if (node.detailedOutput === true) {
116
116
  node.send([
117
- { topic: uri, payload: response.data.pv },
118
- { topic: uri, payload: { pv: response.data.pv, name: response.data.name } },
119
- { topic: uri, payload: response.data },
120
- { topic: uri, payload: { error: false, response: response } }
117
+ { ...msg, topic: uri, payload: response.data.pv },
118
+ { ...msg, topic: uri, payload: { pv: response.data.pv, name: response.data.name } },
119
+ { ...msg, topic: uri, payload: response.data },
120
+ { ...msg, topic: uri, payload: { error: false, response: response } }
121
121
  ]);
122
122
  } else {
123
123
  node.send([
124
- { topic: uri, payload: response.data.pv },
125
- { topic: uri, payload: { pv: response.data.pv, name: response.data.name } }
124
+ { ...msg, topic: uri, payload: response.data.pv },
125
+ { ...msg, topic: uri, payload: { pv: response.data.pv, name: response.data.name } }
126
126
  ]);
127
127
  }
128
128
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "node-red-contrib-mobius-flow-base",
3
- "version": "3.0.0-rc.6",
3
+ "version": "3.0.0-rc.8",
4
4
  "description": "Node-RED base nodes for Mobius Flow",
5
5
  "main": "index.js",
6
6
  "types": "dist/index.d.ts",