mmrelay 1.1.3__py3-none-any.whl → 1.2.0__py3-none-any.whl

{mmrelay-1.1.3.dist-info → mmrelay-1.2.0.dist-info}/METADATA

@@ -1,17 +1,21 @@
 Metadata-Version: 2.4
 Name: mmrelay
-Version: 1.1.3
+Version: 1.2.0
 Summary: Bridge between Meshtastic mesh networks and Matrix chat rooms
-Home-page: https://github.com/geoffwhittington/meshtastic-matrix-relay
+Home-page: https://github.com/jeremiah-k/meshtastic-matrix-relay
 Author: Geoff Whittington, Jeremiah K., and contributors
 Author-email: jeremiahk@gmx.com
-Project-URL: Bug Tracker, https://github.com/geoffwhittington/meshtastic-matrix-relay/issues
+Project-URL: Bug Tracker, https://github.com/jeremiah-k/meshtastic-matrix-relay/issues
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 4 - Beta
 Classifier: Topic :: Communications
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: meshtastic>=2.6.4
@@ -20,12 +24,17 @@ Requires-Dist: matrix-nio==0.25.2
 Requires-Dist: matplotlib==3.10.1
 Requires-Dist: requests==2.32.4
 Requires-Dist: markdown==3.8.2
+Requires-Dist: bleach==6.2.0
 Requires-Dist: haversine==2.9.0
 Requires-Dist: schedule==1.2.2
 Requires-Dist: platformdirs==4.3.8
 Requires-Dist: py-staticmaps>=0.4.0
+Requires-Dist: psutil>=5.8.0
 Requires-Dist: rich==14.1.0
 Requires-Dist: setuptools==80.9.0
+Provides-Extra: e2e
+Requires-Dist: matrix-nio[e2e]==0.25.2; extra == "e2e"
+Requires-Dist: python-olm; extra == "e2e"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -34,6 +43,7 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license-file
 Dynamic: project-url
+Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
@@ -55,59 +65,20 @@ A powerful and easy-to-use relay between Meshtastic devices and Matrix chat room
 - Configurable through a simple YAML file
 - Supports mapping multiple rooms and channels 1:1
 - Relays messages to/from an MQTT broker, if configured in the Meshtastic firmware
-- ✨️ _Bidirectional replies and reactions support_ ✨️ **NEW!!**
-- ✨️ _Native Docker support_ ✨️ **NEW!!**
+- ✨️ _Bidirectional replies and reactions support_ ✨️
+- ✨️ _Native Docker support_ ✨️
+- 🔐 **Matrix End-to-End Encryption (E2EE) support** 🔐 **NEW in v1.2!**
 
-_We would love to support [Matrix E2EE rooms](https://github.com/jeremiah-k/meshtastic-matrix-relay/issues/33), but this is currently not implemented._
+**MMRelay v1.2** introduces full **Matrix End-to-End Encryption** support for secure communication in encrypted rooms. Messages are automatically encrypted/decrypted when communicating with encrypted Matrix rooms, with simple setup using `mmrelay auth login` or automatic credentials creation from config.yaml.
 
 ## Documentation
 
 Visit our [Wiki](https://github.com/jeremiah-k/meshtastic-matrix-relay/wiki) for comprehensive guides and information.
 
-- [Installation Instructions](docs/INSTRUCTIONS.md) - Setup and configuration guide
-
----
-
-## Quick Start
-
-MMRelay runs on Linux, macOS, and Windows.
-
-```bash
-# Install using pipx for isolated installation (recommended)
-pipx install mmrelay
-
-# Generate a sample configuration file & then edit it
-mmrelay --generate-config
-
-# Start the relay (without --install-service to run manually)
-mmrelay --install-service
-```
-
-For detailed installation and configuration instructions, see the [Installation Guide](docs/INSTRUCTIONS.md).
-
-## Docker
+MMRelay supports multiple deployment methods including Docker, pip installation, and standalone executables. For complete setup instructions and all deployment options, see:
 
-MMRelay includes official Docker support for easy deployment and management:
-
-```bash
-# Quick setup with Docker
-make setup   # Copy config and open editor (first time)
-make build   # Build the Docker image
-make run     # Start the container
-make logs    # View logs
-```
-
-Docker provides isolated environment, easy deployment, automatic restarts, and volume persistence.
-
-For detailed Docker setup instructions, see the [Docker Guide](docs/DOCKER.md).
-
----
-
-## Windows Installer
-
-![Windows Installer Screenshot](https://user-images.githubusercontent.com/1770544/235249050-8c79107a-50cc-4803-b989-39e58100342d.png)
-
-The latest installer is available in the [releases section](https://github.com/jeremiah-k/meshtastic-matrix-relay/releases).
+- [Installation Instructions](docs/INSTRUCTIONS.md) - Setup and configuration guide
+- [Docker Guide](docs/DOCKER.md) - Docker deployment methods
 
 ---
 

mmrelay-1.2.0.dist-info/RECORD

@@ -0,0 +1,45 @@
+mmrelay/__init__.py,sha256=CcCX3oC0CS1MiZg2aWA5KXA2UXqYLXBT4GP3M07R-cs,120
+mmrelay/cli.py,sha256=LT_DVvhXFPCpGxU5RD4SxNNqtIJyVVD8bwMm9YSz2q8,55711
+mmrelay/cli_utils.py,sha256=z1TfgHM82NdTtO0toGyQrNdeB7F8khtzuLJYjvDG1j8,26380
+mmrelay/config.py,sha256=qajoYz_KCRWCw6ULAND0ysmHqw4Nbv_PjewNrW22O8o,32640
+mmrelay/db_utils.py,sha256=b_cuw4zOwGlvk4CljFh3SguqOi-TRCHW_s9RCt9gUsU,19920
+mmrelay/e2ee_utils.py,sha256=4VL6sP3ln0bZ7ZubE_dSejo0WYMOWqaduWLKnURoeIY,16574
+mmrelay/log_utils.py,sha256=6O-dvt9K5uT89XkA74gcYYQJ5lADAk5U9IVL4mj1XwM,8764
+mmrelay/main.py,sha256=QwOLY6uLvFQZhHRlJrbp_D_-xDuEHQIgEsQ6ME_g1EI,16360
+mmrelay/matrix_utils.py,sha256=at0mME8nWwN-yxGGIlH4GblwGmrJd6DrjlNhM794scU,99146
+mmrelay/meshtastic_utils.py,sha256=86U8vQuWW7xR4E-_n-d7vlQhQ40gO-tJGZcVjzoeFhc,43027
+mmrelay/message_queue.py,sha256=tHKziIPwQ9Xm7qpITyR1r2e-ftdn4ZivdZhek9SmMcQ,18703
+mmrelay/plugin_loader.py,sha256=6SD7eoO0VHnsEPI_YrrnrbeHAjC7okmyUpaA4Eu5AHo,41718
+mmrelay/setup_utils.py,sha256=EAVPmKHQmlXnxMcrkhlU27fBPjJCiwTVSLZdbEFsWLQ,22095
+mmrelay/constants/__init__.py,sha256=M8AXeIcS1JuS8OwmfTmhcCOkAz5XmWlNQ53GBxYOx94,1494
+mmrelay/constants/app.py,sha256=1NoX00c65CcHzQxHjnKCPaFbkJQo3MnNytAe_XmvJUo,714
+mmrelay/constants/config.py,sha256=B1A_OZLLNXHM9rHOwc01ZaJBvFugR2eXlhYYl4nUxlY,2479
+mmrelay/constants/database.py,sha256=4cHfYfBePDUUtVSflrWyStcxKSQv7VE-jSrb1IzAjls,646
+mmrelay/constants/formats.py,sha256=cjbrfNNFCKoGSFsFHR1QQDEQudiGquA9MUapfm0_ZNI,494
+mmrelay/constants/messages.py,sha256=Reu_-6gZGGZQVP6BuqBm01QBhVTFjHVRQSPTUcQJG2Q,1531
+mmrelay/constants/network.py,sha256=QjROOAMxcP1pA1F_gUtuXzm2tORCqo5koqZbwrZRSns,1186
+mmrelay/constants/queue.py,sha256=yyWSrtq06b5GWzZwdl6IFtrMvxEuF9PdKSNPh8DdL2M,565
+mmrelay/plugins/__init__.py,sha256=KVMQIXRhe0wlGj4O3IZ0vOIQRKFkfPYejHXhJL17qrc,51
+mmrelay/plugins/base_plugin.py,sha256=Nh_zz-Z49qYatS4i38C2bLOl1sNDUgWsqpD8NLJdnl0,20807
+mmrelay/plugins/debug_plugin.py,sha256=adX0cRJHUEDLldajybPfiRDDlvytkZe5aN_dSgNKP2Y,870
+mmrelay/plugins/drop_plugin.py,sha256=x4S-e0Muun2Dy1H2qwRMTBB1ptLmy7ZZJhgPu-KefGs,5394
+mmrelay/plugins/health_plugin.py,sha256=svV_GfpAVL0QhiVzi3PVZ1mNpsOL1NHSmkRF-Mn_ExE,2250
+mmrelay/plugins/help_plugin.py,sha256=S7nBhsANK46Zv9wPHOVegPGcuYGMErBsxAnrRlSSCwg,2149
+mmrelay/plugins/map_plugin.py,sha256=eHV_t3TFcypBD4xT_OQx0hD6_iGkLJOADjwYVny0PvE,11292
+mmrelay/plugins/mesh_relay_plugin.py,sha256=gpQkO8S-LqDNwqJpqq5ewGXVEST-JZgOsJmrE-qRzuw,7631
+mmrelay/plugins/nodes_plugin.py,sha256=RDabzyG5hKG5aYWecsRUcLSjMCCv6Pngmq2Qpld1A1U,2903
+mmrelay/plugins/ping_plugin.py,sha256=8uFnT3qfO3RBaTUOx348voIfKpzXB3zTfcT6Gtfc8kM,4070
+mmrelay/plugins/telemetry_plugin.py,sha256=8SxWv4BLXMUTbiVaD3MjlMMdQyS7S_1OfLlVNAUMSO0,6306
+mmrelay/plugins/weather_plugin.py,sha256=7si8q43Fw6Gghj0x7Ah2gyFcdwxodNqINmIj9Olprjg,14412
+mmrelay/tools/__init__.py,sha256=WFjDQjdevgg19_zT6iEoL29rvb1JPqYSd8708Jn5D7A,838
+mmrelay/tools/mmrelay.service,sha256=3vqK1VbfXvVftkTrTEOan77aTHeOT36hIAL7HqJsmTg,567
+mmrelay/tools/sample-docker-compose-prebuilt.yaml,sha256=NWV-g3RwiFlYfjgGL5t9DtInoJJDUSaTBy4w1ICk81A,3136
+mmrelay/tools/sample-docker-compose.yaml,sha256=PHt0MGrzUAzxBovtf1TZyrvJ9YK-ZpdSyyp5Tmp8zIY,2543
+mmrelay/tools/sample.env,sha256=RP-o3rX3jnEIrVG2rqCZq31O1yRXou4HcGrXWLVbKKw,311
+mmrelay/tools/sample_config.yaml,sha256=wQnEhL5St7Xqeb--ClJQVcbVXu_n69fPHuF2zSB0Zu4,6250
+mmrelay-1.2.0.dist-info/licenses/LICENSE,sha256=aB_07MhnK-bL5WLI1ucXLUSdW_yBVoepPRYB0kaAOl8,35204
+mmrelay-1.2.0.dist-info/METADATA,sha256=RvrjFahRkYXAokF54_gLy24oD2pgjjvQEYjcm0oi9BM,6143
+mmrelay-1.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mmrelay-1.2.0.dist-info/entry_points.txt,sha256=SJZwGUOEpQ-qx4H8UL4xKFnKeInGUaZNW1I0ddjK7Ws,45
+mmrelay-1.2.0.dist-info/top_level.txt,sha256=B_ZLCRm7NYAmI3PipRUyHGymP-C-q16LSeMGzmqJfo4,8
+mmrelay-1.2.0.dist-info/RECORD,,

mmrelay/config_checker.py

@@ -1,133 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-import os
-
-import yaml
-from yaml.loader import SafeLoader
-
-
-def get_config_paths():
-    """
-    Get a list of possible configuration file paths.
-
-    Returns:
-        list: A list of possible configuration file paths
-    """
-    from mmrelay.config import get_config_paths as get_paths
-
-    return get_paths()
-
-
-def check_config():
-    """
-    Check if the configuration file is valid.
-
-    Returns:
-        bool: True if the configuration is valid, False otherwise.
-    """
-    config_paths = get_config_paths()
-    config_path = None
-
-    # Try each config path in order until we find one that exists
-    for path in config_paths:
-        if os.path.isfile(path):
-            config_path = path
-            print(f"Found configuration file at: {config_path}")
-            try:
-                with open(config_path, "r") as f:
-                    config = yaml.load(f, Loader=SafeLoader)
-
-                # Check if config is empty
-                if not config:
-                    print("Error: Configuration file is empty or invalid")
-                    return False
-
-                # Check matrix section
-                if "matrix" not in config:
-                    print("Error: Missing 'matrix' section in config")
-                    return False
-
-                matrix_section = config["matrix"]
-                required_matrix_fields = ["homeserver", "access_token", "bot_user_id"]
-                missing_matrix_fields = [
-                    field
-                    for field in required_matrix_fields
-                    if field not in matrix_section
-                ]
-
-                if missing_matrix_fields:
-                    print(
-                        f"Error: Missing required fields in 'matrix' section: {', '.join(missing_matrix_fields)}"
-                    )
-                    return False
-
-                # Check matrix_rooms section
-                if "matrix_rooms" not in config or not config["matrix_rooms"]:
-                    print("Error: Missing or empty 'matrix_rooms' section in config")
-                    return False
-
-                if not isinstance(config["matrix_rooms"], list):
-                    print("Error: 'matrix_rooms' must be a list")
-                    return False
-
-                for i, room in enumerate(config["matrix_rooms"]):
-                    if not isinstance(room, dict):
-                        print(
-                            f"Error: Room {i+1} in 'matrix_rooms' must be a dictionary"
-                        )
-                        return False
-
-                    if "id" not in room:
-                        print(
-                            f"Error: Room {i+1} in 'matrix_rooms' is missing the 'id' field"
-                        )
-                        return False
-
-                # Check meshtastic section
-                if "meshtastic" not in config:
-                    print("Error: Missing 'meshtastic' section in config")
-                    return False
-
-                meshtastic_section = config["meshtastic"]
-                if "connection_type" not in meshtastic_section:
-                    print("Error: Missing 'connection_type' in 'meshtastic' section")
-                    return False
-
-                connection_type = meshtastic_section["connection_type"]
-                if connection_type not in ["tcp", "serial", "ble"]:
-                    print(
-                        f"Error: Invalid 'connection_type': {connection_type}. Must be 'tcp', 'serial', or 'ble'"
-                    )
-                    return False
-
-                # Check connection-specific fields
-                if (
-                    connection_type == "serial"
-                    and "serial_port" not in meshtastic_section
-                ):
-                    print("Error: Missing 'serial_port' for 'serial' connection type")
-                    return False
-
-                if connection_type == "tcp" and "host" not in meshtastic_section:
-                    print("Error: Missing 'host' for 'tcp' connection type")
-                    return False
-
-                if connection_type == "ble" and "ble_address" not in meshtastic_section:
-                    print("Error: Missing 'ble_address' for 'ble' connection type")
-                    return False
-
-                print("Configuration file is valid!")
-                return True
-            except yaml.YAMLError as e:
-                print(f"Error parsing YAML in {config_path}: {e}")
-                return False
-            except Exception as e:
-                print(f"Error checking configuration: {e}")
-                return False
-
-    print("Error: No configuration file found in any of the following locations:")
-    for path in config_paths:
-        print(f"  - {path}")
-    print("\nRun 'mmrelay --generate-config' to generate a sample configuration file.")
-    return False

mmrelay-1.1.3.dist-info/RECORD

@@ -1,35 +0,0 @@
-mmrelay/__init__.py,sha256=4ciaRmcwzGfuaU_HuNDXVr4Qk0WVkPydhrdXIVo9VOs,120
-mmrelay/cli.py,sha256=hdPTlcGsXTJC9GEUiScG7b3IFp02B3lwhqgwFpU3NsM,13835
-mmrelay/config.py,sha256=5VZag8iSc5yLQgvwI76bbpizbtqag74cHnfXCrWHNyA,7910
-mmrelay/config_checker.py,sha256=UnoHVTXzfdTfFkbmXv9r_Si76v-sxXLb5FOaQSOM45E,4909
-mmrelay/db_utils.py,sha256=eTMMkYVWsmO_DkrBfnZMw4ohg_xa0S9TXJoBjRFTwzo,13590
-mmrelay/log_utils.py,sha256=1zVHBJ5qSOG1O4cq4Ebngq9dp81vaZOEq5khulAFuuM,6611
-mmrelay/main.py,sha256=46J-B6wDRawB392u71kP6pxNoayBdmwOiKcqsleikhU,13182
-mmrelay/matrix_utils.py,sha256=Ans7Wroh693un0LOp4x2p8NPfGFJ9z6TnG6ApXRXg7Q,55686
-mmrelay/meshtastic_utils.py,sha256=iy7BwMlqOwpkqSB0pTx2n8oqaKs2kWQ4PXFk4y16ys8,31440
-mmrelay/message_queue.py,sha256=spLK7pVugnl9djVLIh5-P7iHZ7kRtZEZIWTcQ4X1TfI,18529
-mmrelay/plugin_loader.py,sha256=UJ-i6cL2q_hwMTqjRkaOAQDTj6uUrmyj56-XbUVGcng,39231
-mmrelay/setup_utils.py,sha256=N6qdScHKHEMFKDmT1l7dcLDPNTusZXPkyxrLXjFLhRI,19910
-mmrelay/plugins/__init__.py,sha256=KVMQIXRhe0wlGj4O3IZ0vOIQRKFkfPYejHXhJL17qrc,51
-mmrelay/plugins/base_plugin.py,sha256=DJdM-l-69sMnx6Fgn0rweWF5CuWilnQQAT3nm6eq8f4,18359
-mmrelay/plugins/debug_plugin.py,sha256=adX0cRJHUEDLldajybPfiRDDlvytkZe5aN_dSgNKP2Y,870
-mmrelay/plugins/drop_plugin.py,sha256=0GOz0dgLnFST1HTgqrMayrjwmYlnu02QxfnTZtdPZ3U,4671
-mmrelay/plugins/health_plugin.py,sha256=svV_GfpAVL0QhiVzi3PVZ1mNpsOL1NHSmkRF-Mn_ExE,2250
-mmrelay/plugins/help_plugin.py,sha256=S7nBhsANK46Zv9wPHOVegPGcuYGMErBsxAnrRlSSCwg,2149
-mmrelay/plugins/map_plugin.py,sha256=eHV_t3TFcypBD4xT_OQx0hD6_iGkLJOADjwYVny0PvE,11292
-mmrelay/plugins/mesh_relay_plugin.py,sha256=PIQBACC7Yjq7hzKJJNycHTjkayEC9tsC8-JNG4q_AY8,7563
-mmrelay/plugins/nodes_plugin.py,sha256=RDabzyG5hKG5aYWecsRUcLSjMCCv6Pngmq2Qpld1A1U,2903
-mmrelay/plugins/ping_plugin.py,sha256=8uFnT3qfO3RBaTUOx348voIfKpzXB3zTfcT6Gtfc8kM,4070
-mmrelay/plugins/telemetry_plugin.py,sha256=8SxWv4BLXMUTbiVaD3MjlMMdQyS7S_1OfLlVNAUMSO0,6306
-mmrelay/plugins/weather_plugin.py,sha256=1bQhmiX-enNphzGoFVprU0LcZQX9BvGxWAJAG8Wekg0,8596
-mmrelay/tools/__init__.py,sha256=WFjDQjdevgg19_zT6iEoL29rvb1JPqYSd8708Jn5D7A,838
-mmrelay/tools/mmrelay.service,sha256=3vqK1VbfXvVftkTrTEOan77aTHeOT36hIAL7HqJsmTg,567
-mmrelay/tools/sample-docker-compose.yaml,sha256=vVgJrh-6l48hkj5F-52JA5tpDWPBjiPQ36CE9Pkqn44,1251
-mmrelay/tools/sample.env,sha256=RP-o3rX3jnEIrVG2rqCZq31O1yRXou4HcGrXWLVbKKw,311
-mmrelay/tools/sample_config.yaml,sha256=grS70MKHFd9e_lZ3GkmzPi4RRW-PdahMOMPCAg07MWs,4718
-mmrelay-1.1.3.dist-info/licenses/LICENSE,sha256=aB_07MhnK-bL5WLI1ucXLUSdW_yBVoepPRYB0kaAOl8,35204
-mmrelay-1.1.3.dist-info/METADATA,sha256=gNG_TVwJfpvt0s7sd3WDEceXl8Li2WCLGHTkYkXOWVQ,6493
-mmrelay-1.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mmrelay-1.1.3.dist-info/entry_points.txt,sha256=SJZwGUOEpQ-qx4H8UL4xKFnKeInGUaZNW1I0ddjK7Ws,45
-mmrelay-1.1.3.dist-info/top_level.txt,sha256=B_ZLCRm7NYAmI3PipRUyHGymP-C-q16LSeMGzmqJfo4,8
-mmrelay-1.1.3.dist-info/RECORD,,