e621-client 1.2.2 → 1.2.3

package/README.md

@@ -1,47 +1,47 @@
-# e621 Client
-
-This is a small client to do some stuff with the e621 API. It is created to fit my needs, but you can use it too, if it works for you.
-
-I can't guarantee it will work in the future, so I recommend you just use another package instead or build a client yourself.
-
-### Supported Endpoints
-
-- `/favorites`
-- `/users`
-- `/users/:id`
-- `/posts`
-- `/posts/:id`
-
-### Getting Started
-
-Just create an instance of the client like so:
-
-```ts
-const client = new E621ApiClient({
-  client: "Your client name",
-  isBrowser: false,
-});
-```
-
-Now you can use it to do some stuff:
-
-```ts
-// not useful but still here (like me)
-const posts = await client.getPosts();
-
-// search posts by tags
-const postsWithTags = await client.getPosts({
-  tags: "male score:>100",
-});
-
-// search users by names (* for wildcards)
-const toms = await client.getUsers({
-  nameMatches: "tom*",
-});
-
-// if you have credentials set, they will be sent with your requests as well:
-client.setCredentials({
-  username: "HornyFurry",
-  apiKey: "wouldntyouliketoknowweatherboy",
-});
-```
+# e621 Client
+
+This is a small client to do some stuff with the e621 API. It is created to fit my needs, but you can use it too, if it works for you.
+
+I can't guarantee it will work in the future, so I recommend you just use another package instead or build a client yourself.
+
+### Supported Endpoints
+
+- `/favorites`
+- `/users`
+- `/users/:id`
+- `/posts`
+- `/posts/:id`
+
+### Getting Started
+
+Just create an instance of the client like so:
+
+```ts
+const client = new E621ApiClient({
+  client: "Your client name",
+  isBrowser: false,
+});
+```
+
+Now you can use it to do some stuff:
+
+```ts
+// not useful but still here (like me)
+const posts = await client.getPosts();
+
+// search posts by tags
+const postsWithTags = await client.getPosts({
+  tags: "male score:>100",
+});
+
+// search users by names (* for wildcards)
+const toms = await client.getUsers({
+  nameMatches: "tom*",
+});
+
+// if you have credentials set, they will be sent with your requests as well:
+client.setCredentials({
+  username: "HornyFurry",
+  apiKey: "wouldntyouliketoknowweatherboy",
+});
+```

package/dist/client/E621ApiClient.js

@@ -73,15 +73,15 @@ class E621ApiClient {
             var _a, _b;
             // max page size on e621 api
             const favorites = [];
-            const limit = 300;
+            const limit = 320;
             let page = 1;
             while (true) {
                 if (this.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}`);
+                    console.info("User", user, "page", page);
                 }
                 const posts = yield this.getFavorites(Object.assign(Object.assign({}, options), { page: String(page++), limit: String(limit) }));
-                if (posts.length === 0)
+                if (posts.length === 0 || posts.length < limit)
                     break;
                 favorites.push(...posts);
                 yield (0, utils_1.delay)(this.batchRateLimit);

package/package.json

@@ -1,24 +1,24 @@
-{
-  "name": "e621-client",
-  "version": "1.2.2",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "scripts": {
-    "test": "jest",
-    "build": "tsc",
-    "prepublishOnly": "tsc"
-  },
-  "keywords": [],
-  "author": "Tommus",
-  "license": "ISC",
-  "description": "A simple client for the e621 API",
-  "devDependencies": {
-    "@types/jest": "^29.5.12",
-    "@types/node": "^20.14.2",
-    "jest": "^29.7.0",
-    "prettier": "^3.3.1",
-    "ts-jest": "^29.2.3",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.4.5"
-  }
-}
+{
+  "name": "e621-client",
+  "version": "1.2.3",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "scripts": {
+    "test": "jest",
+    "build": "tsc",
+    "prepublishOnly": "tsc"
+  },
+  "keywords": [],
+  "author": "Tommus",
+  "license": "ISC",
+  "description": "A simple client for the e621 API",
+  "devDependencies": {
+    "@types/jest": "^29.5.12",
+    "@types/node": "^20.14.2",
+    "jest": "^29.7.0",
+    "prettier": "^3.3.1",
+    "ts-jest": "^29.2.3",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.4.5"
+  }
+}

package/src/client/E621ApiClient.ts

@@ -113,7 +113,7 @@ export class E621ApiClient {
 
   // Favorites
   public async getFavorites(
-    options: GetFavoritesOptions = {},
+    options: GetFavoritesOptions = {}
   ): Promise<E621Post[]> {
     const response = await this.get<GetFavoritesResponse>({
       route: "favorites",
@@ -123,17 +123,17 @@ export class E621ApiClient {
   }
 
   public async getAllFavorites(
-    options: GetAllFavoritesOptions = {},
+    options: GetAllFavoritesOptions = {}
   ): Promise<E621Post[]> {
     // max page size on e621 api
     const favorites: E621Post[] = [];
-    const limit = 300;
+    const limit = 320;
     let page = 1;
 
     while (true) {
       if (this.debugLogs) {
         const user = options.userId ?? this.credentials?.username;
-        console.info(`page ${page} for user ${user}`);
+        console.info("User", user, "page", page);
       }
 
       const posts = await this.getFavorites({
@@ -142,7 +142,7 @@ export class E621ApiClient {
         limit: String(limit),
       });
 
-      if (posts.length === 0) break;
+      if (posts.length === 0 || posts.length < limit) break;
       favorites.push(...posts);
       await delay(this.batchRateLimit);
     }
@@ -187,7 +187,7 @@ export class E621ApiClient {
       return null;
     } else {
       throw new Error(
-        `Request to ${route} failed with status code ${response.status}: "${response.statusText}"`,
+        `Request to ${route} failed with status code ${response.status}: "${response.statusText}"`
       );
     }
   }

package/demo.ts

@@ -1,12 +0,0 @@
-import { E621ApiClient } from "./src/client/E621ApiClient";
-
-async function demo() {
-  const client = new E621ApiClient({
-    isBrowser: false,
-    client: "EstoBox (by Tommus621 on e621)",
-  });
-  const favs = await client.getFavorites({ userId: "964986", page: "2" });
-  console.log(favs.length);
-}
-
-demo().finally();