@walldock/agent 0.1.7 → 0.2.1

package/dist/main.js

@@ -44,8 +44,10 @@ const sync_1 = require("./sync");
 const storage = __importStar(require("./token-storage"));
 const startup_1 = require("./startup");
 const pid_1 = require("./pid");
+const tray_1 = require("./tray");
 // ─── Logging ─────────────────────────────────────────────────────────────────
 const isDaemon = process.argv.includes('--daemon');
+const isTray = process.argv.includes('--tray');
 function logDir() {
     if (process.platform === 'darwin')
         return path.join(os.homedir(), 'Library', 'Logs');
@@ -61,7 +63,7 @@ async function openLog() {
 }
 function log(msg) {
     const line = `[${new Date().toISOString()}] ${msg}\n`;
-    if (isDaemon && logStream) {
+    if ((isDaemon || isTray) && logStream) {
         logStream.write(line).catch(() => undefined);
     }
     else {
@@ -95,7 +97,7 @@ async function main() {
         }
         return;
     }
-    if (isDaemon)
+    if (isDaemon || isTray)
         await openLog();
     // Single-instance guard
     try {
@@ -106,12 +108,17 @@ async function main() {
         process.exit(1);
     }
     const api = new api_1.AgentApi(process.env['WALLDOCK_API_URL'] ?? undefined);
+    let trayHandle = null;
     const sync = new sync_1.SyncService(api, {
         onTick(status, lastSyncAt) {
-            if (status === 'error')
+            if (status === 'error') {
                 log('[sync] connection error');
-            else if (lastSyncAt)
+                trayHandle?.updateStatus('connection error');
+            }
+            else if (lastSyncAt) {
                 log(`[sync] ok at ${lastSyncAt}`);
+                trayHandle?.updateStatus('synced ' + new Date(lastSyncAt).toLocaleTimeString());
+            }
         },
         onLog: log,
         onInvalidToken() {
@@ -119,8 +126,8 @@ async function main() {
                 log('Device token is no longer valid. Clearing credentials…');
                 await storage.deleteDeviceToken();
                 await storage.clearDeviceIdentity();
-                if (isDaemon) {
-                    log('Run "walldock-agent" (without --daemon) to re-pair this device.');
+                if (isDaemon || isTray) {
+                    log('Run "walldock-agent" to re-pair this device.');
                     await shutdown();
                     return;
                 }
@@ -147,6 +154,8 @@ async function main() {
         if (stopping)
             return;
         stopping = true;
+        trayHandle?.stop();
+        trayHandle = null;
         sync.stop();
         await (0, pid_1.releaseLock)();
         log('Walldock Agent stopped.');
@@ -155,14 +164,41 @@ async function main() {
     }
     process.on('SIGINT', () => { void shutdown(); });
     process.on('SIGTERM', () => { void shutdown(); });
+    async function maybeStartTray() {
+        if (isDaemon)
+            return false;
+        if (isTray) {
+            // Already a detached background process — start the tray in-place
+            try {
+                trayHandle = (0, tray_1.startTray)(() => { void sync.syncNow(); }, () => { void shutdown(); });
+            }
+            catch { /* no display — run headlessly */ }
+            return false;
+        }
+        // Console-attached interactive session: re-spawn detached so closing the
+        // terminal doesn't kill the agent.
+        await (0, pid_1.releaseLock)();
+        const { spawn } = await Promise.resolve().then(() => __importStar(require('node:child_process')));
+        const child = spawn(process.execPath, [process.argv[1], '--tray'], {
+            detached: true,
+            stdio: 'ignore',
+            windowsHide: true,
+        });
+        child.unref();
+        return true;
+    }
     // Try to resume from stored token
     log('Walldock Agent starting…');
     const existing = await (0, auth_1.validateStoredToken)(api);
     if (existing) {
         await storage.setDeviceIdentity({ deviceId: existing.deviceId, deviceName: existing.deviceName });
         log(`Linked as "${existing.deviceName}". Starting sync…`);
+        if (await maybeStartTray()) {
+            console.log('Walldock Agent is running in the system tray.');
+            process.exit(0);
+        }
         sync.start({ token: existing.token, deviceId: existing.deviceId });
-        return; // sync loop keeps process alive
+        return; // sync loop keeps process alive (isTray path)
     }
     // No valid token — need to pair
     if (isDaemon) {
@@ -199,11 +235,14 @@ async function main() {
             }
             catch (err) {
                 console.warn(`  Could not register for startup: ${err}`);
-                console.warn('  You can run "walldock-agent --daemon" manually to start syncing.');
+                console.warn('  You can run "walldock-agent" manually to start syncing.');
             }
         }
     }
-    console.log('\nStarting sync. Press Ctrl+C to stop.\n');
+    if (await maybeStartTray()) {
+        console.log('\nWalldock Agent is running in the system tray.\n');
+        process.exit(0);
+    }
     sync.start({ token: result.token, deviceId: result.deviceId });
 }
 main().catch(err => {

package/dist/startup.js

@@ -47,7 +47,8 @@ const exec = (0, node_util_1.promisify)(node_child_process_1.execFile);
 async function resolveGlobalBin() {
     let prefix;
     try {
-        const { stdout } = await exec('npm', ['prefix', '-g']);
+        const npmBin = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+        const { stdout } = await exec(npmBin, ['prefix', '-g']);
         prefix = stdout.trim();
     }
     catch {
@@ -82,7 +83,7 @@ function plistContent(binPath) {
   <key>ProgramArguments</key>
   <array>
     <string>${binPath}</string>
-    <string>--daemon</string>
+    <string>--tray</string>
   </array>
   <key>RunAtLoad</key>
   <true/>
@@ -111,7 +112,7 @@ const REG_KEY = 'HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Run';
 const REG_VALUE = 'WalldockAgent';
 async function registerWindows() {
     const binPath = await resolveGlobalBin();
-    const cmd = `"${binPath}" --daemon`;
+    const cmd = `"${binPath}" --tray`;
     await exec('reg', ['add', REG_KEY, '/v', REG_VALUE, '/t', 'REG_SZ', '/d', cmd, '/f']);
 }
 async function unregisterWindows() {
@@ -129,7 +130,7 @@ After=network-online.target
 Wants=network-online.target
 
 [Service]
-ExecStart=${binPath} --daemon
+ExecStart=${binPath} --tray
 Restart=on-failure
 RestartSec=10s
 
@@ -141,7 +142,7 @@ function desktopContent(binPath) {
     return `[Desktop Entry]
 Type=Application
 Name=Walldock Agent
-Exec=${binPath} --daemon
+Exec=${binPath} --tray
 Hidden=false
 NoDisplay=false
 X-GNOME-Autostart-enabled=true

package/dist/tray.d.ts

@@ -0,0 +1,5 @@
+export interface TrayHandle {
+    updateStatus(msg: string): void;
+    stop(): void;
+}
+export declare function startTray(onSyncNow: () => void, onQuit: () => void): TrayHandle;

package/dist/tray.js

@@ -0,0 +1,54 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startTray = startTray;
+const systray2_1 = __importDefault(require("systray2"));
+// 32x32 PNG from apps/agent/src-tauri/icons/32x32.png (base64)
+const ICON = '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';
+const IDX_STATUS = 0;
+const IDX_SYNC = 2;
+const IDX_QUIT = 4;
+function startTray(onSyncNow, onQuit) {
+    const systray = new systray2_1.default({
+        menu: {
+            icon: ICON,
+            title: '',
+            tooltip: 'Walldock Agent',
+            items: [
+                { title: 'Walldock Agent', tooltip: '', checked: false, enabled: false },
+                systray2_1.default.separator,
+                { title: 'Sync Now', tooltip: 'Fetch latest wallpapers', checked: false, enabled: true },
+                systray2_1.default.separator,
+                { title: 'Quit', tooltip: 'Stop Walldock Agent', checked: false, enabled: true },
+            ],
+        },
+        debug: false,
+        copyDir: true,
+    });
+    systray.onClick(action => {
+        if (action.seq_id === IDX_SYNC)
+            onSyncNow();
+        if (action.seq_id === IDX_QUIT)
+            onQuit();
+    });
+    return {
+        updateStatus(msg) {
+            try {
+                void systray.sendAction({
+                    type: 'update-item',
+                    item: { title: `Walldock — ${msg}`, tooltip: '', checked: false, enabled: false },
+                    seq_id: IDX_STATUS,
+                });
+            }
+            catch { /* tray process may have exited */ }
+        },
+        stop() {
+            try {
+                systray.kill(false);
+            }
+            catch { /* ignore */ }
+        },
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@walldock/agent",
-  "version": "0.1.7",
+  "version": "0.2.1",
   "description": "Walldock desktop agent — sync wallpapers across all your screens",
   "license": "MIT",
   "main": "dist/main.js",
@@ -14,7 +14,8 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@napi-rs/keyring": "^1.1.5"
+    "@napi-rs/keyring": "^1.1.5",
+    "systray2": "^2.1.4"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",