fix(transport-commons): Do not error when adding an undefined connection to a channel (#2268)

daffl · web-flow · commit 28114c495d65 · 2021-03-26T16:33:10.000-07:00
diff --git a/packages/transport-commons/src/channels/channel/base.ts b/packages/transport-commons/src/channels/channel/base.ts
@@ -43,7 +43,7 @@ export class Channel extends EventEmitter {
 
   join (...connections: RealTimeConnection[]) {
     connections.forEach(connection => {
-      if (this.connections.indexOf(connection) === -1) {
+      if (connection && this.connections.indexOf(connection) === -1) {
         this.connections.push(connection);
       }
     });
diff --git a/packages/transport-commons/src/channels/channel/combined.ts b/packages/transport-commons/src/channels/channel/combined.ts
@@ -48,8 +48,7 @@ export class CombinedChannel extends Channel {
   }
 
   private callChildren (method: string, connections: RealTimeConnection[]) {
-    // @ts-ignore
-    this.children.forEach(child => child[method](...connections));
+    this.children.forEach((child: any) => child[method](...connections));
     this.refresh();
 
     return this;
diff --git a/packages/transport-commons/test/channels/channel.test.ts b/packages/transport-commons/test/channels/channel.test.ts
@@ -181,6 +181,12 @@ describe('app.channel', () => {
       assert.strictEqual(combined.length, 2);
     });
 
+    it('does nothing when the channel is undefined (#2207)', () => {
+      const channel = app.channel('test', 'me');
+      
+      channel.join(undefined);
+    });
+
     it('.join all child channels', () => {
       const c1 = { id: 1 };
       const c2 = { id: 2 };

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ export class Channel extends EventEmitter {`
`43`	`43`
`44`	`44`	`join (...connections: RealTimeConnection[]) {`
`45`	`45`	`connections.forEach(connection => {`
`46`		`- if (this.connections.indexOf(connection) === -1) {`
	`46`	`+ if (connection && this.connections.indexOf(connection) === -1) {`
`47`	`47`	`this.connections.push(connection);`
`48`	`48`	`}`
`49`	`49`	`});`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,7 @@ export class CombinedChannel extends Channel {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`private callChildren (method: string, connections: RealTimeConnection[]) {`
`51`		`- // @ts-ignore`
`52`		`- this.children.forEach(child => child[method](...connections));`
	`51`	`+ this.children.forEach((child: any) => child[method](...connections));`
`53`	`52`	`this.refresh();`
`54`	`53`
`55`	`54`	`return this;`