kitowall 3.5.7 → 3.5.11

package/dist/core/init.js

@@ -150,7 +150,10 @@ WantedBy=graphical-session.target
     await (0, exec_1.run)('systemctl', ['--user', 'daemon-reload']);
     await (0, exec_1.run)('systemctl', ['--user', 'enable', '--now', `swww-daemon@${ns}.service`]);
     await (0, exec_1.run)('systemctl', ['--user', 'enable', '--now', 'kitowall-watch.service']);
-    await (0, exec_1.run)('systemctl', ['--user', 'enable', '--now', 'kitowall-login-apply.service']);
+    // login-apply is oneshot and can fail on first run if library is still empty.
+    // Enable it for next graphical session, but do not make init fail here.
+    await (0, exec_1.run)('systemctl', ['--user', 'enable', 'kitowall-login-apply.service']);
+    await (0, exec_1.run)('systemctl', ['--user', 'start', 'kitowall-login-apply.service']).catch(() => { });
     // Si quieres: aplicar una vez ahora mismo
     if (opts.apply) {
         const controller = new controller_1.Controller(config, state);

package/dist/core/live.js

@@ -48,6 +48,7 @@ const LIVE_BROWSER_UA = process.env.KITOWALL_LIVE_UA ||
 const LIVE_BROWSER_UA_FALLBACK = process.env.KITOWALL_LIVE_UA_FALLBACK ||
     'insomnia/12.3.1';
 const INTEGRATED_RENDERCORE_ENV = 'KITOWALL_FLATPAK_INTEGRATED_RENDERCORE';
+const INTEGRATED_RENDERCORE_BIN_FALLBACK = '/app/bin/kitsune-rendercore';
 function nowUnix() {
     return Math.floor(Date.now() / 1000);
 }
@@ -104,10 +105,13 @@ function getLiveLockPath() {
     return node_path_1.default.join(getLiveInternalRoot(), 'index.lock');
 }
 function defaultRunnerConfig() {
+    const integratedBin = clean(process.env.KITOWALL_LIVE_RUNNER_BIN) || INTEGRATED_RENDERCORE_BIN_FALLBACK;
     return {
         mode: 'bin',
         cargo_project_dir: process.env.KITOWALL_LIVE_RUNNER_PROJECT?.trim() || '',
-        bin_name: process.env.KITOWALL_LIVE_RUNNER_BIN?.trim() || 'kitsune-rendercore'
+        bin_name: integratedRendercoreMode()
+            ? integratedBin
+            : (process.env.KITOWALL_LIVE_RUNNER_BIN?.trim() || 'kitsune-rendercore')
     };
 }
 function defaultIndex() {
@@ -872,6 +876,12 @@ function integratedRendercoreMode() {
     const v = clean(process.env[INTEGRATED_RENDERCORE_ENV]).toLowerCase();
     return v === '1' || v === 'true' || v === 'yes' || v === 'on';
 }
+function resolveRendercoreBin(index) {
+    if (integratedRendercoreMode()) {
+        return clean(process.env.KITOWALL_LIVE_RUNNER_BIN) || INTEGRATED_RENDERCORE_BIN_FALLBACK;
+    }
+    return clean(index.runner.bin_name) || 'kitsune-rendercore';
+}
 function integratedRendercorePidPath() {
     return node_path_1.default.join(getLiveInternalRoot(), 'rendercore.pid');
 }
@@ -1633,7 +1643,7 @@ async function liveApply(opts) {
     if (!item || !node_fs_1.default.existsSync(item.file_path)) {
         throw new Error(`Live file not found for ${idRaw}. Re-download it with live fetch.`);
     }
-    const bin = index.runner.bin_name;
+    const bin = resolveRendercoreBin(index);
     const setVideoArgs = [
         'set-video',
         '--monitor', monitor,
@@ -1792,18 +1802,26 @@ async function liveDoctor(opts) {
     catch {
         deps.hyprctl = false;
     }
-    try {
-        await (0, exec_1.run)('which', [index.runner.bin_name], { timeoutMs: 4000 });
-        deps.runner_bin = true;
+    const runnerBin = resolveRendercoreBin(index);
+    if (runnerBin.startsWith('/')) {
+        deps.runner_bin = node_fs_1.default.existsSync(runnerBin);
     }
-    catch {
-        deps.runner_bin = false;
-        fix.push(`Install ${index.runner.bin_name} and ensure it is available in PATH`);
+    else {
+        try {
+            await (0, exec_1.run)('which', [runnerBin], { timeoutMs: 4000 });
+            deps.runner_bin = true;
+        }
+        catch {
+            deps.runner_bin = false;
+        }
+    }
+    if (!deps.runner_bin) {
+        fix.push(`Install ${runnerBin} and ensure it is available in PATH`);
     }
     if (opts?.fix && deps.runner_bin) {
         try {
-            await (0, exec_1.run)(index.runner.bin_name, ['install-deps'], { timeoutMs: 180000 });
-            fix.push(`Executed: ${index.runner.bin_name} install-deps`);
+            await (0, exec_1.run)(runnerBin, ['install-deps'], { timeoutMs: 180000 });
+            fix.push(`Executed: ${runnerBin} install-deps`);
             try {
                 await (0, exec_1.run)('ffmpeg', ['-version'], { timeoutMs: 4000 });
                 deps.ffmpeg = true;
@@ -1824,7 +1842,7 @@ async function liveDoctor(opts) {
         }
     }
     else if (!deps.ffmpeg || !deps.hyprctl) {
-        fix.push(`Run '${index.runner.bin_name} install-deps' to install missing runtime dependencies`);
+        fix.push(`Run '${runnerBin} install-deps' to install missing runtime dependencies`);
     }
     return {
         ok: Object.values(deps).every(Boolean) || (deps.hyprctl === false && Object.keys(deps).filter(k => k !== 'hyprctl').every(k => deps[k])),
@@ -1836,7 +1854,7 @@ async function liveDoctor(opts) {
 }
 async function liveServiceAutostart(action) {
     const index = readIndex();
-    let bin = index.runner.bin_name;
+    let bin = resolveRendercoreBin(index);
     if (integratedRendercoreMode()) {
         let out;
         if (action === 'status') {

package/dist/core/systemd.js

@@ -36,6 +36,37 @@ async function installSystemd(opts) {
     const userDir = (0, node_path_1.join)((0, node_os_1.homedir)(), '.config', 'systemd', 'user');
     ensureDir(userDir);
     const every = systemdInterval(opts.every);
+    const ns = (opts.namespace && opts.namespace.trim()) ? opts.namespace.trim() : 'kitowall';
+    const isFlatpak = Boolean(process.env.FLATPAK_ID);
+    const flatpakAppId = (process.env.FLATPAK_ID || 'io.kitotsu.KitoWall').trim();
+    const nodePath = process.execPath;
+    const cliPath = (0, node_path_1.resolve)(process.argv[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}`;
+    const pathEnv = [
+        `${(0, node_os_1.homedir)()}/.local/bin`,
+        '/usr/local/bin',
+        '/usr/bin',
+        '/bin'
+    ].join(':');
+    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;';
+    const nextCmd = isFlatpak
+        ? `${waylandBootstrap} exec /usr/bin/flatpak run --command=kitowall ${flatpakAppId} rotate-now --namespace ${ns} --force`
+        : `${waylandBootstrap} exec ${JSON.stringify(nodePath)} ${JSON.stringify(cliPath)} rotate-now --namespace ${JSON.stringify(ns)} --force`;
+    const kitowallNextService = `
+        [Unit]
+        Description=Kitowall apply next wallpapers
+
+        [Service]
+        Type=oneshot
+        Environment=PATH=${pathEnv}
+        Environment=XDG_RUNTIME_DIR=${xdgRuntimeDir}
+        ExecStart=/bin/sh -lc ${JSON.stringify(nextCmd)}
+    `.trimStart();
+    (0, node_fs_1.writeFileSync)((0, node_path_1.join)(userDir, 'kitowall-next.service'), kitowallNextService, 'utf8');
     const kitowallTimer = `
         [Unit]
         Description=Run kitowall-next periodically
@@ -54,6 +85,8 @@ async function installSystemd(opts) {
     `.trimStart();
     (0, node_fs_1.writeFileSync)((0, node_path_1.join)(userDir, 'kitowall-next.timer'), kitowallTimer, 'utf8');
     await (0, exec_1.run)('systemctl', ['--user', 'daemon-reload']);
+    await (0, exec_1.run)('systemctl', ['--user', 'reset-failed', 'kitowall-next.service']).catch(() => { });
+    await (0, exec_1.run)('systemctl', ['--user', 'reset-failed', 'kitowall-next.timer']).catch(() => { });
     await (0, exec_1.run)('systemctl', ['--user', 'enable', '--now', 'kitowall-next.timer']);
 }
 async function uninstallSystemd() {

package/package.json

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