kitowall 1.0.6 → 1.1.0

package/README.md

@@ -4,7 +4,7 @@
 
 `Kitowall` is a wallpaper manager for Hyprland/Wayland using `swww`.
 
-Current version: `1.0.5`.
+Current version: `1.0.7`.
 
 ## What You Can Do
 - Rotate wallpapers with transitions.

package/dist/core/init.js

@@ -41,7 +41,7 @@ async function detectAndHandleConflicts(force) {
 async function initKitowall(opts) {
     if (process.env.FLATPAK_ID) {
         throw new Error('init/repair cannot be executed from Flatpak UI because it would generate host systemd units with sandbox paths. ' +
-            'Run on host shell: node dist/cli.js init --namespace kitowall --apply --force');
+            'Run on host shell: kitowall init --namespace kitowall --apply --force (or, in local dev, node dist/cli.js init --namespace kitowall --apply --force)');
     }
     const config = (0, config_1.loadConfig)(); // crea/migra config si hace falta
     const state = (0, state_1.loadState)(); // crea/migra state si hace falta
@@ -57,10 +57,6 @@ async function initKitowall(opts) {
     ensureDir(userDir);
     const nodePath = process.execPath;
     const cliPath = (0, node_path_1.resolve)(process.argv[1]); // dist/cli.js absoluto
-    // Entorno Wayland (defaults seguros)
-    const waylandDisplay = (process.env.WAYLAND_DISPLAY && process.env.WAYLAND_DISPLAY.trim())
-        ? process.env.WAYLAND_DISPLAY.trim()
-        : 'wayland-1';
     const xdgRuntimeDir = (process.env.XDG_RUNTIME_DIR && process.env.XDG_RUNTIME_DIR.trim())
         ? process.env.XDG_RUNTIME_DIR.trim()
         : `/run/user/${process.getuid?.() ?? 1000}`;
@@ -70,6 +66,11 @@ async function initKitowall(opts) {
         '/usr/bin',
         '/bin'
     ].join(':');
+    // Resolve WAYLAND_DISPLAY at runtime for every service start. This avoids
+    // stale values across relogin (e.g. wayland-0 vs wayland-1).
+    const waylandBootstrap = 'WAYLAND_DISPLAY="${WAYLAND_DISPLAY:-$(ls \\"$XDG_RUNTIME_DIR\\"/wayland-* 2>/dev/null | xargs -r -n1 basename | sort | tail -n1)}"; ' +
+        'if [ -z "$WAYLAND_DISPLAY" ]; then WAYLAND_DISPLAY=wayland-1; fi; ' +
+        'export WAYLAND_DISPLAY;';
     // 1) swww-daemon template
     const swwwDaemonTemplate = `
 [Unit]
@@ -80,9 +81,8 @@ PartOf=graphical-session.target
 [Service]
 Type=simple
 Environment=PATH=${pathEnv}
-Environment=WAYLAND_DISPLAY=${waylandDisplay}
 Environment=XDG_RUNTIME_DIR=${xdgRuntimeDir}
-ExecStart=swww-daemon --no-cache --namespace %i
+ExecStart=/bin/sh -lc ${esc(`${waylandBootstrap} exec swww-daemon --no-cache --namespace %i`)}
 Restart=on-failure
 RestartSec=1
 
@@ -92,7 +92,7 @@ WantedBy=graphical-session.target
     (0, node_fs_1.writeFileSync)((0, node_path_1.join)(userDir, 'swww-daemon@.service'), swwwDaemonTemplate, 'utf8');
     // 2) kitowall-next.service (oneshot)
     // OJO: aunque CLI ignore --namespace en algunos comandos, aquí lo dejamos por compatibilidad.
-    const nextExec = `${nodePath} ${esc(cliPath)} ${esc('next')} ${esc('--namespace')} ${esc(ns)}`;
+    const nextExec = `/bin/sh -lc ${esc(`${waylandBootstrap} exec ${nodePath} ${esc(cliPath)} ${esc('next')} ${esc('--namespace')} ${esc(ns)}`)}`;
     const kitowallNextService = `
 [Unit]
 Description=Kitowall apply next wallpapers
@@ -102,13 +102,12 @@ Requires=swww-daemon@${ns}.service
 [Service]
 Type=oneshot
 Environment=PATH=${pathEnv}
-Environment=WAYLAND_DISPLAY=${waylandDisplay}
 Environment=XDG_RUNTIME_DIR=${xdgRuntimeDir}
 ExecStart=${nextExec}
 `.trimStart();
     (0, node_fs_1.writeFileSync)((0, node_path_1.join)(userDir, 'kitowall-next.service'), kitowallNextService, 'utf8');
     // 3) kitowall-watch.service (hotplug watcher)
-    const watchExec = `${nodePath} ${esc(cliPath)} ${esc('watch')} ${esc('--namespace')} ${esc(ns)}`;
+    const watchExec = `/bin/sh -lc ${esc(`${waylandBootstrap} exec ${nodePath} ${esc(cliPath)} ${esc('watch')} ${esc('--namespace')} ${esc(ns)}`)}`;
     const kitowallWatchService = `
 [Unit]
 Description=Kitowall watcher (monitor hotplug)
@@ -119,7 +118,6 @@ PartOf=graphical-session.target
 [Service]
 Type=simple
 Environment=PATH=${pathEnv}
-Environment=WAYLAND_DISPLAY=${waylandDisplay}
 Environment=XDG_RUNTIME_DIR=${xdgRuntimeDir}
 ExecStart=${watchExec}
 Restart=on-failure
@@ -130,7 +128,7 @@ WantedBy=graphical-session.target
 `.trimStart();
     (0, node_fs_1.writeFileSync)((0, node_path_1.join)(userDir, 'kitowall-watch.service'), kitowallWatchService, 'utf8');
     // 4) kitowall-login-apply.service (apply once on login to avoid gray background)
-    const loginApplyExec = `/bin/sh -lc ${esc(`sleep 2; ${nodePath} ${esc(cliPath)} ${esc('rotate-now')} ${esc('--namespace')} ${esc(ns)} ${esc('--force')}`)}`;
+    const loginApplyExec = `/bin/sh -lc ${esc(`sleep 2; ${waylandBootstrap} exec ${nodePath} ${esc(cliPath)} ${esc('rotate-now')} ${esc('--namespace')} ${esc(ns)} ${esc('--force')}`)}`;
     const kitowallLoginApplyService = `
 [Unit]
 Description=Kitowall apply wallpapers on session start
@@ -141,7 +139,6 @@ PartOf=graphical-session.target
 [Service]
 Type=oneshot
 Environment=PATH=${pathEnv}
-Environment=WAYLAND_DISPLAY=${waylandDisplay}
 Environment=XDG_RUNTIME_DIR=${xdgRuntimeDir}
 ExecStart=${loginApplyExec}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitowall",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "description": "CLI/daemon for Hyprland wallpapers using swww with pack-based rotation.",
   "license": "SEE LICENSE IN LICENSE.md",
   "type": "commonjs",
@@ -27,7 +27,6 @@
     "test:regression": "bash ./tests/regression.e2e.sh",
     "test:e2e": "npm run test:smoke && npm run test:regression"
   },
-  "dependencies": {},
   "devDependencies": {
     "@types/node": "^22.10.0",
     "typescript": "^5.4.0"