Using IServiceScopeFactory instead of IServiceProvider to create ServiceScope; Set default value to false for perporty ReentryProtection

Author: aden.chen

src/Infrastructure/BotSharp.Abstraction/Crontab/Models/CrontabItem.cs

@@ -33,7 +33,7 @@ public class CrontabItem : ScheduleTaskArgs
     public CronTabItemTriggerType TriggerType { get; set; } = CronTabItemTriggerType.BackgroundWatcher;
 
     [JsonPropertyName("reentry_protection")]
-    public bool ReentryProtection { get; set; } = true;
+    public bool ReentryProtection { get; set; }
 
     public override string ToString()
     {

src/Infrastructure/BotSharp.Core.Crontab/Services/CrontabService.cs

@@ -34,11 +34,13 @@ namespace BotSharp.Core.Crontab.Services;
 public class CrontabService : ICrontabService, ITaskFeeder
 {
     private readonly IServiceProvider _services;
+    private readonly IServiceScopeFactory _scopeFactory;
     private ILogger _logger;
 
-    public CrontabService(IServiceProvider services, ILogger<CrontabService> logger)
+    public CrontabService(IServiceProvider services, IServiceScopeFactory scopeFactory, ILogger<CrontabService> logger)
     {
         _services = services;
+        _scopeFactory = scopeFactory;
         _logger = logger;
     }
 
@@ -166,7 +168,7 @@ public async Task ExecuteTimeArrivedItemWithReentryProtection(CrontabItem item)
         }
 
         var lockKey = $"crontab:execution:{item.Title}";
-        using var scope = _services.CreateScope();
+        using var scope = _scopeFactory.CreateScope();
         var locker = scope.ServiceProvider.GetRequiredService<IDistributedLocker>();
         var acquired = false;
         var lockAcquired = false;

src/Infrastructure/BotSharp.OpenAPI/Controllers/Crontab/CrontabController.cs

@@ -10,13 +10,16 @@ namespace BotSharp.OpenAPI.Controllers;
 public class CrontabController : ControllerBase
 {
     private readonly IServiceProvider _services;
+    private readonly IServiceScopeFactory _scopeFactory;
     private readonly ILogger<CrontabController> _logger;
 
     public CrontabController(
         IServiceProvider services,
+        IServiceScopeFactory scopeFactory,
         ILogger<CrontabController> logger)
     {
         _services = services;
+        _scopeFactory = scopeFactory;
         _logger = logger;
     }
 
@@ -61,7 +64,7 @@ public async Task<CrontabSchedulingResult> SchedulingCrontab()
             if (item.CheckNextOccurrenceEveryOneMinute())
             {
                 _logger.LogInformation($"Crontab: {item.Title}, One occurrence was matched, attempting to execute...");
-                Task.Run(() => ExecuteTimeArrivedItem(item, _services));
+                Task.Run(() => ExecuteTimeArrivedItem(item));
                 result.OccurrenceMatchedItems.Add(item.Title);
             }
         }
@@ -84,9 +87,9 @@ private async Task<List<CrontabItem>> GetCrontabItems(string? title = null)
         return allowedCrons.Where(cron => cron.Title.IsEqualTo(title)).ToList();
     }
 
-    private async Task ExecuteTimeArrivedItem(CrontabItem item, IServiceProvider services)
+    private async Task ExecuteTimeArrivedItem(CrontabItem item)
     {
-        using var scope = services.CreateScope();
+        using var scope = _scopeFactory.CreateScope();
         var crontabService = scope.ServiceProvider.GetRequiredService<ICrontabService>();
         await crontabService.ExecuteTimeArrivedItemWithReentryProtection(item);
     }

src/Plugins/BotSharp.Plugin.MongoStorage/Collections/CrontabItemDocument.cs

@@ -19,7 +19,7 @@ public class CrontabItemDocument : MongoBase
     public IEnumerable<CronTaskMongoElement> Tasks { get; set; } = [];
     public DateTime CreatedTime { get; set; } = DateTime.UtcNow;
     public int TriggerType { get; set; }
-    public bool ReentryProtection { get; set; } = true;
+    public bool ReentryProtection { get; set; }
 
     public static CrontabItem ToDomainModel(CrontabItemDocument item)
     {