@thzero/library_server_fastify 0.17.5 → 0.17.6

package/plugins/settings.js

@@ -1,13 +1,13 @@
-import fastifyPlugin from 'fastify-plugin';
-
-import LibraryServerConstants from '@thzero/library_server/constants.js';
-
-export default fastifyPlugin((instance, opts, done) => {
-	instance.addHook('onRequest', (request, reply, next) => {
-		request.config = opts.config;
-		request.correlationId = request.headers[LibraryServerConstants.Headers.CorrelationId];
-		next();
-	});
-
-	done();
+import fastifyPlugin from 'fastify-plugin';
+
+import LibraryServerConstants from '@thzero/library_server/constants.js';
+
+export default fastifyPlugin((instance, opts, done) => {
+	instance.addHook('onRequest', (request, reply, next) => {
+		request.config = opts.config;
+		request.correlationId = request.headers[LibraryServerConstants.Headers.CorrelationId];
+		next();
+	});
+
+	done();
 });

package/plugins/usageMetrics.js

@@ -1,25 +1,25 @@
-import fastifyPlugin from 'fastify-plugin';
-
-export default fastifyPlugin((instance, opts, done) => {
-	instance.addHook('onSend', (request, reply, payload, next) => {
-		(async () => {
-			const usageMetrics = {
-				url: request.routerPath,
-				correlationId: request.correlationId,
-				href: request.url,
-				headers: request.headers,
-				host: request.hostname,
-				hostname: request.hostname,
-				querystring: request.query,
-				token: request.token
-			};
-			await opts.usageMetrics.register(usageMetrics).catch((err) => {
-				opts.logger.error('usageMetrics', 'start', 'usageMetrics', err);
-			});
-		})();
-
-		next();
-	});
-
-	done();
+import fastifyPlugin from 'fastify-plugin';
+
+export default fastifyPlugin((instance, opts, done) => {
+	instance.addHook('onSend', (request, reply, payload, next) => {
+		(async () => {
+			const usageMetrics = {
+				url: request.routerPath,
+				correlationId: request.correlationId,
+				href: request.url,
+				headers: request.headers,
+				host: request.hostname,
+				hostname: request.hostname,
+				querystring: request.query,
+				token: request.token
+			};
+			await opts.usageMetrics.register(usageMetrics).catch((err) => {
+				opts.logger.error('usageMetrics', 'start', 'usageMetrics', err);
+			});
+		})();
+
+		next();
+	});
+
+	done();
 });

package/routes/admin/index.js

@@ -1,140 +1,140 @@
-import BaseRoute from '../index.js';
-
-class AdminBaseRoute extends BaseRoute {
-	constructor(urlFragment, role, serviceKey) {
-		if (!urlFragment)
-			throw Error('Invalid url fragment');
-
-		super(`/admin/${urlFragment}`);
-
-		this._options = {
-			role: role,
-			serviceKey: serviceKey
-		}
-
-		// this._service = null;
-	}
-
-	async init(injector, app, config) {
-		await super.init(injector, app, config);
-		this._inject(app, injector, this._options.serviceKey, this._options.serviceKey);
-	}
-
-	_allowsCreate() {
-		return true;
-	}
-
-	_allowsDelete() {
-		return true;
-	}
-
-	_allowsUpdate() {
-		return true;
-	}
-
-	_initializeRoutesCreate(router) {
-		const self = this;
-		router.post(this._join(''),
-			// authentication(true),
-			// authorization([ `${self._options.role}.create` ]),
-			{
-				preHandler: router.auth([
-					router.authenticationDefault,
-					router.authorizationDefault
-				], 
-				{ 
-					relation: 'and',
-					roles: [ `${self._options.role}.create` ]
-				}),
-			},
-			// eslint-disable-next-line
-			async (request, reply) => {
-				const response = (await router[this._options.serviceKey].create(request.correlationId, request.user, request.body)).check(request);
-				// https://github.com/fastify/fastify-compress/issues/215#issuecomment-1210598312
-				return  this._jsonResponse(reply, response);
-			}
-		);
-	}
-
-	_initializeRoutesDelete(router) {
-		router.delete(this._join('/:id'),
-			// authentication(true),
-			// authorization([ `${this._options.role}.delete` ]),
-			{
-				preHandler: router.auth([
-					router.authenticationDefault,
-					router.authorizationDefault
-				], 
-				{ 
-					relation: 'and',
-					roles: [ `${this._options.role}.delete` ]
-				}),
-			},
-			// eslint-disable-next-line
-			async (request, reply) => {
-				const response = (await router[this._options.serviceKey].delete(request.correlationId, request.user, request.params.id)).check(request);
-				// https://github.com/fastify/fastify-compress/issues/215#issuecomment-1210598312
-				return  this._jsonResponse(reply, response);
-			}
-		);
-	}
-
-	_initializeRoutesUpdate(router) {
-		router.post(this._join('/:id'),
-			// authentication(true),
-			// authorization([ `${this._options.role}.update` ]),
-			{
-				preHandler: router.auth([
-					router.authenticationDefault,
-					router.authorizationDefault
-				], 
-				{ 
-					relation: 'and',
-					roles: [ `${this._options.role}.update` ]
-				}),
-			},
-			// eslint-disable-next-line
-			async (request, reply) => {
-				const response = (await router[this._options.serviceKey].update(request.correlationId, request.user, request.params.id, request.body)).check(request);
-				// https://github.com/fastify/fastify-compress/issues/215#issuecomment-1210598312
-				return  this._jsonResponse(reply, response);
-			}
-		);
-	}
-
-	_initializeRoutes(router) {
-		if (this._allowsDelete)
-			this._initializeRoutesDelete(router);
-
-		router.post(this._join('/search'),
-			// authentication(true),
-			// authorization([ `${this._options.role}.search` ]),
-			{
-				preHandler: router.auth([
-					router.authenticationDefault,
-					router.authorizationDefault
-				], 
-				{ 
-					relation: 'and',
-					roles: [ `${this._options.role}.search` ]
-				}),
-			},
-			// eslint-disable-next-line
-			async (request, reply) => {
-				const response = (await router[this._options.serviceKey].search(request.correlationId, request.user, request.body)).check(request);
-				// https://github.com/fastify/fastify-compress/issues/215#issuecomment-1210598312
-				return  this._jsonResponse(reply, response);
-			}
-		);
-
-		if (this._allowsUpdate())
-			this._initializeRoutesUpdate(router);
-
-		if (this._allowsCreate())
-			this._initializeRoutesCreate(router);
-
-		return router;
-	}
-}
-
-export default AdminBaseRoute;
+import BaseRoute from '../index.js';
+
+class AdminBaseRoute extends BaseRoute {
+	constructor(urlFragment, role, serviceKey) {
+		if (!urlFragment)
+			throw Error('Invalid url fragment');
+
+		super(`/admin/${urlFragment}`);
+
+		this._options = {
+			role: role,
+			serviceKey: serviceKey
+		}
+
+		// this._service = null;
+	}
+
+	async init(injector, app, config) {
+		await super.init(injector, app, config);
+		this._inject(app, injector, this._options.serviceKey, this._options.serviceKey);
+	}
+
+	_allowsCreate() {
+		return true;
+	}
+
+	_allowsDelete() {
+		return true;
+	}
+
+	_allowsUpdate() {
+		return true;
+	}
+
+	_initializeRoutesCreate(router) {
+		const self = this;
+		router.post(this._join(''),
+			// authentication(true),
+			// authorization([ `${self._options.role}.create` ]),
+			{
+				preHandler: router.auth([
+					router.authenticationDefault,
+					router.authorizationDefault
+				], 
+				{ 
+					relation: 'and',
+					roles: [ `${self._options.role}.create` ]
+				}),
+			},
+			// eslint-disable-next-line
+			async (request, reply) => {
+				const response = (await router[this._options.serviceKey].create(request.correlationId, request.user, request.body)).check(request);
+				// https://github.com/fastify/fastify-compress/issues/215#issuecomment-1210598312
+				return  this._jsonResponse(reply, response);
+			}
+		);
+	}
+
+	_initializeRoutesDelete(router) {
+		router.delete(this._join('/:id'),
+			// authentication(true),
+			// authorization([ `${this._options.role}.delete` ]),
+			{
+				preHandler: router.auth([
+					router.authenticationDefault,
+					router.authorizationDefault
+				], 
+				{ 
+					relation: 'and',
+					roles: [ `${this._options.role}.delete` ]
+				}),
+			},
+			// eslint-disable-next-line
+			async (request, reply) => {
+				const response = (await router[this._options.serviceKey].delete(request.correlationId, request.user, request.params.id)).check(request);
+				// https://github.com/fastify/fastify-compress/issues/215#issuecomment-1210598312
+				return  this._jsonResponse(reply, response);
+			}
+		);
+	}
+
+	_initializeRoutesUpdate(router) {
+		router.post(this._join('/:id'),
+			// authentication(true),
+			// authorization([ `${this._options.role}.update` ]),
+			{
+				preHandler: router.auth([
+					router.authenticationDefault,
+					router.authorizationDefault
+				], 
+				{ 
+					relation: 'and',
+					roles: [ `${this._options.role}.update` ]
+				}),
+			},
+			// eslint-disable-next-line
+			async (request, reply) => {
+				const response = (await router[this._options.serviceKey].update(request.correlationId, request.user, request.params.id, request.body)).check(request);
+				// https://github.com/fastify/fastify-compress/issues/215#issuecomment-1210598312
+				return  this._jsonResponse(reply, response);
+			}
+		);
+	}
+
+	_initializeRoutes(router) {
+		if (this._allowsDelete)
+			this._initializeRoutesDelete(router);
+
+		router.post(this._join('/search'),
+			// authentication(true),
+			// authorization([ `${this._options.role}.search` ]),
+			{
+				preHandler: router.auth([
+					router.authenticationDefault,
+					router.authorizationDefault
+				], 
+				{ 
+					relation: 'and',
+					roles: [ `${this._options.role}.search` ]
+				}),
+			},
+			// eslint-disable-next-line
+			async (request, reply) => {
+				const response = (await router[this._options.serviceKey].search(request.correlationId, request.user, request.body)).check(request);
+				// https://github.com/fastify/fastify-compress/issues/215#issuecomment-1210598312
+				return  this._jsonResponse(reply, response);
+			}
+		);
+
+		if (this._allowsUpdate())
+			this._initializeRoutesUpdate(router);
+
+		if (this._allowsCreate())
+			this._initializeRoutesCreate(router);
+
+		return router;
+	}
+}
+
+export default AdminBaseRoute;

package/routes/admin/news.js

@@ -1,22 +1,22 @@
-import LibraryServerConstants from '@thzero/library_server/constants.js';
-
-import AdminRoute from './index.js';
-
-class NewsAdminRoute extends AdminRoute {
-	constructor(urlFragment, role, serviceKey) {
-		urlFragment = urlFragment ? urlFragment : 'news';
-		role = role ? role : 'news';
-		serviceKey = serviceKey ? serviceKey : LibraryServerConstants.InjectorKeys.SERVICE_ADMIN_NEWS;
-		super(urlFragment, role, serviceKey);
-	}
-
-	get id() {
-		return 'admin-news';
-	}
-
-	get _version() {
-		return 'v1';
-	}
-}
-
-export default NewsAdminRoute;
+import LibraryServerConstants from '@thzero/library_server/constants.js';
+
+import AdminRoute from './index.js';
+
+class NewsAdminRoute extends AdminRoute {
+	constructor(urlFragment, role, serviceKey) {
+		urlFragment = urlFragment ? urlFragment : 'news';
+		role = role ? role : 'news';
+		serviceKey = serviceKey ? serviceKey : LibraryServerConstants.InjectorKeys.SERVICE_ADMIN_NEWS;
+		super(urlFragment, role, serviceKey);
+	}
+
+	get id() {
+		return 'admin-news';
+	}
+
+	get _version() {
+		return 'v1';
+	}
+}
+
+export default NewsAdminRoute;

package/routes/admin/users.js

@@ -1,26 +1,26 @@
-import LibraryServerConstants from '@thzero/library_server/constants.js';
-
-import AdminRoute from './index.js';
-
-class UsersAdminRoute extends AdminRoute {
-	constructor(urlFragment, role, serviceKey) {
-		urlFragment = urlFragment ? urlFragment : 'users';
-		role = role ? role : 'users';
-		serviceKey = serviceKey ? serviceKey : LibraryServerConstants.InjectorKeys.SERVICE_ADMIN_USERS;
-		super(urlFragment, role, serviceKey);
-	}
-
-	get id() {
-		return 'admin-users';
-	}
-
-	_allowsCreate() {
-		return false;
-	}
-
-	get _version() {
-		return 'v1';
-	}
-}
-
-export default UsersAdminRoute;
+import LibraryServerConstants from '@thzero/library_server/constants.js';
+
+import AdminRoute from './index.js';
+
+class UsersAdminRoute extends AdminRoute {
+	constructor(urlFragment, role, serviceKey) {
+		urlFragment = urlFragment ? urlFragment : 'users';
+		role = role ? role : 'users';
+		serviceKey = serviceKey ? serviceKey : LibraryServerConstants.InjectorKeys.SERVICE_ADMIN_USERS;
+		super(urlFragment, role, serviceKey);
+	}
+
+	get id() {
+		return 'admin-users';
+	}
+
+	_allowsCreate() {
+		return false;
+	}
+
+	get _version() {
+		return 'v1';
+	}
+}
+
+export default UsersAdminRoute;

package/routes/baseNews.js

@@ -1,45 +1,45 @@
-import LibraryServerConstants from '@thzero/library_server/constants.js';
-
-import BaseRoute from './index.js';
-
-class BaseNewsRoute extends BaseRoute {
-	constructor(prefix, version) {
-		super(prefix ? prefix : '/news');
-
-		// this._serviceNews = null;
-	}
-
-	async init(injector, app, config) {
-		await super.init(injector, app, config);
-		// this._serviceNews = injector.getService(LibraryServerConstants.InjectorKeys.SERVICE_NEWS);
-		this._inject(app, injector, LibraryServerConstants.InjectorKeys.SERVICE_NEWS, LibraryServerConstants.InjectorKeys.SERVICE_NEWS);
-	}
-
-	get id() {
-		return 'news';
-	}
-
-	_initializeRoutes(router) {
-		router.get(this._join('/latest/:date'), 
-			// authentication(false),
-			{
-				preHandler: router.auth([
-					router.authenticationDefault,
-					// router.authorizationDefault
-				], 
-				{ 
-					relation: 'and',
-					required: false,
-					roles: [ 'news' ]
-				}),
-			},
-			async (request, reply) => {
-				// const service = this._injector.getService(ServerConstants.InjectorKeys.SERVICE_NEWS);
-				const response = (await router[ServerConstants.InjectorKeys.SERVICE_NEWS].latest(request.correlationId, request.user, parseInt(request.params.date))).check(request);
-				// https://github.com/fastify/fastify-compress/issues/215#issuecomment-1210598312
-				return  this._jsonResponse(reply, response);
-			});
-	}
-}
-
-export default BaseNewsRoute;
+import LibraryServerConstants from '@thzero/library_server/constants.js';
+
+import BaseRoute from './index.js';
+
+class BaseNewsRoute extends BaseRoute {
+	constructor(prefix, version) {
+		super(prefix ? prefix : '/news');
+
+		// this._serviceNews = null;
+	}
+
+	async init(injector, app, config) {
+		await super.init(injector, app, config);
+		// this._serviceNews = injector.getService(LibraryServerConstants.InjectorKeys.SERVICE_NEWS);
+		this._inject(app, injector, LibraryServerConstants.InjectorKeys.SERVICE_NEWS, LibraryServerConstants.InjectorKeys.SERVICE_NEWS);
+	}
+
+	get id() {
+		return 'news';
+	}
+
+	_initializeRoutes(router) {
+		router.get(this._join('/latest/:date'), 
+			// authentication(false),
+			{
+				preHandler: router.auth([
+					router.authenticationDefault,
+					// router.authorizationDefault
+				], 
+				{ 
+					relation: 'and',
+					required: false,
+					roles: [ 'news' ]
+				}),
+			},
+			async (request, reply) => {
+				// const service = this._injector.getService(ServerConstants.InjectorKeys.SERVICE_NEWS);
+				const response = (await router[ServerConstants.InjectorKeys.SERVICE_NEWS].latest(request.correlationId, request.user, parseInt(request.params.date))).check(request);
+				// https://github.com/fastify/fastify-compress/issues/215#issuecomment-1210598312
+				return  this._jsonResponse(reply, response);
+			});
+	}
+}
+
+export default BaseNewsRoute;