Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-17 10:40:41 +01:00
Code Issues Packages Projects Releases Activity

Revert "fix(client): also move the logic from the server to the client lol"

Browse Source 
This reverts commit e401c8c930.
This commit is contained in:
Elian Doran
2025-06-12 21:46:27 +03:00
parent 79aae8fb43
commit f6bba436f4
5 changed files with 46 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/client/src/desktop.ts
View File

@@ -8,7 +8,7 @@ import electronContextMenu from "./menus/electron_context_menu.js";
import glob from "./services/glob.js";
import { t } from "./services/i18n.js";
import options from "./services/options.js";
import { isRunningUnderRosetta2 } from "./services/rosetta_detection.js";
import server from "./services/server.js";
import type ElectronRemote from "@electron/remote";
import type Electron from "electron";
import "./stylesheets/bootstrap.scss";
@@ -119,12 +119,13 @@ function initDarkOrLightMode(style: CSSStyleDeclaration) {
nativeTheme.themeSource = themeSource;
}
function checkRosetta2Warning() {
async function checkRosetta2Warning() {
if (!utils.isElectron()) return;
try {
// Check if running under Rosetta 2 directly on client
if (isRunningUnderRosetta2()) {
// Check if running under Rosetta 2 by calling the server
const response = await server.get("api/system-info/rosetta-check") as { isRunningUnderRosetta2: boolean };
if (response.isRunningUnderRosetta2) {
// Trigger the Rosetta 2 warning dialog
appContext.triggerCommand("showRosettaWarning", {});
}

34
apps/client/src/services/rosetta_detection.ts
View File

@@ -1,34 +0,0 @@
import utils from "./utils.js";
/**
* Detects if the application is running under Rosetta 2 translation on Apple Silicon.
* This happens when an x64 version of the app is run on an M1/M2/M3 Mac.
* Uses the macOS sysctl.proc_translated to properly detect translation.
* @returns true if running under Rosetta 2, false otherwise
*/
export function isRunningUnderRosetta2(): boolean {
if (!utils.isElectron()) return false;
const process = utils.dynamicRequire("process");
const { execSync } = utils.dynamicRequire("child_process");
// Only check on macOS
if (process.platform !== "darwin") return false;
try {
// Use sysctl.proc_translated to check if process is being translated by Rosetta 2
// This is the proper way to detect Rosetta 2 translation
const result = execSync("sysctl -n sysctl.proc_translated 2>/dev/null", {
encoding: "utf8",
timeout: 1000
}).trim();
// Returns "1" if running under Rosetta 2, "0" if native ARM64
// Returns empty string or error on Intel Macs (where the key doesn't exist)
return result === "1";
} catch (error) {
// If the command fails (e.g., on Intel Macs), assume not running under Rosetta 2
console.debug("Could not check Rosetta 2 status:", error);
return false;
}
}