From 25ce630e0d2b1275fbdbfea6d4883da460ba1051 Mon Sep 17 00:00:00 2001
From: rizky_denianto <rizky_denianto@segubi.com>
Date: Tue, 14 Apr 2026 20:10:20 +0700
Subject: [PATCH] Memperbaiki struktur respon daftar perangkat

---
 android/src/main/java/BluclasPlugin.kt |  8 ++++----
 src/commands.rs                        |  4 ++--
 src/desktop.rs                         | 16 ++++++++--------
 src/mobile.rs                          |  4 +++-
 src/models.rs                          | 10 ++++++++--
 5 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/android/src/main/java/BluclasPlugin.kt b/android/src/main/java/BluclasPlugin.kt
index 49a03c8..3509a88 100644
--- a/android/src/main/java/BluclasPlugin.kt
+++ b/android/src/main/java/BluclasPlugin.kt
@@ -45,16 +45,16 @@ class BluclasPlugin(private val activity: Activity) : Plugin(activity) {
             return
         }
 
-        val daftar_res = adapter.bondedDevices.map { i ->
+        val daftarRes = adapter.bondedDevices.map { i ->
             mapOf(
                 "nama" to (i.name ?: "Unknown"),
                 "alamat" to i.address
             )
         }
 
-        val objek_daftar_res = JSObject()
-        objek_daftar_res.put("data", daftar_res)
-        invoke.resolve(objek_daftar_res)
+        val objekDaftarRes = JSObject()
+        objekDaftarRes.put("data", daftarRes)
+        invoke.resolve(objekDaftarRes)
     }
 
     fun menghubungkanKoneksi(invoke: Invoke, alamat: String) {
diff --git a/src/commands.rs b/src/commands.rs
index 996abcf..e06a01c 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -7,14 +7,14 @@ use crate::Result;
 #[command]
 pub(crate) async fn daftar_perangkat<R: Runtime>(
     app: AppHandle<R>,
-) -> Result<Vec<SBluetoothClassicResponPerangkat>> {
+) -> Result<SDaftarPerangkatBlueclasClassicResponDaftarPerangkat> {
     return app.bluclas().daftar_perangkat();
 }
 
 #[command]
 pub(crate) async fn kirim<R: Runtime>(
     app: AppHandle<R>,
-    payload: SBluetoothClassicMuatanKirim,
+    payload: SBlueclasClassicMuatanKirim,
 ) -> Result<()> {
     return app.bluclas().kirim(payload);
 }
diff --git a/src/desktop.rs b/src/desktop.rs
index a95b344..3598916 100644
--- a/src/desktop.rs
+++ b/src/desktop.rs
@@ -14,16 +14,16 @@ pub fn init<R: Runtime, C: DeserializeOwned>(
 pub struct Bluclas<R: Runtime>(AppHandle<R>);
 
 impl<R: Runtime> Bluclas<R> {
-    pub fn daftar_perangkat(&self) -> crate::Result<Vec<SBluetoothClassicResponPerangkat>> {
-        let daftar_res: Vec<SBluetoothClassicResponPerangkat> =
-            vec![SBluetoothClassicResponPerangkat {
-                nama: String::new(),
-                alamat: String::new(),
-            }];
-        return Ok(daftar_res);
+    pub fn daftar_perangkat(
+        &self,
+    ) -> crate::Result<SDaftarPerangkatBlueclasClassicResponDaftarPerangkat> {
+        return Ok(SDaftarPerangkatBlueclasClassicResponDaftarPerangkat {
+            nama: String::new(),
+            alamat: String::new(),
+        });
     }
 
-    pub fn kirim(&self, _: SBluetoothClassicMuatanKirim) -> crate::Result<()> {
+    pub fn kirim(&self, _: SBlueclasClassicMuatanKirim) -> crate::Result<()> {
         return Ok(());
     }
 }
diff --git a/src/mobile.rs b/src/mobile.rs
index 311e47e..5f78b74 100644
--- a/src/mobile.rs
+++ b/src/mobile.rs
@@ -25,7 +25,9 @@ pub fn init<R: Runtime, C: DeserializeOwned>(
 pub struct Bluclas<R: Runtime>(PluginHandle<R>);
 
 impl<R: Runtime> Bluclas<R> {
-    pub fn daftar_perangkat(&self) -> crate::Result<Vec<SBluetoothClassicResponPerangkat>> {
+    pub fn daftar_perangkat(
+        &self,
+    ) -> crate::Result<SDaftarPerangkatBlueclasClassicResponDaftarPerangkat> {
         return self
             .0
             .run_mobile_plugin("daftarPerangkat", ())
diff --git a/src/models.rs b/src/models.rs
index 42c5b61..285d0b2 100644
--- a/src/models.rs
+++ b/src/models.rs
@@ -2,14 +2,20 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, Default, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SBluetoothClassicResponPerangkat {
+pub struct SDaftarPerangkatBlueclasClassicResponDaftarPerangkat {
     pub nama: String,
     pub alamat: String,
 }
 
+#[derive(Debug, Clone, Default, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SBlueclasClassicResponDaftarPerangkat {
+    pub data: Vec<SDaftarPerangkatBlueclasClassicResponDaftarPerangkat>,
+}
+
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SBluetoothClassicMuatanKirim {
+pub struct SBlueclasClassicMuatanKirim {
     pub alamat: String,
     pub data: Vec<u8>,
 }