From da0312a5b0369771f804b3e92e5409e417c19597 Mon Sep 17 00:00:00 2001
From: Ian McEwen <mian@cyverse.org>
Date: Wed, 5 Jun 2024 19:44:18 -0700
Subject: [PATCH] more miscellaneous types

---
 meshtastic/util.py | 5 +++--
 requirements.txt   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/meshtastic/util.py b/meshtastic/util.py
index bc24e33..14f6a54 100644
--- a/meshtastic/util.py
+++ b/meshtastic/util.py
@@ -14,6 +14,7 @@ from queue import Queue
 from typing import List, NoReturn, Union
 
 from google.protobuf.json_format import MessageToJson
+from google.protobuf.message import Message
 
 import packaging.version as pkg_version
 import requests
@@ -103,7 +104,7 @@ def pskToString(psk: bytes):
         return "secret"
 
 
-def stripnl(s):
+def stripnl(s) -> str:
     """Remove newlines from a string (and remove extra whitespace)"""
     s = str(s).replace("\n", " ")
     return " ".join(s.split())
@@ -628,7 +629,7 @@ def check_if_newer_version():
     return pypi_version
 
 
-def message_to_json(message, multiline=False):
+def message_to_json(message: Message, multiline: bool=False) -> str:
     """Return protobuf message as JSON. Always print all fields, even when not present in data."""
     json = MessageToJson(message, always_print_fields_with_no_presence=True)
     return stripnl(json) if not multiline else json
diff --git a/requirements.txt b/requirements.txt
index 000ef87..fe49987 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -23,7 +23,7 @@ bleak
 packaging
 mypy
 mypy-protobuf
-types-protobuf
+types-protobuf>=5.26.0
 types-tabulate
 types-requests
 types-setuptools