chore(api): update api and config references

alexzedim · alexzedim · commit 3f40ef9f9e87 · 2026-01-03T23:02:08.000+03:00
diff --git a/.env b/.env
@@ -1,9 +1,5 @@
 # API Configuration
+# Consumed by config/api-origin.js (shares the value across runtime and rewrites)
 NEXT_PUBLIC_API_URL=http://localhost:8080
+# Used in constants/api-config.ts
 NEXT_PUBLIC_API_REVALIDATION=3600
-
-# CDN Configuration (optional)
-NEXT_PUBLIC_CDN_URL=
-
-# Analytics (optional)
-NEXT_PUBLIC_ANALYTICS_ID=
diff --git a/.env.example b/.env.example
@@ -1,5 +1,7 @@
 # API Configuration
+# Consumed by config/api-origin.js (shares the value across runtime and rewrites)
 NEXT_PUBLIC_API_URL=https://cmnw.me
+# Used in constants/api-config.ts
 NEXT_PUBLIC_API_REVALIDATION=3600
 
 # CDN Configuration (optional)
diff --git a/app/api/dma/item/[id]/route.ts b/app/api/dma/item/[id]/route.ts
@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
 
-import { DOMAINS } from "@/constants/domains";
+import { ENDPOINTS } from "@/constants/endpoints";
 
 export async function GET(
   request: NextRequest,
@@ -16,7 +16,7 @@ export async function GET(
   }
 
   try {
-    const apiUrl = new URL(`${DOMAINS.domain}/api/dma/item`);
+    const apiUrl = new URL(`${ENDPOINTS.API}/api/dma/item`);
 
     apiUrl.searchParams.set("id", id);
 
diff --git a/app/api/dma/item/search/route.ts b/app/api/dma/item/search/route.ts
@@ -1,7 +1,8 @@
 import { NextRequest, NextResponse } from "next/server";
 
-const API_BASE_URL =
-  process.env.NEXT_PUBLIC_API_URL || "https://api.tradewithcmnw.com";
+import { API_ORIGIN } from "@/config/api-origin";
+
+const API_BASE_URL = API_ORIGIN;
 
 export async function GET(request: NextRequest) {
   const searchParams = request.nextUrl.searchParams;
diff --git a/app/api/osint/character/logs/route.ts b/app/api/osint/character/logs/route.ts
@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
 
-import { DOMAINS } from "@/constants/domains";
+import { ENDPOINTS } from "@/constants/endpoints";
 
 export async function GET(request: NextRequest) {
   const searchParams = request.nextUrl.searchParams;
@@ -14,7 +14,7 @@ export async function GET(request: NextRequest) {
   }
 
   try {
-    const apiUrl = new URL(`${DOMAINS.domain}/api/osint/character/logs`);
+    const apiUrl = new URL(`${ENDPOINTS.API}/api/osint/character/logs`);
 
     apiUrl.searchParams.set("guid", guid);
 
diff --git a/app/api/osint/character/route.ts b/app/api/osint/character/route.ts
@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
 
-import { DOMAINS } from "@/constants/domains";
+import { ENDPOINTS } from "@/constants/endpoints";
 
 export async function GET(request: NextRequest) {
   const searchParams = request.nextUrl.searchParams;
@@ -14,7 +14,7 @@ export async function GET(request: NextRequest) {
   }
 
   try {
-    const apiUrl = new URL(`${DOMAINS.domain}/api/osint/character`);
+    const apiUrl = new URL(`${ENDPOINTS.API}/api/osint/character`);
 
     apiUrl.searchParams.set("guid", guid);
 
diff --git a/app/api/osint/guild/logs/route.ts b/app/api/osint/guild/logs/route.ts
@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
 
-import { DOMAINS } from "@/constants/domains";
+import { ENDPOINTS } from "@/constants/endpoints";
 
 export async function GET(request: NextRequest) {
   const searchParams = request.nextUrl.searchParams;
@@ -14,7 +14,7 @@ export async function GET(request: NextRequest) {
   }
 
   try {
-    const apiUrl = new URL(`${DOMAINS.domain}/api/osint/guild/logs`);
+    const apiUrl = new URL(`${ENDPOINTS.API}/api/osint/guild/logs`);
 
     apiUrl.searchParams.set("guid", guid);
 
diff --git a/app/api/osint/guild/route.ts b/app/api/osint/guild/route.ts
@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
 
-import { DOMAINS } from "@/constants/domains";
+import { ENDPOINTS } from "@/constants/endpoints";
 
 export async function GET(request: NextRequest) {
   const searchParams = request.nextUrl.searchParams;
@@ -14,7 +14,7 @@ export async function GET(request: NextRequest) {
   }
 
   try {
-    const apiUrl = new URL(`${DOMAINS.domain}/api/osint/guild`);
+    const apiUrl = new URL(`${ENDPOINTS.API}/api/osint/guild`);
 
     apiUrl.searchParams.set("guid", guid);
 
diff --git a/app/item/[id]/page.tsx b/app/item/[id]/page.tsx
@@ -9,11 +9,11 @@ import { MarketHeatmap } from "@/components/item/market-heatmap";
 import { ItemListing } from "@/components/item/item-listing";
 import { ItemContracts } from "@/components/item/item-contracts";
 import { generateItemTitle } from "@/lib";
-import { DOMAINS } from "@/constants";
+import { ENDPOINTS } from "@/constants";
 
 async function getItemData(id: string) {
   try {
-    const res = await fetch(`${DOMAINS.domain}/api/dma/item?id=${id}`, {
+    const res = await fetch(`${ENDPOINTS.API}/api/dma/item?id=${id}`, {
       next: { revalidate: 3600 }, // Revalidate every hour
     });
 
diff --git a/components/character/buttons.tsx b/components/character/buttons.tsx
@@ -3,7 +3,7 @@
 import { Avatar } from "@heroui/react";
 
 import { Link } from "@/components/custom-link";
-import { DOMAINS } from "@/constants";
+import { ENDPOINTS } from "@/constants";
 
 interface CharacterButtonsProps {
   name: string;
@@ -14,27 +14,27 @@ export const CharacterButtons = ({ name, realm }: CharacterButtonsProps) => {
   const services = [
     {
       name: "WarcraftLogs",
-      url: `${DOMAINS.warcraftLogs}/character/eu/${realm}/${name}`,
+      url: `${ENDPOINTS.WARCRAFT_LOGS}/character/eu/${realm}/${name}`,
       icon: "/external/wcl.svg",
     },
     {
       name: "RaiderIO",
-      url: `${DOMAINS.raiderIo}/characters/eu/${realm}/${name}`,
+      url: `${ENDPOINTS.RAIDER_IO}/characters/eu/${realm}/${name}`,
       icon: "/external/rio.svg",
     },
     {
       name: "WoWProgress",
-      url: `${DOMAINS.wowProgress}/character/eu/${realm}/${name}`,
+      url: `${ENDPOINTS.WOW_PROGRESS}/character/eu/${realm}/${name}`,
       icon: "/external/wp.svg",
     },
     {
       name: "BattleNet",
-      url: `${DOMAINS.battleNet}/en-gb/character/eu/${realm}/${name}`,
+      url: `${ENDPOINTS.BATTLE_NET}/en-gb/character/eu/${realm}/${name}`,
       icon: "/external/armory.svg",
     },
     {
       name: "Check PvP",
-      url: `${DOMAINS.checkPvp}/eu/${realm}/${name}`,
+      url: `${ENDPOINTS.CHECK_PVP}/eu/${realm}/${name}`,
       icon: "/external/check-pvp-1.svg",
     },
   ];
diff --git a/components/item/item-listing.tsx b/components/item/item-listing.tsx
@@ -16,7 +16,7 @@ import { useState } from "react";
 import useSWR from "swr";
 
 import { Link } from "@/components/custom-link";
-import { DOMAINS } from "@/constants";
+import { ENDPOINTS } from "@/constants";
 
 interface ItemDetails {
   bonus_lists?: number[];
@@ -65,7 +65,7 @@ export const ItemListing = ({
   if (isCommdty || isGold) return null;
 
   const { data, error, isLoading } = useSWR<AuctionsResponse>(
-    `${DOMAINS.domain}/api/dma/item/feed?id=${id}`,
+    `${ENDPOINTS.API}/api/dma/item/feed?id=${id}`,
     fetcher
   );
 
diff --git a/components/item/market-heatmap.tsx b/components/item/market-heatmap.tsx
@@ -12,7 +12,7 @@ import {
 import { Card, CardBody, Spinner } from "@heroui/react";
 import useSWR from "swr";
 
-import { DOMAINS, NAMING_CONSTANTS } from "@/constants";
+import { ENDPOINTS, NAMING_CONSTANTS } from "@/constants";
 import { BadgeSection } from "@/components/shared/badge-section";
 import {
   CARD_CLASS_NAMES,
@@ -193,7 +193,7 @@ export const MarketHeatmap: FC<MarketHeatmapProps> = memo(
     if (!shouldShowChart) return null;
 
     const { data, error, isLoading } = useSWR<HeatmapResponse>(
-      `${DOMAINS.domain}/api/dma/item/chart?id=${id}`,
+      `${ENDPOINTS.API}/api/dma/item/chart?id=${id}`,
       (url: string) => fetch(url).then((r) => r.json())
     );
 
diff --git a/components/search-form/index.tsx b/components/search-form/index.tsx
@@ -2,13 +2,21 @@
 
 import { useState, useEffect, useRef, KeyboardEvent } from "react";
 import { useRouter } from "next/navigation";
+import { ENDPOINTS } from "@/constants";
 
 interface SearchSuggestion {
   value: string;
   type?: "character" | "guild" | "item";
   label?: string;
 }
 
+const buildSearchUrl = (query: string) => {
+  const url = new URL("/api/osint/search", ENDPOINTS.API);
+  url.searchParams.set("searchQuery", query);
+
+  return url.toString();
+};
+
 export const SearchForm = () => {
   const router = useRouter();
   const [searchQuery, setSearchQuery] = useState("");
@@ -26,7 +34,9 @@ export const SearchForm = () => {
   // Fetch suggestions when search query changes
   useEffect(() => {
     const fetchSuggestions = async () => {
-      if (searchQuery.trim().length < 2) {
+      const sanitizedQuery = searchQuery.trim();
+
+      if (sanitizedQuery.length < 2) {
         setSuggestions([]);
         setShowDropdown(false);
 
@@ -36,9 +46,7 @@ export const SearchForm = () => {
       setIsLoadingSuggestions(true);
 
       try {
-        const response = await fetch(
-          `/api/osint/search?searchQuery=${encodeURIComponent(searchQuery)}`
-        );
+        const response = await fetch(buildSearchUrl(sanitizedQuery));
 
         if (response.ok) {
           const data = await response.json();
@@ -121,9 +129,7 @@ export const SearchForm = () => {
     setShowDropdown(false);
 
     try {
-      const response = await fetch(
-        `/api/osint/search?searchQuery=${encodeURIComponent(trimmedQuery)}`
-      );
+      const response = await fetch(buildSearchUrl(trimmedQuery));
 
       if (response.ok) {
         const data = await response.json();
diff --git a/config/api-origin.d.ts b/config/api-origin.d.ts
@@ -0,0 +1,3 @@
+export declare const DEFAULT_API_ORIGIN: string;
+export declare const API_ORIGIN: string;
+export declare const normalizeOrigin: (origin?: string) => string;
diff --git a/config/api-origin.js b/config/api-origin.js
@@ -0,0 +1,13 @@
+const DEFAULT_API_ORIGIN = "https://cmnw.me";
+
+const normalizeOrigin = (origin) => (origin ?? "").replace(/\/+$/, "");
+
+const API_ORIGIN = normalizeOrigin(
+  process.env.NEXT_PUBLIC_API_URL || DEFAULT_API_ORIGIN
+);
+
+module.exports = {
+  API_ORIGIN,
+  DEFAULT_API_ORIGIN,
+  normalizeOrigin,
+};
diff --git a/constants/domains.ts b/constants/domains.ts
diff --git a/constants/endpoints.ts b/constants/endpoints.ts
@@ -0,0 +1,12 @@
+import { API_ORIGIN } from "@/config/api-origin";
+
+// External service domains
+export const ENDPOINTS = {
+  API: API_ORIGIN,
+  LOCALHOST: "http://localhost:8080",
+  WARCRAFT_LOGS: "https://www.warcraftlogs.com",
+  WOW_PROGRESS: "https://www.wowprogress.com",
+  RAIDER_IO: "https://raider.io",
+  BATTLE_NET: "https://worldofwarcraft.com",
+  CHECK_PVP: "https://check-pvp.fr",
+};
diff --git a/constants/index.ts b/constants/index.ts
@@ -4,7 +4,7 @@ export * from "./gradient-colors";
 export * from "./blog-posts";
 export * from "./class-colors";
 export * from "./contributors";
-export * from "./domains";
+export * from "./endpoints";
 export * from "./expansions";
 export * from "./factions";
 export * from "./hash";
diff --git a/factory1.css b/factory1.css
diff --git a/factory2.css b/factory2.css
diff --git a/lib/api/client.ts b/lib/api/client.ts
@@ -1,14 +1,14 @@
-import { DOMAINS } from "@/constants/domains";
+import { ENDPOINTS } from "@/constants/endpoints";
 
 /**
  * Centralized API client for communicating with the CMNW backend
  * Handles request formatting, error handling, and response parsing
  */
 export class ApiClient {
-  private baseUrl: string;
+  private readonly baseUrl: string;
 
   constructor() {
-    this.baseUrl = process.env.NEXT_PUBLIC_API_URL || DOMAINS.domain;
+    this.baseUrl = ENDPOINTS.API;
   }
 
   /**
diff --git a/next.config.js b/next.config.js
@@ -1,3 +1,5 @@
+const { API_ORIGIN } = require('./config/api-origin');
+
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   turbopack: {
@@ -16,7 +18,7 @@ const nextConfig = {
       beforeFiles: [
         {
           source: '/api/:path*',
-          destination: 'http://localhost:8080/api/:path*',
+          destination: `${API_ORIGIN}/api/:path*`,
         },
       ],
     };
