Skip to content

fix(desktop): event-driven tray menu + real org name #3458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saddlepaddle merged 1 commit into from
Apr 14, 2026
+101 −102
Merged

fix(desktop): event-driven tray menu + real org name #3458

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
203 changes: 101 additions & 102 deletions apps/desktop/src/main/lib/tray/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ import {
} from "main/lib/host-service-coordinator";
import { menuEmitter } from "main/lib/menu-events";

const POLL_INTERVAL_MS = 5000;

/** Must have "Template" suffix for macOS dark/light mode support */
const TRAY_ICON_FILENAME = "iconTemplate.png";

Expand Down Expand Up @@ -51,7 +49,6 @@ function getTrayIconPath(): string | null {
}

let tray: Tray | null = null;
let pollIntervalId: ReturnType<typeof setInterval> | null = null;

function createTrayIcon(): Electron.NativeImage | null {
const iconPath = getTrayIconPath();
Expand Down Expand Up @@ -86,117 +83,127 @@ function openSettings(): void {
menuEmitter.emit("open-settings");
}

// Background cache of host.info data per org
const hostInfoCache = new Map<
string,
{ organizationName: string; version: string; uptime: number }
>();
interface HostInfo {
organizationName: string;
version: string;
}

async function fetchHostInfo(organizationId: string): Promise<HostInfo | null> {
const connection = getHostServiceCoordinator().getConnection(organizationId);
if (!connection) return null;

function refreshHostInfo(): void {
const coordinator = getHostServiceCoordinator();
for (const orgId of coordinator.getActiveOrganizationIds()) {
const connection = coordinator.getConnection(orgId);
if (!connection) continue;

void fetch(`http://127.0.0.1:${connection.port}/trpc/host.info`, {
headers: { Authorization: `Bearer ${connection.secret}` },
})
.then((res) => (res.ok ? res.json() : null))
.then((data) => {
if (!data?.result?.data) return;
const info = data.result.data;
hostInfoCache.set(orgId, {
organizationName: info.organization?.name ?? orgId.slice(0, 8),
version: info.version ?? "",
uptime: info.uptime ?? 0,
});
})
.catch(() => {});
const controller = new AbortController();
const timeout = setTimeout(() => controller.abort(), 2000);
try {
const res = await fetch(
`http://127.0.0.1:${connection.port}/trpc/host.info`,
{
headers: { Authorization: `Bearer ${connection.secret}` },
signal: controller.signal,
},
);
if (!res.ok) return null;
const data = await res.json();
const info = data?.result?.data?.json;
if (!info?.organization?.name) return null;
return {
organizationName: info.organization.name,
version: info.version ?? "",
};
} catch {
return null;
} finally {
clearTimeout(timeout);
}
}

function buildHostServiceSubmenu(): MenuItemConstructorOptions[] {
function buildHostServiceSubmenu(
orgIds: string[],
infos: Map<string, HostInfo>,
): MenuItemConstructorOptions[] {
const coordinator = getHostServiceCoordinator();
const orgIds = coordinator.getActiveOrganizationIds();
const menuItems: MenuItemConstructorOptions[] = [];

if (orgIds.length === 0) {
menuItems.push({ label: "No active services", enabled: false });
} else {
let isFirst = true;
for (const orgId of orgIds) {
if (!isFirst) {
menuItems.push({ type: "separator" });
}
isFirst = false;

const status = coordinator.getProcessStatus(orgId);
const cached = hostInfoCache.get(orgId);
const isRunning = status === "running";
const label = cached?.organizationName ?? orgId.slice(0, 8);
const versionSuffix = cached?.version ? ` (v${cached.version})` : "";

menuItems.push({
label,
enabled: false,
});

menuItems.push({
label: ` ${status}${versionSuffix}`,
enabled: false,
});

menuItems.push({
label: " Restart",
enabled: isRunning,
click: () => {
void (async () => {
try {
const { token } = await loadToken();
if (!token) return;
await coordinator.restart(orgId, {
authToken: token,
cloudApiUrl: env.NEXT_PUBLIC_API_URL,
});
} catch (error) {
console.error(
`[Tray] Failed to restart host-service for ${orgId}:`,
error,
);
}
updateTrayMenu();
})();
},
});

menuItems.push({
label: " Stop",
enabled: isRunning,
click: () => {
coordinator.stop(orgId);
updateTrayMenu();
},
});
return menuItems;
}

let isFirst = true;
for (const orgId of orgIds) {
if (!isFirst) {
menuItems.push({ type: "separator" });
}
isFirst = false;

const status = coordinator.getProcessStatus(orgId);
const info = infos.get(orgId);
const isRunning = status === "running";
const label = info?.organizationName ?? "Loading…";
const versionSuffix = info?.version ? ` (v${info.version})` : "";
Comment on lines +139 to +143
Copy link
Copy Markdown

@greptile-apps greptile-apps Bot Apr 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 status can be "stopped" while label shows "Loading…"

buildHostServiceSubmenu calls coordinator.getProcessStatus(orgId) after the async fetch boundary in updateTrayMenu. getActiveOrganizationIds() filters to status !== "stopped", but between the snapshot and the menu build the coordinator state can change. If a service stops in that window, getProcessStatus returns "stopped", isRunning is false, and both action items are disabled — but the org is still rendered with a "Loading…" label (because fetchHostInfo returned null for a non-running process). The menu then shows:

Loading…
  stopped
  Restart  (disabled)
  Stop     (disabled)

This isn't catastrophic — the next status-changed event corrects it — but it's misleading UX. Consider re-reading orgIds after the await to filter to still-active orgs, or at least fall back to orgId.slice(0, 8) when the org is no longer in a running state.


menuItems.push({ label, enabled: false });
menuItems.push({
label: ` ${status}${versionSuffix}`,
enabled: false,
});
menuItems.push({
label: " Restart",
enabled: isRunning,
click: () => {
void (async () => {
try {
const { token } = await loadToken();
if (!token) return;
await coordinator.restart(orgId, {
authToken: token,
cloudApiUrl: env.NEXT_PUBLIC_API_URL,
});
} catch (error) {
console.error(
`[Tray] Failed to restart host-service for ${orgId}:`,
error,
);
}
void updateTrayMenu();
})();
},
});
menuItems.push({
label: " Stop",
enabled: isRunning,
click: () => {
coordinator.stop(orgId);
void updateTrayMenu();
},
});
}

return menuItems;
}

function updateTrayMenu(): void {
async function updateTrayMenu(): Promise<void> {
if (!tray) return;

refreshHostInfo();

const coordinator = getHostServiceCoordinator();
const orgIds = coordinator.getActiveOrganizationIds();

const infoEntries = await Promise.all(
orgIds.map(async (orgId) => [orgId, await fetchHostInfo(orgId)] as const),
);
const infos = new Map<string, HostInfo>();
for (const [orgId, info] of infoEntries) {
if (info) infos.set(orgId, info);
}

if (!tray) return;
Comment on lines +185 to +199
Copy link
Copy Markdown

@greptile-apps greptile-apps Bot Apr 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 No in-flight guard on concurrent updateTrayMenu calls

Both the status-changed listener and the tray.on("mouse-enter") handler call void updateTrayMenu() independently, and updateTrayMenu now awaits up to 2 seconds of parallel network fetches. There is no guard preventing multiple calls from being in-flight simultaneously.

A concrete race: status-changed fires and starts call #1 (awaiting 2 s). The user then hovers the tray 300 ms later, starting call #2. Call #2 finishes first and sets the menu correctly. Then call #1 finishes and overwrites the menu with data derived from the orgIds snapshot it took 300 ms earlier — potentially excluding an org that was just added, or including one that was just stopped.

A lightweight fix is a single-flight flag that drops duplicate calls while one is in-progress:

let updateInFlight = false;

async function updateTrayMenu(): Promise<void> {
  if (updateInFlight) return;
  updateInFlight = true;
  try {
    // ... existing body ...
  } finally {
    updateInFlight = false;
  }
}

Alternatively, schedule a debounced microtask so rapid-fire events coalesce into one fetch cycle.


const hasActive = orgIds.length > 0;
const hostServiceLabel = hasActive
? `Host Service (${orgIds.length})`
: "Host Service";

const hostServiceSubmenu = buildHostServiceSubmenu();
const hostServiceSubmenu = buildHostServiceSubmenu(orgIds, infos);

const menu = Menu.buildFromTemplate([
{
Expand Down Expand Up @@ -251,19 +258,16 @@ export function initTray(): void {
tray = new Tray(icon);
tray.setToolTip("Superset");

updateTrayMenu();
void updateTrayMenu();

const manager = getHostServiceCoordinator();
manager.on("status-changed", (_event: HostServiceStatusEvent) => {
updateTrayMenu();
void updateTrayMenu();
});

// Periodic refresh as a fallback
pollIntervalId = setInterval(() => {
updateTrayMenu();
}, POLL_INTERVAL_MS);
// Don't keep Electron alive just for tray updates
pollIntervalId.unref();
tray.on("mouse-enter", () => {
void updateTrayMenu();
});

console.log("[Tray] Initialized successfully");
} catch (error) {
Expand All @@ -273,11 +277,6 @@ export function initTray(): void {

/** Call on app quit */
export function disposeTray(): void {
if (pollIntervalId) {
clearInterval(pollIntervalId);
pollIntervalId = null;
}

if (tray) {
tray.destroy();
tray = null;
Expand Down
Loading