@volcanicminds/backend 0.5.1 → 0.5.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +27 -27
- package/dist/index.js.map +1 -1
- package/dist/lib/hooks/onRequest.js +7 -6
- package/dist/lib/hooks/onRequest.js.map +1 -1
- package/dist/lib/loader/router.js +18 -13
- package/dist/lib/loader/router.js.map +1 -1
- package/dist/package.json +21 -21
- package/index.ts +29 -29
- package/lib/hooks/onRequest.ts +4 -3
- package/lib/loader/router.ts +28 -14
- package/package.json +21 -21
package/dist/index.js
CHANGED
|
@@ -64,38 +64,38 @@ const context_1 = require("./lib/apollo/context");
|
|
|
64
64
|
const resolvers_1 = __importDefault(require("./lib/apollo/resolvers"));
|
|
65
65
|
const type_defs_1 = __importDefault(require("./lib/apollo/type-defs"));
|
|
66
66
|
global.log = logger_1.default;
|
|
67
|
-
function attachApollo(
|
|
67
|
+
function attachApollo(server) {
|
|
68
68
|
return __awaiter(this, void 0, void 0, function* () {
|
|
69
69
|
log.info('Attach ApolloServer to Fastify');
|
|
70
70
|
const apollo = new server_1.ApolloServer({
|
|
71
71
|
typeDefs: type_defs_1.default,
|
|
72
72
|
resolvers: resolvers_1.default,
|
|
73
|
-
plugins: [(0, fastify_2.fastifyApolloDrainPlugin)(
|
|
73
|
+
plugins: [(0, fastify_2.fastifyApolloDrainPlugin)(server)]
|
|
74
74
|
});
|
|
75
75
|
yield apollo.start();
|
|
76
76
|
return apollo;
|
|
77
77
|
});
|
|
78
78
|
}
|
|
79
|
-
function addApolloRouting(
|
|
79
|
+
function addApolloRouting(server, apollo) {
|
|
80
80
|
return __awaiter(this, void 0, void 0, function* () {
|
|
81
81
|
if (apollo) {
|
|
82
82
|
log.trace('Add graphql routes');
|
|
83
|
-
yield
|
|
83
|
+
yield server.register((0, fastify_2.default)(apollo), {
|
|
84
84
|
context: context_1.myContextFunction
|
|
85
85
|
});
|
|
86
86
|
}
|
|
87
87
|
});
|
|
88
88
|
}
|
|
89
|
-
function addFastifyRouting(
|
|
89
|
+
function addFastifyRouting(server) {
|
|
90
90
|
return __awaiter(this, void 0, void 0, function* () {
|
|
91
|
-
log.trace('Add
|
|
92
|
-
loaderHooks.apply(
|
|
93
|
-
loaderSchemas.apply(
|
|
91
|
+
log.trace('Add server routes');
|
|
92
|
+
loaderHooks.apply(server);
|
|
93
|
+
loaderSchemas.apply(server);
|
|
94
94
|
const routes = loaderRouter.load();
|
|
95
|
-
routes && loaderRouter.apply(
|
|
95
|
+
routes && loaderRouter.apply(server, routes);
|
|
96
96
|
});
|
|
97
97
|
}
|
|
98
|
-
function addFastifySwagger(
|
|
98
|
+
function addFastifySwagger(server) {
|
|
99
99
|
return __awaiter(this, void 0, void 0, function* () {
|
|
100
100
|
const { SWAGGER, SWAGGER_TITLE, SWAGGER_DESCRIPTION, SWAGGER_VERSION, SWAGGER_PREFIX_URL, SWAGGER_HOST } = process.env;
|
|
101
101
|
const loadSwagger = (0, yn_1.default)(SWAGGER, false);
|
|
@@ -103,7 +103,7 @@ function addFastifySwagger(fastify) {
|
|
|
103
103
|
log.trace('Add swagger plugin');
|
|
104
104
|
const fs = require('fs');
|
|
105
105
|
const contents = fs.readFileSync('logo-dark.png', { encoding: 'base64' });
|
|
106
|
-
yield
|
|
106
|
+
yield server.register(swagger_1.default, {
|
|
107
107
|
swagger: {
|
|
108
108
|
info: {
|
|
109
109
|
title: SWAGGER_TITLE || 'Volcanic API Documentation',
|
|
@@ -136,7 +136,7 @@ function addFastifySwagger(fastify) {
|
|
|
136
136
|
}
|
|
137
137
|
}
|
|
138
138
|
});
|
|
139
|
-
yield
|
|
139
|
+
yield server.register(swagger_ui_1.default, {
|
|
140
140
|
routePrefix: SWAGGER_PREFIX_URL || '/documentation',
|
|
141
141
|
uiConfig: {
|
|
142
142
|
docExpansion: 'list',
|
|
@@ -160,32 +160,32 @@ const start = (decorators) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
160
160
|
global.roles = loaderRoles.load();
|
|
161
161
|
global.t = loaderTranslation.load();
|
|
162
162
|
const opts = (0, yn_1.default)(process.env.LOG_FASTIFY, false) ? { logger: logger_1.default } : {};
|
|
163
|
-
const
|
|
163
|
+
const server = (0, fastify_1.default)();
|
|
164
164
|
const { HOST: host = '0.0.0.0', PORT: port = '2230', GRAPHQL } = process.env;
|
|
165
165
|
const { JWT_SECRET = '', JWT_EXPIRES_IN = '15d', JWT_REFRESH = 'true', JWT_REFRESH_SECRET = '', JWT_REFRESH_EXPIRES_IN = '180d' } = process.env;
|
|
166
166
|
const loadRefreshJWT = (0, yn_1.default)(JWT_REFRESH, true);
|
|
167
167
|
const loadApollo = (0, yn_1.default)(GRAPHQL, false);
|
|
168
168
|
const plugins = loaderPlugins.load();
|
|
169
|
-
!loadApollo && (plugins === null || plugins === void 0 ? void 0 : plugins.helmet) && (yield
|
|
170
|
-
(plugins === null || plugins === void 0 ? void 0 : plugins.rateLimit) && (yield
|
|
171
|
-
(plugins === null || plugins === void 0 ? void 0 : plugins.cors) && (yield
|
|
172
|
-
(plugins === null || plugins === void 0 ? void 0 : plugins.compress) && (yield
|
|
169
|
+
!loadApollo && (plugins === null || plugins === void 0 ? void 0 : plugins.helmet) && (yield server.register(helmet_1.default));
|
|
170
|
+
(plugins === null || plugins === void 0 ? void 0 : plugins.rateLimit) && (yield server.register(rate_limit_1.default));
|
|
171
|
+
(plugins === null || plugins === void 0 ? void 0 : plugins.cors) && (yield server.register(cors_1.default, plugins.cors || {}));
|
|
172
|
+
(plugins === null || plugins === void 0 ? void 0 : plugins.compress) && (yield server.register(compress_1.default));
|
|
173
173
|
log.t && log.trace(`Add JWT - expiresIn: ${JWT_EXPIRES_IN}`);
|
|
174
|
-
yield
|
|
174
|
+
yield server.register(jwt_1.default, {
|
|
175
175
|
secret: JWT_SECRET,
|
|
176
176
|
sign: { expiresIn: JWT_EXPIRES_IN }
|
|
177
177
|
});
|
|
178
178
|
if (loadRefreshJWT) {
|
|
179
|
-
yield
|
|
179
|
+
yield server.register(jwt_1.default, {
|
|
180
180
|
namespace: 'refreshToken',
|
|
181
181
|
secret: JWT_REFRESH_SECRET || JWT_SECRET,
|
|
182
182
|
sign: { expiresIn: JWT_REFRESH_EXPIRES_IN }
|
|
183
183
|
});
|
|
184
184
|
}
|
|
185
|
-
const apollo = loadApollo ? yield attachApollo(
|
|
186
|
-
yield addFastifySwagger(
|
|
187
|
-
yield addApolloRouting(
|
|
188
|
-
yield addFastifyRouting(
|
|
185
|
+
const apollo = loadApollo ? yield attachApollo(server) : null;
|
|
186
|
+
yield addFastifySwagger(server);
|
|
187
|
+
yield addApolloRouting(server, apollo);
|
|
188
|
+
yield addFastifyRouting(server);
|
|
189
189
|
decorators = Object.assign({ userManager: {
|
|
190
190
|
isImplemented() {
|
|
191
191
|
return false;
|
|
@@ -293,9 +293,9 @@ const start = (decorators) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
293
293
|
}
|
|
294
294
|
} }, decorators);
|
|
295
295
|
yield Promise.all(Object.keys(decorators || {}).map((key) => __awaiter(void 0, void 0, void 0, function* () {
|
|
296
|
-
yield
|
|
296
|
+
yield server.decorate(key, decorators[key]);
|
|
297
297
|
})));
|
|
298
|
-
yield
|
|
298
|
+
yield server
|
|
299
299
|
.listen({
|
|
300
300
|
port: Number(port),
|
|
301
301
|
host: host
|
|
@@ -307,8 +307,8 @@ const start = (decorators) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
307
307
|
const loadSwagger = (0, yn_1.default)(process.env.SWAGGER, false);
|
|
308
308
|
loadSwagger && log.info(`Swagger ready ✨ at ${address}${process.env.SWAGGER_PREFIX_URL || '/documentation'}`);
|
|
309
309
|
});
|
|
310
|
-
global.server =
|
|
311
|
-
return
|
|
310
|
+
global.server = server;
|
|
311
|
+
return server;
|
|
312
312
|
});
|
|
313
313
|
exports.start = start;
|
|
314
314
|
module.exports = { yn: yn_1.default, start, TranslatedError: errors_1.TranslatedError };
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEZ,oDAA2B;AAC3B,gBAAM,CAAC,MAAM,EAAE,CAAA;AAEf,uDAA8B;AAwVrB,aAxVF,YAAE,CAwVE;AAvVX,+DAAsC;AACtC,sDAAuC;AACvC,8CAAmD;AAqV/B,gGArVX,wBAAe,OAqVW;AApVnC,oEAAqD;AACrD,gEAAiD;AACjD,kEAAmD;AACnD,gEAAiD;AACjD,oEAAqD;AACrD,4EAA6D;AAE7D,sDAAkD;AAClD,uDAAuC;AACvC,+DAAsC;AACtC,qEAA2C;AAE3C,yDAAgC;AAChC,6DAAoC;AACpC,iEAAwC;AACxC,qEAA2C;AAE3C,2CAA6C;AAC7C,oEAAkF;AAClF,kDAAmE;AACnE,uEAA8C;AAC9C,uEAA6C;AAG7C,MAAM,CAAC,GAAG,GAAG,gBAAM,CAAA;AAEnB,SAAe,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,15 +11,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
const common_1 = require("../util/common");
|
|
13
13
|
module.exports = (req, reply) => __awaiter(void 0, void 0, void 0, function* () {
|
|
14
|
-
var _a, _b, _c, _d, _e, _f;
|
|
14
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
15
15
|
log.i && (req.startedAt = new Date());
|
|
16
16
|
req.data = () => (0, common_1.getData)(req);
|
|
17
17
|
req.parameters = () => (0, common_1.getParams)(req);
|
|
18
18
|
req.roles = () => (req.user ? req.user.roles : [roles.public]);
|
|
19
19
|
req.hasRole = (r) => (req.user ? req.user.roles : [roles.public]).some((role) => role === (r === null || r === void 0 ? void 0 : r.code));
|
|
20
20
|
const auth = ((_a = req.headers) === null || _a === void 0 ? void 0 : _a.authorization) || '';
|
|
21
|
+
const cfg = ((_b = req.routeOptions) === null || _b === void 0 ? void 0 : _b.config) || req.routeConfig || {};
|
|
21
22
|
const [prefix, bearerToken] = auth.split(' ');
|
|
22
|
-
const isRoutePublic = (
|
|
23
|
+
const isRoutePublic = (cfg.requiredRoles || []).some((role) => role.code === roles.public.code);
|
|
23
24
|
if (prefix === 'Bearer' && bearerToken != null) {
|
|
24
25
|
let user = null;
|
|
25
26
|
let token = null;
|
|
@@ -53,10 +54,10 @@ module.exports = (req, reply) => __awaiter(void 0, void 0, void 0, function* ()
|
|
|
53
54
|
}
|
|
54
55
|
}
|
|
55
56
|
}
|
|
56
|
-
if (((
|
|
57
|
-
const { method = '', url = '', requiredRoles } =
|
|
58
|
-
const authRoles = ((
|
|
59
|
-
((
|
|
57
|
+
if (((_c = cfg.requiredRoles) === null || _c === void 0 ? void 0 : _c.length) > 0) {
|
|
58
|
+
const { method = '', url = '', requiredRoles } = cfg;
|
|
59
|
+
const authRoles = ((_f = (((_d = req.user) === null || _d === void 0 ? void 0 : _d.roles) || ((_e = req.token) === null || _e === void 0 ? void 0 : _e.roles))) === null || _f === void 0 ? void 0 : _f.map((code) => code)) || [
|
|
60
|
+
((_g = roles.public) === null || _g === void 0 ? void 0 : _g.code) || 'public'
|
|
60
61
|
];
|
|
61
62
|
const resolvedRoles = authRoles.length > 0 ? requiredRoles.filter((r) => authRoles.includes(r.code)) : [];
|
|
62
63
|
if (!resolvedRoles.length) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onRequest.js","sourceRoot":"","sources":["../../../lib/hooks/onRequest.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2CAAmD;AAGnD,MAAM,CAAC,OAAO,GAAG,CAAO,GAAG,EAAE,KAAK,EAAE,EAAE;;IAEpC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,CAAA;IACrC,GAAG,CAAC,IAAI,GAAG,GAAG,EAAE,CAAC,IAAA,gBAAO,EAAC,GAAG,CAAC,CAAA;IAC7B,GAAG,CAAC,UAAU,GAAG,GAAG,EAAE,CAAC,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAA;IACrC,GAAG,CAAC,KAAK,GAAG,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;IAC9D,GAAG,CAAC,OAAO,GAAG,CAAC,CAAO,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,MAAK,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,IAAI,CAAA,CAAC,CAAA;IAGxG,MAAM,IAAI,GAAG,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,aAAa,KAAI,EAAE,CAAA;IAC7C,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC7C,MAAM,aAAa,GAAG,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"onRequest.js","sourceRoot":"","sources":["../../../lib/hooks/onRequest.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,7 +69,22 @@ function load() {
|
|
|
69
69
|
? log.t &&
|
|
70
70
|
log.trace(`* Method [${method}] path ${endpoint} handler ${handler} enabled with ${(middlewares === null || middlewares === void 0 ? void 0 : middlewares.length) || 0} middlewares`)
|
|
71
71
|
: log.w && log.warn(`* Method [${method}] path ${endpoint} handler ${handler} disabled. Skip.`);
|
|
72
|
-
toAdd
|
|
72
|
+
if (toAdd) {
|
|
73
|
+
const doc = {
|
|
74
|
+
summary: title,
|
|
75
|
+
description,
|
|
76
|
+
deprecated,
|
|
77
|
+
tags,
|
|
78
|
+
version,
|
|
79
|
+
security: security === 'bearer' ? [{ Bearer: [] }] : security,
|
|
80
|
+
response
|
|
81
|
+
};
|
|
82
|
+
if (query)
|
|
83
|
+
doc.querystring = query;
|
|
84
|
+
if (params)
|
|
85
|
+
doc.params = params;
|
|
86
|
+
if (body)
|
|
87
|
+
doc.body = body;
|
|
73
88
|
validRoutes.push({
|
|
74
89
|
handler,
|
|
75
90
|
method,
|
|
@@ -80,19 +95,9 @@ function load() {
|
|
|
80
95
|
base,
|
|
81
96
|
file: path.join(base, defaultConfig.controller || 'controller', handlerParts[0]),
|
|
82
97
|
func: handlerParts[1],
|
|
83
|
-
doc:
|
|
84
|
-
summary: title,
|
|
85
|
-
description,
|
|
86
|
-
deprecated,
|
|
87
|
-
tags,
|
|
88
|
-
version,
|
|
89
|
-
security: security === 'bearer' ? [{ Bearer: [] }] : security,
|
|
90
|
-
querystring: query,
|
|
91
|
-
params,
|
|
92
|
-
body,
|
|
93
|
-
response
|
|
94
|
-
}
|
|
98
|
+
doc: doc
|
|
95
99
|
});
|
|
100
|
+
}
|
|
96
101
|
});
|
|
97
102
|
});
|
|
98
103
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../lib/loader/router.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../lib/loader/router.ts"],"names":[],"mappings":"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"}
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@volcanicminds/backend",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.3",
|
|
4
4
|
"codename": "turin",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"description": "The volcanic (minds) backend",
|
|
@@ -50,36 +50,36 @@
|
|
|
50
50
|
"upgrade-deps": "yarn upgrade-interactive"
|
|
51
51
|
},
|
|
52
52
|
"dependencies": {
|
|
53
|
-
"@apollo/server": "^4.
|
|
54
|
-
"@as-integrations/fastify": "^1.2
|
|
55
|
-
"@fastify/compress": "^6.
|
|
56
|
-
"@fastify/cors": "^8.
|
|
57
|
-
"@fastify/helmet": "^10.1.
|
|
58
|
-
"@fastify/jwt": "^6.
|
|
53
|
+
"@apollo/server": "^4.9.3",
|
|
54
|
+
"@as-integrations/fastify": "^1.3.2",
|
|
55
|
+
"@fastify/compress": "^6.4.0",
|
|
56
|
+
"@fastify/cors": "^8.4.0",
|
|
57
|
+
"@fastify/helmet": "^10.1.1",
|
|
58
|
+
"@fastify/jwt": "^6.7.1",
|
|
59
59
|
"@fastify/rate-limit": "^7.6.0",
|
|
60
|
-
"@fastify/swagger": "^8.
|
|
61
|
-
"@fastify/swagger-ui": "^1.3
|
|
62
|
-
"@types/node": "^20.
|
|
63
|
-
"dotenv": "^16.
|
|
64
|
-
"fastify": "^4.
|
|
65
|
-
"glob": "^8.0
|
|
66
|
-
"graphql": "^16.
|
|
60
|
+
"@fastify/swagger": "^8.10.1",
|
|
61
|
+
"@fastify/swagger-ui": "^1.9.3",
|
|
62
|
+
"@types/node": "^20.7.0",
|
|
63
|
+
"dotenv": "^16.3.1",
|
|
64
|
+
"fastify": "^4.23.2",
|
|
65
|
+
"glob": "^8.1.0",
|
|
66
|
+
"graphql": "^16.8.1",
|
|
67
67
|
"i18n": "^0.15.1",
|
|
68
|
-
"nanoid": "^4.0.
|
|
68
|
+
"nanoid": "^4.0.2",
|
|
69
69
|
"object-sizeof": "^1.6.3",
|
|
70
|
-
"pino": "^8.
|
|
71
|
-
"pino-pretty": "^9.
|
|
70
|
+
"pino": "^8.15.1",
|
|
71
|
+
"pino-pretty": "^9.4.1",
|
|
72
72
|
"root-require": "^0.3.1",
|
|
73
|
-
"semver": "^7.
|
|
73
|
+
"semver": "^7.5.4"
|
|
74
74
|
},
|
|
75
75
|
"devDependencies": {
|
|
76
76
|
"@types/mocha": "^10.0.1",
|
|
77
77
|
"cross-env": "^7.0.3",
|
|
78
|
-
"expect": "^29.
|
|
78
|
+
"expect": "^29.7.0",
|
|
79
79
|
"mocha": "^10.2.0",
|
|
80
|
-
"nodemon": "^2.0.
|
|
80
|
+
"nodemon": "^2.0.22",
|
|
81
81
|
"ts-node": "^10.9.1",
|
|
82
|
-
"typescript": "^4.9.
|
|
82
|
+
"typescript": "^4.9.5"
|
|
83
83
|
},
|
|
84
84
|
"repository": {
|
|
85
85
|
"type": "git",
|
package/index.ts
CHANGED
|
@@ -14,7 +14,7 @@ import * as loaderHooks from './lib/loader/hooks'
|
|
|
14
14
|
import * as loaderSchemas from './lib/loader/schemas'
|
|
15
15
|
import * as loaderTranslation from './lib/loader/translation'
|
|
16
16
|
|
|
17
|
-
import
|
|
17
|
+
import fastify, { FastifyInstance } from 'fastify'
|
|
18
18
|
import jwtValidator from '@fastify/jwt'
|
|
19
19
|
import swagger from '@fastify/swagger'
|
|
20
20
|
import swaggerUI from '@fastify/swagger-ui'
|
|
@@ -33,12 +33,12 @@ import { UserManagement, TokenManagement, DataBaseManagement } from './types/glo
|
|
|
33
33
|
|
|
34
34
|
global.log = logger
|
|
35
35
|
|
|
36
|
-
async function attachApollo(
|
|
36
|
+
async function attachApollo(server: FastifyInstance) {
|
|
37
37
|
log.info('Attach ApolloServer to Fastify')
|
|
38
38
|
const apollo = new ApolloServer<MyContext>({
|
|
39
39
|
typeDefs,
|
|
40
40
|
resolvers,
|
|
41
|
-
plugins: [fastifyApolloDrainPlugin(
|
|
41
|
+
plugins: [fastifyApolloDrainPlugin(server)]
|
|
42
42
|
})
|
|
43
43
|
|
|
44
44
|
await apollo.start()
|
|
@@ -46,15 +46,15 @@ async function attachApollo(fastify: FastifyInstance) {
|
|
|
46
46
|
return apollo
|
|
47
47
|
}
|
|
48
48
|
|
|
49
|
-
async function addApolloRouting(
|
|
49
|
+
async function addApolloRouting(server: FastifyInstance, apollo: ApolloServer<MyContext> | null) {
|
|
50
50
|
if (apollo) {
|
|
51
51
|
log.trace('Add graphql routes')
|
|
52
|
-
await
|
|
52
|
+
await server.register(fastifyApollo(apollo), {
|
|
53
53
|
context: myContextFunction
|
|
54
54
|
})
|
|
55
55
|
|
|
56
56
|
// // OR
|
|
57
|
-
//
|
|
57
|
+
// server.post(
|
|
58
58
|
// '/graphql-alt',
|
|
59
59
|
// fastifyApolloHandler(apollo, {
|
|
60
60
|
// context: myContextFunction
|
|
@@ -63,17 +63,17 @@ async function addApolloRouting(fastify: FastifyInstance, apollo: ApolloServer<M
|
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
|
|
66
|
-
async function addFastifyRouting(
|
|
67
|
-
log.trace('Add
|
|
66
|
+
async function addFastifyRouting(server: FastifyInstance) {
|
|
67
|
+
log.trace('Add server routes')
|
|
68
68
|
|
|
69
|
-
loaderHooks.apply(
|
|
70
|
-
loaderSchemas.apply(
|
|
69
|
+
loaderHooks.apply(server)
|
|
70
|
+
loaderSchemas.apply(server)
|
|
71
71
|
|
|
72
72
|
const routes = loaderRouter.load()
|
|
73
|
-
routes && loaderRouter.apply(
|
|
73
|
+
routes && loaderRouter.apply(server, routes)
|
|
74
74
|
}
|
|
75
75
|
|
|
76
|
-
async function addFastifySwagger(
|
|
76
|
+
async function addFastifySwagger(server: FastifyInstance) {
|
|
77
77
|
const { SWAGGER, SWAGGER_TITLE, SWAGGER_DESCRIPTION, SWAGGER_VERSION, SWAGGER_PREFIX_URL, SWAGGER_HOST } = process.env
|
|
78
78
|
|
|
79
79
|
const loadSwagger = yn(SWAGGER, false)
|
|
@@ -83,7 +83,7 @@ async function addFastifySwagger(fastify: FastifyInstance) {
|
|
|
83
83
|
const fs = require('fs')
|
|
84
84
|
const contents = fs.readFileSync('logo-dark.png', { encoding: 'base64' })
|
|
85
85
|
|
|
86
|
-
await
|
|
86
|
+
await server.register(swagger, {
|
|
87
87
|
swagger: {
|
|
88
88
|
info: {
|
|
89
89
|
title: SWAGGER_TITLE || 'Volcanic API Documentation',
|
|
@@ -117,7 +117,7 @@ async function addFastifySwagger(fastify: FastifyInstance) {
|
|
|
117
117
|
}
|
|
118
118
|
})
|
|
119
119
|
|
|
120
|
-
await
|
|
120
|
+
await server.register(swaggerUI, {
|
|
121
121
|
routePrefix: SWAGGER_PREFIX_URL || '/documentation',
|
|
122
122
|
uiConfig: {
|
|
123
123
|
docExpansion: 'list',
|
|
@@ -142,7 +142,7 @@ const start = async (decorators) => {
|
|
|
142
142
|
global.t = loaderTranslation.load()
|
|
143
143
|
|
|
144
144
|
const opts = yn(process.env.LOG_FASTIFY, false) ? { logger: logger } : {}
|
|
145
|
-
const
|
|
145
|
+
const server: FastifyInstance = fastify()
|
|
146
146
|
|
|
147
147
|
const { HOST: host = '0.0.0.0', PORT: port = '2230', GRAPHQL } = process.env
|
|
148
148
|
const {
|
|
@@ -158,30 +158,30 @@ const start = async (decorators) => {
|
|
|
158
158
|
const plugins = loaderPlugins.load()
|
|
159
159
|
|
|
160
160
|
// Helmet is not usable with Apollo Server
|
|
161
|
-
!loadApollo && plugins?.helmet && (await
|
|
162
|
-
plugins?.rateLimit && (await
|
|
163
|
-
plugins?.cors && (await
|
|
164
|
-
plugins?.compress && (await
|
|
161
|
+
!loadApollo && plugins?.helmet && (await server.register(helmet))
|
|
162
|
+
plugins?.rateLimit && (await server.register(rateLimit))
|
|
163
|
+
plugins?.cors && (await server.register(cors, plugins.cors || {}))
|
|
164
|
+
plugins?.compress && (await server.register(compress))
|
|
165
165
|
|
|
166
166
|
// JWT Validator
|
|
167
167
|
log.t && log.trace(`Add JWT - expiresIn: ${JWT_EXPIRES_IN}`)
|
|
168
|
-
await
|
|
168
|
+
await server.register(jwtValidator, {
|
|
169
169
|
secret: JWT_SECRET,
|
|
170
170
|
sign: { expiresIn: JWT_EXPIRES_IN }
|
|
171
171
|
})
|
|
172
172
|
|
|
173
173
|
if (loadRefreshJWT) {
|
|
174
|
-
await
|
|
174
|
+
await server.register(jwtValidator, {
|
|
175
175
|
namespace: 'refreshToken',
|
|
176
176
|
secret: JWT_REFRESH_SECRET || JWT_SECRET,
|
|
177
177
|
sign: { expiresIn: JWT_REFRESH_EXPIRES_IN }
|
|
178
178
|
})
|
|
179
179
|
}
|
|
180
180
|
|
|
181
|
-
const apollo = loadApollo ? await attachApollo(
|
|
182
|
-
await addFastifySwagger(
|
|
183
|
-
await addApolloRouting(
|
|
184
|
-
await addFastifyRouting(
|
|
181
|
+
const apollo = loadApollo ? await attachApollo(server) : null
|
|
182
|
+
await addFastifySwagger(server)
|
|
183
|
+
await addApolloRouting(server, apollo)
|
|
184
|
+
await addFastifyRouting(server)
|
|
185
185
|
|
|
186
186
|
// defaults
|
|
187
187
|
decorators = {
|
|
@@ -298,11 +298,11 @@ const start = async (decorators) => {
|
|
|
298
298
|
|
|
299
299
|
await Promise.all(
|
|
300
300
|
Object.keys(decorators || {}).map(async (key) => {
|
|
301
|
-
await
|
|
301
|
+
await server.decorate(key, decorators[key])
|
|
302
302
|
})
|
|
303
303
|
)
|
|
304
304
|
|
|
305
|
-
await
|
|
305
|
+
await server
|
|
306
306
|
.listen({
|
|
307
307
|
port: Number(port),
|
|
308
308
|
host: host
|
|
@@ -316,8 +316,8 @@ const start = async (decorators) => {
|
|
|
316
316
|
loadSwagger && log.info(`Swagger ready ✨ at ${address}${process.env.SWAGGER_PREFIX_URL || '/documentation'}`)
|
|
317
317
|
})
|
|
318
318
|
|
|
319
|
-
global.server =
|
|
320
|
-
return
|
|
319
|
+
global.server = server
|
|
320
|
+
return server
|
|
321
321
|
}
|
|
322
322
|
|
|
323
323
|
export {
|
package/lib/hooks/onRequest.ts
CHANGED
|
@@ -11,8 +11,9 @@ module.exports = async (req, reply) => {
|
|
|
11
11
|
|
|
12
12
|
// authorization check
|
|
13
13
|
const auth = req.headers?.authorization || ''
|
|
14
|
+
const cfg = req.routeOptions?.config || req.routeConfig || {}
|
|
14
15
|
const [prefix, bearerToken] = auth.split(' ')
|
|
15
|
-
const isRoutePublic = (
|
|
16
|
+
const isRoutePublic = (cfg.requiredRoles || []).some((role: Role) => role.code === roles.public.code)
|
|
16
17
|
|
|
17
18
|
if (prefix === 'Bearer' && bearerToken != null) {
|
|
18
19
|
let user: null | AuthenticatedUser = null
|
|
@@ -50,8 +51,8 @@ module.exports = async (req, reply) => {
|
|
|
50
51
|
}
|
|
51
52
|
}
|
|
52
53
|
|
|
53
|
-
if (
|
|
54
|
-
const { method = '', url = '', requiredRoles } =
|
|
54
|
+
if (cfg.requiredRoles?.length > 0) {
|
|
55
|
+
const { method = '', url = '', requiredRoles } = cfg
|
|
55
56
|
const authRoles: string[] = ((req.user?.roles || req.token?.roles)?.map((code) => code) as string[]) || [
|
|
56
57
|
roles.public?.code || 'public'
|
|
57
58
|
]
|
package/lib/loader/router.ts
CHANGED
|
@@ -101,7 +101,32 @@ export function load(): ConfiguredRoute[] {
|
|
|
101
101
|
)
|
|
102
102
|
: log.w && log.warn(`* Method [${method}] path ${endpoint} handler ${handler} disabled. Skip.`)
|
|
103
103
|
|
|
104
|
-
toAdd
|
|
104
|
+
if (toAdd) {
|
|
105
|
+
const doc = {
|
|
106
|
+
summary: title,
|
|
107
|
+
description,
|
|
108
|
+
deprecated,
|
|
109
|
+
tags,
|
|
110
|
+
version,
|
|
111
|
+
security: security === 'bearer' ? [{ Bearer: [] }] : security,
|
|
112
|
+
response
|
|
113
|
+
} as {
|
|
114
|
+
summary: string
|
|
115
|
+
description: string
|
|
116
|
+
deprecated: boolean
|
|
117
|
+
tags: string[]
|
|
118
|
+
version: string
|
|
119
|
+
security: any
|
|
120
|
+
response: any
|
|
121
|
+
querystring: any | undefined
|
|
122
|
+
params: any | undefined
|
|
123
|
+
body: any | undefined
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
if (query) doc.querystring = query
|
|
127
|
+
if (params) doc.params = params
|
|
128
|
+
if (body) doc.body = body
|
|
129
|
+
|
|
105
130
|
validRoutes.push({
|
|
106
131
|
handler,
|
|
107
132
|
method,
|
|
@@ -112,20 +137,9 @@ export function load(): ConfiguredRoute[] {
|
|
|
112
137
|
base,
|
|
113
138
|
file: path.join(base, defaultConfig.controller || 'controller', handlerParts[0]),
|
|
114
139
|
func: handlerParts[1],
|
|
115
|
-
// swagger
|
|
116
|
-
doc: {
|
|
117
|
-
summary: title,
|
|
118
|
-
description,
|
|
119
|
-
deprecated,
|
|
120
|
-
tags,
|
|
121
|
-
version,
|
|
122
|
-
security: security === 'bearer' ? [{ Bearer: [] }] : security,
|
|
123
|
-
querystring: query,
|
|
124
|
-
params,
|
|
125
|
-
body,
|
|
126
|
-
response
|
|
127
|
-
}
|
|
140
|
+
doc: doc // swagger & schema validation
|
|
128
141
|
})
|
|
142
|
+
}
|
|
129
143
|
})
|
|
130
144
|
})
|
|
131
145
|
})
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@volcanicminds/backend",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.3",
|
|
4
4
|
"codename": "turin",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"description": "The volcanic (minds) backend",
|
|
@@ -50,36 +50,36 @@
|
|
|
50
50
|
"upgrade-deps": "yarn upgrade-interactive"
|
|
51
51
|
},
|
|
52
52
|
"dependencies": {
|
|
53
|
-
"@apollo/server": "^4.
|
|
54
|
-
"@as-integrations/fastify": "^1.2
|
|
55
|
-
"@fastify/compress": "^6.
|
|
56
|
-
"@fastify/cors": "^8.
|
|
57
|
-
"@fastify/helmet": "^10.1.
|
|
58
|
-
"@fastify/jwt": "^6.
|
|
53
|
+
"@apollo/server": "^4.9.3",
|
|
54
|
+
"@as-integrations/fastify": "^1.3.2",
|
|
55
|
+
"@fastify/compress": "^6.4.0",
|
|
56
|
+
"@fastify/cors": "^8.4.0",
|
|
57
|
+
"@fastify/helmet": "^10.1.1",
|
|
58
|
+
"@fastify/jwt": "^6.7.1",
|
|
59
59
|
"@fastify/rate-limit": "^7.6.0",
|
|
60
|
-
"@fastify/swagger": "^8.
|
|
61
|
-
"@fastify/swagger-ui": "^1.3
|
|
62
|
-
"@types/node": "^20.
|
|
63
|
-
"dotenv": "^16.
|
|
64
|
-
"fastify": "^4.
|
|
65
|
-
"glob": "^8.0
|
|
66
|
-
"graphql": "^16.
|
|
60
|
+
"@fastify/swagger": "^8.10.1",
|
|
61
|
+
"@fastify/swagger-ui": "^1.9.3",
|
|
62
|
+
"@types/node": "^20.7.0",
|
|
63
|
+
"dotenv": "^16.3.1",
|
|
64
|
+
"fastify": "^4.23.2",
|
|
65
|
+
"glob": "^8.1.0",
|
|
66
|
+
"graphql": "^16.8.1",
|
|
67
67
|
"i18n": "^0.15.1",
|
|
68
|
-
"nanoid": "^4.0.
|
|
68
|
+
"nanoid": "^4.0.2",
|
|
69
69
|
"object-sizeof": "^1.6.3",
|
|
70
|
-
"pino": "^8.
|
|
71
|
-
"pino-pretty": "^9.
|
|
70
|
+
"pino": "^8.15.1",
|
|
71
|
+
"pino-pretty": "^9.4.1",
|
|
72
72
|
"root-require": "^0.3.1",
|
|
73
|
-
"semver": "^7.
|
|
73
|
+
"semver": "^7.5.4"
|
|
74
74
|
},
|
|
75
75
|
"devDependencies": {
|
|
76
76
|
"@types/mocha": "^10.0.1",
|
|
77
77
|
"cross-env": "^7.0.3",
|
|
78
|
-
"expect": "^29.
|
|
78
|
+
"expect": "^29.7.0",
|
|
79
79
|
"mocha": "^10.2.0",
|
|
80
|
-
"nodemon": "^2.0.
|
|
80
|
+
"nodemon": "^2.0.22",
|
|
81
81
|
"ts-node": "^10.9.1",
|
|
82
|
-
"typescript": "^4.9.
|
|
82
|
+
"typescript": "^4.9.5"
|
|
83
83
|
},
|
|
84
84
|
"repository": {
|
|
85
85
|
"type": "git",
|