kitowall 3.5.37 → 6.1.0

package/README.md

@@ -35,12 +35,7 @@ node dist/cli.js check --json
 ```bash
 cd ui
 npm install
-npm run tauri:dev
-```
-
-If your system needs it on Wayland:
-```bash
-WEBKIT_DISABLE_DMABUF_RENDERER=1 npm run tauri:dev
+npm run electron:dev
 ```
 
 ## AppImage (Recommended)
@@ -81,7 +76,7 @@ npm run release:check
 # Build distributable CLI tarball
 npm run package:cli
 
-# Build desktop app package (Tauri)
+# Build desktop app package (Electron)
 npm run package:ui
 
 # Full pipeline

package/dist/cli.js

@@ -135,9 +135,9 @@ Commands:
   we sync-steam                          Sync local Steam Workshop 431960 items into Kitsune downloads
   we app-status                          Detect if Wallpaper Engine is installed in Steam
   we active                              Show current livewallpaper authority/lock state
-  we apply <id> --monitor <name> [--backend auto|mpvpaper]
+  we apply <id> --monitor <name>
                                          Apply video live wallpaper on one monitor
-  we apply --map DP-1:<id1>,HDMI-A-1:<id2> [--backend auto|mpvpaper]
+  we apply --map DP-1:<id1>,HDMI-A-1:<id2>
                                          Apply wallpapers in batch by monitor map
   we stop [--monitor <name> | --all]     Stop livewallpaper instances and restore previous services
   we coexist enter|exit|status           Temporarily stop/restore wallpaper rotation services
@@ -482,7 +482,7 @@ async function main() {
             const id = cleanOpt(args[2] ?? null);
             const monitor = cleanOpt(getOptionValue(args, '--monitor'));
             if (!id || !monitor) {
-                throw new Error('Usage: we apply <id> --monitor <name> [--backend auto|mpvpaper] OR we apply --map DP-1:<id1>,HDMI-A-1:<id2>');
+                throw new Error('Usage: we apply <id> --monitor <name> OR we apply --map DP-1:<id1>,HDMI-A-1:<id2>');
             }
             const out = await (0, workshop_1.workshopApply)({ id, monitor, backend });
             console.log(JSON.stringify(out, null, 2));

package/dist/core/live.js

@@ -955,6 +955,31 @@ function integratedRendercoreStart(bin) {
         code: 0
     };
 }
+function integratedRendercoreFailureHint() {
+    const logPath = integratedRendercoreLogPath();
+    try {
+        const raw = node_fs_1.default.readFileSync(logPath, 'utf8').trim();
+        if (!raw)
+            return '';
+        const lines = raw.split('\n');
+        return lines.slice(-20).join('\n');
+    }
+    catch {
+        return '';
+    }
+}
+async function waitForIntegratedRendercoreReady(bin, timeoutMs = 4000) {
+    const until = Date.now() + timeoutMs;
+    while (Date.now() < until) {
+        const status = integratedRendercoreStatus(bin);
+        if (status.code === 0)
+            return;
+        await new Promise((resolve) => setTimeout(resolve, 150));
+    }
+    const hint = integratedRendercoreFailureHint();
+    throw new Error(`Integrated rendercore failed to stay alive after start (${bin}).` +
+        (hint ? ` Recent log:\n${hint}` : ''));
+}
 function integratedRendercoreStop(bin) {
     const pid = readIntegratedRendercorePid();
     if (!pid) {
@@ -1160,6 +1185,7 @@ function ensureRendercoreServiceFiles(bin, defaults) {
         '',
         '[Service]',
         'Type=simple',
+        `WorkingDirectory=${home}`,
         `Environment=PATH=${pathEnv}`,
         `EnvironmentFile=-${envPath}`,
         `ExecStart=${bin}`,
@@ -1194,6 +1220,44 @@ async function runSystemctlUser(args, acceptNonZero = false) {
         throw err;
     }
 }
+async function importRendercoreSessionEnv() {
+    const keys = [
+        'WAYLAND_DISPLAY',
+        'DISPLAY',
+        'XDG_RUNTIME_DIR',
+        'HYPRLAND_INSTANCE_SIGNATURE',
+        'DBUS_SESSION_BUS_ADDRESS'
+    ].filter((key) => clean(process.env[key]).length > 0);
+    if (keys.length === 0)
+        return;
+    try {
+        await runSystemctlUser(['import-environment', ...keys], true);
+    }
+    catch {
+        // best effort
+    }
+}
+async function waitForRendercoreServiceActive(timeoutMs = 5000) {
+    const until = Date.now() + timeoutMs;
+    let lastState = '';
+    while (Date.now() < until) {
+        const out = await runSystemctlUser(['show', 'kitsune-rendercore.service', '--property', 'ActiveState,SubState,Result', '--value'], true);
+        const parts = out.stdout
+            .split('\n')
+            .map((line) => line.trim())
+            .filter(Boolean);
+        const [activeState = '', subState = '', result = ''] = parts;
+        lastState = `ActiveState=${activeState} SubState=${subState} Result=${result}`;
+        if (activeState === 'active')
+            return;
+        if (activeState === 'failed')
+            break;
+        await new Promise((resolve) => setTimeout(resolve, 200));
+    }
+    const status = await runSystemctlUser(['status', '--no-pager', 'kitsune-rendercore.service'], true);
+    const detail = [lastState, status.stderr.trim(), status.stdout.trim()].filter(Boolean).join('\n');
+    throw new Error(`kitsune-rendercore.service failed to become active.\n${detail}`);
+}
 async function resolvePost(provider, pageUrl) {
     const html = await fetchHtml(pageUrl, pageUrl);
     const parsed = liveParsePostFromHtml(provider, pageUrl, html);
@@ -1799,41 +1863,54 @@ async function liveApply(opts) {
         '--monitor', monitor,
         '--video', item.file_path
     ];
-    await (0, exec_1.run)(bin, setVideoArgs, { timeoutMs: 120000 });
-    // 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.
-    if (integratedRendercoreMode()) {
-        integratedRendercoreStart(bin);
+    let coexistEntered = false;
+    try {
+        await (0, exec_1.run)(bin, setVideoArgs, { timeoutMs: 120000 });
+        // Live mode owns wallpaper state: stop only Kitowall static wallpaper services.
+        await (0, workshop_1.workshopCoexistenceEnter)();
+        coexistEntered = true;
+        // Keep live authority persistent across session restarts.
+        if (integratedRendercoreMode()) {
+            integratedRendercoreStart(bin);
+            await waitForIntegratedRendercoreReady(bin);
+        }
+        else {
+            const deps = await ensureRendercoreHostRuntimeDeps();
+            if (deps.missing.length > 0) {
+                throw new Error(`Missing host dependencies: ${deps.missing.join(', ')}. ` +
+                    'Install on host (Arch): sudo pacman -S --needed ffmpeg hyprland');
+            }
+            const binPath = await resolveHostExecutablePath(bin);
+            ensureRendercoreServiceFiles(binPath, index.apply_defaults);
+            await importRendercoreSessionEnv();
+            await runSystemctlUser(['daemon-reload']);
+            await runSystemctlUser(['enable', 'kitsune-rendercore.service']);
+            await runSystemctlUser(['start', 'kitsune-rendercore.service']);
+            await waitForRendercoreServiceActive();
+        }
+        withLiveLock(() => {
+            const current = readIndex();
+            const updatedItems = current.items.map(v => (v.id === item.id ? { ...v, last_applied_at: nowUnix() } : v));
+            const perMonitor = { ...current.per_monitor };
+            const currentMon = perMonitor[monitor] || {
+                auto_apply: false,
+                preferred_quality: 'auto',
+                last_applied_id: null
+            };
+            perMonitor[monitor] = {
+                ...currentMon,
+                last_applied_id: item.id
+            };
+            writeIndexAtomic({ ...current, items: updatedItems, per_monitor: perMonitor });
+            return true;
+        });
     }
-    else {
-        const deps = await ensureRendercoreHostRuntimeDeps();
-        if (deps.missing.length > 0) {
-            throw new Error(`Missing host dependencies: ${deps.missing.join(', ')}. ` +
-                'Install on host (Arch): sudo pacman -S --needed ffmpeg hyprland');
+    catch (error) {
+        if (coexistEntered) {
+            await (0, workshop_1.workshopCoexistenceExit)().catch(() => undefined);
         }
-        const binPath = await resolveHostExecutablePath(bin);
-        ensureRendercoreServiceFiles(binPath, index.apply_defaults);
-        await runSystemctlUser(['daemon-reload']);
-        await runSystemctlUser(['enable', 'kitsune-rendercore.service']);
-        await runSystemctlUser(['start', 'kitsune-rendercore.service']);
+        throw error;
     }
-    withLiveLock(() => {
-        const current = readIndex();
-        const updatedItems = current.items.map(v => (v.id === item.id ? { ...v, last_applied_at: nowUnix() } : v));
-        const perMonitor = { ...current.per_monitor };
-        const currentMon = perMonitor[monitor] || {
-            auto_apply: false,
-            preferred_quality: 'auto',
-            last_applied_id: null
-        };
-        perMonitor[monitor] = {
-            ...currentMon,
-            last_applied_id: item.id
-        };
-        writeIndexAtomic({ ...current, items: updatedItems, per_monitor: perMonitor });
-        return true;
-    });
     return {
         ok: true,
         id: item.id,

package/dist/core/workshop.js

@@ -129,15 +129,11 @@ function getSteamWebApiKey() {
 function getCoexistServices() {
     const cfg = readWeConfig();
     const defaults = [
-        'swww-daemon.service',
         'swww-daemon@kitowall.service',
         'kitowall-login-apply.service',
         'kitowall-watch.service',
         'kitowall-next.service',
-        'kitowall-next.timer',
-        'hyprwall-watch.service',
-        'hyprwall-next.service',
-        'hyprwall-next.timer'
+        'kitowall-next.timer'
     ];
     const configured = Array.isArray(cfg.coexistServices) ? cfg.coexistServices.map(v => String(v).trim()).filter(Boolean) : [];
     return configured.length > 0 ? configured : defaults;
@@ -964,7 +960,6 @@ async function stopKnownLiveProcesses() {
     // Live V2 can run wallpapers without registering pids in workshop active-state.
     // Stop common runtime processes as best-effort fallback.
     const patterns = [
-        'mpvpaper',
         'kitsune-livewallpaper',
         'kitsune-rendercore'
     ];
@@ -1049,7 +1044,7 @@ async function workshopCoexistenceEnter() {
     const snapshotId = String(now());
     const snap = { id: snapshotId, ts: now(), active, enabled };
     (0, fs_1.writeJson)(node_path_1.default.join(snapshotDir(paths), `${snapshotId}.json`), snap);
-    (0, fs_1.writeJson)(snapshotFile(paths), { id: snapshotId, ts: snap.ts });
+    (0, fs_1.writeJson)(snapshotFile(paths), snap);
     return { ok: true, stopped: active, snapshot: active, snapshot_id: snapshotId };
 }
 async function workshopCoexistenceExit() {
@@ -1105,9 +1100,23 @@ async function workshopCoexistenceStatus() {
     const paths = getWePaths();
     ensureWePaths(paths);
     const snapPath = snapshotFile(paths);
-    const snapshot = node_fs_1.default.existsSync(snapPath)
-        ? (JSON.parse(node_fs_1.default.readFileSync(snapPath, 'utf8')).active ?? [])
-        : [];
+    let snapshot = [];
+    if (node_fs_1.default.existsSync(snapPath)) {
+        try {
+            const raw = JSON.parse(node_fs_1.default.readFileSync(snapPath, 'utf8'));
+            snapshot = Array.isArray(raw.active) ? raw.active.map(v => String(v)) : [];
+            if (snapshot.length === 0 && raw.id) {
+                const historical = node_path_1.default.join(snapshotDir(paths), `${raw.id}.json`);
+                if (node_fs_1.default.existsSync(historical)) {
+                    const snap = JSON.parse(node_fs_1.default.readFileSync(historical, 'utf8'));
+                    snapshot = Array.isArray(snap.active) ? snap.active.map(v => String(v)) : [];
+                }
+            }
+        }
+        catch {
+            snapshot = [];
+        }
+    }
     const units = getCoexistServices();
     const current = {};
     for (const unit of units) {
@@ -1277,29 +1286,6 @@ function workshopLibrary() {
     items.sort((a, b) => a.id.localeCompare(b.id));
     return { root: paths.downloads, items };
 }
-function spawnMpvpaper(monitor, entry) {
-    return new Promise((resolve, reject) => {
-        const child = (0, node_child_process_1.spawn)('mpvpaper', ['-o', 'no-audio --loop-file=inf', monitor, entry], {
-            detached: true,
-            stdio: 'ignore',
-            env: process.env
-        });
-        let settled = false;
-        const done = (fn) => {
-            if (settled)
-                return;
-            settled = true;
-            fn();
-        };
-        child.once('error', (err) => done(() => reject(err)));
-        setTimeout(() => {
-            done(() => {
-                child.unref();
-                resolve(child.pid ?? 0);
-            });
-        }, 180);
-    });
-}
 async function workshopApply(input) {
     const id = clean(input.id);
     const monitor = clean(input.monitor);
@@ -1319,46 +1305,16 @@ async function workshopApply(input) {
     const type = project.type !== 'unknown'
         ? project.type
         : detectTypeFromEntry(inferredEntry ?? node_path_1.default.join(dir, 'scene.json'));
-    if (type !== 'video') {
-        throw new Error(`Unsupported wallpaper type for apply: ${type}. Supported: video (mpvpaper).`);
-    }
-    let state = readActiveState();
-    if (!state) {
-        const coexist = await workshopCoexistenceEnter();
-        state = {
-            mode: 'livewallpaper',
-            started_at: now(),
-            snapshot_id: coexist.snapshot_id,
-            instances: {}
-        };
-    }
-    const current = state.instances[monitor];
-    if (current?.pid) {
-        killPid(current.pid);
+    if (requestedBackend !== 'auto') {
+        throw new Error(`Invalid backend for video wallpaper: ${requestedBackend}. Wallpaper Engine apply no longer supports custom backends.`);
     }
-    let backend;
-    let pid = 0;
-    if (!(requestedBackend === 'auto' || requestedBackend === 'mpvpaper')) {
-        throw new Error(`Invalid backend for video wallpaper: ${requestedBackend}`);
+    if (type !== 'video') {
+        throw new Error(`Unsupported wallpaper type for apply: ${type}. Only video items can be migrated to the LiveWallpapers library.`);
     }
     if (!inferredEntry || !node_fs_1.default.existsSync(inferredEntry)) {
         throw new Error(`Video entry not found for wallpaper: ${id}`);
     }
-    backend = 'mpvpaper';
-    pid = await spawnMpvpaper(monitor, inferredEntry).catch((err) => {
-        throw new Error(`Failed to launch mpvpaper: ${err instanceof Error ? err.message : String(err)}`);
-    });
-    if (!pid) {
-        throw new Error(`${backend} started without pid`);
-    }
-    state.instances[monitor] = {
-        id,
-        pid,
-        backend,
-        type
-    };
-    writeActiveState(state);
-    return { ok: true, applied: true, monitor, id, backend, pid, state };
+    throw new Error('Wallpaper Engine direct apply was removed. Import the video into LiveWallpapers and apply it with rendercore instead.');
 }
 async function workshopApplyMap(input) {
     const raw = clean(input.map);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitowall",
-  "version": "3.5.37",
+  "version": "6.1.0",
   "description": "CLI/daemon for Hyprland wallpapers using swww with pack-based rotation.",
   "repository": {
     "type": "git",
@@ -25,8 +25,8 @@
     "lint": "node dist/cli.js --help",
     "release:check": "npm run build && npm run test:e2e",
     "package:cli": "npm pack",
-    "package:ui": "npm --prefix ui run tauri:build",
-    "package:appimage": "npm --prefix ui run tauri:build",
+    "package:ui": "npm --prefix ui run electron:build",
+    "package:appimage": "npm --prefix ui run electron:build",
     "package:all": "npm run release:check && npm run package:cli && npm run package:ui",
     "test:smoke": "bash ./tests/smoke.e2e.sh",
     "test:regression": "bash ./tests/regression.e2e.sh",