Skip to content

refactor: move connection fault mapping helper (R2g) #94

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

Merged
KeyffMS merged 2 commits into from
Sep 16, 2026
Merged

refactor: move connection fault mapping helper (R2g) #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2d0887
refactor: move connection fault mapping helper (R2g)
KeyffMS Sep 16, 2026
1b83c20
style: rustfmt connection fault helper move
KeyffMS Sep 16, 2026
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
26 changes: 4 additions & 22 deletions crates/lantern-app/src/application.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ use thiserror::Error;

use crate::{
AuditHealth, Authorization, BackupCaptureRequest, BackupRestoreAction, BackupRestoreEffect,
BackupRestoreState, BusError, ConnectionAction, ConnectionAttemptKind, ConnectionEffect,
BackupRestoreState, ConnectionAction, ConnectionAttemptKind, ConnectionEffect,
ConnectionFailure, ConnectionStep, ConnectionWizardState, Connectivity, CsvLoggingFaultSummary,
CsvLoggingStateView, FaultAction, FaultEffect, FaultTracker, MAX_PARAMETER_BROWSER_VISIBLE,
MonitoringAction, MonitoringEffect, OperationState, ParameterAction, ParameterIntentContext,
ProfileRegistry, RestoreConfirmation, SerialConnectError, SessionEffect, SessionFault,
SessionInput, SessionState, SessionStateMachine, WriteConfirmation, WriteConfirmationModel,
WriteEffect, WriteSessionSnapshot, prepare_parameter_intent,
ProfileRegistry, RestoreConfirmation, SessionEffect, SessionInput, SessionState,
SessionStateMachine, WriteConfirmation, WriteConfirmationModel, WriteEffect,
WriteSessionSnapshot, prepare_parameter_intent,
};

mod connection;
Expand Down Expand Up @@ -657,24 +657,6 @@ impl<R: EffectRunner> ApplicationRuntime<R> {
}
}

fn session_fault_for_connect_error(error: &SerialConnectError) -> SessionFault {
match error {
SerialConnectError::Missing { .. } | SerialConnectError::IdentityChanged { .. } => {
SessionFault::PortRemoved
}
SerialConnectError::PermissionDenied { .. } => {
SessionFault::Transport(BusError::PermissionDenied)
}
SerialConnectError::PortBusy { .. } => SessionFault::Transport(BusError::PortBusy),
SerialConnectError::NotCharacterDevice { .. }
| SerialConnectError::InvalidPathEncoding { .. }
| SerialConnectError::InvalidSettings(_)
| SerialConnectError::StableIdentityRequired { .. }
| SerialConnectError::UnsupportedRs485Ioctl { .. }
| SerialConnectError::Io { .. } => SessionFault::Transport(BusError::Io(error.to_string())),
}
}

#[cfg(test)]
mod tests {
use std::{path::PathBuf, sync::Arc};
Expand Down
26 changes: 22 additions & 4 deletions crates/lantern-app/src/application/connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,34 @@ use std::time::Instant;
use lantern_domain::{IdentificationMatch, SessionId};

use crate::{
ConnectionAction, ConnectionAttemptKind, ConnectionEffect, ConnectionFailure, ConnectionStep,
Connectivity, FaultTracker, MonitoringEffect, SerialConnectError, SessionEffect, SessionInput,
SessionState, identification_error_attempt, identification_report_export,
BusError, ConnectionAction, ConnectionAttemptKind, ConnectionEffect, ConnectionFailure,
ConnectionStep, Connectivity, FaultTracker, MonitoringEffect, SerialConnectError,
SessionEffect, SessionFault, SessionInput, SessionState, identification_error_attempt,
identification_report_export,
};

use super::{
ApplicationEffect, ApplicationMonitoringState, ApplicationParameterState, ApplicationState,
session_fault_for_connect_error,
};

fn session_fault_for_connect_error(error: &SerialConnectError) -> SessionFault {
match error {
SerialConnectError::Missing { .. } | SerialConnectError::IdentityChanged { .. } => {
SessionFault::PortRemoved
}
SerialConnectError::PermissionDenied { .. } => {
SessionFault::Transport(BusError::PermissionDenied)
}
SerialConnectError::PortBusy { .. } => SessionFault::Transport(BusError::PortBusy),
SerialConnectError::NotCharacterDevice { .. }
| SerialConnectError::InvalidPathEncoding { .. }
| SerialConnectError::InvalidSettings(_)
| SerialConnectError::StableIdentityRequired { .. }
| SerialConnectError::UnsupportedRs485Ioctl { .. }
| SerialConnectError::Io { .. } => SessionFault::Transport(BusError::Io(error.to_string())),
}
}

impl ApplicationState {
pub(super) fn reduce_connection(&mut self, action: ConnectionAction) -> Vec<ApplicationEffect> {
match action {
Expand Down
Loading