Merge pull request #94 from VictoriqueMoe/update-to-use-store-from-npm

update to use published store

package.json

@@ -79,6 +79,7 @@
     "sanitize-filename-ts": "^1.0.2",
     "toad-scheduler": "^3.0.1",
     "typeorm": "^0.3.20",
+    "typeorm-rate-limit-store": "^1.0.0",
     "xss": "^1.0.14"
   },
   "devDependencies": {

src/Server.ts

@@ -38,7 +38,8 @@ import rateLimit from "express-rate-limit";
 import { LRUCache } from "lru-cache";
 import { filesDir, FileUtils, NetworkUtils } from "./utils/Utils.js";
 import { fileURLToPath } from "node:url";
-import { ExpressRateLimitTypeOrmStore } from "./extensions/expressRateLimit/stores/ExpressRateLimitTypeOrmStore.js";
+import { ExpressRateLimitTypeOrmStore } from "typeorm-rate-limit-store";
+import { ExpressRateLimitStoreModel } from "./model/db/ExpressRateLimitStore.model.js";
 
 const opts: Partial<TsED.Configuration> = {
     ...config,
@@ -152,7 +153,6 @@ export class Server implements BeforeRoutesInit {
     public constructor(
         @Inject() private app: PlatformApplication,
         @Inject(SQLITE_DATA_SOURCE) private ds: DataSource,
-        @Inject() private expressRateLimitTypeOrmStore: ExpressRateLimitTypeOrmStore,
     ) {}
 
     @Configuration()
@@ -201,7 +201,7 @@ export class Server implements BeforeRoutesInit {
                 keyGenerator: request => {
                     return NetworkUtils.getIp(request);
                 },
-                store: this.expressRateLimitTypeOrmStore,
+                store: new ExpressRateLimitTypeOrmStore(this.ds.getRepository(ExpressRateLimitStoreModel)),
             }),
         );
     }

src/model/db/ExpressRateLimitStore.model.ts

@@ -1,7 +1,8 @@
 import { Column, Entity, PrimaryColumn } from "typeorm";
+import type { IExpressRateLimitModel } from "typeorm-rate-limit-store";
 
 @Entity()
-export class ExpressRateLimitStoreModel {
+export class ExpressRateLimitStoreModel implements IExpressRateLimitModel {
     @PrimaryColumn()
     public key: string;