lfg2025/archy
1
0
Fork 0
Code Issues 16 Pull Requests Actions Packages Projects Releases 44 Wiki Activity

fix(mesh): route DM-via-channel on channel 0 (channel 1 unsupported)

Browse Source 
Firmware rejected send_channel_text(1, ...) with "Unsupported command"
because channel 1 isn't configured on the device. Revert to channel 0
for the DM wrapper — the 0xD1 marker + dest_prefix header still
disambiguates DMs from plain public-channel text. Also revert
Mesh.vue publicChannel back to index 0 so user-typed broadcasts
target the same (only) working channel.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Dorian 2026-04-14 10:40:28 -04:00
parent d514e0e5e4
commit 164f938982
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/archipelago/src/mesh/listener/session.rs
View File

@ -309,7 +309,7 @@ async fn handle_send_command(
// payload with a recipient pubkey-prefix header so the // payload with a recipient pubkey-prefix header so the
// receiver side can tell it apart from normal channel text. // receiver side can tell it apart from normal channel text.
let wrapped = wrap_dm_via_channel(&dest_pubkey_prefix, &payload); let wrapped = wrap_dm_via_channel(&dest_pubkey_prefix, &payload);
if let Err(e) = device.send_channel_text(1, &wrapped).await { if let Err(e) = device.send_channel_text(0, &wrapped).await {
*consecutive_write_failures += 1; *consecutive_write_failures += 1;
warn!(failures = *consecutive_write_failures, "Failed to send DM via channel: {}", e); warn!(failures = *consecutive_write_failures, "Failed to send DM via channel: {}", e);
} else { } else {
@ -350,7 +350,7 @@ async fn handle_send_command(
// Single frame — wraps under 160B. 160 − 7 wrapper − some // Single frame — wraps under 160B. 160 − 7 wrapper − some
// safety margin leaves ≈133 bytes for the base64 payload. // safety margin leaves ≈133 bytes for the base64 payload.
let wrapped = wrap_dm_via_channel(&dest_pubkey_prefix, encoded.as_bytes()); let wrapped = wrap_dm_via_channel(&dest_pubkey_prefix, encoded.as_bytes());
if let Err(e) = device.send_channel_text(1, &wrapped).await { if let Err(e) = device.send_channel_text(0, &wrapped).await {
*consecutive_write_failures += 1; *consecutive_write_failures += 1;
warn!(failures = *consecutive_write_failures, "Failed to send raw DM-via-channel: {}", e); warn!(failures = *consecutive_write_failures, "Failed to send raw DM-via-channel: {}", e);
} else { } else {
@ -378,7 +378,7 @@ async fn handle_send_command(
for (idx, chunk) in chunks.iter().enumerate() { for (idx, chunk) in chunks.iter().enumerate() {
let frame = format!("MC{:02x}{:02x}{:02x}{}", msg_id, idx as u8, total, chunk); let frame = format!("MC{:02x}{:02x}{:02x}{}", msg_id, idx as u8, total, chunk);
let wrapped = wrap_dm_via_channel(&dest_pubkey_prefix, frame.as_bytes()); let wrapped = wrap_dm_via_channel(&dest_pubkey_prefix, frame.as_bytes());
if let Err(e) = device.send_channel_text(1, &wrapped).await { if let Err(e) = device.send_channel_text(0, &wrapped).await {
*consecutive_write_failures += 1; *consecutive_write_failures += 1;
warn!(failures = *consecutive_write_failures, chunk = idx, "Chunk DM-via-channel send failed: {}", e); warn!(failures = *consecutive_write_failures, chunk = idx, "Chunk DM-via-channel send failed: {}", e);
break; break;

2
neode-ui/src/views/Mesh.vue
View File

@ -41,7 +41,7 @@ let pollInterval: ReturnType<typeof setInterval> | null = null
// + RF region. Slot 1 is set by archipelago first-boot to a hash derived // + RF region. Slot 1 is set by archipelago first-boot to a hash derived
// from the channel_name, so all archipelago nodes are guaranteed on the // from the channel_name, so all archipelago nodes are guaranteed on the
// same channel regardless of region. // same channel regardless of region.
const publicChannel = { index: 1, name: 'Public' } const publicChannel = { index: 0, name: 'Public' }
// Channel contact_id convention: matches backend u32::MAX - channel_index // Channel contact_id convention: matches backend u32::MAX - channel_index
function channelContactId(channelIndex: number): number { function channelContactId(channelIndex: number): number {