fix: allow IEventSubSocket#register with null transport

twitch4j · Jul 19, 2023 · 7b90791 · 7b90791
1 parent 4162c8d
commit 7b90791
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/eventsub-websocket/src/main/java/com/github/twitch4j/eventsub/socket/TwitchEventSocket.java b/eventsub-websocket/src/main/java/com/github/twitch4j/eventsub/socket/TwitchEventSocket.java
@@ -370,12 +370,13 @@ private EventSubSubscription unsubscribeNoHelix(@NotNull EventSubSubscription re
         return subscriptions.remove(SubscriptionWrapper.wrap(remove));
     }
 
+    @Synchronized
     private void onInitialConnection(final String websocketId) {
         final Collection<EventSubSubscription> oldSubs = new ArrayDeque<>(subscriptions.size());
         subscriptions.keySet().removeIf(oldSubs::add);
 
         for (final EventSubSubscription old : oldSubs) {
-            if (StringUtils.equals(old.getTransport().getSessionId(), websocketId)) {
+            if (old.getTransport() != null && StringUtils.equals(old.getTransport().getSessionId(), websocketId)) {
                 // this branch shouldn't be hit, but is a performance optimization to avoid helix
                 subscriptions.putIfAbsent(SubscriptionWrapper.wrap(old), old);
             } else {
@@ -653,11 +654,11 @@ static String getAuthToken(OAuth2Credential token) {
     }
 
     private static EventSubSubscription augmentSub(EventSubSubscription old, String newWebSocketId) {
-        assert old.getTransport() != null;
+        EventSubTransport transport = old.getTransport() != null ? old.getTransport() : EventSubTransport.builder().method(EventSubTransportMethod.WEBSOCKET).build();
         return EventSubSubscription.builder()
             .type(old.getType())
             .condition(old.getCondition())
-            .transport(old.getTransport().withSessionId(newWebSocketId))
+            .transport(transport.withSessionId(newWebSocketId))
             .isBatchingEnabled(old.isBatchingEnabled())
             .rawType(old.getRawType())
             .rawVersion(old.getRawVersion())