(feat): add hotkeys
This commit is contained in:
parent
915568f739
commit
85633a1c81
27 changed files with 1014 additions and 33 deletions
|
|
@ -5,6 +5,7 @@ import {
|
|||
app,
|
||||
BrowserWindow,
|
||||
desktopCapturer,
|
||||
globalShortcut,
|
||||
ipcMain,
|
||||
session,
|
||||
shell,
|
||||
|
|
@ -13,6 +14,7 @@ import { checkForUpdates } from "./updates.js";
|
|||
import {
|
||||
ipcChannels,
|
||||
type DesktopCallStatus,
|
||||
type DesktopGlobalHotkeyBinding,
|
||||
type DesktopScreenShareAudioOutput,
|
||||
type DesktopScreenShareCapabilities,
|
||||
} from "../shared/ipc.js";
|
||||
|
|
@ -29,6 +31,8 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
|
|||
const verbose = process.argv.includes("--verbose");
|
||||
let mainWindow: BrowserWindow | null = null;
|
||||
let selectedScreenShareSourceId: string | null = null;
|
||||
let globalHotkeyBindings: DesktopGlobalHotkeyBinding[] = [];
|
||||
let globalHotkeysSuspended = false;
|
||||
|
||||
app.setName("tensamin");
|
||||
app.setPath("userData", join(app.getPath("appData"), "tensamin", "electron"));
|
||||
|
|
@ -46,6 +50,13 @@ if (
|
|||
app.commandLine.appendSwitch("password-store", "gnome-libsecret");
|
||||
}
|
||||
|
||||
if (
|
||||
process.platform === "linux" &&
|
||||
process.env.XDG_SESSION_TYPE === "wayland"
|
||||
) {
|
||||
app.commandLine.appendSwitch("enable-features", "GlobalShortcutsPortal");
|
||||
}
|
||||
|
||||
if (
|
||||
process.platform === "linux" &&
|
||||
process.env.XDG_SESSION_TYPE === "wayland" &&
|
||||
|
|
@ -242,6 +253,24 @@ function registerIpc() {
|
|||
deleteSecureStorage(key),
|
||||
);
|
||||
ipcMain.handle(ipcChannels.clearSecureStorage, clearSecureStorage);
|
||||
ipcMain.handle(
|
||||
ipcChannels.setGlobalHotkeyBindings,
|
||||
(event, bindings: unknown) => {
|
||||
assertTrustedRenderer(event);
|
||||
return setGlobalHotkeyBindings(bindings);
|
||||
},
|
||||
);
|
||||
ipcMain.handle(
|
||||
ipcChannels.setGlobalHotkeysSuspended,
|
||||
(event, suspended: unknown) => {
|
||||
assertTrustedRenderer(event);
|
||||
if (typeof suspended !== "boolean") {
|
||||
throw new Error("Invalid hotkey suspension state.");
|
||||
}
|
||||
globalHotkeysSuspended = suspended;
|
||||
return applyGlobalHotkeyBindings();
|
||||
},
|
||||
);
|
||||
ipcMain.handle(ipcChannels.setCallStatus, (_event, status: unknown) => {
|
||||
if (
|
||||
typeof status !== "object" ||
|
||||
|
|
@ -282,6 +311,90 @@ function registerIpc() {
|
|||
});
|
||||
}
|
||||
|
||||
function assertTrustedRenderer(event: Electron.IpcMainInvokeEvent) {
|
||||
const target = mainWindow;
|
||||
if (
|
||||
!target ||
|
||||
target.isDestroyed() ||
|
||||
event.sender !== target.webContents ||
|
||||
event.senderFrame !== target.webContents.mainFrame
|
||||
) {
|
||||
throw new Error("Untrusted hotkey IPC sender.");
|
||||
}
|
||||
|
||||
try {
|
||||
if (fileURLToPath(event.senderFrame.url) === getRendererIndex()) return;
|
||||
} catch {
|
||||
// Fall through to the rejection below.
|
||||
}
|
||||
throw new Error("Untrusted hotkey IPC sender.");
|
||||
}
|
||||
|
||||
function validGlobalHotkeyBindings(
|
||||
value: unknown,
|
||||
): value is DesktopGlobalHotkeyBinding[] {
|
||||
return (
|
||||
Array.isArray(value) &&
|
||||
value.length <= 64 &&
|
||||
value.every(
|
||||
(binding) =>
|
||||
binding &&
|
||||
typeof binding === "object" &&
|
||||
typeof (binding as DesktopGlobalHotkeyBinding).id === "string" &&
|
||||
/^[a-z0-9.-]+$/i.test((binding as DesktopGlobalHotkeyBinding).id) &&
|
||||
(binding as DesktopGlobalHotkeyBinding).id.length > 0 &&
|
||||
(binding as DesktopGlobalHotkeyBinding).id.length <= 128 &&
|
||||
typeof (binding as DesktopGlobalHotkeyBinding).accelerator ===
|
||||
"string" &&
|
||||
(binding as DesktopGlobalHotkeyBinding).accelerator.length > 0 &&
|
||||
(binding as DesktopGlobalHotkeyBinding).accelerator.length <= 128,
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
function applyGlobalHotkeyBindings() {
|
||||
globalShortcut.unregisterAll();
|
||||
const statuses = Object.fromEntries(
|
||||
globalHotkeyBindings.map(({ id }) => [id, false]),
|
||||
);
|
||||
if (globalHotkeysSuspended) return statuses;
|
||||
|
||||
const grouped = new Map<string, string[]>();
|
||||
for (const { id, accelerator } of globalHotkeyBindings) {
|
||||
const ids = grouped.get(accelerator) ?? [];
|
||||
ids.push(id);
|
||||
grouped.set(accelerator, ids);
|
||||
}
|
||||
|
||||
for (const [accelerator, ids] of grouped) {
|
||||
let registered = false;
|
||||
try {
|
||||
registered = globalShortcut.register(accelerator, () => {
|
||||
const target = mainWindow;
|
||||
if (!target || target.isDestroyed()) return;
|
||||
ids.forEach((id) =>
|
||||
target.webContents.send(ipcChannels.globalHotkeyTriggered, id),
|
||||
);
|
||||
});
|
||||
} catch (error) {
|
||||
console.error("Failed to register global hotkey", accelerator, error);
|
||||
}
|
||||
ids.forEach((id) => {
|
||||
statuses[id] = registered;
|
||||
});
|
||||
}
|
||||
|
||||
return statuses;
|
||||
}
|
||||
|
||||
function setGlobalHotkeyBindings(bindings: unknown) {
|
||||
if (!validGlobalHotkeyBindings(bindings)) {
|
||||
throw new Error("Invalid global hotkey bindings.");
|
||||
}
|
||||
globalHotkeyBindings = bindings;
|
||||
return applyGlobalHotkeyBindings();
|
||||
}
|
||||
|
||||
async function createWindow() {
|
||||
const rendererIndex = getRendererIndex();
|
||||
verboseLog("creating main window", {
|
||||
|
|
@ -367,6 +480,10 @@ app.on("activate", () => {
|
|||
if (BrowserWindow.getAllWindows().length === 0) void createWindow();
|
||||
});
|
||||
|
||||
app.on("will-quit", () => {
|
||||
globalShortcut.unregisterAll();
|
||||
});
|
||||
|
||||
if (verbose) {
|
||||
process.on("uncaughtException", (error) => {
|
||||
console.error("[tensamin:electron] uncaught exception", error);
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ import { contextBridge, ipcRenderer } from "electron";
|
|||
import {
|
||||
ipcChannels,
|
||||
type DesktopCallStatus,
|
||||
type DesktopGlobalHotkeyBinding,
|
||||
type DesktopScreenShareSource,
|
||||
secureStorageLimits,
|
||||
} from "../shared/ipc.js";
|
||||
|
|
@ -55,6 +56,23 @@ const desktopApi = {
|
|||
return ipcRenderer.invoke(ipcChannels.setCallStatus, status);
|
||||
},
|
||||
},
|
||||
hotkeys: {
|
||||
setBindings: (bindings: DesktopGlobalHotkeyBinding[]) =>
|
||||
ipcRenderer.invoke(ipcChannels.setGlobalHotkeyBindings, bindings),
|
||||
setSuspended: (suspended: boolean) =>
|
||||
typeof suspended === "boolean"
|
||||
? ipcRenderer.invoke(ipcChannels.setGlobalHotkeysSuspended, suspended)
|
||||
: Promise.reject(new Error("Invalid hotkey suspension state.")),
|
||||
onTriggered: (callback: (id: string) => void) => {
|
||||
const listener = (_event: Electron.IpcRendererEvent, id: unknown) => {
|
||||
if (typeof id === "string") callback(id);
|
||||
};
|
||||
ipcRenderer.on(ipcChannels.globalHotkeyTriggered, listener);
|
||||
return () => {
|
||||
ipcRenderer.removeListener(ipcChannels.globalHotkeyTriggered, listener);
|
||||
};
|
||||
},
|
||||
},
|
||||
secureStorage: {
|
||||
getStatus: () => ipcRenderer.invoke(ipcChannels.getSecureStorageStatus),
|
||||
load: (key: string) =>
|
||||
|
|
|
|||
|
|
@ -31,6 +31,11 @@ export type DesktopSecureStorageStatus = {
|
|||
backend: string | null;
|
||||
};
|
||||
|
||||
export type DesktopGlobalHotkeyBinding = {
|
||||
id: string;
|
||||
accelerator: string;
|
||||
};
|
||||
|
||||
export const secureStorageLimits = {
|
||||
maxKeyBytes: 256,
|
||||
maxValueBytes: 1024 * 1024,
|
||||
|
|
@ -77,4 +82,7 @@ export const ipcChannels = {
|
|||
saveSecureStorage: "secureStorage:save",
|
||||
deleteSecureStorage: "secureStorage:delete",
|
||||
clearSecureStorage: "secureStorage:clear",
|
||||
setGlobalHotkeyBindings: "hotkeys:setBindings",
|
||||
setGlobalHotkeysSuspended: "hotkeys:setSuspended",
|
||||
globalHotkeyTriggered: "hotkeys:triggered",
|
||||
} as const;
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@
|
|||
"@tensamin/cache": "workspace:*",
|
||||
"@tensamin/chat": "workspace:*",
|
||||
"@tensamin/crypto": "workspace:*",
|
||||
"@tensamin/hotkeys": "workspace:*",
|
||||
"@tensamin/shared": "workspace:*",
|
||||
"@tensamin/settings": "workspace:*",
|
||||
"@tensamin/storage": "workspace:*",
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@ import { useStorage } from "@tensamin/storage/context";
|
|||
import { useLocation, useNavigate } from "@tanstack/react-router";
|
||||
import { useIsMobile, Toaster, TooltipProvider } from "@methanium/ui";
|
||||
import { isTauri } from "@tauri-apps/api/core";
|
||||
import { HotkeysProvider } from "@tensamin/hotkeys";
|
||||
|
||||
const wrapper = document.getElementById("root");
|
||||
|
||||
|
|
@ -266,10 +267,12 @@ function RootShell() {
|
|||
/>
|
||||
<TooltipProvider>
|
||||
<Storage>
|
||||
<ThemeStorageBridge />
|
||||
<LoginWrapper>
|
||||
<Outlet />
|
||||
</LoginWrapper>
|
||||
<HotkeysProvider>
|
||||
<ThemeStorageBridge />
|
||||
<LoginWrapper>
|
||||
<Outlet />
|
||||
</LoginWrapper>
|
||||
</HotkeysProvider>
|
||||
</Storage>
|
||||
</TooltipProvider>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -82,9 +82,7 @@ export default defineConfig({
|
|||
"use-sync-external-store",
|
||||
"@tanstack/history",
|
||||
"@tanstack/react-router",
|
||||
"@tanstack/react-store",
|
||||
"@tanstack/router-core",
|
||||
"@tanstack/store",
|
||||
"@tensamin/crypto",
|
||||
"@tensamin/settings",
|
||||
"@tensamin/storage",
|
||||
|
|
@ -134,6 +132,7 @@ export default defineConfig({
|
|||
"@tensamin/chat",
|
||||
"@tensamin/crypto",
|
||||
"@tensamin/crypto/context",
|
||||
"@tensamin/hotkeys",
|
||||
"@tensamin/markdown",
|
||||
"@tensamin/mtp",
|
||||
"@tensamin/notifications",
|
||||
|
|
|
|||
Loading…
Reference in a new issue