Refactor to add ensureSessionKey function

meshtastic/__main__.py

@@ -39,7 +39,7 @@ except ImportError as e:
     have_powermon = False
     powermon_exception = e
     meter = None
-from meshtastic.protobuf import admin_pb2, channel_pb2, config_pb2, portnums_pb2
+from meshtastic.protobuf import channel_pb2, config_pb2, portnums_pb2
 from meshtastic.version import get_active_version
 
 def onReceive(packet, interface):
@@ -334,11 +334,7 @@ def onConnected(interface):
             closeNow = True
             waitForAckNak = True
             print(f"Setting device owner to {args.set_owner}")
-            node = interface.getNode(args.dest, False)
-            node.requestConfig(
-                admin_pb2.AdminMessage.SESSIONKEY_CONFIG
-            )
-            node.setOwner(args.set_owner)
+            interface.getNode(args.dest, False).setOwner(args.set_owner)
 
         if args.set_owner_short:
             closeNow = True

meshtastic/node.py

@@ -221,7 +221,7 @@ class Node:
 
     def writeChannel(self, channelIndex, adminIndex=0):
         """Write the current (edited) channel to the device"""
-
+        self.ensureSessionKey()
         p = admin_pb2.AdminMessage()
         p.set_channel.CopyFrom(self.channels[channelIndex])
         self._sendAdmin(p, adminIndex=adminIndex)
@@ -289,6 +289,7 @@ class Node:
     def setOwner(self, long_name=None, short_name=None, is_licensed=False):
         """Set device owner name"""
         logging.debug(f"in setOwner nodeNum:{self.nodeNum}")
+        self.ensureSessionKey()
         p = admin_pb2.AdminMessage()
 
         nChars = 4
@@ -422,7 +423,7 @@ class Node:
 
         if len(ringtone) > 230:
             our_exit("Warning: The ringtone must be less than 230 characters.")
-
+        self.ensureSessionKey()
         # split into chunks
         chunks = []
         chunks_size = 230
@@ -498,7 +499,7 @@ class Node:
 
         if len(message) > 200:
             our_exit("Warning: The canned message must be less than 200 characters.")
-
+        self.ensureSessionKey()
         # split into chunks
         chunks = []
         chunks_size = 200
@@ -525,6 +526,7 @@ class Node:
     def exitSimulator(self):
         """Tell a simulator node to exit (this message
         is ignored for other nodes)"""
+        self.ensureSessionKey()
         p = admin_pb2.AdminMessage()
         p.exit_simulator = True
         logging.debug("in exitSimulator()")
@@ -533,6 +535,7 @@ class Node:
 
     def reboot(self, secs: int = 10):
         """Tell the node to reboot."""
+        self.ensureSessionKey()
         p = admin_pb2.AdminMessage()
         p.reboot_seconds = secs
         logging.info(f"Telling node to reboot in {secs} seconds")
@@ -546,6 +549,7 @@ class Node:
 
     def beginSettingsTransaction(self):
         """Tell the node to open a transaction to edit settings."""
+        self.ensureSessionKey()
         p = admin_pb2.AdminMessage()
         p.begin_edit_settings = True
         logging.info(f"Telling open a transaction to edit settings")
@@ -559,6 +563,7 @@ class Node:
 
     def commitSettingsTransaction(self):
         """Tell the node to commit the open transaction for editing settings."""
+        self.ensureSessionKey()
         p = admin_pb2.AdminMessage()
         p.commit_edit_settings = True
         logging.info(f"Telling node to commit open transaction for editing settings")
@@ -572,6 +577,7 @@ class Node:
 
     def rebootOTA(self, secs: int = 10):
         """Tell the node to reboot into factory firmware."""
+        self.ensureSessionKey()
         p = admin_pb2.AdminMessage()
         p.reboot_ota_seconds = secs
         logging.info(f"Telling node to reboot to OTA in {secs} seconds")
@@ -585,6 +591,7 @@ class Node:
 
     def enterDFUMode(self):
         """Tell the node to enter DFU mode (NRF52)."""
+        self.ensureSessionKey()
         p = admin_pb2.AdminMessage()
         p.enter_dfu_mode_request = True
         logging.info(f"Telling node to enable DFU mode")
@@ -598,6 +605,7 @@ class Node:
 
     def shutdown(self, secs: int = 10):
         """Tell the node to shutdown."""
+        self.ensureSessionKey()
         p = admin_pb2.AdminMessage()
         p.shutdown_seconds = secs
         logging.info(f"Telling node to shutdown in {secs} seconds")
@@ -622,6 +630,7 @@ class Node:
 
     def factoryReset(self):
         """Tell the node to factory reset."""
+        self.ensureSessionKey()
         p = admin_pb2.AdminMessage()
         p.factory_reset = True
         logging.info(f"Telling node to factory reset")
@@ -635,6 +644,7 @@ class Node:
 
     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)
@@ -652,6 +662,7 @@ class Node:
 
     def resetNodeDb(self):
         """Tell the node to reset its list of nodes."""
+        self.ensureSessionKey()
         p = admin_pb2.AdminMessage()
         p.nodedb_reset = True
         logging.info(f"Telling node to reset the NodeDB")
@@ -689,6 +700,7 @@ class Node:
 
     def removeFixedPosition(self):
         """Tell the node to remove the fixed position and set the fixed position setting to false"""
+        self.ensureSessionKey()
         p = admin_pb2.AdminMessage()
         p.remove_fixed_position = True
         logging.info(f"Telling node to remove fixed position")
@@ -853,3 +865,11 @@ class Node:
                 onResponse=onResponse,
                 channelIndex=adminIndex,
             )
+
+    def ensureSessionKey(self):
+        if isinstance(self.nodeNum, int):
+            nodeid = self.nodeNum
+        elif self.nodeNum.startswith("!"):
+            nodeid = int(self.nodeNum[1:],16)
+        if self.iface._getOrCreateByNum(nodeid).get("adminSessionPassKey") is None:
+            self.requestConfig(admin_pb2.AdminMessage.SESSIONKEY_CONFIG)