fix: Improve error reporting for WireGuard profile validation and preserve configuration shape for custom maps

Author: dsfkjlweuyr

app/src/main/java/io/nekohasekai/sagernet/fmt/ConfigBuilder.kt

@@ -101,8 +101,12 @@ private val wireGuardIntegerFields = setOf("listen_port", "workers", "routing_ma
 private val wireGuardStringListFields = setOf("network_type", "fallback_network_type")
 
 private fun wireGuardOverrideError(profileId: Long, field: String, category: String): Nothing {
+    // Unknown keys are user-controlled and may themselves contain credentials or
+    // other sensitive text. Keep known schema field names actionable, but report
+    // unknown input only by category so diagnostics cannot echo arbitrary keys.
+    val diagnosticField = if (category == "unknown") "<unknown>" else field
     throw IllegalArgumentException(
-        "WireGuard profile $profileId has incompatible custom outbound field '$field' ($category)"
+        "WireGuard profile $profileId has incompatible custom outbound field '$diagnosticField' ($category)"
     )
 }
 

app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java

@@ -85,6 +85,13 @@ public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
             } else {
                 map = gsonSingbox.fromJson(((TypeAdapter<SingBoxOption>) delegate).toJson(src), Map.class);
             }
+            // Preserve the pre-endpoint shape for ordinary configurations. Remove
+            // only the generated empty top-level container before custom maps are
+            // merged, so a global custom configuration can still add endpoints.
+            if (src instanceof MyOptions &&
+                    (((MyOptions) src).endpoints == null || ((MyOptions) src).endpoints.isEmpty())) {
+                map.remove("endpoints");
+            }
             if (src._hack_config_map != null && !src._hack_config_map.isEmpty()) {
                 Util.INSTANCE.mergeMap(map, src._hack_config_map);
             }