Merge pull request 'Memperbaiki program kirim data' (#5) from pengembangan into main

Reviewed-on: #5

Cargo.toml

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

android/src/main/java/BluclasPlugin.kt

@@ -33,7 +33,7 @@ class KirimArgs {
     ]
 )
 class BluclasPlugin(private val activity: Activity) : Plugin(activity) {
-    private val SPP_UUID: UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB")
+    private val uuidSpp: UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB")
 
     private val adapter: BluetoothAdapter? = this.activity.getSystemService(BluetoothManager::class.java).getAdapter()
     private var soket: BluetoothSocket? = null
@@ -59,55 +59,41 @@ class BluclasPlugin(private val activity: Activity) : Plugin(activity) {
         invoke.resolve(objekDaftarRes)
     }
 
-    fun menghubungkanKoneksi(invoke: Invoke, alamat: String) {
+    fun menghubungkanKoneksi(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}")
     }
 
-        invoke.resolve()
+    fun memutusKoneksi() {
-    }
-
-    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)
 
-        menghubungkanKoneksi(invoke, args.alamat ?: "")
+        try {
+            menghubungkanKoneksi(args.alamat ?: "")
+
             if (keluaran == null) {
-            invoke.reject("Tidak ada perangkat yang terhubung")
+                throw Exception("Tidak ada perangkat yang terhubung")
-            return
             }
 
-        try {
             keluaran!!.write(args.data)
             keluaran!!.flush()
 
         } catch (e: Exception) {
-            memutusKoneksi(invoke)
+            memutusKoneksi()
             invoke.reject("Mengirim data ke perangkat gagal: ${e.message}")
+            return
         }
 
-        memutusKoneksi(invoke)
+        memutusKoneksi()
         invoke.resolve()
     }
 }

package.json

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

src/commands.rs

@@ -1,20 +1,20 @@
-use tauri::{command, AppHandle, Runtime};
+use tauri::{AppHandle, Runtime, command};
 
-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<SBlueclasClassicResponDaftarPerangkat> {
+) -> Result<SBlueclasResponDaftarPerangkat> {
     return app.bluclas().daftar_perangkat();
 }
 
 #[command]
 pub(crate) async fn kirim<R: Runtime>(
     app: AppHandle<R>,
-    payload: SBlueclasClassicMuatanKirim,
+    payload: SBlueclasMuatanKirim,
 ) -> Result<()> {
     return app.bluclas().kirim(payload);
 }

src/desktop.rs

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

src/mobile.rs

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

src/models.rs

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