Refactor index.ts and types.ts to enhance data structure and loading; remove obsolete database subproject

database

@@ -1 +0,0 @@
-Subproject commit 456e6be6aacfcec190bee6c48758d7fc9dacb536

src/index.ts

@@ -1,138 +1,156 @@
 import { serve } from "bun";
-import { readFile } from "fs/promises";
-import path from "path";
-
-// Type Definition for Items (Packages/Programs)
-interface Item {
-  name?: string;
-  full_name?: string;
-  owner?: string;
-  description?: string;
+
+// --- Interfaces ---
+
+export interface Dependency {
+  name: string;
+  source: "relative" | "remote";
+  location: string;
+}
+
+export interface DeepSearchData {
+  [key: string]: string;
+}
+
+export interface Item {
+  avatar_url: string;
+  name: string;
+  full_name: string;
+  created_at: string;
+  description?: string | null;
+  default_branch?: string;
+  open_issues: number;
+  stargazers_count: number;
+  forks_count: number;
+  watchers_count: number;
+  contentIsCorrect?: boolean;
+  tags_url: string;
+  license: string;
+  readme_content: string;
+  specials?: string;
   topics?: string[];
-  created_at?: string;
-  usage_count?: number;
+  size: number;
+  has_build_zig_zon?: boolean;
+  has_build_zig?: boolean;
+  fork: boolean;
+  updated_at: string;
+  dependencies?: Dependency[];
+  berg?: number;
+  gitlab?: number;
+  archived?: boolean;
+}
+
+// --- Constants ---
+
+const packagesUrls = [
+  "https://raw.githubusercontent.com/Zigistry/database/refs/heads/main/database/games.json",
+  "https://raw.githubusercontent.com/Zigistry/database/refs/heads/main/database/gui.json",
+  "https://raw.githubusercontent.com/Zigistry/database/refs/heads/main/database/packages.json",
+  "https://raw.githubusercontent.com/Zigistry/database/refs/heads/main/database/web.json",
+];
+
+const programsUrl =
+  "https://raw.githubusercontent.com/Zigistry/database/refs/heads/main/database/programs.json";
+
+// --- Data Loading ---
+
+let packages: Item[] = [];
+let programs: Item[] = [];
+
+async function loadData() {
+  const packagesFile = await Promise.all(packagesUrls.map((url) => fetch(url)));
+  packages = (await Promise.all(packagesFile.map((file) => file.json())))
+    .flat() as Item[];
+
+  const programsFile = await fetch(programsUrl);
+  programs = (await programsFile.json()) as Item[];
+  console.log("Data loaded");
 }
 
-// --- CONFIGURATION ---
+await loadData();
 
-const DB_PATH = "../database/database";
-const PORT = 7860;
-const RELOAD_INTERVAL_MS = 3600000; // 1 hour
+// Refresh the data every 10 minutes
+setInterval(loadData, 10 * 60 * 100);
 
-const corsHeaders = {
+// --- CORS Headers ---
+const corsHeaders: Record<string, string> = {
   "Content-Type": "application/json",
   "Access-Control-Allow-Origin": "*",
 };
 
-// --- GLOBAL DATA STORE (in-memory) ---
+// --- Sorting Helpers ---
+const sortByDate = (a: Item, b: Item) =>
+  new Date(b.created_at ?? "").getTime() - new Date(a.created_at ?? "").getTime();
 
-let packages: Item[] = [];
-let programs: Item[] = [];
-let sorted: {
-  packages: { latest: Item[]; mostUsed: Item[] };
-  programs: { latest: Item[]; mostUsed: Item[] };
-} = { packages: { latest: [], mostUsed: [] }, programs: { latest: [], mostUsed: [] } };
+const sortByUsage = (a: Item, b: Item) =>
+  (b.stargazers_count ?? 0) - (a.stargazers_count ?? 0);
 
-// --- UTILITY FUNCTIONS ---
+// --- Pre-sorted Data ---
+function getSorted() {
+  const packagesArray = packages as Item[];
+  const programsArray = programs as Item[];
 
-function getSortedData(packages: Item[], programs: Item[]) {
   return {
     packages: {
-      latest: [...packages].sort(sortByDate),
-      mostUsed: [...packages].sort(sortByUsage),
+      latest: [...packagesArray].sort(sortByDate),
+      mostUsed: [...packagesArray].sort(sortByUsage),
     },
     programs: {
-      latest: [...programs].sort(sortByDate),
-      mostUsed: [...programs].sort(sortByUsage),
+      latest: [...programsArray].sort(sortByDate),
+      mostUsed: [...programsArray].sort(sortByUsage),
     },
   };
 }
 
-function sortByDate(a: Item, b: Item): number {
-  return new Date(b.created_at || "").getTime() - new Date(a.created_at || "").getTime();
-}
-
-function sortByUsage(a: Item, b: Item): number {
-  return (b.usage_count || 0) - (a.usage_count || 0);
-}
-
-/**
- * Filters an array of items by query and topic filter.
- */
-function filterItems(items: Item[], query: string | null, topic: string | null): Item[] {
+// --- Filtering ---
+function filterItems(
+  items: Item[],
+  q: string | null,
+  filter: string | null
+): Item[] {
   return items.filter(({ name, full_name, description, topics }) => {
-    if (topic && !topics?.some(t => t.toLowerCase() === topic)) return false;
-    if (!query) return true;
-    const lowerQ = query.toLowerCase();
-    return [name, full_name, description, ...(topics || [])]
-      .some(field => field?.toLowerCase().includes(lowerQ));
+    if (filter && !topics?.some((t) => t.toLowerCase() === filter)) return false;
+    if (!q) return true;
+    const lowerQ = q.toLowerCase();
+    return [name, full_name, description, ...(topics ?? [])].some((field) =>
+      field?.toLowerCase().includes(lowerQ)
+    );
   });
 }
 
-/**
- * Returns a paginated slice of items.
- */
-function getPaginated(items: Item[], page: number = 0, size: number = 10): Item[] {
+// --- Pagination ---
+function getPaginated(items: Item[], page = 0, size = 10): Item[] {
   const start = page * size;
   return items.slice(start, start + size);
 }
 
-/**
- * Finds an item by owner and repo name.
- */
+// --- Find by Owner/Repo ---
 function findItem(items: Item[], owner: string, repo: string): Item | undefined {
-  return items.find(({ owner: o, name, full_name }) =>
-    (o?.toLowerCase() === owner && name?.toLowerCase() === repo) ||
-    full_name?.toLowerCase() === `${owner}/${repo}`
+  return items.find(
+    ({ full_name }) => full_name?.toLowerCase() === `${owner}/${repo}`
   );
 }
 
-/**
- * Parses a range string of the form "start..end" to [start, end].
- */
+// --- Parse Range ---
 function parseRange(str: string | null, max: number): [number, number] {
   const match = str?.match(/^(\d+)\.\.(\d+)$/);
   const [start, end] = match
-    ? [parseInt(match[1]), parseInt(match[2])]
+    ? [parseInt(match[1] ?? "0", 10), parseInt(match[2] ?? "10", 10)]
     : [0, 10];
   return [Math.max(0, start), Math.min(max, end)];
 }
 
-/**
- * Loads data from disk and updates in-memory database and sorted views.
- */
-async function reloadData() {
-  try {
-    const pkgPath = path.resolve(__dirname, `${DB_PATH}/packages.json`);
-    const prgPath = path.resolve(__dirname, `${DB_PATH}/programs.json`);
-    const [pkgData, prgData] = await Promise.all([
-      readFile(pkgPath, "utf8"),
-      readFile(prgPath, "utf8"),
-    ]);
-    packages = JSON.parse(pkgData);
-    programs = JSON.parse(prgData);
-    sorted = getSortedData(packages, programs);
-    console.log(`[${new Date().toISOString()}] Database reloaded`);
-  } catch (err) {
-    console.error("Error reloading database files:", err);
-  }
-}
-
-// Initial data load and set up periodic reload
-reloadData();
-setInterval(reloadData, RELOAD_INTERVAL_MS);
-
-// --- SERVER DEFINITION ---
-
+// --- Server ---
 serve({
-  port: PORT,
-  fetch(req: Request): Response | Promise<Response> {
+  port: 7860,
+  async fetch(req) {
     const url = new URL(req.url);
     const { pathname, searchParams } = url;
     const q = searchParams.get("q")?.trim().toLowerCase() ?? null;
     const filter = searchParams.get("filter")?.trim().toLowerCase() ?? null;
+    const sorted = getSorted();
 
-    // Handle preflight CORS requests
+    // Handle CORS preflight
     if (req.method === "OPTIONS") {
       return new Response(null, {
         status: 204,
@@ -144,8 +162,6 @@ serve({
       });
     }
 
-    // --- API ENDPOINTS ---
-
     // Search endpoints
     if (pathname === "/api/searchPackages") {
       const result = filterItems(packages, q, filter).slice(0, 25);
@@ -160,29 +176,41 @@ serve({
     if (pathname === "/api/infiniteScrollPackages") {
       const page = parseInt(searchParams.get("pageNumber") || "0", 10);
       if (isNaN(page) || page < 0)
-        return Response.json({ error: "Invalid page number" }, { status: 400, headers: corsHeaders });
-      return Response.json(getPaginated(packages, page), { headers: corsHeaders });
+        return Response.json(
+          { error: "Invalid page number" },
+          { status: 400, headers: corsHeaders }
+        );
+      return Response.json(getPaginated(packages, page), {
+        headers: corsHeaders,
+      });
     }
     if (pathname === "/api/infiniteScrollPrograms") {
       const page = parseInt(searchParams.get("pageNumber") || "0", 10);
       if (isNaN(page) || page < 0)
-        return Response.json({ error: "Invalid page number" }, { status: 400, headers: corsHeaders });
-      return Response.json(getPaginated(programs, page), { headers: corsHeaders });
+        return Response.json(
+          { error: "Invalid page number" },
+          { status: 400, headers: corsHeaders }
+        );
+      return Response.json(getPaginated(programs, page), {
+        headers: corsHeaders,
+      });
     }
 
-    // Item details endpoints (by owner/repo)
-    const programMatch = pathname.match(/^\/api\/programs\/([^\/]+)\/([^\/]+)$/);
+    // Get single program/package by owner/repo
+    const programMatch = pathname.match(/^\/api\/programs\/([^/]+)\/([^/]+)$/);
     if (programMatch) {
-      const [_, owner, repo] = programMatch.map(s => s.toLowerCase());
+      const owner = programMatch[1]?.toLowerCase() ?? "";
+      const repo = programMatch[2]?.toLowerCase() ?? "";
       const found = findItem(programs, owner, repo);
       return Response.json(found || { error: "Program not found" }, {
         status: found ? 200 : 404,
         headers: corsHeaders,
       });
     }
-    const packageMatch = pathname.match(/^\/api\/packages\/([^\/]+)\/([^\/]+)$/);
+    const packageMatch = pathname.match(/^\/api\/packages\/([^/]+)\/([^/]+)$/);
     if (packageMatch) {
-      const [_, owner, repo] = packageMatch.map(s => s.toLowerCase());
+      const owner = packageMatch[1]?.toLowerCase() ?? "";
+      const repo = packageMatch[2]?.toLowerCase() ?? "";
       const found = findItem(packages, owner, repo);
       return Response.json(found || { error: "Package not found" }, {
         status: found ? 200 : 404,
@@ -190,11 +218,14 @@ serve({
       });
     }
 
-    // Index details endpoints (for homepage sections)
+    // Index details endpoints
     if (pathname === "/api/indexDetailsPackages") {
       const section = searchParams.get("section");
       if (section !== "latestRepos" && section !== "mostUsed") {
-        return Response.json({ error: "Invalid section" }, { status: 400, headers: corsHeaders });
+        return Response.json(
+          { error: "Invalid section" },
+          { status: 400, headers: corsHeaders }
+        );
       }
       const sortKey = section === "latestRepos" ? "latest" : "mostUsed";
       const data = sorted.packages[sortKey as keyof typeof sorted.packages] ?? packages;
@@ -204,7 +235,10 @@ serve({
     if (pathname === "/api/indexDetailsPrograms") {
       const section = searchParams.get("section");
       if (section !== "latestRepos" && section !== "mostUsed") {
-        return Response.json({ error: "Invalid section" }, { status: 400, headers: corsHeaders });
+        return Response.json(
+          { error: "Invalid section" },
+          { status: 400, headers: corsHeaders }
+        );
       }
       const sortKey = section === "latestRepos" ? "latest" : "mostUsed";
       const data = sorted.programs[sortKey as keyof typeof sorted.programs] ?? programs;
@@ -212,7 +246,7 @@ serve({
       return Response.json(data.slice(start, end), { headers: corsHeaders });
     }
 
-    // Unknown endpoint
+    // Not found
     return new Response("Not Found", {
       status: 404,
       headers: corsHeaders,
@@ -220,4 +254,4 @@ serve({
   },
 });
 
-console.log(`Server running on http://localhost:${PORT}`);
+console.log("Server running on http://localhost:7860");

src/types.ts

@@ -0,0 +1,34 @@
+export interface Dependency {
+    name: string;
+    source: "relative" | "remote";
+    location: string;
+  }
+  
+  export interface Item {
+    avatar_url: string;
+    name: string;
+    full_name: string;
+    created_at: string;
+    description?: string | null;
+    default_branch?: string;
+    open_issues: number;
+    stargazers_count: number;
+    forks_count: number;
+    watchers_count: number;
+    contentIsCorrect?: boolean;
+    tags_url: string;
+    license: string;
+    readme_content: string;
+    specials?: string;
+    topics?: string[];
+    size: number;
+    has_build_zig_zon?: boolean;
+    has_build_zig?: boolean;
+    fork: boolean;
+    updated_at: string;
+    dependencies?: Dependency[];
+    berg?: number;
+    gitlab?: number;
+    archived?: boolean;
+    owner?: string; // Added for findItem compatibility
+  }