@ejfdelgado/ejflab-back 1.30.7 → 1.30.9

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@ejfdelgado/ejflab-back",
-  "version": "1.30.7",
+  "version": "1.30.9",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ejfdelgado/ejflab-back.git"
   },
   "description": "",
   "scripts": {
+    "bip": "ffplay /sound/finish.mp3 -nodisp -nostats -hide_banner -autoexit",
     "mylogin": "npm login",
-    "mypublish": "npm install && npm publish --access=public",
+    "mypublish": "npm install && npm publish --access=public && npm run bip",
     "clean": "rm -rf node_modules && npm cache clean --force && rm package-lock.json && npm install"
   },
   "engines": {

package/srv/MainHandler.mjs

@@ -15,8 +15,10 @@ export class MainHandler {
     static async handle(req, res, next) {
         const originalUrl = req.getUrl();
         const theUrl = url.parse(originalUrl);
-        if (theUrl.pathname == "/socket.io/") {
-            return next();
+        //console.log(`theUrl.pathname = ${theUrl.pathname}`);
+        if (theUrl.pathname == "/socket.io/" || theUrl.pathname.startsWith("/srv/")) {
+            //next(); // it can't call no one after then...
+            return;
         }
         const rutas = MainHandler.decodeUrl(theUrl);
         const encoding = req.query.encoding;

package/srv/common/General.mjs

@@ -79,11 +79,23 @@ export class General {
     }
 
     static getPaginationArguments(req, orderColumnDef = null) {
-        const limit = parseInt(General.readParam(req, "limit", General.PAGE_SIZE_DEFAULT));
-        const orderColumn = General.readParam(req, "orderColumn", orderColumnDef);
-        const direction = General.readParam(req, "direction", General.PAGE_DIRECTION).toLowerCase();
-        const page = parseInt(General.readParam(req, "page", null));
-        const offsetProvided = parseInt(General.readParam(req, "offset", null));
+        let predefined = {
+            orderColumn: null,
+            limit: General.PAGE_SIZE_DEFAULT,
+            offset: null,
+            page: null,
+            direction: General.PAGE_DIRECTION
+        }
+        if (typeof orderColumnDef == "object") {
+            predefined = Object.assign(predefined, orderColumnDef);
+        } else if (typeof orderColumnDef == "string") {
+            predefined.orderColumn = orderColumnDef;
+        }
+        const limit = parseInt(General.readParam(req, "limit", predefined.limit));
+        const orderColumn = General.readParam(req, "orderColumn", predefined.orderColumn);
+        const direction = General.readParam(req, "direction", predefined.direction).toLowerCase();
+        const page = parseInt(General.readParam(req, "page", predefined.page));
+        const offsetProvided = parseInt(General.readParam(req, "offset", predefined.offset));
         if (!(typeof limit == "number")) {
             throw new MalaPeticionException("limit is expected to be a number");
         }