diff --git a/src/main/services/utils.service.ts b/src/main/services/utils.service.ts index a636fe35..8d58224c 100644 --- a/src/main/services/utils.service.ts +++ b/src/main/services/utils.service.ts @@ -1,7 +1,5 @@ import path from "path"; -import { app, BrowserWindow } from "electron"; -import { IpcResponse } from "shared/models/ipc"; -import log from "electron-log"; +import { app } from "electron"; // TODO : REFACTOR @@ -44,12 +42,4 @@ export class UtilsService { public getBuildPath(filepath: string): string { return path.join(this.buildPath, filepath); } - - public ipcSend(channel: string, response: IpcResponse): void { - try { - BrowserWindow.getAllWindows().forEach(window => window?.webContents?.send(channel, response)); - } catch (error) { - log.error(error); - } - } } diff --git a/src/renderer/services/ipc.service.ts b/src/renderer/services/ipc.service.ts index be27349b..0c07cd92 100644 --- a/src/renderer/services/ipc.service.ts +++ b/src/renderer/services/ipc.service.ts @@ -1,6 +1,6 @@ import { defaultIfEmpty, share } from "rxjs/operators"; import { Observable, ReplaySubject, identity } from "rxjs"; -import { IpcRequest, IpcResponse } from "shared/models/ipc"; +import { IpcRequest } from "shared/models/ipc"; import { deserializeError } from 'serialize-error'; import { IpcCompleteChannel, IpcErrorChannel, IpcTearDownChannel } from "shared/models/ipc/ipc-response.interface"; import { IpcChannels, IpcRequestType, IpcResponseType } from "shared/models/ipc/ipc-routes"; @@ -8,8 +8,6 @@ import { IpcChannels, IpcRequestType, IpcResponseType } from "shared/models/ipc/ export class IpcService { private static instance: IpcService; - private readonly channelObservables: Map>; - public static getInstance(): IpcService { if (!IpcService.instance) { IpcService.instance = new IpcService(); @@ -17,53 +15,12 @@ export class IpcService { return IpcService.instance; } - private constructor() { - this.channelObservables = new Map>>(); - } - - /** - * @deprecated use sendV2 instead - */ - public send(channel: string, request?: IpcRequest): Promise> { - if (!request) { - request = { args: null, responceChannel: null }; - } - if (!request.responceChannel) { - request.responceChannel = `${channel}_responce_${new Date().getTime()}`; - } - - const promise = new Promise>(resolve => { - window.electron.ipcRenderer.once(request.responceChannel, (response: IpcResponse) => resolve(response)); - }); - - window.electron.ipcRenderer.sendMessage(channel, request); - - return promise; - } + private constructor() {} public sendLazy(channel: string, request?: IpcRequest): void { window.electron.ipcRenderer.sendMessage(channel, request); } - // Also need a rework - public watch(channel: string): Observable { - if (this.channelObservables.has(channel)) { - return this.channelObservables.get(channel) as Observable; - } - - const obs = new Observable(observer => { - window.electron.ipcRenderer.on(channel, (res) => { - observer.next(res); - }); - }); - - this.channelObservables.set(channel, obs); - - return obs; - } - - // TODO : Convert all IPCs calls to V2 - public sendV2(channel: C, data?: IpcRequestType, defaultValue?: IpcResponseType): Observable> { const request: IpcRequest> = {