dev (#35)

add redis and k6 to the project

.env.exemple

@@ -1,4 +1,7 @@
 ACCESS_KEY='your_aws_access_key'
 SECRET_KEY='your_aws_acess_key'
 REGION='your_aws_region'
-PORT=3000
+PORT=3000
+REDIS_PORT=53821
+REDIS_HOST="redis_host"
+REDIS_PASSWORD="redis_password"

package.json

@@ -10,12 +10,13 @@
     "tests:all": "npm run tests:integration & npm run tests:unit",
     "dev": "nodemon src/server.ts",
     "start": "npm run build && node dist/server.js",
-    "docker:build": "docker build -t uploads3 .",
+    "docker:build": "docker build -t uploads3 -f docker/Dockerfile .",
     "prepare": "husky install",
     "build": "tsc",
     "format": "prettier --write .",
     "tests:e2e": "jest src/tests/e2e",
-    "coverage": "jest --coverage"
+    "coverage": "jest --coverage",
+    "k6:dev": "k6 run ./scripts/dev/**.ts"
   },
   "keywords": [],
   "author": "",
@@ -40,9 +41,12 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.550.0",
+    "@types/k6": "^0.51.0",
     "compression": "^1.7.4",
     "dotenv": "^16.4.5",
     "helmet": "^7.1.0",
+    "ioredis": "^5.4.1",
+    "k6": "^0.0.0",
     "morgan": "^1.10.0",
     "multer": "^1.4.5-lts.1",
     "winston": "^3.13.0",

scripts/dev/get-files.ts

@@ -0,0 +1,15 @@
+import { check, sleep } from 'k6'
+import http from 'k6/http'
+
+export let options = {
+  vus: 800,
+  iterations: 20000,
+}
+
+export default function () {
+  let res = http.get('http://localhost:4000/api/v1/files')
+
+  check(res, { 'request successfully': (r) => r.status === 200 })
+
+  sleep(0.3)
+}

src/app.ts

@@ -50,7 +50,7 @@ export class ExpressApp {
 
   public start(port: number) {
     return this.expressApp.listen(port, () => {
-      loggerService.info('Sever is running !')
+      loggerService.info(`Sever is running on por ${port}!`)
     })
   }
 

src/config/env/index.ts

@@ -8,6 +8,9 @@ const envSchema = z.object({
   ACCESS_KEY: z.string(),
   SECRET_KEY: z.string(),
   REGION: z.string(),
+  REDIS_PORT: z.coerce.number(),
+  REDIS_HOST: z.string(),
+  REDIS_PASSWORD: z.string(),
 })
 
 const _env = envSchema.safeParse(process.env)

src/controllers/list-all-files-controller.ts

@@ -2,6 +2,8 @@ import { Request, Response } from 'express'
 import { ListFilesService } from '../services/list-all-files-service'
 import { s3 } from '../aws'
 import { HttpStatusCode } from '../utils/http-status'
+import { loggerService } from '../config/logger/winston'
+import { redis } from '../redis'
 
 export class ListFilesController {
   private listFilesService: ListFilesService
@@ -27,5 +29,5 @@ export class ListFilesController {
 }
 
 export const listFilesControllerHandler = new ListFilesController(
-  new ListFilesService(s3),
+  new ListFilesService(s3, loggerService, redis),
 )

src/controllers/list-file-by-id-controller.ts

@@ -3,6 +3,7 @@ import { ListFileByIdService } from '../services/list-file-by-id-service'
 import { s3 } from '../aws'
 import { HttpStatusCode } from '../utils/http-status'
 import { loggerService } from '../config/logger/winston'
+import { redis } from '../redis'
 
 export class ListFileByIdController {
   private listFileByIdService: ListFileByIdService
@@ -27,7 +28,11 @@ export class ListFileByIdController {
   }
 }
 
-export const listFileByIdService = new ListFileByIdService(s3, loggerService)
+export const listFileByIdService = new ListFileByIdService(
+  s3,
+  loggerService,
+  redis,
+)
 
 export const listFileByIdControllerHandler = new ListFileByIdController(
   listFileByIdService,

src/redis/index.ts

@@ -0,0 +1,8 @@
+import Redis from 'ioredis'
+import { env } from '../config/env'
+
+export const redis = new Redis({
+  password: env.REDIS_PASSWORD,
+  host: env.REDIS_HOST,
+  port: env.REDIS_PORT,
+})

src/services/list-all-files-service.ts

@@ -1,18 +1,31 @@
 import { S3Client, ListObjectsV2Command, _Object } from '@aws-sdk/client-s3'
+import { Redis } from 'ioredis'
+import { Logger } from 'winston'
 
 export class ListFilesService {
   private s3: S3Client
+  private redisService: Redis
+  private logger: Logger
 
-  constructor(s3: S3Client) {
+  constructor(s3: S3Client, logger: Logger, redisService: Redis) {
     this.s3 = s3
+    this.redisService = redisService
+    this.logger = logger
   }
 
   public async invoke(): Promise<_Object[]> {
     const params = {
       Bucket: 'storage-app',
     }
     try {
+      const cacheData = await this.redisService.get('data')
+      if (cacheData) {
+        this.logger.info('Returning data from cache...')
+        return JSON.parse(cacheData)
+      }
       const data = await this.s3.send(new ListObjectsV2Command(params))
+
+      await this.redisService.set('data', JSON.stringify(data), 'EX', 3000)
       return data.Contents
     } catch (error) {
       throw new Error('Some error has been ocurred')

src/services/list-file-by-id-service.ts

@@ -1,4 +1,5 @@
 import { S3Client, HeadObjectCommand } from '@aws-sdk/client-s3'
+import { Redis } from 'ioredis'
 import { Logger } from 'winston'
 
 type ReturnTypeListFileById = {
@@ -11,13 +12,20 @@ type ReturnTypeListFileById = {
 export class ListFileByIdService {
   private s3: S3Client
   private logger: Logger
+  private redisService: Redis
 
-  constructor(s3: S3Client, logger: Logger) {
+  constructor(s3: S3Client, logger: Logger, redisService: Redis) {
     this.s3 = s3
     this.logger = logger
+    this.redisService = redisService
   }
 
   public async invoke(file_id: string): Promise<ReturnTypeListFileById> {
+    const cacheData = await this.redisService.get(file_id)
+    if (cacheData) {
+      this.logger.info('Returning file in cache...')
+      return JSON.parse(cacheData)
+    }
     if (!file_id || file_id.trim() == '') {
       this.logger.warn('Provide a file file id...')
       throw new Error('Please provide a file id')
@@ -29,12 +37,16 @@ export class ListFileByIdService {
 
     try {
       const data = await this.s3.send(new HeadObjectCommand(params))
-      return {
+
+      const result: ReturnTypeListFileById = {
         key: file_id,
         size: data.ContentLength,
         lastModified: data.LastModified,
         contentType: data.ContentType,
       }
+
+      await this.redisService.set(file_id, JSON.stringify(result), 'EX', 600)
+      return result
     } catch (error) {
       throw new Error('Some error while get a file...')
     }

src/services/upload-file-service.ts

@@ -36,5 +36,5 @@ export class UploadFileService {
       this.logger.error('Error uploading file:', error)
       throw new Error('An error occurred while uploading the file')
     }
+  }
 }
-}