Add IPushSubscriptionStoreAccessor (#9)

Author: tpeczek

Demo.AspNetCore.PushNotifications.Services.Abstractions/IPushSubscriptionStoreAccessor.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace Demo.AspNetCore.PushNotifications.Services.Abstractions
+{
+    public interface IPushSubscriptionStoreAccessor : IDisposable
+    {
+        IPushSubscriptionStore PushSubscriptionStore { get; }
+    }
+}

Demo.AspNetCore.PushNotifications.Services.Abstractions/IPushSubscriptionStoreAccessorProvider.cs

@@ -0,0 +1,7 @@
+namespace Demo.AspNetCore.PushNotifications.Services.Abstractions
+{
+    public interface IPushSubscriptionStoreAccessorProvider
+    {
+        IPushSubscriptionStoreAccessor GetPushSubscriptionStoreAccessor();
+    }
+}

Demo.AspNetCore.PushNotifications.Services.Sqlite/Demo.AspNetCore.PushNotifications.Services.Sqlite.csproj

@@ -4,6 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Lib.Net.Http.WebPush" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.0" />
   </ItemGroup>

Demo.AspNetCore.PushNotifications.Services.Sqlite/SqlitePushSubscriptionStoreAccessor.cs

@@ -0,0 +1,34 @@
+using Microsoft.Extensions.DependencyInjection;
+using Demo.AspNetCore.PushNotifications.Services.Abstractions;
+
+namespace Demo.AspNetCore.PushNotifications.Services.Sqlite
+{
+    internal class SqlitePushSubscriptionStoreAccessor : IPushSubscriptionStoreAccessor
+    {
+        private IServiceScope _serviceScope;
+
+        public IPushSubscriptionStore PushSubscriptionStore { get; private set; }
+
+        public SqlitePushSubscriptionStoreAccessor(IPushSubscriptionStore pushSubscriptionStore)
+        {
+            PushSubscriptionStore = pushSubscriptionStore;
+        }
+
+        public SqlitePushSubscriptionStoreAccessor(IServiceScope serviceScope)
+        {
+            _serviceScope = serviceScope;
+            PushSubscriptionStore = _serviceScope.ServiceProvider.GetService<IPushSubscriptionStore>();
+        }
+
+        public void Dispose()
+        {
+            PushSubscriptionStore = null;
+
+            if (!(_serviceScope is null))
+            {
+                _serviceScope.Dispose();
+                _serviceScope = null;
+            }
+        }
+    }
+}

Demo.AspNetCore.PushNotifications.Services.Sqlite/SqlitePushSubscriptionStoreAccessorProvider.cs

@@ -0,0 +1,31 @@
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+using Demo.AspNetCore.PushNotifications.Services.Abstractions;
+
+namespace Demo.AspNetCore.PushNotifications.Services.Sqlite
+{
+    internal class SqlitePushSubscriptionStoreAccessorProvider : IPushSubscriptionStoreAccessorProvider
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IServiceProvider _serviceProvider;
+
+        public SqlitePushSubscriptionStoreAccessorProvider(IHttpContextAccessor httpContextAccessor, IServiceProvider serviceProvider)
+        {
+            _httpContextAccessor = httpContextAccessor;
+            _serviceProvider = serviceProvider;
+        }
+
+        public IPushSubscriptionStoreAccessor GetPushSubscriptionStoreAccessor()
+        {
+            if (_httpContextAccessor.HttpContext is null)
+            {
+                return new SqlitePushSubscriptionStoreAccessor(_serviceProvider.CreateScope());
+            }
+            else
+            {
+                return new SqlitePushSubscriptionStoreAccessor(_httpContextAccessor.HttpContext.RequestServices.GetRequiredService<IPushSubscriptionStore>());
+            }
+        }
+    }
+}

Demo.AspNetCore.PushNotifications.Services.Sqlite/SqliteServiceCollectionExtensions.cs

@@ -16,6 +16,8 @@ public static IServiceCollection AddSqlitePushSubscriptionStore(this IServiceCol
             );
 
             services.AddTransient<IPushSubscriptionStore, SqlitePushSubscriptionStore>();
+            services.AddHttpContextAccessor();
+            services.AddSingleton<IPushSubscriptionStoreAccessorProvider, SqlitePushSubscriptionStoreAccessorProvider>();
 
             return services;
         }

Demo.AspNetCore.PushNotifications.Services/PushNotificationsDequeuer.cs

@@ -1,25 +1,23 @@
-using System;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.DependencyInjection;
 using Lib.Net.Http.WebPush;
 using Demo.AspNetCore.PushNotifications.Services.Abstractions;
 
 namespace Demo.AspNetCore.PushNotifications.Services
 {
     internal class PushNotificationsDequeuer : IHostedService
     {
-        private readonly IServiceProvider _serviceProvider;
+        private readonly IPushSubscriptionStoreAccessorProvider _subscriptionStoreAccessorProvider;
         private readonly IPushNotificationsQueue _messagesQueue;
         private readonly IPushNotificationService _notificationService;
         private readonly CancellationTokenSource _stopTokenSource = new CancellationTokenSource();
 
         private Task _dequeueMessagesTask;
 
-        public PushNotificationsDequeuer(IServiceProvider serviceProvider, IPushNotificationsQueue messagesQueue, IPushNotificationService notificationService)
+        public PushNotificationsDequeuer(IPushNotificationsQueue messagesQueue, IPushSubscriptionStoreAccessorProvider subscriptionStoreAccessorProvider, IPushNotificationService notificationService)
         {
-            _serviceProvider = serviceProvider;
+            _subscriptionStoreAccessorProvider = subscriptionStoreAccessorProvider;
             _messagesQueue = messagesQueue;
             _notificationService = notificationService;
         }
@@ -46,11 +44,9 @@ private async Task DequeueMessagesAsync()
 
                 if (!_stopTokenSource.IsCancellationRequested)
                 {
-                    using (IServiceScope serviceScope = _serviceProvider.CreateScope())
+                    using (IPushSubscriptionStoreAccessor subscriptionStoreAccessor = _subscriptionStoreAccessorProvider.GetPushSubscriptionStoreAccessor())
                     {
-                        IPushSubscriptionStore subscriptionStore = serviceScope.ServiceProvider.GetRequiredService<IPushSubscriptionStore>();
-
-                        await subscriptionStore.ForEachSubscriptionAsync((PushSubscription subscription) =>
+                        await subscriptionStoreAccessor.PushSubscriptionStore.ForEachSubscriptionAsync((PushSubscription subscription) =>
                         {
                             // Fire-and-forget 
                             _notificationService.SendNotificationAsync(subscription, message, _stopTokenSource.Token);

Demo.AspNetCore.PushNotifications/appsettings.json

@@ -5,7 +5,7 @@
   "PushNotificationServiceType": "PushService",
   "PushNotificationService": {
     "Subject": "https://localhost:65506/",
-    "PublicKey": "<Application Server Public Key>",
-    "PrivateKey": "<Application Server Private Key>"
+    "PublicKey": "BK5sn4jfa0Jqo9MhV01oyzK2FaEHm0KqkSCuUkKr53-9cr-vBE1a9TiiBaWy7hy0eOUF1jhZnwcd3vof4wnwSw0",
+    "PrivateKey": "AJ2ho7or-6D4StPktpTO3l1ErjHGyxb0jzt9Y8lj67g"
   }
 }