don't invoke callback on subscribe in multiplayer mode unless client is already connected

Author: nicolodavis

src/client/client.js

@@ -104,6 +104,7 @@ class _ClientImpl {
     this.debug = debug;
     this.gameStateOverride = null;
     this.subscribers = {};
+    this._running = false;
 
     this.reducer = CreateGameReducer({
       game: this.game,
@@ -320,6 +321,8 @@ class _ClientImpl {
 
   start() {
     this.transport.connect();
+    this.notifySubscribers();
+    this._running = true;
 
     if (
       process.env.NODE_ENV !== 'production' &&
@@ -341,6 +344,7 @@ class _ClientImpl {
 
   stop() {
     this.transport.disconnect();
+    this._running = false;
 
     if (this._debugPanel != null) {
       this._debugPanel.$destroy();
@@ -352,7 +356,10 @@ class _ClientImpl {
     const id = Object.keys(this.subscribers).length;
     this.subscribers[id] = fn;
     this.transport.subscribe(() => this.notifySubscribers());
-    fn(this.getState());
+
+    if (this._running || !this.multiplayer) {
+      fn(this.getState());
+    }
 
     // Return a handle that allows the caller to unsubscribe.
     return () => {

src/client/client.test.js

@@ -660,6 +660,31 @@ describe('subscribe', () => {
     client.transport.callback();
     expect(fn).toHaveBeenCalled();
   });
+
+  describe('multiplayer', () => {
+    test('subscribe before start', () => {
+      const fn = jest.fn();
+      const client = Client({
+        game: {},
+        multiplayer: { local: true },
+      });
+      client.subscribe(fn);
+      expect(fn).not.toBeCalled();
+      client.start();
+      expect(fn).toBeCalled();
+    });
+
+    test('subscribe after start', () => {
+      const fn = jest.fn();
+      const client = Client({
+        game: {},
+        multiplayer: { local: true },
+      });
+      client.start();
+      client.subscribe(fn);
+      expect(fn).toBeCalled();
+    });
+  });
 });
 
 test('override game state', () => {