Merge pull request #133 from Brskt/enhance-linux-update

Add Linux elevated update via pkexec/kdesudo

Author: Inrixia

native/injector.ts

@@ -217,7 +217,7 @@ const ProxiedBrowserWindow = new Proxy(electron.BrowserWindow, {
 
 		const window = new target(options);
 
-		globalThis.luna.sendToRender = window.webContents.send;
+		globalThis.luna.sendToRender = window.webContents.send.bind(window.webContents);
 
 		// Linux (tidal-hifi): Handle OAuth login in a popup window
 		if (platformIsLinux) {

native/update.ts

@@ -1,4 +1,7 @@
-import { mkdir, readdir, rm, unlink, writeFile } from "fs/promises";
+import { access, mkdir, rm, unlink, writeFile } from "fs/promises";
+import { constants } from "fs";
+import { execFile } from "child_process";
+import { tmpdir } from "os";
 import JSZip from "jszip";
 import path from "path";
 
@@ -15,25 +18,85 @@ export const relaunch = async () => {
 
 const appFolder = path.join(process.resourcesPath, "app");
 
-export const update = async (version: string) => {
+export const needsElevation = async (): Promise<boolean> => {
+	if (process.platform !== "linux") return false;
+	try {
+		await access(appFolder, constants.W_OK);
+		return false;
+	} catch {
+		return true;
+	}
+};
+
+
+const validateAppFolder = (folder: string) => {
+	const resolved = path.resolve(folder);
+	// Must be an absolute path ending with /resources/app inside a known app directory
+	if (!resolved.endsWith(path.join("resources", "app"))) {
+		throw new Error(`[UPDATER] Refusing elevated operation: unexpected app folder path "${resolved}"`);
+	}
+	// Must have at least 3 segments (e.g. /opt/tidal-hifi/resources/app)
+	const segments = resolved.split(path.sep).filter(Boolean);
+	if (segments.length < 3) {
+		throw new Error(`[UPDATER] Refusing elevated operation: path too shallow "${resolved}"`);
+	}
+};
+
+const runElevated = (tool: string, args: string[]) =>
+	new Promise<void>((resolve, reject) => {
+		const child = execFile(tool, args);
+		child.on("close", (code) => {
+			if (code === 0) return resolve();
+			if (code === 126) return reject(new Error("ELEVATION_CANCELLED"));
+			reject(new Error(`${tool} exited with code ${code}`));
+		});
+		child.on("error", reject);
+	});
+
+const elevationTools = ["pkexec", "kdesudo"] as const;
+
+const elevatedUpdate = async (zipBuffer: Buffer) => {
+	validateAppFolder(appFolder);
+	const tmpZip = path.join(tmpdir(), `luna-update-${Date.now()}.zip`);
+	try {
+		await writeFile(tmpZip, zipBuffer);
+		const cmd = `rm -rf "${appFolder}" && mkdir -p "${appFolder}" && unzip -o "${tmpZip}" -d "${appFolder}"`;
+
+		for (const tool of elevationTools) {
+			try {
+				await runElevated(tool, tool === "kdesudo" ? ["-c", cmd] : ["sh", "-c", cmd]);
+				return;
+			} catch (err: any) {
+				if (err.message === "ELEVATION_CANCELLED") throw err;
+				if ((err as NodeJS.ErrnoException).code !== "ENOENT") throw err;
+			}
+		}
+		throw new Error("NO_ELEVATION_TOOL");
+	} finally {
+		await unlink(tmpZip).catch(() => {});
+	}
+};
+
+let pendingZipBuffer: Buffer | null = null;
+
+export const update = async (version: string): Promise<string> => {
 	const zipUrl = `https://github.com/Inrixia/TidaLuna/releases/download/${version}/luna.zip`;
 	const res = await fetch(zipUrl);
 	if (!res.ok) throw new Error(`Failed to download ${zipUrl}\n${res.statusText}`);
 
-	// Ensure clean start
+	const zipBuffer = Buffer.from(await res.arrayBuffer());
 
-	console.log(`[UPDATER] == Downloaded: ${zipUrl}`);
+	if (process.platform === "linux" && (await needsElevation())) {
+		pendingZipBuffer = zipBuffer;
+		return "elevation_required";
+	}
 
 	// Load zip purely from buffer (no internal fs usage by the library)
-	const zip = await JSZip.loadAsync(Buffer.from(await res.arrayBuffer()));
-
-	console.log("[UPDATER] == Loaded zip into memory");
+	const zip = await JSZip.loadAsync(zipBuffer);
 
-	await clearAppFolder();
+	await rm(appFolder, { recursive: true, force: true });
 	await mkdir(appFolder, { recursive: true });
 
-	console.log("[UPDATER] == Cleared app folder");
-
 	// Manually write files to disk
 	const entries = Object.keys(zip.files);
 	for (const filename of entries) {
@@ -58,21 +121,16 @@ export const update = async (version: string) => {
 		}
 	}
 
-	console.log("[UPDATER] == Extraction complete");
-
-	await relaunch();
+	return "done";
 };
 
-const clearAppFolder = async () => {
-	// Check if folder exists before reading to avoid crashing on fresh installs
+export const runElevatedInstall = async (): Promise<void> => {
+	if (!pendingZipBuffer) throw new Error("No pending update to install");
+
 	try {
-		const entries = await readdir(appFolder, { withFileTypes: true });
-		for (const entry of entries) {
-			const fullPath = path.join(appFolder, entry.name);
-			if (entry.isDirectory()) await rm(fullPath, { recursive: true, force: true });
-			else await unlink(fullPath);
-		}
-	} catch (error: any) {
-		if (error.code !== "ENOENT") throw error;
+		await elevatedUpdate(pendingZipBuffer);
+	} finally {
+		pendingZipBuffer = null;
 	}
 };
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "luna",
-  "version": "1.10.0-beta",
+  "version": "1.11.0-beta",
   "description": "A client mod for the Tidal music app for plugins",
   "author": {
     "name": "Inrixia",

plugins/lib.native/src/native.ts

@@ -1,6 +1,8 @@
 export const pkg = luna.pkg;
 export const update = luna.update;
 export const relaunch = luna.relaunch;
+export const needsElevation = luna.needsElevation;
+export const runElevatedInstall = luna.runElevatedInstall;
 export const sendToRender = luna.sendToRender;
 
 // Electron

plugins/ui/src/SettingsPage/SettingsTab/LunaClientUpdate.tsx

@@ -4,10 +4,14 @@ import React from "react";
 import { components } from "@octokit/openapi-types";
 type GitHubRelease = components["schemas"]["release"];
 
+import Dialog from "@mui/material/Dialog";
+import DialogContent from "@mui/material/DialogContent";
+import DialogContentText from "@mui/material/DialogContentText";
+import DialogTitle from "@mui/material/DialogTitle";
 import MenuItem from "@mui/material/MenuItem";
 import Select from "@mui/material/Select";
 
-import { pkg, relaunch, update } from "plugins/lib.native/src/index.native";
+import { pkg, relaunch, update, needsElevation, runElevatedInstall } from "plugins/lib.native/src/index.native";
 
 export const version = (await pkg()).version;
 
@@ -20,6 +24,7 @@ export const LunaClientUpdate = React.memo(() => {
 	const confirm = useConfirm();
 	const [releases, setReleases] = React.useState<GitHubRelease[]>([]);
 	const [loading, setLoading] = React.useState(false);
+	const [busy, setBusy] = React.useState<"updating" | "resetting" | null>(null);
 	const [selectedRelease, setSelectedRelease] = React.useState<string>(version!);
 
 	const updateReleases = async () => {
@@ -51,6 +56,12 @@ export const LunaClientUpdate = React.memo(() => {
 			alignItems="center"
 			pb={4}
 		>
+			<Dialog open={!!busy}>
+				<DialogTitle>Operation in progress</DialogTitle>
+				<DialogContent>
+					<DialogContentText>Please do not close the application. It will restart automatically.</DialogContentText>
+				</DialogContent>
+			</Dialog>
 			<Select
 				fullWidth
 				sx={{ flex: 1, height: 48 }}
@@ -62,19 +73,60 @@ export const LunaClientUpdate = React.memo(() => {
 			/>
 			<LunaButton
 				sx={{ height: 48 }}
+				disabled={!!busy}
 				children={action}
 				title={desc}
 				onClick={async () => {
 					const result = await confirm({ title: action, description: desc, confirmationText: action });
 					if (!result.confirmed) return;
 					const releaseUrl = releases.find((r) => r.tag_name === selectedRelease)?.assets[0].browser_download_url;
 					if (releaseUrl === undefined) throw new Error("Release URL not found");
-					await update(selectedRelease);
+
+					// On Linux, warn the user if elevation is needed
+					if (__platform === "linux" && (await needsElevation())) {
+						const elevationResult = await confirm({
+							title: "Administrator privileges required",
+							description:
+								"TidaLuna does not have write access to the installation directory. " +
+								"Your password will be requested to proceed with the update.",
+							confirmationText: "Continue",
+							cancellationText: "Cancel",
+						});
+						if (!elevationResult.confirmed) return;
+					}
+
+					const updateResult = await update(selectedRelease);
+
+					if (updateResult === "elevation_required") {
+						setBusy("updating");
+						try {
+							await runElevatedInstall();
+						} catch (err: any) {
+							setBusy(null);
+							if (err.message?.includes("ELEVATION_CANCELLED")) return;
+							if (err.message?.includes("NO_ELEVATION_TOOL")) {
+								await confirm({
+									title: "Elevation failed",
+									description:
+										"Neither pkexec nor kdesudo were found on your system. " +
+										"Please perform this operation manually.",
+									hideCancelButton: true,
+								});
+								return;
+							}
+							throw err;
+						}
+					}
+
+					setBusy("updating");
+					await new Promise((resolve) => setTimeout(resolve, 2000));
+					await relaunch();
 				}}
 			/>
 			<LunaButton
 				sx={{ height: 48, marginLeft: 2 }}
 				color="error"
+				disabled={!!busy}
 				children={"Factory Reset"}
 				title={"Warning! This will reset luna to a clean install with no plugins."}
 				onClick={async () => {
@@ -85,6 +137,7 @@ export const LunaClientUpdate = React.memo(() => {
 					});
 					if (!ok.confirmed) return;
 
+					setBusy("resetting");
 					for (const db of await indexedDB.databases()) {
 						// Dont delete the tidal localforage db as it will reset the tidal app
 						// Deleting other _TIDAL indexedDB databases is ok