Added ability to specify server protocol (#247)

* Added ability to specify server protocol

* Fixed protocol check would accept an occurance anywhere in server string

* Replaced var with let

* tighter regex

* update docs

docs/multiplayer.md

@@ -95,6 +95,16 @@ const App = Client({
 });
 ```
 
+You may also specify a protocol here (if you want to use SSL, for example):
+
+```js
+const App = Client({
+  game: TicTacToe,
+  board: TicTacToeBoard,
+  multiplayer: { server: 'https://localhost:8000/' },
+});
+```
+
 #### Associating Clients with Players
 
 Clients needs to be associated with a particular player in order

src/client/multiplayer/multiplayer.js

@@ -91,10 +91,12 @@ export class Multiplayer {
   connect() {
     if (!this.socket) {
       if (this.server) {
-        this.socket = io(
-          'http://' + this.server + '/' + this.gameName,
-          this.socketOpts
-        );
+        let server = this.server;
+        if (server.search(/^https?:\/\//) == -1) {
+          server = 'http://' + this.server;
+        }
+
+        this.socket = io(server + '/' + this.gameName, this.socketOpts);
       } else {
         this.socket = io('/' + this.gameName, this.socketOpts);
       }

src/client/multiplayer/multiplayer.test.js

@@ -132,20 +132,43 @@ test('move blacklist', () => {
   mockSocket.emit.mockReset();
 });
 
-test('game server is set when provided', () => {
-  var hostname = 'host';
-  var port = '1234';
-  var server = hostname + ':' + port;
+describe('server option', () => {
+  const hostname = 'host';
+  const port = '1234';
+
+  test('without protocol', () => {
+    const server = hostname + ':' + port;
+    const m = new Multiplayer({ server });
+    m.connect();
+    expect(m.socket.io.engine.hostname).toEqual(hostname);
+    expect(m.socket.io.engine.port).toEqual(port);
+    expect(m.socket.io.engine.secure).toEqual(false);
+  });
 
-  const m = new Multiplayer({ server });
-  m.connect();
-  expect(m.socket.io.engine.hostname).toEqual(hostname);
-  expect(m.socket.io.engine.port).toEqual(port);
+  test('https', () => {
+    const serverWithProtocol = 'https://' + hostname + ':' + port + '/';
+    const m = new Multiplayer({ server: serverWithProtocol });
+    m.connect();
+    expect(m.socket.io.engine.hostname).toEqual(hostname);
+    expect(m.socket.io.engine.port).toEqual(port);
+    expect(m.socket.io.engine.secure).toEqual(true);
+  });
 
-  const m2 = new Multiplayer();
-  m2.connect();
-  expect(m2.socket.io.engine.hostname).not.toEqual(hostname);
-  expect(m2.socket.io.engine.port).not.toEqual(port);
+  test('http', () => {
+    const serverWithProtocol = 'http://' + hostname + ':' + port + '/';
+    const m = new Multiplayer({ server: serverWithProtocol });
+    m.connect();
+    expect(m.socket.io.engine.hostname).toEqual(hostname);
+    expect(m.socket.io.engine.port).toEqual(port);
+    expect(m.socket.io.engine.secure).toEqual(false);
+  });
+
+  test('no server set', () => {
+    const m = new Multiplayer();
+    m.connect();
+    expect(m.socket.io.engine.hostname).not.toEqual(hostname);
+    expect(m.socket.io.engine.port).not.toEqual(port);
+  });
 });
 
 test('game server accepts enhanced store', () => {