@walldock/agent 0.2.5 → 0.2.7

package/dist/main.js

@@ -102,11 +102,6 @@ async function main() {
     }
     // --register-startup: (re-)register the startup entry without going through pairing
     if (args.includes('--register-startup')) {
-        const globalBin = await (0, startup_1.getGlobalBin)();
-        if (!globalBin) {
-            console.error('walldock-agent is not globally installed. Run: npm install -g @walldock/agent');
-            process.exit(1);
-        }
         try {
             await (0, startup_1.registerStartup)();
             console.log(`✓ Registered for startup (${(0, startup_1.startupDescription)()})`);

package/dist/startup.js

@@ -45,28 +45,32 @@ const node_util_1 = require("node:util");
 const exec = (0, node_util_1.promisify)(node_child_process_1.execFile);
 // ─── Global bin resolution ────────────────────────────────────────────────────
 async function resolveGlobalBin() {
-    let prefix;
-    try {
-        const npmBin = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-        const { stdout } = await exec(npmBin, ['prefix', '-g']);
-        prefix = stdout.trim();
-    }
-    catch {
-        throw new Error('Could not determine npm global prefix.\n' +
-            'Make sure npm is installed and run: npm install -g @walldock/agent');
-    }
     const binName = process.platform === 'win32' ? 'walldock-agent.cmd' : 'walldock-agent';
-    const binPath = process.platform === 'win32'
-        ? path.join(prefix, binName)
-        : path.join(prefix, 'bin', binName);
+    // First try: derive path from npm global prefix
     try {
+        const npmBin = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+        const { stdout } = await exec(npmBin, ['prefix', '-g'], { encoding: 'utf8' });
+        const prefix = stdout.trim();
+        const binPath = process.platform === 'win32'
+            ? path.join(prefix, binName)
+            : path.join(prefix, 'bin', binName);
         await fs.access(binPath);
+        return binPath;
     }
-    catch {
-        throw new Error(`walldock-agent is not globally installed at ${binPath}.\n` +
-            'Run: npm install -g @walldock/agent');
+    catch { /* fall through to PATH lookup */ }
+    // Second try: search PATH (handles nvm-windows, custom prefixes, etc.)
+    try {
+        const whereCmd = process.platform === 'win32' ? 'where' : 'which';
+        const { stdout } = await exec(whereCmd, [binName], { encoding: 'utf8' });
+        const found = stdout.trim().split('\n')[0]?.trim();
+        if (found) {
+            await fs.access(found);
+            return found;
+        }
     }
-    return binPath;
+    catch { /* fall through */ }
+    throw new Error(`walldock-agent is not globally installed.\n` +
+        'Run: npm install -g @walldock/agent');
 }
 // ─── macOS ───────────────────────────────────────────────────────────────────
 const LAUNCH_AGENTS_DIR = path.join(os.homedir(), 'Library', 'LaunchAgents');
@@ -108,24 +112,18 @@ async function unregisterMacOS() {
     await fs.unlink(PLIST_PATH).catch(() => undefined);
 }
 // ─── Windows ─────────────────────────────────────────────────────────────────
-const REG_KEY = 'HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Run';
-const REG_VALUE = 'WalldockAgent';
-// VBScript launcher: runs walldock-agent.cmd silently (windowStyle=0 = hidden).
-// Stored in %APPDATA%\walldock\ so it survives package updates — the .cmd
-// wrapper always resolves to whichever version is currently installed.
-const VBS_PATH = path.join(process.env['APPDATA'] ?? os.homedir(), 'walldock', 'launch-agent.vbs');
+// Use the per-user Startup folder — always writable, no registry or admin needed.
+const WIN_STARTUP_DIR = path.join(process.env['APPDATA'] ?? os.homedir(), 'Microsoft', 'Windows', 'Start Menu', 'Programs', 'Startup');
+const WIN_VBS_PATH = path.join(WIN_STARTUP_DIR, 'walldock-agent.vbs');
 async function registerWindows() {
     const binPath = await resolveGlobalBin();
-    await fs.mkdir(path.dirname(VBS_PATH), { recursive: true });
-    // windowStyle=0 = hidden, WaitOnReturn=False
-    await fs.writeFile(VBS_PATH, `CreateObject("WScript.Shell").Run """${binPath}"" --tray", 0, False\n`, 'utf8');
-    const wscript = path.join(process.env['SystemRoot'] ?? 'C:\\Windows', 'System32', 'wscript.exe');
-    const cmd = `"${wscript}" "${VBS_PATH}"`;
-    await exec('reg', ['add', REG_KEY, '/v', REG_VALUE, '/t', 'REG_SZ', '/d', cmd, '/f'], { windowsHide: true, encoding: 'utf8' });
+    // windowStyle=0 = hidden, WaitOnReturn=False — no console window at login
+    await fs.writeFile(WIN_VBS_PATH, `CreateObject("WScript.Shell").Run """${binPath}"" --tray", 0, False\n`, 'utf8');
 }
 async function unregisterWindows() {
-    await exec('reg', ['delete', REG_KEY, '/v', REG_VALUE, '/f'], { windowsHide: true, encoding: 'utf8' }).catch(() => undefined);
-    await fs.unlink(VBS_PATH).catch(() => undefined);
+    await fs.unlink(WIN_VBS_PATH).catch(() => undefined);
+    // Clean up old registry entry left by earlier versions
+    await exec('reg', ['delete', 'HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Run', '/v', 'WalldockAgent', '/f'], { windowsHide: true, encoding: 'utf8' }).catch(() => undefined);
 }
 // ─── Linux ───────────────────────────────────────────────────────────────────
 const SYSTEMD_USER_DIR = path.join(os.homedir(), '.config', 'systemd', 'user');
@@ -204,7 +202,7 @@ function startupDescription() {
     if (process.platform === 'darwin')
         return `LaunchAgent at ${PLIST_PATH}`;
     if (process.platform === 'win32')
-        return `Registry Run key → wscript launcher at ${VBS_PATH}`;
+        return `Startup folder: ${WIN_VBS_PATH}`;
     return `systemd user service (or ${DESKTOP_PATH})`;
 }
 /** Returns the resolved global bin path, or null if not globally installed. */

package/package.json

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