support direct addon search and protocol handlers

Author: blarfoon

apps/desktop/.electron-builder.config.cjs

@@ -81,6 +81,16 @@ module.exports = {
       name: "gdlauncher",
       role: "Viewer",
       schemes: ["gdlauncher"]
+    },
+    {
+      name: "CurseForge",
+      role: "Viewer",
+      schemes: ["curseforge"]
+    },
+    {
+      name: "Modrinth",
+      role: "Viewer",
+      schemes: ["modrinth"]
     }
   ],
   win: {

apps/desktop/packages/main/index.ts

@@ -563,20 +563,33 @@ if ((app as any).overwolf) {
 // Set application name for Windows 10+ notifications
 if (process.platform === "win32") app.setAppUserModelId(app.getName())
 
-if (process.defaultApp) {
-  if (process.argv.length >= 2) {
-    app.setAsDefaultProtocolClient("gdlauncher", process.execPath, [
-      resolve(process.argv[1])
-    ])
+// Register protocol handlers for gdlauncher, curseforge, and modrinth
+const protocols = ["gdlauncher", "curseforge", "modrinth"]
+for (const protocol of protocols) {
+  if (process.defaultApp) {
+    if (process.argv.length >= 2) {
+      app.setAsDefaultProtocolClient(protocol, process.execPath, [
+        resolve(process.argv[1])
+      ])
+    }
+  } else {
+    app.setAsDefaultProtocolClient(protocol)
   }
-} else {
-  app.setAsDefaultProtocolClient("gdlauncher")
 }
 
 let lastDisplay: Display | null = null
 
 let isSpawningWindow = false
 
+// Queue for protocol URLs received before window is ready
+let pendingProtocolUrl: string | null = null
+
+// Helper to check if a URL is a supported protocol
+const isSupportedProtocol = (url: string) =>
+  url.startsWith("gdlauncher://") ||
+  url.startsWith("curseforge://") ||
+  url.startsWith("modrinth://")
+
 async function createWindow(): Promise<BrowserWindow> {
   console.log("Creating window...")
   if (isSpawningWindow) {
@@ -682,6 +695,16 @@ async function createWindow(): Promise<BrowserWindow> {
     isSpawningWindow = false
     console.log("Window is ready to show")
 
+    // Send any pending protocol URL that was received before window was ready
+    if (pendingProtocolUrl) {
+      console.log("Sending pending protocol URL:", pendingProtocolUrl)
+      // Small delay to ensure renderer is fully initialized
+      setTimeout(() => {
+        win?.webContents.send("protocol-url", pendingProtocolUrl)
+        pendingProtocolUrl = null
+      }, 500)
+    }
+
     function upsertKeyValue(obj: any, keyToChange: string, value: any) {
       const keyToChangeLower = keyToChange.toLowerCase()
       for (const key of Object.keys(obj)) {
@@ -1000,7 +1023,7 @@ app.whenReady().then(async () => {
 
   app.on("second-instance", (_e, argv) => {
     // Handle protocol URLs on Windows (passed as command line arguments)
-    const protocolUrl = argv.find((arg) => arg.startsWith("gdlauncher://"))
+    const protocolUrl = argv.find((arg) => isSupportedProtocol(arg))
 
     if (win && !win.isDestroyed()) {
       // Focus on the main window if the user tried to open another
@@ -1013,14 +1036,11 @@ app.whenReady().then(async () => {
         win.webContents.send("protocol-url", protocolUrl)
       }
     } else {
-      createWindow()
-
-      // If window was just created, wait a bit for it to be ready
-      if (protocolUrl && win) {
-        setTimeout(() => {
-          win?.webContents.send("protocol-url", protocolUrl)
-        }, 1000)
+      // Store URL and create window
+      if (protocolUrl) {
+        pendingProtocolUrl = protocolUrl
       }
+      createWindow()
     }
   })
 
@@ -1107,8 +1127,8 @@ app.on("render-process-gone", (event, webContents, detailed) => {
 app.on("open-url", (event, url) => {
   console.log("Protocol URL received:", url)
 
-  // Handle gdlauncher:// protocol URLs
-  if (url.startsWith("gdlauncher://")) {
+  // Handle gdlauncher://, curseforge://, and modrinth:// protocol URLs
+  if (isSupportedProtocol(url)) {
     event.preventDefault()
 
     // Focus the window if minimized
@@ -1120,9 +1140,8 @@ app.on("open-url", (event, url) => {
       win.webContents.send("protocol-url", url)
     } else {
       // Window not ready yet, store the URL for later
-      // This can happen if the app is launched via protocol before window is created
       console.log("Window not ready, storing protocol URL for later")
-      // You could implement a queue here if needed
+      pendingProtocolUrl = url
     }
   }
 })

apps/desktop/packages/mainWindow/src/components/EnhancedSearchBar.tsx

@@ -105,6 +105,13 @@ export function EnhancedSearchBar() {
         />
       </Show>
 
+      <Show when={isExpanded() && searchResults?.isDirectMode()}>
+        <div class="bg-primary-600/20 text-primary-400 flex shrink-0 items-center gap-1 rounded px-2 py-0.5 text-xs">
+          <div class="i-hugeicons:link-01 text-sm" />
+          <span>{t("search:_trn_direct")}</span>
+        </div>
+      </Show>
+
       <Show
         when={
           isExpanded() &&

apps/desktop/packages/mainWindow/src/global.d.ts

@@ -89,6 +89,7 @@ declare global {
     listenToCoreModuleProgress: (
       cb: (event: Electron.IpcRendererEvent, progress: number) => void
     ) => void
+    onProtocolUrl: (cb: (url: string) => void) => void
   }
 }
 

apps/desktop/packages/mainWindow/src/managers/NavigationManager/index.tsx

@@ -5,8 +5,9 @@ import {
   isNewsPath,
   isNewsDetailPath
 } from "@/utils/routes"
+import { parseSearchQuery } from "@/utils/searchQueryParser"
 import { useLocation, useNavigate } from "@solidjs/router"
-import { JSX, createContext, createSignal, useContext } from "solid-js"
+import { JSX, createContext, createSignal, onMount, useContext } from "solid-js"
 
 const getTransitionClassToApply = (from: string, to: string) => {
   if (isSearchPath(from) && isAddonPath(to)) {
@@ -49,6 +50,19 @@ export const NavigationManager = (props: { children: JSX.Element }) => {
     searchParams: location.search
   })
 
+  // Handle protocol URLs (curseforge://, modrinth://)
+  onMount(() => {
+    window.onProtocolUrl?.((url) => {
+      console.log("Protocol URL received in renderer:", url)
+      const parsed = parseSearchQuery(url)
+      if (parsed.mode === "direct" && parsed.items.length > 0) {
+        // Navigate to search page with the URL pre-filled
+        // The search page will parse this and show the direct results
+        navigate(`/search?q=${encodeURIComponent(url)}`)
+      }
+    })
+  })
+
   const shouldTransition = () =>
     !globalstore.settings.data?.reducedMotion && document.startViewTransition
 

apps/desktop/packages/mainWindow/src/utils/platformSearch.ts

@@ -1,4 +1,5 @@
 import {
+  FEUnifiedBatchRequest,
   FEUnifiedSearchParameters,
   FEUnifiedSearchResult,
   FEUnifiedSearchType
@@ -10,6 +11,7 @@ import { createAsyncEffect } from "./asyncEffect"
 import { createInfiniteQuery } from "@tanstack/solid-query"
 import { VirtualizerHandle } from "virtua/lib/solid"
 import { useSearchParams } from "@solidjs/router"
+import { parseSearchQuery, buildBatchRequest } from "./searchQueryParser"
 
 const defaultSearchQuery: FEUnifiedSearchParameters = {
   searchQuery: "",
@@ -102,17 +104,28 @@ export const getSearchResults = (_opts?: SearchResultsOpts) => {
     }
   })
 
+  // Check for protocol URL in query params (from deep link)
+  const initialSearchText = searchParams.q
+    ? decodeURIComponent(String(searchParams.q))
+    : ""
+
   const [searchQuery, _setSearchQuery] =
     createSignal<FEUnifiedSearchParameters>(
       {
         ...defaultSearchQuery,
-        ...opts.defaultSearchQuery
+        ...opts.defaultSearchQuery,
+        ...(initialSearchText ? { searchQuery: initialSearchText } : {})
       },
       {
         equals: false
       }
     )
 
+  // Clear the q param from URL after reading (one-time use)
+  if (searchParams.q) {
+    _setSearchParams({ ...searchParams, q: undefined })
+  }
+
   const setSearchQuery = (
     value:
       | FEUnifiedSearchParameters
@@ -152,9 +165,30 @@ export const getSearchResults = (_opts?: SearchResultsOpts) => {
     return pageSize
   }
 
+  // Direct search mode - for URLs, protocols, and # prefix IDs
+  // Must be defined before infinite queries so isDirectMode() is available
+  const parsedQuery = createMemo(() =>
+    parseSearchQuery(searchQuery().searchQuery || "")
+  )
+
+  const isDirectMode = () => parsedQuery().mode === "direct"
+
+  const directBatchRequest = createMemo<FEUnifiedBatchRequest>(() =>
+    buildBatchRequest(parsedQuery())
+  )
+
+  const directSearchQuery = rspc.createQuery(() => ({
+    queryKey: [
+      "modplatforms.unifiedGetProjectsByIds",
+      directBatchRequest()
+    ] as const,
+    enabled: isDirectMode() && parsedQuery().items.length > 0
+  }))
+
   const cfInfiniteResults = createInfiniteQuery(() => ({
     queryKey: ["modplatforms.unifiedSearch.cf"],
     enabled:
+      !isDirectMode() &&
       (searchQuery().searchQuery?.length || 0) > 0 &&
       (!searchQuery().searchApi || searchQuery().searchApi === "curseforge"),
     queryFn: (ctx) => {
@@ -188,6 +222,7 @@ export const getSearchResults = (_opts?: SearchResultsOpts) => {
   const mrInfiniteResults = createInfiniteQuery(() => ({
     queryKey: ["modplatforms.unifiedSearch.mr"],
     enabled:
+      !isDirectMode() &&
       (searchQuery().searchQuery?.length || 0) > 0 &&
       (!searchQuery().searchApi || searchQuery().searchApi === "modrinth"),
     queryFn: (ctx) => {
@@ -242,6 +277,22 @@ export const getSearchResults = (_opts?: SearchResultsOpts) => {
   }, null)
 
   const allRows = createMemo<SearchResultItem[]>(() => {
+    // Direct mode - return results from batch query
+    if (isDirectMode()) {
+      const directResults = directSearchQuery.data?.results ?? []
+      const items: SearchResultItem[] = directResults.map((item) => ({
+        type: "value" as const,
+        value: item
+      }))
+
+      if (directSearchQuery.isFetching) {
+        items.push({ type: "loader" })
+      }
+
+      return items
+    }
+
+    // Regular search mode
     const cfData =
       searchQuery().searchApi === "modrinth"
         ? []
@@ -323,6 +374,9 @@ export const getSearchResults = (_opts?: SearchResultsOpts) => {
   }
 
   const isInitialLoading = createMemo(() => {
+    if (isDirectMode()) {
+      return directSearchQuery.isLoading
+    }
     if (searchQuery().searchApi === "curseforge") {
       return cfInfiniteResults.isLoading
     } else if (searchQuery().searchApi === "modrinth") {
@@ -332,6 +386,9 @@ export const getSearchResults = (_opts?: SearchResultsOpts) => {
   })
 
   const isLoading = createMemo(() => {
+    if (isDirectMode()) {
+      return directSearchQuery.isLoading || directSearchQuery.isFetching
+    }
     if (searchQuery().searchApi === "curseforge") {
       return cfInfiniteResults.isLoading || cfInfiniteResults.isFetching
     } else if (searchQuery().searchApi === "modrinth") {
@@ -364,7 +421,10 @@ export const getSearchResults = (_opts?: SearchResultsOpts) => {
     selectedInstance,
     selectedInstanceMods,
     setSelectedInstanceId,
-    selectedInstanceId
+    selectedInstanceId,
+    // Direct search mode
+    isDirectMode,
+    parsedQuery
   }
 }