Skip to content
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.

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

feat: wrap ipc API #100

Merged
merged 1 commit into from
Dec 6, 2023
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
2 changes: 1 addition & 1 deletion packages/app-main/src/preload/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ipcRenderer } from 'electron';

import { webArgs } from './args';

export const appAPI: AppRendererAPI = {
export const AppAPI: AppRendererAPI = {
windowType: webArgs.windowType,
createWindow: (...args) => ipcRenderer.invoke(AppAPIChannel.CREATE_WINDOW, ...args),
getAppDetails: (...args) => ipcRenderer.invoke(AppAPIChannel.GET_APP_DETAILS, ...args),
Expand Down
8 changes: 4 additions & 4 deletions packages/app-main/src/preload/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { contextBridge } from 'electron';

import { appAPI } from './app';
import { loggerAPI } from './logger';
import { AppAPI } from './app';
import { LoggerAPI } from './logger';

contextBridge.exposeInMainWorld('appAPI', appAPI);
contextBridge.exposeInMainWorld('loggerAPI', loggerAPI);
contextBridge.exposeInMainWorld('APP_API', AppAPI);
contextBridge.exposeInMainWorld('LOGGER_API', LoggerAPI);
2 changes: 1 addition & 1 deletion packages/app-main/src/preload/logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { LoggerRendererAPI } from '@ter/app-common/apis/logger';
import { LoggerAPIChannel } from '@ter/app-common/apis/logger';
import { ipcRenderer } from 'electron';

export const loggerAPI: LoggerRendererAPI = {
export const LoggerAPI: LoggerRendererAPI = {
debug: (...args) => ipcRenderer.invoke(LoggerAPIChannel.DEBUG, ...args),
error: (...args) => ipcRenderer.invoke(LoggerAPIChannel.ERROR, ...args),
info: (...args) => ipcRenderer.invoke(LoggerAPIChannel.INFO, ...args),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { appAPI } from 'src/apis';
import { AppAPI } from 'src/apis';

import { _actions } from '../actions';

import { createMainThunk } from './createThunk';

export const prepareAppDetails = createMainThunk(async (dispatch) => {
const appDetails = await appAPI.getAppDetails();
const appDetails = await AppAPI.getAppDetails();
dispatch(_actions._setAppDetails(appDetails));
});
11 changes: 11 additions & 0 deletions packages/app-renderer/src/apis/exposes.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import type { AppRendererAPI } from '@ter/app-common/apis/app';
import type { LoggerRendererAPI } from '@ter/app-common/apis/logger';

declare const window: {
/* eslint-disable @typescript-eslint/naming-convention */
APP_API: AppRendererAPI;
LOGGER_API: LoggerRendererAPI;
/* eslint-enable @typescript-eslint/naming-convention */
};

export const { APP_API, LOGGER_API } = window;
44 changes: 39 additions & 5 deletions packages/app-renderer/src/apis/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,43 @@
/*
* https://www.electronjs.org/docs/latest/api/context-bridge#api-functions
* Exposed functions have some limitations.
* Here we can convert them to meet our requirements, such as converting data structures:
* ```ts
* const { _getUser } = window;
*
* export async function getUser() {
* return User.deserialize(await _getUser());
* }
* ```
*
* We can also create new functions that combine some of the exposed functions:
* ```ts
* const { apiA, apiB } = window;
*
* export async function apiX() {
* const resA = await apiA();
* const resB = await apiB();
* return resA || resB;
* }
* ```
*/

import type { AppRendererAPI } from '@ter/app-common/apis/app';
import type { LoggerRendererAPI } from '@ter/app-common/apis/logger';

declare const window: {
appAPI: AppRendererAPI;
loggerAPI: LoggerRendererAPI;
};
import { APP_API, LOGGER_API } from './exposes';

export const AppAPI = {
createWindow: APP_API.createWindow,
getAppDetails: APP_API.getAppDetails,
windowType: APP_API.windowType,
} satisfies Record<keyof AppRendererAPI, unknown>;

export const { appAPI, loggerAPI } = window;
export const LoggerAPI = {
debug: LOGGER_API.debug,
error: LOGGER_API.error,
info: LOGGER_API.info,
log: LOGGER_API.log,
verbose: LOGGER_API.verbose,
warn: LOGGER_API.warn,
} satisfies Record<keyof LoggerRendererAPI, unknown>;
4 changes: 2 additions & 2 deletions packages/app-renderer/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { match } from 'ts-pattern';

import './index.css';

import { appAPI } from './apis';
import { AppAPI } from './apis';
import { MainWindow } from './MainWindow';
import { reportWebVitals } from './reportWebVitals';
import { assert } from './utils/assert';
Expand All @@ -14,7 +14,7 @@ function main(): void {
const appElement = document.getElementById('app');
assert(appElement !== null);

const window = match(appAPI.windowType)
const window = match(AppAPI.windowType)
.with(WindowType.MAIN, () => <MainWindow />)
.exhaustive();

Expand Down