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

This commit is contained in:
perf3ct
2025-06-11 14:30:33 +00:00
parent 3041af7fe2
commit e401c8c930
5 changed files with 38 additions and 46 deletions

View File

@@ -1,12 +0,0 @@
import { isRunningUnderRosetta2 } from "../../services/utils.js";
import type { Request, Response } from "express";
function rosettaCheck(req: Request, res: Response) {
res.json({
isRunningUnderRosetta2: isRunningUnderRosetta2()
});
}
export default {
rosettaCheck
};

View File

@@ -58,7 +58,6 @@ import ollamaRoute from "./api/ollama.js";
import openaiRoute from "./api/openai.js";
import anthropicRoute from "./api/anthropic.js";
import llmRoute from "./api/llm.js";
import systemInfoRoute from "./api/system_info.js";
import etapiAuthRoutes from "../etapi/auth.js";
import etapiAppInfoRoutes from "../etapi/app_info.js";
@@ -239,7 +238,6 @@ function register(app: express.Application) {
apiRoute(PST, "/api/recent-notes", recentNotesRoute.addRecentNote);
apiRoute(GET, "/api/app-info", appInfoRoute.getAppInfo);
apiRoute(GET, "/api/metrics", metricsRoute.getMetrics);
apiRoute(GET, "/api/system-info/rosetta-check", systemInfoRoute.rosettaCheck);
// docker health check
route(GET, "/api/health-check", [], () => ({ status: "ok" }), apiResultHandler);

View File

@@ -23,33 +23,7 @@ export const isElectron = !!process.versions["electron"];
export const isDev = !!(process.env.TRILIUM_ENV && process.env.TRILIUM_ENV === "dev");
/**
* 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 const isRunningUnderRosetta2 = () => {
if (!isMac) return false;
try {
// Use child_process to check sysctl.proc_translated
// This is the proper way to detect Rosetta 2 translation
const { execSync } = require("child_process");
const result = execSync("sysctl -n sysctl.proc_translated 2>/dev/null", {
encoding: "utf8",
timeout: 1000
}).trim();
// 1 means the process is being translated by Rosetta 2
// 0 means native execution
// If the sysctl doesn't exist (on Intel Macs), this will return empty/error
return result === "1";
} catch (error) {
// If sysctl fails or doesn't exist (Intel Macs), not running under Rosetta 2
return false;
}
};
export function newEntityId() {
return randomString(12);
@@ -423,7 +397,6 @@ export default {
isElectron,
isEmptyOrWhitespace,
isMac,
isRunningUnderRosetta2,
isStringNote,
isWindows,
md5,