ldn-inbox-server 1.4.8 → 1.5.0

package/bin/ldn-inbox-server.js

@@ -5,6 +5,7 @@ const { program } = require('commander');
 const { start_server } = require('mellon-server');
 const { doInbox }      = require('../lib/index');
 const { handle_inbox } = require('../lib/handler');
+const { parseConfig }  = require('../lib/util');
 require('dotenv').config();
 
 const HOST = process.env.LDN_SERVER_HOST ?? 'localhost';
@@ -58,7 +59,7 @@ program
       }
 
       if (options['config'] && fs.existsSync(options['config'])) {
-          const config = JSON.parse(fs.readFileSync(options['config'], { encoding: 'utf-8'}));
+          const config = parseConfig(options['config']);
           if (config.registry) {
              for (let i = 0 ; i < config.registry.length ; i++) {
                 const registry_item = config.registry[i];

package/handler/notification_handler/multi.js

@@ -1,4 +1,4 @@
-const { dynamic_handler , parseAsJSON } = require('../../lib/util.js');
+const { dynamic_handler , parseConfig } = require('../../lib/util.js');
 const logger = require('../../lib/util.js').getLogger();
 
 /**
@@ -8,7 +8,7 @@ const logger = require('../../lib/util.js').getLogger();
 async function handle({path,options}) {
     let success = false;
 
-    const config = parseAsJSON(options['config']);
+    const config = parseConfig(options['config']);
 
     if (! config) {
         logger.error('no configuration found for multi_notification_handler');

package/lib/index.js

@@ -9,7 +9,9 @@ const {
     sendNotification,
     moveTo,
     parseAsJSON,
-    generateId
+    generateId,
+    generatePublished,
+    parseConfig
 } = require('../lib/util');
 const { handle_inbox } = require('../lib/handler');
 const logger = getLogger();
@@ -285,5 +287,7 @@ module.exports = {
     moveTo ,
     sendNotification ,
     handle_inbox ,
-    generateId
+    generateId , 
+    generatePublished ,
+    parseConfig
 };

package/lib/util.js

@@ -5,6 +5,7 @@ const path = require('path');
 const { backOff } = require('exponential-backoff');
 const { v4: uuidv4 } = require('uuid');
 const fetch = require('node-fetch');
+const YAML = require('yaml');
 require('dotenv').config();
 
 const logger = getLogger();
@@ -26,6 +27,24 @@ function getLogger() {
     return logger;
 }
 
+function parseConfig(path) {
+    try {
+        if (path.endsWith('.json') || path.endsWith('.jsonld')) {
+            return JSON.parse(fs.readFileSync(path, {encoding: 'utf-8'}));
+        }
+        else if (path.endsWith('.yaml') || path.endsWith('.yml')) {
+            return YAML.parse(fs.readFileSync(path, {encoding: 'utf-8'}));
+        }
+        else {
+            return JSON.parse(fs.readFileSync(path, {encoding: 'utf-8'}));
+        }
+    }
+    catch (e) {
+        logger.error(e);
+        return null;
+    }
+}
+
 async function fetchOriginal(url) {
     logger.info(`Fetching ${url}...`);
     
@@ -231,9 +250,14 @@ function generateId() {
     return 'urn:uuid:' + uuidv4();
 }
 
+function generatePublished() {
+    return (new Date()).toISOString();
+}
+
 module.exports = { 
     getLogger , 
     generateId ,
+    generatePublished ,
     backOff_fetch , 
     fetchOriginal ,
     moveTo ,
@@ -243,5 +267,6 @@ module.exports = {
     parseArtifact ,
     parseEventLog ,
     parseLocalResource ,
-    ldPropertyAsId
+    ldPropertyAsId ,
+    parseConfig
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ldn-inbox-server",
-  "version": "1.4.8",
+  "version": "1.5.0",
   "description": "A demonstration Event Notifications Inbox server",
   "main": "lib/index.js",
   "author": "Patrick Hochstenbach <Patrick.Hochstenbach@UGent.be>",
@@ -33,6 +33,7 @@
     "piscina": "^4.4.0",
     "proper-lockfile": "^4.1.2",
     "upath": "^2.0.1",
-    "uuid": "^9.0.1"
+    "uuid": "^9.0.1",
+    "yaml": "^2.5.0"
   }
 }