Skip to content

CLI: normalize lora.ignore_incoming IDs (dec/!hex/0x), dedupe, YAML [] clear, fix bytes→int crash #834

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

Merged
ianmcorvidae merged 2 commits into from
Nov 6, 2025
Merged

CLI: normalize lora.ignore_incoming IDs (dec/!hex/0x), dedupe, YAML [] clear, fix bytes→int crash #834

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43a685f
cli: notmalize ignore IDs for dec, hex and 0x. support YAML [] clear
NillRudd Oct 5, 2025
1d3a7d3
Move to_node_num to util and updated function calls
NillRudd Nov 6, 2025
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
3 changes: 2 additions & 1 deletion meshtastic/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,8 @@ def setPref(config, comp_name, raw_val) -> bool:
else:
print(f"Adding '{raw_val}' to the {pref.name} list")
cur_vals = [x for x in getattr(config_values, pref.name) if x not in [0, "", b""]]
cur_vals.append(val)
if val not in cur_vals:
cur_vals.append(val)
getattr(config_values, pref.name)[:] = cur_vals
return True

Expand Down
54 changes: 21 additions & 33 deletions meshtastic/node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,20 @@ def __repr__(self):
r += ")"
return r

def _to_node_num(self, nodeId: Union[int, str]) -> int:
"""Normalize node id from int | '!hex' | '0xhex' | 'decimal' to int."""
if isinstance(nodeId, int):
return nodeId
s = str(nodeId).strip()
if s.startswith("!"):
s = s[1:]
if s.lower().startswith("0x"):
return int(s, 16)
try:
return int(s, 10)
except ValueError:
return int(s, 16)

Copy link
Contributor

@ianmcorvidae ianmcorvidae Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like this structure, but I think this function belongs in meshtastic.util, perhaps something like to_node_num there. (side note that most of the functions there are camelcase rather than underscores, but I think we may as well follow pep8 when we can).

Doesn't need to block merging, but if you're able to move this there that'd be appreciated!

Copy link
Contributor Author

@NillRudd NillRudd Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has now been moved to util! Seems to be a bit of mixture between camelcase and underscores but i kept to_node_num.

def module_available(self, excluded_bit: int) -> bool:
"""Check DeviceMetadata.excluded_modules to see if a module is available."""
meta = getattr(self.iface, "metadata", None)
Expand Down Expand Up @@ -714,11 +728,7 @@ def factoryReset(self, full: bool = False):
def removeNode(self, nodeId: Union[int, str]):
"""Tell the node to remove a specific node by ID"""
self.ensureSessionKey()
if isinstance(nodeId, str):
if nodeId.startswith("!"):
nodeId = int(nodeId[1:], 16)
else:
nodeId = int(nodeId)
nodeId = self._to_node_num(nodeId)

p = admin_pb2.AdminMessage()
p.remove_by_nodenum = nodeId
Expand All @@ -732,11 +742,7 @@ def removeNode(self, nodeId: Union[int, str]):
def setFavorite(self, nodeId: Union[int, str]):
"""Tell the node to set the specified node ID to be favorited on the NodeDB on the device"""
self.ensureSessionKey()
if isinstance(nodeId, str):
if nodeId.startswith("!"):
nodeId = int(nodeId[1:], 16)
else:
nodeId = int(nodeId)
nodeId = self._to_node_num(nodeId)

p = admin_pb2.AdminMessage()
p.set_favorite_node = nodeId
Expand All @@ -750,11 +756,7 @@ def setFavorite(self, nodeId: Union[int, str]):
def removeFavorite(self, nodeId: Union[int, str]):
"""Tell the node to set the specified node ID to be un-favorited on the NodeDB on the device"""
self.ensureSessionKey()
if isinstance(nodeId, str):
if nodeId.startswith("!"):
nodeId = int(nodeId[1:], 16)
else:
nodeId = int(nodeId)
nodeId = self._to_node_num(nodeId)

p = admin_pb2.AdminMessage()
p.remove_favorite_node = nodeId
Expand All @@ -768,11 +770,7 @@ def removeFavorite(self, nodeId: Union[int, str]):
def setIgnored(self, nodeId: Union[int, str]):
"""Tell the node to set the specified node ID to be ignored on the NodeDB on the device"""
self.ensureSessionKey()
if isinstance(nodeId, str):
if nodeId.startswith("!"):
nodeId = int(nodeId[1:], 16)
else:
nodeId = int(nodeId)
nodeId = self._to_node_num(nodeId)

p = admin_pb2.AdminMessage()
p.set_ignored_node = nodeId
Expand All @@ -786,11 +784,7 @@ def setIgnored(self, nodeId: Union[int, str]):
def removeIgnored(self, nodeId: Union[int, str]):
"""Tell the node to set the specified node ID to be un-ignored on the NodeDB on the device"""
self.ensureSessionKey()
if isinstance(nodeId, str):
if nodeId.startswith("!"):
nodeId = int(nodeId[1:], 16)
else:
nodeId = int(nodeId)
nodeId = self._to_node_num(nodeId)

p = admin_pb2.AdminMessage()
p.remove_ignored_node = nodeId
Expand Down Expand Up @@ -1013,10 +1007,7 @@ def _sendAdmin(
): # unless a special channel index was used, we want to use the admin index
adminIndex = self.iface.localNode._getAdminChannelIndex()
logger.debug(f"adminIndex:{adminIndex}")
if isinstance(self.nodeNum, int):
nodeid = self.nodeNum
else: # assume string starting with !
nodeid = int(self.nodeNum[1:],16)
nodeid = self._to_node_num(self.nodeNum)
if "adminSessionPassKey" in self.iface._getOrCreateByNum(nodeid):
p.session_passkey = self.iface._getOrCreateByNum(nodeid).get("adminSessionPassKey")
return self.iface.sendData(
Expand All @@ -1037,9 +1028,6 @@ def ensureSessionKey(self):
f"Not ensuring session key, because protocol use is disabled by noProto"
)
else:
if isinstance(self.nodeNum, int):
nodeid = self.nodeNum
else: # assume string starting with !
nodeid = int(self.nodeNum[1:],16)
nodeid = self._to_node_num(self.nodeNum)
if self.iface._getOrCreateByNum(nodeid).get("adminSessionPassKey") is None:
self.requestConfig(admin_pb2.AdminMessage.SESSIONKEY_CONFIG)