Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions apps/desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"dbus-next": "0.10.2",
"effect": "catalog:",
"electron": "44.4.2",
"electron-chrome-web-store": "^0.13.0",
"electron-store": "^8.2.0",
"electron-updater": "^6.8.9",
"ffi-rs": "1.3.2",
Expand Down
6 changes: 6 additions & 0 deletions apps/desktop/src/ipc/DesktopIpcHandlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ import {
setSnapShotShortcutSuppressed,
} from "./methods/snapShot.ts";
import * as PreviewIpc from "./methods/preview.ts";
import * as PreviewExtensions from "../preview/extensions/PreviewExtensions.ts";
import * as AppActivationIpc from "./methods/appActivation.ts";
import * as ThreadLinksIpc from "./methods/threadLinks.ts";
import { getWslState, setWslBackendEnabled, setWslDistro, setWslOnly } from "./methods/wsl.ts";
Expand All @@ -77,6 +78,11 @@ export const installDesktopIpcHandlers = Effect.fn("desktop.ipc.installHandlers"
const ipc = yield* DesktopIpc.DesktopIpc;
yield* installNotificationBadge();
yield* PreviewIpc.installPreviewEventForwarding();
yield* Effect.sync(() =>
PreviewExtensions.installPreviewExtensions({
preloadPath: `${__dirname}/preview-extensions-preload.cjs`,
}),
);

yield* ipc.handle(AppActivationIpc.setReady);
yield* ipc.handle(AppActivationIpc.complete);
Expand Down
5 changes: 4 additions & 1 deletion apps/desktop/src/ipc/methods/preview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import * as NodeURL from "node:url";
import * as ElectronWindow from "../../electron/ElectronWindow.ts";
import * as BrowserImport from "../../preview/BrowserImport/BrowserImport.ts";
import * as PreviewManager from "../../preview/Manager.ts";
import * as PreviewExtensions from "../../preview/extensions/PreviewExtensions.ts";
import * as DesktopClientSettings from "../../settings/DesktopClientSettings.ts";
import { PREVIEW_WEBVIEW_PREFERENCES } from "../../preview/WebviewPreferences.ts";
import * as IpcChannels from "../channels.ts";
Expand Down Expand Up @@ -294,7 +295,9 @@ export const getPreviewConfig = DesktopIpc.makeIpcMethod({
// Creating the session first is what installs the UA rewrite and permission
// handlers; a guest that attached to an untouched partition would run with
// Electron's default UA and Chromium's default permission behaviour.
yield* manager.getBrowserSession(scope, persistent, namespace);
const session = yield* manager.getBrowserSession(scope, persistent, namespace);
// Chrome extensions run in every persistent profile, as in Chrome's own.
if (persistent) yield* Effect.sync(() => PreviewExtensions.enablePreviewExtensions(session));
return {
partition: yield* manager.getBrowserPartition(scope, persistent, namespace),
webPreferences: PREVIEW_WEBVIEW_PREFERENCES,
Expand Down
31 changes: 31 additions & 0 deletions apps/desktop/src/preload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { exposeClerkBridge } from "@clerk/electron/preload";
import { contextBridge, ipcRenderer, webFrame, webUtils } from "electron";

import * as IpcChannels from "./ipc/channels.ts";
import * as PreviewExtensionChannels from "./preview/extensions/channels.ts";

const SNAP_SHOT_EVENT_TYPES = new Set([
"requested",
Expand Down Expand Up @@ -409,4 +410,34 @@ contextBridge.exposeInMainWorld("desktopBridge", {
ipcRenderer.removeListener(IpcChannels.PREVIEW_POINTER_EVENT_CHANNEL, wrappedListener);
},
},
previewExtensions: {
list: () => ipcRenderer.invoke(PreviewExtensionChannels.LIST_CHANNEL),
actions: (webContentsId) =>
ipcRenderer.invoke(PreviewExtensionChannels.ACTIONS_CHANNEL, webContentsId),
runAction: (input) => ipcRenderer.invoke(PreviewExtensionChannels.RUN_ACTION_CHANNEL, input),
setActiveTab: (webContentsId) =>
ipcRenderer.invoke(PreviewExtensionChannels.SET_ACTIVE_TAB_CHANNEL, webContentsId),
openOptions: (extensionId) =>
ipcRenderer.invoke(PreviewExtensionChannels.OPEN_OPTIONS_CHANNEL, extensionId),
openWebStore: () => ipcRenderer.invoke(PreviewExtensionChannels.OPEN_WEB_STORE_CHANNEL),
setEnabled: (extensionId, enabled) =>
ipcRenderer.invoke(PreviewExtensionChannels.SET_ENABLED_CHANNEL, extensionId, enabled),
remove: (extensionId) =>
ipcRenderer.invoke(PreviewExtensionChannels.REMOVE_CHANNEL, extensionId),
loadUnpacked: () => ipcRenderer.invoke(PreviewExtensionChannels.LOAD_UNPACKED_CHANNEL),
onChanged: (listener) => {
const wrappedListener = () => listener();
ipcRenderer.on(PreviewExtensionChannels.CHANGED_CHANNEL, wrappedListener);
return () =>
ipcRenderer.removeListener(PreviewExtensionChannels.CHANGED_CHANNEL, wrappedListener);
},
onOpenTab: (listener) => {
const wrappedListener = (_event: Electron.IpcRendererEvent, url: unknown) => {
if (typeof url === "string") listener(url);
};
ipcRenderer.on(PreviewExtensionChannels.OPEN_TAB_CHANNEL, wrappedListener);
return () =>
ipcRenderer.removeListener(PreviewExtensionChannels.OPEN_TAB_CHANNEL, wrappedListener);
},
},
} satisfies DesktopBridge);
Loading
Loading