Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1998fffe30 | ||
|
|
82095e614d |
@@ -11,8 +11,8 @@ android {
|
|||||||
applicationId = "com.expapp.trigger"
|
applicationId = "com.expapp.trigger"
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
targetSdk = 34
|
targetSdk = 34
|
||||||
versionCode = 20
|
versionCode = 22
|
||||||
versionName = "1.3.1"
|
versionName = "1.3.3"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
vectorDrawables {
|
vectorDrawables {
|
||||||
|
|||||||
@@ -93,8 +93,25 @@ class MainActivity : FragmentActivity() {
|
|||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
enableEdgeToEdge()
|
enableEdgeToEdge()
|
||||||
|
|
||||||
|
val origHandler = Thread.getDefaultUncaughtExceptionHandler()
|
||||||
|
Thread.setDefaultUncaughtExceptionHandler { thread, throwable ->
|
||||||
|
android.util.Log.e("CrashHandler", "Crash on ${thread.name}", throwable)
|
||||||
|
try {
|
||||||
|
getSharedPreferences("app_settings_prefs", Context.MODE_PRIVATE)
|
||||||
|
.edit()
|
||||||
|
.putString("last_crash_log", "${throwable.javaClass.simpleName}: ${throwable.message}\n" + throwable.stackTraceToString().take(1500))
|
||||||
|
.commit()
|
||||||
|
} catch (_: Exception) {}
|
||||||
|
origHandler?.uncaughtException(thread, throwable)
|
||||||
|
}
|
||||||
|
|
||||||
repository = DeviceRepository(SharedPrefsStorage(applicationContext))
|
repository = DeviceRepository(SharedPrefsStorage(applicationContext))
|
||||||
val settingsPrefs = getSharedPreferences("app_settings_prefs", Context.MODE_PRIVATE)
|
val settingsPrefs = getSharedPreferences("app_settings_prefs", Context.MODE_PRIVATE)
|
||||||
|
val lastCrash = settingsPrefs.getString("last_crash_log", null)
|
||||||
|
if (!lastCrash.isNullOrBlank()) {
|
||||||
|
settingsPrefs.edit().remove("last_crash_log").apply()
|
||||||
|
android.util.Log.e("CrashReport", "Recovered from crash: $lastCrash")
|
||||||
|
}
|
||||||
val hasSeeded = settingsPrefs.getBoolean("has_seeded_default_device", false)
|
val hasSeeded = settingsPrefs.getBoolean("has_seeded_default_device", false)
|
||||||
if (!hasSeeded) {
|
if (!hasSeeded) {
|
||||||
settingsPrefs.edit().putBoolean("has_seeded_default_device", true).apply()
|
settingsPrefs.edit().putBoolean("has_seeded_default_device", true).apply()
|
||||||
|
|||||||
@@ -51,21 +51,27 @@ class SharedPrefsStorage(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun JsonObject.getStringSafe(key: String, default: String = ""): String {
|
||||||
|
val elem = get(key) ?: return default
|
||||||
|
if (elem.isJsonNull || !elem.isJsonPrimitive) return default
|
||||||
|
return try { elem.asString ?: default } catch (_: Exception) { default }
|
||||||
|
}
|
||||||
|
|
||||||
class DeviceConfigDeserializer : JsonDeserializer<DeviceConfig> {
|
class DeviceConfigDeserializer : JsonDeserializer<DeviceConfig> {
|
||||||
override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): DeviceConfig {
|
override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): DeviceConfig {
|
||||||
val obj = if (json.isJsonObject) json.asJsonObject else JsonObject()
|
val obj = if (json.isJsonObject) json.asJsonObject else JsonObject()
|
||||||
return DeviceConfig(
|
return DeviceConfig(
|
||||||
id = obj.get("id")?.asString?.ifBlank { UUID.randomUUID().toString() } ?: UUID.randomUUID().toString(),
|
id = obj.getStringSafe("id").ifBlank { UUID.randomUUID().toString() },
|
||||||
name = obj.get("name")?.asString ?: "Server",
|
name = obj.getStringSafe("name", "Server"),
|
||||||
node = obj.get("node")?.asString ?: "debian",
|
node = obj.getStringSafe("node", "debian"),
|
||||||
secretKey = obj.get("secretKey")?.asString ?: "",
|
secretKey = obj.getStringSafe("secretKey"),
|
||||||
r2Url = obj.get("r2Url")?.asString ?: "",
|
r2Url = obj.getStringSafe("r2Url"),
|
||||||
powerOnUrl = obj.get("powerOnUrl")?.asString ?: "",
|
powerOnUrl = obj.getStringSafe("powerOnUrl"),
|
||||||
powerOffUrl = obj.get("powerOffUrl")?.asString ?: "",
|
powerOffUrl = obj.getStringSafe("powerOffUrl"),
|
||||||
rebootUrl = obj.get("rebootUrl")?.asString ?: "",
|
rebootUrl = obj.getStringSafe("rebootUrl"),
|
||||||
statusUrl = obj.get("statusUrl")?.asString ?: "",
|
statusUrl = obj.getStringSafe("statusUrl"),
|
||||||
syspulseUrl = obj.get("syspulseUrl")?.asString ?: "",
|
syspulseUrl = obj.getStringSafe("syspulseUrl"),
|
||||||
syspulseSecretKey = obj.get("syspulseSecretKey")?.asString ?: ""
|
syspulseSecretKey = obj.getStringSafe("syspulseSecretKey")
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,8 +48,12 @@ class SysPulseStatusDeserializer : JsonDeserializer<SysPulseStatus> {
|
|||||||
val listType = object : TypeToken<List<SysServiceInfo>>() {}.type
|
val listType = object : TypeToken<List<SysServiceInfo>>() {}.type
|
||||||
context.deserialize<List<SysServiceInfo>>(obj.get("services"), listType) ?: emptyList()
|
context.deserialize<List<SysServiceInfo>>(obj.get("services"), listType) ?: emptyList()
|
||||||
} else emptyList()
|
} else emptyList()
|
||||||
val uptime = obj.get("uptime")?.asString ?: ""
|
val uptime = if (obj.has("uptime") && !obj.get("uptime").isJsonNull && obj.get("uptime").isJsonPrimitive) {
|
||||||
val success = obj.get("success")?.asBoolean ?: true
|
try { obj.get("uptime").asString ?: "" } catch (_: Exception) { "" }
|
||||||
|
} else ""
|
||||||
|
val success = if (obj.has("success") && !obj.get("success").isJsonNull && obj.get("success").isJsonPrimitive) {
|
||||||
|
try { obj.get("success").asBoolean } catch (_: Exception) { true }
|
||||||
|
} else true
|
||||||
|
|
||||||
return SysPulseStatus(
|
return SysPulseStatus(
|
||||||
success = success,
|
success = success,
|
||||||
@@ -93,7 +97,11 @@ class SysPulseClient(
|
|||||||
|
|
||||||
fun resolveBaseUrl(device: DeviceConfig, nodeStatus: NodeStatus? = null): String {
|
fun resolveBaseUrl(device: DeviceConfig, nodeStatus: NodeStatus? = null): String {
|
||||||
if (device.syspulseUrl.isNotBlank()) {
|
if (device.syspulseUrl.isNotBlank()) {
|
||||||
return device.syspulseUrl.trim().removeSuffix("/")
|
return device.syspulseUrl.trim()
|
||||||
|
.removeSuffix("/")
|
||||||
|
.removeSuffix("/api/status")
|
||||||
|
.removeSuffix("/api")
|
||||||
|
.removeSuffix("/")
|
||||||
}
|
}
|
||||||
val ip = nodeStatus?.ip?.trim()
|
val ip = nodeStatus?.ip?.trim()
|
||||||
if (!ip.isNullOrBlank()) {
|
if (!ip.isNullOrBlank()) {
|
||||||
|
|||||||
@@ -93,7 +93,8 @@ fun CircularMetricGauge(
|
|||||||
modifier: Modifier = Modifier,
|
modifier: Modifier = Modifier,
|
||||||
size: Int = 110
|
size: Int = 110
|
||||||
) {
|
) {
|
||||||
val clampedPct = percentage.coerceIn(0.0, 100.0).toFloat()
|
val safePct = if (percentage.isNaN() || percentage.isInfinite()) 0.0 else percentage
|
||||||
|
val clampedPct = safePct.coerceIn(0.0, 100.0).toFloat()
|
||||||
val animatedSweep by animateFloatAsState(
|
val animatedSweep by animateFloatAsState(
|
||||||
targetValue = clampedPct * 2.6f, // 260 degrees arc
|
targetValue = clampedPct * 2.6f, // 260 degrees arc
|
||||||
animationSpec = tween(700, easing = FastOutSlowInEasing),
|
animationSpec = tween(700, easing = FastOutSlowInEasing),
|
||||||
|
|||||||
@@ -132,4 +132,18 @@ class DeviceRepositoryTest {
|
|||||||
assertTrue(dev.syspulseUrl.isBlank())
|
assertTrue(dev.syspulseUrl.isBlank())
|
||||||
assertTrue(dev.syspulseSecretKey.isBlank())
|
assertTrue(dev.syspulseSecretKey.isBlank())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun getDevices_whenJsonContainsExplicitNulls_doesNotCrash() {
|
||||||
|
val jsonWithNulls = """[{"id":"2dc98ae9-9f71-4f29-95a6-a59ac94d7bf6","name":"Server","node":"debian","secretKey":"Carbon@12","r2Url":null,"powerOnUrl":"https://trigger.macrodroid.com","powerOffUrl":"https://cosmos.linuxguy.space","rebootUrl":"https://cosmos.linuxguy.space","statusUrl":null,"syspulseUrl":null,"syspulseSecretKey":null}]"""
|
||||||
|
storage.putString("saved_devices_json", jsonWithNulls)
|
||||||
|
|
||||||
|
val devices = repository.getDevices()
|
||||||
|
assertEquals(1, devices.size)
|
||||||
|
val dev = devices[0]
|
||||||
|
assertEquals("", dev.r2Url)
|
||||||
|
assertEquals("", dev.statusUrl)
|
||||||
|
assertEquals("", dev.syspulseUrl)
|
||||||
|
assertEquals("", dev.syspulseSecretKey)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,45 @@
|
|||||||
|
package com.expapp.trigger.network
|
||||||
|
|
||||||
|
import com.expapp.trigger.data.model.SysPulseStatus
|
||||||
|
import com.google.gson.GsonBuilder
|
||||||
|
import org.junit.Assert.assertEquals
|
||||||
|
import org.junit.Assert.assertNotNull
|
||||||
|
import org.junit.Assert.assertTrue
|
||||||
|
import org.junit.Test
|
||||||
|
|
||||||
|
class SysPulseClientTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testDeserializeSysPulseStatus_realPayload() {
|
||||||
|
val json = """{"cpu":{"cores":4,"load":[0.17,1.25,0.88],"pct":5.01},"disk":[{"mount":"/","pct":31.22,"total_gb":115.83,"used_gb":36.16},{"mount":"/mnt/storage","pct":1.95,"total_gb":1862.11,"used_gb":36.27}],"ram":{"pct":40.78,"total_mb":7855,"used_mb":3203},"services":[{"name":"openclaw","unit":"openclaw-gateway.service","active":true,"enabled":true,"state":"running","pid":927},{"name":"forge","unit":"forge.service","active":true,"enabled":true,"state":"exited","pid":1751},{"name":"oort","unit":"oort.service","active":true,"enabled":true,"state":"running","pid":1752},{"name":"minio","unit":"minio.service","active":true,"enabled":true,"state":"running","pid":1711},{"name":"xrdp","unit":"xrdp.service","active":false,"enabled":false,"state":"stopped"},{"name":"xrdp sesman","unit":"xrdp-sesman.service","active":false,"enabled":false,"state":"stopped"},{"name":"docker","unit":"docker.service","active":true,"enabled":true,"state":"running","pid":1020},{"name":"postgres","unit":"[email protected]","active":true,"enabled":true,"state":"running","pid":1883}],"success":true,"uptime":"16m 15s"}"""
|
||||||
|
|
||||||
|
val gson = GsonBuilder()
|
||||||
|
.registerTypeAdapter(SysPulseStatus::class.java, SysPulseStatusDeserializer())
|
||||||
|
.create()
|
||||||
|
|
||||||
|
val status = gson.fromJson(json, SysPulseStatus::class.java)
|
||||||
|
assertNotNull(status)
|
||||||
|
assertEquals("16m 15s", status.uptime)
|
||||||
|
assertEquals(5.01, status.cpu.pct, 0.01)
|
||||||
|
assertEquals(2, status.disk.size)
|
||||||
|
assertEquals(8, status.services.size)
|
||||||
|
val activeCount = status.services.count { it.active }
|
||||||
|
assertEquals(6, activeCount)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testDeserializeSysPulseStatus_emptyOrErrorPayload() {
|
||||||
|
val errorJson = """{"error":"Unauthorized","success":false}"""
|
||||||
|
|
||||||
|
val gson = GsonBuilder()
|
||||||
|
.registerTypeAdapter(SysPulseStatus::class.java, SysPulseStatusDeserializer())
|
||||||
|
.create()
|
||||||
|
|
||||||
|
val status = gson.fromJson(errorJson, SysPulseStatus::class.java)
|
||||||
|
assertNotNull(status)
|
||||||
|
assertEquals("", status.uptime)
|
||||||
|
assertEquals(0.0, status.cpu.pct, 0.01)
|
||||||
|
assertTrue(status.disk.isEmpty())
|
||||||
|
assertTrue(status.services.isEmpty())
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user