1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
|
use crate::atuin_client::{
database::{ClientSqlite, OptFilters},
history::History,
settings::{SearchMode, Settings},
};
use crate::atuin_daemon::client::SearchClient;
use async_trait::async_trait;
use atuin_nucleo_matcher::{
Config, Matcher, Utf32Str,
pattern::{CaseMatching, Normalization, Pattern},
};
use eyre::Result;
use tracing::{Level, debug, instrument, span};
use uuid::Uuid;
use super::{SearchEngine, SearchState};
pub(crate) struct Search {
client: Option<SearchClient>,
query_id: u64,
#[cfg(unix)]
socket_path: String,
}
impl Search {
pub(crate) fn new(settings: &Settings) -> Self {
Self {
client: None,
query_id: 0,
#[cfg(unix)]
socket_path: settings.daemon.socket_path.clone(),
}
}
#[instrument(skip_all, level = Level::TRACE, name = "get_daemon_client")]
async fn get_client(&mut self) -> Result<&mut SearchClient> {
if self.client.is_none() {
self.connect().await?;
}
Ok(self.client.as_mut().unwrap())
}
async fn connect(&mut self) -> Result<()> {
#[cfg(unix)]
let client = SearchClient::new(self.socket_path.clone()).await?;
self.client = Some(client);
Ok(())
}
fn next_query_id(&mut self) -> u64 {
self.query_id += 1;
self.query_id
}
/// Check if query contains regex pattern (r/.../)
/// Nucleo doesn't support regex, so we fall back to database search
fn contains_regex_pattern(query: &str) -> bool {
query.starts_with("r/") || query.contains(" r/")
}
#[instrument(skip_all, level = Level::TRACE, name = "daemon_db_fallback")]
async fn fallback_to_db_search(
&self,
state: &SearchState,
db: &ClientSqlite,
) -> Result<Vec<History>> {
let results = db
.search(
SearchMode::FullText,
state.filter_mode,
&state.context,
state.input.as_str(),
OptFilters {
limit: Some(200),
..Default::default()
},
)
.await
.map_or(Vec::new(), |r| r.into_iter().collect());
Ok(results)
}
#[instrument(skip_all, level = Level::TRACE, name = "hydrate_from_db", fields(count = ids.len()))]
async fn hydrate_from_db(&self, db: &ClientSqlite, ids: &[String]) -> Result<Vec<History>> {
let placeholders: Vec<String> = ids.iter().map(|id| format!("'{id}'")).collect();
let sql_query = format!(
"SELECT * FROM history WHERE id IN ({}) ORDER BY timestamp DESC",
placeholders.join(",")
);
Ok(db.query_history(&sql_query).await?)
}
}
#[async_trait]
impl SearchEngine for Search {
#[instrument(skip_all, level = Level::TRACE, name = "daemon_search", fields(query = %state.input.as_str()))]
async fn full_query(
&mut self,
state: &SearchState,
db: &mut ClientSqlite,
) -> Result<Vec<History>> {
let query = state.input.as_str().to_string();
// Fall back to database for regex queries (Nucleo doesn't support regex)
if Self::contains_regex_pattern(&query) {
debug!(query = %query, "[daemon-client] regex detected, falling back to db");
return self.fallback_to_db_search(state, db).await;
}
let query_id = self.next_query_id();
let span =
span!(Level::TRACE, "daemon_search.req_resp", query = %query, query_id = query_id);
// Try to connect and search; if it fails with a retriable error,
// auto-start the daemon and retry once.
let first_attempt = async {
let client = self.get_client().await?;
client
.search(
query.clone(),
query_id,
state.filter_mode,
Some(state.context.clone()),
)
.await
}
.await;
let mut stream = match first_attempt {
Ok(stream) => stream,
Err(err) => return Err(err),
};
let mut ids = Vec::with_capacity(200);
span!(Level::TRACE, "daemon_search.resp")
.in_scope(async || {
while let Ok(Some(response)) = stream.message().await {
let span2 = span!(
Level::TRACE,
"daemon_search.resp.item",
query_id = response.query_id
);
let _span2 = span2.enter();
// Only process if the query_id matches (prevents stale responses)
if response.query_id == query_id {
let uuids = response
.ids
.iter()
.map(|id| {
let bytes: [u8; 16] =
id.as_slice().try_into().expect("id should be 16 bytes");
Uuid::from_bytes(bytes).as_simple().to_string()
})
.collect::<Vec<_>>();
ids.extend(uuids);
}
drop(_span2);
drop(span2);
}
})
.await;
drop(span);
if ids.is_empty() {
debug!(query = %query, results = 0, "[daemon-client] empty results");
return Ok(Vec::new());
}
// // Hydrate from local database
let results = self.hydrate_from_db(db, &ids).await?;
// // Reorder results to match the order from the daemon (which is ranked by relevance)
let ordered_results = span!(Level::TRACE, "reorder_results").in_scope(|| {
let mut ordered_results = Vec::with_capacity(results.len());
for id in &ids {
if let Some(history) = results.iter().find(|h| h.id.0 == *id) {
ordered_results.push(history.clone());
}
}
ordered_results
});
debug!(
query = %query,
results = results.len(),
"[daemon-client]"
);
Ok(ordered_results)
}
#[instrument(skip_all, level = Level::TRACE, name = "daemon_highlight")]
fn get_highlight_indices(&self, command: &str, search_input: &str) -> Vec<usize> {
// Use fulltext highlighting for regex queries
if Self::contains_regex_pattern(search_input) {
return super::db::get_highlight_indices_fulltext(command, search_input);
}
let mut matcher = Matcher::new(Config::DEFAULT);
let pattern = Pattern::parse(search_input, CaseMatching::Smart, Normalization::Smart);
let mut indices: Vec<u32> = Vec::new();
let mut haystack_buf = Vec::new();
let haystack = Utf32Str::new(command, &mut haystack_buf);
pattern.indices(haystack, &mut matcher, &mut indices);
// Convert u32 indices to usize
indices.into_iter().map(|i| i as usize).collect()
}
}
|
