feat: enhance default entries in Storage with new search providers

Author: Daydreamer-riri

CmdPalWebSearchShortcut/.github/copilot-instructions.md

@@ -0,0 +1,44 @@
+# Copilot Instructions for PowerToys-Run-WebSearchShortcut
+
+This repository contains a **Windows App SDK** project that implements a **Command Palette Extension** (likely for PowerToys Run or similar hosts). It runs as a **COM Server**.
+
+## Project Architecture
+
+- **Core Framework**: .NET 9.0, Windows App SDK, `Microsoft.CommandPalette.Extensions`.
+- **Entry Point**: `WebSearchShortcut/Program.cs` initializes the COM server (`Shmuelie.WinRTServer`) and registers the `WebSearchShortcut` extension.
+- **Extension Logic**:
+  - `WebSearchShortcut.cs`: Implements `IExtension`. Serves as the main bridge between the host and the plugin.
+  - `WebSearchShortcutCommandsProvider.cs`: Implements `CommandProvider`. Manages the list of available commands (shortcuts) displayed in the palette.
+- **Data & Persistence**:
+  - `Storage.cs`: Handles loading/saving shortcut configurations (JSON). Contains default providers (Google, Bing, etc.).
+  - `WebSearchShortcutDataEntry.cs`: Model for a single shortcut entry.
+- **Search Suggestions**:
+  - `SuggestionsProviders/`: Contains implementations of `ISuggestionsProvider` for different services (Google, Bing, YouTube, etc.).
+  - **Pattern**: Each provider implements `GetSuggestionsAsync` to fetch autocomplete results via HTTP.
+- **Browser Integration**: `Browser/` folder handles detecting and launching the default browser.
+
+## Key Patterns & Conventions
+
+- **COM Server Lifetime**: The application runs as a local COM server. `Program.cs` manages the lifetime using `ManualResetEvent`.
+- **Toolkit Usage**: Heavily relies on `Microsoft.CommandPalette.Extensions.Toolkit` for implementing interfaces like `ICommandItem` and `CommandProvider`.
+- **Async/Await**: All I/O (network requests, file access) must be asynchronous.
+- **JSON Handling**: Use `System.Text.Json` for parsing API responses and storage files.
+- **Error Handling**: Suggestion providers should catch exceptions and log them via `ExtensionHost.LogMessage` (or return empty results) to avoid crashing the host.
+
+## Development Workflows
+
+- **Build**: Standard `dotnet build`.
+- **Debugging**:
+  - The app expects to be launched with `-RegisterProcessAsComServer` by the host.
+  - To debug, you may need to attach to the process or configure the host to launch your debug build.
+- **Adding a New Search Provider**:
+  1. Create a new class in `SuggestionsProviders/` implementing `ISuggestionsProvider`.
+  2. Implement `GetSuggestionsAsync` to parse the specific API response.
+  3. (Optional) Add a default entry in `Storage.cs`.
+
+## File Structure Highlights
+
+- `WebSearchShortcut/`: Main application project.
+- `WebSearchShortcut.Tests/`: Unit tests (MSTest).
+- `WebSearchShortcut/SuggestionsProviders/`: Search engine implementations.
+- `WebSearchShortcut/Commands/`: Command implementations (e.g., `SearchWebCommand`).

CmdPalWebSearchShortcut/WebSearchShortcut/Services/IconService.cs

@@ -26,7 +26,8 @@ internal static class IconService
     private static readonly HashSet<string> FaviconBlacklist = new(StringComparer.OrdinalIgnoreCase)
     {
         "youtube.com",
-        "www.youtube.com"
+        "www.youtube.com",
+        "www.npmjs.com",
     };
 
     /// <summary>

CmdPalWebSearchShortcut/WebSearchShortcut/Storage.cs

@@ -10,33 +10,24 @@ internal sealed class Storage
 {
     public List<WebSearchShortcutDataEntry> Data { get; set; } = [];
 
+    // public List<WebSearchShortcutDataEntry> GetTopLevelShortcuts()
+    // {
+    //     return Data.FindAll(x => !x.HideWhenEmptyQuery);
+    // }
+
+    // public List<WebSearchShortcutDataEntry> GetFallbackShortcuts()
+    // {
+    //     return Data.FindAll(x => x.HideWhenEmptyQuery);
+    // }
+
     public static Storage ReadFromFile(string path)
     {
         var data = new Storage();
 
         if (!File.Exists(path))
         {
             var defaultStorage = new Storage();
-            defaultStorage.Data.AddRange([
-                new WebSearchShortcutDataEntry
-                {
-                    Name = "Google",
-                    Url = "https://www.google.com/search?q=%s",
-                    SuggestionProvider = "Google",
-                },
-                new WebSearchShortcutDataEntry
-                {
-                    Name = "Bing",
-                    Url = "https://www.bing.com/search?q=%s",
-                    SuggestionProvider = "Bing",
-                },
-                new WebSearchShortcutDataEntry
-                {
-                    Name = "Youtube",
-                    Url = "https://www.youtube.com/results?search_query=%s",
-                    SuggestionProvider = "YouTube"
-                },
-            ]);
+            defaultStorage.Data.AddRange(GetDefaultEntries());
             WriteToFile(path, defaultStorage);
         }
 
@@ -50,6 +41,16 @@ public static Storage ReadFromFile(string path)
                 data = JsonSerializer.Deserialize(jsonStringReading, AppJsonSerializerContext.Default.Storage) ?? new Storage();
 
                 bool modified = EnsureIds(data.Data);
+
+                foreach (var defaultEntry in GetDefaultEntries())
+                {
+                    if (!data.Data.Exists(x => x.Name == defaultEntry.Name))
+                    {
+                        data.Data.Add(defaultEntry);
+                        modified = true;
+                    }
+                }
+
                 if (modified)
                 {
                     WriteToFile(path, data);
@@ -60,6 +61,52 @@ public static Storage ReadFromFile(string path)
         return data;
     }
 
+    private static List<WebSearchShortcutDataEntry> GetDefaultEntries()
+    {
+        return
+        [
+            new WebSearchShortcutDataEntry
+            {
+                Name = "Google",
+                Url = "https://www.google.com/search?q=%s",
+                SuggestionProvider = "Google",
+            },
+            new WebSearchShortcutDataEntry
+            {
+                Name = "Bing",
+                Url = "https://www.bing.com/search?q=%s",
+                SuggestionProvider = "Bing",
+            },
+            new WebSearchShortcutDataEntry
+            {
+                Name = "Youtube",
+                Url = "https://www.youtube.com/results?search_query=%s",
+                SuggestionProvider = "YouTube"
+            },
+            new WebSearchShortcutDataEntry
+            {
+                Name = "DuckDuckGo",
+                Url = "https://duckduckgo.com/?q=%s",
+                SuggestionProvider = "DuckDuckGo",
+                // HideWhenEmptyQuery = true
+            },
+            new WebSearchShortcutDataEntry
+            {
+                Name = "Wikipedia",
+                Url = "https://en.wikipedia.org/w/index.php?search=",
+                SuggestionProvider = "Wikipedia",
+                // HideWhenEmptyQuery = true
+            },
+            new WebSearchShortcutDataEntry
+            {
+                Name = "npm",
+                Url = "https://www.npmjs.com/search?q=%s",
+                SuggestionProvider = "Npm",
+                // HideWhenEmptyQuery = true
+            }
+        ];
+    }
+
     public static void WriteToFile(string path, Storage data)
     {
         EnsureIds(data.Data);

CmdPalWebSearchShortcut/WebSearchShortcut/WebSearchShortcutDataEntry.cs

@@ -13,6 +13,7 @@ internal sealed class WebSearchShortcutDataEntry
     // public string[]? Urls { get; set; }
     public string? SuggestionProvider { get; set; }
     public string? HomePage { get; set; }
+    // public bool HideWhenEmptyQuery { get; set; } // TODO: wait powertoys cmdpal support for update with query
     public string? IconUrl { get; set; }
     public string? ReplaceWhitespace { get; set; }
     public string? BrowserPath { get; set; }