@walldock/agent 0.1.0 → 0.1.2

package/dist/screens/windows.js

@@ -23,21 +23,23 @@ public class MonitorHelper {
     [MarshalAs(UnmanagedType.ByValTStr, SizeConst=32)] public string Device;
   }
   public delegate bool MonitorEnumProc(IntPtr hMon, IntPtr hdc, ref RECT rc, IntPtr data);
+  private static List<string> _results = new List<string>();
+  private static bool Callback(IntPtr hMon, IntPtr hdc, ref RECT rc, IntPtr data) {
+    var info = new MonitorInfo(); info.Size = (uint)Marshal.SizeOf(info);
+    GetMonitorInfo(hMon, ref info);
+    uint dx, dy;
+    GetDpiForMonitor(hMon, 0, out dx, out dy);
+    double scale = dx / 96.0;
+    int w = info.Monitor.R - info.Monitor.L;
+    int h = info.Monitor.B - info.Monitor.T;
+    int primary = (info.Flags & 1) != 0 ? 1 : 0;
+    _results.Add(info.Device + "|" + info.Monitor.L + "|" + info.Monitor.T + "|" + w + "|" + h + "|" + scale.ToString("F6") + "|" + primary);
+    return true;
+  }
   public static List<string> Enumerate() {
-    var results = new List<string>();
-    EnumDisplayMonitors(IntPtr.Zero, IntPtr.Zero, (hMon, hdc, ref rc, data) => {
-      var info = new MonitorInfo(); info.Size = (uint)Marshal.SizeOf(info);
-      GetMonitorInfo(hMon, ref info);
-      uint dx, dy;
-      GetDpiForMonitor(hMon, 0, out dx, out dy);
-      double scale = dx / 96.0;
-      int w = info.Monitor.R - info.Monitor.L;
-      int h = info.Monitor.B - info.Monitor.T;
-      int primary = (info.Flags & 1) != 0 ? 1 : 0;
-      results.Add(info.Device + "|" + info.Monitor.L + "|" + info.Monitor.T + "|" + w + "|" + h + "|" + scale.ToString("F6") + "|" + primary);
-      return true;
-    }, IntPtr.Zero);
-    return results;
+    _results = new List<string>();
+    EnumDisplayMonitors(IntPtr.Zero, IntPtr.Zero, new MonitorEnumProc(Callback), IntPtr.Zero);
+    return _results;
   }
 }
 "@

package/dist/token-storage.js

@@ -42,8 +42,8 @@ exports.clearDeviceIdentity = clearDeviceIdentity;
 const fs = __importStar(require("node:fs/promises"));
 const path = __importStar(require("node:path"));
 const os = __importStar(require("node:os"));
-const KEYTAR_SERVICE = 'walldock-agent';
-const KEYTAR_ACCOUNT = 'device-token';
+const KEYRING_SERVICE = 'walldock-agent';
+const KEYRING_ACCOUNT = 'device-token';
 function configDir() {
     if (process.platform === 'win32') {
         return path.join(process.env['APPDATA'] ?? os.homedir(), 'walldock');
@@ -67,57 +67,44 @@ async function writeAuthFile(data) {
     await fs.mkdir(path.dirname(CONFIG_FILE), { recursive: true });
     await fs.writeFile(CONFIG_FILE, JSON.stringify(data, null, 2), { mode: 0o600 });
 }
-async function tryKeytar() {
+function secureEntry() {
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    const { Entry } = require('@napi-rs/keyring');
+    return new Entry(KEYRING_SERVICE, KEYRING_ACCOUNT);
+}
+async function getDeviceToken() {
     try {
-        // eslint-disable-next-line @typescript-eslint/no-require-imports
-        return require('keytar');
+        const token = secureEntry().getPassword();
+        if (token)
+            return token;
     }
     catch {
-        return null;
-    }
-}
-async function getDeviceToken() {
-    const keytar = await tryKeytar();
-    if (keytar) {
-        try {
-            const token = await keytar.getPassword(KEYTAR_SERVICE, KEYTAR_ACCOUNT);
-            if (token)
-                return token;
-        }
-        catch {
-            // fall through to file
-        }
+        // keyring unavailable or entry not found — fall through to file
     }
     const auth = await readAuthFile();
     return auth.deviceToken ?? null;
 }
 async function setDeviceToken(token) {
-    const keytar = await tryKeytar();
-    if (keytar) {
-        try {
-            await keytar.setPassword(KEYTAR_SERVICE, KEYTAR_ACCOUNT, token);
-            // also write identity file (without token) so offline boot still works
-            const auth = await readAuthFile();
-            delete auth.deviceToken;
-            await writeAuthFile(auth);
-            return;
-        }
-        catch {
-            // fall through to file
-        }
+    try {
+        secureEntry().setPassword(token);
+        // also write identity file (without token) so offline boot still works
+        const auth = await readAuthFile();
+        delete auth.deviceToken;
+        await writeAuthFile(auth);
+        return;
+    }
+    catch {
+        // keyring unavailable — fall through to file
     }
     const auth = await readAuthFile();
     auth.deviceToken = token;
     await writeAuthFile(auth);
 }
 async function deleteDeviceToken() {
-    const keytar = await tryKeytar();
-    if (keytar) {
-        try {
-            await keytar.deletePassword(KEYTAR_SERVICE, KEYTAR_ACCOUNT);
-        }
-        catch { /* ok */ }
+    try {
+        secureEntry().deletePassword();
     }
+    catch { /* ok */ }
     const auth = await readAuthFile();
     delete auth.deviceToken;
     await writeAuthFile(auth);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@walldock/agent",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Walldock desktop agent — sync wallpapers across all your screens",
   "license": "MIT",
   "main": "dist/main.js",
@@ -14,10 +14,9 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "keytar": "^7.9.0"
+    "@napi-rs/keyring": "^1.1.5"
   },
   "devDependencies": {
-    "@types/keytar": "^4.4.2",
     "@types/node": "^20.0.0",
     "typescript": "^5.4.0"
   },