Merge pull request #198 from reTHINK-project/develop

Develop

Author: luistduarte

README.md

@@ -15,20 +15,22 @@
 -	[Tasks](#tasks)
 
 ## <a id="note">Note</a>
-In order to try speed up the instalation process, we remove the first verification of global modules, so, if you want install this repository, you should install globaly this modules:
+In order to speed up the installation process, we have removed the first verification of global modules, so, if you want to install this repository, you should globally install  this module:
 
 ```shell
 npm install -g karma-cli
 ```
 
 ## <a id="overview">Overview</a>
 
-This repository contains the source code and associated documentation of the core components required to support the deployment and execution of Hyperties in user devices or in network servers. More information about the Hyperty concept and the reTHINK framework in general is provided [here](https://github.com/reTHINK-project/dev-service-framework/blob/master/README.md).
+This repository contains the source code and associated documentation of the core components required to support the deployment and execution of Hyperties in user devices or in network servers. The full specification is provided [here]().
 
-The Hyperty Runtime architecture follows a security by design approach since it was highly influenced by a careful [security analysis](docs/specs/securityanalysis.md) where different types of components are executed in isolated sandboxes. Thus, components downloaded from a specific Service Provider are executed in sandboxes that are different from the sandboxes used to execute components downloaded from another service provider. Communication between components running in different sandboxes is only possible through messages exchanged through a Message Bus functionality provided by the Hyperty Runtime Core Sandbox. On the other hand, and according to the [ProtoOFly concept](https://github.com/reTHINK-project/dev-service-framework/blob/master/docs/manuals/hyperty-messaging-framework.md#protocol-on-the-fly-protofly-and-protostubs), the protocol stub is executed in isolated sandbox and provides the bridge for the Hperty Runtime to communicate with associated Service Provider. The detailed specification of the Hyperty Runtime Core is provided [here](docs/specs/readme.md).
+The Hyperty Runtime architecture follows a security by design approach where different types of components are executed in isolated sandboxes. Thus, components downloaded from a specific Service Provider are executed in sandboxes that are different from the sandboxes used to execute components downloaded from another service provider. Communication between components running in different sandboxes is only possible through messages exchanged through a Message Bus functionality provided by the Hyperty Runtime Core Sandbox. On the other hand, and according to the ProtoOFly concept, the protocol stub is executed in isolated sandbox and provides the bridge for the Hperty Runtime to communicate with associated Service Provider.
 
 Hyperty Core Runtime components are platform agnostic and are to be included in platform specific Hyperty Runtimes, like Web Browsers and Nodejs based platforms.
 
+The detailed specification of the Hyperty Runtime Core is provided [here](https://github.com/reTHINK-project/specs/blob/master/runtime/readme.md) and the full reTHINK Framework is provided [here](https://github.com/reTHINK-project/specs).
+
 ## <a id="user-view">User View</a>
 
 **How to include the Hyperty Runtime Core in other Projects**
@@ -65,7 +67,7 @@ console.log('MiniBus: ', MiniBus);
 
 ```
 
-if you found some issues, please submit them into the respective repository;
+if you find some issues, please submit them into the respective repository;
 
 ---
 

dist/PEP.js

@@ -1,6 +1,6 @@
 {
   "name": "runtime-core",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "core runtime development",
   "files": [
     "dist"
@@ -34,7 +34,7 @@
   },
   "homepage": "https://rethink-project.eu/",
   "dependencies": {
-    "service-framework": "github:rethink-project/dev-service-framework#v0.6.0"
+    "service-framework": "github:rethink-project/dev-service-framework#v0.6.1"
   },
   "devDependencies": {
     "babel-core": "^6.21.0",

dist/ReThinkCtx.js

@@ -161,18 +161,21 @@ class RuntimeCoreCtx extends ReThinkCtx {
     return new Promise((resolve, reject) => {
       console.log('[Policy.RuntimeCoreCtx.prepareToForward]', message);
 
+      // uncomment this to enable mutual authentication
+      return resolve(message);
+
       // TODO remove this validation. When the Nodejs auth was completed this should work like browser;
       this.runtimeCapabilities.isAvailable('node').then((result) => {
 
-        console.log('[RuntimeCoreCtx - isAvailable - node] - ', result);
+      console.log('[RuntimeCoreCtx - isAvailable - node] - ', result);
         if (result) {
           return resolve(message);
         } else {
           if (isIncoming) {
             let isSubscription = message.type === 'subscribe';
             let isFromRemoteSM = _this.isFromRemoteSM(message.from);
 
-            if (isSubscription & isFromRemoteSM) {            
+            if (isSubscription & isFromRemoteSM) {
               // TODO: should verify why the mutualAuthentication is not working
               // TODO: this should uncommented
              _this.doMutualAuthentication(message).then(() => {

dist/Runtime.js

@@ -27,7 +27,7 @@ import AddressAllocation from '../allocation/AddressAllocation';
 import HypertyInstance from './HypertyInstance';
 
 import {MessageFactory} from 'service-framework/dist/MessageFactory';
-import {divideURL, isHypertyURL, isURL, isUserURL, generateGUID, getUserIdentityDomain, isBackendServiceURL} from '../utils/utils.js';
+import {divideURL, isHypertyURL, isURL, isUserURL, generateGUID, getUserIdentityDomain, isBackendServiceURL, deepClone} from '../utils/utils.js';
 
 import 'proxy-observe';
 import { WatchingYou } from 'service-framework/dist/Utils';
@@ -328,7 +328,7 @@ class Registry {
     let preAuth = [];
 
     if (dataObject) {
-      preAuth = dataObject.preAuth;
+      preAuth = dataObject.authorise;
     }
     return preAuth;
   }
@@ -417,6 +417,8 @@ class Registry {
     let dataObject = _this.dataObjectList[dataObjectURL];
 
     if (dataObject) {
+      if (!dataObject.subscribers) { dataObject.subscribers = []; }
+
       dataObject.subscribers.push(subscriberURL);
       _this.dataObjectList[dataObjectURL] = dataObject;
     }
@@ -447,13 +449,16 @@ class Registry {
   * @param  {Array}     resources                     dataObject resources
   * @param  {Array}     authorise                     list of pre authorised authorised IDs
   */
-  registerDataObject(identifier, dataObjectschema, dataObjectUrl, dataObjectReporter, resources, addressURL, authorise) {
+  //registerDataObject(identifier, dataObjectschema, dataObjectUrl, dataObjectReporter, resources, addressURL, authorise) {
+  registerDataObject(objectRegistration) {
     let _this = this;
 
+    let registration = deepClone(objectRegistration);
+
     return new Promise(function(resolve, reject) {
 
       let dataScheme = [];
-      let filteredDataScheme = dataObjectUrl.split(':');
+      let filteredDataScheme = registration.url.split(':');
       dataScheme.push(filteredDataScheme[0]);
 
       _this.storageManager.get('registry:DataObjectURLs').then((urlsList) => {
@@ -463,7 +468,7 @@ class Registry {
         }
 
         //update the list with the new elements
-        urlsList[identifier + dataObjectschema + resources + dataObjectReporter] = addressURL.address;
+        urlsList[objectRegistration.name + objectRegistration.schema + objectRegistration.resources + objectRegistration.reporter] = objectRegistration.url;
 
         let p2pHandler;
         let p2pRequester;
@@ -473,59 +478,47 @@ class Registry {
           p2pRequester = runtimeUtils.runtimeDescriptor.p2pRequesterStub;
         }
 
-        let runtime = _this.runtimeURL;
-        let status = 'live';
-
-        //message to register the new data object, within the domain registry
-        let messageValue = {
-          name: identifier,
-          resources: resources,
-          dataSchemes: dataScheme,
-          schema: dataObjectschema,
-          url: dataObjectUrl,
-          expires: _this.expiresTime,
-          reporter: dataObjectReporter,
-          preAuth: authorise,
-          subscribers: [],
-          runtime: runtime,
-          status: status
-        };
+        registration.startingTime = registration.created;
+
+        delete registration.authorise;
+        delete registration.created;
+        delete registration.mutual;
+        delete registration.resume;
+
+        registration.expires = _this.expiresTime;
+        registration.dataSchemes = dataScheme;
 
         if (p2pHandler) {
-          messageValue.p2pHandler = p2pHandler;
-          messageValue.p2pRequester = p2pRequester;
+          registration.p2pHandler = p2pHandler;
+          registration.p2pRequester = p2pRequester;
         }
 
-        if (_this.isInterworkingProtoStub(dataObjectReporter)) {
-          messageValue.interworking = true;
+        if (_this.isInterworkingProtoStub(registration.reporter)) {
+          registration.interworking = true;
         }
 
         let message;
 
-        if (addressURL.newAddress) {
+        if (!registration.resume) {
 
-          console.log('[Registry] registering new data object URL', dataObjectUrl);
+          console.log('[Registry.registerDataObject] registering new data object URL', objectRegistration);
 
-          message = {type: 'create', from: _this.registryURL, to: 'domain://registry.' + _this.registryDomain + '/', body: {value: messageValue, policy: 'policy'}};
+          message = {type: 'create', from: _this.registryURL, to: 'domain://registry.' + _this.registryDomain + '/', body: {value: registration, policy: 'policy'}};
 
         } else {
 
-          console.log('[Registry] registering previously registered data object URL', dataObjectUrl);
-
-          /*messageValue = {name: identifier, resources: resources, dataSchemes: dataScheme, schema: dataObjectschema, url: dataObjectUrl, expires: _this.expiresTime, reporter: dataObjectReporter, preAuth: authorise, subscribers: []};
-
-          message = {type:'create', from: _this.registryURL, to: 'domain://registry.' + _this.registryDomain + '/', body: {value: messageValue, policy: 'policy'}};*/
+          console.log('[Registry.registerDataObject] registering previously registered data object URL', objectRegistration);
 
           message = {
             type: 'update',
             to: 'domain://registry.' + _this.registryDomain + '/',
             from: _this.registryURL,
-            body: {resource: dataObjectUrl, value: {status: 'live'} }
+            body: {resource: objectRegistration.url, value: {status: 'live'} }
           };
 
         }
 
-        _this.dataObjectList[dataObjectUrl] = messageValue;
+        _this.dataObjectList[objectRegistration.url] = objectRegistration;
 
         // step to obtain the list of all URL registered to updated with the new one.
         _this.storageManager.set('registry:DataObjectURLs', 0, urlsList).then(() => {
@@ -538,7 +531,7 @@ class Registry {
           );*/
 
           _this._messageBus.postMessage(message, (reply) => {
-            console.log('[Registry] ===> registerDataObject Reply: ', reply);
+            console.log('[Registry.registerDataObject] ===> registerDataObject Reply: ', reply);
             if (reply.body.code === 200) {
               resolve('ok');
             } else {

dist/minibus.js

@@ -104,6 +104,7 @@ class RuntimeUA {
     } else {
       throw new Error('Check your Runtime Factory because it need the Storage Manager implementation');
     }
+
     if (typeof runtimeFactory.runtimeCapabilities === 'function') {
       this.runtimeCapabilities = runtimeFactory.runtimeCapabilities(this.storageManager);
     } else {