chore: fastify & redis conf separate

Author: vwency

src/auth/auth/auth.service.ts

@@ -14,24 +14,20 @@ export class AuthService {
   constructor(private prisma: PrismaService) {}
 
   async signupLocal(dto: AuthDto, req: FastifyRequest): Promise<Users> {
-
     const existingUser = await this.prisma.users.findUnique({
       where: { username: dto.username, email: dto.email },
     })
     if (existingUser) {
       throw new BadRequestException('User already exists')
     }
 
-
     const hash = await argon.hash(dto.password)
     dto.password = undefined
 
-
     const newUser = await this.prisma.users.create({
       data: { ...dto, hash: hash },
     })
 
-
     await this.saveSession(req, newUser)
 
     return newUser
@@ -69,7 +65,6 @@ export class AuthService {
       return user
     }
 
-
     const hash = await argon.hash(dto.password)
     dto.password = undefined
     const newUser = await this.prisma.users.create({
@@ -89,7 +84,6 @@ export class AuthService {
     remember?: boolean,
   ): Promise<boolean> {
     return new Promise((resolve, reject) => {
-
       if (remember) {
         req.session.cookie.maxAge = 1000 * 60 * 60 * 24 * 30 // 30 дней
       } else {

src/auth/oauth/github/github.contoller.ts

@@ -24,7 +24,6 @@ export class GithubController {
     @Res() res: FastifyReply,
   ) {
     try {
-
       await this.githubOAuthService.authenticate(code, req)
       return res.redirect('/auth/status', 302) // переадресация на статус
     } catch (error) {

src/auth/oauth/google/google.service.ts

@@ -1,4 +1,3 @@
-
 import { Injectable } from '@nestjs/common'
 import { OAuthService } from '../oauth.service'
 import { AuthService } from 'src/auth/auth/auth.service'

src/main.ts

@@ -2,10 +2,7 @@ import { NestFactory } from '@nestjs/core'
 import { AppModule } from './app.module'
 import { SwaggerModule, DocumentBuilder } from '@nestjs/swagger'
 import * as cliColor from 'cli-color'
-import IORedis from 'ioredis'
-import * as fastifyCookie from '@fastify/cookie'
-import * as fastifySession from '@fastify/session'
-import * as fastifyCors from '@fastify/cors'
+import { registerFastifyPlugins } from './session/fastify.config'
 import {
   FastifyAdapter,
   NestFastifyApplication,
@@ -20,78 +17,7 @@ async function bootstrap() {
     new FastifyAdapter(),
   )
 
-  await app.register(fastifyCors, {
-    origin: ['http://127.0.0.1:9000', 'http://localhost:9000'],
-    methods: ['GET', 'HEAD', 'PUT', 'PATCH', 'POST', 'DELETE'],
-    credentials: true,
-  })
-
-  await app.register(fastifyCookie)
-
-  const redis = new IORedis('redis://localhost:6379', {
-    lazyConnect: true,
-    connectTimeout: 5000,
-    maxRetriesPerRequest: 3,
-  })
-
-  await redis.ping()
-
-  redis.on('error', (err) => {
-    console.error('Ошибка Redis:', err)
-  })
-
-  redis.on('connect', () => {
-    console.log('Подключение к Redis успешно!')
-  })
-
-  redis.on('pong', (message) => {
-    console.log('Redis ответил на ping:', message)
-  })
-
-  redis.on('monitor', (time, args) => {
-    console.log('Redis команда:', time, args)
-  })
-
-  const customRedisStore = {
-    get(sid: string, callback: (err?: any, session?: any) => void) {
-      redis.get(`session:${sid}`, (err, data) => {
-        if (err) return callback(err)
-        if (!data) return callback()
-        try {
-          const session = JSON.parse(data)
-          callback(null, session)
-        } catch (error) {
-          callback(error)
-        }
-      })
-    },
-    set(sid: string, session: any, callback: (err?: any) => void) {
-      const ttl =
-        session.cookie && session.cookie.maxAge
-          ? Math.floor(session.cookie.maxAge / 1000)
-          : 24 * 60 * 60
-      redis.set(`session:${sid}`, JSON.stringify(session), 'EX', ttl, (err) => {
-        callback(err)
-      })
-    },
-    destroy(sid: string, callback: (err?: any) => void) {
-      redis.del(`session:${sid}`, (err) => {
-        callback(err)
-      })
-    },
-  }
-
-  await app.register(fastifySession, {
-    secret: process.env.SESSION_SECRET || 'supersecret',
-    saveUninitialized: false,
-    cookie: {
-      sameSite: 'lax',
-      httpOnly: true,
-      secure: false,
-      maxAge: 24 * 60 * 60 * 1000,
-    },
-    store: customRedisStore,
-  })
+  registerFastifyPlugins(app)
 
   const config = new DocumentBuilder()
     .setTitle('NestJS Fastify API')

src/session/fastify.config.ts

@@ -0,0 +1,26 @@
+import * as fastifyCookie from '@fastify/cookie'
+import * as fastifySession from '@fastify/session'
+import * as fastifyCors from '@fastify/cors'
+import { customRedisStore } from './redis.provider'
+
+export function registerFastifyPlugins(app) {
+  app.register(fastifyCors, {
+    origin: ['http://127.0.0.1:9000', 'http://localhost:9000'],
+    methods: ['GET', 'HEAD', 'PUT', 'PATCH', 'POST', 'DELETE'],
+    credentials: true,
+  })
+
+  app.register(fastifyCookie)
+
+  app.register(fastifySession, {
+    secret: process.env.SESSION_SECRET || 'supersecret',
+    saveUninitialized: false,
+    cookie: {
+      sameSite: 'lax',
+      httpOnly: true,
+      secure: false,
+      maxAge: 24 * 60 * 60 * 1000,
+    },
+    store: customRedisStore,
+  })
+}

src/session/redis.provider.ts

@@ -0,0 +1,54 @@
+import IORedis from 'ioredis'
+
+const redisUri = process.env.REDIS_URI || 'redis://localhost:6379'
+
+export const redis = new IORedis(redisUri, {
+  lazyConnect: true,
+  connectTimeout: 5000,
+  maxRetriesPerRequest: 3,
+})
+
+redis.on('error', (err) => {
+  console.error('Ошибка Redis:', err)
+})
+
+redis.on('connect', () => {
+  console.log('Подключение к Redis успешно!')
+})
+
+redis.on('pong', (message) => {
+  console.log('Redis ответил на ping:', message)
+})
+
+redis.on('monitor', (time, args) => {
+  console.log('Redis команда:', time, args)
+})
+
+export const customRedisStore = {
+  get(sid: string, callback: (err?: any, session?: any) => void) {
+    redis.get(`session:${sid}`, (err, data) => {
+      if (err) return callback(err)
+      if (!data) return callback()
+      try {
+        const session = JSON.parse(data)
+        callback(null, session)
+      } catch (error) {
+        callback(error)
+      }
+    })
+  },
+  set(sid: string, session: any, callback: (err?: any) => void) {
+    const ttl =
+      session.cookie && session.cookie.maxAge
+        ? Math.floor(session.cookie.maxAge / 1000)
+        : 24 * 60 * 60
+    redis.set(`session:${sid}`, JSON.stringify(session), 'EX', ttl, (err) => {
+      callback(err)
+    })
+  },
+  destroy(sid: string, callback: (err?: any) => void) {
+    redis.del(`session:${sid}`, (err) => {
+      callback(err)
+    })
+  },
+}