badmfck-api-server 4.0.61 → 4.0.63

package/dist/apiServer/APIService.d.ts

@@ -65,6 +65,7 @@ export declare class APIService<TInterceptorResult = any, TInternalCallParams =
     private monitor;
     private started;
     private requestsCount;
+    private noCors;
     netLog: APIServiceNetworkLogItem[];
     constructor(options: APIServiceOptions);
     init(): Promise<void>;

package/dist/apiServer/APIService.js

@@ -95,11 +95,12 @@ async function Initializer(services) {
 }
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
-    version = "4.0.6";
+    version = "4.0.63";
     options;
     monitor = null;
     started = new Date();
     requestsCount = 0;
+    noCors = false;
     netLog = [];
     constructor(options) {
         super('HTTP Service');
@@ -109,6 +110,10 @@ class APIService extends BaseService_1.BaseService {
         const self = "http://localhost:" + this.options.port;
         if (!this.options.corsHostWhiteList.find(val => val === self))
             this.options.corsHostWhiteList.push(self);
+        if (this.options.corsHostWhiteList.length === 0)
+            this.noCors = true;
+        if (this.options.corsHostWhiteList.find(x => x === "*"))
+            this.noCors = true;
         const list = [];
         for (let h of this.options.corsHostWhiteList) {
             h = h.replace(/\/$/, "");
@@ -234,7 +239,7 @@ class APIService extends BaseService_1.BaseService {
             const originHeader = req.headers.origin;
             if (!originHeader)
                 return next();
-            if (this.options.corsHostWhiteList && this.options.corsHostWhiteList.find(x => x === "*"))
+            if (this.noCors)
                 return next();
             let originNorm;
             try {
@@ -245,6 +250,7 @@ class APIService extends BaseService_1.BaseService {
                     error: { ...DefaultErrors_1.default.FORBIDDEN, details: "Invalid Origin header" },
                     data: null,
                     httpStatus: 403,
+                    version: this.options.appVersion
                 });
                 return;
             }
@@ -253,6 +259,7 @@ class APIService extends BaseService_1.BaseService {
                     error: { ...DefaultErrors_1.default.FORBIDDEN, details: `Origin not allowed: ${originNorm}` },
                     data: null,
                     httpStatus: 403,
+                    version: this.options.appVersion
                 });
                 return;
             }

package/dist/apiServer/DBService.d.ts

@@ -48,6 +48,7 @@ export interface IDBError {
 export interface IDBResult {
     data?: any | null;
     error?: IDBError | null;
+    total?: number;
     execution: {
         started_at: number;
         finished_at: number;

package/dist/apiServer/db/MysqlAdapter.js

@@ -445,8 +445,21 @@ class MysqlAdapter {
             let result = null;
             if (this.options.maxQueryTimeout && this.options.maxQueryTimeout > 0)
                 result = await this.withTimeout(conn.query(query), this.options.maxQueryTimeout, query);
-            else
+            else {
                 result = await conn.query(query);
+            }
+            let total = null;
+            ;
+            if (request.calculateCount) {
+                const cres = await conn.query("SELECT FOUND_ROWS() as total");
+                if (cres && cres[0]) {
+                    const res = cres[0];
+                    if (Array.isArray(res) && res.length > 0 && "total" in res[0])
+                        total = res[0].total;
+                    else if ("total" in res)
+                        total = res.total;
+                }
+            }
             this.lastSuccessQueryTime = +new Date();
             if (!request.transactionID && doCloseConnection)
                 this.finalizeConnection(conn);
@@ -455,6 +468,7 @@ class MysqlAdapter {
             return {
                 data: result[0],
                 error: null,
+                total: total ? total : undefined,
                 execution: {
                     started_at: executionStartTime,
                     finished_at: Date.now()

package/dist/apiServer/external/MicroserviceClient.js

@@ -38,6 +38,7 @@ class MicroserviceClient extends BaseService_1.BaseService {
         const nonce = crypto_1.default.randomBytes(16).toString("hex");
         const headers = {
             "Content-Type": "application/json",
+            "x-microservice-id": this.options.id,
             "x-microservice-ts": ts,
             "x-microservice-nonce": nonce
         };

package/dist/apiServer/external/MicroserviceHostController.js

@@ -45,7 +45,7 @@ class MicroserviceHostController extends BaseEndpoint_1.BaseEndpoint {
             throw DefaultErrors_1.default.METHOD_NOT_ALLOWED;
         const microserviceHost = MicroserviceHost_1.MicroserviceHost.getMicroservice(req.headers["x-microservice-id"]);
         if (!microserviceHost)
-            throw { ...DefaultErrors_1.default.NOT_FOUND, message: "Microservice host not found" };
+            throw { ...DefaultErrors_1.default.NOT_FOUND, message: "Microservice host not found with id: " + req.headers["x-microservice-id"] };
         const result = await microserviceHost.handleIncomingRequest(req);
         if (DefaultErrors_1.ErrorUtils.isError(result))
             throw result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "badmfck-api-server",
-  "version": "4.0.61",
+  "version": "4.0.63",
   "description": "Simple API http server based on express",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",