e621-client 1.1.0 → 1.1.2

package/dist/client/E621ApiClient.d.ts

@@ -31,6 +31,9 @@ export type GetPostsOptions = {
 export type GetFavoritesOptions = {
     userId?: string;
 } & Pagination;
+export type GetAllFavoritesOptions = {
+    userId?: string;
+};
 export declare class E621ApiClient {
     protected static readonly BASE_URL = "https://e621.net/";
     private readonly client;
@@ -42,6 +45,7 @@ export declare class E621ApiClient {
     getPosts(options?: GetPostsOptions): Promise<E621Post[]>;
     getPostById(id: EntityId): Promise<E621Post | null>;
     getFavorites(options?: GetFavoritesOptions): Promise<E621Post[]>;
+    getAllFavorites(options?: GetAllFavoritesOptions, debugLogs?: boolean): Promise<E621Post[]>;
     setCredentials(credentials: Credentials | null): E621ApiClient;
     checkCredentials(credentials?: Credentials): Promise<boolean>;
     get<E>({ route, params, headers, }: GetOptions): Promise<E | null>;

package/dist/client/E621ApiClient.js

@@ -66,6 +66,26 @@ class E621ApiClient {
             return ((_a = response === null || response === void 0 ? void 0 : response.posts) === null || _a === void 0 ? void 0 : _a.map(E621Post_1.parsePost)) || [];
         });
     }
+    getAllFavorites() {
+        return __awaiter(this, arguments, void 0, function* (options = {}, debugLogs = false) {
+            var _a, _b;
+            // max page size on e621 api
+            const favorites = [];
+            const limit = 300;
+            let page = 1;
+            while (true) {
+                if (debugLogs) {
+                    const user = (_a = options.userId) !== null && _a !== void 0 ? _a : (_b = this.credentials) === null || _b === void 0 ? void 0 : _b.username;
+                    console.info(`page ${page} for user ${user}`);
+                }
+                const posts = yield this.getFavorites(Object.assign(Object.assign({}, options), { page: String(page++), limit: String(limit) }));
+                if (posts.length === 0)
+                    break;
+                favorites.push(...posts);
+            }
+            return favorites;
+        });
+    }
     // Account
     setCredentials(credentials) {
         this.credentials = credentials;
@@ -96,7 +116,12 @@ class E621ApiClient {
                 method: "GET",
                 headers: headers.addAuthorization(this.credentials).build(),
             });
-            return response.json().catch(() => null);
+            if (response.ok) {
+                return response.json().catch(utils_1.logErrorAndReturnNull);
+            }
+            else {
+                return null;
+            }
         });
     }
     buildUrl(route, params = {}) {

package/dist/test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test.js

@@ -0,0 +1,23 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const E621ApiClient_1 = require("./client/E621ApiClient");
+function test() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const client = new E621ApiClient_1.E621ApiClient({
+            isBrowser: false,
+            client: "EstoBox (by Tommus621 on e621)",
+        });
+        const user = yield client.getUserById(918032);
+        console.log(user);
+    });
+}
+test().finally();

package/dist/utils.d.ts

@@ -1,2 +1,3 @@
 export declare function ensureArray<T>(value: T | T[]): T[];
 export declare function translateOptions<Options extends Record<string, string>>(options: Options, table: Partial<Options>): Record<string, string>;
+export declare function logErrorAndReturnNull(error: unknown): null;

package/dist/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.translateOptions = exports.ensureArray = void 0;
+exports.logErrorAndReturnNull = exports.translateOptions = exports.ensureArray = void 0;
 function ensureArray(value) {
     if (Array.isArray(value)) {
         return value;
@@ -17,3 +17,8 @@ function translateOptions(options, table) {
     return params;
 }
 exports.translateOptions = translateOptions;
+function logErrorAndReturnNull(error) {
+    console.error(error);
+    return null;
+}
+exports.logErrorAndReturnNull = logErrorAndReturnNull;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "e621-client",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {

package/src/client/E621ApiClient.ts

@@ -1,11 +1,11 @@
 import { E621Post, parsePost } from "../types/e621/E621Post";
-import { E621User, UserResponse, parseUser } from "../types/e621/E621User";
+import { E621User, parseUser, UserResponse } from "../types/e621/E621User";
 import {
   GetFavoritesResponse,
   GetPostResponse,
   GetPostsResponse,
 } from "../types/responses";
-import { ensureArray, translateOptions } from "../utils";
+import { ensureArray, logErrorAndReturnNull, translateOptions } from "../utils";
 import { E621ApiHeaders } from "./E621ApiHeaders";
 
 export interface E621ApiOptions {
@@ -153,7 +153,12 @@ export class E621ApiClient {
       method: "GET",
       headers: headers.addAuthorization(this.credentials).build(),
     });
-    return response.json().catch(() => null);
+
+    if (response.ok) {
+      return response.json().catch(logErrorAndReturnNull);
+    } else {
+      return null;
+    }
   }
 
   private buildUrl(route: Route, params: Params = {}): string {

package/src/utils.ts

@@ -17,3 +17,8 @@ export function translateOptions<Options extends Record<string, string>>(
 
   return params;
 }
+
+export function logErrorAndReturnNull(error: unknown) {
+  console.error(error);
+  return null;
+}