Skip to content

Commit c40a48c

Browse files
committed
feat: remove autoload
1 parent 295a496 commit c40a48c

File tree

9 files changed

+10299
-8180
lines changed

9 files changed

+10299
-8180
lines changed

packages/velog-server/src/app.ts

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
import autoload from '@fastify/autoload'
21
import Fastify from 'fastify'
32
import formbody from '@fastify/formbody'
43
import cookie from '@fastify/cookie'
54
import { ENV } from '@env'
6-
import { UtilsService } from '@lib/utils/UtilsService.js'
7-
import { container } from 'tsyringe'
85
import routes from '@routes/index.js'
96
import multer from 'fastify-multer'
107
import validatorCompilerPlugin from '@plugins/global/validatorCompilerPlugin.js'
8+
import corsPlugin from '@plugins/global/corsPlugin.js'
9+
import authPlugin from '@plugins/global/authPlugin.js'
10+
import ipaddrPlugin from '@plugins/global/ipaddrPlugin.js'
11+
import mercuriusPlugin from '@plugins/global/mercuriusPlugin.js'
12+
import errorHandlerPlugin from '@plugins/global/errorHandlerPlugin.js'
13+
import keepAlivePlugin from '@plugins/global/keepAlivePlugin.js'
1114

1215
const app = Fastify({
1316
logger: true,
@@ -17,13 +20,12 @@ const app = Fastify({
1720
app.register(cookie, { secret: ENV.cookieSecretKey })
1821
app.register(formbody)
1922

20-
const utils = container.resolve(UtilsService)
21-
app.register(autoload, {
22-
dir: utils.resolveDir('./src/common/plugins/global'),
23-
encapsulate: false,
24-
forceESM: true,
25-
})
26-
23+
await app.register(corsPlugin)
24+
app.register(authPlugin)
25+
app.register(ipaddrPlugin)
26+
app.register(mercuriusPlugin)
27+
app.register(errorHandlerPlugin)
28+
app.register(keepAlivePlugin)
2729
app.register(multer.contentParser)
2830
app.register(validatorCompilerPlugin)
2931

packages/velog-server/src/common/plugins/global/authPlugin.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { container } from 'tsyringe'
55
import { UserService } from '@services/UserService/index.js'
66
import { CookieService } from '@lib/cookie/CookieService.js'
77
import { Time } from '@constants/TimeConstants.js'
8+
import fp from 'fastify-plugin'
89

910
const authPlugin: FastifyPluginAsync = async (fastify) => {
1011
fastify.decorateRequest('user', null)
@@ -77,4 +78,4 @@ const authPlugin: FastifyPluginAsync = async (fastify) => {
7778
})
7879
}
7980

80-
export default authPlugin
81+
export default fp(authPlugin)

packages/velog-server/src/common/plugins/global/corsPlugin.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { FastifyPluginAsync } from 'fastify'
22
import cors from '@fastify/cors'
33
import { ForbiddenError } from '@errors/ForbiddenError.js'
44
import { ENV } from '@env'
5+
import fp from 'fastify-plugin'
56

67
const corsPlugin: FastifyPluginAsync = async (fastify) => {
78
const corsWhitelist: RegExp[] = [
@@ -28,4 +29,4 @@ const corsPlugin: FastifyPluginAsync = async (fastify) => {
2829
})
2930
}
3031

31-
export default corsPlugin
32+
export default fp(corsPlugin)

packages/velog-server/src/common/plugins/global/errorHandlerPlugin.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { isHttpError } from '@errors/HttpError.js'
33
import { DiscordService } from '@lib/discord/DiscordService.js'
44
import { FastifyPluginCallback } from 'fastify'
55
import { container } from 'tsyringe'
6+
import fp from 'fastify-plugin'
67

78
const errorHandlerPlugin: FastifyPluginCallback = (fastify, _, done) => {
89
fastify.addHook('preHandler', function (request, reply, done) {
@@ -62,4 +63,4 @@ const errorHandlerPlugin: FastifyPluginCallback = (fastify, _, done) => {
6263
done()
6364
}
6465

65-
export default errorHandlerPlugin
66+
export default fp(errorHandlerPlugin)

packages/velog-server/src/common/plugins/global/ipaddrPlugin.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import type { FastifyPluginAsync } from 'fastify'
2+
import fp from 'fastify-plugin'
23

34
const ipaddrPlugin: FastifyPluginAsync = async (fastify) => {
45
fastify.decorateRequest('ipaddr', null)
@@ -16,4 +17,4 @@ const ipaddrPlugin: FastifyPluginAsync = async (fastify) => {
1617
})
1718
}
1819

19-
export default ipaddrPlugin
20+
export default fp(ipaddrPlugin)

packages/velog-server/src/common/plugins/global/keepAlivePlugin.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { FastifyPluginAsync } from 'fastify'
2+
import fp from 'fastify-plugin'
23

34
let isClosing = false
45
export const startClosing = () => {
@@ -15,4 +16,4 @@ const keepAlivePlugin: FastifyPluginAsync = async (fastify) => {
1516
})
1617
}
1718

18-
export default keepAlivePlugin
19+
export default fp(keepAlivePlugin)

packages/velog-server/src/common/plugins/global/mercuriusPlugin.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { ENV } from '@env'
66
import { isHttpError } from '@errors/HttpError.js'
77
import { container } from 'tsyringe'
88
import { DiscordService } from '@lib/discord/DiscordService.js'
9+
import fp from 'fastify-plugin'
910

1011
const mercuriusPlugin: FastifyPluginAsync = async (fastify) => {
1112
fastify.register(mercurius, {
@@ -88,4 +89,4 @@ const mercuriusPlugin: FastifyPluginAsync = async (fastify) => {
8889
})
8990
}
9091

91-
export default mercuriusPlugin
92+
export default fp(mercuriusPlugin)

packages/velog-server/src/common/plugins/global/validatorCompilerPlugin.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Ajv from 'ajv'
22
import { FastifyPluginAsync } from 'fastify'
3+
import fp from 'fastify-plugin'
34

45
const schemaCompilers = {
56
body: new Ajv({
@@ -37,4 +38,4 @@ const validatorCompiler: FastifyPluginAsync = async (fastify) => {
3738
})
3839
}
3940

40-
export default validatorCompiler
41+
export default fp(validatorCompiler)

0 commit comments

Comments
 (0)