Merge pull request 'Membuat program android untuk menghubungkan tauri dengan perangkat bluetooth classic' (#1) from pengembangan into main

Reviewed-on: #1

Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "tauri-plugin-bluclas"
 version = "0.1.0"
-authors = [ "Rizky Denianto" ]
+authors = [ "You" ]
 description = ""
-edition = "2024"
+edition = "2021"
-rust-version = "1.94.1"
+rust-version = "1.77.2"
 exclude = ["/examples", "/dist-js", "/guest-js", "/node_modules"]
 links = "tauri-plugin-bluclas"
 

android/src/main/java/BluclasPlugin.kt

@@ -11,7 +11,6 @@ import app.tauri.annotation.InvokeArg
 import app.tauri.annotation.Permission
 import app.tauri.annotation.TauriPlugin
 import app.tauri.plugin.Invoke
-import app.tauri.plugin.JSArray
 import app.tauri.plugin.JSObject
 import app.tauri.plugin.Plugin
 import java.io.OutputStream
@@ -32,8 +31,8 @@ class KirimArgs {
         )
     ]
 )
-class BluclasPlugin(private val activity: Activity) : Plugin(activity) {
+class BluetoothClassicPlugin(private val activity: Activity) : Plugin(activity) {
-    private val uuidSpp: UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB")
+    private val SPP_UUID: UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB")
 
     private val adapter: BluetoothAdapter? = this.activity.getSystemService(BluetoothManager::class.java).getAdapter()
     private var soket: BluetoothSocket? = null
@@ -46,54 +45,67 @@ class BluclasPlugin(private val activity: Activity) : Plugin(activity) {
             return
         }
 
-        val daftarRes = JSArray()
+        val daftar_res = adapter.bondedDevices.map { i ->
-        adapter.bondedDevices.map { i ->
+            mapOf(
-            val res = JSObject()
+                "nama" to (i.name ?: "Unknown"),
-            res.put("nama", i.name ?: "Unknown")
+                "alamat" to i.address
-            res.put("alamat", i.address)
+            )
-            daftarRes.put(res)
         }
 
-        val objekDaftarRes = JSObject()
+        val objek_daftar_res = JSObject()
-        objekDaftarRes.put("data", daftarRes)
+        objek_daftar_res.put("data", daftar_res)
-        invoke.resolve(objekDaftarRes)
+        invoke.resolve(objek_daftar_res)
     }
 
-    fun menghubungkanKoneksi(alamat: String) {
+    fun menghubungkanKoneksi(invoke: Invoke, alamat: String) {
+        try {
             val perangkat: BluetoothDevice = adapter!!.getRemoteDevice(alamat)
-        soket = perangkat.createInsecureRfcommSocketToServiceRecord(uuidSpp)
+
+            soket = perangkat.createRfcommSocketToServiceRecord(SPP_UUID)
             soket!!.connect()
             keluaran = soket!!.outputStream
+
+        } catch (e: Exception) {
+            invoke.reject("Koneksi dengan perangkat gagal: ${e.message}")
         }
 
-    fun memutusKoneksi() {
+        invoke.resolve()
+    }
+
+    fun memutusKoneksi(invoke: Invoke) {
+        try {
             keluaran?.close()
             keluaran = null
             soket?.close()
             soket = null
+
+        } catch (e: Exception) {
+            invoke.reject("Memutus koneksi perangkat gagal")
+        }
+
+        invoke.resolve()
     }
 
     @Command
     fun kirim(invoke: Invoke) {
         val args = invoke.parseArgs(KirimArgs::class.java)
 
-        try {
+        menghubungkanKoneksi(invoke, args.alamat ?: "")
-            menghubungkanKoneksi(args.alamat ?: "")
-
         if (keluaran == null) {
-                throw Exception("Tidak ada perangkat yang terhubung")
+            invoke.reject("Tidak ada perangkat yang terhubung")
+            return
         }
 
+        try {
             keluaran!!.write(args.data)
             keluaran!!.flush()
 
         } catch (e: Exception) {
-            memutusKoneksi()
+            memutusKoneksi(invoke)
             invoke.reject("Mengirim data ke perangkat gagal: ${e.message}")
-            return
         }
 
-        memutusKoneksi()
+        memutusKoneksi(invoke)
         invoke.resolve()
     }
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tauri-plugin-bluclas-api",
   "version": "0.1.0",
-  "author": "Rizky Denianto",
+  "author": "You",
   "description": "",
   "type": "module",
   "types": "./dist-js/index.d.ts",

src/commands.rs

@@ -1,20 +1,20 @@
-use tauri::{AppHandle, Runtime, command};
+use tauri::{command, AppHandle, Runtime};
 
+use crate::models::*;
 use crate::BluclasExt;
 use crate::Result;
-use crate::models::*;
 
 #[command]
 pub(crate) async fn daftar_perangkat<R: Runtime>(
     app: AppHandle<R>,
-) -> Result<SBlueclasResponDaftarPerangkat> {
+) -> Result<Vec<SBluetoothClassicResponPerangkat>> {
     return app.bluclas().daftar_perangkat();
 }
 
 #[command]
 pub(crate) async fn kirim<R: Runtime>(
     app: AppHandle<R>,
-    payload: SBlueclasMuatanKirim,
+    payload: SBluetoothClassicMuatanKirim,
 ) -> Result<()> {
     return app.bluclas().kirim(payload);
 }

src/desktop.rs

@@ -1,5 +1,5 @@
 use serde::de::DeserializeOwned;
-use tauri::{AppHandle, Runtime, plugin::PluginApi};
+use tauri::{plugin::PluginApi, AppHandle, Runtime};
 
 use crate::models::*;
 
@@ -14,11 +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<SBlueclasResponDaftarPerangkat> {
+    pub fn daftar_perangkat(&self) -> crate::Result<Vec<SBluetoothClassicResponPerangkat>> {
-        return Ok(SBlueclasResponDaftarPerangkat { data: vec![] });
+        let daftar_res: Vec<SBluetoothClassicResponPerangkat> =
+            vec![SBluetoothClassicResponPerangkat {
+                nama: String::new(),
+                alamat: String::new(),
+            }];
+        return Ok(daftar_res);
     }
 
-    pub fn kirim(&self, _: SBlueclasMuatanKirim) -> crate::Result<()> {
+    pub fn kirim(&self, _: SBluetoothClassicMuatanKirim) -> crate::Result<()> {
         return Ok(());
     }
 }

src/mobile.rs

@@ -1,7 +1,7 @@
 use serde::de::DeserializeOwned;
 use tauri::{
-    AppHandle, Runtime,
     plugin::{PluginApi, PluginHandle},
+    AppHandle, Runtime,
 };
 
 use crate::models::*;
@@ -25,14 +25,14 @@ 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<SBlueclasResponDaftarPerangkat> {
+    pub fn daftar_perangkat(&self) -> crate::Result<Vec<SBluetoothClassicResponPerangkat>> {
         return self
             .0
             .run_mobile_plugin("daftarPerangkat", ())
             .map_err(Into::into);
     }
 
-    pub fn kirim(&self, payload: SBlueclasMuatanKirim) -> crate::Result<()> {
+    pub fn kirim(&self, payload: SBluetoothClassicMuatanKirim) -> crate::Result<()> {
         return self
             .0
             .run_mobile_plugin("kirim", payload)

src/models.rs

@@ -2,20 +2,14 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, Default, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SDaftarPerangkatBlueclasResponDaftarPerangkat {
+pub struct SBluetoothClassicResponPerangkat {
     pub nama: String,
     pub alamat: String,
 }
 
-#[derive(Debug, Clone, Default, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SBlueclasResponDaftarPerangkat {
-    pub data: Vec<SDaftarPerangkatBlueclasResponDaftarPerangkat>,
-}
-
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SBlueclasMuatanKirim {
+pub struct SBluetoothClassicMuatanKirim {
     pub alamat: String,
     pub data: Vec<u8>,
 }