refactored config compiling, cleaned up project

Author: mxritzdev

LinkRouter/App/Configuration/Config.cs

@@ -11,7 +11,8 @@ public class Config
 
     public NotFoundBehaviorConfig NotFoundBehavior { get; set; } = new();
 
-    public RedirectRoute[] Routes { get; set; } = [
+    public RedirectRoute[] Routes { get; set; } =
+    [
         new RedirectRoute()
         {
             Route = "/instagram",
@@ -23,89 +24,82 @@ public class Config
             RedirectUrl = "https://example.com"
         },
     ];
-    
+
     public class NotFoundBehaviorConfig
     {
         public bool RedirectOn404 { get; set; } = false;
         public string RedirectUrl { get; set; } = "https://example.com/404";
     }
 
-    [JsonIgnore]
-    public static Regex PlaceholderPattern => new(@"\\\{(\d|\w+)\}");
-    
-    [JsonIgnore]
-    public CompiledRoute[]? CompiledRoutes { get; set; }
-    
+    [JsonIgnore] public CompiledRoute[]? CompiledRoutes { get; set; }
+
     public void CompileRoutes()
     {
         var compiledRoutes = new List<CompiledRoute>();
-        
+
         foreach (var route in Routes)
         {
             if (!route.Route.StartsWith("/"))
                 route.Route = "/" + route.Route;
-            
+
             if (!route.Route.EndsWith("/"))
                 route.Route += "/";
-            
+
             var compiled = new CompiledRoute
             {
                 Route = route.Route,
                 RedirectUrl = route.RedirectUrl
             };
-    
+
             var replacements = new List<(int Index, int Length, string NewText)>();
 
             var escaped = Regex.Escape(route.Route);
-            
-            var matches = PlaceholderPattern.Matches(escaped);
-    
-            
+
+            var pattern = new Regex(@"\\{(\d|\w+)\}");
+
+            var matches = pattern.Matches(escaped);
+
             foreach (var match in matches.Select(x => x))
             {
                 // Check if the placeholder is immediately followed by another placeholder
-                
-                Console.WriteLine("matchlenght: "+ (match.Index + match.Length + 2) + " route lenght" + escaped.Length);
-                
-                if (escaped.Length >= match.Index + match.Length + 2 && escaped.Substring(match.Index + match.Length, 2) == "\\{")
-                        throw new InvalidOperationException(
-                            $"Placeholder {match.Groups[1].Value} cannot be immediately followed by another placeholder. " +
-                            $"Please add a string literal as separator.");
+                if (escaped.Length >= match.Index + match.Length + 2
+                    && escaped.Substring(match.Index + match.Length, 2) == "\\{")
+                    throw new InvalidOperationException(
+                        $"Placeholder {match.Groups[1].Value} cannot be immediately followed by another placeholder. " +
+                        $"Please add any separator.");
 
                 replacements.Add((match.Index, match.Length, "(.+)"));
             }
-            
+
             var compiledRouteBuilder = new StringBuilder(escaped);
-            
+
             foreach (var replacement in replacements.OrderByDescending(r => r.Index))
             {
                 compiledRouteBuilder.Remove(replacement.Index, replacement.Length);
                 compiledRouteBuilder.Insert(replacement.Index, replacement.NewText);
             }
 
-            compiled.CompiledPattern = new Regex(compiledRouteBuilder.ToString(), RegexOptions.Compiled);
+            compiled.CompiledPattern = new Regex(compiledRouteBuilder.ToString(),
+                RegexOptions.Compiled | RegexOptions.CultureInvariant);
 
-            Console.WriteLine(compiled.CompiledPattern.ToString());
-            
             var duplicate = matches
                 .Select((m, i) => m.Groups[1].Value)
                 .GroupBy(x => x)
                 .FirstOrDefault(x => x.Count() > 1);
 
             if (duplicate != null)
                 throw new InvalidOperationException("Cannot use a placeholder twice in the route: " + duplicate.Key);
-            
+
             compiled.Placeholders = matches
                 .Select((m, i) => m.Groups[1].Value)
                 .Distinct()
                 .Select((name, i) => (name, i))
                 .ToDictionary(x => x.name, x => x.i + 1);
-            
+
             compiledRoutes.Add(compiled);
         }
 
         CompiledRoutes = compiledRoutes
             .ToArray();
     }
-    
 }

LinkRouter/App/Http/Controllers/RedirectController.cs

@@ -63,8 +63,6 @@ public async Task<ActionResult> RedirectToExternalUrl(string path)
 
         var match = redirectRoute.CompiledPattern.Match(path);
 
-        Console.WriteLine(redirectRoute.CompiledPattern);
-        
         string redirectUrl = redirectRoute.RedirectUrl;
 
         foreach (var placeholder in redirectRoute.Placeholders)

LinkRouter/App/Models/CompiledRoute.cs

@@ -5,6 +5,6 @@ namespace LinkRouter.App.Models;
 public class CompiledRoute : RedirectRoute
 {
     public Regex CompiledPattern { get; set; }
-    
+
     public Dictionary<string, int> Placeholders { get; set; } = new();
 }

LinkRouter/App/Models/RedirectRoute.cs

@@ -3,6 +3,6 @@
 public class RedirectRoute
 {
     public string Route { get; set; }
-    
+
     public string RedirectUrl { get; set; }
 }

LinkRouter/App/Services/ConfigWatcher.cs

@@ -18,44 +18,44 @@ public ConfigWatcher(ILogger<ConfigWatcher> logger, Config config)
 
     protected override Task ExecuteAsync(CancellationToken stoppingToken)
     {
-        
         if (!File.Exists(ConfigPath))
         {
             Logger.LogWarning("Watched file does not exist: {FilePath}", ConfigPath);
         }
-        
+
         Watcher = new FileSystemWatcher(Path.GetDirectoryName(ConfigPath) ?? throw new InvalidOperationException())
         {
             Filter = Path.GetFileName(ConfigPath),
             NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.Size | NotifyFilters.CreationTime
         };
-        
+
         OnChanged(Watcher, new FileSystemEventArgs(WatcherChangeTypes.Created, string.Empty, string.Empty));
-        
+
         Watcher.Changed += OnChanged;
-        
+
         Watcher.EnableRaisingEvents = true;
-        
+
         return Task.CompletedTask;
     }
-    
+
     private void OnChanged(object sender, FileSystemEventArgs e)
     {
         try
         {
             var content = File.ReadAllText(ConfigPath);
-            
+
             var config = JsonSerializer.Deserialize<Config>(content);
-            
+
             Config.Routes = config?.Routes ?? [];
             Config.RootRoute = config?.RootRoute ?? "https://example.com";
-            
+
             Logger.LogInformation("Config file changed.");
 
             try
             {
                 Config.CompileRoutes();
-            } catch (InvalidOperationException ex)
+            }
+            catch (InvalidOperationException ex)
             {
                 Logger.LogError("Failed to compile routes: " + ex.Message);
                 Environment.Exit(1);

LinkRouter/Program.cs

@@ -12,46 +12,44 @@ public abstract class Program
     public static void Main(string[] args)
     {
         var builder = WebApplication.CreateBuilder(args);
-        
+
         Directory.CreateDirectory(PathBuilder.Dir("data"));
-        
+
         builder.Services.AddControllers();
-        
+
         var loggerProviders = LoggerBuildHelper.BuildFromConfiguration(configuration =>
         {
             configuration.Console.Enable = true;
             configuration.Console.EnableAnsiMode = true;
         });
-        
+
         builder.Logging.ClearProviders();
         builder.Logging.AddProviders(loggerProviders);
 
         builder.Services.AddHostedService<ConfigWatcher>();
-        
+
         var configPath = Path.Combine("data", "config.json");
-        
+
         if (!File.Exists(configPath))
             File.WriteAllText(
-                configPath, 
-                JsonSerializer.Serialize(new Config(), new JsonSerializerOptions {WriteIndented = true}
+                configPath,
+                JsonSerializer.Serialize(new Config(), new JsonSerializerOptions { WriteIndented = true }
                 ));
-        
+
         Config config = JsonSerializer.Deserialize<Config>(File.ReadAllText(configPath)) ?? new Config();
 
-        File.WriteAllText(configPath, JsonSerializer.Serialize(config, new JsonSerializerOptions {WriteIndented = true}));
-        
+        File.WriteAllText(configPath,
+            JsonSerializer.Serialize(config, new JsonSerializerOptions { WriteIndented = true }));
+
         builder.Services.AddSingleton(config);
-        
-        builder.Services.AddMetricServer(options =>
-        {
-            options.Port = 5000;
-        });
-        
+
+        builder.Services.AddMetricServer(options => { options.Port = 5000; });
+
         var app = builder.Build();
 
         app.UseMetricServer();
         app.MapControllers();
 
         app.Run();
     }
-}
+}