ani-client 1.6.0 → 1.7.0

package/dist/index.js

@@ -1,33 +1,91 @@
 'use strict';
 
 // src/utils/markdown.ts
+function isSafeUrl(url) {
+  return /^https?:\/\//i.test(url);
+}
 function parseAniListMarkdown(text) {
   if (!text) return "";
   let html = text;
+  html = html.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
+  html = html.replace(/```([\s\S]*?)```/g, (_match, code) => {
+    return `<pre><code>${code.trim()}</code></pre>`;
+  });
+  html = html.replace(/`([^`]+)`/g, "<code>$1</code>");
   html = html.replace(/~!(.*?)!~/gs, '<span class="anilist-spoiler">$1</span>');
   html = html.replace(/~~~(.*?)~~~/gs, '<div class="anilist-center">$1</div>');
-  html = html.replace(/img(\d+)\((.*?)\)/gi, '<img src="$2" width="$1" alt="" class="anilist-image" />');
-  html = html.replace(/img\((.*?)\)/gi, '<img src="$1" alt="" class="anilist-image" />');
   html = html.replace(
-    /youtube\((.*?)\)/gi,
-    '<iframe src="https://www.youtube.com/embed/$1" frameborder="0" allowfullscreen class="anilist-youtube"></iframe>'
+    /img(\d+)\((.*?)\)/gi,
+    (_match, width, url) => isSafeUrl(url) ? `<img src="${url}" width="${width}" alt="" class="anilist-image" />` : ""
+  );
+  html = html.replace(
+    /img\((.*?)\)/gi,
+    (_match, url) => isSafeUrl(url) ? `<img src="${url}" alt="" class="anilist-image" />` : ""
   );
-  html = html.replace(/webm\((.*?)\)/gi, '<video src="$1" controls class="anilist-webm"></video>');
+  html = html.replace(/youtube\((.*?)\)/gi, (_match, id) => {
+    if (!/^[\w-]+$/.test(id)) return "";
+    return `<iframe src="https://www.youtube.com/embed/${id}" frameborder="0" allowfullscreen class="anilist-youtube"></iframe>`;
+  });
+  html = html.replace(
+    /webm\((.*?)\)/gi,
+    (_match, url) => isSafeUrl(url) ? `<video src="${url}" controls class="anilist-webm"></video>` : ""
+  );
+  html = html.replace(/^######\s+(.+)$/gm, "<h6>$1</h6>");
+  html = html.replace(/^#####\s+(.+)$/gm, "<h5>$1</h5>");
+  html = html.replace(/^####\s+(.+)$/gm, "<h4>$1</h4>");
+  html = html.replace(/^###\s+(.+)$/gm, "<h3>$1</h3>");
+  html = html.replace(/^##\s+(.+)$/gm, "<h2>$1</h2>");
+  html = html.replace(/^#\s+(.+)$/gm, "<h1>$1</h1>");
   html = html.replace(/__(.*?)__/g, "<strong>$1</strong>");
   html = html.replace(/\*\*(.*?)\*\*/g, "<strong>$1</strong>");
   html = html.replace(/_(.*?)_/g, "<em>$1</em>");
   html = html.replace(/(?<!\*)\*(?!\*)(.*?)(?<!\*)\*(?!\*)/g, "<em>$1</em>");
   html = html.replace(/~~(.*?)~~/g, "<del>$1</del>");
-  html = html.replace(/\[(.*?)\]\((.*?)\)/g, '<a href="$2" target="_blank" rel="noopener noreferrer">$1</a>');
+  html = html.replace(
+    /\[(.*?)\]\((.*?)\)/g,
+    (_match, text2, url) => isSafeUrl(url) ? `<a href="${url}" target="_blank" rel="noopener noreferrer">${text2}</a>` : text2
+  );
   html = html.replace(/\r\n/g, "\n");
+  const lines = html.split("\n");
+  const processed = [];
+  let listType = null;
+  for (const line of lines) {
+    const ulMatch = line.match(/^[\s]*[-*]\s+(.*)/);
+    const olMatch = line.match(/^[\s]*\d+\.\s+(.*)/);
+    if (ulMatch) {
+      if (listType !== "ul") {
+        if (listType) processed.push(`</${listType}>`);
+        processed.push("<ul>");
+        listType = "ul";
+      }
+      processed.push(`<li>${ulMatch[1]}</li>`);
+    } else if (olMatch) {
+      if (listType !== "ol") {
+        if (listType) processed.push(`</${listType}>`);
+        processed.push("<ol>");
+        listType = "ol";
+      }
+      processed.push(`<li>${olMatch[1]}</li>`);
+    } else {
+      if (listType) {
+        processed.push(`</${listType}>`);
+        listType = null;
+      }
+      processed.push(line);
+    }
+  }
+  if (listType) processed.push(`</${listType}>`);
+  html = processed.join("\n");
   const paragraphs = html.split(/\n{2,}/);
   html = paragraphs.map((p) => {
-    const withBr = p.replace(/\n/g, "<br />");
-    if (withBr.match(/^(<div|<iframe|<video|<img)/)) {
+    const trimmed = p.trim();
+    if (!trimmed) return "";
+    const withBr = trimmed.replace(/\n/g, "<br />");
+    if (withBr.match(/^(<div|<iframe|<video|<img|<h[1-6]|<ul|<ol|<pre)/)) {
       return withBr;
     }
     return `<p>${withBr}</p>`;
-  }).join("\n");
+  }).filter(Boolean).join("\n");
   return html;
 }
 
@@ -430,6 +488,48 @@ var STUDIO_FIELDS = `
     }
   }
 `;
+var THREAD_FIELDS = `
+  id
+  title
+  body(asHtml: false)
+  userId
+  replyUserId
+  replyCommentId
+  replyCount
+  viewCount
+  isLocked
+  isSticky
+  isSubscribed
+  repliedAt
+  createdAt
+  updatedAt
+  siteUrl
+  user {
+    id
+    name
+    avatar { large medium }
+  }
+  replyUser {
+    id
+    name
+    avatar { large medium }
+  }
+  categories {
+    id
+    name
+  }
+  mediaCategories {
+    id
+    title { romaji english native userPreferred }
+    type
+    coverImage { large medium }
+    siteUrl
+  }
+  likes {
+    id
+    name
+  }
+`;
 
 // src/queries/media.ts
 var QUERY_MEDIA_BY_ID = `
@@ -678,10 +778,10 @@ query ($id: Int!) {
   }
 }`;
 var QUERY_STUDIO_SEARCH = `
-query ($search: String, $page: Int, $perPage: Int) {
+query ($search: String, $sort: [StudioSort], $page: Int, $perPage: Int) {
   Page(page: $page, perPage: $perPage) {
     pageInfo { total perPage currentPage lastPage hasNextPage }
-    studios(search: $search) {
+    studios(search: $search, sort: $sort) {
       ${STUDIO_FIELDS}
     }
   }
@@ -712,7 +812,7 @@ function buildMediaByIdQuery(include) {
   }
   if (include.characters) {
     const opts = typeof include.characters === "object" ? include.characters : {};
-    const perPage = opts.perPage ?? 25;
+    const perPage = clampPerPage(opts.perPage ?? 25);
     const sortClause = opts.sort !== false ? ", sort: [ROLE, RELEVANCE, ID]" : "";
     const voiceActorBlock = opts.voiceActors ? `
             voiceActors {
@@ -730,7 +830,7 @@ function buildMediaByIdQuery(include) {
   }
   if (include.staff) {
     const opts = typeof include.staff === "object" ? include.staff : {};
-    const perPage = opts.perPage ?? 25;
+    const perPage = clampPerPage(opts.perPage ?? 25);
     const sortClause = opts.sort !== false ? ", sort: [RELEVANCE, ID]" : "";
     extra.push(`
     staff(perPage: ${perPage}${sortClause}) {
@@ -743,7 +843,9 @@ function buildMediaByIdQuery(include) {
     }`);
   }
   if (include.recommendations) {
-    const perPage = typeof include.recommendations === "object" ? include.recommendations.perPage ?? 10 : 10;
+    const perPage = clampPerPage(
+      typeof include.recommendations === "object" ? include.recommendations.perPage ?? 10 : 10
+    );
     extra.push(`
     recommendations(perPage: ${perPage}, sort: [RATING_DESC]) {
       nodes {
@@ -802,53 +904,11 @@ function buildBatchQuery(ids, typeName, fields, prefix) {
   ${aliases}
 }`;
 }
-var buildBatchMediaQuery = (ids) => buildBatchQuery(ids, "Media", MEDIA_FIELDS_BASE, "m");
+var buildBatchMediaQuery = (ids) => buildBatchQuery(ids, "Media", MEDIA_FIELDS, "m");
 var buildBatchCharacterQuery = (ids) => buildBatchQuery(ids, "Character", CHARACTER_FIELDS, "c");
 var buildBatchStaffQuery = (ids) => buildBatchQuery(ids, "Staff", STAFF_FIELDS, "s");
 
 // src/queries/thread.ts
-var THREAD_FIELDS = `
-  id
-  title
-  body(asHtml: false)
-  userId
-  replyUserId
-  replyCommentId
-  replyCount
-  viewCount
-  isLocked
-  isSticky
-  isSubscribed
-  repliedAt
-  createdAt
-  updatedAt
-  siteUrl
-  user {
-    id
-    name
-    avatar { large medium }
-  }
-  replyUser {
-    id
-    name
-    avatar { large medium }
-  }
-  categories {
-    id
-    name
-  }
-  mediaCategories {
-    id
-    title { romaji english native userPreferred }
-    type
-    coverImage { large medium }
-    siteUrl
-  }
-  likes {
-    id
-    name
-  }
-`;
 var QUERY_THREAD_BY_ID = `
 query ($id: Int!) {
   Thread(id: $id) {
@@ -870,6 +930,8 @@ var RateLimiter = class {
   constructor(options = {}) {
     this.head = 0;
     this.count = 0;
+    /** @internal — active sleep timers for cleanup */
+    this.activeTimers = /* @__PURE__ */ new Set();
     this.maxRequests = options.maxRequests ?? 85;
     this.windowMs = options.windowMs ?? 6e4;
     this.maxRetries = options.maxRetries ?? 3;
@@ -887,8 +949,7 @@ var RateLimiter = class {
     if (!this.enabled) return;
     if (this.count >= this.maxRequests) {
       const oldest = this.timestamps[this.head];
-      const now2 = Date.now();
-      const elapsed = now2 - oldest;
+      const elapsed = Date.now() - oldest;
       if (elapsed < this.windowMs) {
         const waitMs = this.windowMs - elapsed + 50;
         await this.sleep(waitMs);
@@ -952,14 +1013,32 @@ var RateLimiter = class {
     if (this.timeoutMs <= 0) return fetch(url, init);
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), this.timeoutMs);
+    const signals = [controller.signal, init.signal].filter(Boolean);
+    const combinedSignal = signals.length > 1 ? AbortSignal.any(signals) : signals[0];
     try {
-      return await fetch(url, { ...init, signal: controller.signal });
+      return await fetch(url, { ...init, signal: combinedSignal });
     } finally {
       clearTimeout(timer);
     }
   }
   sleep(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
+    return new Promise((resolve) => {
+      const timer = setTimeout(() => {
+        this.activeTimers.delete(timer);
+        resolve();
+      }, ms);
+      this.activeTimers.add(timer);
+    });
+  }
+  /** Cancel all pending sleep timers and reset internal state. */
+  dispose() {
+    for (const timer of this.activeTimers) {
+      clearTimeout(timer);
+    }
+    this.activeTimers.clear();
+    this.head = 0;
+    this.count = 0;
+    this.timestamps.fill(0);
   }
 };
 var RETRYABLE_NETWORK_CODES = /* @__PURE__ */ new Set([
@@ -1163,6 +1242,18 @@ var UserSort = /* @__PURE__ */ ((UserSort2) => {
   return UserSort2;
 })(UserSort || {});
 
+// src/types/studio.ts
+var StudioSort = /* @__PURE__ */ ((StudioSort2) => {
+  StudioSort2["ID"] = "ID";
+  StudioSort2["ID_DESC"] = "ID_DESC";
+  StudioSort2["NAME"] = "NAME";
+  StudioSort2["NAME_DESC"] = "NAME_DESC";
+  StudioSort2["SEARCH_MATCH"] = "SEARCH_MATCH";
+  StudioSort2["FAVOURITES"] = "FAVOURITES";
+  StudioSort2["FAVOURITES_DESC"] = "FAVOURITES_DESC";
+  return StudioSort2;
+})(StudioSort || {});
+
 // src/types/lists.ts
 var MediaListStatus = /* @__PURE__ */ ((MediaListStatus2) => {
   MediaListStatus2["CURRENT"] = "CURRENT";
@@ -1275,7 +1366,7 @@ async function getAiredEpisodes(client, options = {}) {
     "airingSchedules"
   );
 }
-async function getAiredChapters(client, options = {}) {
+async function getRecentlyUpdatedManga(client, options = {}) {
   return client.pagedRequest(
     QUERY_RECENT_CHAPTERS,
     {
@@ -1298,6 +1389,7 @@ async function getPlanning(client, options = {}) {
   );
 }
 async function getRecommendations(client, mediaId, options = {}) {
+  validateId(mediaId, "mediaId");
   const data = await client.request(QUERY_RECOMMENDATIONS, {
     mediaId,
     page: options.page ?? 1,
@@ -1333,14 +1425,12 @@ async function getWeeklySchedule(client, date = /* @__PURE__ */ new Date()) {
     Saturday: [],
     Sunday: []
   };
-  const startOfWeek = new Date(date);
-  const day = startOfWeek.getDay();
-  const diff = startOfWeek.getDate() - day + (day === 0 ? -6 : 1);
-  startOfWeek.setDate(diff);
-  startOfWeek.setHours(0, 0, 0, 0);
+  const utcDay = date.getUTCDay();
+  const diff = utcDay === 0 ? -6 : 1 - utcDay;
+  const startOfWeek = new Date(Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate() + diff, 0, 0, 0));
   const endOfWeek = new Date(startOfWeek);
-  endOfWeek.setDate(startOfWeek.getDate() + 6);
-  endOfWeek.setHours(23, 59, 59, 999);
+  endOfWeek.setUTCDate(startOfWeek.getUTCDate() + 6);
+  endOfWeek.setUTCHours(23, 59, 59, 999);
   const startTimestamp = Math.floor(startOfWeek.getTime() / 1e3);
   const endTimestamp = Math.floor(endOfWeek.getTime() / 1e3);
   const iterator = client.paginate(
@@ -1349,12 +1439,13 @@ async function getWeeklySchedule(client, date = /* @__PURE__ */ new Date()) {
       airingAtLesser: endTimestamp,
       page,
       perPage: 50
-    })
+    }),
+    20
   );
   const names = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
   for await (const episode of iterator) {
     const epDate = new Date(episode.airingAt * 1e3);
-    const dayName = names[epDate.getDay()];
+    const dayName = names[epDate.getUTCDay()];
     schedule[dayName].push(episode);
   }
   return schedule;
@@ -1387,12 +1478,14 @@ async function getStudio(client, id) {
   return data.Studio;
 }
 async function searchStudios(client, options = {}) {
+  const { query: search, page = 1, perPage = 20, sort } = options;
   return client.pagedRequest(
     QUERY_STUDIO_SEARCH,
     {
-      search: options.query,
-      page: options.page ?? 1,
-      perPage: clampPerPage(options.perPage ?? 20)
+      search,
+      sort,
+      page,
+      perPage: clampPerPage(perPage)
     },
     "studios"
   );
@@ -1438,6 +1531,9 @@ async function getUserMediaList(client, options) {
   if (!options.userId && !options.userName) {
     throw new AniListError("getUserMediaList requires either userId or userName", 0, []);
   }
+  if (options.userId) {
+    validateId(options.userId, "userId");
+  }
   return client.pagedRequest(
     QUERY_USER_MEDIA_LIST,
     {
@@ -1477,13 +1573,15 @@ function mapFavorites(fav) {
 
 // src/client/index.ts
 var DEFAULT_API_URL = "https://graphql.anilist.co";
+var LIB_VERSION = "1.7.0" ;
 var AniListClient = class {
   constructor(options = {}) {
     this.inFlight = /* @__PURE__ */ new Map();
     this.apiUrl = options.apiUrl ?? DEFAULT_API_URL;
     this.headers = {
       "Content-Type": "application/json",
-      Accept: "application/json"
+      Accept: "application/json",
+      "User-Agent": `ani-client/${LIB_VERSION}`
     };
     if (options.token) {
       this.headers.Authorization = `Bearer ${options.token}`;
@@ -1507,7 +1605,6 @@ var AniListClient = class {
   get lastRequestMeta() {
     return this._lastRequestMeta;
   }
-  // ── Core infrastructure (internal) ──
   /** @internal */
   async request(query, variables = {}) {
     const cacheKey = MemoryCache.key(query, variables);
@@ -1534,20 +1631,29 @@ var AniListClient = class {
     const start = Date.now();
     this.hooks.onRequest?.(query, variables);
     const minifiedQuery = normalizeQuery(query);
-    const res = await this.rateLimiter.fetchWithRetry(
-      this.apiUrl,
-      {
-        method: "POST",
-        headers: this.headers,
-        body: JSON.stringify({ query: minifiedQuery, variables }),
-        signal: this.signal
-      },
-      { onRetry: this.hooks.onRetry, onRateLimit: this.hooks.onRateLimit }
-    );
+    let res;
+    try {
+      res = await this.rateLimiter.fetchWithRetry(
+        this.apiUrl,
+        {
+          method: "POST",
+          headers: this.headers,
+          body: JSON.stringify({ query: minifiedQuery, variables }),
+          signal: this.signal
+        },
+        { onRetry: this.hooks.onRetry, onRateLimit: this.hooks.onRateLimit }
+      );
+    } catch (err) {
+      const error = err instanceof AniListError ? err : new AniListError(err.message ?? "Network request failed", 0, [err]);
+      this.hooks.onError?.(error, query, variables);
+      throw error;
+    }
     const json = await res.json();
     if (!res.ok || json.errors) {
       const message = json.errors?.[0]?.message ?? `AniList API error (HTTP ${res.status})`;
-      throw new AniListError(message, res.status, json.errors ?? []);
+      const error = new AniListError(message, res.status, json.errors ?? []);
+      this.hooks.onError?.(error, query, variables);
+      throw error;
     }
     const rlLimit = res.headers.get("X-RateLimit-Limit");
     const rlRemaining = res.headers.get("X-RateLimit-Remaining");
@@ -1576,7 +1682,6 @@ var AniListClient = class {
     }
     return { pageInfo: data.Page.pageInfo, results };
   }
-  // ── Media ──
   /**
    * Fetch a single media entry by its AniList ID.
    *
@@ -1613,9 +1718,19 @@ var AniListClient = class {
   async getAiredEpisodes(options = {}) {
     return getAiredEpisodes(this, options);
   }
-  /** Get currently releasing manga. */
+  /**
+   * Get currently releasing manga sorted by most recently updated.
+   *
+   * @param options - Pagination parameters
+   */
+  async getRecentlyUpdatedManga(options = {}) {
+    return getRecentlyUpdatedManga(this, options);
+  }
+  /**
+   * @deprecated Use `getRecentlyUpdatedManga` instead. This alias will be removed in v2.
+   */
   async getAiredChapters(options = {}) {
-    return getAiredChapters(this, options);
+    return this.getRecentlyUpdatedManga(options);
   }
   /** Get the detailed schedule for the current week, sorted by day. */
   async getWeeklySchedule(date) {
@@ -1633,7 +1748,6 @@ var AniListClient = class {
   async getMediaBySeason(options) {
     return getMediaBySeason(this, options);
   }
-  // ── Characters ──
   /** Fetch a character by AniList ID. Pass `{ voiceActors: true }` to include VA data. */
   async getCharacter(id, include) {
     return getCharacter(this, id, include);
@@ -1642,7 +1756,6 @@ var AniListClient = class {
   async searchCharacters(options = {}) {
     return searchCharacters(this, options);
   }
-  // ── Staff ──
   /** Fetch a staff member by AniList ID. Pass `{ media: true }` or `{ media: { perPage } }` for media credits. */
   async getStaff(id, include) {
     return getStaff(this, id, include);
@@ -1651,7 +1764,6 @@ var AniListClient = class {
   async searchStaff(options = {}) {
     return searchStaff(this, options);
   }
-  // ── Users ──
   /**
    * Fetch a user by AniList ID or username.
    *
@@ -1683,7 +1795,6 @@ var AniListClient = class {
   async getUserFavorites(idOrName) {
     return getUserFavorites(this, idOrName);
   }
-  // ── Studios ──
   /** Fetch a studio by its AniList ID. */
   async getStudio(id) {
     return getStudio(this, id);
@@ -1692,8 +1803,6 @@ var AniListClient = class {
   async searchStudios(options = {}) {
     return searchStudios(this, options);
   }
-  // ── Metadata ──
-  // ── Threads ──
   /** Fetch a forum thread by its AniList ID. */
   async getThread(id) {
     return getThread(this, id);
@@ -1712,12 +1821,10 @@ var AniListClient = class {
     const data = await this.request(QUERY_TAGS);
     return data.MediaTagCollection;
   }
-  // ── Raw query ──
   /** Execute an arbitrary GraphQL query against the AniList API. */
   async raw(query, variables) {
     return this.request(query, variables ?? {});
   }
-  // ── Pagination ──
   /**
    * Auto-paginating async iterator. Yields individual items across all pages.
    *
@@ -1736,7 +1843,6 @@ var AniListClient = class {
       page++;
     }
   }
-  // ── Batch queries ──
   /** Fetch multiple media entries in a single API request. */
   async getMediaBatch(ids) {
     if (ids.length === 0) return [];
@@ -1770,13 +1876,12 @@ var AniListClient = class {
     );
     return chunkResults.flat();
   }
-  // ── Cache management ──
   /** Clear the entire response cache. */
   async clearCache() {
     await this.cacheAdapter.clear();
   }
   /** Number of entries currently in the cache. */
-  get cacheSize() {
+  async cacheSize() {
     return this.cacheAdapter.size;
   }
   /** Remove cache entries whose key matches the given pattern. */
@@ -1799,6 +1904,7 @@ var AniListClient = class {
   async destroy() {
     await this.cacheAdapter.clear();
     this.inFlight.clear();
+    this.rateLimiter.dispose();
   }
 };
 
@@ -1904,6 +2010,7 @@ exports.RateLimiter = RateLimiter;
 exports.RecommendationSort = RecommendationSort;
 exports.RedisCache = RedisCache;
 exports.StaffSort = StaffSort;
+exports.StudioSort = StudioSort;
 exports.ThreadSort = ThreadSort;
 exports.UserSort = UserSort;
 exports.parseAniListMarkdown = parseAniListMarkdown;