@volcanicminds/backend 0.1.5 → 0.1.6
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/README.md +70 -0
- package/TODO.md +6 -0
- package/dist/api/me/routes.js +1 -2
- package/dist/api/me/routes.js.map +1 -1
- package/dist/loader/roles.js +14 -0
- package/dist/loader/roles.js.map +1 -1
- package/dist/loader/router.js +7 -6
- package/dist/loader/router.js.map +1 -1
- package/lib/api/me/routes.ts +1 -1
- package/lib/loader/roles.ts +19 -0
- package/lib/loader/router.ts +8 -8
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -144,3 +144,73 @@ SRV_HELMET=false
|
|
|
144
144
|
SRV_RATELIMIT=false
|
|
145
145
|
SRV_COMPRESS=false
|
|
146
146
|
```
|
|
147
|
+
|
|
148
|
+
# Routes
|
|
149
|
+
|
|
150
|
+
Minimal setup (routes.ts):
|
|
151
|
+
|
|
152
|
+
```js
|
|
153
|
+
module.exports = {
|
|
154
|
+
routes: [
|
|
155
|
+
{
|
|
156
|
+
method: 'GET',
|
|
157
|
+
path: '/',
|
|
158
|
+
handler: 'myController.test'
|
|
159
|
+
}
|
|
160
|
+
]
|
|
161
|
+
}
|
|
162
|
+
```
|
|
163
|
+
|
|
164
|
+
Some notes:
|
|
165
|
+
|
|
166
|
+
- It's possible define a generic **config** (optional).
|
|
167
|
+
- It's possible define a **config** for a specific route (optional).
|
|
168
|
+
- It's possible define a list of **roles** (optional).
|
|
169
|
+
- It's possible define a list of **middleware** (optional).
|
|
170
|
+
|
|
171
|
+
```js
|
|
172
|
+
module.exports = {
|
|
173
|
+
config: {
|
|
174
|
+
title: 'Example of routes.ts',
|
|
175
|
+
description: 'Example of routes.ts',
|
|
176
|
+
controller: 'controller',
|
|
177
|
+
tags: ['user', 'code'], // swagger
|
|
178
|
+
enable: true,
|
|
179
|
+
deprecated: false, // swagger
|
|
180
|
+
version: false // swagger
|
|
181
|
+
},
|
|
182
|
+
routes: [
|
|
183
|
+
{
|
|
184
|
+
method: 'GET',
|
|
185
|
+
path: '/',
|
|
186
|
+
roles: [],
|
|
187
|
+
handler: 'demo.user',
|
|
188
|
+
middlewares: ['global.isAuthenticated'],
|
|
189
|
+
config: {
|
|
190
|
+
enable: true,
|
|
191
|
+
title: 'Demo title', // swagger summary
|
|
192
|
+
description: 'Demo description', // swagger
|
|
193
|
+
tags: ['user', 'code'], // swagger
|
|
194
|
+
deprecated: false, // swagger
|
|
195
|
+
version: false, // swagger
|
|
196
|
+
response: {
|
|
197
|
+
403: {
|
|
198
|
+
description: 'Unsuccessful response',
|
|
199
|
+
type: 'object',
|
|
200
|
+
properties: {
|
|
201
|
+
hello: { type: 'string' }
|
|
202
|
+
}
|
|
203
|
+
},
|
|
204
|
+
200: {
|
|
205
|
+
description: 'Successful response',
|
|
206
|
+
type: 'object',
|
|
207
|
+
properties: {
|
|
208
|
+
id: { type: 'number' }
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
} // swagger
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
]
|
|
215
|
+
}
|
|
216
|
+
```
|
package/TODO.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# TODO
|
|
2
2
|
|
|
3
|
+
https://tutorialjavascript.altervista.org/moduli-typescript
|
|
4
|
+
https://swagger.io/specification/v2/#swaggerObject
|
|
5
|
+
https://github.com/fastify/fastify-swagger
|
|
6
|
+
https://www.fastify.io/docs/latest/Reference/Validation-and-Serialization/
|
|
7
|
+
https://json-schema.org/draft/2020-12/json-schema-validation.html#name-pattern
|
|
8
|
+
|
|
3
9
|
- roles
|
|
4
10
|
- database psql
|
|
5
11
|
- hooks (esposti, es come middlewares ma per nome file specifico es onReady ecc)
|
package/dist/api/me/routes.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../lib/api/me/routes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../lib/api/me/routes.ts"],"names":[],"mappings":";AAAA,MAAM,CAAC,OAAO,GAAG;IACf,MAAM,EAAE;QACN,KAAK,EAAE,kBAAkB;QACzB,WAAW,EAAE,kBAAkB;QAC/B,UAAU,EAAE,YAAY;QACxB,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;QACtB,MAAM,EAAE,IAAI;QACZ,UAAU,EAAE,KAAK;QACjB,OAAO,EAAE,KAAK;KACf;IACD,MAAM,EAAE;QACN;YACE,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,GAAG;YACT,KAAK,EAAE,EAAE;YACT,OAAO,EAAE,SAAS;YAClB,WAAW,EAAE,CAAC,wBAAwB,CAAC;YACvC,MAAM,EAAE;gBACN,MAAM,EAAE,IAAI;gBACZ,KAAK,EAAE,UAAU;gBACjB,WAAW,EAAE,gBAAgB;gBAC7B,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;gBACtB,UAAU,EAAE,KAAK;gBACjB,OAAO,EAAE,KAAK;gBACd,QAAQ,EAAE;oBACR,GAAG,EAAE;wBACH,WAAW,EAAE,qBAAqB;wBAClC,IAAI,EAAE,QAAQ;wBACd,UAAU,EAAE;4BACV,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;yBAC1B;qBACF;oBACD,GAAG,EAAE;wBACH,WAAW,EAAE,kBAAkB;wBAC/B,IAAI,EAAE,QAAQ;wBACd,UAAU,EAAE;4BACV,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;yBACvB;qBACF;iBACF;aACF;SACF;QACD;YACE,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE,EAAE;YACT,OAAO,EAAE,YAAY;YACrB,WAAW,EAAE,CAAC,wBAAwB,CAAC;YACvC,MAAM,EAAE;gBACN,KAAK,EAAE,OAAO;gBACd,WAAW,EAAE,OAAO;gBACpB,MAAM,EAAE,IAAI;gBACZ,UAAU,EAAE,KAAK;gBACjB,OAAO,EAAE,KAAK;aACf;SACF;QACD;YACE,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,EAAE;YACT,OAAO,EAAE,SAAS;YAClB,WAAW,EAAE,CAAC,gBAAgB,CAAC;YAC/B,MAAM,EAAE;gBACN,MAAM,EAAE,IAAI;gBACZ,KAAK,EAAE,UAAU;gBACjB,WAAW,EAAE,gBAAgB;gBAC7B,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;gBACtB,UAAU,EAAE,KAAK;gBACjB,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE;oBACN,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE;wBACV,EAAE,EAAE;4BACF,IAAI,EAAE,QAAQ;4BACd,WAAW,EAAE,SAAS;yBACvB;qBACF;iBACF;gBACD,QAAQ,EAAE;oBACR,GAAG,EAAE;wBACH,WAAW,EAAE,qBAAqB;wBAClC,IAAI,EAAE,QAAQ;wBACd,UAAU,EAAE;4BACV,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;yBAC1B;qBACF;oBACD,GAAG,EAAE;wBACH,WAAW,EAAE,kBAAkB;wBAC/B,IAAI,EAAE,QAAQ;wBACd,UAAU,EAAE;4BACV,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;yBACxB;qBACF;iBACF;aACF;SACF;KACF;CACF,CAAA"}
|
package/dist/loader/roles.js
CHANGED
|
@@ -2,11 +2,25 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.load = void 0;
|
|
4
4
|
const roles_1 = require("../config/roles");
|
|
5
|
+
const glob = require('glob');
|
|
6
|
+
const path = require('path');
|
|
5
7
|
function load() {
|
|
6
8
|
const roles = {};
|
|
7
9
|
roles_1.roles.forEach((role) => {
|
|
8
10
|
roles[role.code] = role;
|
|
9
11
|
});
|
|
12
|
+
const patterns = [`${__dirname}/../config/roles.{ts,js}`, `${process.cwd()}/config/roles.{ts,js}`];
|
|
13
|
+
patterns.forEach((pattern) => {
|
|
14
|
+
log.i && log.info('Looking for ' + pattern);
|
|
15
|
+
glob.sync(pattern).forEach((f, index, values) => {
|
|
16
|
+
const base = path.dirname(f);
|
|
17
|
+
const dir = path.basename(base);
|
|
18
|
+
const file = path.join(dir, path.basename(f));
|
|
19
|
+
const groupjs = require(f);
|
|
20
|
+
console.log(file);
|
|
21
|
+
console.log(groupjs);
|
|
22
|
+
});
|
|
23
|
+
});
|
|
10
24
|
return Object.assign({}, roles);
|
|
11
25
|
}
|
|
12
26
|
exports.load = load;
|
package/dist/loader/roles.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roles.js","sourceRoot":"","sources":["../../lib/loader/roles.ts"],"names":[],"mappings":";;;AACA,2CAAsD;AAEtD,SAAgB,IAAI;IAClB,MAAM,KAAK,GAEP,EAAE,CAAA;IAEN,aAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3B,KAAK,CAAC,IAAI,CAAC,IAAe,CAAC,GAAG,IAAI,CAAA;IACpC,CAAC,CAAC,CAAA;IAEF,OAAO,kBAAK,KAAK,CAAW,CAAA;AAC9B,CAAC;
|
|
1
|
+
{"version":3,"file":"roles.js","sourceRoot":"","sources":["../../lib/loader/roles.ts"],"names":[],"mappings":";;;AACA,2CAAsD;AAEtD,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAE5B,SAAgB,IAAI;IAClB,MAAM,KAAK,GAEP,EAAE,CAAA;IAEN,aAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3B,KAAK,CAAC,IAAI,CAAC,IAAe,CAAC,GAAG,IAAI,CAAA;IACpC,CAAC,CAAC,CAAA;IAEF,MAAM,QAAQ,GAAG,CAAC,GAAG,SAAS,0BAA0B,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,uBAAuB,CAAC,CAAA;IAElG,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,CAAA;QAC3C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAS,EAAE,KAAa,EAAE,MAAgB,EAAE,EAAE;YACxE,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;YAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;YAG7C,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;YAC1B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YACjB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACtB,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,OAAO,kBAAK,KAAK,CAAW,CAAA;AAC9B,CAAC;AA1BD,oBA0BC"}
|
package/dist/loader/router.js
CHANGED
|
@@ -23,7 +23,7 @@ function load() {
|
|
|
23
23
|
const dir = path.basename(base);
|
|
24
24
|
const file = path.join(dir, path.basename(f));
|
|
25
25
|
const routesjs = require(f);
|
|
26
|
-
const { routes = [], config: defaultConfig = {} } = routesjs
|
|
26
|
+
const { routes = [], config: defaultConfig = {} } = routesjs || {};
|
|
27
27
|
if (!defaultConfig.enable)
|
|
28
28
|
defaultConfig.enable = true;
|
|
29
29
|
if (defaultConfig.deprecated == null)
|
|
@@ -101,24 +101,25 @@ function apply(server, routes) {
|
|
|
101
101
|
log.t && log.trace(`Apply ${routes.length} routes to server with pid ${process.pid}`);
|
|
102
102
|
routes.forEach(({ handler, method, path, middlewares, roles, enable, base, file, func, doc }) => __awaiter(this, void 0, void 0, function* () {
|
|
103
103
|
if (enable) {
|
|
104
|
-
log.t && log.trace(
|
|
105
|
-
const allMiddlewares = (middlewares
|
|
104
|
+
log.t && log.trace(`* Add path ${method} ${path} on handle ${handler}`);
|
|
105
|
+
const allMiddlewares = (middlewares || []).map((m) => require(normalizeMiddlewarePath(base, m)));
|
|
106
106
|
server.route({
|
|
107
107
|
method: method,
|
|
108
108
|
path: path,
|
|
109
109
|
schema: doc,
|
|
110
|
-
|
|
110
|
+
preHandler: allMiddlewares,
|
|
111
|
+
handler: (req, reply) => {
|
|
111
112
|
var _a;
|
|
112
113
|
try {
|
|
113
114
|
if ((roles === null || roles === void 0 ? void 0 : roles.length) > 0) {
|
|
114
|
-
const userRoles = ((_a =
|
|
115
|
+
const userRoles = ((_a = req.user) === null || _a === void 0 ? void 0 : _a.roles) || [];
|
|
115
116
|
const resolvedRole = roles.filter((r) => userRoles.includes(r.code));
|
|
116
117
|
if (!resolvedRole || resolvedRole.length === 0) {
|
|
117
118
|
log.w && log.warn(`Not allowed to call ${method.toUpperCase()} ${path}`);
|
|
118
119
|
return reply.code(403).send();
|
|
119
120
|
}
|
|
120
121
|
}
|
|
121
|
-
return require(file)[func](
|
|
122
|
+
return require(file)[func](req, reply);
|
|
122
123
|
}
|
|
123
124
|
catch (err) {
|
|
124
125
|
log.e && log.error(`Cannot find ${file}.js or method ${func}: ${err}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../lib/loader/router.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC5B,MAAM,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,CAAA;AAE5E,SAAgB,IAAI;IAClB,MAAM,WAAW,GAAsB,EAAE,CAAA;IACzC,MAAM,QAAQ,GAAG,CAAC,GAAG,SAAS,2BAA2B,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,4BAA4B,CAAC,CAAA;IAExG,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,CAAA;QAC3C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAS,EAAE,KAAa,EAAE,MAAgB,EAAE,EAAE;YACxE,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;YAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;YAG7C,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;YAC3B,MAAM,EAAE,MAAM,GAAG,EAAE,EAAE,MAAM,EAAE,aAAa,GAAG,EAAE,EAAE,GAAG,QAAQ,
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../lib/loader/router.ts"],"names":[],"mappings":"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"}
|
package/lib/api/me/routes.ts
CHANGED
package/lib/loader/roles.ts
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { Role, RoleKey, Roles } from '../../types/global'
|
|
2
2
|
import { roles as configRoles } from '../config/roles'
|
|
3
3
|
|
|
4
|
+
const glob = require('glob')
|
|
5
|
+
const path = require('path')
|
|
6
|
+
|
|
4
7
|
export function load() {
|
|
5
8
|
const roles: {
|
|
6
9
|
[key in RoleKey]?: Role
|
|
@@ -10,5 +13,21 @@ export function load() {
|
|
|
10
13
|
roles[role.code as RoleKey] = role
|
|
11
14
|
})
|
|
12
15
|
|
|
16
|
+
const patterns = [`${__dirname}/../config/roles.{ts,js}`, `${process.cwd()}/config/roles.{ts,js}`]
|
|
17
|
+
|
|
18
|
+
patterns.forEach((pattern) => {
|
|
19
|
+
log.i && log.info('Looking for ' + pattern)
|
|
20
|
+
glob.sync(pattern).forEach((f: string, index: number, values: string[]) => {
|
|
21
|
+
const base = path.dirname(f)
|
|
22
|
+
const dir = path.basename(base)
|
|
23
|
+
const file = path.join(dir, path.basename(f))
|
|
24
|
+
|
|
25
|
+
// allow array or structure
|
|
26
|
+
const groupjs = require(f)
|
|
27
|
+
console.log(file)
|
|
28
|
+
console.log(groupjs)
|
|
29
|
+
})
|
|
30
|
+
})
|
|
31
|
+
|
|
13
32
|
return { ...roles } as Roles
|
|
14
33
|
}
|
package/lib/loader/router.ts
CHANGED
|
@@ -18,7 +18,7 @@ export function load(): ConfiguredRoute[] {
|
|
|
18
18
|
|
|
19
19
|
// allow array or structure
|
|
20
20
|
const routesjs = require(f)
|
|
21
|
-
const { routes = [], config: defaultConfig = {} } = routesjs
|
|
21
|
+
const { routes = [], config: defaultConfig = {} } = routesjs || {}
|
|
22
22
|
|
|
23
23
|
// adjust default config
|
|
24
24
|
if (!defaultConfig.enable) defaultConfig.enable = true
|
|
@@ -125,28 +125,28 @@ export function apply(server: any, routes: ConfiguredRoute[]): void {
|
|
|
125
125
|
|
|
126
126
|
routes.forEach(async ({ handler, method, path, middlewares, roles, enable, base, file, func, doc }) => {
|
|
127
127
|
if (enable) {
|
|
128
|
-
log.t && log.trace(
|
|
128
|
+
log.t && log.trace(`* Add path ${method} ${path} on handle ${handler}`)
|
|
129
129
|
|
|
130
|
-
const allMiddlewares =
|
|
131
|
-
middlewares?.length > 0 ? middlewares.map((m) => require(normalizeMiddlewarePath(base, m))) : []
|
|
130
|
+
const allMiddlewares = (middlewares || []).map((m) => require(normalizeMiddlewarePath(base, m)))
|
|
132
131
|
|
|
133
132
|
server.route({
|
|
134
133
|
method: method,
|
|
135
134
|
path: path,
|
|
136
135
|
schema: doc,
|
|
137
|
-
|
|
138
|
-
handler: (
|
|
136
|
+
preHandler: allMiddlewares,
|
|
137
|
+
handler: (req: FastifyRequest, reply: FastifyReply) => {
|
|
139
138
|
try {
|
|
140
139
|
if (roles?.length > 0) {
|
|
141
|
-
const userRoles =
|
|
140
|
+
const userRoles = req.user?.roles || []
|
|
142
141
|
const resolvedRole = roles.filter((r) => userRoles.includes(r.code))
|
|
142
|
+
|
|
143
143
|
if (!resolvedRole || resolvedRole.length === 0) {
|
|
144
144
|
log.w && log.warn(`Not allowed to call ${method.toUpperCase()} ${path}`)
|
|
145
145
|
return reply.code(403).send()
|
|
146
146
|
}
|
|
147
147
|
}
|
|
148
148
|
|
|
149
|
-
return require(file)[func](
|
|
149
|
+
return require(file)[func](req, reply)
|
|
150
150
|
} catch (err) {
|
|
151
151
|
log.e && log.error(`Cannot find ${file}.js or method ${func}: ${err}`)
|
|
152
152
|
return reply.code(500).send(`Invalid handler ${handler}`)
|