@thzero/library_server 0.14.8 → 0.15.4

package/boot/index.js

@@ -1,5 +1,4 @@
-// import internalIp from 'internal-ip';
-// Until author fixes the issue with version 7+
+import http from 'http';
 import {internalIpV6, internalIpV4} from '@thzero/library_server/utility/internalIp';
 
 import { createTerminus } from '@godaddy/terminus';
@@ -13,7 +12,22 @@ import Utility from '@thzero/library_common/utility';
 
 import NotImplementedError from '@thzero/library_common/errors/notImplemented';
 
-require('@thzero/library_common/utility/string');
+// require('@thzero/library_server/utility/string.cjs');
+String.isNullOrEmpty = function(value) {
+	//return !(typeof value === 'string' && value.length > 0)
+	return !value;
+}
+
+String.isString = function(value) {
+	return (typeof value === "string" || value instanceof String);
+}
+
+String.trim = function(value) {
+	if (!value || !String.isString(value))
+		return value;
+	return value.trim();
+}
+
 import injector from '@thzero/library_common/utility/injector';
 
 import usageMetricsRepository from '../repository/usageMetrics/devnull';
@@ -46,7 +60,7 @@ class BootMain {
 		this.loggerServiceI.info2(`process.env.PORT: ${process.env.PORT}`);
 		this.port = process.env.PORT || this.port;
 		this.loggerServiceI.info2(`selected.port: ${this.port}`);
-		const serverHttp = require('http').createServer(app.callback());
+		const serverHttp = http.createServer(app.callback());
 
 		function onSignal() {
 			this.loggerServiceI.info2(`server is starting cleanup`);

package/boot/koa/index.js

@@ -8,7 +8,6 @@ import Utility from '@thzero/library_common/utility';
 
 import TokenExpiredError from '../../errors/tokenExpired';
 
-require('@thzero/library_common/utility/string');
 import injector from '@thzero/library_common/utility/injector';
 
 import BootMain from '@thzero/library_server/boot';

package/boot/plugins/api.js

@@ -1,14 +1,13 @@
 import LibraryConstants from '../../constants';
 import LibraryCommonServiceConstants from '@thzero/library_common_service/constants';
 
-import NotImplementedError from '@thzero/library_common/errors/notImplemented';
-
 import BootPlugin from './index';
 
 import homeRoute from '../../routes/home';
 import versionRoute from '../../routes/version';
 
 import cryptoService from '../../service/crypto';
+import versionService from '../../service/version';
 
 class ApiBootPlugin extends BootPlugin {
 	async _initRoutesPost() {
@@ -52,7 +51,7 @@ class ApiBootPlugin extends BootPlugin {
 	}
 
 	_initServicesVersion() {
-		throw new NotImplementedError();
+		return new versionService();
 	}
 }
 

package/middleware/authorization.js

@@ -3,7 +3,21 @@ import LibraryCommonServiceConstants from '@thzero/library_common_service/consta
 
 import injector from '@thzero/library_common/utility/injector';
 
-require('@thzero/library_common/utility/string');
+// require('../utility/string.cjs');
+String.isNullOrEmpty = function(value) {
+	//return !(typeof value === 'string' && value.length > 0)
+	return !value;
+}
+
+String.isString = function(value) {
+	return (typeof value === "string" || value instanceof String);
+}
+
+String.trim = function(value) {
+	if (!value || !String.isString(value))
+		return value;
+	return value.trim();
+}
 
 const logicalAnd = 'and';
 const logicalOr = 'or';

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@thzero/library_server",
-  "version": "0.14.8",
+  "type": "module",
+  "version": "0.15.4",
   "version_major": 0,
-  "version_minor": 14,
-  "version_patch": 8,
-  "version_date": "10/20/2021",
+  "version_minor": 15,
+  "version_patch": 4,
+  "version_date": "12/13/2021",
   "description": "An opinionated library of common functionality to bootstrap a Koa based API application using MongoDb and Firebase.",
   "author": "thZero",
   "license": "MIT",
@@ -33,7 +34,7 @@
     "dayjs": "^1.10.7",
     "dayjs-plugin-utc": "^0.1.2",
     "default-gateway": "^6.0.3",
-    "easy-rbac": "^3.1.1",
+    "easy-rbac": "^3.2.0",
     "esm": "^3.2.25",
     "ipaddr.js": "^2.0.1",
     "koa": "^2.13.4",
@@ -45,16 +46,16 @@
     "@thzero/library_cli": "^0.13.21"
   },
   "peerDependencies": {
-    "@thzero/library_common": "^0.14",
-    "@thzero/library_common_service": "^0.14",
-    "@babel/core": "^7.15.8",
-    "@babel/plugin-proposal-class-properties": "^7.14.5",
-    "@babel/preset-env": "^7.15.8",
-    "babel-loader": "^8.2.2",
-    "eslint": "^8.0.1",
+    "@thzero/library_common": "^0.15",
+    "@thzero/library_common_service": "^0.15",
+    "@babel/core": "^7.16.5",
+    "@babel/plugin-proposal-class-properties": "^7.16.5",
+    "@babel/preset-env": "^7.16.5",
+    "babel-loader": "^8.2.3",
+    "eslint": "^8.4.1",
     "eslint-plugin-node": "^11.1.0",
-    "pino-pretty": "^7.1.0",
-    "webpack": "^5.59.0",
+    "pino-pretty": "^7.3.0",
+    "webpack": "^5.65.0",
     "webpack-cli": "^4.9.1"
   }
 }

package/service/version.js

@@ -1,10 +1,20 @@
-import NotImplementedError from '@thzero/library_common/errors/notImplemented';
+import fs from 'fs';
+import path from 'path';
 
 import Service from './index';
 
 class VersionService extends Service {
 	async version(correlationId) {
-		throw new NotImplementedError();
+		const filePath = path.join(process.cwd(), 'package.json');
+		const file = fs.readFileSync(filePath, 'utf8');
+		if (String.isNullOrEmpty(file))
+			throw Error('Invalid package.json file for versioning; expected in the <app root> folder.');
+
+		const packageObj = JSON.parse(file);
+		if (!packageObj)
+			throw Error('Invalid package.json file for versioning.');
+
+		return this._generate(correlationId, packageObj.version_major, packageObj.version_minor, packageObj.version_patch, packageObj.version_date);
 	}
 
 	_generate(correlationId, version_major, version_minor, version_patch, version_date) {