Merge pull request 'Memindahkan model guest-js ke index' (#17) from pengembangan into main

Reviewed-on: #17

.cargo/config.toml

@@ -1,5 +0,0 @@
-[registry]
-default = "gitea"
-
-[registries.gitea]
-index = "sparse+https://git.segubi.com/api/packages/segubi/cargo/"

.gitea/workflows/penerbitan.yml

@@ -1,12 +1,15 @@
 name: Penerbitan Plugin
 
 on:
+  push:
+    branches: ["main"]
   pull_request:
     branches: ["main"]
     types: ["opened", "synchronize"]
 
 jobs:
   persiapan:
+    if: "!contains(gitea.event.head_commit.message, 'Merge pull request')"
     runs-on: ubuntu-latest
     outputs:
       organisasi: ${{ steps.var.outputs.organisasi }}
@@ -21,47 +24,19 @@ jobs:
     runs-on: ubuntu-latest
     needs: persiapan
     steps:
-      - name: Unduh paket untuk membangun citra
-        run: |
-          apt update -y
-          sudo apt install -y libwebkit2gtk-4.1-dev \
-            build-essential \
-            curl \
-            wget \
-            file \
-            libxdo-dev \
-            libssl-dev \
-            libayatana-appindicator3-dev \
-            librsvg2-dev \
-            libudev-dev
-          apt clean -y
-
       - name: Unduh program
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
-      - name: Unduh Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: stable
-          rustflags: "-A warnings"
-
-      - name: Penerbitan peti Cargo
-        run: |
-          cargo publish
-        env:
-          CARGO_REGISTRIES_GITEA_TOKEN: Bearer ${{ secrets.KUNCI_PENERBITAN }}
-
       - name: Unduh pnpm
-        uses: pnpm/setup@v2
+        uses: pnpm/action-setup@v6
         with:
-          version: 11
+          version: 10
 
-      - name: Penerbitan paket NPM
+      - name: Unggah program
         run: |
           pnpm i
           npm config set @${{ needs.persiapan.outputs.organisasi }}:registry=https://${{ vars.ALAMAT_GITEA }}/api/packages/${{ needs.persiapan.outputs.organisasi }}/npm/
           npm config set -- '//${{ vars.ALAMAT_GITEA }}/api/packages/${{ needs.persiapan.outputs.organisasi }}/npm/:_authToken' "${{ secrets.KUNCI_PENERBITAN }}"
           npm publish
-          rm -rf pnpm-lock.yaml .pnpm-store/

Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "tauri-plugin-bluclas"
-version = "0.1.23"
+version = "0.1.0"
 authors = [ "Rizky Denianto" ]
-description = "Program sederhana untuk interaksi dengan bluetooth classic"
+description = ""
 edition = "2024"
-rust-version = "1.98.0"
+rust-version = "1.94.1"
 exclude = ["/examples", "/dist-js", "/guest-js", "/node_modules"]
 links = "tauri-plugin-bluclas"
 
@@ -17,18 +17,11 @@ incremental = false
 strip = "symbols"
 debug = false
 
-[package.metadata.platforms.support]
-windows = { level = "full" }
-linux = { level = "full" }
-macos = { level = "none" }
-android = { level = "full" }
-ios = { level = "none" }
-
 [dependencies]
 tauri = { version = "2.11.5" }
 serde = "1.0"
 thiserror = "2"
-serialport = "4.10.1"
+serialport = "4.9.0"
 
 [build-dependencies]
 tauri-plugin = { version = "2.6.3", features = ["build"] }

README.md

@@ -1,3 +1 @@
 # Tauri Plugin bluclas
-
-Program sederhana untuk interaksi dengan bluetooth classic

android/src/main/java/BluclasPlugin.kt

@@ -37,11 +37,11 @@ class KirimArgs {
     ]
 )
 class BluclasPlugin(private val activity: Activity) : Plugin(activity) {
-    private val uuid: UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB")
+    private val uuidSpp: UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB")
 
-    private val bluetoothAdapter: BluetoothAdapter? = this.activity.getSystemService(BluetoothManager::class.java).getAdapter()
+    private val adapter: BluetoothAdapter? = this.activity.getSystemService(BluetoothManager::class.java).getAdapter()
-    private var bluetoothSocket: BluetoothSocket? = null
+    private var soket: BluetoothSocket? = null
-    private var outputStream: OutputStream? = null
+    private var keluaran: OutputStream? = null
 
     @Command
     override fun checkPermissions(invoke: Invoke) {
@@ -55,13 +55,13 @@ class BluclasPlugin(private val activity: Activity) : Plugin(activity) {
 
     @Command
     fun daftarPerangkat(invoke: Invoke) {
-        if (bluetoothAdapter == null) {
+        if (adapter == null) {
             invoke.reject("Bluetooth tidak didukung")
             return
         }
 
         val daftarRes = JSArray()
-        bluetoothAdapter.bondedDevices.map { i ->
+        adapter.bondedDevices.map { i ->
             val res = JSObject()
             res.put("nama", i.name ?: "Unknown")
             res.put("alamat", i.address)
@@ -74,37 +74,32 @@ class BluclasPlugin(private val activity: Activity) : Plugin(activity) {
     }
 
     fun menghubungkanKoneksi(alamat: String) {
-        val bluetoothDevice: BluetoothDevice = bluetoothAdapter!!.getRemoteDevice(alamat)
+        val perangkat: BluetoothDevice = adapter!!.getRemoteDevice(alamat)
-        bluetoothSocket = bluetoothDevice.createInsecureRfcommSocketToServiceRecord(uuid)
+        soket = perangkat.createInsecureRfcommSocketToServiceRecord(uuidSpp)
-        bluetoothSocket!!.connect()
+        soket!!.connect()
-        outputStream = bluetoothSocket!!.outputStream
+        keluaran = soket!!.outputStream
     }
 
     fun memutusKoneksi() {
-        outputStream?.close()
+        keluaran?.close()
-        outputStream = null
+        keluaran = null
-        bluetoothSocket?.close()
+        soket?.close()
-        bluetoothSocket = null
+        soket = null
     }
 
     @Command
     fun kirim(invoke: Invoke) {
         val args = invoke.parseArgs(KirimArgs::class.java)
-        val alamat = args.alamat
-        if (alamat.isNullOrEmpty()) {
-            invoke.resolve()
-            return
-        }
 
         try {
-            menghubungkanKoneksi(alamat)
+            menghubungkanKoneksi(args.alamat ?: "")
 
-            if (outputStream == null) {
+            if (keluaran == null) {
                 throw Exception("Tidak ada perangkat yang terhubung")
             }
 
-            outputStream!!.write(args.data)
+            keluaran!!.write(args.data)
-            outputStream!!.flush()
+            keluaran!!.flush()
 
         } catch (e: Exception) {
             memutusKoneksi()

guest-js/index.ts

@@ -1,21 +1,4 @@
-import {
+import { invoke } from "@tauri-apps/api/core";
-  checkPermissions as checkPermissions_,
-  invoke,
-  PermissionState,
-  requestPermissions as requestPermissions_,
-} from "@tauri-apps/api/core";
-
-export async function checkPermissions(): Promise<PermissionState> {
-  return await checkPermissions_<{ bluetooth: PermissionState }>(
-    "bluclas",
-  ).then((e) => e.bluetooth);
-}
-
-export async function requestPermissions(): Promise<PermissionState> {
-  return await requestPermissions_<{ bluetooth: PermissionState }>(
-    "bluclas",
-  ).then((e) => e.bluetooth);
-}
 
 export type SDaftarPerangkatBlueclasResponDaftarPerangkat = {
   nama: string;
@@ -26,10 +9,12 @@ export type SBlueclasResponDaftarPerangkat = {
   data: SDaftarPerangkatBlueclasResponDaftarPerangkat[];
 };
 
-export async function daftarPerangkat(): Promise<SBlueclasResponDaftarPerangkat> {
+export async function daftarPerangkat(): Promise<
-  return await invoke<SBlueclasResponDaftarPerangkat>(
+  SBlueclasResponDaftarPerangkat[]
+> {
+  return await invoke<SBlueclasResponDaftarPerangkat[]>(
     "plugin:bluclas|daftar_perangkat",
-  ).then((res: SBlueclasResponDaftarPerangkat) => res);
+  ).then((res: SBlueclasResponDaftarPerangkat[]) => res);
 }
 
 export type SBlueclasMuatanKirim = {
@@ -37,6 +22,10 @@ export type SBlueclasMuatanKirim = {
   data: number[];
 };
 
-export async function kirim(muatan: SBlueclasMuatanKirim): Promise<null> {
+export async function kirim(value: SBlueclasMuatanKirim): Promise<null> {
-  return await invoke<null>("plugin:bluclas|kirim", { muatan: muatan });
+  return await invoke<null>("plugin:bluclas|kirim", {
+    payload: {
+      value,
+    },
+  });
 }

package.json

@@ -1,8 +1,8 @@
 {
   "name": "@segubi/tauri-plugin-bluclas-api",
-  "version": "0.1.23",
+  "version": "0.1.7",
   "author": "Rizky Denianto",
-  "description": "Program sederhana untuk interaksi dengan bluetooth classic",
+  "description": "",
   "type": "module",
   "types": "./dist-js/index.d.ts",
   "main": "./dist-js/index.cjs",
@@ -26,8 +26,8 @@
   },
   "devDependencies": {
     "@rollup/plugin-typescript": "^12.3.0",
-    "rollup": "^4.63.2",
+    "rollup": "^4.62.2",
-    "typescript": "^6.0.3",
+    "typescript": "^5.9.3",
     "tslib": "^2.8.1"
   }
 }

rollup.config.js

@@ -20,8 +20,7 @@ export default {
   plugins: [
     typescript({
       declaration: true,
-      declarationDir: dirname(pkg.exports.import),
+      declarationDir: dirname(pkg.exports.import)
-      rootDir: 'guest-js'
     })
   ],
   external: [

src/commands.rs

@@ -14,7 +14,7 @@ pub(crate) async fn daftar_perangkat<R: Runtime>(
 #[command]
 pub(crate) async fn kirim<R: Runtime>(
     app: AppHandle<R>,
-    muatan: SBlueclasMuatanKirim,
+    payload: SBlueclasMuatanKirim,
 ) -> Result<()> {
-    return app.bluclas().kirim(muatan);
+    return app.bluclas().kirim(payload);
 }

src/lib.rs

@@ -1,8 +1,11 @@
+use crate::commands::{daftar_perangkat, kirim};
 use tauri::{
     Manager, Runtime,
     plugin::{Builder, TauriPlugin},
 };
 
+pub use models::*;
+
 #[cfg(desktop)]
 mod desktop;
 #[cfg(mobile)]
@@ -19,8 +22,6 @@ use desktop::Bluclas;
 #[cfg(mobile)]
 use mobile::Bluclas;
 
-use crate::commands::{daftar_perangkat, kirim};
-
 /// Extensions to [`tauri::App`], [`tauri::AppHandle`] and [`tauri::Window`] to access the bluclas APIs.
 pub trait BluclasExt<R: Runtime> {
     fn bluclas(&self) -> &Bluclas<R>;

src/mobile.rs

@@ -32,10 +32,10 @@ impl<R: Runtime> Bluclas<R> {
             .map_err(Into::into);
     }
 
-    pub fn kirim(&self, muatan: SBlueclasMuatanKirim) -> crate::Result<()> {
+    pub fn kirim(&self, payload: SBlueclasMuatanKirim) -> crate::Result<()> {
         return self
             .0
-            .run_mobile_plugin("kirim", muatan)
+            .run_mobile_plugin("kirim", payload)
             .map_err(Into::into);
     }
 }

src/models.rs

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