From 493d329a1680b0e72bac9b1f7dc1ff90005a95d6 Mon Sep 17 00:00:00 2001 From: "WIN-20230613SRA\\Administrator" <871066422@qq.com> Date: Thu, 2 Jul 2026 17:40:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0mqtt=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E9=87=8D=E8=BF=9E=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cpy_server.py | 22 ++-- mqtt_client.py | 280 +++++++++++++++++++++++++++++-------------------- 2 files changed, 170 insertions(+), 132 deletions(-) diff --git a/cpy_server.py b/cpy_server.py index e3db3bd..9f56ff7 100644 --- a/cpy_server.py +++ b/cpy_server.py @@ -1,11 +1,8 @@ import logging import json -import threading -from typing import Dict, Any, Optional import base64 -from config import ConfigManager from mqtt_client import MqttClient from file_handler import FileHandler from compute_service import ComputeService @@ -21,9 +18,6 @@ class CpyServer: # 服务器状态 self.running = False - self.host = config_manager.get('http.host', '0.0.0.0') - self.port = config_manager.get('http.port', 5000) - self.server_thread = None # 初始化各个模块 self._init_modules() @@ -45,7 +39,7 @@ class CpyServer: # 初始化计算服务 self.compute_services = {} - for dev_id in config_manager.get('udp.udp_map', {}).keys(): + for dev_id in config_manager.get('udp_map', {}).keys(): try: compute_service = ComputeService(dev_id) logger.info(f"ComputeService initialized for dev_id: {dev_id}, udp port {compute_service.udp_handler.port}") @@ -228,29 +222,27 @@ class CpyServer: return json.dumps({'error': str(e)}) def start(self): - """启动HTTP服务器""" + """启动服务""" if self.running: logger.warning("Server is already running") return self.running = True - logger.info(f"Starting HTTP server on {self.host}:{self.port}") # 启动MQTT客户端 if self.mqtt_client: self.mqtt_client.connect() - - logger.info("HTTP server started") + logger.info("Server started") def stop(self): - """停止HTTP服务器""" + """停止服务""" if not self.running: logger.warning("Server is not running") return self.running = False - logger.info("Stopping HTTP server") + logger.info("Stopping server") # 断开MQTT连接 if self.mqtt_client: @@ -268,9 +260,7 @@ class CpyServer: except: pass - # Flask会在新线程中运行,需要特殊处理 - # 这里只是标记状态,实际停止需要更复杂的处理 - logger.info("HTTP server stopped") + logger.info("Server stopped") def is_running(self) -> bool: """检查服务器是否在运行""" diff --git a/mqtt_client.py b/mqtt_client.py index 75122c0..f1cc61a 100644 --- a/mqtt_client.py +++ b/mqtt_client.py @@ -3,25 +3,44 @@ from paho.mqtt.enums import CallbackAPIVersion import logging import json import ssl +import socket from typing import Callable, Optional, Dict, Any import threading +import time from config import config_manager logger = logging.getLogger(__name__) +class ConnectionState: + DISCONNECTED = "disconnected" + CONNECTING = "connecting" + CONNECTED = "connected" + + class MqttClient: """MQTT客户端封装类""" def __init__(self): - """初始化MQTT客户端 - - """ + """初始化MQTT客户端""" self.client = None - self.connected = False self.device_id = None + # 状态机相关 + self._state = ConnectionState.DISCONNECTED + self._state_lock = threading.Lock() + + # 定时器相关 + self._reconnect_timer = None + self._reconnect_interval = 5 + self._min_reconnect_interval = 5 + self._max_reconnect_interval = 10 + + # 退避相关 + self._backoff_factor = 2 + self._current_backoff = 0 + # 回调函数 self.on_connect_callback = None self.on_message_callback = None @@ -30,32 +49,30 @@ class MqttClient: # 订阅的主题列表 self.subscribed_topics = set() + # MQTT配置缓存 + self._broker = config_manager.get('mqtt.broker', '127.0.0.1') + self._port = config_manager.get('mqtt.port', 1883) + self._keepalive = config_manager.get('mqtt.keepalive', 60) + # 初始化客户端 self._init_client() def _init_client(self): """初始化MQTT客户端""" try: - # 获取配置 - broker = config_manager.get('mqtt.broker', '127.0.0.1') - port = config_manager.get('mqtt.port', 1883) username = config_manager.get('mqtt.username', '') password = config_manager.get('mqtt.password', '') use_ssl = config_manager.get('mqtt.use_ssl', True) use_ca = config_manager.get('mqtt.use_ca', False) logger.info(f"use_ssl {use_ssl}, use_ca {use_ca}") - server_id = config_manager.get('server_id', '3') + server_id = config_manager.get('server_id', '1') - #读取本机ip地址 - import socket device_name = socket.gethostbyname(socket.gethostname()) - # 创建客户端 self.client = mqtt.Client(client_id=f"cpy_gateway_{server_id}_{device_name}", \ callback_api_version=CallbackAPIVersion.VERSION2, clean_session=True) logger.info(f"cpy_gateway_{server_id}_{device_name}") - # 设置用户名和密码 if username and password: self.client.username_pw_set(username, password) @@ -64,72 +81,153 @@ class MqttClient: self.client.tls_set(cert_reqs=ca_file) self.client.tls_insecure_set(False) elif use_ssl: - # 使用默认系统CA证书 logger.info(f"use mqtts without ca") self.client.tls_set(cert_reqs=ssl.CERT_NONE) self.client.tls_insecure_set(True) - # 设置回调 self.client.on_connect = self._on_connect self.client.on_message = self._on_message self.client.on_disconnect = self._on_disconnect - logger.info(f"MQTT client initialized for broker {broker}:{port}") + logger.info(f"MQTT client initialized for broker {self._broker}:{self._port}") except Exception as e: logger.error(f"Failed to initialize MQTT client: {e}") raise - def connect(self) -> bool: - """连接到MQTT代理 + def _set_state(self, new_state: str): + """设置连接状态(线程安全)""" + with self._state_lock: + old_state = self._state + self._state = new_state + logger.debug(f"State changed: {old_state} -> {new_state}") + + def _get_state(self) -> str: + """获取连接状态(线程安全)""" + with self._state_lock: + return self._state + + def _socket_check(self) -> bool: + """Socket连通性预检 Returns: - bool: 连接是否成功 + bool: 连通性检查是否通过 """ try: - broker = config_manager.get('mqtt.broker', '127.0.0.1') - port = config_manager.get('mqtt.port', 1883) - keepalive = config_manager.get('mqtt.keepalive', 60) + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + s.settimeout(3) + s.connect((self._broker, self._port)) + s.close() + logger.debug(f"Socket check passed for {self._broker}:{self._port}") + return True + except socket.timeout: + logger.debug(f"Socket check timeout for {self._broker}:{self._port}") + return False + except Exception as e: + logger.debug(f"Socket check failed for {self._broker}:{self._port}: {e}") + return False + + def _schedule_reconnect(self): + """调度下一次重连尝试""" + if self._current_backoff == 0: + self._current_backoff = self._min_reconnect_interval + else: + self._current_backoff = min(self._current_backoff * self._backoff_factor, self._max_reconnect_interval) + + logger.debug(f"Scheduling reconnect in {self._current_backoff} seconds") + + self._reconnect_timer = threading.Timer(self._current_backoff, self._on_reconnect_timer) + self._reconnect_timer.start() + + def _cancel_reconnect(self): + """取消重连定时器""" + if self._reconnect_timer: + self._reconnect_timer.cancel() + self._reconnect_timer = None + + def _reset_backoff(self): + """重置退避间隔""" + self._current_backoff = 0 + + def _on_reconnect_timer(self): + """重连定时器回调""" + state = self._get_state() + + if state != ConnectionState.DISCONNECTED: + logger.debug(f"Ignoring reconnect timer, current state: {state}") + return + + logger.info(f"Attempting to reconnect (attempt in {self._current_backoff}s)...") + + if not self._socket_check(): + logger.warning(f"Socket check failed, will retry later") + self._schedule_reconnect() + return + + try: + self._set_state(ConnectionState.CONNECTING) + logger.info(f"Connecting to MQTT broker {self._broker}:{self._port}...") + self.client.connect_async(self._broker, self._port, self._keepalive) - logger.info(f"Connecting to MQTT broker {broker}:{port}...") - self.client.connect(broker, port, keepalive) - self.client.loop_start() + if not hasattr(self, '_loop_started') or not self._loop_started: + self.client.loop_start() + self._loop_started = True + except Exception as e: + logger.error(f"Failed to initiate connection: {e}") + self._set_state(ConnectionState.DISCONNECTED) + self._schedule_reconnect() + + def connect(self) -> bool: + """启动MQTT连接流程 + + 非阻塞调用,启动重连定时器,实际连接在定时器回调中完成 + + Returns: + bool: 定时器是否成功启动 + """ + try: + state = self._get_state() + + if state == ConnectionState.CONNECTED: + logger.warning("Already connected, ignoring connect request") + return True + + if state == ConnectionState.CONNECTING: + logger.warning("Already connecting, ignoring connect request") + return True + + self._reset_backoff() + self._schedule_reconnect() + + logger.info("MQTT connection process started") return True except Exception as e: - logger.error(f"Failed to connect to MQTT broker: {e}") + logger.error(f"Failed to start connection process: {e}") return False def disconnect(self): """断开MQTT连接""" try: + self._cancel_reconnect() + if self.client: self.client.loop_stop() self.client.disconnect() - self.connected = False - logger.info("Disconnected from MQTT broker") + + self._set_state(ConnectionState.DISCONNECTED) + logger.info("Disconnected from MQTT broker") except Exception as e: logger.error(f"Error disconnecting from MQTT broker: {e}") def publish(self, topic: str, payload: Any, qos: int = 0, retain: bool = False) -> bool: - """发布消息到指定主题 - - Args: - topic: 主题名称 - payload: 消息内容(可以是字符串、字典等) - qos: 服务质量等级(0, 1, 2) - retain: 是否保留消息 - - Returns: - bool: 发布是否成功 - """ + """发布消息到指定主题""" try: - if not self.connected: + if self._get_state() != ConnectionState.CONNECTED: logger.warning("MQTT client not connected, cannot publish") return False - # 如果payload是字典,转换为JSON字符串 if isinstance(payload, dict): payload = json.dumps(payload) @@ -147,17 +245,9 @@ class MqttClient: return False def subscribe(self, topic: str, qos: int = 0) -> bool: - """订阅主题 - - Args: - topic: 主题名称(支持通配符) - qos: 服务质量等级 - - Returns: - bool: 订阅是否成功 - """ + """订阅主题""" try: - if not self.connected: + if self._get_state() != ConnectionState.CONNECTED: logger.warning("MQTT client not connected, cannot subscribe") return False @@ -176,16 +266,9 @@ class MqttClient: return False def unsubscribe(self, topic: str) -> bool: - """取消订阅主题 - - Args: - topic: 主题名称 - - Returns: - bool: 取消订阅是否成功 - """ + """取消订阅主题""" try: - if not self.connected: + if self._get_state() != ConnectionState.CONNECTED: logger.warning("MQTT client not connected, cannot unsubscribe") return False @@ -206,18 +289,18 @@ class MqttClient: def _on_connect(self, client, userdata, flags, rc, props): """连接回调函数""" if rc == 0: - self.connected = True + self._set_state(ConnectionState.CONNECTED) + self._reset_backoff() logger.info(f"Connected to MQTT broker with result code {rc}") - # 订阅默认主题 self._subscribe_default_topics() - # 调用外部回调 if self.on_connect_callback: self.on_connect_callback(client, userdata, flags, rc) else: - self.connected = False + self._set_state(ConnectionState.DISCONNECTED) logger.error(f"Failed to connect to MQTT broker, result code {rc}") + self._schedule_reconnect() def _on_message(self, client, userdata, msg): """消息接收回调函数""" @@ -227,23 +310,25 @@ class MqttClient: logger.debug(f"Received message on {topic}: {payload}") - # 调用外部回调 if self.on_message_callback: - #在新线程中调用外部回调 thread = threading.Thread(target=self.on_message_callback, args=(client, userdata, msg)) thread.start() - + except Exception as e: logger.error(f"Error processing message: {e}") def _on_disconnect(self, client, userdata, rc, props, flags): """断开连接回调函数""" - self.connected = False - logger.info(f"Disconnected from MQTT broker with result code {rc}") + current_state = self._get_state() - # 调用外部回调 - if self.on_disconnect_callback: - self.on_disconnect_callback(client, userdata, rc) + if current_state == ConnectionState.CONNECTED or current_state == ConnectionState.CONNECTING: + self._set_state(ConnectionState.DISCONNECTED) + logger.info(f"Disconnected from MQTT broker with result code {rc}") + + if self.on_disconnect_callback: + self.on_disconnect_callback(client, userdata, rc) + + self._schedule_reconnect() def _subscribe_default_topics(self): """订阅默认主题""" @@ -251,7 +336,6 @@ class MqttClient: topic_prefix = config_manager.get('mqtt.topic_prefix', 'v1/cpycal/') server_id = config_manager.get('server_id', '1') - # 订阅控制主题 control_topic = f"{topic_prefix}{server_id}" self.subscribe(control_topic) @@ -261,56 +345,30 @@ class MqttClient: logger.error(f"Error subscribing to default topics: {e}") def get_status_topic(self) -> str: - """获取状态主题 - - Returns: - str: 状态主题名称 - """ + """获取状态主题""" topic_prefix = config_manager.get('mqtt.topic_prefix', 'v1/cpycal/') server_id = config_manager.get('server_id', '1') return f"{topic_prefix}{server_id}/status" def get_control_topic(self) -> str: - """获取控制主题 - - Returns: - str: 控制主题名称 - """ + """获取控制主题""" topic_prefix = config_manager.get('mqtt.topic_prefix', 'v1/cpycal/') server_id = config_manager.get('server_id', '1') return f"{topic_prefix}{server_id}/control" def get_data_topic(self) -> str: - """获取数据主题 - - Returns: - str: 数据主题名称 - """ + """获取数据主题""" topic_prefix = config_manager.get('mqtt.topic_prefix', 'v1/cpycal/') server_id = config_manager.get('server_id', '1') return f"{topic_prefix}{server_id}/data" def publish_status(self, status: Dict[str, Any]) -> bool: - """发布状态消息 - - Args: - status: 状态字典 - - Returns: - bool: 发布是否成功 - """ + """发布状态消息""" topic = self.get_status_topic() return self.publish(topic, status, qos=1, retain=True) def publish_data(self, data: Dict[str, Any]) -> bool: - """发布数据消息 - - Args: - data: 数据字典 - - Returns: - bool: 发布是否成功 - """ + """发布数据消息""" topic = self.get_data_topic() return self.publish(topic, data, qos=0, retain=False) @@ -318,13 +376,7 @@ class MqttClient: on_connect: Optional[Callable] = None, on_message: Optional[Callable] = None, on_disconnect: Optional[Callable] = None): - """设置回调函数 - - Args: - on_connect: 连接回调函数 - on_message: 消息回调函数 - on_disconnect: 断开连接回调函数 - """ + """设置回调函数""" if on_connect: self.on_connect_callback = on_connect if on_message: @@ -333,9 +385,5 @@ class MqttClient: self.on_disconnect_callback = on_disconnect def is_connected(self) -> bool: - """检查是否已连接 - - Returns: - bool: 是否已连接 - """ - return self.connected + """检查是否已连接""" + return self._get_state() == ConnectionState.CONNECTED \ No newline at end of file