refactor: CacheManager

Author: star0202

src/cache.ts

@@ -1,29 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { logger } from '.'
-import sha256 from 'crypto-js/sha256'
-import { appendFile, readFile } from 'fs/promises'
-import { join } from 'path'
-
-export const isCached = async (data: any) => {
-  const hash = sha256(JSON.stringify(data)).toString()
-
-  return readFile(join(__dirname, `../cache/${hash}.svg`))
-    .then(() => true)
-    .catch(() => false)
-}
-
-export const cache = async (data: any, svg: string) => {
-  const hash = sha256(JSON.stringify(data)).toString()
-
-  logger.info(`Caching ${hash}`)
-
-  await appendFile(join(__dirname, `../cache/${hash}.svg`), svg)
-}
-
-export const getCache = async (data: any) => {
-  const hash = sha256(JSON.stringify(data)).toString()
-
-  logger.info(`Using cache ${hash}`)
-
-  return await readFile(join(__dirname, `../cache/${hash}.svg`), 'utf-8')
-}

src/index.ts

@@ -1,6 +1,6 @@
-import { cache, getCache, isCached } from './cache'
 import { discordCard } from './cards/discord'
 import { spotifyCard } from './cards/spotify'
+import CacheManager from './structures/cache'
 import DataManager from './structures/data'
 import fastify from 'fastify'
 import { readFile } from 'fs/promises'
@@ -20,7 +20,8 @@ const app = fastify({
 
 export const logger = app.log
 
-const manager = new DataManager(logger)
+const dataManager = new DataManager(logger)
+const cacheManager = new CacheManager(logger)
 
 app.get('/', async (_, reply) => {
   reply.redirect('https://github.com/star0202/discord-profile')
@@ -41,23 +42,17 @@ app.get('/spotify/:id', async (request, reply) => {
 
   let data
   if (redirect === 'true') {
-    data = await manager.spotify(id, true)
+    data = await dataManager.spotify(id, true)
 
     if (data === undefined) return reply.code(400).send('User Not Found')
 
     reply.redirect(data ?? 'https://github.com/star0202/discord-profile')
   } else {
-    data = await manager.spotify(id, false)
+    data = await dataManager.spotify(id, false)
 
     if (data === undefined) return reply.code(400).send('User Not Found')
 
-    let card
-    if (await isCached(data)) {
-      card = await getCache(data)
-    } else {
-      card = await spotifyCard(data)
-      await cache(data, card)
-    }
+    const card = await cacheManager.generateCachedCard(data, spotifyCard)
 
     reply
       .code(200)
@@ -71,17 +66,11 @@ app.get('/discord/:id', async (request, reply) => {
   if (!request.params) return reply.code(400).send('No User ID Provided')
 
   const { id } = request.params as { id: string }
-  const data = await manager.discord(id)
+  const data = await dataManager.discord(id)
 
   if (!data) return reply.code(400).send('User Not Found')
 
-  let card
-  if (await isCached(data)) {
-    card = await getCache(data)
-  } else {
-    card = await discordCard(data)
-    await cache(data, card)
-  }
+  const card = await cacheManager.generateCachedCard(data, discordCard)
 
   reply
     .code(200)

src/structures/cache.ts

@@ -0,0 +1,49 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import sha256 from 'crypto-js/sha256'
+import type { FastifyBaseLogger } from 'fastify'
+import { appendFile, readFile } from 'fs/promises'
+import { join } from 'path'
+
+export default class CacheManager {
+  private logger: FastifyBaseLogger
+
+  constructor(logger: FastifyBaseLogger) {
+    this.logger = logger.child({ name: 'Cache' })
+  }
+
+  async isCached(data: any) {
+    const hash = sha256(JSON.stringify(data)).toString()
+
+    return readFile(join(__dirname, `../../cache/${hash}.svg`))
+      .then(() => true)
+      .catch(() => false)
+  }
+
+  async cache(data: any, svg: string) {
+    const hash = sha256(JSON.stringify(data)).toString()
+
+    this.logger.info(`Caching ${hash}`)
+
+    await appendFile(join(__dirname, `../../cache/${hash}.svg`), svg)
+  }
+
+  async getCache(data: any) {
+    const hash = sha256(JSON.stringify(data)).toString()
+
+    this.logger.info(`Using cache ${hash}`)
+
+    return await readFile(join(__dirname, `../../cache/${hash}.svg`), 'utf-8')
+  }
+
+  async generateCachedCard(
+    data: any,
+    generate: (data: any) => Promise<string>
+  ) {
+    if (await this.isCached(data)) return await this.getCache(data)
+
+    const svg = await generate(data)
+    await this.cache(data, svg)
+
+    return svg
+  }
+}

src/structures/data.ts

@@ -12,7 +12,7 @@ export default class DataManager {
     this.bot = new Bot(logger)
     this.lanyard = new LanyardRequest(logger)
 
-    this.logger = logger.child({ name: 'DataManager' })
+    this.logger = logger.child({ name: 'Data' })
 
     this.bot.start()
   }