Merge branch 'master' of https://github.com/cleboost/rustmius

Author: Cleboost

src-tauri/capabilities/default.json

@@ -14,6 +14,7 @@
     "fs:allow-read-dir",
     "fs:allow-exists",
     "fs:allow-write-text-file",
+    "fs:allow-remove",
     "fs:scope-home-recursive",
     {
       "identifier": "fs:scope",
@@ -32,6 +33,7 @@
         { "name": "ssh", "cmd": "ssh", "args": true },
         { "name": "sshpass", "cmd": "sshpass", "args": true },
         { "name": "ssh-copy-id", "cmd": "ssh-copy-id", "args": true },
+        { "name": "ssh-keygen", "cmd": "ssh-keygen", "args": true },
         { "name": "foot", "cmd": "foot", "args": true },
         { "name": "footclient", "cmd": "footclient", "args": true },
         { "name": "alacritty", "cmd": "alacritty", "args": true },
@@ -49,6 +51,7 @@
       "identifier": "shell:allow-spawn",
       "allow": [
         { "name": "ssh", "cmd": "ssh", "args": true },
+        { "name": "ssh-keygen", "cmd": "ssh-keygen", "args": true },
         { "name": "foot", "cmd": "foot", "args": true },
         { "name": "footclient", "cmd": "footclient", "args": true },
         { "name": "alacritty", "cmd": "alacritty", "args": true },

src/main.ts

@@ -6,8 +6,6 @@ import { createPinia } from "pinia";
 import { useSettingsStore } from "@/stores/settings";
 import { useKeysStore } from "./stores/keys";
 import { useServerConfigStore } from "./stores/servers";
-import { readDir, exists } from "@tauri-apps/plugin-fs";
-import { homeDir, join, BaseDirectory } from "@tauri-apps/api/path";
 
 import "@/index.css";
 
@@ -34,61 +32,6 @@ async function initAppSetttings() {
     mode.value = theme;
   }
 
-  await ensureSshKeysSynced();
+  await useKeysStore().syncWithFs();
   await useServerConfigStore().load();
 }
-
-async function ensureSshKeysSynced() {
-  const keysStore = useKeysStore();
-  await keysStore.load();
-
-  const home = await homeDir();
-  const sshRel = ".ssh";
-  const sshAbs = await join(home, ".ssh");
-  const entries = await readDir(sshRel, { baseDir: BaseDirectory.Home });
-  const scanned: Array<{ name: string; private: string; public?: string }> = [];
-  for (const e of entries) {
-    if (e.isDirectory) continue;
-    const name = e.name ?? "";
-    if (!name.endsWith(".pub")) {
-      continue;
-    }
-    const stem = name.slice(0, -4);
-    if (!stem || stem === "config" || stem.startsWith("known_hosts")) {
-      continue;
-    }
-    const privateRel = `${sshRel}/${stem}`;
-    const hasPrivate = await exists(privateRel, {
-      baseDir: BaseDirectory.Home,
-    });
-    if (!hasPrivate) {
-      continue; // require private key pair
-    }
-    const publicPath = await join(sshAbs, name);
-    const privatePath = await join(sshAbs, stem);
-    scanned.push({ name: stem, private: privatePath, public: publicPath });
-  }
-
-  const existing = await keysStore.getKeys();
-  const byPrivate = new Map(existing.map((k) => [k.private, k]));
-
-  for (const s of scanned) {
-    const found = byPrivate.get(s.private);
-    if (found) {
-      if (found.name !== s.name || found.public !== s.public) {
-        await keysStore.addOrUpdateKey({
-          id: found.id,
-          name: s.name,
-          private: s.private,
-          public: s.public,
-        });
-      }
-    } else {
-      await keysStore.addOrUpdateKey({
-        name: s.name,
-        private: s.private,
-        public: s.public,
-      });
-    }
-  }
-}