Do not throw exception when user subscribes to a channel twice (#94)

* Do not throw exception when user subscribes to a channel twice * Run lint * Bump to version 1.2.2 --------- Co-authored-by: Pusher CI <[email protected]>
pusher · May 17, 2023 · 3aac759 · 3aac759
1 parent ef09875
commit 3aac759
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.2.2
+
+* [FIXED] Crash when a user subscribes to a channel twice on Android
+* [FIXED] Wait for unsubscription before deleting the local channel (#88)
+
 ## 1.2.1
 
 * [FIXED] Fixed event name conflicts with other libs using RCTDeviceEventEmitter

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pusher/pusher-websocket-react-native",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Pusher Channels Client for React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

diff --git a/src/index.tsx b/src/index.tsx
@@ -209,7 +209,7 @@ export class Pusher {
         default:
           const pusherEvent = new PusherEvent(event);
           args.onEvent?.(pusherEvent);
-          channel.onEvent?.(pusherEvent);
+          channel?.onEvent?.(pusherEvent);
           break;
       }
     });
@@ -287,10 +287,15 @@ export class Pusher {
     onMemberRemoved?: (member: PusherMember) => void;
     onEvent?: (event: PusherEvent) => void;
   }) {
-    const channel = new PusherChannel(args);
-    this.channels.set(args.channelName, channel);
+    const channel = this.channels.get(args.channelName);
+    if (channel) {
+      return channel;
+    }
+
+    const newChannel = new PusherChannel(args);
     await PusherWebsocketReactNative.subscribe(args.channelName);
-    return channel;
+    this.channels.set(args.channelName, newChannel);
+    return newChannel;
   }
 
   public async unsubscribe({ channelName }: { channelName: string }) {