ldn-inbox-server 1.1.2 → 1.1.4

package/bin/ldn-inbox-server.js

@@ -17,7 +17,7 @@ const JSON_SCHEMA_PATH = process.env.LDN_SERVER_JSON_SCHEMA ?? './config/notific
 
 program
   .name('lnd-inbox-server')
-  .version('1.1.2')
+  .version('1.1.4')
   .description('A demonstration Event Notifications Inbox server');
 
 program
@@ -35,6 +35,7 @@ program
 
 program
   .command('handler')
+  .option('--loop <seconds>', 'run in a loop',0)
   .option('--inbox <inbox>','inbox',INBOX_PATH)
   .option('--outbox <outbox>','outbox',OUTBOX_PATH)
   .option('--error <errbox>','errbox',ERROR_PATH)
@@ -53,7 +54,15 @@ program
            options['notification_handler'] ?? defaultSendNotificationHandler;
         break;
     }
-    await handle_inbox(box,options);
+    if (options['loop']) {
+      while(1) {
+        await handle_inbox(box,options); 
+        await new Promise(resolve => setTimeout(resolve, options['loop']*1000));
+      }
+    }
+    else {
+      await handle_inbox(box,options);
+    }
   });
 
   program.parse();

package/handler/demo_notification_handler.js

@@ -4,7 +4,7 @@ const { moveTo } = require('../lib/util');
 
 async function handle(path,options) {
     logger.info(`parsing notification ${path}`);
-
+    
     try {
         const json = JSON.parse(fs.readFileSync(path, { encoding: 'utf-8'}));
         

package/lib/handler.js

@@ -16,29 +16,40 @@ async function defaultInboxHandler(path,options) {
 
     const glob    = new RegExp(options['glob'] ?? "^.*\\.jsonld$");
     const handler = dynamic_handler(options['notification_handler'],null);
-console.log(glob);
-    fs.readdir(path, (err,files) => {
-        files.forEach( (file) => {
-            const fullPath = `${path}/${file}`;
-            console.log(file);
-            if (file.match(glob)) {
-                // Process
-                lockfile.lock(fullPath)
-                    .then( async (release) => {
+
+    // Need some more elegant code here to select of batch of files to
+    // process in the path. The code below will work as long as the 
+    // number of files in the inbox don't become gigantic...
+    const files = fs.readdirSync(path);
+
+    for (let i = 0 ; i < files.length ; i++) {
+        const file = files[i];
+        const fullPath = `${path}/${file}`;
+
+        if (file.match(glob)) {
+            // Process
+            lockfile.lock(fullPath)
+                .then( async (release) => {
+                    try {
                         await handler(fullPath,options);
-                        return release();
-                    })
-                    .catch( (e) => {
+                    }
+                    catch (e) {
                         logger.error(e);
-                        logger.warn(`${fullPath} is locked`);
-                    })
-                    .finally( () => {
+                        logger.error(`handler failed on ${fullPath}`);
+                    }
+                    return release();
+                })
+                .catch( (e) => {
+                    logger.debug(`${fullPath} is locked`);
+                })
+                .finally( () => {
+                    if (fs.existsSync(fullPath)) {
                         logger.debug(`removing ${fullPath}`);
                         fs.unlinkSync(fullPath);
-                    });
-            }
-        });
-    });
+                    }
+                });
+        }
+    }
 }
 
 async function defaultSendNotificationHandler(path,options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ldn-inbox-server",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "A demonstration Event Notifications Inbox server",
   "main": "lib/index.js",
   "author": "Patrick Hochstenbach <Patrick.Hochstenbach@UGent.be>",