More tweaking

apps/yaak-proxy/lib/rpc.ts

@@ -1,12 +1,11 @@
-import { invoke } from '@tauri-apps/api/core';
-import { listen as tauriListen } from '@tauri-apps/api/event';
 import type { RpcEventSchema, RpcSchema } from '@yaakapp-internal/proxy-lib';
+import { command, subscribe } from './tauri';
 
 export type Req<K extends keyof RpcSchema> = RpcSchema[K][0];
 export type Res<K extends keyof RpcSchema> = RpcSchema[K][1];
 
 export async function rpc<K extends keyof RpcSchema>(cmd: K, payload: Req<K>): Promise<Res<K>> {
-  return invoke('rpc', { cmd, payload }) as Promise<Res<K>>;
+  return command<Res<K>>('rpc', { cmd, payload });
 }
 
 /** Subscribe to a backend event. Returns an unsubscribe function. */
@@ -14,11 +13,5 @@ export function listen<K extends keyof RpcEventSchema>(
   event: K & string,
   callback: (payload: RpcEventSchema[K]) => void,
 ): () => void {
-  let unsub: (() => void) | null = null;
-  tauriListen<RpcEventSchema[K]>(event, (e) => callback(e.payload))
-    .then((fn) => {
-      unsub = fn;
-    })
-    .catch(console.error);
-  return () => unsub?.();
+  return subscribe<RpcEventSchema[K]>(event, callback);
 }

apps/yaak-proxy/lib/tauri.ts

@@ -0,0 +1,30 @@
+import { invoke } from '@tauri-apps/api/core';
+import { listen as tauriListen } from '@tauri-apps/api/event';
+import { getCurrentWebviewWindow } from '@tauri-apps/api/webviewWindow';
+import { type as tauriOsType } from '@tauri-apps/plugin-os';
+
+/** Call a Tauri command. */
+export function command<T>(cmd: string, args?: Record<string, unknown>): Promise<T> {
+  return invoke(cmd, args) as Promise<T>;
+}
+
+/** Subscribe to a Tauri event. Returns an unsubscribe function. */
+export function subscribe<T>(event: string, callback: (payload: T) => void): () => void {
+  let unsub: (() => void) | null = null;
+  tauriListen<T>(event, (e) => callback(e.payload))
+    .then((fn) => {
+      unsub = fn;
+    })
+    .catch(console.error);
+  return () => unsub?.();
+}
+
+/** Show the current webview window. */
+export function showWindow(): Promise<void> {
+  return getCurrentWebviewWindow().show();
+}
+
+/** Get the current OS type (e.g. "macos", "linux", "windows"). */
+export function getOsType() {
+  return tauriOsType();
+}

apps/yaak-proxy/lib/theme.ts

@@ -1,4 +1,3 @@
-import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
 import { setWindowTheme } from "@yaakapp-internal/mac-window";
 import {
   applyThemeToDocument,
@@ -10,23 +9,22 @@ import {
   subscribeToPreferredAppearance,
   type Appearance,
 } from "@yaakapp-internal/theme";
+import { showWindow } from "./tauri";
 
-export function initTheme() {
-  setPlatformOnDocument(platformFromUserAgent(navigator.userAgent));
+setPlatformOnDocument(platformFromUserAgent(navigator.userAgent));
 
-  // Apply a quick initial theme based on CSS media query
-  let preferredAppearance: Appearance = getCSSAppearance();
+// Apply a quick initial theme based on CSS media query
+let preferredAppearance: Appearance = getCSSAppearance();
+applyTheme(preferredAppearance);
+
+// Then subscribe to accurate OS appearance detection and changes
+subscribeToPreferredAppearance((a) => {
+  preferredAppearance = a;
   applyTheme(preferredAppearance);
+});
 
-  // Then subscribe to accurate OS appearance detection and changes
-  subscribeToPreferredAppearance((a) => {
-    preferredAppearance = a;
-    applyTheme(preferredAppearance);
-  });
-
-  // Show window after initial theme is applied (window starts hidden to prevent flash)
-  getCurrentWebviewWindow().show().catch(console.error);
-}
+// Show window after initial theme is applied (window starts hidden to prevent flash)
+showWindow().catch(console.error);
 
 function applyTheme(appearance: Appearance) {
   const theme = appearance === "dark" ? defaultDarkTheme : defaultLightTheme;