feat: upgrade to donglora-client 0.2, simplify connection, fix org URLs
- Upgrade donglora-client from 0.1 to 0.2 (ping-on-connect validation) - Remove manual mux/serial fallback and manual ping — handled by client now - Fix repository/homepage URLs to github.com/donglora/bridge - Fix README links to donglora GitHub org
This commit is contained in:
5 files changed
+37
-36
No files matched your search
@@ -1,5 +1,23 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [0.3.0] - 2026-04-07
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Upgraded to `donglora-client` 0.2: all connections now auto-validate via
|
||||||
|
ping-on-connect, rejecting non-DongLoRa serial devices within 200ms.
|
||||||
|
- Simplified connection logic — removed manual mux/serial fallback and manual
|
||||||
|
ping; `donglora_client::connect()` handles the full fallback chain and
|
||||||
|
validation internally.
|
||||||
|
- Config negotiation detects mux vs serial via transport type instead of
|
||||||
|
string comparison.
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Repository and homepage URLs now point to `github.com/donglora/bridge`
|
||||||
|
(was `swaits/donglora-bridge`).
|
||||||
|
- README links updated to `donglora` GitHub org.
|
||||||
|
|
||||||
## [0.2.2] - 2026-04-06
|
## [0.2.2] - 2026-04-06
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|||||||
Generated
+3
-3
@@ -906,7 +906,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "donglora-bridge"
|
name = "donglora-bridge"
|
||||||
version = "0.2.2"
|
version = "0.3.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"blake3",
|
"blake3",
|
||||||
@@ -938,9 +938,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "donglora-client"
|
name = "donglora-client"
|
||||||
version = "0.1.0"
|
version = "0.2.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "162468289ac189a798c4ecd961ed92c5dde2d9c5709d779ae324e0bb9a5ac4dc"
|
checksum = "1936935d31ab56a8cd70ceecfd6d447f2628a73a123e1cfe37ee4987eab0fa70"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"serialport",
|
"serialport",
|
||||||
|
|||||||
+4
-4
@@ -1,12 +1,12 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "donglora-bridge"
|
name = "donglora-bridge"
|
||||||
version = "0.2.2"
|
version = "0.3.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
authors = ["Stephen Waits <steve@waits.net>"]
|
authors = ["Stephen Waits <steve@waits.net>"]
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
description = "Peer-to-peer LoRa bridge using iroh and DongLoRa"
|
description = "Peer-to-peer LoRa bridge using iroh and DongLoRa"
|
||||||
repository = "https://github.com/swaits/donglora-bridge"
|
repository = "https://github.com/donglora/bridge"
|
||||||
homepage = "https://github.com/swaits/donglora-bridge"
|
homepage = "https://github.com/donglora/bridge"
|
||||||
keywords = ["lora", "bridge", "gossip", "p2p", "iot"]
|
keywords = ["lora", "bridge", "gossip", "p2p", "iot"]
|
||||||
categories = ["network-programming", "command-line-utilities"]
|
categories = ["network-programming", "command-line-utilities"]
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
@@ -14,7 +14,7 @@ rust-version = "1.94.1"
|
|||||||
exclude = [".jj/", ".github/"]
|
exclude = [".jj/", ".github/"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
donglora-client = "0.1"
|
donglora-client = "0.2"
|
||||||
iroh = "0.97"
|
iroh = "0.97"
|
||||||
iroh-gossip = "0.97"
|
iroh-gossip = "0.97"
|
||||||
mainline = { version = "6", features = ["async"] }
|
mainline = { version = "6", features = ["async"] }
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# donglora-bridge
|
# donglora-bridge
|
||||||
|
|
||||||
[](https://github.com/swaits/donglora-bridge/actions/workflows/ci.yml)
|
[](https://github.com/donglora/bridge/actions/workflows/ci.yml)
|
||||||
[](LICENSE)
|
[](LICENSE)
|
||||||

|

|
||||||
|
|
||||||
@@ -25,12 +25,12 @@ through an encrypted peer-to-peer gossip swarm.
|
|||||||
|
|
||||||
### 1. A DongLoRa radio
|
### 1. A DongLoRa radio
|
||||||
|
|
||||||
[DongLoRa](https://github.com/swaits/donglora) is open-source firmware that
|
[DongLoRa](https://github.com/donglora/firmware) is open-source firmware that
|
||||||
turns a supported LoRa development board (such as a Heltec WiFi LoRa 32 or
|
turns a supported LoRa development board (such as a Heltec WiFi LoRa 32 or
|
||||||
similar ESP32+SX1262 board) into a USB LoRa dongle. You will need to:
|
similar ESP32+SX1262 board) into a USB LoRa dongle. You will need to:
|
||||||
|
|
||||||
1. **Get a board** -- any ESP32 board with an SX1262 LoRa radio that DongLoRa
|
1. **Get a board** -- any ESP32 board with an SX1262 LoRa radio that DongLoRa
|
||||||
supports. See the [DongLoRa README](https://github.com/swaits/donglora) for
|
supports. See the [DongLoRa README](https://github.com/donglora/firmware) for
|
||||||
the full list.
|
the full list.
|
||||||
2. **Flash the DongLoRa firmware** onto the board. Instructions are in the
|
2. **Flash the DongLoRa firmware** onto the board. Instructions are in the
|
||||||
DongLoRa repository.
|
DongLoRa repository.
|
||||||
@@ -68,7 +68,7 @@ mise use -g cargo:donglora-bridge
|
|||||||
Or build from source:
|
Or build from source:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
git clone https://github.com/swaits/donglora-bridge.git
|
git clone https://github.com/donglora/bridge.git
|
||||||
cd donglora-bridge
|
cd donglora-bridge
|
||||||
cargo build --release
|
cargo build --release
|
||||||
```
|
```
|
||||||
|
|||||||
+8
-25
@@ -6,7 +6,7 @@
|
|||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
use anyhow::{Context, Result};
|
use anyhow::{Context, Result};
|
||||||
use donglora_client::{RadioConfig, Response, Transport};
|
use donglora_client::{AnyTransport, RadioConfig, Response, Transport};
|
||||||
use tokio::sync::mpsc;
|
use tokio::sync::mpsc;
|
||||||
use tracing::{debug, error, info, warn};
|
use tracing::{debug, error, info, warn};
|
||||||
|
|
||||||
@@ -93,30 +93,13 @@ fn connect_and_run(
|
|||||||
let timeout = Duration::from_secs(10);
|
let timeout = Duration::from_secs(10);
|
||||||
|
|
||||||
info!("connecting to dongle...");
|
info!("connecting to dongle...");
|
||||||
let (mut client, device) = if let Some(port) = port {
|
let mut client = donglora_client::connect(port, timeout)?;
|
||||||
let c = donglora_client::connect(Some(port), timeout)?;
|
let is_mux = matches!(client.transport(), AnyTransport::Mux(_));
|
||||||
(c, shorten_path(port))
|
let device = if is_mux { "mux".to_string() } else { port.map_or_else(|| "usb".to_string(), shorten_path) };
|
||||||
} else if let Ok(c) = donglora_client::connect_mux_auto(timeout) {
|
info!("[radio] connected and validated: {device}");
|
||||||
(c, "mux".to_string())
|
|
||||||
} else {
|
|
||||||
let port_path = donglora_client::find_port().ok_or_else(|| anyhow::anyhow!("no mux or USB dongle found"))?;
|
|
||||||
info!("no mux found, connecting to serial port {port_path}");
|
|
||||||
let c = donglora_client::connect(Some(&port_path), timeout)?;
|
|
||||||
(c, shorten_path(&port_path))
|
|
||||||
};
|
|
||||||
info!("[radio] transport connected: {device}");
|
|
||||||
|
|
||||||
info!("[radio] sending ping...");
|
|
||||||
match client.ping() {
|
|
||||||
Ok(()) => info!("[radio] ping OK"),
|
|
||||||
Err(e) => {
|
|
||||||
info!("[radio] ping FAILED: {e:#}");
|
|
||||||
return Err(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
info!("[radio] negotiating config...");
|
info!("[radio] negotiating config...");
|
||||||
let (active_config, config_source) = match negotiate_config(&mut client, config, &device) {
|
let (active_config, config_source) = match negotiate_config(&mut client, config, is_mux) {
|
||||||
Ok(result) => {
|
Ok(result) => {
|
||||||
info!("[radio] config negotiated: source={:?}, config={}", result.1, format_radio_config(&result.0));
|
info!("[radio] config negotiated: source={:?}, config={}", result.1, format_radio_config(&result.0));
|
||||||
result
|
result
|
||||||
@@ -215,7 +198,7 @@ fn connect_and_run(
|
|||||||
fn negotiate_config<T: Transport>(
|
fn negotiate_config<T: Transport>(
|
||||||
client: &mut donglora_client::Client<T>,
|
client: &mut donglora_client::Client<T>,
|
||||||
desired: &RadioConfig,
|
desired: &RadioConfig,
|
||||||
device: &str,
|
is_mux: bool,
|
||||||
) -> Result<(RadioConfig, ConfigSource)> {
|
) -> Result<(RadioConfig, ConfigSource)> {
|
||||||
info!("[negotiate] get_config...");
|
info!("[negotiate] get_config...");
|
||||||
match client.get_config() {
|
match client.get_config() {
|
||||||
@@ -223,7 +206,7 @@ fn negotiate_config<T: Transport>(
|
|||||||
if configs_match(&cfg, desired) {
|
if configs_match(&cfg, desired) {
|
||||||
info!("[negotiate] get_config OK (matches desired): {}", format_radio_config(&cfg));
|
info!("[negotiate] get_config OK (matches desired): {}", format_radio_config(&cfg));
|
||||||
Ok((cfg, ConfigSource::Ours))
|
Ok((cfg, ConfigSource::Ours))
|
||||||
} else if device == "mux" {
|
} else if is_mux {
|
||||||
info!("[negotiate] get_config OK (mux config differs, accepting): {}", format_radio_config(&cfg));
|
info!("[negotiate] get_config OK (mux config differs, accepting): {}", format_radio_config(&cfg));
|
||||||
Ok((cfg, ConfigSource::Mux))
|
Ok((cfg, ConfigSource::Mux))
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in new issue
Block a user