refactor(code-style): fix codacy warnings

pubnub · Sep 29, 2024 · 137d056 · 137d056
1 parent 240b1a1
commit 137d056
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 29 deletions.
diff --git a/dist/web/pubnub.js b/dist/web/pubnub.js
@@ -5871,7 +5871,8 @@
 	            const events = serviceResponse.m
 	                .filter((envelope) => {
 	                const subscribable = envelope.b === undefined ? envelope.c : envelope.b;
-	                return (this.parameters.channels.includes(subscribable) || this.parameters.channelGroups.includes(subscribable));
+	                return ((this.parameters.channels && this.parameters.channels.includes(subscribable)) ||
+	                    (this.parameters.channelGroups && this.parameters.channelGroups.includes(subscribable)));
 	            })
 	                .map((envelope) => {
 	                let { e: eventType } = envelope;

diff --git a/dist/web/pubnub.min.js b/dist/web/pubnub.min.js
diff --git a/dist/web/pubnub.worker.js b/dist/web/pubnub.worker.js
@@ -204,15 +204,17 @@
                 else if (data.type === 'send-request') {
                     if (data.request.path.startsWith('/v2/subscribe')) {
                         updateClientStateIfRequired(data);
-                        const { subscriptionKey, userId } = pubNubClients[data.clientIdentifier];
-                        const timerIdentifier = `${userId}-${subscriptionKey}`;
-                        // Check whether we need to start new aggregation timer or not.
-                        if (!aggregationTimers.has(timerIdentifier)) {
-                            const aggregationTimer = setTimeout(() => {
-                                handleSendSubscribeRequestEvent(data);
-                                aggregationTimers.delete(timerIdentifier);
-                            }, subscribeAggregationTimeout);
-                            aggregationTimers.set(timerIdentifier, aggregationTimer);
+                        const client = pubNubClients[data.clientIdentifier];
+                        if (client) {
+                            const timerIdentifier = `${client.userId}-${client.subscriptionKey}`;
+                            // Check whether we need to start new aggregation timer or not.
+                            if (!aggregationTimers.has(timerIdentifier)) {
+                                const aggregationTimer = setTimeout(() => {
+                                    handleSendSubscribeRequestEvent(data);
+                                    aggregationTimers.delete(timerIdentifier);
+                                }, subscribeAggregationTimeout);
+                                aggregationTimers.set(timerIdentifier, aggregationTimer);
+                            }
                         }
                     }
                     else
@@ -668,7 +670,9 @@
             };
         }
         if (serviceRequests[serviceRequestId]) {
-            if (request.queryParameters.tt !== undefined) {
+            if (request.queryParameters &&
+                request.queryParameters.tt !== undefined &&
+                request.queryParameters.tr !== undefined) {
                 serviceRequests[serviceRequestId].region = request.queryParameters.tr;
             }
             serviceRequests[serviceRequestId].timetokenOverride = previousSubscribeTimetoken;

diff --git a/dist/web/pubnub.worker.min.js b/dist/web/pubnub.worker.min.js
diff --git a/lib/core/endpoints/subscribe.js b/lib/core/endpoints/subscribe.js
@@ -115,7 +115,8 @@ class BaseSubscribeRequest extends request_1.AbstractRequest {
             const events = serviceResponse.m
                 .filter((envelope) => {
                 const subscribable = envelope.b === undefined ? envelope.c : envelope.b;
-                return (this.parameters.channels.includes(subscribable) || this.parameters.channelGroups.includes(subscribable));
+                return ((this.parameters.channels && this.parameters.channels.includes(subscribable)) ||
+                    (this.parameters.channelGroups && this.parameters.channelGroups.includes(subscribable)));
             })
                 .map((envelope) => {
                 let { e: eventType } = envelope;

diff --git a/src/core/endpoints/subscribe.ts b/src/core/endpoints/subscribe.ts
@@ -633,7 +633,8 @@ export class BaseSubscribeRequest extends AbstractRequest<Subscription.Subscript
       .filter((envelope) => {
         const subscribable = envelope.b === undefined ? envelope.c : envelope.b;
         return (
-          this.parameters.channels!.includes(subscribable) || this.parameters.channelGroups!.includes(subscribable)
+          (this.parameters.channels && this.parameters.channels.includes(subscribable)) ||
+          (this.parameters.channelGroups && this.parameters.channelGroups.includes(subscribable))
         );
       })
       .map((envelope) => {

diff --git a/src/transport/subscription-worker/subscription-worker.ts b/src/transport/subscription-worker/subscription-worker.ts
@@ -628,17 +628,19 @@ self.onconnect = (event) => {
         if (data.request.path.startsWith('/v2/subscribe')) {
           updateClientStateIfRequired(data);
 
-          const { subscriptionKey, userId } = pubNubClients[data.clientIdentifier]!;
-          const timerIdentifier = `${userId}-${subscriptionKey}`;
-
-          // Check whether we need to start new aggregation timer or not.
-          if (!aggregationTimers.has(timerIdentifier)) {
-            const aggregationTimer = setTimeout(() => {
-              handleSendSubscribeRequestEvent(data);
-              aggregationTimers.delete(timerIdentifier);
-            }, subscribeAggregationTimeout);
-
-            aggregationTimers.set(timerIdentifier, aggregationTimer);
+          const client = pubNubClients[data.clientIdentifier];
+          if (client) {
+            const timerIdentifier = `${client.userId}-${client.subscriptionKey}`;
+
+            // Check whether we need to start new aggregation timer or not.
+            if (!aggregationTimers.has(timerIdentifier)) {
+              const aggregationTimer = setTimeout(() => {
+                handleSendSubscribeRequestEvent(data);
+                aggregationTimers.delete(timerIdentifier);
+              }, subscribeAggregationTimeout);
+
+              aggregationTimers.set(timerIdentifier, aggregationTimer);
+            }
           }
         } else handleSendLeaveRequestEvent(data);
       } else if (data.type === 'cancel-request') handleCancelRequestEvent(data);
@@ -1123,7 +1125,7 @@ const subscribeTransportRequestFromEvent = (event: SendRequestEvent): TransportR
     }
 
     for (const _client of clients) {
-      const { subscription: _subscription } = _client!;
+      const { subscription: _subscription } = _client;
       // Skip clients which doesn't have active subscription request.
       if (!_subscription) continue;
 
@@ -1186,8 +1188,12 @@ const subscribeTransportRequestFromEvent = (event: SendRequestEvent): TransportR
   }
 
   if (serviceRequests[serviceRequestId]) {
-    if (request.queryParameters!.tt !== undefined) {
-      serviceRequests[serviceRequestId].region = request.queryParameters!.tr as string;
+    if (
+      request.queryParameters &&
+      request.queryParameters.tt !== undefined &&
+      request.queryParameters.tr !== undefined
+    ) {
+      serviceRequests[serviceRequestId].region = request.queryParameters.tr as string;
     }
     serviceRequests[serviceRequestId].timetokenOverride = previousSubscribeTimetoken;
     serviceRequests[serviceRequestId].regionOverride = previousSubscribeRegion;