@Pachat Added keyword in filter route

Author: cryshin22

src/controllers/search.controller.js

@@ -2,13 +2,27 @@ import extractSearchResults from "../extractors/search.extractor.js";
 
 export const search = async (req) => {
   try {
-    let { keyword } = req.query;
+    let { keyword, type, status, rated, score, season, language, genres, sort, sy, sm, sd, ey, em, ed } = req.query;
     let page = parseInt(req.query.page) || 1;
 
-    const [totalPage, data] = await extractSearchResults(
-      encodeURIComponent(keyword),
-      page
-    );
+    const [totalPage, data] = await extractSearchResults({
+      keyword: keyword, 
+      type: type,
+      status: status,
+      rated: rated,
+      score: score,
+      season: season,
+      language: language,
+      genres: genres,
+      sort: sort,
+      page: page,
+      sy: sy,
+      sm: sm,
+      sd: sd,
+      ey: ey,
+      em: em,
+      ed: ed,
+    });
     if (page > totalPage) {
       const error = new Error("Requested page exceeds total available pages.");
       error.status = 404;

src/extractors/filter.extractor.js

@@ -78,17 +78,21 @@ async function extractFilterResults(params = {}) {
 
     const queryParams = new URLSearchParams(filteredParams).toString();
 
-    const resp = await axios.get(
-      `https://${v1_base_url}/filter?${queryParams}`,
-      {
-        headers: {
-          Accept:
-            "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8",
-          "Accept-Encoding": "gzip, deflate, br",
-          "User-Agent": DEFAULT_HEADERS,
-        },
-      }
-    );
+    let apiUrl = `https://${v1_base_url}/filter?${queryParams}`;
+
+    if (filteredParams.keyword) {
+      apiUrl = `https://${v1_base_url}/search?${queryParams}`;
+    }
+
+    const resp = await axios.get(apiUrl, {
+      headers: {
+        Accept:
+          "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8",
+
+        "Accept-Encoding": "gzip, deflate, br",
+        "User-Agent": DEFAULT_HEADERS,
+      },
+    });
 
     const $ = cheerio.load(resp.data);
     const elements = ".flw-item";
@@ -136,9 +140,7 @@ async function extractFilterResults(params = {}) {
                 .replace(/[^0-9]/g, "")
             ) || null,
         },
-        adultContent:
-          $el.find(".tick-rate").text().trim() ||
-          null,
+        adultContent: $el.find(".tick-rate").text().trim() || null,
       });
     });
 

src/extractors/search.extractor.js

@@ -2,20 +2,90 @@ import axios from "axios";
 import * as cheerio from "cheerio";
 import { DEFAULT_HEADERS } from "../configs/header.config.js";
 import { v1_base_url } from "../utils/base_v1.js";
+import {
+  FILTER_LANGUAGE_MAP,
+  GENRE_MAP,
+  FILTER_TYPES,
+  FILTER_STATUS,
+  FILTER_RATED,
+  FILTER_SCORE,
+  FILTER_SEASON,
+  FILTER_SORT,
+} from "../routes/filter.maping.js";
 
-async function extractSearchResults(search, page) {
+async function extractSearchResults(params = {}) {
   try {
-    const resp = await axios.get(
-      `https://${v1_base_url}/search?keyword=${search}&page=${page}`,
-      {
-        headers: {
-          Accept:
-            "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9",
-          "Accept-Encoding": "gzip, deflate, br",
-          "User-Agent": DEFAULT_HEADERS,
-        },
+    const normalizeParam = (param, mapping) => {
+      if (!param) return undefined;
+
+      if (typeof param === "string") {
+        const isAlreadyId = Object.values(mapping).includes(param);
+        if (isAlreadyId) {
+          return param;
+        }
+
+        const key = param.trim().toUpperCase();
+        return mapping.hasOwnProperty(key) ? mapping[key] : undefined;
       }
-    );
+      return param;
+    };
+
+    const typeParam = normalizeParam(params.type, FILTER_TYPES);
+    const statusParam = normalizeParam(params.status, FILTER_STATUS);
+    const ratedParam = normalizeParam(params.rated, FILTER_RATED);
+    const scoreParam = normalizeParam(params.score, FILTER_SCORE);
+    const seasonParam = normalizeParam(params.season, FILTER_SEASON);
+    const sortParam = normalizeParam(params.sort, FILTER_SORT);
+
+    let languageParam = params.language;
+    if (typeof languageParam === "string") {
+      languageParam = languageParam.trim().toUpperCase();
+      languageParam = FILTER_LANGUAGE_MAP[languageParam] || undefined;
+    }
+
+    let genresParam = params.genres;
+    if (typeof genresParam === "string") {
+      genresParam = genresParam
+        .split(",")
+        .map((genre) => GENRE_MAP[genre.trim().toUpperCase()] || genre.trim())
+        .join(",");
+    }
+
+    const filteredParams = {
+      type: typeParam,
+      status: statusParam,
+      rated: ratedParam,
+      score: scoreParam,
+      season: seasonParam,
+      language: languageParam,
+      genres: genresParam,
+      sort: sortParam,
+      page: params.page || 1,
+      sy: params.sy || undefined,
+      sm: params.sm || undefined,
+      sd: params.sd || undefined,
+      ey: params.ey || undefined,
+      em: params.em || undefined,
+      ed: params.ed || undefined,
+      keyword: params.keyword || undefined,
+    };
+
+    Object.keys(filteredParams).forEach((key) => {
+      if (filteredParams[key] === undefined) {
+        delete filteredParams[key];
+      }
+    });
+
+    const queryParams = new URLSearchParams(filteredParams).toString();
+
+    const resp = await axios.get(`https://${v1_base_url}/search?${queryParams}`, {
+      headers: {
+        Accept:
+          "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9",
+        "Accept-Encoding": "gzip, deflate, br",
+        "User-Agent": DEFAULT_HEADERS,
+      },
+    });
 
     const $ = cheerio.load(resp.data);
     const elements = "#main-content .film_list-wrap .flw-item";
@@ -59,10 +129,11 @@ async function extractSearchResults(search, page) {
             .find(".film-poster .film-poster-img")
             ?.attr("data-src")
             ?.trim() || null,
-        duration: $(el)
-          .find(".film-detail .fd-infor .fdi-item.fdi-duration")
-          ?.text()
-          ?.trim(),
+        duration:
+          $(el)
+            .find(".film-detail .fd-infor .fdi-item.fdi-duration")
+            ?.text()
+            ?.trim(),
         tvInfo: {
           showType:
             $(el)