Auto-add trailing slash to server only if needed (#403)

* Auto-add trailing slash to server only if needed * undo package-lock.json change
boardgameio · May 19, 2019 · efece0c · efece0c
1 parent f289379
commit efece0c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/client/transport/socketio.js b/src/client/transport/socketio.js
@@ -72,8 +72,11 @@ export class SocketIO {
         if (server.search(/^https?:\/\//) == -1) {
           server = 'http://' + this.server;
         }
-
-        this.socket = io(server + '/' + this.gameName, this.socketOpts);
+        if (server.substr(-1) != '/') {
+          // add trailing slash if not already present
+          server = server + '/';
+        }
+        this.socket = io(server + this.gameName, this.socketOpts);
       } else {
         this.socket = io('/' + this.gameName, this.socketOpts);
       }

diff --git a/src/client/transport/socketio.test.js b/src/client/transport/socketio.test.js
@@ -144,6 +144,13 @@ describe('server option', () => {
     expect(m.socket.io.engine.secure).toEqual(false);
   });
 
+  test('without trailing slash', () => {
+    const server = 'http://' + hostname + ':' + port;
+    const m = new SocketIO({ server });
+    m.connect();
+    expect(m.socket.io.uri).toEqual(server + '/default');
+  });
+
   test('https', () => {
     const serverWithProtocol = 'https://' + hostname + ':' + port + '/';
     const m = new SocketIO({ server: serverWithProtocol });