badmfck-api-server 4.0.64 → 4.0.66

package/dist/apiServer/APIService.js

@@ -95,7 +95,7 @@ async function Initializer(services) {
 }
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
-    version = "4.0.64";
+    version = "4.0.66";
     options;
     monitor = null;
     started = new Date();

package/dist/apiServer/db/MysqlAdapter.js

@@ -451,13 +451,13 @@ class MysqlAdapter {
             let total = null;
             ;
             if (request.calculateCount) {
-                const cres = await conn.query("SELECT FOUND_ROWS() as total");
+                const cres = await conn.query(this.prepareCountQuery(query));
                 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;
+                    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();
@@ -644,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/external/MicroserviceClient.js

@@ -55,9 +55,10 @@ class MicroserviceClient extends BaseService_1.BaseService {
         const resp = await Http_1.Http.post(url, { tag: tag.toString("base64"), enc: encrypted.toString("base64") }, { headers });
         if (!resp.ok)
             return { ...DefaultErrors_1.default.BAD_REQUEST, details: resp.details, stack: [resp.error] };
-        if (resp.data && typeof resp.data === "object" && "error" in resp.data)
-            return resp.data.error;
-        return resp.data;
+        const body = resp.data;
+        if (body && typeof body === "object" && "error" in body)
+            return body.error;
+        return body.data ?? null;
     }
 }
 exports.MicroserviceClient = MicroserviceClient;

package/dist/apiServer/monitor/Monitor.js

@@ -132,7 +132,7 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
     async checkAuthentication(req) {
         const users = await APIService_1.REQ_MONITOR_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 monitor access, please set up users first." };
         let header = req.headers['authorization'];
         if (!header)
             throw { ...DefaultErrors_1.default.UNAUTHORIZED, details: "No authorization header found" };

package/package.json

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