From 5c4d3ddd8403cdf91e7779972993b16d21d0825d Mon Sep 17 00:00:00 2001
From: SrGooglo <srgooglo@ragestudio.net>
Date: Tue, 30 May 2023 12:49:08 +0000
Subject: [PATCH] improve method

---
 .../server/src/classes/CacheService/index.js  | 57 ++++++++++++-------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/packages/server/src/classes/CacheService/index.js b/packages/server/src/classes/CacheService/index.js
index 911ce318..e65f85f2 100644
--- a/packages/server/src/classes/CacheService/index.js
+++ b/packages/server/src/classes/CacheService/index.js
@@ -1,42 +1,57 @@
 import fs from "fs"
-import path from "path"
 
 export default class CacheService {
-    watchingFiles = new Set()
+    intervalMaps = new Map()
 
     static deletionInterval = 1000 * 60 * 5
 
+    checkDeletionFilepath(filepath) {
+        try {
+            const stats = fs.statSync(filepath)
+
+            stats.atime = new Date(stats.atime)
+
+            if (stats.atime.getTime() + CacheService.deletionInterval < Date.now()) {
+                fs.promises.unlink(filepath)
+            } else {
+                return false
+            }
+
+            return true
+
+        } catch (error) {
+            console.error(error)
+
+            fs.promises.unlink(filepath)
+
+            return true
+        }
+    }
+
     appendToDeletion(filepath) {
         // create a interval of 5 minutes to delete the file
         // check the last time the file was accessed and if it was accessed in the last 5 minutes
         // reset the interval until the file is not accessed for 5 minutes and then delete it
         try {
             const createInterval = () => {
-                return setInterval(() => {
-                    const stats = fs.statSync(filepath)
+                let interval = setInterval(async () => {
+                    try {
+                        await this.checkDeletionFilepath(filepath)
 
-                    stats.atime = new Date(stats.atime)
+                        this.intervalMaps.delete(filepath)
 
-                    if (stats.atime.getTime() + CacheService.deletionInterval < Date.now()) {
-                        clearInterval(this.watchingFiles.get(filepath).interval)
-
-                        this.watchingFiles.delete(filepath)
-
-                        fs.promises.unlink(filepath)
-                    } else {
-                        console.log(`[${filepath}] was accessed in the last 5 minutes, resetting deletion interval`)
-
-                        clearInterval(this.watchingFiles.get(filepath).interval)
-
-                        this.watchingFiles.get(filepath).interval = createInterval()
+                        if (!results) {
+                            this.appendToDeletion(filepath)
+                        }
+                    } catch (error) {
+                        return clearInterval(interval)
                     }
                 })
+
+                return interval
             }
 
-            this.watchingFiles.add({
-                filepath,
-                interval: createInterval()
-            })
+            this.intervalMaps.set(filepath, createInterval())
         } catch (error) {
             console.error(error)