Skip to content

fix: custom MQTT advertised port #73

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

Open
ndesgranges wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −5
Open

fix: custom MQTT advertised port #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion mitm_redirect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ def _rewrite_value(text: str) -> str:
args.local_api,
fallback_port=DEFAULT_LOCAL_API_PORT,
)
local_api = _format_authority(local_api_host, local_api_port, default_port=443)
local_api = _format_authority(local_api_host, local_api_port, default_port=None)
local_mqtt_host, local_mqtt_port = _parse_endpoint(
args.local_mqtt or "",
fallback_host=local_api_host,
Expand Down
12 changes: 8 additions & 4 deletions onboarding_shared.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,18 @@ def perform_onboarding_preflight(
)
output.write(_tls_success_message(f"https://{api_host}:{api_port}", allow_insecure_tls))

output.write(f"Checking MQTT TLS listener at ssl://{api_host}:{mqtt_port}...\n")
# Prefer advertised port (external_tls mode) over internal listener port
advertised_mqtt_port = status.get("advertised_mqtt_tls_port")
mqtt_preflight_port = advertised_mqtt_port if advertised_mqtt_port else mqtt_port

output.write(f"Checking MQTT TLS listener at ssl://{api_host}:{mqtt_preflight_port}...\n")
_probe_tls_endpoint(
host=api_host,
port=mqtt_port,
port=mqtt_preflight_port,
allow_insecure_tls=allow_insecure_tls,
label=f"ssl://{api_host}:{mqtt_port}",
label=f"ssl://{api_host}:{mqtt_preflight_port}",
)
output.write(_tls_success_message(f"ssl://{api_host}:{mqtt_port}", allow_insecure_tls))
output.write(_tls_success_message(f"ssl://{api_host}:{mqtt_preflight_port}", allow_insecure_tls))
return status


Expand Down
2 changes: 2 additions & 0 deletions src/roborock_local_server/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1334,6 +1334,8 @@ def _status_payload(self) -> dict[str, Any]:
"support": PROJECT_SUPPORT,
"inventory_path": str(self.paths.inventory_path),
"cloud_snapshot_path": str(self.paths.cloud_snapshot_path),
"advertised_https_port": self.config.network.advertised_https_port,
"advertised_mqtt_tls_port": self.config.network.advertised_mqtt_tls_port,
}

def _vacuums_payload(self) -> dict[str, Any]:
Expand Down