Fix problem with multiple callMain calls (#41)

Author: t13m

source/main.js

@@ -14,8 +14,8 @@ ipc.callRenderer = (browserWindow, channel, data) => new Promise((resolve, rejec
 	const {sendChannel, dataChannel, errorChannel} = util.getRendererResponseChannels(channel);
 
 	const cleanup = () => {
-		ipc.off(dataChannel, onData);
-		ipc.off(errorChannel, onError);
+		ipcMain.off(dataChannel, onData);
+		ipcMain.off(errorChannel, onError);
 	};
 
 	const onData = (event, result) => {
@@ -34,8 +34,8 @@ ipc.callRenderer = (browserWindow, channel, data) => new Promise((resolve, rejec
 		}
 	};
 
-	ipc.on(dataChannel, onData);
-	ipc.on(errorChannel, onError);
+	ipcMain.on(dataChannel, onData);
+	ipcMain.on(errorChannel, onError);
 
 	const completeData = {
 		dataChannel,
@@ -99,10 +99,10 @@ ipc.answerRenderer = (browserWindowOrChannel, channelOrCallback, callbackOrNothi
 		}
 	};
 
-	ipc.on(sendChannel, listener);
+	ipcMain.on(sendChannel, listener);
 
 	return () => {
-		ipc.off(sendChannel, listener);
+		ipcMain.off(sendChannel, listener);
 	};
 };
 

source/renderer.js

@@ -10,8 +10,8 @@ ipc.callMain = (channel, data) => new Promise((resolve, reject) => {
 	const {sendChannel, dataChannel, errorChannel} = util.getResponseChannels(channel);
 
 	const cleanup = () => {
-		ipc.off(dataChannel, onData);
-		ipc.off(errorChannel, onError);
+		ipcRenderer.off(dataChannel, onData);
+		ipcRenderer.off(errorChannel, onError);
 	};
 
 	const onData = (_event, result) => {
@@ -24,16 +24,16 @@ ipc.callMain = (channel, data) => new Promise((resolve, reject) => {
 		reject(deserializeError(error));
 	};
 
-	ipc.once(dataChannel, onData);
-	ipc.once(errorChannel, onError);
+	ipcRenderer.once(dataChannel, onData);
+	ipcRenderer.once(errorChannel, onError);
 
 	const completeData = {
 		dataChannel,
 		errorChannel,
 		userData: data
 	};
 
-	ipc.send(sendChannel, completeData);
+	ipcRenderer.send(sendChannel, completeData);
 });
 
 ipc.answerMain = (channel, callback) => {
@@ -43,16 +43,16 @@ ipc.answerMain = (channel, callback) => {
 		const {dataChannel, errorChannel, userData} = data;
 
 		try {
-			ipc.send(dataChannel, await callback(userData));
+			ipcRenderer.send(dataChannel, await callback(userData));
 		} catch (error) {
-			ipc.send(errorChannel, serializeError(error));
+			ipcRenderer.send(errorChannel, serializeError(error));
 		}
 	};
 
-	ipc.on(sendChannel, listener);
+	ipcRenderer.on(sendChannel, listener);
 
 	return () => {
-		ipc.off(sendChannel, listener);
+		ipcRenderer.off(sendChannel, listener);
 	};
 };