backend-plus 2.0.0-rc.10 → 2.0.0-rc.12

package/lib/backend-plus.d.ts

@@ -420,7 +420,8 @@ export class AppBackend{
     i18n:{
         messages:Record<LangId,Record<string, string>>
     }
-    shootDownBackend():Promise<void>
+    shutdownCallbackListAdd(param:{message:string, fun:()=>Promise<void>}):void
+    shutdownBackend():Promise<void>
     setLog(opts:{until:string, results?:boolean}):void
     getDataDumpTransformations(rawData:string):Promise<{rawData:string, prepareTransformationSql:string[], endTransformationSql:string[]}>
 }

package/lib/backend-plus.js

@@ -97,7 +97,13 @@ class AppBackend{
         /** @type {{path:string}[]} */
         this.appStack=[];
         /** @type {{message:string; fun:()=>void}[]} */
-        this.shootDownCallbackList=[];
+        this.shutdownCallbackList=[];
+        this.sessionStores={
+            file: SessionFileStore,
+            memory: memorystore,
+            memoryDevel: BindMemoryPerodicallySaved(this),
+            "memory-saved": BindMemoryPerodicallySaved(this),
+        }
         if(!this.rootPath){
             console.log('ATENCIÓN hay que poner be.rootPath antes de llamar a super()');
             this.rootPath=Path.resolve(__dirname,'..');
@@ -119,7 +125,7 @@ class AppBackend{
         this.tableStructures = {};
         this.configStaticConfig();
         /** @type {null|()=>Promise<void>} */
-        this.shootDownBackend = null;
+        this.shutdownBackend = null;
         /** @type {bp.Server} */
         // @ts-ignore
         this.server = null;
@@ -358,6 +364,8 @@ AppBackend.prototype.i18n.messages.es={
     }
 };
 
+function BindMemoryPerodicallySaved(be){
+    return (
 /**
  * @param {Express.Session} session
  */
@@ -406,7 +414,7 @@ function MemoryPerodicallySaved(session){
                 console.log('dumping sessions every',dumpEverySeconds,'seconds');
                 var errorsToShow=4;
                 // TODO: hangs the server in devel mode
-                setInterval(function(){
+                var interval = setInterval(function(){
                     try{
                         fs.writeFile(fileName,json4all.stringify(store.store.dump()));
                     }catch(err){
@@ -417,18 +425,15 @@ function MemoryPerodicallySaved(session){
                         }
                     }
                 },dumpEverySeconds*1000);
+                be.shutdownCallbackListAdd({
+                    message:'session saver',
+                    fun:()=>clearInterval(interval)
+                })
             });
         }
     }
     return MemoryDevelConstructor;
-}
-
-var sessionStores={
-    file: SessionFileStore,
-    memory: memorystore,
-    memoryDevel: MemoryPerodicallySaved,
-    "memory-saved": MemoryPerodicallySaved,
-}
+})}
 
 /**
  * @param {string} text 
@@ -504,6 +509,11 @@ AppBackend.prototype.canChangePass = async function canChangePass(reqOrContext,
     return be.isAdmin(reqOrContext);
 }
 
+AppBackend.prototype.shutdownCallbackListAdd = function(messageFun){
+    this.shutdownCallbackList.push(messageFun);
+}
+
+
 AppBackend.prototype._Browsers = {
     Edge:      {short:'Ed'  , minVer:14  , polly:true},
     Konqueror: {short:'Kq'  , minVer:null, polly:true},
@@ -626,32 +636,33 @@ AppBackend.prototype.start = function start(opts){
         // @ts-ignore : only for testing */
         this.getMainApp = function getMainApp(){ return mainApp; };
     }
-    this.shootDownBackend = function shootDownBackend(){
+    this.shutdownBackend = async function shutdownBackend(){
         console.log('shooting down:');
-        return new Promise(function(resolve,reject){
-            console.log('*','express server');
-            be.server.close(/** @param {Error} err */function(err){
-                if(err){
-                    console.log('*', err)
-                    reject(err);
-                }else{
-                    resolve();
-                }
-            });
-        }).then(async function(){
-            while(be.shootDownCallbackList.length){
-                var nextCallback=be.shootDownCallbackList.pop();
-                if(nextCallback!=null){
-                    console.log('*',nextCallback.message);
-                    await nextCallback.fun();
-                }
-            }
-        }).then(function(){
-            console.log('pg pool balance',pg.poolBalanceControl());
-            // @ts-ignore al hacer shootDown ya no hay mainApp. 
-            mainApp = null;
-            logWhy && logWhy();
-        });
+        var waitFor = [
+            new Promise(function(resolve,reject){
+                console.log('*','express server');
+                be.server.close(/** @param {Error} err */function(err){
+                    if(err){
+                        console.log('*', err)
+                        reject(err);
+                    }else{
+                        console.log('*','express server done!')
+                        resolve();
+                    }
+                });
+            }),
+            ...(be.shutdownCallbackList.map(x => (async function(){
+                console.log('shut:', x.message)
+                await x.fun()
+                console.log('done:', x.message)
+            })()))
+        ];
+        console.log('*', 'waiting for all')
+        await Promise.all(waitFor);
+        console.log('*', 'all done')
+        mainApp = null;
+        console.log('* logWhy',logWhy)
+        logWhy && logWhy();
     };
     return Promise.resolve().then(function(){
         var configList=be.configList();
@@ -682,10 +693,10 @@ AppBackend.prototype.start = function start(opts){
                 }
                 var sessionStoreName=be.config.server["session-store"];
                 if(sessionStoreName){
-                    if(config.devel && sessionStores[sessionStoreName+'Devel']){
+                    if(config.devel && be.sessionStores[sessionStoreName+'Devel']){
                         sessionStoreName+='Devel';
                     }
-                    var storeModule = sessionStores[sessionStoreName];
+                    var storeModule = be.sessionStores[sessionStoreName];
                     be.config.login.plus.store.module = storeModule;
                 }
                 be.config.install.dump.db.owner=coalesce(be.config.db.owner,be.config.install.dump.db.owner,be.config.db.user);
@@ -963,12 +974,18 @@ AppBackend.prototype.start = function start(opts){
                 loginPlusOpts.noLoggedUrlPath=be.config.login.unloggedLandPage;
             }
             mainApp.loginPlusManager.init(mainApp,changing(be.config.login.plus,loginPlusOpts));
-            be.shootDownCallbackList.push({
+            be.shutdownCallbackListAdd({
                 message:'login-plus manager',
                 fun:function(){
                     mainApp.loginPlusManager.closeManager();
                 }
             });
+            be.shutdownCallbackListAdd({
+                message:'pg',
+                fun:function(){
+                    pg.shutdown();
+                }
+            });
             mainApp.loginPlusManager.setValidatorStrategy(
                 function(req, username, password, done) {
                     var client;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.0.0-rc.10",
+  "version": "2.0.0-rc.12",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -82,7 +82,7 @@
     "@types/js-yaml": "^4.0.9",
     "@types/mocha": "^10.0.6",
     "@types/multiparty": "~0.0.36",
-    "@types/node": "^20.12.2",
+    "@types/node": "^20.12.5",
     "@types/nodemailer": "^6.4.14",
     "@types/numeral": "~2.0.5",
     "@types/session-file-store": "^1.2.5",
@@ -99,11 +99,11 @@
     "kill-9": "~0.4.3",
     "mocha": "^10.4.0",
     "nyc": "^15.1.0",
-    "puppeteer": "^22.6.1",
+    "puppeteer": "^22.6.3",
     "sinon": "^17.0.1",
     "supertest": "^6.3.4",
     "types.d.ts": "~0.6.21",
-    "typescript": "^5.4.3",
+    "typescript": "^5.4.4",
     "why-is-node-running": "^2.2.2"
   },
   "engines": {