POC - Living lab payment2

Gruntfile.js

@@ -69,6 +69,7 @@ module.exports = function(grunt) {
           'webinos/core/wrt/lib/webinos.devicestatus.js',
           'webinos/core/wrt/lib/webinos.discovery.js',
           'webinos/core/wrt/lib/webinos.payment.js',
+          'webinos/core/wrt/lib/webinos.payment2.js',
           'webinos/core/wrt/lib/webinos.mediacontent.js',
           'webinos/core/wrt/lib/webinos.corePZinformation.js',
           'webinos/core/wrt/lib/webinos.nfc.js',

webinos/core/api/app2app/lib/app2app.js

@@ -144,7 +144,15 @@
     if (registeredChannels.hasOwnProperty(namespace)) {
       // channel already exists; check if request is from the same session; if yes assume reconnect
       var existingChannel = registeredChannels[namespace];
-      if (sessionId === existingChannel.creator.sessionId && reclaimIfExists) {
+      var mysessionId = sessionId.split("//");
+        mysessionId[mysessionId.length-1] = mysessionId[mysessionId.length-1].split("_")[0];
+        mysessionId = mysessionId.join("//");
+        var mycreatorid = existingChannel.creator.sessionId.split("//");
+        mycreatorid[mycreatorid.length-1] = mycreatorid[mycreatorid.length-1].split("_")[0];
+        mycreatorid = mycreatorid.join("//");
+
+//      if (sessionId === existingChannel.creator.sessionId && reclaimIfExists) {
+      if (mysessionId === mycreatorid && reclaimIfExists) {
         console.log("Reconnecting channel creator to channel with namespace " + namespace);
 
         // refresh client bindings, but keep existing configuration
@@ -250,8 +258,9 @@
       return;
     }
 
+      //ABOT HACK
     // send connect request to channel creator, if callback is provided
-    if (channel.creator.hasRequestCallback) {
+    if (false){//channel.creator.hasRequestCallback) {
       var peerRef = registeredPeers[channel.creator.peerId];
 
       var rpc = this.rpcHandler.createRPC(peerRef, "handleConnectRequest", connectRequest);

webinos/core/api/contacts/lib/contacts_modules.js

@@ -116,7 +116,12 @@ function makeW3Ccontacts(successCB, errorCB)
     var rawContacts;
     var wID = webinos.global.require (webinos.global.pzp.location).getDeviceName();
     var pzpJsonPath = wPath + "/userData/" + wID + ".json";
-    var pzp_json = require(pzpJsonPath);
+    var pzp_json =  {};
+	try{
+		pzp_json = require(pzpJsonPath);
+	}catch(e){
+	}
+
     if ( !pzp_json.abook || pzp_json.abook === "")
     {
         // Is this the first time we search for an abook setting?
@@ -169,6 +174,10 @@ function makeW3Ccontacts(successCB, errorCB)
 
         contacts_l = JSON.parse(JSON.stringify(contacts_l));
         successCB(contacts_l);
+    }else if (fs.existsSync(contactsPath)){ // Return google cached contacts
+        var contacts_g = fs.readFileSync(contactsPath, 'utf8');
+		contacts_g = JSON.parse(contacts_g);
+		successCB(contacts_g);
     }
     else if (errorCB)
         errorCB(this.NOT_FOUND_ERROR);
@@ -372,9 +381,8 @@ this.findContacts = function(filters, successCB, errorCB)
     else //on Android
     {
         console.log("---FIND: android, local");
-        if(!options)
-            options=new Array();
-        LocalContacts.find(fields, successCB, function(){}, options);
+        var options=new Array();
+        LocalContacts.find({}, successCB, function(){}, options);
     }
 };
 

webinos/core/api/deviceorientation/lib/webinos.deviceorientation.android.js

@@ -17,6 +17,12 @@
  ******************************************************************************/
 (function () {
 
+var remove = function(arr, val) {
+    var idx = arr.indexOf(val);
+    if(idx != -1)
+        arr.splice(idx, 1);
+};
+
 var rpcHandler = null;
 
 // device info
@@ -79,11 +85,11 @@ function removeEventListener(params, successCB, errorCB, objectRef) {
     switch (params[1]) {
         case "devicemotion":
             if (listeningToDeviceMotion) {
-                var n = objectRefs["devicemotion"].length;
-                for (var i = 0; i < n; i++) {
-                    if (objectRefs["devicemotion"][i] === params[0])
-                        objectRefs["devicemotion"].splice(i, 1);
-                }
+				var idx = objectRefs["devicemotion"].length;
+				while(idx-- > 0) {
+					if(objectRefs["devicemotion"][idx].rpcId == params[0])
+						objectRefs["devicemotion"].splice(idx, 1);
+				}
                 if (objectRefs["devicemotion"].length === 0) {
                     orientation.unwatchMotion();
                     listeningToDeviceMotion = false;
@@ -92,11 +98,11 @@ function removeEventListener(params, successCB, errorCB, objectRef) {
             break;
         case "deviceorientation":
             if (listeningToDeviceOrientation) {
-                var n = objectRefs["deviceorientation"].length;
-                for (var i = 0; i < n; i++) {
-                    if (objectRefs["deviceorientation"][i] === params[0])
-                        objectRefs["deviceorientation"].splice(i, 1);
-                }
+				var idx = objectRefs["deviceorientation"].length;
+				while(idx-- > 0) {
+					if(objectRefs["deviceorientation"][idx].rpcId == params[0])
+						objectRefs["deviceorientation"].splice(idx, 1);
+				}
                 if (objectRefs["deviceorientation"].length === 0) {
                     orientation.unwatchOrientation();
                     listeningToDeviceOrientation = false;

webinos/core/api/deviceorientation/lib/webinos.deviceorientation.rpc.js

@@ -21,7 +21,11 @@ var RPCWebinosService = require('webinos-jsonrpc2').RPCWebinosService;
 function DeviceOrientationModule(rpcHandler, params) {
     var car, implFile = 'fake';
     var connector = params.connector;
-    if(connector == 'most'){
+    if(process.platform=='android')
+    {
+        implFile = 'android';
+        console.log('connecting to android impl');
+    }else if(connector == 'most'){
         try{
             var vehicleSystem = require('../../vehicle/contrib/vb-con/vc.js');
             vehicleBusAvailable = vehicleSystem.available;
@@ -44,10 +48,7 @@ function DeviceOrientationModule(rpcHandler, params) {
         console.log('connecting to fake data generator');
      }
 
-    if(process.platform=='android')
-	{
-		implFile = 'android';
-	}
+
 
 
 	var implModule = require('./webinos.deviceorientation.' + implFile + '.js');

webinos/core/api/file/lib/fs/local.js

@@ -75,7 +75,9 @@ var links = {}
 var app = express()
 app.get("/media/:ref", function (request, response) {
   if (links[request.params.ref]) {
-    response.sendfile(links[request.params.ref])
+    response.sendfile(links[request.params.ref], function(err){
+        console.log(JSON.stringify(err,null," "));
+    })
   } else {
     response.send(404)
   }
@@ -87,7 +89,7 @@ LocalFileSystem.hostname = null
 LocalFileSystem.init = function (port, hostname) {
   LocalFileSystem.port = port
   LocalFileSystem.hostname = hostname
-  app.listen(port, hostname)
+  app.listen(port, "0.0.0.0")
 }
 
 LocalFileSystem.prototype.type = "local"

webinos/core/api/geolocation/lib/webinos.geolocation.android.js

@@ -30,12 +30,34 @@ try {
   console.log("error loading native android module: " + e);
 }
 
-function getCurrentPosition (params, successCB, errorCB){
+function getCurrentPosition (params, successCB, errorCB, objectRef){
   if(!androidImpl) {
     errorCB(new Error('Android geolocation service not available'));
     return;
   }
-  androidImpl.getCurrentPosition(successCB, errorCB, params);
+  var inCall;
+  var implSuccess = function(position) {
+  	if(inCall) {
+  		successCB(position);
+  		return;
+  	}
+  	/* it will complete asynchronously */
+	var rpc = rpcHandler.createRPC(objectRef, 'onEvent', position);
+	rpcHandler.executeRPC(rpc);
+  };
+  var implErr = function(err) {
+
+  	if(inCall) {
+  		errorCB(err);
+  		return;
+  	}
+  	/* it will complete asynchronously */
+	var rpc = rpcHandler.createRPC(objectRef, 'onError', err);
+	rpcHandler.executeRPC(rpc);
+  };
+  inCall = true;
+  androidImpl.getCurrentPosition(implSuccess, implErr, params);
+  inCall = false;
 }
 
 function watchPosition (args, successCB, errorCB, objectRef) {

webinos/core/api/payment2/dependencies.json

@@ -0,0 +1,4 @@
+{ "root": {
+    "location": "../../" 
+  }
+}