kitowall 2.5.0 → 2.7.0

package/dist/cli.js

@@ -131,11 +131,11 @@ Commands:
   we library                             List downloaded workshop items
   we scan-steam                          Detect Steam workshop folders and list downloaded ids
   we sync-steam                          Sync local Steam Workshop 431960 items into Kitsune downloads
-  we app-status                          Detect if Wallpaper Engine and scene engine are installed
+  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|linux-wallpaperengine]
-                                         Apply live wallpaper on one monitor (auto resolves by wallpaper type)
-  we apply --map DP-1:<id1>,HDMI-A-1:<id2> [--backend auto|mpvpaper|linux-wallpaperengine]
+  we apply <id> --monitor <name> [--backend auto|mpvpaper]
+                                         Apply video live wallpaper on one monitor
+  we apply --map DP-1:<id1>,HDMI-A-1:<id2> [--backend auto|mpvpaper]
                                          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
@@ -440,7 +440,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|linux-wallpaperengine] OR we apply --map DP-1:<id1>,HDMI-A-1:<id2>');
+                throw new Error('Usage: we apply <id> --monitor <name> [--backend auto|mpvpaper] 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/workshop.js

@@ -7,7 +7,6 @@ exports.setWorkshopApiKey = setWorkshopApiKey;
 exports.workshopGetSteamRoots = workshopGetSteamRoots;
 exports.workshopSetSteamRoots = workshopSetSteamRoots;
 exports.workshopWallpaperEngineStatus = workshopWallpaperEngineStatus;
-exports.workshopSceneEngineStatus = workshopSceneEngineStatus;
 exports.workshopScanSteamDownloads = workshopScanSteamDownloads;
 exports.workshopSyncSteamDownloads = workshopSyncSteamDownloads;
 exports.workshopSearch = workshopSearch;
@@ -46,74 +45,6 @@ function clean(input) {
     const v = input.trim();
     return v.length > 0 ? v : undefined;
 }
-function isExecutable(filePath) {
-    try {
-        node_fs_1.default.accessSync(filePath, node_fs_1.default.constants.X_OK);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-function resolveOnPath(binary) {
-    const bin = clean(binary);
-    if (!bin)
-        return undefined;
-    if (bin.includes('/')) {
-        const resolved = node_path_1.default.resolve(bin);
-        return node_fs_1.default.existsSync(resolved) && isExecutable(resolved) ? resolved : undefined;
-    }
-    const pathEnv = clean(process.env.PATH) ?? '';
-    const parts = pathEnv.split(':').filter(Boolean);
-    for (const p of parts) {
-        const candidate = node_path_1.default.join(p, bin);
-        if (node_fs_1.default.existsSync(candidate) && isExecutable(candidate))
-            return candidate;
-    }
-    return undefined;
-}
-function buildSceneEngineEnv(enginePath) {
-    const env = { ...process.env };
-    const libPaths = [];
-    const seen = new Set();
-    const pushLibPath = (candidate) => {
-        const value = clean(candidate);
-        if (!value || seen.has(value))
-            return;
-        seen.add(value);
-        libPaths.push(value);
-    };
-    const current = clean(process.env.LD_LIBRARY_PATH);
-    if (current) {
-        for (const segment of current.split(':')) {
-            const v = clean(segment);
-            if (v)
-                pushLibPath(v);
-        }
-    }
-    const resolvedEngine = clean(enginePath);
-    if (resolvedEngine) {
-        const engineDir = node_path_1.default.dirname(resolvedEngine);
-        if (node_fs_1.default.existsSync(node_path_1.default.join(engineDir, 'libcef.so'))) {
-            pushLibPath(engineDir);
-        }
-        const siblingLib = node_path_1.default.join(engineDir, 'lib');
-        if (node_fs_1.default.existsSync(siblingLib) && node_fs_1.default.statSync(siblingLib).isDirectory()) {
-            pushLibPath(siblingLib);
-        }
-    }
-    // Arch linux-wallpaperengine installs runtime libs here when bypassing the wrapper.
-    if (node_fs_1.default.existsSync('/opt/linux-wallpaperengine/libcef.so')) {
-        pushLibPath('/opt/linux-wallpaperengine');
-    }
-    if (node_fs_1.default.existsSync('/opt/linux-wallpaperengine/lib') && node_fs_1.default.statSync('/opt/linux-wallpaperengine/lib').isDirectory()) {
-        pushLibPath('/opt/linux-wallpaperengine/lib');
-    }
-    if (libPaths.length > 0) {
-        env.LD_LIBRARY_PATH = libPaths.join(':');
-    }
-    return env;
-}
 function getWePaths() {
     const root = node_path_1.default.join(node_os_1.default.homedir(), '.local', 'share', 'kitsune', 'we');
     return {
@@ -199,6 +130,7 @@ function getCoexistServices() {
     const cfg = readWeConfig();
     const defaults = [
         'swww-daemon.service',
+        'swww-daemon@kitowall.service',
         'hyprwall-watch.service',
         'hyprwall-next.timer',
         'kitowall-next.timer'
@@ -601,41 +533,13 @@ function workshopWallpaperEngineStatus() {
         if (node_fs_1.default.existsSync(manifest))
             manifests.push(manifest);
     }
-    const engine = workshopSceneEngineStatus();
     return {
         ok: true,
         installed: manifests.length > 0,
         manifests,
-        steamapps,
-        engine
+        steamapps
     };
 }
-function workshopSceneEngineStatus() {
-    const configured = clean(process.env.KITOWALL_SCENE_ENGINE_CMD);
-    const candidates = configured
-        ? [configured]
-        : ['linux-wallpaperengine', 'linux-wallpaperengine-cli', 'wallpaper-engine'];
-    for (const cmd of candidates) {
-        const resolved = resolveOnPath(cmd);
-        if (!resolved)
-            continue;
-        const verOut = (0, node_child_process_1.spawnSync)(resolved, ['--version'], {
-            encoding: 'utf8',
-            timeout: 2500,
-            env: buildSceneEngineEnv(resolved)
-        });
-        const stdout = clean(verOut.stdout) ?? '';
-        const stderr = clean(verOut.stderr) ?? '';
-        const version = (stdout.split('\n')[0] || stderr.split('\n')[0] || '').trim();
-        return {
-            installed: true,
-            path: resolved,
-            version: version || undefined,
-            command: cmd
-        };
-    }
-    return { installed: false, command: configured ?? 'linux-wallpaperengine' };
-}
 function findPreviewCandidate(dir) {
     if (!node_fs_1.default.existsSync(dir))
         return undefined;
@@ -1334,34 +1238,6 @@ function spawnMpvpaper(monitor, entry) {
         }, 180);
     });
 }
-function spawnSceneEngine(monitor, wallpaperDir) {
-    const engine = workshopSceneEngineStatus();
-    if (!engine.installed || !engine.path) {
-        throw new Error('Scene engine not installed. Install linux-wallpaperengine first.');
-    }
-    const enginePath = engine.path;
-    return new Promise((resolve, reject) => {
-        const child = (0, node_child_process_1.spawn)(enginePath, ['--screen-root', monitor, '--bg', wallpaperDir], {
-            detached: true,
-            stdio: 'ignore',
-            env: buildSceneEngineEnv(enginePath)
-        });
-        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);
-            });
-        }, 220);
-    });
-}
 async function workshopApply(input) {
     const id = clean(input.id);
     const monitor = clean(input.monitor);
@@ -1381,8 +1257,8 @@ async function workshopApply(input) {
     const type = project.type !== 'unknown'
         ? project.type
         : detectTypeFromEntry(inferredEntry ?? node_path_1.default.join(dir, 'scene.json'));
-    if (type === 'web' || type === 'application' || type === 'unknown') {
-        throw new Error(`Unsupported wallpaper type for apply: ${type}. Supported: video, scene.`);
+    if (type !== 'video') {
+        throw new Error(`Unsupported wallpaper type for apply: ${type}. Supported: video (mpvpaper).`);
     }
     let state = readActiveState();
     if (!state) {
@@ -1400,30 +1276,16 @@ async function workshopApply(input) {
     }
     let backend;
     let pid = 0;
-    if (type === 'video') {
-        if (!(requestedBackend === 'auto' || requestedBackend === 'mpvpaper')) {
-            throw new Error(`Invalid backend for video wallpaper: ${requestedBackend}`);
-        }
-        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 (!(requestedBackend === 'auto' || requestedBackend === 'mpvpaper')) {
+        throw new Error(`Invalid backend for video wallpaper: ${requestedBackend}`);
     }
-    else if (type === 'scene') {
-        if (!(requestedBackend === 'auto' || requestedBackend === 'linux-wallpaperengine')) {
-            throw new Error(`Invalid backend for scene wallpaper: ${requestedBackend}`);
-        }
-        backend = 'linux-wallpaperengine';
-        pid = await spawnSceneEngine(monitor, dir).catch((err) => {
-            throw new Error(`Failed to launch scene engine: ${err instanceof Error ? err.message : String(err)}`);
-        });
-    }
-    else {
-        throw new Error(`Unsupported wallpaper type for apply: ${type}`);
+    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`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitowall",
-  "version": "2.5.0",
+  "version": "2.7.0",
   "description": "CLI/daemon for Hyprland wallpapers using swww with pack-based rotation.",
   "license": "SEE LICENSE IN LICENSE.md",
   "type": "commonjs",