cleaups

.swcrc

@@ -10,7 +10,7 @@
         "topLevel": false
       }
     },
-    "target": "es2021",
+    "target": "esnext",
     "parser": {
       "syntax": "typescript",
       "tsx": false,

src/controllers/rest/impl/FileUploadController.ts

@@ -5,9 +5,8 @@ import { FileUploadModelResponse } from "../../../model/rest/FileUploadModelResp
 import { BadRequest, Forbidden, UnsupportedMediaType } from "@tsed/exceptions";
 import { MultipartFile, PathParams, type PlatformMulterFile, QueryParams, Req, Res } from "@tsed/common";
 import { BodyParams } from "@tsed/platform-params";
-import { FileEngine } from "../../../engine/impl/index.js";
 import { FileService } from "../../../services/FileService.js";
-import { NetworkUtils } from "../../../utils/Utils.js";
+import { FileUtils, NetworkUtils } from "../../../utils/Utils.js";
 import { BaseRestController } from "../BaseRestController.js";
 import { Logger } from "@tsed/logger";
 
@@ -17,7 +16,6 @@ import { Logger } from "@tsed/logger";
 @Returns(StatusCodes.FORBIDDEN, Forbidden).Description("If your IP has been blocked")
 export class FileUploadController extends BaseRestController {
     public constructor(
-        @Inject() private fileEngine: FileEngine,
         @Inject() private fileUploadService: FileService,
         @Inject() private logger: Logger,
     ) {
@@ -75,7 +73,7 @@ export class FileUploadController extends BaseRestController {
     ): Promise<unknown> {
         if (file && url) {
             if (file) {
-                await this.fileEngine.deleteFile(file);
+                await FileUtils.deleteFile(file);
             }
             throw new BadRequest("Unable to upload both a file and a url");
         }
@@ -106,7 +104,7 @@ export class FileUploadController extends BaseRestController {
             if (file) {
                 // this will delete files if something goes wrong, but not urls...
                 // TODO: fix
-                await this.fileEngine.deleteFile(file, true);
+                await FileUtils.deleteFile(file, true);
             }
             throw e;
         }

src/engine/impl/index.ts

@@ -2,7 +2,6 @@
  * @file Automatically generated by barrelsby.
  */
 
-export * from "./FileEngine.js";
 export * from "./av/ClamAvEngine.js";
 export * from "./av/MsDefenderEngine.js";
 export * from "./HttpErrorRenderers/AuthenticationErrorRenderEngine.js";

src/manager/AvManager.ts

@@ -2,11 +2,11 @@ import { Inject, Injectable, OnInit } from "@tsed/di";
 import { AvFactory } from "../factory/AvFactory.js";
 import type { PlatformMulterFile } from "@tsed/common";
 import { Logger } from "@tsed/logger";
-import { FileEngine } from "../engine/impl/index.js";
 import { BadRequest } from "@tsed/exceptions";
 import path from "node:path";
 import { IAvEngine } from "../engine/IAvEngine.js";
 import { AvScanResult } from "../utils/typeings.js";
+import { FileUtils } from "../utils/Utils.js";
 
 @Injectable()
 export class AvManager implements OnInit {
@@ -15,7 +15,6 @@ export class AvManager implements OnInit {
     public constructor(
         @Inject() private avFactory: AvFactory,
         @Inject() private logger: Logger,
-        @Inject() private fileEngine: FileEngine,
     ) {}
 
     public async $onInit(): Promise<void> {
@@ -42,10 +41,10 @@ export class AvManager implements OnInit {
             if (scanResult.passed) {
                 continue;
             }
-            const fileExists = await this.fileEngine.fileExists(resource);
+            const fileExists = await FileUtils.fileExists(resource);
             if (fileExists) {
                 try {
-                    await this.fileEngine.deleteFile(file, false);
+                    await FileUtils.deleteFile(file, false);
                 } catch (e) {
                     // this basically means we could not delete the virus...
                     this.logger.error(`Unable to delete resource ${resource} after positive AV detection`);

src/public/assets/custom/css/index.css

@@ -117,6 +117,6 @@
     font-size: 2rem;
 }
 
-.am5-modal-content{
+.am5-modal-content {
     color: #000000 !important;
 }

src/public/assets/custom/js/main.js

@@ -1,4 +1,4 @@
-const Site = (function () {
+const Site = (function() {
     let isInit = false;
 
     const loading = function loading(show) {
@@ -52,14 +52,14 @@ const Site = (function () {
         // eslint-disable-next-line require-await
         anon.call(this, Site).then(async () => {
             function initTooltips() {
-                document.querySelectorAll('[data-bs-toggle="tooltip"]').forEach(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl));
+                document.querySelectorAll("[data-bs-toggle=\"tooltip\"]").forEach(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl));
             }
 
             function initTabs() {
-                const triggerTabList = document.querySelectorAll('#resultTabs button');
+                const triggerTabList = document.querySelectorAll("#resultTabs button");
                 triggerTabList.forEach(triggerEl => {
                     const tabTrigger = new bootstrap.Tab(triggerEl);
-                    triggerEl.addEventListener('click', event => {
+                    triggerEl.addEventListener("click", event => {
                         event.preventDefault();
                         tabTrigger.show();
                     });
@@ -76,6 +76,6 @@ const Site = (function () {
         loading,
         display,
         showSuccess,
-        showError,
+        showError
     };
 }());

src/public/fileLogin.ejs

@@ -52,8 +52,8 @@
         submitPassword();
     });
 
-    function progress({loaded, total}) {
-        const downloadDone = Math.round(loaded / total * 100) + '%';
+    function progress({ loaded, total }) {
+        const downloadDone = Math.round(loaded / total * 100) + "%";
         progressbar.innerText = downloadDone;
         progressbar.style.width = downloadDone;
         progressWrapper.setAttribute("aria-valuenow", Math.round(loaded / total * 100).toString());
@@ -78,35 +78,35 @@
                 const response = await fetch(url, {
                     headers: {
                         "x-password": password
-                    },
+                    }
                 });
                 if (response.status === 403) {
                     alert.classList.remove("hidden");
                     return;
                 }
-                const contentLength = response.headers.get('content-length');
+                const contentLength = response.headers.get("content-length");
                 const total = Number.parseInt(contentLength);
                 let loaded = 0;
                 const res = new Response(
                     new ReadableStream({
-                        async start(controller) {
-                            const reader = response.body.getReader();
-                            for (; ;) {
-                                try {
-                                    const {done, value} = await reader.read();
-                                    if (done) {
-                                        break;
-                                    }
-                                    loaded += value.byteLength;
-                                    progress({loaded, total});
-                                    controller.enqueue(value);
-                                } catch (e) {
-                                    controller.error(e);
+                            async start(controller) {
+                                const reader = response.body.getReader();
+                                for (; ;) {
+                                    try {
+                                        const { done, value } = await reader.read();
+                                        if (done) {
+                                            break;
+                                        }
+                                        loaded += value.byteLength;
+                                        progress({ loaded, total });
+                                        controller.enqueue(value);
+                                    } catch (e) {
+                                        controller.error(e);
                                         return;
                                     }
+                                }
+                                controller.close();
                             }
-                            controller.close();
-                        },
                         }
                     ), {
                         headers: response.headers,

src/public/index.ejs

@@ -12,7 +12,7 @@
             <a href="/" class="text-body-emphasis text-decoration-none">
                 <span class="fs-4">WaifuVault</span>
             </a>
-            <a class="btn btn-secondary" href="https://github.com/VictoriqueMoe/WaifuVault" target="_blank"><i class="bi bi-github"></i> Source</a>
+            <a class="btn btn-secondary" href="https://github.com/waifuvault/WaifuVault" target="_blank"><i class="bi bi-github"></i> Source</a>
         </header>
 
         <div class="p-5 mb-4 bg-body-tertiary rounded-3 border border-primary-subtle position-relative">
@@ -22,7 +22,7 @@
                     <a href="https://0x0.st" target="_blank">https://0x0.st</a>, WaifuVault is a temporary file hosting service that allows for file uploads that are hosted for a set amount of time.
                 </p>
                 <a class="btn btn-primary btn-lg" type="button" href="/api-docs" target="_blank">Api Documentation</a>
-                <img id="victorique" class="img-fluid" src="assets/custom/images/08.png" alt="logo"/>
+                <img id="victorique" class="img-fluid" src="assets/custom/images/08.png" alt="logo" />
             </div>
         </div>