fix: HttpRequest Cancellation through CancellationTokenSource

pubnub · Feb 24, 2025 · c93c03f · c93c03f
1 parent 838738a
commit c93c03f
Show file tree

Hide file tree

Showing 6 changed files with 313 additions and 230 deletions.
diff --git a/src/Api/PubnubApi/EndPoint/Files/SendFileOperation.cs b/src/Api/PubnubApi/EndPoint/Files/SendFileOperation.cs
@@ -258,7 +258,7 @@ private async Task<PNResult<PNFileUploadResult>> ProcessFileUpload()
 				RequestType = Constants.POST,
 				RequestUrl = generateFileUploadUrlResult.FileUploadRequest.Url,
 				BodyContentBytes = postData,
-				CancellationToken = cts.Token
+				CancellationTokenSource = cts
 			};
 			transportRequest.Headers.Add("Content-Type", contentType);
 			Tuple<string, PNStatus> jsonAndStatusTuple;

diff --git a/src/Api/PubnubApi/EndPoint/PubSub/SubscribeManager.cs b/src/Api/PubnubApi/EndPoint/PubSub/SubscribeManager.cs
@@ -290,7 +290,8 @@ private void MultiChannelSubscribeRequest<T>(PNOperationType type, string[] chan
 				};
 				var subscribeRequestParameter = CreateSubscribeRequestParameter(channels: channels, channelGroups: channelGroups,timetoken: (Convert.ToInt64(timetoken.ToString(), CultureInfo.InvariantCulture) == 0) ? Convert.ToInt64(timetoken.ToString(), CultureInfo.InvariantCulture) : lastTimetoken,region: region,stateJsonValue: channelsJsonState, initialSubscribeUrlParams: initialSubscribeUrlParams, externalQueryParam: externalQueryParam);
 				var transportRequest = PubnubInstance.transportMiddleware.PreapareTransportRequest(requestParameter: subscribeRequestParameter, operationType: PNOperationType.PNSubscribeOperation);
-				OngoingSubscriptionCancellationTokenSources[PubnubInstance.InstanceId] = CancellationTokenSource.CreateLinkedTokenSource(transportRequest.CancellationToken);
+				OngoingSubscriptionCancellationTokenSources[PubnubInstance.InstanceId] =
+					transportRequest.CancellationTokenSource;
 				PubnubInstance.transportMiddleware.Send(transportRequest: transportRequest).ContinueWith( t => {
 					var transportResponse = t.Result;
 					if (transportResponse.Error == null) {

diff --git a/src/Api/PubnubApi/EndPoint/PubSub/SubscribeManager2.cs b/src/Api/PubnubApi/EndPoint/PubSub/SubscribeManager2.cs
@@ -33,7 +33,7 @@ public async Task<Tuple<HandshakeResponse, PNStatus>> HandshakeRequest(PNOperati
 			if (config.MaintainPresenceState) presenceState = BuildJsonUserState(channels, channelGroups, true);
 			var requestParameter = CreateSubscribeRequestParameter(channels: channels, channelGroups: channelGroups, timetoken: timetoken.GetValueOrDefault(), region: region.GetValueOrDefault(), stateJsonValue: presenceState, initialSubscribeUrlParams: initialSubscribeUrlParams, externalQueryParam: externalQueryParam);
 			var transportRequest = pubnubInstance.transportMiddleware.PreapareTransportRequest(requestParameter: requestParameter, operationType: PNOperationType.PNSubscribeOperation);
-			cancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(transportRequest.CancellationToken);
+			cancellationTokenSource = transportRequest.CancellationTokenSource;
 			RequestState<HandshakeResponse> pubnubRequestState = new RequestState<HandshakeResponse>
 			{
 				Channels = channels,
@@ -85,7 +85,7 @@ internal async Task<Tuple<ReceivingResponse<object>, PNStatus>> ReceiveRequest<T
 				string channelsJsonState = BuildJsonUserState(channels, channelGroups, false);
 				var requestParameter = CreateSubscribeRequestParameter(channels: channels, channelGroups: channelGroups, timetoken: timetoken.GetValueOrDefault(), region: region.GetValueOrDefault(), stateJsonValue: channelsJsonState, initialSubscribeUrlParams: initialSubscribeUrlParams, externalQueryParam: externalQueryParam);
 				var transportRequest = pubnubInstance.transportMiddleware.PreapareTransportRequest(requestParameter: requestParameter, operationType: PNOperationType.PNSubscribeOperation);
-				cancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(transportRequest.CancellationToken);
+				cancellationTokenSource = transportRequest.CancellationTokenSource;
 				RequestState<ReceivingResponse<object>> pubnubRequestState = new RequestState<ReceivingResponse<object>>
 					{
 						Channels = channels,