socket layer fixes for multiple tabs with same origin

Author: nsjames

electron.js

@@ -302,16 +302,16 @@ class LowLevelSocketService {
 		this.ports = {};
 	}
 
-	async getNewKey(origin){
+	async getNewKey(origin, id){
 		return new Promise((resolve, reject) => {
 			this.rekeyPromise = {resolve, reject};
-			this.emit(origin, 'rekey');
+			this.emit(origin, id, 'rekey');
 			return this.rekeyPromise;
 		})
 	}
 
-	async emit(origin, path, data){
-		const socket = this.openConnections[origin];
+	async emit(origin, id, path, data){
+		const socket = this.openConnections[origin+id];
 		return this.emitSocket(socket, path, data);
 	}
 
@@ -329,12 +329,14 @@ class LowLevelSocketService {
 			socket.send("40/scatter");
 			socket.send(`42/scatter,["connected"]`);
 
+			const id = Math.round(Math.random() * 999999999).toString();
+
 			// Just logging errors for debugging purposes (dev only)
 			if(isDev) socket.on('error', async request => console.log('error', request));
 
 			// Different clients send different message types for disconnect (ws vs socket.io)
-			socket.on('close',      () => delete this.openConnections[origin]);
-			socket.on('disconnect', () => delete this.openConnections[origin]);
+			socket.on('close',      () => delete this.openConnections[origin+id]);
+			socket.on('disconnect', () => delete this.openConnections[origin+id]);
 
 			socket.on('message', msg => {
 				if(msg.indexOf('42/scatter') === -1) return false;
@@ -354,12 +356,12 @@ class LowLevelSocketService {
 
 				if(!origin) origin = requestOrigin;
 				else if(origin && requestOrigin !== origin) return this.emitSocket(socket, 'api', {id:request.id, result:null});
-				if(!this.openConnections.hasOwnProperty(origin)) this.openConnections[origin] = socket;
+				if(!this.openConnections.hasOwnProperty(origin+id)) this.openConnections[origin+id] = socket;
 
 				switch(type){
-					case 'pair':        return mainWindow.webContents.send('pair', request);
+					case 'pair':        return mainWindow.webContents.send('pair', {request, id});
 					case 'rekeyed':     return this.rekeyPromise.resolve(request);
-					case 'api':         return mainWindow.webContents.send('api', request);
+					case 'api':         return mainWindow.webContents.send('api', {request, id});
 				}
 
 			});
@@ -399,13 +401,13 @@ class LowLevelSocketService {
 	}
 
 	sendEvent(event, payload, origin){
-		return this.emit(origin, 'event', {event, payload});
+		const sockets = Object.keys(this.openConnections).filter(x => x.indexOf(origin) === 0).map(x => this.openConnections[x]);
+		sockets.map(x => this.emitSocket(x, 'event', {event, payload}));
+		return true;
 	}
 
 	broadcastEvent(event, payload){
-		Object.keys(this.openConnections).map(origin => {
-			this.sendEvent(event, payload, origin);
-		});
+		Object.keys(this.openConnections).map(origin => this.sendEvent(event, payload, origin));
 		return true;
 	}
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "scatter",
-  "version": "11.0.0",
+  "version": "11.0.1",
   "private": true,
   "buttonText": "Scatter Desktop Companion",
   "author": {

src/services/utility/SocketService.js

@@ -18,10 +18,10 @@ remote.getGlobal('appShared').QuitWatcher = () => {
 
 
 
-const emit = (origin, path, data) => LowLevelSocketService.emit(origin, path, data);
-const getNewKey = origin => LowLevelSocketService.getNewKey(origin);
+const emit = (origin, id, path, data) => LowLevelSocketService.emit(origin, id, path, data);
+const getNewKey = (origin, id) => LowLevelSocketService.getNewKey(origin, id);
 
-const handleApiResponse = async request => {
+const handleApiResponse = async (request, id) => {
 
 	// 2 way authentication
 	const existingApp = StoreService.get().state.scatter.keychain.findApp(request.data.payload.origin);
@@ -45,11 +45,11 @@ const handleApiResponse = async request => {
 	else await updateNonce();
 
 	ApiService.handler(Object.assign(request.data, {plugin:request.plugin})).then(result => {
-		emit(existingApp.origin, 'api', result);
+		emit(existingApp.origin, id, 'api', result);
 	})
 };
 
-const handlePairedResponse = async request => {
+const handlePairedResponse = async (request, id) => {
 	const scatter = StoreService.get().state.scatter;
 	const existingApp = scatter.keychain.findApp(request.data.origin);
 	const linkApp = {
@@ -58,27 +58,27 @@ const handlePairedResponse = async request => {
 	};
 
 	if(request.data.passthrough)
-		return emit(request.data.origin, 'paired', existingApp && existingApp.checkKey(request.data.appkey));
+		return emit(request.data.origin, id, 'paired', existingApp && existingApp.checkKey(request.data.appkey));
 
 	const addAuthorizedApp = async (newKey = null) => {
 		const authedApp = new AuthorizedApp(request.data.origin, newKey ? newKey : request.data.appkey);
 		const clone = scatter.clone();
 		clone.keychain.updateOrPushApp(authedApp);
 		await StoreService.get().dispatch(Actions.SET_SCATTER, clone);
-		emit(request.data.origin, 'paired', true);
+		emit(request.data.origin, id, 'paired', true);
 	};
 
 	const repair = async () => {
-		const newKey = await getNewKey(request.data.origin);
-		if(newKey.data.origin !== request.data.origin || newKey.data.appkey.indexOf('appkey:') === -1) return emit(request.data.origin, 'paired', false);
+		const newKey = await getNewKey(request.data.origin, id);
+		if(newKey.data.origin !== request.data.origin || newKey.data.appkey.indexOf('appkey:') === -1) return emit(request.data.origin, id, 'paired', false);
 		return addAuthorizedApp(newKey.data.appkey)
 	}
 
 	if(existingApp){
-		if(existingApp.checkKey(request.data.appkey)) return emit(request.data.origin, 'paired', true);
+		if(existingApp.checkKey(request.data.appkey)) return emit(request.data.origin, id, 'paired', true);
 		else PopupService.push(Popup.popout(linkApp, async ({result}) => {
 			if(result) return repair();
-			else emit(request.data.origin, 'paired', false);
+			else emit(request.data.origin, id, 'paired', false);
 		}));
 	}
 	else return repair();
@@ -111,8 +111,8 @@ export default class SocketService {
 
 	static async initialize(){
 		const certs = await getCerts();
-		ipcRenderer.on('api', (event, request) => handleApiResponse(request));
-		ipcRenderer.on('pair', (event, request) => handlePairedResponse(request));
+		ipcRenderer.on('api', (event, {request, id}) => handleApiResponse(request, id));
+		ipcRenderer.on('pair', (event, {request, id}) => handlePairedResponse(request, id));
 		ipcRenderer.on('ports', (event, ports) => StoreService.get().dispatch(Actions.SET_PORTS, ports));
 		return LowLevelSocketService.initialize(certs);
 	}