From fac0a388583828b8dc8e91ffef8be260a3de0d9f Mon Sep 17 00:00:00 2001
From: Sugui <anaisusg@gmail.com>
Date: Sun, 21 Apr 2024 11:49:55 +0200
Subject: [PATCH] Refactored all classes as modules, and added
 thread-safetyness to imageService

---
 bun.lockb                                    | Bin 53938 -> 54645 bytes
 package.json                                 |   1 +
 src/app.ts                                   |   4 +-
 src/controllers/ImageController.ts           |  17 ----
 src/controllers/imageController.ts           |  13 ++++
 src/services/BotApiService.ts                |  22 ------
 src/services/GelbooruApiService.ts           |  32 --------
 src/services/ImageService.ts                 |  39 ----------
 src/services/botApiService.ts                |  18 +++++
 src/services/gelbooruApiService.ts           |  28 +++++++
 src/services/imageService.ts                 |  51 ++++++++++++
 test/ImageController/ImageController.test.ts |  27 ++-----
 test/ImageService/ImageService.test.ts       |  77 +++++++------------
 yarn.lock                                    |  14 +++-
 14 files changed, 160 insertions(+), 183 deletions(-)
 delete mode 100644 src/controllers/ImageController.ts
 create mode 100644 src/controllers/imageController.ts
 delete mode 100644 src/services/BotApiService.ts
 delete mode 100644 src/services/GelbooruApiService.ts
 delete mode 100644 src/services/ImageService.ts
 create mode 100644 src/services/botApiService.ts
 create mode 100644 src/services/gelbooruApiService.ts
 create mode 100644 src/services/imageService.ts

diff --git a/bun.lockb b/bun.lockb
index c74810a397fb96f52d91e4a1e6618c9d7423d868..347f41e4f365a6f2ab3c1d172580761089bcd6e2 100755
GIT binary patch
delta 7788
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

delta 7278
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
CJ8csH

diff --git a/package.json b/package.json
index 17db9fa..ef606ba 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
+    "async-mutex": "^0.5.0",
     "compression": "^1.7.4",
     "express": "^4.19.2",
     "express-list-endpoints": "^6.0.0",
diff --git a/src/app.ts b/src/app.ts
index 8edee2b..e34f131 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -1,7 +1,7 @@
 import compression from "compression";
 import express from "express";
 import listEndpoints from "express-list-endpoints";
-import ImageController from "src/controllers/ImageController";
+import * as imageController from "src/controllers/imageController";
 
 const app = express();
 
@@ -13,6 +13,6 @@ app.get("/", (_, res) => {
   res.json({ endpoints });
 });
 
-app.get("/image", ImageController.get);
+app.get("/image", imageController.get);
 
 export default app;
diff --git a/src/controllers/ImageController.ts b/src/controllers/ImageController.ts
deleted file mode 100644
index 9a6bcf5..0000000
--- a/src/controllers/ImageController.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Request, Response } from "express";
-import logger from "src/logger";
-import ImageService from "src/services/ImageService";
-
-class ImageController {
-  async get(_: Request, res: Response) {
-    try {
-      const image = await ImageService.get();
-      res.json(image);
-    } catch (error: any) {
-      logger.error(error);
-      res.status(500).json({ error: `Internal server error: ${error}` });
-    }
-  }
-}
-
-export default new ImageController();
diff --git a/src/controllers/imageController.ts b/src/controllers/imageController.ts
new file mode 100644
index 0000000..e0e8bd6
--- /dev/null
+++ b/src/controllers/imageController.ts
@@ -0,0 +1,13 @@
+import { Request, Response } from "express";
+import logger from "src/logger";
+import * as imageService from "src/services/imageService";
+
+export async function get(_: Request, res: Response) {
+  try {
+    const image = await imageService.get();
+    res.json(image);
+  } catch (error: any) {
+    logger.error(error);
+    res.status(500).json({ error: `Internal server error: ${error}` });
+  }
+}
diff --git a/src/services/BotApiService.ts b/src/services/BotApiService.ts
deleted file mode 100644
index 85b0b8b..0000000
--- a/src/services/BotApiService.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { env } from "bun";
-import logger from "src/logger";
-import { BotApiResponse } from "src/types/BotApiResponse";
-
-class BotApiService {
-  readonly BOT_API_URI = env.BOT_API_URI;
-
-  async getAll(): Promise<BotApiResponse> {
-    const get_url = `${this.BOT_API_URI}/images`;
-    const response: BotApiResponse = (await fetch(get_url).then(async (res) => {
-      if (!res.ok) {
-        logger.error(`${res.status}: ${res.statusText}, ${await res.text()}`);
-        throw new Error("Error fetching images");
-      } else {
-        return res.json();
-      }
-    })) as BotApiResponse;
-    return response;
-  }
-}
-
-export default new BotApiService();
diff --git a/src/services/GelbooruApiService.ts b/src/services/GelbooruApiService.ts
deleted file mode 100644
index 509f472..0000000
--- a/src/services/GelbooruApiService.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { env } from "bun";
-import logger from "src/logger";
-import GelbooruApiResponse from "src/types/GelbooruApiResponse";
-import GelbooruServiceResponse from "src/types/GelbooruServiceResponse";
-
-class GelbooruApiService {
-  async get(): Promise<GelbooruServiceResponse> {
-    const LIMIT = env.GELBOORU_IMAGES_PER_REQUEST || 100;
-    const TAGS = encodeURIComponent(env.GELBOORU_TAGS || "");
-    const url: string = `https://gelbooru.com/index.php?page=dapi&s=post&q=index&limit=${LIMIT}&json=1&tags=${TAGS}`;
-
-    const response: GelbooruApiResponse = (await fetch(url).then(
-      async (res) => {
-        if (!res.ok) {
-          logger.error(`${res.status}: ${res.statusText}, ${await res.text()}`);
-          throw new Error("Error fetching images");
-        } else {
-          return res.json();
-        }
-      }
-    )) as GelbooruApiResponse;
-
-    return {
-      posts: response.post.map((post) => ({
-        url: post.file_url,
-        tags: post.tags.split(" "),
-      })),
-    };
-  }
-}
-
-export default new GelbooruApiService();
diff --git a/src/services/ImageService.ts b/src/services/ImageService.ts
deleted file mode 100644
index 53005fb..0000000
--- a/src/services/ImageService.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import GelbooruServiceResponse from "src/types/GelbooruServiceResponse";
-import Image from "src/types/Image";
-import BotApiService from "src/services/BotApiService";
-import GelbooruApiService from "src/services/GelbooruApiService";
-import logger from "src/logger";
-
-class ImageService {
-  postsQueue: Image[] = [];
-
-  async get(): Promise<Image> {
-    while (this.postsQueue.length === 0) {
-      const validPosts = await this.getNewValidImages();
-      this.postsQueue = validPosts;
-      logger.info(`Got ${validPosts.length} images from remote`);
-    }
-    return this.postsQueue.pop() as Image;
-  }
-
-  private async getNewValidImages(): Promise<Image[]> {
-    const gelbooruResponse: GelbooruServiceResponse =
-      await GelbooruApiService.get();
-    const posts = gelbooruResponse.posts;
-
-    const botResponse = await BotApiService.getAll();
-    const imagesUrls = botResponse.images.map((image) => image.url);
-
-    const validPosts = Promise.all(
-      posts
-        .filter((post) => !imagesUrls.some((url) => url === post.url))
-        .map((post): Image => {
-          return { url: post.url, tags: post.tags };
-        })
-    );
-
-    return validPosts;
-  }
-}
-
-export default new ImageService();
diff --git a/src/services/botApiService.ts b/src/services/botApiService.ts
new file mode 100644
index 0000000..b7da92e
--- /dev/null
+++ b/src/services/botApiService.ts
@@ -0,0 +1,18 @@
+import { env } from "bun";
+import logger from "src/logger";
+import { BotApiResponse } from "src/types/BotApiResponse";
+
+const BOT_API_URI = env.BOT_API_URI;
+
+export async function getAll(): Promise<BotApiResponse> {
+  const get_url = `${BOT_API_URI}/images`;
+  const response: BotApiResponse = (await fetch(get_url).then(async (res) => {
+    if (!res.ok) {
+      logger.error(`${res.status}: ${res.statusText}, ${await res.text()}`);
+      throw new Error("Error fetching images");
+    } else {
+      return res.json();
+    }
+  })) as BotApiResponse;
+  return response;
+}
diff --git a/src/services/gelbooruApiService.ts b/src/services/gelbooruApiService.ts
new file mode 100644
index 0000000..f584892
--- /dev/null
+++ b/src/services/gelbooruApiService.ts
@@ -0,0 +1,28 @@
+import { env } from "bun";
+import logger from "src/logger";
+import GelbooruApiResponse from "src/types/GelbooruApiResponse";
+import GelbooruServiceResponse from "src/types/GelbooruServiceResponse";
+
+export async function get(): Promise<GelbooruServiceResponse> {
+  const LIMIT = env.GELBOORU_IMAGES_PER_REQUEST || 100;
+  const TAGS = encodeURIComponent(env.GELBOORU_TAGS || "");
+  const url: string = `https://gelbooru.com/index.php?page=dapi&s=post&q=index&limit=${LIMIT}&json=1&tags=${TAGS}`;
+
+  const response: GelbooruApiResponse = (await fetch(url).then(
+    async (res) => {
+      if (!res.ok) {
+        logger.error(`${res.status}: ${res.statusText}, ${await res.text()}`);
+        throw new Error("Error fetching images");
+      } else {
+        return res.json();
+      }
+    }
+  )) as GelbooruApiResponse;
+
+  return {
+    posts: response.post.map((post) => ({
+      url: post.file_url,
+      tags: post.tags.split(" "),
+    })),
+  };
+}
\ No newline at end of file
diff --git a/src/services/imageService.ts b/src/services/imageService.ts
new file mode 100644
index 0000000..ea20d53
--- /dev/null
+++ b/src/services/imageService.ts
@@ -0,0 +1,51 @@
+import GelbooruServiceResponse from "src/types/GelbooruServiceResponse";
+import Image from "src/types/Image";
+import logger from "src/logger";
+import { Mutex } from "async-mutex";
+import * as gelbooruApiService from 'src/services/gelbooruApiService';
+import * as botApiService from 'src/services/botApiService';
+
+const mutex: Mutex = new Mutex();
+const postsQueue: Image[] = [];
+
+// We wrap the function into a Mutex because it's not thread-safe
+export async function get(): Promise<Image> {
+  return await mutex.runExclusive(() => unsafeGet())
+}
+
+async function unsafeGet(): Promise<Image> {
+  while (postsQueue.length === 0) {
+    const validPosts = await getNewValidImages();
+    validPosts.map(post => postsQueue.push(post));
+    logger.info(`Got ${validPosts.length} images from remote`);
+  }
+  return popImage();
+}
+
+function popImage(): Image {
+  const image = postsQueue.pop();
+  if (image) {
+    return image
+  } else {
+    throw Error("Can't pop from an empty list");
+  }
+}
+
+async function getNewValidImages(): Promise<Image[]> {
+  const gelbooruResponse: GelbooruServiceResponse =
+    await gelbooruApiService.get();
+  const posts = gelbooruResponse.posts;
+
+  const botResponse = await botApiService.getAll();
+  const imagesUrls = botResponse.images.map((image) => image.url);
+
+  const validPosts = Promise.all(
+    posts
+      .filter((post) => !imagesUrls.some((url) => url === post.url))
+      .map((post): Image => {
+        return { url: post.url, tags: post.tags };
+      })
+  );
+
+  return validPosts;
+}
diff --git a/test/ImageController/ImageController.test.ts b/test/ImageController/ImageController.test.ts
index ddf1ad5..4c8746b 100644
--- a/test/ImageController/ImageController.test.ts
+++ b/test/ImageController/ImageController.test.ts
@@ -1,16 +1,11 @@
-import { afterEach, describe, expect, it, mock } from "bun:test";
+import { afterAll, afterEach, describe, expect, it, jest, mock, spyOn } from "bun:test";
 import app from "src/app";
-import ImageService from "src/services/ImageService";
 import request from "supertest";
+import * as imageService from "src/services/imageService";
 
-const imageServiceOriginal = ImageService;
-
-afterEach(() => {
-  mock.restore();
-  mock.module("src/services/ImageService", () => ({
-    default: imageServiceOriginal,
-  }));
-});
+afterAll(() => {
+  jest.restoreAllMocks();
+})
 
 describe("endpoint returns the correct status codes", () => {
   it("should return 200 if successful", async () => {
@@ -21,16 +16,10 @@ describe("endpoint returns the correct status codes", () => {
   });
 
   it("should return 500 if any error happens", async () => {
-    mock.module("src/services/ImageService", () => {
-      return {
-        default: {
-          get: () => {
-            throw new Error("Controlled error");
-          },
-        },
-      };
-    });
+    spyOn(imageService, "get").mockImplementation(() => { throw new Error("Controlled error") });
+
     const res = await request(app).get("/image");
+
     expect(res.status).toBe(500);
   });
 });
diff --git a/test/ImageService/ImageService.test.ts b/test/ImageService/ImageService.test.ts
index 1f48d98..67e36c0 100644
--- a/test/ImageService/ImageService.test.ts
+++ b/test/ImageService/ImageService.test.ts
@@ -1,27 +1,18 @@
-import { afterEach, describe, expect, it, mock } from "bun:test";
-import BotApiService from "src/services/BotApiService";
-import GelbooruApiService from "src/services/GelbooruApiService";
-import ImageService from "src/services/ImageService";
-import { BotApiResponse } from "src/types/BotApiResponse";
-import GelbooruApiResponse from "src/types/GelbooruServiceResponse";
+import { afterAll, describe, expect, it, jest, mock, spyOn } from "bun:test";
 import Image from "src/types/Image";
+import * as gelbooruApiService from "src/services/gelbooruApiService";
+import * as botApiService from "src/services/botApiService";
+import * as imageService from "src/services/imageService";
 
-const imageServiceOriginal = ImageService;
-const gelbooruApiServiceOriginal = GelbooruApiService;
-const botApiServiceOriginal = BotApiService;
+afterAll(() => {
+  jest.restoreAllMocks();
+})
 
-afterEach(() => {
-  mock.restore();
-  mock.module("src/services/ImageService", () => ({
-    default: imageServiceOriginal,
-  }));
-  mock.module("src/services/GelbooruApiService", () => ({
-    default: gelbooruApiServiceOriginal,
-  }));
-  mock.module("src/services/BotApiService", () => ({
-    default: botApiServiceOriginal,
-  }));
-});
+describe("the service is thread-safe", () => {
+  it("should run normally when 2 processes call the get() method with 1 remaining image in the queue", async () => {
+    // TODO
+  })
+})
 
 describe("endpoint gets a non repeated image", () => {
   it("should return an image that is not in the response of the /images endpoint of the bot API", async () => {
@@ -30,39 +21,23 @@ describe("endpoint gets a non repeated image", () => {
     const UNIQUE_URL =
       "https://fastly.picsum.photos/id/2/10/20.jpg?hmac=zy6lz21CuRIstr9ETx9h5AuoH50s_L2uIEct3dROpY8";
 
-    mock.module("src/services/GelbooruApiService", () => {
-      let alreadyCalled = false;
-      return {
-        default: {
-          get: (): GelbooruApiResponse => {
-            if (alreadyCalled) {
-              return { posts: [{ url: UNIQUE_URL, tags: [] }] };
-            } else {
-              alreadyCalled = true;
-              return { posts: [{ url: REPEATED_URL, tags: [] }] };
-            }
-          },
+    const gelbooruApiServiceGet = spyOn(gelbooruApiService, "get");
+    gelbooruApiServiceGet.mockImplementationOnce(async () => ({ posts: [{ url: UNIQUE_URL, tags: [] }] }));
+    gelbooruApiServiceGet.mockImplementation(async () => ({ posts: [{ url: REPEATED_URL, tags: [] }] }));
+    spyOn(botApiService, "getAll").mockImplementation(async () => ({
+      images: [
+        {
+          _id: "0",
+          url: REPEATED_URL,
+          status: "consumed",
+          tags: ["pokemon", "computer"],
+          __v: 0,
         },
-      };
-    });
-
-    mock.module("src/services/BotApiService", () => ({
-      default: {
-        getAll: (): BotApiResponse => ({
-          images: [
-            {
-              _id: "0",
-              url: REPEATED_URL,
-              status: "consumed",
-              tags: ["pokemon", "computer"],
-              __v: 0,
-            },
-          ],
-        }),
-      },
+      ],
     }));
 
-    const image: Image = await ImageService.get();
+    const image: Image = await imageService.get();
+
     expect(image.url).not.toBe(REPEATED_URL);
   });
 });
diff --git a/yarn.lock b/yarn.lock
index 5db6c5e..ff9aa21 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1,6 +1,6 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
-# bun ./bun.lockb --hash: 2D4E664D3091262E-6e6ac083a9fdd796-C67F3D33680268C0-c674fd6e89aeea1f
+# bun ./bun.lockb --hash: 9A5A612BBFD3E7ED-76a31de2b7c4bbe8-8DB93E498B9CBB30-9cf1116024820c4f
 
 
 "@colors/colors@1.6.0", "@colors/colors@^1.6.0":
@@ -177,6 +177,13 @@ async@^3.2.3:
   resolved "https://registry.npmjs.org/async/-/async-3.2.5.tgz"
   integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
 
+async-mutex@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.npmjs.org/async-mutex/-/async-mutex-0.5.0.tgz"
+  integrity sha512-1A94B18jkJ3DYq284ohPxoXbfTA5HsQ7/Mf4DEhcyLx3Bz27Rh59iScbB6EPiP+B+joue6YCxcMXSbFC1tZKwA==
+  dependencies:
+    tslib "^2.4.0"
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
@@ -908,6 +915,11 @@ triple-beam@^1.3.0:
   resolved "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz"
   integrity sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==
 
+tslib@^2.4.0:
+  version "2.6.2"
+  resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz"
+  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
+
 type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"