ldn-inbox-server 1.4.2 → 1.4.4

package/README.md

@@ -148,7 +148,7 @@ The json path matches when one of:
 
 ### Multi handler
 
-A `handler/multi_notification_handler.js` is available to start multiple handler for each notification messages. The handlers to start are specified in a configuraton file that can be passed via the `config` parameter of an `handle_inbox`. In the commmand line tool `bin/ldn-inbox-server` the default location of such config file is `config/inbox_config.json` when processing an `@inbox`, and `config/outbox_config.json` when processing an `@outbox`.
+A `handler/multi_notification_handler.js` is available to start multiple handler for each notification messages. The handlers to start are specified in a configuration file that can be passed via the `config` parameter of an `handle_inbox`. In the commmand line tool `bin/ldn-inbox-server` the default location of such config file is `config/inbox_config.json` when processing an `@inbox`, and `config/outbox_config.json` when processing an `@outbox`.
 
 ### Offer memento handler
 

package/config/inbox_config.json

@@ -4,21 +4,21 @@
             "handlers": [
                 [
                  { 
-                    "id": "handler/notification_handler/jsonpath_filter.js",
+                    "id": "@handler/notification_handler/jsonpath_filter.js",
                     "anyOf": [ 
                         [ 
                             { "path": "$.type" , "value": "Offer" } 
                         ]
                     ]
                  }, 
-                 "handler/notification_handler/valid_artifact.js" ,
+                 "@handler/notification_handler/valid_artifact.js" ,
                  {
-                    "id": "handler/notification_handler/eventlog.js",
+                    "id": "@handler/notification_handler/eventlog.js",
                     "log": "@artifact:strip@.jsonld",
                     "dir": "@artifact:strip@"
                  },
                  {
-                    "id": "handler/notification_handler/offer_memento.js",
+                    "id": "@handler/notification_handler/offer_memento.js",
                     "actor": {
                         "id": "http://localhost:8000/profile/card#me" ,
                         "inbox": "http://localhost:8000/inbox/" ,
@@ -33,7 +33,7 @@
                 ] ,
                 [
                   { 
-                    "id": "handler/notification_handler/jsonpath_filter.js",
+                    "id": "@handler/notification_handler/jsonpath_filter.js",
                     "anyOf": [ 
                         [ 
                             { "path": "$.type" , "value": "Announce" } ,
@@ -41,8 +41,8 @@
                         ]
                     ]
                  } ,
-                 "handler/notification_handler/valid_eventlog.js",
-                 "handler/notification_handler/add_timemap_link.js" 
+                 "@handler/notification_handler/valid_eventlog.js",
+                 "@handler/notification_handler/add_timemap_link.js" 
                 ]
             ]
         }

package/config/outbox_config.json

@@ -3,9 +3,9 @@
         "multi": {
             "handlers": [
                 [
-                "handler/notification_handler/send_notification.js",
+                "@handler/notification_handler/send_notification.js",
                 {
-                    "id": "handler/eventlog_notification_handler.js",
+                    "id": "@handler/eventlog_notification_handler.js",
                     "log": "@artifact:strip@.jsonld",
                     "dir": "@artifact:strip@" 
                 }

package/lib/handler.js

@@ -15,7 +15,15 @@ async function defaultInboxHandler({path,options}) {
 
     const queue_size = options['queue_size'] ?? 'auto';
 
-    const worker = options['notification_handler'] ?? fsPath.resolve(__dirname,'..','lib','notification.js');
+    let worker;
+
+    if (options['notification_handler']) {
+        worker = options['notification_handler']
+                    .replaceAll(/@handler/g,fsPath.resolve(__dirname,'..','handler'));
+    }
+    else {
+        worker = fsPath.resolve(__dirname,'..','lib','demoNotificationHandler.js');
+    }
 
     // Run the notifications using a node.js worker pool
     const pool = new piscina({

package/lib/index.js

@@ -84,30 +84,51 @@ function doInboxGET(req,res) {
 
 function doInboxHEAD(req,res) {
     const pathItem = req.url.substring(INBOX_URL.length);
+    const id = pathItem.substring(1);
 
     logger.debug(`doInboxHEAD (for ${pathItem})`);
 
     if (pathItem === '/')  {
-        res.setHeader('Content-Type','application/ld+json');
+        const meta = getBody(`${id}.meta`);
+    
+        if (meta) {
+            const metadata = JSON.parse(meta);
+            for (let property in metadata) {
+                res.setHeader(property,metadata[property]);
+            }
+        }
+        else {
+            res.setHeader('Content-Type','application/ld+json');
+        }
         res.writeHead(200);
         res.end();
         return;
     }
 
     if (pathItem.match(/^\/[A-Za-z0-9_-]+\.jsonld$/)) {
-        const id = pathItem.substring(1);
         const result = getBody(id);
 
-        if (result) {
-            res.setHeader('Content-Type','application/ld+json');
-            res.writeHead(200);
-            res.end(); 
+        if (! result) {
+            res.writeHead(403);
+            res.end('Forbidden');
             return;
         }
+
+        const meta = getBody(`${id}.meta`);
+        
+        if (meta) {
+            const metadata = JSON.parse(meta);
+            for (let property in metadata) {
+                res.setHeader(property,metadata[property]);
+            }
+        }
         else {
-            res.writeHead(403);
-            res.end('Forbidden');
+            res.setHeader('Content-Type','application/ld+json');
         }
+
+        res.writeHead(200);
+        res.end(); 
+        return;
     }
     else {
         res.writeHead(403);
@@ -127,17 +148,40 @@ function doInboxGET_Index(req,res) {
         "contains": notifications
     };
 
+    const meta = getBody(`.meta`);
+        
+    if (meta) {
+        const metadata = JSON.parse(meta);
+        for (let property in metadata) {
+            res.setHeader(property,metadata[property]);
+        }
+    }
+    else {
+        res.setHeader('Content-Type','application/ld+json');
+    }
+
     res.writeHead(200);
     res.end(JSON.stringify(result,null,2));
 }
 
 function doInboxGET_Read(req,res) {
     const pathItem = req.url.substring(INBOX_URL.length);
-
-    const result = getBody(pathItem.substring(1));
+    const id = pathItem.substring(1);
+    const result = getBody(id);
 
     if (result) {
-        res.setHeader('Content-Type','application/ld+json');
+        const meta = getBody(`${id}.meta`);
+        
+        if (meta) {
+            const metadata = JSON.parse(meta);
+            for (let property in metadata) {
+                res.setHeader(property,metadata[property]);
+            }
+        }
+        else {
+            res.setHeader('Content-Type','application/ld+json');
+        }
+
         res.writeHead(200);
         res.end(result);
     }
@@ -217,7 +261,6 @@ function getBody(id) {
         return fs.readFileSync(INBOX_PATH + '/' + id, {encoding : 'utf-8'});
     }
     catch(e) {
-        logger.error(e);
         return null;
     }
 }

package/lib/util.js

@@ -112,6 +112,8 @@ function dynamic_handler(handler,fallback) {
             return handler;
         }
         else {
+            // translate dynamic path names
+            handler = handler.replaceAll(/@handler/g,fsPath.resolve(__dirname,'..','handler'));
             const abs_handler = path.resolve(handler);
             logger.debug(`trying dynamic load of ${handler} -> ${abs_handler}`);
             delete require.cache[abs_handler];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ldn-inbox-server",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "A demonstration Event Notifications Inbox server",
   "main": "lib/index.js",
   "author": "Patrick Hochstenbach <Patrick.Hochstenbach@UGent.be>",
@@ -8,11 +8,11 @@
   "scripts": {
     "server": "npx ldn-inbox-server start-server",
     "demo-post": "curl -X POST -H 'Content-Type: application/ld+json' --data-binary '@examples/offer.jsonld' http://localhost:8000/inbox/",
-    "handle-inbox": "npx ldn-inbox-server handler @inbox -hn ./handler/notification_handler/accept.js",
-    "handle-outbox": "npx ldn-inbox-server handler @outbox -hn ./handler/notification_handler/send_notification.js",
-    "handle-eventlog": "npx ldn-inbox-server handler @inbox -hn handler/notification_handler/eventlog.js",
-    "handle-inbox-multi": "npx ldn-inbox-server handler @inbox -hn ./handler/notification_handler/multi.js",
-    "handle-outbox-multi": "npx ldn-inbox-server handler @outbox -hn ./handler/notification_handler/multi.js",
+    "handle-inbox": "npx ldn-inbox-server handler @inbox -hn @handler/notification_handler/accept.js",
+    "handle-outbox": "npx ldn-inbox-server handler @outbox -hn @handler/notification_handler/send_notification.js",
+    "handle-eventlog": "npx ldn-inbox-server handler @inbox -hn @handler/notification_handler/eventlog.js",
+    "handle-inbox-multi": "npx ldn-inbox-server handler @inbox -hn @handler/notification_handler/multi.js",
+    "handle-outbox-multi": "npx ldn-inbox-server handler @outbox -hn @handler/notification_handler/multi.js",
     "clean": "rm -rf error/* inbox/* outbox/* public/events/* public/events/log/* public/artifacts/artifact1 public/artifacts/artifact2 public/artifacts/*.jsonld*"
   },
   "bin": "./bin/ldn-inbox-server.js",