badmfck-api-server 4.0.5 → 4.0.7

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.5";
+    version = "4.0.7";
     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,6 +239,8 @@ class APIService extends BaseService_1.BaseService {
             const originHeader = req.headers.origin;
             if (!originHeader)
                 return next();
+            if (this.noCors)
+                return next();
             let originNorm;
             try {
                 originNorm = new URL(String(originHeader)).origin.replace(/\/$/, "");
@@ -243,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;
             }
@@ -251,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(this.prepareCountQuery(query));
+                if (cres && cres[0]) {
+                    const res = cres[0];
+                    if (Array.isArray(res) && res.length > 0 && "count" in res[0])
+                        total = res[0].count;
+                    else if ("count" in res)
+                        total = res.count;
+                }
+            }
             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()
@@ -630,14 +644,11 @@ class MysqlAdapter {
         return value;
     }
     prepareCountQuery(query) {
-        let countQuery = query;
-        if (countQuery.indexOf("LIMIT") === -1)
-            countQuery = countQuery.substring(0, countQuery.indexOf("LIMIT"));
-        if (countQuery.indexOf("ORDER") !== -1)
-            countQuery = countQuery.substring(0, countQuery.indexOf("ORDER"));
-        countQuery = countQuery.substring(countQuery.indexOf("FROM"));
-        countQuery = "SELECT COUNT(1) as `count` " + countQuery;
-        return countQuery;
+        let cleanQuery = query
+            .replace(/ORDER\s+BY\s+.*$/is, "")
+            .replace(/\bLIMIT\s+\d+(\s+OFFSET\s+\d+)?/is, "")
+            .trim();
+        return `SELECT COUNT(1) AS \`count\` FROM (${cleanQuery}) AS \`temp_count_table\``;
     }
     async commit(trx) {
         try {

package/dist/apiServer/documentation/Documentation.js

@@ -70,7 +70,7 @@ class Documentation extends BaseEndpoint_1.BaseEndpoint {
     async checkAuthorization(req) {
         const users = await APIService_1.REQ_DOC_USERS.request();
         if (!users || users.length == 0)
-            throw { ...DefaultErrors_1.default.UNAUTHORIZED, details: "No users found for documentation access" };
+            throw { ...DefaultErrors_1.default.UNAUTHORIZED, details: "No users found for documentation access, please set up users first." };
         let header = req.headers['authorization'];
         if (!header)
             throw { ...DefaultErrors_1.default.UNAUTHORIZED, details: "No authorization header found" };