@thzero/library_server 0.15.20 → 0.15.23

package/boot/koa/index.js

@@ -132,14 +132,21 @@ class KoaBootMain extends BootMain {
 			await pluginRoute.initRoutes(this._routes);
 
 		await this._initRoutes();
+				
+		console.log();
 
 		for (const route of this._routes) {
-			await route.init(injector)
+			await route.init(injector, this._appConfig);
 			app
 				.use(route.router.routes())
 				.use(route.router.allowedMethods());
-			console.log(route.router.stack.map(i => i.path));
-			console.log(route.router.stack.map(i => i.methods));
+
+			console.log([ route.id ]);
+
+			for (let i = 0; i < route.router.stack.length; i++)
+				console.log([ route.router.stack[i].path, route.router.stack[i].methods ]);
+
+			console.log();
 		}
 
 		return app;

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@thzero/library_server",
   "type": "module",
-  "version": "0.15.20",
+  "version": "0.15.23",
   "version_major": 0,
   "version_minor": 15,
-  "version_patch": 20,
-  "version_date": "04/14/2022",
+  "version_patch": 23,
+  "version_date": "04/16/2022",
   "description": "An opinionated library of common functionality to bootstrap a Koa based API application using MongoDb and Firebase.",
   "author": "thZero",
   "license": "MIT",

package/routes/admin/index.js

@@ -12,7 +12,7 @@ class AdminBaseRoute extends BaseRoute {
 		if (!urlFragment)
 			throw Error('Invalid url fragment');
 
-		super(`/api/admin/${urlFragment}`);
+		super(`/admin/${urlFragment}`);
 
 		this._options = {
 			role: role,

package/routes/admin/news.js

@@ -9,6 +9,14 @@ class NewsAdminRoute extends AdminRoute {
 		serviceKey = serviceKey ? serviceKey : LibraryConstants.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

@@ -10,9 +10,17 @@ class UsersAdminRoute extends AdminRoute {
 		super(urlFragment, role, serviceKey);
 	}
 
+	get id() {
+		return 'admin-users';
+	}
+
 	_allowsCreate() {
 		return false;
 	}
+
+	get _version() {
+		return 'v1';
+	}
 }
 
 export default UsersAdminRoute;

package/routes/baseNews.js

@@ -7,8 +7,12 @@ import BaseRoute from './index';
 import authentication from '../middleware/authentication';
 
 class BaseNewsRoute extends BaseRoute {
-	constructor(prefix) {
-		super(prefix ? prefix : '/api/news');
+	constructor(prefix, version) {
+		super(prefix ? prefix : '/news');
+	}
+
+	get id() {
+		return 'news';
 	}
 
 	_initializeRoutes(router) {

package/routes/baseUsers.js

@@ -10,8 +10,12 @@ import authentication from '../middleware/authentication';
 import authorization from '../middleware/authorization';
 
 class BaseUsersRoute extends BaseRoute {
-	constructor(prefix) {
-		super(prefix ? prefix : '/api/users');
+	constructor(prefix, version) {
+		super(prefix ? prefix : '/users');
+	}
+
+	get id() {
+		return 'users';
 	}
 
 	_initializeRoutes(router) {

package/routes/home.js

@@ -2,7 +2,11 @@ import BaseRoute from './index';
 
 class HomeRoute extends BaseRoute {
 	constructor(prefix) {
-		super(prefix ? prefix : '/api');
+		super(prefix ? prefix : '');
+	}
+
+	get id() {
+		return 'home';
 	}
 
 	_initializeRoutes(router) {
@@ -11,6 +15,14 @@ class HomeRoute extends BaseRoute {
 			ctx.status = 404;
 		});
 	}
+
+	get _ignoreApi() {
+		return true;
+	}
+
+	get _version() {
+		return '';
+	}
 }
 
 export default HomeRoute;

package/routes/index.js

@@ -2,19 +2,52 @@ import koaRouter from '@koa/router';
 
 class BaseRoute {
 	constructor(prefix) {
-		if (!prefix)
+		if (prefix === null || prefix === undefined)
 			throw Error('Invalid prefix');
 
 		this._prefix = prefix;
 	}
 
+	get id() {
+		return null;
+	}
+
 	get router() {
 		return this._router;
 	}
 
-	async init(injector) {
+	async init(injector, config) {
+		if (!injector)
+			throw Error('Invalid injector for route.');
+		if (!config)
+			throw Error('Invalid injector for route.');
+		if (this._prefix === null || this._prefix === undefined)
+			throw Error('Invalid prefix for route.');
+
 		this._injector = injector;
 
+		const api = config.get('api', { });
+		let prefix = '';
+		if (!this._ignoreApi) {
+			prefix = api.prefix !== null && api.prefix !== undefined ? api.prefix : 'api';
+			if (!String.isNullOrEmpty(prefix) && (prefix !== '/'))
+				prefix = '/' + prefix;
+		}
+		
+		let version = !String.isNullOrEmpty(api.version) ? api.version : null;
+		if (this._version !== null && this._version !== undefined)
+			version = this._version;
+		if (!String.isNullOrEmpty(this.id) && api.apis && Array.isArray(api.apis))
+			version = api.apis[this.id];
+
+		if (!String.isNullOrEmpty(version))
+			prefix += '/' + version;
+
+		if (!String.isNullOrEmpty(this._prefix) && (this._prefix[0] !== '/'))
+			this._prefix = '/' + this._prefix;
+
+		this._prefix = prefix + this._prefix;
+
 		this._router = new koaRouter({
 			prefix: this._prefix
 		});
@@ -26,6 +59,14 @@ class BaseRoute {
 
 	_initializeRoutes(router) {
 	}
+
+	get _ignoreApi() {
+		return false;
+	}
+
+	get _version() {
+		return null;
+	}
 }
 
 export default BaseRoute;

package/routes/plans.js

@@ -6,11 +6,15 @@ import BaseRoute from './index';
 
 class PlansRoute extends BaseRoute {
 	constructor(prefix) {
-		super(prefix ? prefix : '/api');
+		super(prefix ? prefix : '/plans');
+	}
+
+	get id() {
+		return 'plans';
 	}
 
 	_initializeRoutes(router) {
-		router.get('/plans',
+		router.get('/',
 			// eslint-disable-next-line
 			async (ctx, next) => {
 				const service = this._injector.getService(LibraryConstants.InjectorKeys.SERVICE_PLANS);
@@ -19,6 +23,10 @@ class PlansRoute extends BaseRoute {
 			}
 		);
 	}
+
+	get _version() {
+		return 'v1';
+	}
 }
 
 export default PlansRoute;

package/routes/utility.js

@@ -11,7 +11,11 @@ import authentication from '../middleware/authentication';
 
 class UtilityRoute extends BaseRoute {
 	constructor(prefix) {
-		super(prefix ? prefix : '/api/utility');
+		super(prefix ? prefix : '/utility');
+	}
+
+	get id() {
+		return 'utility';
 	}
 
 	_initializeRoutes(router) {
@@ -29,6 +33,10 @@ class UtilityRoute extends BaseRoute {
 			}
 		);
 	}
+
+	get _version() {
+		return 'v1';
+	}
 }
 
 export default UtilityRoute;

package/routes/version.js

@@ -6,7 +6,11 @@ import BaseRoute from './index';
 
 class VersionRoute extends BaseRoute {
 	constructor(prefix) {
-		super(prefix ? prefix : '/api');
+		super(prefix ? prefix : '');
+	}
+
+	get id() {
+		return 'version';
 	}
 
 	_initializeRoutes(router) {
@@ -19,6 +23,10 @@ class VersionRoute extends BaseRoute {
 			}
 		);
 	}
+
+	get _version() {
+		return 'v1';
+	}
 }
 
 export default VersionRoute;