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

refactor: make nodes a map instead of an array #710

Merged
merged 14 commits into from
Feb 24, 2021
Merged

refactor: make nodes a map instead of an array #710

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9924978
refactor: make nodes a map instead of an array
robertsLando Feb 23, 2021
e362290
refactor: minor bug
robertsLando Feb 24, 2021
76e01b6
refactor: updated nodes logic on control panel
robertsLando Feb 24, 2021
a26eebd
refactor: fix lint issues
robertsLando Feb 24, 2021
d551596
fix: don't override nodes
robertsLando Feb 24, 2021
220faac
fix: store nodes conversion
robertsLando Feb 24, 2021
1cd066f
fix: `_setNodeName` and `_setNodeLocation`
robertsLando Feb 24, 2021
f499261
fix: node added event returns null
robertsLando Feb 24, 2021
3696785
fix: sync node name and location with zwaveJS
robertsLando Feb 24, 2021
0728da4
fix: lint issues
robertsLando Feb 24, 2021
f0d2e5a
fix: use mode map in mutations where possible
robertsLando Feb 24, 2021
b65f532
Merge branch 'master' into nodes-map
robertsLando Feb 24, 2021
8c0d930
fix: import config api
robertsLando Feb 24, 2021
1401911
Merge branch 'master' into nodes-map
robertsLando Feb 24, 2021
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
2 changes: 1 addition & 1 deletion app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ function setupSocket (server) {
socketManager.on(inboundEvents.init, function (socket) {
if (gw.zwave) {
socket.emit(socketEvents.init, {
nodes: gw.zwave.nodes,
nodes: gw.zwave.getNodes(),
info: gw.zwave.getInfo(),
error: gw.zwave.error,
cntStatus: gw.zwave.cntStatus
Expand Down
18 changes: 9 additions & 9 deletions lib/Gateway.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,7 +925,7 @@ Gateway.prototype.parsePayload = function (payload, valueId, valueConf) {
}

if (valueConf.parseReceive) {
const node = this.zwave.nodes[valueId.nodeId]
const node = this.zwave.nodes.get(valueId.nodeId)
const parsedVal = evalFunction(
valueConf.receiveFunction,
valueId,
Expand Down Expand Up @@ -1091,7 +1091,7 @@ Gateway.prototype.valueTopic = function (node, valueId, returnObject = false) {
* @param {number} nodeID
*/
Gateway.prototype.rediscoverNode = function (nodeID) {
const node = this.zwave.nodes[nodeID]
const node = this.zwave.nodes.get(nodeID)
if (node) {
robertsLando marked this conversation as resolved.
Show resolved Hide resolved
// delete all discovered values
onNodeRemoved.call(this, node)
Expand All @@ -1117,7 +1117,7 @@ Gateway.prototype.rediscoverNode = function (nodeID) {
* @param {number} nodeID
*/
Gateway.prototype.disableDiscovery = function (nodeID) {
const node = this.zwave.nodes[nodeID]
const node = this.zwave.nodes.get(nodeID)
if (node && node.hassDevices) {
for (const id in node.hassDevices) {
node.hassDevices[id].ignoreDiscovery = true
Expand Down Expand Up @@ -1219,15 +1219,15 @@ Gateway.prototype.rediscoverAll = function () {
if (!this.config.hassDiscovery) return

const nodes = this.zwave ? this.zwave.nodes : []
for (let i = 0; i < nodes.length; i++) {
const devices = nodes[i] && nodes[i].hassDevices ? nodes[i].hassDevices : {}
for (const [nodeId, node] of nodes) {
const devices = node.hassDevices ? node.hassDevices : {}
robertsLando marked this conversation as resolved.
Show resolved Hide resolved
for (const id in devices) {
const d = devices[id]
if (d && d.discoveryTopic && d.discovery_payload) {
this.publishDiscovery(d, i)
this.publishDiscovery(d, nodeId)
}
} // end foreach hassdevice
} // end foreach node
}
}

/**
Expand Down Expand Up @@ -2126,7 +2126,7 @@ Gateway.prototype.discoverValue = function (node, vId) {
* @param {number} nodeId
*/
Gateway.prototype.updateNodeTopics = function (nodeId) {
const node = this.zwave.nodes[nodeId]
const node = this.zwave.nodes.get(nodeId)
if (node) {
const topics = Object.keys(this.topicValues).filter(
k => this.topicValues[k].nodeId === node.id
Expand All @@ -2147,7 +2147,7 @@ Gateway.prototype.updateNodeTopics = function (nodeId) {
* @param {number} nodeId
*/
Gateway.prototype.removeNodeRetained = function (nodeId) {
const node = this.zwave.nodes[nodeId]
const node = this.zwave.nodes.get(nodeId)
if (node) {
const topics = Object.keys(node.values).map(v =>
this.valueTopic(node, node.values[v])
Expand Down
Loading