ani-client 1.4.4 → 1.5.0

package/dist/index.mjs

@@ -33,6 +33,13 @@ var MEDIA_FIELDS_BASE = `
   studios { nodes { id name isAnimationStudio siteUrl } }
   isAdult
   siteUrl
+  nextAiringEpisode {
+    id
+    airingAt
+    episode
+    mediaId
+    timeUntilAiring
+  }
 `;
 var RELATIONS_FIELDS = `
   relations {
@@ -200,6 +207,10 @@ query (
   $seasonYear: Int,
   $genre: String,
   $tag: String,
+  $genre_in: [String],
+  $tag_in: [String],
+  $genre_not_in: [String],
+  $tag_not_in: [String],
   $isAdult: Boolean,
   $sort: [MediaSort],
   $page: Int,
@@ -216,6 +227,10 @@ query (
       seasonYear: $seasonYear,
       genre: $genre,
       tag: $tag,
+      genre_in: $genre_in,
+      tag_in: $tag_in,
+      genre_not_in: $genre_not_in,
+      tag_not_in: $tag_not_in,
       isAdult: $isAdult,
       sort: $sort
     ) {
@@ -296,6 +311,15 @@ query ($name: String!) {
     ${USER_FIELDS}
   }
 }`;
+var QUERY_USER_SEARCH = `
+query ($search: String, $sort: [UserSort], $page: Int, $perPage: Int) {
+  Page(page: $page, perPage: $perPage) {
+    pageInfo { total perPage currentPage lastPage hasNextPage }
+    users(search: $search, sort: $sort) {
+      ${USER_FIELDS}
+    }
+  }
+}`;
 var QUERY_AIRING_SCHEDULE = `
 query ($airingAt_greater: Int, $airingAt_lesser: Int, $sort: [AiringSort], $page: Int, $perPage: Int) {
   Page(page: $page, perPage: $perPage) {
@@ -550,6 +574,21 @@ var buildBatchMediaQuery = (ids) => buildBatchQuery(ids, "Media", MEDIA_FIELDS_B
 var buildBatchCharacterQuery = (ids) => buildBatchQuery(ids, "Character", CHARACTER_FIELDS, "c");
 var buildBatchStaffQuery = (ids) => buildBatchQuery(ids, "Staff", STAFF_FIELDS, "s");
 
+// src/utils/index.ts
+function normalizeQuery(query) {
+  return query.replace(/\s+/g, " ").trim();
+}
+function clampPerPage(value) {
+  return Math.min(Math.max(value, 1), 50);
+}
+function chunk(arr, size) {
+  const chunks = [];
+  for (let i = 0; i < arr.length; i += size) {
+    chunks.push(arr.slice(i, i + size));
+  }
+  return chunks;
+}
+
 // src/cache/index.ts
 var ONE_DAY_MS = 24 * 60 * 60 * 1e3;
 var MemoryCache = class {
@@ -561,7 +600,7 @@ var MemoryCache = class {
   }
   /** Build a deterministic cache key from a query + variables pair. */
   static key(query, variables) {
-    const normalized = query.replace(/\s+/g, " ").trim();
+    const normalized = normalizeQuery(query);
     return `${normalized}|${JSON.stringify(variables, Object.keys(variables).sort())}`;
   }
   /** Retrieve a cached value, or `undefined` if missing / expired. */
@@ -606,14 +645,17 @@ var MemoryCache = class {
   /**
    * Remove all entries whose key matches the given pattern.
    *
-   * @param pattern — A string (converted to RegExp) or RegExp.
+   * - **String**: treated as a substring match (e.g. `"Media"` removes all keys containing `"Media"`).
+   * - **RegExp**: tested against each key directly.
+   *
+   * @param pattern — A string (substring match) or RegExp.
    * @returns Number of entries removed.
    */
   invalidate(pattern) {
-    const regex = typeof pattern === "string" ? new RegExp(pattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")) : pattern;
+    const test = typeof pattern === "string" ? (key) => key.includes(pattern) : (key) => pattern.test(key);
     const toDelete = [];
     for (const key of this.store.keys()) {
-      if (regex.test(key)) toDelete.push(key);
+      if (test(key)) toDelete.push(key);
     }
     for (const key of toDelete) this.store.delete(key);
     return toDelete.length;
@@ -637,8 +679,8 @@ var AniListError = class _AniListError extends Error {
 // src/rate-limiter/index.ts
 var RateLimiter = class {
   constructor(options = {}) {
-    /** @internal */
-    this.timestamps = [];
+    this.head = 0;
+    this.count = 0;
     this.maxRequests = options.maxRequests ?? 85;
     this.windowMs = options.windowMs ?? 6e4;
     this.maxRetries = options.maxRetries ?? 3;
@@ -646,24 +688,34 @@ var RateLimiter = class {
     this.enabled = options.enabled ?? true;
     this.timeoutMs = options.timeoutMs ?? 3e4;
     this.retryOnNetworkError = options.retryOnNetworkError ?? true;
+    this.timestamps = new Array(this.maxRequests).fill(0);
   }
   /**
    * Wait until it's safe to make a request (respects rate limit window).
    */
   async acquire() {
     if (!this.enabled) return;
+    if (this.count >= this.maxRequests) {
+      const oldest = this.timestamps[this.head];
+      const now2 = Date.now();
+      const elapsed = now2 - oldest;
+      if (elapsed < this.windowMs) {
+        const waitMs = this.windowMs - elapsed + 50;
+        await this.sleep(waitMs);
+      }
+    }
     const now = Date.now();
-    this.timestamps = this.timestamps.filter((t) => now - t < this.windowMs);
-    if (this.timestamps.length >= this.maxRequests) {
-      const oldest = this.timestamps[0];
-      const waitMs = this.windowMs - (now - oldest) + 50;
-      await this.sleep(waitMs);
-      return this.acquire();
+    if (this.count < this.maxRequests) {
+      this.timestamps[(this.head + this.count) % this.maxRequests] = now;
+      this.count++;
+    } else {
+      this.timestamps[this.head] = now;
+      this.head = (this.head + 1) % this.maxRequests;
     }
-    this.timestamps.push(Date.now());
   }
   /**
    * Execute a fetch with automatic retry on 429 responses and network errors.
+   * Uses exponential backoff with jitter for retry delays.
    */
   async fetchWithRetry(url, init, hooks) {
     await this.acquire();
@@ -676,7 +728,7 @@ var RateLimiter = class {
         lastResponse = res;
         if (attempt === this.maxRetries) break;
         const retryAfter = res.headers.get("Retry-After");
-        const delayMs = retryAfter ? Number.parseInt(retryAfter, 10) * 1e3 : this.retryDelayMs * (attempt + 1);
+        const delayMs = retryAfter ? Number.parseInt(retryAfter, 10) * 1e3 : this.exponentialDelay(attempt);
         hooks?.onRateLimit?.(delayMs);
         hooks?.onRetry?.(attempt + 1, "HTTP 429", delayMs);
         await this.sleep(delayMs);
@@ -684,7 +736,7 @@ var RateLimiter = class {
       } catch (err) {
         lastError = err;
         if (this.retryOnNetworkError && isNetworkError(err) && attempt < this.maxRetries) {
-          const delayMs = this.retryDelayMs * (attempt + 1);
+          const delayMs = this.exponentialDelay(attempt);
           hooks?.onRetry?.(attempt + 1, `Network error: ${err.message}`, delayMs);
           await this.sleep(delayMs);
           await this.acquire();
@@ -696,6 +748,12 @@ var RateLimiter = class {
     if (lastResponse) return lastResponse;
     throw lastError;
   }
+  /** @internal — Exponential backoff with jitter, capped at 30s */
+  exponentialDelay(attempt) {
+    const base = this.retryDelayMs * 2 ** attempt;
+    const jitter = Math.random() * 1e3;
+    return Math.min(base + jitter, 3e4);
+  }
   /** @internal */
   async fetchWithTimeout(url, init) {
     if (this.timeoutMs <= 0) return fetch(url, init);
@@ -735,6 +793,24 @@ var MediaType = /* @__PURE__ */ ((MediaType2) => {
   MediaType2["MANGA"] = "MANGA";
   return MediaType2;
 })(MediaType || {});
+var MediaSource = /* @__PURE__ */ ((MediaSource2) => {
+  MediaSource2["ORIGINAL"] = "ORIGINAL";
+  MediaSource2["MANGA"] = "MANGA";
+  MediaSource2["LIGHT_NOVEL"] = "LIGHT_NOVEL";
+  MediaSource2["VISUAL_NOVEL"] = "VISUAL_NOVEL";
+  MediaSource2["VIDEO_GAME"] = "VIDEO_GAME";
+  MediaSource2["OTHER"] = "OTHER";
+  MediaSource2["NOVEL"] = "NOVEL";
+  MediaSource2["DOUJINSHI"] = "DOUJINSHI";
+  MediaSource2["ANIME"] = "ANIME";
+  MediaSource2["WEB_NOVEL"] = "WEB_NOVEL";
+  MediaSource2["LIVE_ACTION"] = "LIVE_ACTION";
+  MediaSource2["GAME"] = "GAME";
+  MediaSource2["COMIC"] = "COMIC";
+  MediaSource2["MULTIMEDIA_PROJECT"] = "MULTIMEDIA_PROJECT";
+  MediaSource2["PICTURE_BOOK"] = "PICTURE_BOOK";
+  return MediaSource2;
+})(MediaSource || {});
 var MediaFormat = /* @__PURE__ */ ((MediaFormat2) => {
   MediaFormat2["TV"] = "TV";
   MediaFormat2["TV_SHORT"] = "TV_SHORT";
@@ -867,6 +943,20 @@ var StaffSort = /* @__PURE__ */ ((StaffSort2) => {
   return StaffSort2;
 })(StaffSort || {});
 
+// src/types/user.ts
+var UserSort = /* @__PURE__ */ ((UserSort2) => {
+  UserSort2["ID"] = "ID";
+  UserSort2["ID_DESC"] = "ID_DESC";
+  UserSort2["USERNAME"] = "USERNAME";
+  UserSort2["USERNAME_DESC"] = "USERNAME_DESC";
+  UserSort2["WATCHED_TIME"] = "WATCHED_TIME";
+  UserSort2["WATCHED_TIME_DESC"] = "WATCHED_TIME_DESC";
+  UserSort2["CHAPTERS_READ"] = "CHAPTERS_READ";
+  UserSort2["CHAPTERS_READ_DESC"] = "CHAPTERS_READ_DESC";
+  UserSort2["SEARCH_MATCH"] = "SEARCH_MATCH";
+  return UserSort2;
+})(UserSort || {});
+
 // src/types/lists.ts
 var MediaListStatus = /* @__PURE__ */ ((MediaListStatus2) => {
   MediaListStatus2["CURRENT"] = "CURRENT";
@@ -911,18 +1001,6 @@ var MediaListSort = /* @__PURE__ */ ((MediaListSort2) => {
   return MediaListSort2;
 })(MediaListSort || {});
 
-// src/utils/index.ts
-function clampPerPage(value) {
-  return Math.min(Math.max(value, 1), 50);
-}
-function chunk(arr, size) {
-  const chunks = [];
-  for (let i = 0; i < arr.length; i += size) {
-    chunks.push(arr.slice(i, i + size));
-  }
-  return chunks;
-}
-
 // src/client/index.ts
 var DEFAULT_API_URL = "https://graphql.anilist.co";
 var AniListClient = class {
@@ -965,7 +1043,7 @@ var AniListClient = class {
   async executeRequest(query, variables, cacheKey) {
     const start = Date.now();
     this.hooks.onRequest?.(query, variables);
-    const minifiedQuery = query.replace(/\s+/g, " ").trim();
+    const minifiedQuery = normalizeQuery(query);
     const res = await this.rateLimiter.fetchWithRetry(
       this.apiUrl,
       {
@@ -1053,10 +1131,19 @@ var AniListClient = class {
    * ```
    */
   async searchMedia(options = {}) {
-    const { query: search, page = 1, perPage = 20, ...filters } = options;
+    const { query: search, page = 1, perPage = 20, genres, tags, genresExclude, tagsExclude, ...filters } = options;
     return this.pagedRequest(
       QUERY_MEDIA_SEARCH,
-      { search, ...filters, page, perPage: clampPerPage(perPage) },
+      {
+        search,
+        ...filters,
+        genre_in: genres,
+        tag_in: tags,
+        genre_not_in: genresExclude,
+        tag_not_in: tagsExclude,
+        page,
+        perPage: clampPerPage(perPage)
+      },
       "media"
     );
   }
@@ -1070,6 +1157,30 @@ var AniListClient = class {
   async getTrending(type = "ANIME" /* ANIME */, page = 1, perPage = 20) {
     return this.pagedRequest(QUERY_TRENDING, { type, page, perPage: clampPerPage(perPage) }, "media");
   }
+  /**
+   * Get the most popular anime or manga.
+   *
+   * Convenience wrapper around `searchMedia` with `sort: POPULARITY_DESC`.
+   *
+   * @param type - `MediaType.ANIME` or `MediaType.MANGA` (defaults to ANIME)
+   * @param page - Page number (default 1)
+   * @param perPage - Results per page (default 20, max 50)
+   */
+  async getPopular(type = "ANIME" /* ANIME */, page = 1, perPage = 20) {
+    return this.searchMedia({ type, sort: ["POPULARITY_DESC" /* POPULARITY_DESC */], page, perPage });
+  }
+  /**
+   * Get the highest-rated anime or manga.
+   *
+   * Convenience wrapper around `searchMedia` with `sort: SCORE_DESC`.
+   *
+   * @param type - `MediaType.ANIME` or `MediaType.MANGA` (defaults to ANIME)
+   * @param page - Page number (default 1)
+   * @param perPage - Results per page (default 20, max 50)
+   */
+  async getTopRated(type = "ANIME" /* ANIME */, page = 1, perPage = 20) {
+    return this.searchMedia({ type, sort: ["SCORE_DESC" /* SCORE_DESC */], page, perPage });
+  }
   /**
    * Fetch a character by AniList ID.
    *
@@ -1165,36 +1276,50 @@ var AniListClient = class {
     );
   }
   /**
-   * Fetch a user by AniList ID.
+   * Fetch a user by AniList ID or username.
    *
-   * @param id - The AniList user ID
+   * @param idOrName - The AniList user ID (number) or username (string)
    * @returns The user object
    *
    * @example
    * ```ts
    * const user = await client.getUser(1);
+   * const user2 = await client.getUser("AniList");
    * console.log(user.name);
    * ```
    */
-  async getUser(id) {
-    const data = await this.request(QUERY_USER_BY_ID, { id });
+  async getUser(idOrName) {
+    if (typeof idOrName === "number") {
+      const data2 = await this.request(QUERY_USER_BY_ID, { id: idOrName });
+      return data2.User;
+    }
+    const data = await this.request(QUERY_USER_BY_NAME, { name: idOrName });
     return data.User;
   }
   /**
    * Fetch a user by username.
    *
+   * @deprecated Use `getUser(name)` instead.
    * @param name - The AniList username
    * @returns The user object
+   */
+  async getUserByName(name) {
+    return this.getUser(name);
+  }
+  /**
+   * Search for users by name.
+   *
+   * @param options - Search / pagination parameters
+   * @returns Paginated results with matching users
    *
    * @example
    * ```ts
-   * const user = await client.getUserByName("AniList");
-   * console.log(user.statistics);
+   * const result = await client.searchUsers({ query: "AniList", perPage: 5 });
    * ```
    */
-  async getUserByName(name) {
-    const data = await this.request(QUERY_USER_BY_NAME, { name });
-    return data.User;
+  async searchUsers(options = {}) {
+    const { query: search, page = 1, perPage = 20, sort } = options;
+    return this.pagedRequest(QUERY_USER_SEARCH, { search, sort, page, perPage: clampPerPage(perPage) }, "users");
   }
   /**
    * Execute an arbitrary GraphQL query against the AniList API.
@@ -1559,6 +1684,17 @@ var AniListClient = class {
     }
     return count;
   }
+  /**
+   * Clean up resources held by the client.
+   *
+   * Clears the in-memory cache and aborts any pending in-flight requests.
+   * If using a custom cache adapter (e.g. Redis), call its close/disconnect
+   * method separately.
+   */
+  async destroy() {
+    await this.cacheAdapter.clear();
+    this.inFlight.clear();
+  }
 };
 
 // src/cache/redis.ts
@@ -1644,6 +1780,6 @@ var RedisCache = class {
   }
 };
 
-export { AiringSort, AniListClient, AniListError, CharacterRole, CharacterSort, MediaFormat, MediaListSort, MediaListStatus, MediaRelationType, MediaSeason, MediaSort, MediaStatus, MediaType, MemoryCache, RateLimiter, RecommendationSort, RedisCache, StaffSort };
+export { AiringSort, AniListClient, AniListError, CharacterRole, CharacterSort, MediaFormat, MediaListSort, MediaListStatus, MediaRelationType, MediaSeason, MediaSort, MediaSource, MediaStatus, MediaType, MemoryCache, RateLimiter, RecommendationSort, RedisCache, StaffSort, UserSort };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map