feat: enhance legacy redirects and query API

rudra-iitm · rudra-iitm · commit 84a9f602e453 · 2026-06-15T09:53:20.000+05:30
- Introduced QueryApiClient to handle printer queries with support for text and XML formats.
- Updated legacy redirect logic to resolve paths based on parameters.
- Enhanced the generate-query-api script to create static endpoints for printers and drivers.
- Improved CSS styles for better text wrapping and hyphenation in prose elements.
- Added support for manufacturer filtering in the printer list page.
- Updated package.json to include new query API generation script.
- Added new legacy redirects for home and database paths.
diff --git a/.gitignore b/.gitignore
@@ -28,6 +28,7 @@
 /public/ppds
 /public/feed.xml
 /public/search
+/public/query
 
 # debug
 npm-debug.log*
diff --git a/app/download.cgi/page.tsx b/app/download.cgi/page.tsx
@@ -0,0 +1,13 @@
+import { Suspense } from "react"
+
+import LoadingScreen from "@/components/foomatic/LoadingScreen"
+
+import LegacyCgiRedirect from "@/components/foomatic/LegacyCgiRedirect"
+
+export default function LegacydownloadCgiPage() {
+  return (
+    <Suspense fallback={<LoadingScreen />}>
+      <LegacyCgiRedirect endpoint="download" />
+    </Suspense>
+  )
+}
diff --git a/app/driver_list.cgi/page.tsx b/app/driver_list.cgi/page.tsx
@@ -0,0 +1,13 @@
+import { Suspense } from "react"
+
+import LoadingScreen from "@/components/foomatic/LoadingScreen"
+
+import LegacyCgiRedirect from "@/components/foomatic/LegacyCgiRedirect"
+
+export default function Legacydriver_listCgiPage() {
+  return (
+    <Suspense fallback={<LoadingScreen />}>
+      <LegacyCgiRedirect endpoint="driver_list" />
+    </Suspense>
+  )
+}
diff --git a/app/drivers/page.tsx b/app/drivers/page.tsx
@@ -1,19 +1,16 @@
 "use client"
 
 import { useEffect } from "react"
-import { siteConfig } from "@/config/site.config";
+import { useRouter } from "next/navigation"
+
+import LoadingScreen from "@/components/foomatic/LoadingScreen"
 
 export default function DriversPage() {
+  const router = useRouter()
+
   useEffect(() => {
-    window.location.href = siteConfig.destinations.drivers
-  }, [])
-  
-  return (
-    <main className="min-h-screen bg-background text-foreground container mx-auto px-4 py-24">
-      <h1 className="text-3xl font-bold mb-4">Redirecting...</h1>
-      <p className="text-muted-foreground">
-        Redirecting to OpenPrinting Drivers database...
-      </p>
-    </main>
-  );
+    router.replace("/foomatic/drivers")
+  }, [router])
+
+  return <LoadingScreen />
 }
diff --git a/app/execution.cgi/page.tsx b/app/execution.cgi/page.tsx
@@ -0,0 +1,13 @@
+import { Suspense } from "react"
+
+import LoadingScreen from "@/components/foomatic/LoadingScreen"
+
+import LegacyCgiRedirect from "@/components/foomatic/LegacyCgiRedirect"
+
+export default function LegacyexecutionCgiPage() {
+  return (
+    <Suspense fallback={<LoadingScreen />}>
+      <LegacyCgiRedirect endpoint="execution" />
+    </Suspense>
+  )
+}
diff --git a/app/foomatic/ppd-o-matic.php/page.tsx b/app/foomatic/ppd-o-matic.php/page.tsx
@@ -0,0 +1,13 @@
+import { Suspense } from "react"
+
+import LoadingScreen from "@/components/foomatic/LoadingScreen"
+
+import LegacyPpdMaticRedirect from "@/components/foomatic/LegacyPpdMaticRedirect"
+
+export default function LegacyPpdMaticPage() {
+  return (
+    <Suspense fallback={<LoadingScreen />}>
+      <LegacyPpdMaticRedirect />
+    </Suspense>
+  )
+}
diff --git a/app/foomatic/printers/page.tsx b/app/foomatic/printers/page.tsx
@@ -141,6 +141,14 @@ export default function HomePage() {
       const savedValue = parseInt(savedItemsPerPage, 10)
       setItemsPerPage(Number.isFinite(savedValue) ? savedValue : 20)
     }
+
+    const urlManufacturer = new URLSearchParams(window.location.search).get(
+      "manufacturer"
+    )
+    if (urlManufacturer) {
+      setSelectedManufacturer(urlManufacturer)
+      setCurrentPage(1)
+    }
   }, [])
 
   useEffect(() => {
diff --git a/app/globals.css b/app/globals.css
@@ -197,11 +197,20 @@
 
 .prose {
   overflow-wrap: break-word;
-  word-wrap: break-word;
+  hyphens: auto;
 }
 
 .prose a {
-  word-break: break-all;
+  word-break: normal;
+  overflow-wrap: anywhere;
+  hyphens: none;
+}
+
+.prose code,
+.prose pre,
+.prose kbd,
+.prose samp {
+  hyphens: none;
 }
 
 .prose iframe {
diff --git a/app/ppd-o-matic.cgi/page.tsx b/app/ppd-o-matic.cgi/page.tsx
@@ -0,0 +1,13 @@
+import { Suspense } from "react"
+
+import LoadingScreen from "@/components/foomatic/LoadingScreen"
+
+import LegacyPpdMaticRedirect from "@/components/foomatic/LegacyPpdMaticRedirect"
+
+export default function LegacyPpdMaticEntryPage() {
+  return (
+    <Suspense fallback={<LoadingScreen />}>
+      <LegacyPpdMaticRedirect />
+    </Suspense>
+  )
+}
diff --git a/app/ppd-o-matic.php/page.tsx b/app/ppd-o-matic.php/page.tsx
@@ -0,0 +1,13 @@
+import { Suspense } from "react"
+
+import LoadingScreen from "@/components/foomatic/LoadingScreen"
+
+import LegacyPpdMaticRedirect from "@/components/foomatic/LegacyPpdMaticRedirect"
+
+export default function LegacyPpdMaticEntryPage() {
+  return (
+    <Suspense fallback={<LoadingScreen />}>
+      <LegacyPpdMaticRedirect />
+    </Suspense>
+  )
+}
diff --git a/app/printer_list.cgi/page.tsx b/app/printer_list.cgi/page.tsx
@@ -0,0 +1,13 @@
+import { Suspense } from "react"
+
+import LoadingScreen from "@/components/foomatic/LoadingScreen"
+
+import LegacyCgiRedirect from "@/components/foomatic/LegacyCgiRedirect"
+
+export default function Legacyprinter_listCgiPage() {
+  return (
+    <Suspense fallback={<LoadingScreen />}>
+      <LegacyCgiRedirect endpoint="printer_list" />
+    </Suspense>
+  )
+}
diff --git a/app/projects/[project]/page.tsx b/app/projects/[project]/page.tsx
@@ -34,15 +34,28 @@ export default async function ProjectDetail({
         <head>
           <meta httpEquiv="refresh" content={`0; url=${data.redirect}`} />
           <link rel="canonical" href={data.redirect} />
+          <style>{`@keyframes op-spin{to{transform:rotate(360deg)}}`}</style>
         </head>
-        <body className="bg-background text-foreground flex items-center justify-center min-h-screen">
-          <p>
-            Redirecting to{" "}
-            <a href={data.redirect} className="text-primary underline">
-              {data.redirect}
-            </a>
-            …
-          </p>
+        <body
+          className="bg-background text-foreground flex items-center justify-center min-h-screen"
+          role="status"
+          aria-label="Loading"
+        >
+          <svg
+            width="24"
+            height="24"
+            viewBox="0 0 24 24"
+            fill="none"
+            stroke="currentColor"
+            strokeWidth="2"
+            strokeLinecap="round"
+            style={{ animation: "op-spin 1s linear infinite", opacity: 0.7 }}
+          >
+            <path d="M21 12a9 9 0 1 1-6.219-8.56" />
+          </svg>
+          <a href={data.redirect} hidden>
+            {data.redirect}
+          </a>
         </body>
       </html>
     )
diff --git a/app/query.cgi/page.tsx b/app/query.cgi/page.tsx
@@ -0,0 +1,13 @@
+import { Suspense } from "react"
+
+import LoadingScreen from "@/components/foomatic/LoadingScreen"
+
+import QueryApiClient from "@/components/foomatic/QueryApiClient"
+
+export default function QueryApiPage() {
+  return (
+    <Suspense fallback={<LoadingScreen />}>
+      <QueryApiClient />
+    </Suspense>
+  )
+}
diff --git a/app/query.php/page.tsx b/app/query.php/page.tsx
@@ -0,0 +1,13 @@
+import { Suspense } from "react"
+
+import LoadingScreen from "@/components/foomatic/LoadingScreen"
+
+import QueryApiClient from "@/components/foomatic/QueryApiClient"
+
+export default function QueryApiPage() {
+  return (
+    <Suspense fallback={<LoadingScreen />}>
+      <QueryApiClient />
+    </Suspense>
+  )
+}
diff --git a/app/show_driver.cgi/page.tsx b/app/show_driver.cgi/page.tsx
@@ -0,0 +1,13 @@
+import { Suspense } from "react"
+
+import LoadingScreen from "@/components/foomatic/LoadingScreen"
+
+import LegacyCgiRedirect from "@/components/foomatic/LegacyCgiRedirect"
+
+export default function Legacyshow_driverCgiPage() {
+  return (
+    <Suspense fallback={<LoadingScreen />}>
+      <LegacyCgiRedirect endpoint="show_driver" />
+    </Suspense>
+  )
+}
diff --git a/app/show_license.cgi/page.tsx b/app/show_license.cgi/page.tsx
@@ -0,0 +1,13 @@
+import { Suspense } from "react"
+
+import LoadingScreen from "@/components/foomatic/LoadingScreen"
+
+import LegacyCgiRedirect from "@/components/foomatic/LegacyCgiRedirect"
+
+export default function Legacyshow_licenseCgiPage() {
+  return (
+    <Suspense fallback={<LoadingScreen />}>
+      <LegacyCgiRedirect endpoint="show_license" />
+    </Suspense>
+  )
+}
diff --git a/app/show_printer.cgi/page.tsx b/app/show_printer.cgi/page.tsx
@@ -0,0 +1,13 @@
+import { Suspense } from "react"
+
+import LoadingScreen from "@/components/foomatic/LoadingScreen"
+
+import LegacyCgiRedirect from "@/components/foomatic/LegacyCgiRedirect"
+
+export default function Legacyshow_printerCgiPage() {
+  return (
+    <Suspense fallback={<LoadingScreen />}>
+      <LegacyCgiRedirect endpoint="show_printer" />
+    </Suspense>
+  )
+}
diff --git a/app/wikish_history.cgi/page.tsx b/app/wikish_history.cgi/page.tsx
@@ -0,0 +1,13 @@
+import { Suspense } from "react"
+
+import LoadingScreen from "@/components/foomatic/LoadingScreen"
+
+import LegacyCgiRedirect from "@/components/foomatic/LegacyCgiRedirect"
+
+export default function Legacywikish_historyCgiPage() {
+  return (
+    <Suspense fallback={<LoadingScreen />}>
+      <LegacyCgiRedirect endpoint="wikish_history" />
+    </Suspense>
+  )
+}
diff --git a/components/foomatic/DriverPageClient.tsx b/components/foomatic/DriverPageClient.tsx
@@ -252,7 +252,7 @@ export default function DriverPageClient({ driverId }: DriverPageClientProps) {
                   </div>
                 ) : null}
                 {driver.license || driver.freeSoftware !== undefined ? (
-                  <div>
+                  <div id="license" className="scroll-mt-24">
                     <dt className="text-xs font-semibold uppercase tracking-[0.18em] text-muted-foreground">License</dt>
                     <dd className="mt-2 text-sm text-foreground">
                       {driver.license || (driver.freeSoftware ? "Free software" : "Not specified")}
diff --git a/components/foomatic/LegacyCgiRedirect.tsx b/components/foomatic/LegacyCgiRedirect.tsx
@@ -0,0 +1,32 @@
+"use client"
+
+import { useEffect, useMemo } from "react"
+import { useRouter, useSearchParams } from "next/navigation"
+
+import LoadingScreen from "@/components/foomatic/LoadingScreen"
+import { resolveLegacyCgi } from "@/lib/foomatic/legacy-cgi"
+
+interface LegacyCgiRedirectProps {
+  endpoint: string
+}
+
+export default function LegacyCgiRedirect({ endpoint }: LegacyCgiRedirectProps) {
+  const router = useRouter()
+  const searchParams = useSearchParams()
+
+  const resolution = useMemo(
+    () => resolveLegacyCgi(endpoint, searchParams),
+    [endpoint, searchParams]
+  )
+
+  useEffect(() => {
+    if (resolution.external) {
+      window.location.replace(resolution.href)
+      return
+    }
+
+    router.replace(resolution.href)
+  }, [resolution, router])
+
+  return <LoadingScreen />
+}
diff --git a/components/foomatic/LegacyPpdMaticRedirect.tsx b/components/foomatic/LegacyPpdMaticRedirect.tsx
@@ -0,0 +1,29 @@
+"use client"
+
+import { useEffect, useMemo } from "react"
+import { useRouter, useSearchParams } from "next/navigation"
+
+import LoadingScreen from "@/components/foomatic/LoadingScreen"
+import { withBasePath } from "@/lib/foomatic/base-path"
+import { resolveLegacyPpdMatic } from "@/lib/foomatic/legacy-php"
+
+export default function LegacyPpdMaticRedirect() {
+  const router = useRouter()
+  const searchParams = useSearchParams()
+
+  const resolution = useMemo(
+    () => resolveLegacyPpdMatic(searchParams),
+    [searchParams]
+  )
+
+  useEffect(() => {
+    if (resolution.assetPath) {
+      window.location.replace(withBasePath(resolution.assetPath))
+      return
+    }
+
+    router.replace(resolution.internalHref ?? resolution.fallbackHref)
+  }, [resolution, router])
+
+  return <LoadingScreen />
+}
diff --git a/components/foomatic/LoadingScreen.tsx b/components/foomatic/LoadingScreen.tsx
@@ -0,0 +1,14 @@
+import { Loader2 } from "lucide-react"
+
+export default function LoadingScreen() {
+  return (
+    <main
+      className="flex min-h-screen items-center justify-center bg-background px-6 text-foreground"
+      role="status"
+      aria-label="Loading"
+    >
+      <Loader2 className="h-6 w-6 animate-spin text-primary" />
+      <span className="sr-only">Loading…</span>
+    </main>
+  )
+}
diff --git a/components/foomatic/QueryApiClient.tsx b/components/foomatic/QueryApiClient.tsx
diff --git a/lib/foomatic/legacy-cgi.ts b/lib/foomatic/legacy-cgi.ts
diff --git a/lib/foomatic/legacy-php.ts b/lib/foomatic/legacy-php.ts
diff --git a/lib/foomatic/query-locator.ts b/lib/foomatic/query-locator.ts
diff --git a/lib/legacy-redirects.ts b/lib/legacy-redirects.ts
diff --git a/package.json b/package.json
diff --git a/scripts/foomatic/generate-legacy-redirects.ts b/scripts/foomatic/generate-legacy-redirects.ts
diff --git a/scripts/foomatic/generate-query-api.ts b/scripts/foomatic/generate-query-api.ts
