Move webconsole log into Singleton class (#566)

Author: ChristopherHX

src/Runner.Server/Controllers/ActionDownloadInfoController.cs

@@ -115,7 +115,7 @@ public async Task<IActionResult> Get(Guid scopeIdentifier, string hubName, Guid
                         actions[name] = new ActionDownloadInfo() {NameWithOwner = item.NameWithOwner, Ref = item.Ref, ResolvedNameWithOwner = item.NameWithOwner, TarballUrl = new Uri(new Uri(ServerUrl), item.Ref == BuildConstants.Source.CommitHash ? "localcheckout.tar.gz" : $"_apis/v1/ActionDownloadInfo/localcheckout?format=tarball&version={Uri.EscapeDataString(item.Ref)}&name={Uri.EscapeDataString(localcheckout)}").ToString(), ZipballUrl = new Uri(new Uri(ServerUrl), item.Ref == BuildConstants.Source.CommitHash ? "localcheckout.zip"  : $"_apis/v1/ActionDownloadInfo/localcheckout?format=zipball&version={Uri.EscapeDataString(item.Ref)}&name={Uri.EscapeDataString(localcheckout)}").ToString(), ResolvedSha = item.Ref != BuildConstants.Source.CommitHash ? GitHub.Runner.Sdk.BuildConstants.Source.CommitHash : $"{GitHub.Runner.Sdk.BuildConstants.Source.CommitHash}${item.Ref}" };
                     } else {
                         if(!string.IsNullOrEmpty(localcheckout) && !string.IsNullOrEmpty(runid) && long.TryParse(runid, out var _runid)) {
-                            var handler = new MessageController(Configuration, this._cache, null, null);
+                            var handler = new MessageController(Configuration, this._cache, null, null, null);
                             if(await handler.RepoExists(_runid, name)) {
                                 actions[name] = new ActionDownloadInfo() {NameWithOwner = item.NameWithOwner, ResolvedNameWithOwner = item.NameWithOwner, Ref = item.Ref, TarballUrl = new Uri(new Uri(ServerUrl), $"_apis/v1/Message/tardown/{_runid}?repositoryAndRef={Uri.EscapeDataString(name)}").ToString(), ZipballUrl = new Uri(new Uri(ServerUrl), $"_apis/v1/Message/zipdown/{_runid}?repositoryAndRef={Uri.EscapeDataString(name)}").ToString(), ResolvedSha = "Local-Repository" };
                                 continue;

src/Runner.Server/Controllers/FinishJobController.cs

@@ -12,6 +12,7 @@
 using Runner.Server.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
+using Runner.Server.Services;
 
 namespace Runner.Server.Controllers
 {
@@ -22,21 +23,19 @@ public class FinishJobController : VssControllerBase
     {
         private IMemoryCache _cache;
         private SqLiteDb _context;
+        private WebConsoleLogService _webConsoleLogService;
 
-        public FinishJobController(IMemoryCache cache, SqLiteDb context, IConfiguration conf) : base(conf)
+        public FinishJobController(IMemoryCache cache, SqLiteDb context, IConfiguration conf, WebConsoleLogService webConsoleLogService) : base(conf)
         {
             _cache = cache;
             _context = context;
+            _webConsoleLogService = webConsoleLogService;
         }
 
         public delegate void JobCompleted(JobCompletedEvent jobCompletedEvent);
-        public delegate void JobAssigned(JobAssignedEvent jobAssignedEvent);
-        public delegate void JobStarted(JobStartedEvent jobStartedEvent);
 
         public static event JobCompleted OnJobCompleted;
         public static event JobCompleted OnJobCompletedAfter;
-        public static event JobAssigned OnJobAssigned;
-        public static event JobStarted OnJobStarted;
 
         internal void InvokeJobCompleted(JobCompletedEvent ev) {
             try {
@@ -64,7 +63,7 @@ internal void InvokeJobCompleted(JobCompletedEvent ev) {
                         }
                         MessageController.UpdateJob(this, job);
                         _context.SaveChanges();
-                        new TimelineController(_context, Configuration).SyncLiveLogsToDb(job.TimeLineId);
+                        _webConsoleLogService.SyncLiveLogsToDb(job.TimeLineId);
                     }
                 }
             } finally {
@@ -86,12 +85,6 @@ public IActionResult OnEvent(Guid scopeIdentifier, string hubName, Guid planId,
             if (jevent is JobCompletedEvent ev) {
                 InvokeJobCompleted(ev);
                 return Ok();
-            } else if (jevent is JobAssignedEvent a) {
-                Task.Run(() => OnJobAssigned?.Invoke(a));
-                return Ok();
-            } else if(jevent is JobStartedEvent s) {
-                Task.Run(() => OnJobStarted?.Invoke(s));
-                return Ok();
             }
             return NotFound();
         }

src/Runner.Server/Controllers/MessageController.cs

@@ -62,7 +62,7 @@ public IActionResult GetTaskArchive(Guid taskid, string version) {
             var archivePath = tasksByNameAndVersion[$"{taskid}@{version}"].ArchivePath;
             var prefix = "localtaskzip://";
             if(archivePath.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)) {
-                var handler = new MessageController(Configuration, cache, null, null);
+                var handler = new MessageController(Configuration, cache, null, null, null);
                 handler.ControllerContext = ControllerContext;
                 handler.HttpContext.Response.GetTypedHeaders().ContentType = new Microsoft.Net.Http.Headers.MediaTypeHeaderValue("application/zip");
                 handler.GetZip(runid, false, false, archivePath.Substring(prefix.Length), true).GetAwaiter().GetResult();

src/Runner.Server/Controllers/TaskController.cs

@@ -18,6 +18,7 @@
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
 using Runner.Server.Models;
+using Runner.Server.Services;
 
 namespace Runner.Server.Controllers
 {
@@ -28,33 +29,26 @@ public class TimeLineWebConsoleLogController : VssControllerBase
     {
 
         private IMemoryCache _cache;
+        private readonly WebConsoleLogService _webConsoleLogService;
 
-        public TimeLineWebConsoleLogController(IMemoryCache cache, IConfiguration conf) : base(conf)
+        public TimeLineWebConsoleLogController(IMemoryCache cache, IConfiguration conf, WebConsoleLogService webConsoleLogService) : base(conf)
         {
             _cache = cache;
+            _webConsoleLogService = webConsoleLogService;
         }
 
         [HttpGet("{timelineId}/{recordId}")]
         public IEnumerable<TimelineRecordLogLine> GetLogLines(Guid timelineId, Guid recordId)
         {
-            if(TimelineController.dict.TryGetValue(timelineId, out var rec) && rec.Item2.TryGetValue(recordId, out var value)) {
-                return from line in value where line != null select line;
-            }
-            return null;
+            return _webConsoleLogService.GetLogLines(timelineId, recordId);
         }
 
         [HttpGet("{timelineId}")]
         public ConcurrentDictionary<Guid, List<TimelineRecordLogLine>> GetLogLines(Guid timelineId)
         {
-            if(TimelineController.dict.TryGetValue(timelineId, out var rec)) {
-                return rec.Item2;
-            }
-            return null;
+            return _webConsoleLogService.GetLogLines(timelineId);
         }
 
-        public delegate void LogFeedEvent(object sender, Guid timelineId, Guid recordId, TimelineRecordFeedLinesWrapper record);
-        public static event LogFeedEvent logfeed;
-
         [HttpGet]
         public IActionResult Message([FromQuery] Guid timelineId, [FromQuery] long[] runid)
         {
@@ -64,17 +58,17 @@ public IActionResult Message([FromQuery] Guid timelineId, [FromQuery] long[] run
                 await using(var writer = new StreamWriter(stream) { NewLine = "\n" } ) {
                     var queue2 = Channel.CreateUnbounded<KeyValuePair<string,string>>(new UnboundedChannelOptions { SingleReader = true });
                     var chwriter = queue2.Writer;
-                    LogFeedEvent handler = (sender, timelineId2, recordId, record) => {
-                        (List<TimelineRecord>, ConcurrentDictionary<Guid, List<TimelineRecordLogLine>>) val;
+                    WebConsoleLogService.LogFeedEvent handler = (sender, timelineId2, recordId, record) => {
                         Job job;
-                        if (timelineId == timelineId2 || timelineId == Guid.Empty && (runid.Length == 0 || TimelineController.dict.TryGetValue(timelineId2, out val) && val.Item1.Any() && _cache.TryGetValue(val.Item1[0].Id, out job) && runid.Contains(job.runid))) {
+                        TimelineRecord record1;
+                        if (timelineId == timelineId2 || timelineId == Guid.Empty && (runid.Length == 0 || (record1 = _webConsoleLogService.GetTimeLine(timelineId2)?.FirstOrDefault()) != null && _cache.TryGetValue(record1.Id, out job) && runid.Contains(job.runid))) {
                             chwriter.WriteAsync(new KeyValuePair<string, string>("log", JsonConvert.SerializeObject(new { timelineId = timelineId2, recordId, record }, new JsonSerializerSettings{ ContractResolver = new CamelCasePropertyNamesContractResolver(), Converters = new List<JsonConverter>{new StringEnumConverter { NamingStrategy = new CamelCaseNamingStrategy() }}})));
                         }
                     };
                     TimelineController.TimeLineUpdateDelegate handler2 = (timelineId2, timeline) => {
-                        (List<TimelineRecord>, ConcurrentDictionary<Guid, List<TimelineRecordLogLine>>) val;
                         Job job;
-                        if(timelineId == timelineId2 || timelineId == Guid.Empty && (runid.Length == 0 || TimelineController.dict.TryGetValue(timelineId2, out val) && val.Item1.Any() && _cache.TryGetValue(val.Item1[0].Id, out job) && runid.Contains(job.runid))) {
+                        TimelineRecord record2;
+                        if(timelineId == timelineId2 || timelineId == Guid.Empty && (runid.Length == 0 || (record2 = _webConsoleLogService.GetTimeLine(timelineId2)?.FirstOrDefault()) != null && _cache.TryGetValue(record2.Id, out job) && runid.Contains(job.runid))) {
                             chwriter.WriteAsync(new KeyValuePair<string, string>("timeline", JsonConvert.SerializeObject(new { timelineId = timelineId2, timeline }, new JsonSerializerSettings{ ContractResolver = new CamelCasePropertyNamesContractResolver(), Converters = new List<JsonConverter>{new StringEnumConverter { NamingStrategy = new CamelCaseNamingStrategy() }}})));
                         }
                     };
@@ -111,7 +105,7 @@ public IActionResult Message([FromQuery] Guid timelineId, [FromQuery] long[] run
 
                         }
                     }, requestAborted);
-                    logfeed += handler;
+                    _webConsoleLogService.LogFeed += handler;
                     TimelineController.TimeLineUpdate += handler2;
                     MessageController.OnRepoDownload += rd;
                     FinishJobController.OnJobCompleted += completed;
@@ -121,7 +115,7 @@ public IActionResult Message([FromQuery] Guid timelineId, [FromQuery] long[] run
                     } catch(OperationCanceledException) {
 
                     } finally {
-                        logfeed -= handler;
+                        _webConsoleLogService.LogFeed -= handler;
                         TimelineController.TimeLineUpdate -= handler2;
                         MessageController.OnRepoDownload -= rd;
                         FinishJobController.OnJobCompleted -= completed;
@@ -131,16 +125,6 @@ public IActionResult Message([FromQuery] Guid timelineId, [FromQuery] long[] run
             }, "text/event-stream");
         }
 
-        public static void AppendTimelineRecordFeed(TimelineRecordFeedLinesWrapper record, Guid timelineId, Guid recordId) {
-            logfeed?.Invoke(null, timelineId, recordId, record);
-            (List<TimelineRecord>, ConcurrentDictionary<Guid, List<TimelineRecordLogLine>>) timeline;
-            timeline = TimelineController.dict.GetOrAdd(timelineId, g => (new List<TimelineRecord>(), new ConcurrentDictionary<Guid, List<TimelineRecordLogLine>>()));
-            timeline.Item2.AddOrUpdate(record.StepId, t => record.Value.Select((s, i) => new TimelineRecordLogLine(s, null)).ToList(), (g, t) => {
-                t.AddRange(record.Value.Select((s) => new TimelineRecordLogLine(s, null)));
-                return t;
-            });
-        }
-
         [HttpPost("{scopeIdentifier}/{hubName}/{planId}/{timelineId}/{recordId}")]
         [Authorize(AuthenticationSchemes = "Bearer", Policy = "AgentJob")]
         public IActionResult AppendTimelineRecordFeed(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, Guid recordId, [FromBody, Vss] TimelineRecordFeedLinesWrapper record)
@@ -150,7 +134,7 @@ public IActionResult AppendTimelineRecordFeed(Guid scopeIdentifier, string hubNa
             var nl = record.Value.SelectMany(lines => regex.Split(lines)).ToList();
             record.Value.Clear();
             record.Value.AddRange(nl);
-            Task.Run(() => AppendTimelineRecordFeed(record, timelineId, recordId));
+            Task.Run(() => _webConsoleLogService.AppendTimelineRecordFeed(record, timelineId, recordId));
             return Ok();
         }
 
@@ -181,7 +165,7 @@ public async Task Get(Guid timelineId)
                             var regex = new Regex("\r?\n");
                             var nl = livelogfeed.Value.SelectMany(lines => regex.Split(lines)).ToList();
                             var record = new TimelineRecordFeedLinesWrapper(livelogfeed.StepId, nl);
-                            AppendTimelineRecordFeed(record, timelineId, livelogfeed.StepId);
+                            _webConsoleLogService.AppendTimelineRecordFeed(record, timelineId, livelogfeed.StepId);
                         }
                     }
                 } finally {

src/Runner.Server/Controllers/TimeLineWebConsoleLogController.cs

@@ -26,27 +26,13 @@ namespace Runner.Server.Controllers
     [Route("{owner}/{repo}/_apis/v1/[controller]")]
     public class TimelineController : VssControllerBase
     {
-        public static ConcurrentDictionary<Guid, (List<TimelineRecord>, ConcurrentDictionary<Guid, List<TimelineRecordLogLine>>)> dict = new ConcurrentDictionary<Guid, (List<TimelineRecord>, ConcurrentDictionary<Guid, List<TimelineRecordLogLine>>)>();
         private SqLiteDb _context;
 
         public TimelineController(SqLiteDb context, IConfiguration conf) : base(conf)
         {
             _context = context;
         }
 
-        internal void SyncLiveLogsToDb(Guid timelineId) {
-            if(dict.TryRemove(timelineId, out var entry)) {
-                foreach(var rec in (from record in _context.TimeLineRecords where record.TimelineId == timelineId select record).Include(r => r.Log).ToList()) {
-                    if(rec.Log == null && entry.Item2.TryGetValue(rec.Id, out var value)) {
-                        var log = new TaskLog() {  };
-                        _context.Logs.Add(new SqLiteDb.LogStorage() { Ref = log, Content = string.Join('\n', from line in value where line != null select line.Line) });
-                        rec.Log = log;
-                    }
-                }
-                _context.SaveChanges();
-            }
-        }
-
         [HttpGet("{timelineId}")]
         public async Task<IActionResult> GetTimelineRecords(Guid timelineId) {
             var l = (from record in _context.TimeLineRecords where record.TimelineId == timelineId select record).Include(r => r.Log).ToList();
@@ -178,14 +164,14 @@ private List<TimelineRecord> MergeTimelineRecords(List<TimelineRecord> timelineR
         [SwaggerResponse(200, type: typeof(VssJsonCollectionWrapper<List<TimelineRecord>>))]
         public async Task<IActionResult> Patch(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, [FromBody, Vss] VssJsonCollectionWrapper<List<TimelineRecord>> patch)
         {
-            return await UpdateTimeLine(timelineId, patch, true);
+            return await Ok(new VssJsonCollectionWrapper<List<TimelineRecord>>(await UpdateTimeLine(timelineId, patch?.Value, true)));
         }
 
-        internal async Task<IActionResult> UpdateTimeLine(Guid timelineId, VssJsonCollectionWrapper<List<TimelineRecord>> patch, bool outOfSyncTimeLineUpdate = false)
+        internal async Task<List<TimelineRecord>> UpdateTimeLine(Guid timelineId, List<TimelineRecord> patch, bool outOfSyncTimeLineUpdate = false)
         {
             var old = (from record in _context.TimeLineRecords where record.TimelineId == timelineId select record).Include(r => r.Log).ToList();
             var records = old.ToList();
-            records.AddRange(patch.Value.Select((r, _) => {
+            records.AddRange(patch.Select((r, _) => {
                 r.TimelineId = timelineId;
                 if(r.Log != null) {
                     var logId = r.Log.Id;
@@ -226,7 +212,7 @@ internal async Task<IActionResult> UpdateTimeLine(Guid timelineId, VssJsonCollec
 
             await _context.AddRangeAsync(from rec in records where !old.Contains(rec) select rec);
             await _context.SaveChangesAsync();
-            return await Ok(patch);
+            return patch;
         }
     }
 }