@walldock/agent 0.2.0 → 0.2.2

package/dist/main.js

@@ -47,6 +47,7 @@ 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');
@@ -62,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 {
@@ -74,6 +75,15 @@ async function main() {
     const args = process.argv.slice(2);
     // --unlink: remove stored credentials and startup entry
     if (args.includes('--unlink')) {
+        // Kill any running background instance first so the user can re-pair immediately
+        const bgPid = await (0, pid_1.runningPid)();
+        if (bgPid) {
+            try {
+                process.kill(bgPid);
+            }
+            catch { /* already dead */ }
+            await new Promise(r => setTimeout(r, 600));
+        }
         const token = await storage.getDeviceToken();
         if (token) {
             const api = new api_1.AgentApi();
@@ -96,7 +106,7 @@ async function main() {
         }
         return;
     }
-    if (isDaemon)
+    if (isDaemon || isTray)
         await openLog();
     // Single-instance guard
     try {
@@ -104,6 +114,7 @@ async function main() {
     }
     catch (err) {
         console.error(`\n${err}`);
+        console.error('To re-link: right-click the tray icon → Quit, or run: walldock-agent --unlink');
         process.exit(1);
     }
     const api = new api_1.AgentApi(process.env['WALLDOCK_API_URL'] ?? undefined);
@@ -125,8 +136,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;
                 }
@@ -163,15 +174,28 @@ async function main() {
     }
     process.on('SIGINT', () => { void shutdown(); });
     process.on('SIGTERM', () => { void shutdown(); });
-    function maybeStartTray() {
-        if (isDaemon || trayHandle)
-            return;
-        try {
-            trayHandle = (0, tray_1.startTray)(() => { void sync.syncNow(); }, () => { void shutdown(); });
-        }
-        catch {
-            // tray unavailable (headless/no display) — continue without it
+    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…');
@@ -179,15 +203,16 @@ async function main() {
     if (existing) {
         await storage.setDeviceIdentity({ deviceId: existing.deviceId, deviceName: existing.deviceName });
         log(`Linked as "${existing.deviceName}". Starting sync…`);
-        maybeStartTray();
-        sync.start({ token: existing.token, deviceId: existing.deviceId });
-        if (trayHandle)
+        if (await maybeStartTray()) {
             console.log('Walldock Agent is running in the system tray.');
-        return; // sync loop keeps process alive
+            process.exit(0);
+        }
+        sync.start({ token: existing.token, deviceId: existing.deviceId });
+        return; // sync loop keeps process alive (isTray path)
     }
     // No valid token — need to pair
-    if (isDaemon) {
-        log('No valid device token found. Run without --daemon to pair this device.');
+    if (isDaemon || isTray) {
+        log('No valid device token found. Run "walldock-agent" to pair this device.');
         process.exit(1);
     }
     // Interactive pairing
@@ -220,16 +245,13 @@ 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.');
             }
         }
     }
-    maybeStartTray();
-    if (trayHandle) {
-        console.log('\nWalldock Agent is running in the system tray. You can close this terminal.\n');
-    }
-    else {
-        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 });
 }

package/dist/screens/windows.js

@@ -47,7 +47,7 @@ public class MonitorHelper {
 [MonitorHelper]::Enumerate() | ForEach-Object { Write-Output $_ }
 `.trim();
 async function listScreensWindows() {
-    const { stdout } = await exec('powershell.exe', ['-NoProfile', '-Command', PS_SCRIPT]);
+    const { stdout } = await exec('powershell.exe', ['-NoProfile', '-Command', PS_SCRIPT], { windowsHide: true, encoding: 'utf8' });
     const screens = [];
     for (const line of stdout.trim().split(/\r?\n/)) {
         if (!line.trim())

package/dist/startup.js

@@ -83,7 +83,7 @@ function plistContent(binPath) {
   <key>ProgramArguments</key>
   <array>
     <string>${binPath}</string>
-    <string>--daemon</string>
+    <string>--tray</string>
   </array>
   <key>RunAtLoad</key>
   <true/>
@@ -112,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() {
@@ -130,7 +130,7 @@ After=network-online.target
 Wants=network-online.target
 
 [Service]
-ExecStart=${binPath} --daemon
+ExecStart=${binPath} --tray
 Restart=on-failure
 RestartSec=10s
 
@@ -142,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/wallpaper/windows.js

@@ -53,5 +53,5 @@ public class WallpaperHelper {
 "@
 [WallpaperHelper]::Set(${monitorIndex}, '${safePath}')
 `.trim();
-    await exec('powershell.exe', ['-NoProfile', '-Command', script]);
+    await exec('powershell.exe', ['-NoProfile', '-Command', script], { windowsHide: true, encoding: 'utf8' });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@walldock/agent",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Walldock desktop agent — sync wallpapers across all your screens",
   "license": "MIT",
   "main": "dist/main.js",