Merge pull request #17 from CKylinMC:dev

chore: bump to 1.1.1

Author: CKylinMC

package.json

@@ -1,7 +1,7 @@
 {
     "name": "pasteme",
     "private": true,
-    "version": "1.1.0",
+    "version": "1.1.1",
     "type": "module",
     "scripts": {
         "dev": "vite",

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "pasteme"
-version = "1.1.0"
+version = "1.1.1"
 description = "A simple clipboard manager"
 authors = ["CKylinMC"]
 edition = "2021"

src-tauri/Cargo.toml

@@ -1,10 +1,13 @@
 mod tray;
 
 use enigo::{Direction, Enigo, Key, Keyboard, Settings};
-use tauri::{AppHandle, Manager};
+use tauri::{AppHandle, Manager, Runtime};
 use tauri_plugin_autostart::MacosLauncher;
+use tauri_plugin_store::StoreExt;
 use window_vibrancy::{apply_acrylic, apply_mica};
 
+use serde_json::json;
+
 #[tauri::command]
 async fn input_text(text: &str) -> Result<(), String> {
     let mut enigo = Enigo::new(&Settings::default()).unwrap();
@@ -21,6 +24,45 @@ async fn simulate_paste() -> Result<(), String> {
     Ok(())
 }
 
+#[tauri::command]
+async fn get_key_from_store<R: Runtime>(
+    app: tauri::AppHandle<R>,
+    _window: tauri::Window<R>,
+    key: String,
+    fallback: serde_json::Value,
+) -> Result<serde_json::Value, String> {
+    let stores = app.store("store.bin");
+    let store = match stores {
+        Ok(store) => store,
+        Err(_) => return Ok(fallback),
+    };
+    if store.has(key.clone()) {
+        let value = store
+            .get(key.clone())
+            .expect("Failed to get value from store");
+        Ok(value)
+    } else {
+        Ok(fallback)
+    }
+}
+
+#[tauri::command]
+async fn set_key_to_store<R: Runtime>(
+    app: tauri::AppHandle<R>,
+    _window: tauri::Window<R>,
+    key: String,
+    value: serde_json::Value,
+) -> Result<(), String> {
+    let stores = app.store("store.bin");
+    let store = match stores {
+        Ok(store) => store,
+        Err(_) => return Err("Failed to get store".to_string()),
+    };
+    store.set(key.clone(), json!(value));
+    store.save().expect("Failed to save store");
+    Ok(())
+}
+
 fn show_window(app: &AppHandle) {
     let windows = app.webview_windows();
 
@@ -65,7 +107,9 @@ pub fn run() {
         .plugin(tauri_plugin_opener::init())
         .invoke_handler(tauri::generate_handler![
             input_text,
-            simulate_paste
+            simulate_paste,
+            get_key_from_store,
+            set_key_to_store
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");

src-tauri/src/lib.rs

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "PasteMe",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "identifier": "in.ckyl.pasteme",
   "build": {
     "beforeDevCommand": "yarn dev",

src-tauri/tauri.conf.json

@@ -1,3 +1,3 @@
 export const AppInfo = {
-    version: "1.1.0",
+    version: "1.1.1",
 };

src/AppInfo.ts

@@ -1,8 +1,9 @@
 import { ref } from 'vue';
-import { Store } from '@tauri-apps/plugin-store';
+import { Store } from '@/libs/store';
 import { tryParse } from '@/libs/utils';
 import type { CoreMessage } from 'ai';
 
+
 export interface AIConfig {
     enabled: boolean;
     apiKey: string;

src/composables/useConfig.ts

@@ -1,4 +1,4 @@
-import { ref } from 'vue';
+import { ref, toRaw, unref } from 'vue';
 import { check, type Update, type DownloadEvent } from '@tauri-apps/plugin-updater';
 import { bytesToSize } from '@/libs/utils';
 
@@ -102,13 +102,15 @@ export function useUpdater() {
                 }
                 case UpdateStage.DOWNLOAD: {
                     state.value.btn = '正在下载更新';
-                    await state.value.event?.download(handleDownloadProgress);
+                    const _state = toRaw(unref(state));
+                    await _state?.event?.download(handleDownloadProgress);
                     break;
                 }
                 case UpdateStage.INSTALL: {
                     state.value.btn = '正在安装更新';
                     state.value.type = UpdateType.INFO;
-                    await state.value.event?.install();
+                    const _state = toRaw(unref(state));
+                    await _state?.event?.install();
                     break;
                 }
             }

src/composables/useUpdater.ts

@@ -7,3 +7,15 @@ export async function inputText(text: string) {
 export async function simulatePaste(){
     return await invoke("simulate_paste");
 }
+
+export type JsonObject = { [key: string]: JsonValue };
+export type JsonArray = JsonValue[];
+export type JsonValue = string | number | boolean | null | JsonObject | JsonArray;
+
+export function getStoreKey(key: string, fallback: JsonValue): Promise<JsonValue> {
+    return invoke("get_key_from_store", { key, fallback });
+}
+
+export function setStoreKey(key: string, value: JsonValue): Promise<void> {
+    return invoke("set_key_in_store", { key, value });
+}

src/libs/bridges.ts

@@ -0,0 +1,36 @@
+import { getStoreKey, JsonValue, setStoreKey } from "./bridges";
+
+/**
+ * StoreBackend used to move the store impl to different backend without changing usages
+ */
+export class Store {
+    static async load(_ignored: string): Promise<Store> {
+        return new Store();
+    }
+
+    close() { }
+
+    save() { }
+
+    getRaw(key:string, fallback: JsonValue = null): Promise<JsonValue> {
+        return getStoreKey(key, fallback);
+    }
+
+    get<T>(key: string, fallback: JsonValue = null): Promise<T> {
+        return this.getRaw(key, fallback) as Promise<T>;
+    }
+
+    set(key: string, value: JsonValue = null): Promise<void> {
+        return setStoreKey(key, value);
+    }
+
+    has(key: string):Promise<boolean> {
+        return getStoreKey(key, null).then(v => v !== null);
+    }
+
+    async delete(key: string): Promise<void> {
+        if(await this.has(key)) {
+            return setStoreKey(key, null);
+        }
+    }
+}