Merge pull request #834 from hchen2020/master

ICrontabSource

Author: iceljc

src/Infrastructure/BotSharp.Abstraction/Agents/IAgentRuleHook.cs

@@ -5,8 +5,9 @@ public class ConversationChannel
     public const string WebChat = "webchat";
     public const string OpenAPI = "openapi";
     public const string Phone = "phone";
+    public const string SMS = "sms";
     public const string Messenger = "messenger";
     public const string Email = "email";
-    public const string Cron = "cron";
+    public const string Crontab = "crontab";
     public const string Database = "database";
 }

src/Infrastructure/BotSharp.Abstraction/Conversations/Enums/ConversationChannel.cs

@@ -23,6 +23,9 @@ public class CrontabItem : ScheduleTaskArgs
     [JsonPropertyName("expire_seconds")]
     public int ExpireSeconds { get; set; } = 60;
 
+    [JsonPropertyName("last_execution_time")]
+    public DateTime? LastExecutionTime { get; set; }
+
     [JsonPropertyName("created_time")]
     public DateTime CreatedTime { get; set; } = DateTime.UtcNow;
 

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

@@ -2,5 +2,12 @@ namespace BotSharp.Core.Crontab.Abstraction;
 
 public interface ICrontabHook
 {
-    Task OnCronTriggered(CrontabItem item);
+    Task OnCronTriggered(CrontabItem item)
+        => Task.CompletedTask;
+
+    Task OnTaskExecuting(CrontabItem item)
+        => Task.CompletedTask;
+
+    Task OnTaskExecuted(CrontabItem item)
+        => Task.CompletedTask;
 }

src/Infrastructure/BotSharp.Core.Crontab/Abstraction/ICrontabHook.cs

@@ -0,0 +1,9 @@
+namespace BotSharp.Core.Crontab.Abstraction;
+
+/// <summary>
+/// Provide a cron source for the crontab service.
+/// </summary>
+public interface ICrontabSource
+{
+    CrontabItem GetCrontabItem();
+}

src/Infrastructure/BotSharp.Core.Crontab/Abstraction/ICrontabSource.cs

@@ -39,16 +39,28 @@ public async Task<List<CrontabItem>> GetCrontable()
     {
         var repo = _services.GetRequiredService<IBotSharpRepository>();
         var crontable = repo.GetCrontabItems(CrontabItemFilter.Empty());
-        return crontable.Items.ToList();
+
+        // Add fixed crontab items from cronsources
+        var fixedCrantabItems = crontable.Items.ToList();
+        var cronsources = _services.GetServices<ICrontabSource>();
+        foreach (var source in cronsources)
+        {
+            var item = source.GetCrontabItem();
+            fixedCrantabItems.Add(source.GetCrontabItem());
+        }
+
+        return fixedCrantabItems;
     }
 
     public async Task ScheduledTimeArrived(CrontabItem item)
     {
         _logger.LogDebug($"ScheduledTimeArrived {item}");
 
         await HookEmitter.Emit<ICrontabHook>(_services, async hook =>
-            await hook.OnCronTriggered(item)
-        );
-        await Task.Delay(1000 * 10);
+        {
+            await hook.OnTaskExecuting(item);
+            await hook.OnCronTriggered(item);
+            await hook.OnTaskExecuted(item);
+        });
     }
 }

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

@@ -24,17 +24,17 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         {
             var locker = scope.ServiceProvider.GetRequiredService<IDistributedLocker>();
 
-            /*while (!stoppingToken.IsCancellationRequested)
+            while (!stoppingToken.IsCancellationRequested)
             {
-                var delay = Task.Delay(1000, stoppingToken);
+                var delay = Task.Delay(1000 * 10, stoppingToken);
 
                 await locker.LockAsync("CrontabWatcher", async () =>
                 {
                     await RunCronChecker(scope.ServiceProvider);
                 });
 
                 await delay;
-            }*/
+            }
 
             _logger.LogWarning("Crontab Watcher background service is stopped.");
         }
@@ -58,10 +58,24 @@ private async Task RunCronChecker(IServiceProvider services)
                 // Get the current time
                 var currentTime = DateTime.UtcNow;
 
+                // Get the last occurrence from the schedule
+                var lastOccurrence = GetLastOccurrence(schedule);
+
                 // Get the next occurrence from the schedule
                 var nextOccurrence = schedule.GetNextOccurrence(currentTime.AddSeconds(-1));
 
-                // Check if the current time matches the schedule
+                // Get the previous occurrence from the execution log
+                var previousOccurrence = item.LastExecutionTime;
+
+                // First check if this occurrence was already triggered
+                if (previousOccurrence.HasValue && 
+                    previousOccurrence.Value >= lastOccurrence && 
+                    previousOccurrence.Value < nextOccurrence.AddSeconds(1))
+                {
+                    continue;
+                }
+
+                // Then check if the current time matches the schedule
                 bool matches = currentTime >= nextOccurrence && currentTime < nextOccurrence.AddSeconds(1);
 
                 if (matches)
@@ -72,9 +86,21 @@ private async Task RunCronChecker(IServiceProvider services)
             }
             catch (Exception ex)
             {
-                _logger.LogWarning($"Error when running cron task ({item.ConversationId}, {item.Title}, {item.Cron}): {ex.Message}\r\n{ex.InnerException}");
+                _logger.LogError($"Error when running cron task ({item.Title}, {item.Cron}): {ex.Message}");
                 continue;
             }
         }
     }
+
+    private DateTime GetLastOccurrence(CrontabSchedule schedule)
+    {
+        var nextOccurrence = schedule.GetNextOccurrence(DateTime.UtcNow);
+        var afterNextOccurrence = schedule.GetNextOccurrence(nextOccurrence);
+        var interval = afterNextOccurrence - nextOccurrence;
+        if (interval.TotalMinutes < 10)
+        {
+            throw new ArgumentException("The minimum interval must be at least 10 minutes.");
+        }
+        return nextOccurrence - interval;
+    }
 }

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

@@ -45,14 +45,16 @@ public async Task Triggered(IRuleTrigger trigger, string data)
         {
             var conv = await convService.NewConversation(new Conversation
             {
+                Channel = trigger.Channel,
+                Title = data,
                 AgentId = agent.Id
             });
 
             var message = new RoleDialogModel(AgentRole.User, data);
 
             var states = new List<MessageState>
             {
-                new("channel", ConversationChannel.Database),
+                new("channel", trigger.Channel),
                 new("channel_id", trigger.EntityId)
             };
             convService.SetConversationId(conv.Id, states);

src/Infrastructure/BotSharp.Core.Rules/Engines/RuleEngine.cs

@@ -0,0 +1,5 @@
+namespace BotSharp.Core.Rules.Triggers;
+
+public interface IRuleConfig
+{
+}

src/Infrastructure/BotSharp.Core.Rules/Triggers/IRuleConfig.cs

@@ -47,6 +47,7 @@
   </ItemGroup>
 
   <ItemGroup>    
+    <ProjectReference Include="..\BotSharp.Core.Rules\BotSharp.Core.Rules.csproj" />    
     <ProjectReference Include="..\BotSharp.Core\BotSharp.Core.csproj" />
   </ItemGroup>