fix: ping as engine instance method — same lifecycle as call
Ping was a static JNI method that loaded the .so before nativeInit, crashing jemalloc. Now ping is an instance method on WzpEngine: - Engine is created once (nativeInit), reused for both ping and call - pingRelay() uses same tokio runtime pattern as startCall() - Auto-pings all servers on app launch (after engine init) - No process restart needed - TOFU fingerprints saved on first successful ping Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -208,55 +208,61 @@ class CallViewModel : ViewModel(), WzpCallback {
|
||||
settings?.saveSelectedServer(_selectedServer.value)
|
||||
}
|
||||
|
||||
/** Load saved ping results from last ping-and-exit cycle. */
|
||||
fun loadSavedPingResults() {
|
||||
val s = settings ?: return
|
||||
val results = mutableMapOf<String, PingResult>()
|
||||
val known = mutableMapOf<String, String>()
|
||||
_servers.value.forEach { server ->
|
||||
val rtt = s.loadPingRtt(server.address)
|
||||
val fp = s.loadServerFingerprint(server.address)
|
||||
if (rtt >= 0) {
|
||||
results[server.address] = PingResult(rttMs = rtt, serverFingerprint = fp ?: "")
|
||||
}
|
||||
fp?.let { known[server.address] = it }
|
||||
}
|
||||
_pingResults.value = results
|
||||
_knownFingerprints.value = known
|
||||
}
|
||||
|
||||
/**
|
||||
* Ping all servers via native QUIC, save results, then exit process.
|
||||
* On restart, saved results are loaded. This avoids the jemalloc crash
|
||||
* by ensuring the native .so is only loaded once per process lifetime.
|
||||
* Ping all servers via native QUIC. Requires engine to be initialized.
|
||||
* Creates engine if needed, pings, keeps engine alive for subsequent Connect.
|
||||
*/
|
||||
fun pingAndExit() {
|
||||
fun pingAllServers() {
|
||||
viewModelScope.launch {
|
||||
val results = mutableMapOf<String, PingResult>()
|
||||
_servers.value.forEach { server ->
|
||||
val pr = withContext(Dispatchers.IO) {
|
||||
com.wzp.net.RelayPinger.ping(server.address)
|
||||
// Ensure engine exists
|
||||
if (engine == null || engine?.isInitialized != true) {
|
||||
try {
|
||||
engine = WzpEngine(this@CallViewModel).also { it.init() }
|
||||
engineInitialized = true
|
||||
} catch (e: Exception) {
|
||||
Log.w(TAG, "engine init for ping failed: $e")
|
||||
return@launch
|
||||
}
|
||||
results[server.address] = PingResult(
|
||||
rttMs = pr.rttMs,
|
||||
serverFingerprint = pr.serverFingerprint,
|
||||
)
|
||||
// Save results
|
||||
settings?.savePingRtt(server.address, pr.rttMs)
|
||||
if (pr.serverFingerprint.isNotEmpty()) {
|
||||
val saved = settings?.loadServerFingerprint(server.address)
|
||||
if (saved == null) {
|
||||
settings?.saveServerFingerprint(server.address, pr.serverFingerprint)
|
||||
}
|
||||
}
|
||||
val eng = engine ?: return@launch
|
||||
|
||||
val results = mutableMapOf<String, PingResult>()
|
||||
val known = mutableMapOf<String, String>()
|
||||
_servers.value.forEach { server ->
|
||||
val json = withContext(Dispatchers.IO) {
|
||||
eng.pingRelay(server.address)
|
||||
}
|
||||
if (json != null) {
|
||||
try {
|
||||
val obj = JSONObject(json)
|
||||
val rtt = obj.getInt("rtt_ms")
|
||||
val fp = obj.optString("server_fingerprint", "")
|
||||
results[server.address] = PingResult(rttMs = rtt, serverFingerprint = fp)
|
||||
// TOFU
|
||||
if (fp.isNotEmpty()) {
|
||||
val saved = settings?.loadServerFingerprint(server.address)
|
||||
if (saved == null) settings?.saveServerFingerprint(server.address, fp)
|
||||
known[server.address] = saved ?: fp
|
||||
}
|
||||
} catch (_: Exception) {}
|
||||
}
|
||||
}
|
||||
_pingResults.value = results
|
||||
// Exit process — next launch loads saved results, native .so reinits cleanly
|
||||
delay(300) // let UI update
|
||||
System.exit(0)
|
||||
_knownFingerprints.value = known
|
||||
}
|
||||
}
|
||||
|
||||
/** Load saved TOFU fingerprints. */
|
||||
fun loadSavedFingerprints() {
|
||||
val known = mutableMapOf<String, String>()
|
||||
_servers.value.forEach { server ->
|
||||
settings?.loadServerFingerprint(server.address)?.let {
|
||||
known[server.address] = it
|
||||
}
|
||||
}
|
||||
_knownFingerprints.value = known
|
||||
}
|
||||
|
||||
/** Get lock status for a server. */
|
||||
fun lockStatus(address: String): LockStatus {
|
||||
val pr = _pingResults.value[address] ?: return LockStatus.UNKNOWN
|
||||
|
||||
@@ -90,8 +90,11 @@ fun InCallScreen(
|
||||
|
||||
var showManageRelays by remember { mutableStateOf(false) }
|
||||
|
||||
// Load saved ping results from last ping-and-exit cycle
|
||||
LaunchedEffect(Unit) { viewModel.loadSavedPingResults() }
|
||||
// Ping servers on launch — engine init + QUIC ping, no restart needed
|
||||
LaunchedEffect(Unit) {
|
||||
viewModel.loadSavedFingerprints()
|
||||
viewModel.pingAllServers()
|
||||
}
|
||||
|
||||
Surface(
|
||||
modifier = Modifier.fillMaxSize(),
|
||||
@@ -227,21 +230,6 @@ fun InCallScreen(
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(8.dp))
|
||||
|
||||
// Ping button — pings all servers via native QUIC, saves results, exits app
|
||||
OutlinedButton(
|
||||
onClick = { viewModel.pingAndExit() },
|
||||
modifier = Modifier.fillMaxWidth().height(40.dp),
|
||||
shape = RoundedCornerShape(8.dp),
|
||||
) {
|
||||
Text(
|
||||
"Ping Servers (restarts app)",
|
||||
style = MaterialTheme.typography.labelSmall,
|
||||
color = TextDim
|
||||
)
|
||||
}
|
||||
|
||||
errorMessage?.let { err ->
|
||||
Spacer(modifier = Modifier.height(8.dp))
|
||||
Text(text = err, color = Red, style = MaterialTheme.typography.bodySmall)
|
||||
|
||||
Reference in New Issue
Block a user