From 21718cd87865fd0085990ef48be5c815dae11201 Mon Sep 17 00:00:00 2001
From: peterpeterparker <david.dalbusco@outlook.com>
Date: Sat, 23 Nov 2019 16:42:58 +0100
Subject: [PATCH] feat(#471): no breaking change in remote connection, use root
 path for socket

---
 backend/src/socket-io-remote.js                            | 4 ++--
 .../app/services/communication/communication.service.tsx   | 3 +--
 webcomponents/remote/src/components.d.ts                   | 2 --
 .../src/components/deckdeckgo-remote/deckdeckgo-remote.tsx | 7 -------
 .../src/services/communication/communication.service.tsx   | 6 +-----
 5 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/backend/src/socket-io-remote.js b/backend/src/socket-io-remote.js
index 85173596e..5c5d5613b 100644
--- a/backend/src/socket-io-remote.js
+++ b/backend/src/socket-io-remote.js
@@ -1,11 +1,11 @@
 let rooms = [];
 
 module.exports = (server) => {
-    const socketIO = require('socket.io').listen(server, {'transports': ['websocket', 'xhr-polling'], path: '/remote'});
+    const socketIO = require('socket.io').listen(server, {'transports': ['websocket', 'xhr-polling']});
 
     socketIO.set('origins', '*:*');
 
-    console.log('\x1b[36m%s\x1b[0m', '[DeckDeckGo]', 'Socket listening. Path: /remote');
+    console.log('\x1b[36m%s\x1b[0m', '[DeckDeckGo]', 'Socket listening. Path: /');
 
     socketIO.sockets.on('connection', (socket) => {
         socket.on('rooms', async () => {
diff --git a/remote/src/app/services/communication/communication.service.tsx b/remote/src/app/services/communication/communication.service.tsx
index dd7b4b8e4..4a4682056 100644
--- a/remote/src/app/services/communication/communication.service.tsx
+++ b/remote/src/app/services/communication/communication.service.tsx
@@ -84,8 +84,7 @@ export class CommunicationService {
             this.socket = io.connect(url, {
                 'reconnectionAttempts': 5,
                 'transports': ['websocket', 'xhr-polling'],
-                'query': 'type=app',
-                'path': '/remote'
+                'query': 'type=app'
             });
 
             this.socket.on('connect', async () => {
diff --git a/webcomponents/remote/src/components.d.ts b/webcomponents/remote/src/components.d.ts
index 2525e517e..8c2b26124 100644
--- a/webcomponents/remote/src/components.d.ts
+++ b/webcomponents/remote/src/components.d.ts
@@ -32,7 +32,6 @@ export namespace Components {
     'prevSlide': (slideAnimation?: boolean) => Promise<void>;
     'room': string;
     'slideTo': (index: number, speed?: number) => Promise<void>;
-    'socketPath': string;
     'socketUrl': string;
     'updateReveal': (reveal: boolean) => Promise<void>;
     'updateSlide': (index: number, slide: DeckdeckgoSlideDefinition) => Promise<void>;
@@ -63,7 +62,6 @@ declare namespace LocalJSX {
     'onEvent'?: (event: CustomEvent<DeckdeckgoEvent>) => void;
     'onState'?: (event: CustomEvent<ConnectionState>) => void;
     'room'?: string;
-    'socketPath'?: string;
     'socketUrl'?: string;
     'width'?: number;
   }
diff --git a/webcomponents/remote/src/components/deckdeckgo-remote/deckdeckgo-remote.tsx b/webcomponents/remote/src/components/deckdeckgo-remote/deckdeckgo-remote.tsx
index d02b22025..5c2351f45 100644
--- a/webcomponents/remote/src/components/deckdeckgo-remote/deckdeckgo-remote.tsx
+++ b/webcomponents/remote/src/components/deckdeckgo-remote/deckdeckgo-remote.tsx
@@ -91,7 +91,6 @@ export class DeckdeckgoRemote {
 
   @Prop() room: string;
   @Prop() socketUrl: string;
-  @Prop() socketPath: string;
 
   @Prop() width: number;
   @Prop() height: number;
@@ -185,11 +184,6 @@ export class DeckdeckgoRemote {
     await this.initConnect();
   }
 
-  @Watch('socketPath')
-  async onSocketPathChange() {
-    await this.initConnect();
-  }
-
   private async initConnect() {
     if (!this.autoConnect) {
       return;
@@ -208,7 +202,6 @@ export class DeckdeckgoRemote {
 
       this.communicationService.room = this.room;
       this.communicationService.socketUrl = this.socketUrl;
-      this.communicationService.socketPath = this.socketPath;
 
       await this.communicationService.disconnect();
       await this.communicationService.connect();
diff --git a/webcomponents/remote/src/services/communication/communication.service.tsx b/webcomponents/remote/src/services/communication/communication.service.tsx
index 4256d0e05..903dc35ef 100644
--- a/webcomponents/remote/src/services/communication/communication.service.tsx
+++ b/webcomponents/remote/src/services/communication/communication.service.tsx
@@ -29,7 +29,6 @@ const dataChannelOptions = {
 };
 
 const DEFAULT_SOCKET_URL: string = 'https://api.deckdeckgo.com';
-const DEFAULT_SOCKET_PATH: string = '/remote';
 
 export enum ConnectionState {
   DISCONNECTED,
@@ -56,7 +55,6 @@ export class CommunicationService {
 
   room: string;
   socketUrl: string;
-  socketPath: string;
 
   private state: BehaviorSubject<ConnectionState> = new BehaviorSubject<ConnectionState>(ConnectionState.DISCONNECTED);
   private event: Subject<DeckdeckgoEvent> = new Subject<DeckdeckgoEvent>();
@@ -81,15 +79,13 @@ export class CommunicationService {
       }
 
       const url: string = this.socketUrl ? this.socketUrl : DEFAULT_SOCKET_URL;
-      const path: string = this.socketPath ? this.socketPath : DEFAULT_SOCKET_PATH;
 
       this.state.next(ConnectionState.CONNECTING);
 
       this.socket = io.connect(url, {
         'reconnectionAttempts': 5,
         'transports': ['websocket', 'xhr-polling'],
-        'query': 'type=app',
-        'path': path
+        'query': 'type=app'
       });
 
       this.socket.on('connect', async () => {