backend-plus 2.1.3 → 2.1.4

package/for-client/my-menu.js

@@ -436,6 +436,19 @@ myOwn.displayMenu = function displayMenu(layout, menu, addrParams, parents){
                     {underElement:this}
                 );
             }),
+            my.light('airplane', function(){
+                if(my.ldb && my.offline){
+                    if(my.offline.mode && !my.server.connected){
+                        promptPromise("Si desea salir del modo avión puede forzarlo").then(function(texto){
+                            if (texto == 'forzar') {
+                                my.changeOfflineMode();
+                            }
+                        });
+                    }else{
+                        my.changeOfflineMode();
+                    }
+                }
+            }, {hidden:true})
         ]));
         elements.push(status);
     }
@@ -488,6 +501,9 @@ myOwn.displayMainMenu = function(addrParams){
         }
     }
     setTimeout(my.doMenuRealigns,10);
+    setTimeout(function(){
+        my.offlineModeRefresh();
+    },10);
     return menu;
 };
 
@@ -531,37 +547,101 @@ myOwn.informDetectedStatus = function informDetectedStatus(statusCode, logged) {
     }
 }
 
-var lastUrl = window.location.href;
-//TODO: desacoplar de BP
-window.addEventListener('popstate', function(){
-    function checkReactUrl(url){
-        const regex = /\/react(\/.*)?$/;
-        return regex.test(url);
+myOwn.setOnlineOfflineUrl = function setOnlineOfflineUrl(){
+    var actualHref=location.href;
+    var hrefSplit = actualHref.split(my.menuSeparator)
+    var newHref = my.offline.mode?'ext':my.menuName;
+    newHref = (hrefSplit.length > 1)?newHref+my.menuSeparator+hrefSplit[1]:newHref;
+    history.pushState(null, null, newHref);
+}
+
+myOwn.offlineModeRefresh = function offlineModeRefresh(){
+    var my=this;
+    /** @type {HTMLImageElement} */
+    // @ts-ignore
+    var imgLight = document.getElementById('light-airplane');
+    if (imgLight != null) {
+        var skin=((my.config||{}).config||{}).skin;
+        if(my.offline.mode){
+            imgLight.src=my.path.img+'airplane-on.png';
+        }else{
+            imgLight.src=my.path.img+'airplane-off.png';
+        }
+    }
+}
+
+myOwn.changeOfflineMode = function changeOfflineMode(){
+    my.offline.mode=!my.offline.mode;
+    my.offlineModeRefresh();
+    my.setOnlineOfflineUrl();
+    if(my.offline.mode){
+        var fkToStoreData = [];
+        var promiseArray1 = [];
+        var promiseChain = my.ldb.getAllStructures().then(function(tablesDef){
+            tablesDef.forEach(function(tableDef){
+                promiseArray1.push(
+                    my.ldb.isEmpty(tableDef.name).then(function(isEmpty){
+                        if(!isEmpty){
+                            var fkToStoreSearch = tableDef.foreignKeys.filter(function(fk){
+                                return fk.fields.find(function(field){
+                                    return !tableDef.primaryKey.includes(field.source)
+                                })
+                            });
+                            fkToStoreData = fkToStoreData.concat(fkToStoreSearch);
+                        }
+                    })
+                );
+            });
+        });
+        var promiseArray2 = [];
+        promiseChain = promiseChain.then(function(){
+            return Promise.all(promiseArray1).then(function(){
+                return fkToStoreData.forEach(function(fk){
+                    var conn = new my.TableConnector({tableName: fk.references, my:my});
+                    var opts = { registerInLocalDB: false };
+                    conn.getStructure(opts)
+                    promiseArray2.push(
+                        Promise.resolve().then(function(){
+                            return conn.getData().then(function(rows){
+                                return my.ldb.putMany(fk.references, rows)
+                            })
+                        })
+                    );
+                });
+            });
+        });
+        promiseChain = promiseChain.then(function(){
+            Promise.all(promiseArray2).then(function(){
+                location.reload();
+            })
+        });
+    }else{
+        my.showPage();
+        location.reload();
     }
-    const currentUrl = window.location.href;
-    if(checkReactUrl(currentUrl)){
-        if(!checkReactUrl(lastUrl))
-            location.reload();
+}
+
+window.addEventListener('popstate', function(){
+    if(!my.config){
+        my.autoSetup().then(function(){
+            my.setOnlineOfflineUrl();
+            my.showPage();
+        })
     }else{
-        setTimeout(function(){
-            if(!my.config){
-                my.autoSetup().then(function(){
-                    my.showPage();
-                })
-            }else{
-                my.showPage();
-            }
-        },10)
-    }    
-    lastUrl = currentUrl;
+        my.showPage();
+    }
 });
 
 window.addEventListener('load', function(){
     window.my = myOwn;
     my.autoSetup().then(function(){
+        my.setOnlineOfflineUrl();
         my.showPage();
     })
     document.body.appendChild(html.div({id:'cached-images'},[
+        html.img({src:my.path.img+'airplane-on.png'}),
+        html.img({src:my.path.img+'airplane-off.png'}),
+        html.img({src:my.path.img+'airplane.png'}),
         html.img({src:my.path.img+'server.png'}),
         html.img({src:my.path.img+'network-signal.png'}),
         html.img({src:my.path.img+'server-error.png'}),

package/lib/backend-plus.d.ts

@@ -341,6 +341,7 @@ export interface TableDefinitions {
     [k: string]: TableDefinitionFunction
 }
 export interface ClientSetup {
+    config:AppConfigClientSetup
     setup:Record<string, any>
     procedures:ProcedureDef[]
 }
@@ -367,7 +368,6 @@ export interface OptsClientPage {
     extraFiles?:ClientModuleDefinition[]
     icon?:string
     icons?:Record<string,string>
-    baseUrlForRelativePaths?:boolean
 }
 
 export type DumpOptions={complete?:boolean, skipEnance?:boolean, disableDBFunctions?:boolean}
@@ -382,11 +382,8 @@ export interface AppConfigBin {                                    // executable
     "zip-fixed-parameters":string         // fixed parameters to pass to zipper
 }
 
-export interface AppConfig {
-    package: {
-        version: string
-    }
-    server: {
+export interface AppConfigServer 
+    {
         "base-url": string                 // rool path in the url
         port: number                       // port of the API services
         "session-store": string            // strategies to store session info
@@ -396,7 +393,8 @@ export interface AppConfig {
         bitacoraSchema: string
         bitacoraTableName: string 
     }
-    db: {
+export interface AppConfigDb 
+    {
         motor: 'postgresql'
         database: string
         user: string
@@ -409,7 +407,8 @@ export interface AppConfig {
         no_login: boolean                  // if no login is needed. Used only for all public sites
         "downloadable-backup-path": string // OS path of the encrypted downloadable backup
     }
-    login: {
+export interface AppConfigLogin 
+    {
         schema: string                     // schema of the user table
         table: string                      // user table
         userFieldname: string              // fieldname in user table that stores the user name
@@ -437,7 +436,8 @@ export interface AppConfig {
         }
         "double-dragon": boolean           // app user must match db user
     }
-    install: {
+export interface AppConfigInstall 
+    {
         "table-data-dir": string           // SO path to the .tab files in the db creation script
         dump: {                            // configuration of --dump-db, the db creation script
             "drop-his": boolean            // include drop schema his in the db creation script
@@ -459,9 +459,29 @@ export interface AppConfig {
             }
         }
     }
-    "client-setup": {                      // front-end config
+export interface AppConfigClientSetup // front-end config
+    {
         title:string                       // title of the app (common sufix of the title bar)
+        lang:string
+        version?:string
+        menu?:boolean
+        "background-img"?:string
+        devel?:boolean
+        deviceWidthForMobile?:string
+        "initial-scale"?:string
+        "minimum-scale"?:string
+        "maximum-scale"?:string
+        "user-scalable"?:string
+    }
+export interface AppConfig {
+    package: {
+        version: string
     }
+    server: AppConfigServer
+    db: AppConfigDb
+    login: AppConfigLogin
+    install: AppConfigInstall
+    "client-setup": AppConfigClientSetup
     log: {
         "serve-content": never
         req: {

package/lib/backend-plus.js

@@ -2240,13 +2240,11 @@ AppBackend.prototype.mainPage = function mainPage(req, offlineMode, opts){
     if(offlineMode){
         cssList.push('css/offline-mode.css');
     }
-    cssList = cssList.concat((opts.extraFiles ?? []).filter((extraFile)=>extraFile.type == 'css').map((extraFile)=>extraFile.file));
     return html.html(attr,[
         html.head([
             html.title(be.config["client-setup"]?.title),
             html.meta({charset:"utf-8"}),
             viewportAttrs?html.meta(viewportAttrs):null,
-            opts.baseUrlForRelativePaths?html.base({href:`${be.config.server["base-url"]}/`}):null,
             html.link({href: opts.icons.iconShortcut , rel: "shortcut icon", type: "image/png"}),
             html.link({href: opts.icons.icon         , rel: "icon", type: "image/png"}),
             html.link({href: opts.icons.iconApple    , rel: "apple-touch-icon"}),
@@ -2270,9 +2268,7 @@ AppBackend.prototype.mainPage = function mainPage(req, offlineMode, opts){
                 html.div(be.messages.unlogged.loading),
                 req.useragent.os=='iOS'&&req.useragent.version.split('.')[0]<9?html.div(`La versión del dispositivo ${req.useragent.version} no es compatible`):null
             ]),
-            html.div({id: "total-scripts"}, be.clientModules(req,opts).scripts.concat(
-                (opts?.extraFiles ?? []).filter((extraFile)=>be.esJavascript(extraFile.type)).map((extraFile)=>({...extraFile,type:null}))
-            ).map(function(scriptDef){
+            html.div({id: "total-scripts"}, be.clientModules(req,opts).scripts.map(function(scriptDef){
                 return html.script(scriptDef);
             }).concat([html.script({src:'client/menu.js'})]))
         ]),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -41,10 +41,10 @@
     "cookie-parser": "^1.4.7",
     "dialog-promise": "^0.10.0",
     "discrepances": "^0.2.8",
-    "express": "^4.21.1",
+    "express": "^4.21.2",
     "express-session": "^1.18.1",
     "express-useragent": "^1.0.15",
-    "fs-extra": "^11.2.0",
+    "fs-extra": "^11.3.0",
     "js-to-html": "^1.3.2",
     "js-yaml": "^4.1.0",
     "json4all": "^1.4.0",
@@ -52,10 +52,10 @@
     "like-ar": "^0.5.1",
     "login-plus": "^1.7.2",
     "memorystore": "^1.6.7",
-    "mini-tools": "^1.12.2",
+    "mini-tools": "^1.13.2",
     "moment": "^2.30.1",
     "multiparty": "^4.2.3",
-    "nodemailer": "^6.9.16",
+    "nodemailer": "^6.10.0",
     "numeral": "^2.0.6",
     "pg-promise-strict": "^1.4.2",
     "pikaday": "^1.8.2",
@@ -64,7 +64,7 @@
     "regexplicit": "^0.1.3",
     "require-bro": "^0.3.1",
     "self-explain": "^0.11.0",
-    "serve-content": "^0.3.20",
+    "serve-content": "^0.4.0",
     "session-file-store": "^1.5.0",
     "sql-tools": "^0.1.2",
     "stack-trace": "^0.0.10",
@@ -82,7 +82,7 @@
     "@types/js-yaml": "^4.0.9",
     "@types/mocha": "^10.0.10",
     "@types/multiparty": "~4.2.1",
-    "@types/node": "^22.9.3",
+    "@types/node": "^22.10.10",
     "@types/nodemailer": "^6.4.17",
     "@types/numeral": "~2.0.5",
     "@types/session-file-store": "^1.2.5",
@@ -97,14 +97,14 @@
     "karma-ie-launcher": "^1.0.0",
     "karma-mocha": "^2.0.1",
     "kill-9": "~0.4.3",
-    "mocha": "^10.8.2",
+    "mocha": "^11.1.0",
     "nyc": "^17.1.0",
-    "puppeteer": "^23.9.0",
+    "puppeteer": "^24.1.1",
     "sinon": "^19.0.2",
     "supertest": "^7.0.0",
     "types.d.ts": "~0.6.22",
-    "typescript": "^5.7.2",
-    "why-is-node-running": "^3.2.1"
+    "typescript": "^5.7.3",
+    "why-is-node-running": "^3.2.2"
   },
   "engines": {
     "node": ">= 18"