kitowall 3.5.0 → 3.5.11

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Jhojan Esteban Molina Valencia
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -66,6 +66,9 @@ npm run package:all
 
 ## Flatpak (Linux)
 ```bash
+# 0) Install host deps (Arch Linux)
+./BOOTSTRAP_FLATPAK_BUILD_DEPS.sh
+
 # 1) Build desktop binary
 cd ui
 npm run tauri:build
@@ -78,6 +81,20 @@ cd ..
 flatpak-builder flatpak/build-dir flatpak/io.kitotsu.KitoWall.yml --user --install --force-clean
 ```
 
+For Flathub source pipeline:
+```bash
+./BOOTSTRAP_FLATPAK_BUILD_DEPS.sh
+./GENERATE_FLATHUB_SOURCES.sh 2.1.0 && ./BUILD_FLATPAK_FROMSOURCE.sh
+```
+
+Integrated local Flatpak (Kitowall + Kitsune + Kitsune-RenderCore in one app):
+```bash
+./BOOTSTRAP_FLATPAK_BUILD_DEPS.sh
+./GENERATE_FLATHUB_SOURCES.sh 2.1.0
+./BUILD_FLATPAK_INTEGRATED_LOCAL.sh
+flatpak run io.kitotsu.KitoWall
+```
+
 ## User Docs
 - Current status: `STATUS.md`
 - Config examples: `CONFIG_EXAMPLES.md`

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

@@ -33,6 +33,7 @@ exports.liveViewData = liveViewData;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_os_1 = __importDefault(require("node:os"));
 const node_path_1 = __importDefault(require("node:path"));
+const node_child_process_1 = require("node:child_process");
 const node_stream_1 = require("node:stream");
 const promises_1 = require("node:stream/promises");
 const exec_1 = require("../utils/exec");
@@ -46,6 +47,8 @@ const LIVE_BROWSER_UA = process.env.KITOWALL_LIVE_UA ||
     'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36';
 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);
 }
@@ -102,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() {
@@ -864,6 +870,127 @@ function normalizeApplyDefaults(raw, fallback) {
 function rendercoreEnvPath() {
     return node_path_1.default.join(node_os_1.default.homedir(), '.config', 'kitsune-rendercore', 'env');
 }
+function integratedRendercoreMode() {
+    if (!process.env.FLATPAK_ID)
+        return false;
+    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');
+}
+function integratedRendercoreLogPath() {
+    return node_path_1.default.join(getLiveInternalRoot(), 'rendercore.log');
+}
+function readIntegratedRendercorePid() {
+    const p = integratedRendercorePidPath();
+    try {
+        const raw = clean(node_fs_1.default.readFileSync(p, 'utf8'));
+        const pid = Number(raw);
+        if (!Number.isInteger(pid) || pid <= 1)
+            return null;
+        return pid;
+    }
+    catch {
+        return null;
+    }
+}
+function processRunning(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function integratedRendercoreStatus(bin) {
+    const pid = readIntegratedRendercorePid();
+    if (!pid) {
+        return {
+            stdout: `Integrated rendercore inactive (bin=${bin})`,
+            stderr: '',
+            code: 3
+        };
+    }
+    if (!processRunning(pid)) {
+        try {
+            node_fs_1.default.rmSync(integratedRendercorePidPath(), { force: true });
+        }
+        catch { }
+        return {
+            stdout: `Integrated rendercore stale pid file removed (pid=${pid})`,
+            stderr: '',
+            code: 3
+        };
+    }
+    return {
+        stdout: `Integrated rendercore active (pid=${pid}, bin=${bin})`,
+        stderr: '',
+        code: 0
+    };
+}
+function integratedRendercoreStart(bin) {
+    ensureLiveDirs();
+    const current = integratedRendercoreStatus(bin);
+    if (current.code === 0)
+        return current;
+    const outFd = node_fs_1.default.openSync(integratedRendercoreLogPath(), 'a');
+    const child = (0, node_child_process_1.spawn)(bin, [], {
+        cwd: node_os_1.default.homedir(),
+        env: process.env,
+        detached: true,
+        stdio: ['ignore', outFd, outFd]
+    });
+    child.unref();
+    node_fs_1.default.closeSync(outFd);
+    node_fs_1.default.writeFileSync(integratedRendercorePidPath(), `${child.pid}\n`, 'utf8');
+    return {
+        stdout: `Integrated rendercore started (pid=${child.pid}, bin=${bin})`,
+        stderr: '',
+        code: 0
+    };
+}
+function integratedRendercoreStop(bin) {
+    const pid = readIntegratedRendercorePid();
+    if (!pid) {
+        return {
+            stdout: `Integrated rendercore already stopped (bin=${bin})`,
+            stderr: '',
+            code: 0
+        };
+    }
+    try {
+        process.kill(pid, 'SIGTERM');
+    }
+    catch { }
+    const until = Date.now() + 2000;
+    while (Date.now() < until) {
+        if (!processRunning(pid))
+            break;
+    }
+    if (processRunning(pid)) {
+        try {
+            process.kill(pid, 'SIGKILL');
+        }
+        catch { }
+    }
+    try {
+        node_fs_1.default.rmSync(integratedRendercorePidPath(), { force: true });
+    }
+    catch { }
+    return {
+        stdout: `Integrated rendercore stopped (pid=${pid}, bin=${bin})`,
+        stderr: '',
+        code: 0
+    };
+}
 function syncRendercoreEnv(defaults) {
     const p = rendercoreEnvPath();
     (0, fs_1.ensureDir)(node_path_1.default.dirname(p));
@@ -1516,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,
@@ -1526,8 +1653,13 @@ async function liveApply(opts) {
     // Live mode owns wallpaper state: stop static rotation services while live is active.
     await (0, workshop_1.workshopCoexistenceEnter)();
     // Keep live authority persistent across session restarts.
-    await (0, exec_1.run)(bin, ['service', 'install'], { timeoutMs: 20000 });
-    await (0, exec_1.run)(bin, ['service', 'enable'], { timeoutMs: 20000 });
+    if (integratedRendercoreMode()) {
+        integratedRendercoreStart(bin);
+    }
+    else {
+        await (0, exec_1.run)(bin, ['service', 'install'], { timeoutMs: 20000 });
+        await (0, exec_1.run)(bin, ['service', 'enable'], { timeoutMs: 20000 });
+    }
     withLiveLock(() => {
         const current = readIndex();
         const updatedItems = current.items.map(v => (v.id === item.id ? { ...v, last_applied_at: nowUnix() } : v));
@@ -1670,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;
@@ -1702,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])),
@@ -1714,7 +1854,31 @@ 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') {
+            out = integratedRendercoreStatus(bin);
+        }
+        else if (action === 'start' || action === 'enable' || action === 'install') {
+            out = integratedRendercoreStart(bin);
+        }
+        else if (action === 'stop' || action === 'disable') {
+            out = integratedRendercoreStop(bin);
+        }
+        else {
+            integratedRendercoreStop(bin);
+            out = integratedRendercoreStart(bin);
+        }
+        return {
+            ok: true,
+            action,
+            runner: `${bin} (integrated)`,
+            stdout: out.stdout.trim(),
+            stderr: out.stderr.trim(),
+            code: out.code
+        };
+    }
     let out;
     const extractResult = (err) => {
         const result = err?.result;

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/dist/utils/exec.js

@@ -6,21 +6,25 @@ const child_process_1 = require("child_process");
 function run(cmd, args = [], options = {}) {
     return new Promise((resolve, reject) => {
         const isFlatpak = Boolean(process.env.FLATPAK_ID);
+        const integratedRendercore = isFlatpak && (process.env.KITOWALL_FLATPAK_INTEGRATED_RENDERCORE === '1'
+            || process.env.KITOWALL_FLATPAK_INTEGRATED_RENDERCORE === 'true');
         const hostCommands = new Set([
             'swww',
             'swww-daemon',
             'hyprctl',
             'systemctl',
-            'which',
             'xdg-open',
             'steamcmd',
             'ffmpeg',
             'ffprobe',
             'cargo',
             'kitsune-livewallpaper',
-            'kitsune-rendercore',
             'dd'
         ]);
+        if (!integratedRendercore) {
+            hostCommands.add('which');
+            hostCommands.add('kitsune-rendercore');
+        }
         const useHost = isFlatpak && hostCommands.has(cmd);
         const finalCmd = useHost ? 'flatpak-spawn' : cmd;
         const finalArgs = useHost ? ['--host', cmd, ...args] : args;

package/package.json

@@ -1,7 +1,11 @@
 {
   "name": "kitowall",
-  "version": "3.5.0",
+  "version": "3.5.11",
   "description": "CLI/daemon for Hyprland wallpapers using swww with pack-based rotation.",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/KitotsuMolina/Kitowall"
+  },
   "license": "SEE LICENSE IN LICENSE.md",
   "type": "commonjs",
   "files": [