kitowall 2.2.0 → 2.3.0

package/dist/cli.js

@@ -132,6 +132,8 @@ Commands:
   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 (AppID 431960) is installed
+  we active                              Show current livewallpaper authority/lock state
+  we stop [--monitor <name> | --all]     Stop livewallpaper instances and restore previous services
   we coexist enter|exit|status           Temporarily stop/restore wallpaper rotation services
   check [--namespace <ns>] [--json]        Quick system check (no changes)
 
@@ -418,6 +420,20 @@ async function main() {
             console.log(JSON.stringify(out, null, 2));
             return;
         }
+        if (action === 'active') {
+            const out = (0, workshop_1.workshopActiveStatus)();
+            console.log(JSON.stringify(out, null, 2));
+            return;
+        }
+        if (action === 'stop') {
+            const monitor = cleanOpt(getOptionValue(args, '--monitor'));
+            const out = await (0, workshop_1.workshopStop)({
+                monitor,
+                all: args.includes('--all') || !monitor
+            });
+            console.log(JSON.stringify(out, null, 2));
+            return;
+        }
         if (action === 'coexist') {
             const sub = cleanOpt(args[2] ?? null);
             if (sub === 'enter') {
@@ -437,7 +453,7 @@ async function main() {
             }
             throw new Error('Usage: we coexist <enter|exit|status>');
         }
-        throw new Error('Usage: we <config|search|details|download|job|jobs|library|scan-steam|sync-steam|app-status|run-job|coexist> ...');
+        throw new Error('Usage: we <config|search|details|download|job|jobs|library|scan-steam|sync-steam|app-status|active|stop|run-job|coexist> ...');
     }
     // Regular commands (need config/state)
     const config = (0, config_1.loadConfig)();

package/dist/core/workshop.js

@@ -12,9 +12,12 @@ exports.workshopSyncSteamDownloads = workshopSyncSteamDownloads;
 exports.workshopSearch = workshopSearch;
 exports.workshopDetails = workshopDetails;
 exports.workshopQueueDownload = workshopQueueDownload;
+exports.workshopActiveStatus = workshopActiveStatus;
+exports.workshopSetActive = workshopSetActive;
 exports.workshopCoexistenceEnter = workshopCoexistenceEnter;
 exports.workshopCoexistenceExit = workshopCoexistenceExit;
 exports.workshopCoexistenceStatus = workshopCoexistenceStatus;
+exports.workshopStop = workshopStop;
 exports.workshopRunJob = workshopRunJob;
 exports.workshopGetJob = workshopGetJob;
 exports.workshopListJobs = workshopListJobs;
@@ -64,6 +67,7 @@ function ensureWePaths(paths) {
     (0, fs_1.ensureDir)(paths.runtime);
     (0, fs_1.ensureDir)(node_path_1.default.join(paths.cache, 'search'));
     (0, fs_1.ensureDir)(node_path_1.default.join(paths.steamcmd, 'logs'));
+    (0, fs_1.ensureDir)(node_path_1.default.join(paths.root, 'coexistence', 'snapshots'));
 }
 function getWeConfigPath() {
     return node_path_1.default.join(node_os_1.default.homedir(), '.config', 'kitowall', 'we.json');
@@ -351,6 +355,40 @@ function writeMetaFile(meta) {
         cached_at: now()
     });
 }
+function normalizeWallpaperType(raw) {
+    const t = clean(raw)?.toLowerCase();
+    if (!t)
+        return 'unknown';
+    if (t === 'video')
+        return 'video';
+    if (t === 'scene')
+        return 'scene';
+    if (t === 'web')
+        return 'web';
+    if (t === 'application')
+        return 'application';
+    return 'unknown';
+}
+function detectAudioReactiveFromText(text) {
+    return /(audio|spectrum|visualizer|now[\s_-]?playing|media[\s_-]?integration|fft|bass|reactive)/i.test(text);
+}
+function readProjectInfo(dir) {
+    const projectPath = node_path_1.default.join(dir, 'project.json');
+    if (!node_fs_1.default.existsSync(projectPath)) {
+        return { type: 'unknown', audioReactive: false };
+    }
+    try {
+        const raw = node_fs_1.default.readFileSync(projectPath, 'utf8');
+        const json = JSON.parse(raw);
+        const type = normalizeWallpaperType(json.type);
+        const title = clean(json.title) ?? '';
+        const audioReactive = detectAudioReactiveFromText(`${title}\n${raw}`);
+        return { type, audioReactive };
+    }
+    catch {
+        return { type: 'unknown', audioReactive: false };
+    }
+}
 function readLibraryFoldersVdf(vdfPath) {
     if (!node_fs_1.default.existsSync(vdfPath))
         return [];
@@ -543,6 +581,7 @@ function workshopSyncSteamDownloads() {
                 imported += 1;
             }
             const metadataFile = node_path_1.default.join(paths.metadata, `${id}.json`);
+            const info = readProjectInfo(sourceDir);
             if (!node_fs_1.default.existsSync(metadataFile)) {
                 const previewCandidate = findPreviewCandidate(sourceDir);
                 let thumbLocal;
@@ -561,9 +600,26 @@ function workshopSyncSteamDownloads() {
                     tags: [],
                     preview_thumb_local: thumbLocal,
                     author_name: 'Steam Workshop',
-                    time_updated: Math.floor(Date.now() / 1000)
+                    time_updated: Math.floor(Date.now() / 1000),
+                    wallpaper_type: info.type,
+                    audio_reactive: info.audioReactive
                 });
             }
+            else {
+                try {
+                    const current = JSON.parse(node_fs_1.default.readFileSync(metadataFile, 'utf8'));
+                    if (!current.wallpaper_type || current.wallpaper_type === 'unknown' || current.audio_reactive === undefined) {
+                        writeMetaFile({
+                            ...current,
+                            wallpaper_type: current.wallpaper_type ?? info.type,
+                            audio_reactive: current.audio_reactive ?? info.audioReactive
+                        });
+                    }
+                }
+                catch {
+                    // ignore malformed metadata
+                }
+            }
         }
     }
     return {
@@ -813,6 +869,78 @@ async function copyDownloadedContent(job) {
 function snapshotFile(paths) {
     return node_path_1.default.join(paths.runtime, 'coexistence.snapshot.json');
 }
+function snapshotDir(paths) {
+    return node_path_1.default.join(paths.root, 'coexistence', 'snapshots');
+}
+function activeLockFile(paths) {
+    return node_path_1.default.join(paths.runtime, 'active.lock');
+}
+function activeStateFile(paths) {
+    return node_path_1.default.join(paths.runtime, 'active.json');
+}
+function readActiveState() {
+    const paths = getWePaths();
+    ensureWePaths(paths);
+    const p = activeStateFile(paths);
+    if (!node_fs_1.default.existsSync(p))
+        return null;
+    try {
+        return JSON.parse(node_fs_1.default.readFileSync(p, 'utf8'));
+    }
+    catch {
+        return null;
+    }
+}
+function writeActiveState(state) {
+    const paths = getWePaths();
+    ensureWePaths(paths);
+    (0, fs_1.writeJson)(activeStateFile(paths), state);
+    node_fs_1.default.writeFileSync(activeLockFile(paths), `${state.mode}:${state.started_at}\n`, 'utf8');
+}
+function clearActiveState() {
+    const paths = getWePaths();
+    ensureWePaths(paths);
+    try {
+        node_fs_1.default.unlinkSync(activeStateFile(paths));
+    }
+    catch {
+        // ignore
+    }
+    try {
+        node_fs_1.default.unlinkSync(activeLockFile(paths));
+    }
+    catch {
+        // ignore
+    }
+}
+function killPid(pid) {
+    if (!pid || !Number.isFinite(pid) || pid <= 1)
+        return false;
+    try {
+        process.kill(pid, 'SIGTERM');
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function workshopActiveStatus() {
+    const paths = getWePaths();
+    ensureWePaths(paths);
+    const state = readActiveState();
+    const lock = node_fs_1.default.existsSync(activeLockFile(paths));
+    return {
+        ok: true,
+        active: lock && !!state,
+        lock_path: activeLockFile(paths),
+        state_path: activeStateFile(paths),
+        state: state ?? undefined
+    };
+}
+function workshopSetActive(state) {
+    writeActiveState(state);
+    return { ok: true, active: true, state };
+}
 async function isUnitActive(unit) {
     try {
         const out = await (0, exec_1.run)('systemctl', ['--user', 'show', unit, '--property', 'ActiveState', '--value']);
@@ -839,8 +967,11 @@ async function workshopCoexistenceEnter() {
             // best effort
         }
     }
-    (0, fs_1.writeJson)(snapshotFile(paths), { ts: now(), active });
-    return { ok: true, stopped: active, snapshot: active };
+    const snapshotId = String(now());
+    const snap = { id: snapshotId, ts: now(), active };
+    (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 });
+    return { ok: true, stopped: active, snapshot: active, snapshot_id: snapshotId };
 }
 async function workshopCoexistenceExit() {
     const paths = getWePaths();
@@ -849,7 +980,19 @@ async function workshopCoexistenceExit() {
     if (!node_fs_1.default.existsSync(snapPath))
         return { ok: true, restored: [] };
     const raw = JSON.parse(node_fs_1.default.readFileSync(snapPath, 'utf8'));
-    const active = Array.isArray(raw.active) ? raw.active.map(v => String(v)) : [];
+    let active = Array.isArray(raw.active) ? raw.active.map(v => String(v)) : [];
+    if ((!active || active.length === 0) && raw.id) {
+        const historical = node_path_1.default.join(snapshotDir(paths), `${raw.id}.json`);
+        if (node_fs_1.default.existsSync(historical)) {
+            try {
+                const snap = JSON.parse(node_fs_1.default.readFileSync(historical, 'utf8'));
+                active = Array.isArray(snap.active) ? snap.active.map(v => String(v)) : [];
+            }
+            catch {
+                active = [];
+            }
+        }
+    }
     const restored = [];
     for (const unit of active) {
         try {
@@ -882,6 +1025,42 @@ async function workshopCoexistenceStatus() {
     }
     return { ok: true, snapshot, current };
 }
+async function workshopStop(options) {
+    const state = readActiveState();
+    const hadActive = !!state;
+    const stopped = [];
+    if (state?.instances) {
+        if (options?.monitor) {
+            const inst = state.instances[options.monitor];
+            if (killPid(inst?.pid))
+                stopped.push(options.monitor);
+            delete state.instances[options.monitor];
+            if (Object.keys(state.instances).length > 0 && !options?.all) {
+                writeActiveState(state);
+            }
+            else {
+                clearActiveState();
+            }
+        }
+        else {
+            for (const [monitor, inst] of Object.entries(state.instances)) {
+                if (killPid(inst?.pid))
+                    stopped.push(monitor);
+            }
+            clearActiveState();
+        }
+    }
+    else if (options?.all) {
+        clearActiveState();
+    }
+    const coexist = await workshopCoexistenceExit();
+    return {
+        ok: true,
+        stopped_instances: stopped,
+        restored_units: coexist.restored,
+        had_active: hadActive
+    };
+}
 async function workshopRunJob(jobId) {
     const job = readJob(jobId);
     if (!job)
@@ -980,6 +1159,13 @@ function workshopLibrary() {
                 meta = undefined;
             }
         }
+        const info = readProjectInfo(p);
+        if (meta) {
+            meta.wallpaper_type = meta.wallpaper_type ?? info.type;
+            if (meta.audio_reactive === undefined) {
+                meta.audio_reactive = info.audioReactive;
+            }
+        }
         items.push({
             id,
             path: p,

package/package.json

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