feat:EventEngine

.github/workflows/run-tests.yml

@@ -29,15 +29,20 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: | 
-            2.1.519
+          dotnet-version: |
             5.0.x
             6.0.x
             7.0.x
       - name: Build packages
         env:
           WORKSPACE_PATH: ${{ github.workspace }}
         run: .\\.github\\workflows\\release\\build-packages.ps1
+      - name: Run unit tests
+        env: 
+          PN_PUB_KEY: ${{ secrets.PN_PUB_KEY }}
+          PN_SUB_KEY: ${{ secrets.PN_SUB_KEY }}
+          PN_SEC_KEY: ${{ secrets.PN_SEC_KEY }}    
+        run: dotnet test .\\src\\UnitTests\\PubnubApiPCL.Tests\\PubnubApiPCL.Tests.csproj --verbosity normal --logger trx 
       - name: Cancel workflow runs for commit on error
         if: failure()
         uses: ./.github/.release/actions/actions/utils/fast-jobs-failure
@@ -74,9 +79,12 @@ jobs:
           dotnet build --no-restore
       - name: Run acceptance tests
         env: 
-          PN_PUB_KEY: ${{ secrets.PN_PUB_KEY }}
-          PN_SUB_KEY: ${{ secrets.PN_SUB_KEY }}
-          PN_SEC_KEY: ${{ secrets.PN_SEC_KEY }}    
+          PN_PAM_PUB_KEY: ${{ secrets.SDK_PAM_PUB_KEY }}
+          PN_PAM_SUB_KEY: ${{ secrets.SDK_PAM_SUB_KEY }}
+          PN_PAM_SEC_KEY: ${{ secrets.SDK_PAM_SEC_KEY }}    
+          PN_PUB_KEY: ${{ secrets.SDK_PUB_KEY }}
+          PN_SUB_KEY: ${{ secrets.SDK_SUB_KEY }}
+          PN_SEC_KEY: ${{ secrets.SDK_SEC_KEY }}   
         run: |
           Copy-Item -Path "${{ github.workspace }}/sdk-specifications/features/access/*" -Destination "${{ github.workspace }}/src/UnitTests/AcceptanceTests/Features" -Recurse
           cd ./UnitTests/AcceptanceTests 

.gitignore

@@ -170,7 +170,10 @@ src/Examples/PubnubApiPCL.XamariniMacExample/obj/*
 *.suo
 src/UnitTests/MockServer/bin/*
 src/UnitTests/MockServer/obj/*
-
+src/PNEventEngine/bin/*
+src/PNEventEngine/obj/*
+src/PNEventEngineUWP/bin/*
+src/PNEventEngineUWP/obj/*
 
 # GitHub Actions #
 ##################

src/Api/PubnubApi/Builder/UrlRequestBuilder.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using PubnubApi.Interface;
 using System.Globalization;
 using System.Threading.Tasks;
 using System.Threading;
@@ -89,6 +88,11 @@ Uri IUrlRequestBuilder.BuildMultiChannelSubscribeRequest(string requestMethod, s
                 requestQueryStringParams.Add("filter-expr", UriUtil.EncodeUriComponent(pubnubConfig[pubnubInstanceId].FilterExpression, currentType, false, false, false));
             }
 
+            if (!requestQueryStringParams.ContainsKey("ee") && pubnubConfig.ContainsKey(pubnubInstanceId) && pubnubConfig[pubnubInstanceId].EnableEventEngine)
+            {
+                requestQueryStringParams.Add("ee", "");
+            }
+
             if (!requestQueryStringParams.ContainsKey("tt"))
             {
                 requestQueryStringParams.Add("tt", timetoken.ToString(CultureInfo.InvariantCulture));

src/Api/PubnubApi/ClientNetworkStatus.cs

@@ -209,7 +209,7 @@ private static async Task<bool> CheckSocketConnect<T>(object internetState)
                 pubnubCallback = state.PubnubCallbacck;
             }
 
-            PubnubApi.Interface.IUrlRequestBuilder urlBuilder = new UrlRequestBuilder(pubnubConfig, jsonLib, unit, pubnubLog, null, null, "");
+            IUrlRequestBuilder urlBuilder = new UrlRequestBuilder(pubnubConfig, jsonLib, unit, pubnubLog, null, null, "");
             Uri requestUri = urlBuilder.BuildTimeRequest("GET", "", null);
             try
             {

src/Api/PubnubApi/EndPoint/Access/AuditOperation.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using PubnubApi.Interface;
 using System.Threading.Tasks;
 using System.Threading;
 using System.Net;

src/Api/PubnubApi/EndPoint/Access/GrantOperation.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using PubnubApi.Interface;
 using System.Threading.Tasks;
 using System.Threading;
 using System.Net;

src/Api/PubnubApi/EndPoint/Access/GrantTokenOperation.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using PubnubApi.Interface;
 using System.Threading.Tasks;
 using System.Threading;
 using System.Net;

src/Api/PubnubApi/EndPoint/Access/RevokeTokenOperation.cs

@@ -1,5 +1,4 @@
-using PubnubApi.Interface;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

src/Api/PubnubApi/EndPoint/ChannelGroup/AddChannelsToChannelGroupOperation.cs

@@ -1,5 +1,4 @@
 using System;
-using PubnubApi.Interface;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;

src/Api/PubnubApi/EndPoint/ChannelGroup/DeleteChannelGroupOperation.cs

@@ -1,5 +1,4 @@
 using System;
-using PubnubApi.Interface;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Threading;

src/Api/PubnubApi/EndPoint/ChannelGroup/ListAllChannelGroupOperation.cs

@@ -1,5 +1,4 @@
 using System;
-using PubnubApi.Interface;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Threading;

src/Api/PubnubApi/EndPoint/ChannelGroup/ListChannelsForChannelGroupOperation.cs

@@ -1,5 +1,4 @@
 using System;
-using PubnubApi.Interface;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Threading;

src/Api/PubnubApi/EndPoint/ChannelGroup/RemoveChannelsFromChannelGroupOperation.cs

@@ -1,5 +1,4 @@
 using System;
-using PubnubApi.Interface;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;

src/Api/PubnubApi/EndPoint/Files/DeleteFileOperation.cs

@@ -1,5 +1,4 @@
-using PubnubApi.Interface;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

src/Api/PubnubApi/EndPoint/Files/DownloadFileOperation.cs

@@ -1,5 +1,4 @@
-using PubnubApi.Interface;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;

src/Api/PubnubApi/EndPoint/Files/GenerateFileUploadUrlOperation.cs

@@ -1,5 +1,4 @@
-using PubnubApi.Interface;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;

src/Api/PubnubApi/EndPoint/Files/GetFileUrlOperation.cs

@@ -1,5 +1,4 @@
-using PubnubApi.Interface;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

src/Api/PubnubApi/EndPoint/Files/ListFilesOperation.cs

@@ -1,5 +1,4 @@
-using PubnubApi.Interface;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

src/Api/PubnubApi/EndPoint/Files/PublishFileMessage.cs

@@ -1,5 +1,4 @@
-using PubnubApi.Interface;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;

src/Api/PubnubApi/EndPoint/Files/SendFileOperation.cs

@@ -1,5 +1,4 @@
-using PubnubApi.Interface;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;

src/Api/PubnubApi/EndPoint/Objects/GetAllChannelMetadataOperation.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using PubnubApi.Interface;
 using System.Threading;
 using System.Net;
 using System.Threading.Tasks;

src/Api/PubnubApi/EndPoint/Objects/GetAllUuidMetadataOperation.cs

@@ -1,5 +1,4 @@
-using PubnubApi.Interface;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;

src/Api/PubnubApi/EndPoint/Objects/GetChannelMembersOperation.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using PubnubApi.Interface;
 using System.Threading;
 using System.Net;
 using System.Threading.Tasks;

src/Api/PubnubApi/EndPoint/Objects/GetChannelMetadataOperation.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using PubnubApi.Interface;
 using System.Threading.Tasks;
 using System.Threading;
 using System.Net;

src/Api/PubnubApi/EndPoint/Objects/GetMembershipsOperation.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using PubnubApi.Interface;
 using System.Threading;
 using System.Net;
 using System.Threading.Tasks;

src/Api/PubnubApi/EndPoint/Objects/GetUuidMetadataOperation.cs

@@ -1,5 +1,4 @@
-using PubnubApi.Interface;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;

src/Api/PubnubApi/EndPoint/Objects/ManageChannelMembersOperation.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using PubnubApi.Interface;
 using System.Threading.Tasks;
 using System.Threading;
 using System.Net;

src/Api/PubnubApi/EndPoint/Objects/ManageMembershipsOperation.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using PubnubApi.Interface;
 using System.Threading.Tasks;
 using System.Threading;
 using System.Net;

src/Api/PubnubApi/EndPoint/Objects/RemoveChannelMembersOperation.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using PubnubApi.Interface;
 using System.Threading.Tasks;
 using System.Threading;
 using System.Net;

src/Api/PubnubApi/EndPoint/Objects/RemoveChannelMetadataOperation.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using PubnubApi.Interface;
 using System.Threading.Tasks;
 using System.Threading;
 using System.Net;

src/Api/PubnubApi/EndPoint/Objects/RemoveMembershipsOperation.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using PubnubApi.Interface;
 using System.Threading.Tasks;
 using System.Threading;
 using System.Net;

src/Api/PubnubApi/EndPoint/Objects/RemoveUuidMetadataOperation.cs

@@ -1,5 +1,4 @@
-using PubnubApi.Interface;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;

src/Api/PubnubApi/EndPoint/Objects/SetChannelMembersOperation.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using PubnubApi.Interface;
 using System.Threading.Tasks;
 using System.Threading;
 using System.Net;

src/Api/PubnubApi/EndPoint/Objects/SetChannelMetadataOperation.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using PubnubApi.Interface;
 using System.Threading.Tasks;
 using System.Threading;
 using System.Net;

src/Api/PubnubApi/EndPoint/Objects/SetMembershipsOperation.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using PubnubApi.Interface;
 using System.Threading.Tasks;
 using System.Threading;
 using System.Net;

src/Api/PubnubApi/EndPoint/Objects/SetUuidMetadataOperation.cs

@@ -1,5 +1,4 @@
-using PubnubApi.Interface;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;

src/Api/PubnubApi/EndPoint/OtherOperation.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using PubnubApi.Interface;
 using System.Threading.Tasks;
 using System.Threading;
 using System.Net;

src/Api/PubnubApi/EndPoint/Presence/GetStateOperation.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using PubnubApi.Interface;
 using System.Threading.Tasks;
 using System.Threading;
 using System.Net;

src/Api/PubnubApi/EndPoint/Presence/HeartbeatOperation.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace PubnubApi.EndPoint
+{
+	public class HeartbeatOperation : PubnubCoreBase
+	{
+		private readonly PNConfiguration config;
+		private readonly IJsonPluggableLibrary jsonLibrary;
+		private readonly IPubnubUnitTest unit;
+		private readonly IPubnubLog pubnubLog;
+		private readonly TelemetryManager pubnubTelemetryMgr;
+
+		public HeartbeatOperation(PNConfiguration pubnubConfig, IJsonPluggableLibrary jsonPluggableLibrary, IPubnubUnitTest pubnubUnit, IPubnubLog log, TelemetryManager telemetryManager, EndPoint.TokenManager tokenManager, Pubnub instance) : base(pubnubConfig, jsonPluggableLibrary, pubnubUnit, log, telemetryManager, tokenManager, instance)
+		{
+			config = pubnubConfig;
+			jsonLibrary = jsonPluggableLibrary;
+			unit = pubnubUnit;
+			pubnubLog = log;
+			pubnubTelemetryMgr = telemetryManager;
+
+			PubnubInstance = instance;
+		}
+
+		internal async Task<PNStatus> HeartbeatRequest<T>(string[] channels, string[] channelGroups)
+		{
+			PNStatus resp = null;
+			try {
+				string presenceState = string.Empty;
+
+				if (config.MaintainPresenceState) presenceState = BuildJsonUserState(channels, channelGroups, true);
+
+				IUrlRequestBuilder urlBuilder = new UrlRequestBuilder(config, jsonLibrary, unit, pubnubLog, pubnubTelemetryMgr, null, "");
+				Uri request = urlBuilder.BuildPresenceHeartbeatRequest("GET", "", channels, channelGroups, presenceState);
+				RequestState<T> pubnubRequestState = new RequestState<T>();
+				pubnubRequestState.Channels = channels;
+				pubnubRequestState.ChannelGroups = channelGroups;
+				pubnubRequestState.ResponseType = PNOperationType.PNHeartbeatOperation;
+				pubnubRequestState.TimeQueued = DateTime.Now;
+
+				await UrlProcessRequest<T>(request, pubnubRequestState, false).ContinueWith(r => {
+					resp = r.Result.Item2;
+				}, TaskContinuationOptions.ExecuteSynchronously).ConfigureAwait(false);
+			} catch (Exception ex) {
+				LoggingMethod.WriteToLog(pubnubLog, string.Format(CultureInfo.InvariantCulture, "DateTime {0} HeartbeatOperation=> HeartbeatRequest \n channel(s)={1} \n cg(s)={2} \n Exception Details={3}", DateTime.Now.ToString(CultureInfo.InvariantCulture), string.Join(",", channels.OrderBy(x => x).ToArray()), string.Join(",", channelGroups.OrderBy(x => x).ToArray()), ex), config.LogVerbosity);
+				return new PNStatus(ex, PNOperationType.PNHeartbeatOperation, PNStatusCategory.PNUnknownCategory, channels, channelGroups);
+			}
+			return resp;
+		}
+
+	}
+}