kitowall 3.5.12 → 3.5.14

package/README.md

@@ -1,4 +1,4 @@
-<img src="https://github.com/KitotsuMolina/Kitowall/blob/master/assets/kitowall.png?raw=true" alt="Kitowall" width="420" />
+<img src="https://github.com/KitotsuMolina/Kitowall/blob/main/assets/kitowall.png?raw=true" alt="Kitowall" width="420" />
 
 # Kitowall
 

package/dist/core/init.js

@@ -16,6 +16,91 @@ function esc(a) {
     // ExecStart=... necesita escapado simple. JSON.stringify funciona bien para espacios/comillas.
     return JSON.stringify(a);
 }
+async function runHostShell(cmd) {
+    if (process.env.FLATPAK_ID) {
+        return (0, exec_1.run)('flatpak-spawn', ['--host', 'sh', '-lc', cmd]);
+    }
+    return (0, exec_1.run)('sh', ['-lc', cmd]);
+}
+async function hostCmdExists(cmd) {
+    try {
+        await runHostShell(`command -v ${cmd} >/dev/null 2>&1`);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+async function ensureHostDeps() {
+    const required = ['swww', 'swww-daemon', 'hyprctl'];
+    const missing = [];
+    for (const dep of required) {
+        if (!(await hostCmdExists(dep)))
+            missing.push(dep);
+    }
+    if (missing.length === 0)
+        return;
+    const pkgSet = new Set();
+    if (missing.includes('swww') || missing.includes('swww-daemon'))
+        pkgSet.add('swww');
+    if (missing.includes('hyprctl'))
+        pkgSet.add('hyprland');
+    const packages = Array.from(pkgSet);
+    // Best effort auto-install on Arch host; if it fails, we keep a clear actionable error.
+    if (packages.length > 0 && await hostCmdExists('pacman')) {
+        const pkgArgs = packages.join(' ');
+        await runHostShell(`if command -v sudo >/dev/null 2>&1; then ` +
+            `(sudo -n pacman -S --needed --noconfirm ${pkgArgs} || sudo pacman -S --needed ${pkgArgs}); ` +
+            `else pacman -S --needed ${pkgArgs}; fi`).catch(() => { });
+    }
+    const stillMissing = [];
+    for (const dep of required) {
+        if (!(await hostCmdExists(dep)))
+            stillMissing.push(dep);
+    }
+    if (stillMissing.length > 0) {
+        throw new Error(`Missing host dependencies: ${stillMissing.join(', ')}. ` +
+            `Install on host (Arch): sudo pacman -S --needed swww hyprland`);
+    }
+}
+async function ensureHostFlatpakBridges(appId) {
+    const home = (0, node_os_1.homedir)();
+    const localBinDir = (0, node_path_1.join)(home, '.local', 'bin');
+    ensureDir(localBinDir);
+    const writeBridge = (name, command) => {
+        const bridgePath = (0, node_path_1.join)(localBinDir, name);
+        const bridgeScript = `#!/usr/bin/env bash
+set -euo pipefail
+exec /usr/bin/flatpak run --command=${command} ${appId} "$@"
+`;
+        (0, node_fs_1.writeFileSync)(bridgePath, bridgeScript, { encoding: 'utf8', mode: 0o755 });
+        return bridgePath;
+    };
+    writeBridge('kitowall', 'kitowall');
+    writeBridge('kitsune', 'kitsune');
+    const rendercoreBridgePath = writeBridge('kitsune-rendercore', 'kitsune-rendercore');
+    const userDir = (0, node_path_1.join)(home, '.config', 'systemd', 'user');
+    ensureDir(userDir);
+    const unitPath = (0, node_path_1.join)(userDir, 'kitsune-rendercore.service');
+    const unit = `
+[Unit]
+Description=Kitsune RenderCore Live Wallpaper (Flatpak bridge)
+After=graphical-session.target
+PartOf=graphical-session.target
+
+[Service]
+Type=simple
+ExecStart=${rendercoreBridgePath}
+Restart=on-failure
+RestartSec=1
+
+[Install]
+WantedBy=default.target
+`.trimStart();
+    (0, node_fs_1.writeFileSync)(unitPath, unit, 'utf8');
+    await (0, exec_1.run)('systemctl', ['--user', 'daemon-reload']);
+    await (0, exec_1.run)('systemctl', ['--user', 'enable', '--now', 'kitsune-rendercore.service']).catch(() => { });
+}
 async function disableIfExists(unit) {
     await (0, exec_1.run)('systemctl', ['--user', 'disable', '--now', unit]).catch(() => { });
     await (0, exec_1.run)('systemctl', ['--user', 'reset-failed', unit]).catch(() => { });
@@ -39,24 +124,26 @@ 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: 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
     const ns = (opts.namespace && opts.namespace.trim()) ? opts.namespace.trim() : 'kitowall';
     const force = !!opts.force;
+    const isFlatpak = Boolean(process.env.FLATPAK_ID);
+    const flatpakAppId = (process.env.FLATPAK_ID || 'io.kitotsu.KitoWall').trim();
     // Validaciones mínimas
-    await (0, exec_1.run)('which', ['swww']).catch(() => { throw new Error('Missing dependency: swww'); });
-    await (0, exec_1.run)('which', ['swww-daemon']).catch(() => { throw new Error('Missing dependency: swww-daemon'); });
-    await (0, exec_1.run)('which', ['hyprctl']).catch(() => { throw new Error('Missing dependency: hyprctl'); });
+    await ensureHostDeps();
+    if (isFlatpak) {
+        await ensureHostFlatpakBridges(flatpakAppId);
+    }
     // Apagar servicios que pisan el wallpaper
     await detectAndHandleConflicts(force);
     const userDir = (0, node_path_1.join)((0, node_os_1.homedir)(), '.config', 'systemd', 'user');
     ensureDir(userDir);
     const nodePath = process.execPath;
     const cliPath = (0, node_path_1.resolve)(process.argv[1]); // dist/cli.js absoluto
+    const cliInvoke = isFlatpak
+        ? `/usr/bin/flatpak run --command=kitowall ${flatpakAppId}`
+        : `${JSON.stringify(nodePath)} ${JSON.stringify(cliPath)}`;
     const xdgRuntimeDir = (process.env.XDG_RUNTIME_DIR && process.env.XDG_RUNTIME_DIR.trim())
         ? process.env.XDG_RUNTIME_DIR.trim()
         : `/run/user/${process.getuid?.() ?? 1000}`;
@@ -92,7 +179,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 = `/bin/sh -lc ${esc(`${waylandBootstrap} exec ${nodePath} ${esc(cliPath)} ${esc('next')} ${esc('--namespace')} ${esc(ns)}`)}`;
+    const nextExec = `/bin/sh -lc ${esc(`${waylandBootstrap} exec ${cliInvoke} next --namespace ${JSON.stringify(ns)}`)}`;
     const kitowallNextService = `
 [Unit]
 Description=Kitowall apply next wallpapers
@@ -107,7 +194,7 @@ 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 = `/bin/sh -lc ${esc(`${waylandBootstrap} exec ${nodePath} ${esc(cliPath)} ${esc('watch')} ${esc('--namespace')} ${esc(ns)}`)}`;
+    const watchExec = `/bin/sh -lc ${esc(`${waylandBootstrap} exec ${cliInvoke} watch --namespace ${JSON.stringify(ns)}`)}`;
     const kitowallWatchService = `
 [Unit]
 Description=Kitowall watcher (monitor hotplug)
@@ -128,7 +215,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; ${waylandBootstrap} exec ${nodePath} ${esc(cliPath)} ${esc('rotate-now')} ${esc('--namespace')} ${esc(ns)} ${esc('--force')}`)}`;
+    const loginApplyExec = `/bin/sh -lc ${esc(`sleep 2; ${waylandBootstrap} exec ${cliInvoke} rotate-now --namespace ${JSON.stringify(ns)} --force`)}`;
     const kitowallLoginApplyService = `
 [Unit]
 Description=Kitowall apply wallpapers on session start

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitowall",
-  "version": "3.5.12",
+  "version": "3.5.14",
   "description": "CLI/daemon for Hyprland wallpapers using swww with pack-based rotation.",
   "repository": {
     "type": "git",