Merge branch 'develop'

Author: jboulmal

Dockerfile

@@ -1,7 +1,7 @@
 FROM node:6.2
 
-ADD src /usr/src/app/src
-ADD package.json /usr/src/app/
+COPY src /usr/src/app/src
+COPY package.json /usr/src/app/
 
 WORKDIR /usr/src/app
 
@@ -11,4 +11,4 @@ RUN mkdir logs
 RUN npm install
 
 EXPOSE  9090
-CMD ["forever", "src/main/server.js"]
+CMD ["node", "src/main/server.js"]

docker-compose.yml

@@ -1,13 +1,15 @@
 msg-node-nodejs:
     image: msg-node-rethink:latest
+    # For Easy Development of the msg-node load this volume
     # volumes:
     #     - /path/to/msg-node/repository:/usr/src/app
     ports:
         - "9090:9090"
     environment:
-        - url=localhost
-        - port=9090
-        - domainRegistryUrl=http://localhost:4567
+        - url=localhost  # url:domain of CSP where the Messaging Node would be deployed
+        - port=9090     # port:port of Messaging Node would be deployed
+        - domainRegistryUrl=http://localhost:4567/ # url:domain of CSP where the registry-domain would be deployed
+        - globalRegistryUrl=http://130.149.22.133:5002/ # url:domain of CSP where the Global Registry would be deployed
         - logLevel=INFO
         # - logDir=/usr/src/app/logs
         # - useSSL=1

package.json

@@ -34,6 +34,7 @@
     "chai": "^3.3.0",
     "expect.js": "^0.3.1",
     "gulp": "^3.9.0",
+    "log4js": "^0.6.27",
     "gulp-bump": "^1.0.0",
     "gulp-if": "^2.0.0",
     "gulp-insert": "^0.5.0",
@@ -52,7 +53,9 @@
     "socket.io-client": "^1.3.7",
     "vinyl-buffer": "^1.0.0",
     "vinyl-source-stream": "^1.1.0",
-    "watchify": "^3.4.0"
+    "watchify": "^3.4.0",
+    "dev-registry-domain": "github:rethink-project/dev-registry-domain",
+    "runtime-core": "github:rethink-project/dev-runtime-core#develop"
   },
   "jspm": {
     "directories": {
@@ -66,6 +69,7 @@
     }
   },
   "directories": {
+    "doc": "docs",
     "test": "test"
   },
   "dependencies": {
@@ -99,6 +103,8 @@
     "uuid": "^2.0.1",
     "vinyl-buffer": "^1.0.0",
     "vinyl-source-stream": "^1.1.0",
-    "watchify": "^3.6.1"
+    "watchify": "^3.6.1",
+    "dev-registry-domain": "github:rethink-project/dev-registry-domain",
+    "runtime-core": "github:rethink-project/dev-runtime-core#develop"
   }
 }

src/main/MsgNode.js

@@ -45,7 +45,8 @@ let MessageBus = require('./components/MessageBus');
 let SessionManager = require('./components/SessionManager');
 
 let AddressAllocationManager = require('./components/rethink/AddressAllocationManager');
-let RegistryManager = require('./components/rethink/RegistryManager');
+let DomainRegistryManager = require('./components/rethink/DomainRegistryManager');
+let GlobalRegistryManager = require('./components/rethink/GlobalRegistryManager');
 let SubscriptionManager = require('./components/rethink/SubscriptionManager');
 let ObjectAllocationManager = require('./components/rethink/ObjectAllocationManager');
 
@@ -58,9 +59,7 @@ class MsgNode {
    */
   constructor(config) {
     let _this = this;
-
     this.config = config;
-
     this.config.domainRegistryUrl = this.config.domainRegistryUrl.replace(/\/$/, '') + '/';
 
     // define logger configuration
@@ -89,8 +88,9 @@ class MsgNode {
     this.app.get('/live', (req, res) => {
       res.send({
         status:'up',
-        domain : this.config.url,
+        domain: this.config.url,
         domainRegistry: this.config.domainRegistryUrl,
+        globalRegistry: this.config.globalRegistryUrl,
         time: (new Date()).toISOString(),
         connected: Object.keys(this.io.sockets.sockets).length
       });
@@ -122,8 +122,10 @@ class MsgNode {
     this.registry.registerComponent(olm);
     let syncm = new SubscriptionManager('domain://msg-node.' + this.registry.getDomain()  + '/sm', this.registry);
     this.registry.registerComponent(syncm);
-    let rm = new RegistryManager('domain://registry.' + this.registry.getDomain(), this.registry);
+    let rm = new DomainRegistryManager('domain://registry.' + this.registry.getDomain() + '/', this.registry);
     this.registry.registerComponent(rm);
+    let glbm = new GlobalRegistryManager(this.registry.getDomain().globalRegistryUrl, this.registry);
+    this.registry.registerComponent(glbm);
 
     this.io.on('connection', this.onConnection.bind(this));
 
@@ -135,13 +137,13 @@ class MsgNode {
 
     //socket.id : socket.io id
     //socket.handshake.sessionID : express shared sessionId
-    this.logger.info('[C->S] new client connection', socket.id);
+    this.logger.info('[C->S] new client connection : ', socket.id);
 
     //    socket.join(socket.id);
     let client = new Client(this.registry, socket);
 
     socket.on('message', function(data) {
-      _this.logger.info('[C->S] new event', data);
+      _this.logger.info('[C->S] new event : ', data);
       try {
         client.processMessage(new Message(data));
       } catch (e) {
@@ -150,21 +152,21 @@ class MsgNode {
     });
 
     socket.on('disconnect', function() {
-      _this.logger.info('[C->S] client disconnect', socket.id);
+      _this.logger.info('[C->S] client disconnect: ', socket.id);
 
       client.disconnect();
     });
 
     socket.on('error', function(e) {
-      _this.logger.info('[C->S] socket error', socket.id, e);
+      _this.logger.info('[C->S] socket error :  ', socket.id, e);
     });
 
     // test ws route
     socket.on('echo', function(msg, callback) {
-      _this.logger.info('[C->S] receive echo');
+      _this.logger.info('[C->S] receive echo : ');
       callback = callback || function() {};
 
-      _this.logger.info('[S->C] test ping back');
+      _this.logger.info('[S->C] test ping back :');
       socket.emit('echo', msg);
       callback(null, 'Done.');
     });

src/main/components/Client.js

@@ -57,10 +57,15 @@ class Client {
   }
 
   reply(msg) {
-    this.logger.info('[S->C] emit msg', msg.getJson(), 'to', this.getUid());
+    this.logger.info('[S->C] emit msg : \n ', msg.getJson(), '\t to', this.getUid());
     this.socket.emit('message', msg.getJson());
   }
 
+  replyDomain(msg) {
+    this.logger.info('[S->C] Forward reply from domain registry emit msg : \n ', msg, '\n to : \n', msg.to);
+    this.socket.emit('message', msg);
+  }
+
   disconnect() {
     this.socket.disconnect();
   }

src/main/components/ClientMessage.js

@@ -52,14 +52,14 @@ class ClientMessage {
   dispatch() {
     let comp = this.registry.getComponent(this.msg.getTo());
     if (comp) {
-      this.logger.info('[ClientMessage] dispatch msg to internal', comp.getName());
+      this.logger.info('[ClientMessage] dispatch msg to internal:', comp.getName());
       try {
         comp.handle(this);
       } catch (e) {
         this.replyError(comp.getName(), e);
       }
     } else {
-      this.logger.info('[ClientMessage] forward msg to', this.msg.getTo());
+      this.logger.info('[ClientMessage] forward msg to :', this.msg.getTo());
       this.registry.getComponent('MessageBus').publish(this.msg.getTo(), this.msg.msg);
     }
   }
@@ -69,6 +69,11 @@ class ClientMessage {
     this.client.reply(msg);
   }
 
+  replyDomain(msg) {
+    // msg.setType('response');
+    this.client.replyDomain(msg);
+  }
+
   replyok(from) {
     let reply = new Message();
     reply.setId(this.msg.getId());

src/main/components/MessageBus.js

@@ -1,3 +1,4 @@
+
 /**
 * Copyright 2016 PT Inovação e Sistemas SA
 * Copyright 2016 INESC-ID

src/main/components/Registry.js

@@ -58,13 +58,14 @@ class Registry {
   }
 
   registerComponent(component) {
+    this.logger.info(this.components[component.getName()]);
     this.components[component.getName()] = component;
   }
 
   getComponent(name) {
     this.logger.info('getComponent(name):', name);
     if (name in this.components) {
-        this.logger.info('this.components', this.components);
+        // this.logger.info('this.components', this.components);
       return this.components[name];
     }
 

src/main/components/rethink/DomainRegistryManager.js

@@ -0,0 +1,76 @@
+/**
+* Copyright 2016 PT Inovação e Sistemas SA
+* Copyright 2016 INESC-ID
+* Copyright 2016 QUOBIS NETWORKS SL
+* Copyright 2016 FRAUNHOFER-GESELLSCHAFT ZUR FOERDERUNG DER ANGEWANDTEN FORSCHUNG E.V
+* Copyright 2016 ORANGE SA
+* Copyright 2016 Deutsche Telekom AG
+* Copyright 2016 Apizee
+* Copyright 2016 TECHNISCHE UNIVERSITAT BERLIN
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+**/
+
+'use strict';
+let Message = require('./../Message');
+
+const RegistryDomainConnector = require('dev-registry-domain/connector');
+
+class DomainRegistryManager {
+
+  constructor(name, registry) {
+    this.name = name;
+    this.registry = registry;
+    this.registryConnector = new RegistryDomainConnector(this.registry.getConfig().domainRegistryUrl);
+    this.logger = this.registry.getLogger();
+
+  }
+
+  getName() {
+    return this.name;
+  }
+
+  handle(clientMessage) {
+    let msg = clientMessage.getMessage();
+    this.logger.info('[RegistryManager]: [', this.getName(), ']: handle registry message :\n', msg.msg);
+
+    switch (msg.msg.type.toLowerCase()) {
+      case 'create':
+      case 'read':
+      case 'delete':
+      case 'update':
+        try {
+          this.registryConnector.processMessage(msg.msg, (res) => {
+            this.logger.info('[', this.getName(), '] Reply from domain registry :\n ', res);
+            this.logger.debug('  this.registryConnector : ',   this.registryConnector);
+            let reply = new Message();
+            reply = {
+                id: msg.msg.id,
+                type: 'response',
+                from:msg.msg.to,
+                to: msg.msg.from,
+                body: res
+              };
+            clientMessage.replyDomain(reply);
+          });
+        } catch (e) {
+          this.logger.error('[', this.getName(), ']: Error while processing message:\n', e);
+        }
+
+      break;
+      default:
+        clientMessage.replyError(this.getName(), 'Unrecognized type :"' + msg.getType() + '"');
+    }
+  }
+}
+module.exports = DomainRegistryManager;