Skip to content

Commit e35e84b

Browse files
authored
fix(desktop): move crypto commands off the main thread (#1222)
1 parent c58e988 commit e35e84b

1 file changed

Lines changed: 66 additions & 40 deletions

File tree

‎desktop/src-tauri/src/commands/identity.rs‎

Lines changed: 66 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -64,30 +64,38 @@ pub fn get_media_proxy_port(state: State<'_, AppState>) -> u16 {
6464
}
6565

6666
#[tauri::command]
67-
pub fn sign_event(
67+
pub async fn sign_event(
6868
kind: u16,
6969
content: String,
7070
created_at: Option<u64>,
7171
tags: Vec<Vec<String>>,
7272
state: State<'_, AppState>,
7373
) -> Result<String, String> {
74-
let keys = state.keys.lock().map_err(|error| error.to_string())?;
74+
let keys = state
75+
.keys
76+
.lock()
77+
.map_err(|error| error.to_string())?
78+
.clone();
7579

76-
let nostr_tags = tags
77-
.into_iter()
78-
.map(|tag| Tag::parse(tag).map_err(|error| format!("invalid tag: {error}")))
79-
.collect::<Result<Vec<_>, _>>()?;
80+
tauri::async_runtime::spawn_blocking(move || {
81+
let nostr_tags = tags
82+
.into_iter()
83+
.map(|tag| Tag::parse(tag).map_err(|error| format!("invalid tag: {error}")))
84+
.collect::<Result<Vec<_>, _>>()?;
8085

81-
let mut builder = EventBuilder::new(Kind::Custom(kind), content).tags(nostr_tags);
82-
if let Some(created_at) = created_at {
83-
builder = builder.custom_created_at(Timestamp::from(created_at));
84-
}
86+
let mut builder = EventBuilder::new(Kind::Custom(kind), content).tags(nostr_tags);
87+
if let Some(created_at) = created_at {
88+
builder = builder.custom_created_at(Timestamp::from(created_at));
89+
}
8590

86-
let event = builder
87-
.sign_with_keys(&keys)
88-
.map_err(|error| format!("sign failed: {error}"))?;
91+
let event = builder
92+
.sign_with_keys(&keys)
93+
.map_err(|error| format!("sign failed: {error}"))?;
8994

90-
Ok(event.as_json())
95+
Ok(event.as_json())
96+
})
97+
.await
98+
.map_err(|e| format!("spawn_blocking failed: {e}"))?
9199
}
92100

93101
#[tauri::command]
@@ -197,49 +205,67 @@ pub fn import_identity(
197205
}
198206

199207
#[tauri::command]
200-
pub fn create_auth_event(
208+
pub async fn create_auth_event(
201209
challenge: String,
202210
relay_url: String,
203211
state: State<'_, AppState>,
204212
) -> Result<String, String> {
205-
let keys = state.keys.lock().map_err(|error| error.to_string())?;
213+
let keys = state
214+
.keys
215+
.lock()
216+
.map_err(|error| error.to_string())?
217+
.clone();
206218

207-
let tags = vec![
208-
Tag::parse(vec!["relay", &relay_url])
209-
.map_err(|error| format!("relay tag failed: {error}"))?,
210-
Tag::parse(vec!["challenge", &challenge])
211-
.map_err(|error| format!("challenge tag failed: {error}"))?,
212-
];
219+
tauri::async_runtime::spawn_blocking(move || {
220+
let tags = vec![
221+
Tag::parse(vec!["relay", &relay_url])
222+
.map_err(|error| format!("relay tag failed: {error}"))?,
223+
Tag::parse(vec!["challenge", &challenge])
224+
.map_err(|error| format!("challenge tag failed: {error}"))?,
225+
];
213226

214-
let event = EventBuilder::new(Kind::Custom(22242), "")
215-
.tags(tags)
216-
.sign_with_keys(&keys)
217-
.map_err(|error| format!("sign failed: {error}"))?;
227+
let event = EventBuilder::new(Kind::Custom(22242), "")
228+
.tags(tags)
229+
.sign_with_keys(&keys)
230+
.map_err(|error| format!("sign failed: {error}"))?;
218231

219-
Ok(event.as_json())
232+
Ok(event.as_json())
233+
})
234+
.await
235+
.map_err(|e| format!("spawn_blocking failed: {e}"))?
220236
}
221237

222238
#[tauri::command]
223-
pub fn nip44_encrypt_to_self(
239+
pub async fn nip44_encrypt_to_self(
224240
plaintext: String,
225241
state: State<'_, AppState>,
226242
) -> Result<String, String> {
227-
let keys = state.keys.lock().map_err(|e| e.to_string())?;
228-
nip44::encrypt(
229-
keys.secret_key(),
230-
&keys.public_key(),
231-
&plaintext,
232-
nip44::Version::V2,
233-
)
234-
.map_err(|e| format!("nip44 encrypt failed: {e}"))
243+
let keys = state.keys.lock().map_err(|e| e.to_string())?.clone();
244+
245+
tauri::async_runtime::spawn_blocking(move || {
246+
nip44::encrypt(
247+
keys.secret_key(),
248+
&keys.public_key(),
249+
&plaintext,
250+
nip44::Version::V2,
251+
)
252+
.map_err(|e| format!("nip44 encrypt failed: {e}"))
253+
})
254+
.await
255+
.map_err(|e| format!("spawn_blocking failed: {e}"))?
235256
}
236257

237258
#[tauri::command]
238-
pub fn nip44_decrypt_from_self(
259+
pub async fn nip44_decrypt_from_self(
239260
ciphertext: String,
240261
state: State<'_, AppState>,
241262
) -> Result<String, String> {
242-
let keys = state.keys.lock().map_err(|e| e.to_string())?;
243-
nip44::decrypt(keys.secret_key(), &keys.public_key(), &ciphertext)
244-
.map_err(|e| format!("nip44 decrypt failed: {e}"))
263+
let keys = state.keys.lock().map_err(|e| e.to_string())?.clone();
264+
265+
tauri::async_runtime::spawn_blocking(move || {
266+
nip44::decrypt(keys.secret_key(), &keys.public_key(), &ciphertext)
267+
.map_err(|e| format!("nip44 decrypt failed: {e}"))
268+
})
269+
.await
270+
.map_err(|e| format!("spawn_blocking failed: {e}"))?
245271
}

0 commit comments

Comments
 (0)