From 7a36642b55c32d97e402d417ac0eef39615f4d2a Mon Sep 17 00:00:00 2001
From: Frederic PAUT <frederic.paut@linux.intel.com>
Date: Thu, 27 Jun 2013 15:10:52 +0200
Subject: [PATCH] dbus service : removing the method
 cloudeebus.BusConnection.removeService (to avoid the confusion with
 cloudeebus.Service.remove)

---
 cloudeebus/cloudeebus.js | 67 ++++++++++++++++++++++++++++--------------------
 cloudeebus/cloudeebus.py |  2 +-
 doc/agent/server.html    |  8 +++++-
 3 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/cloudeebus/cloudeebus.js b/cloudeebus/cloudeebus.js
index 8bc0649..f326f8a 100644
--- a/cloudeebus/cloudeebus.js
+++ b/cloudeebus/cloudeebus.js
@@ -199,21 +199,6 @@ cloudeebus.BusConnection.prototype.addService = function(serviceName) {
 	return promise;
 };
 
-cloudeebus.BusConnection.prototype.removeService = function(serviceName, successCB, errorCB) {
-	var self = this;
-	
-	function busServiceRemovedSuccessCB(serviceName) {
-		// Be sure we are removing the service requested...
-		if (serviceName == self.service.name) {
-			self.service = null;
-			if (successCB)
-				successCB(serviceName);
-		}
-	}
-	
-	cloudeebusService.remove(busServiceRemovedSuccessCB, errorCB);
-};
-
 
 /*****************************************************************************/
 //Generic definition for an agent. An agent need :
@@ -235,28 +220,49 @@ cloudeebus.Service = function(session, busConnection, name) {
 	this.wampSession = session;
 	this.busConnection = busConnection; 
 	this.name = name;
+	this.agents = [];
 	this.isCreated = false;
 	return this;
 };
 
-cloudeebus.Service.prototype.remove = function(successCB, errorCB) {
-	function ServiceRemovedSuccessCB(serviceName) {
-		if (successCB) {
-			try {
-				successCB(serviceName);
+cloudeebus.Service.prototype.remove = function() {
+	var self = this;
+	
+	var promise = new cloudeebus.Promise(function (resolver) {
+		function ServiceRemovedSuccessCB(serviceName) {
+			try { // calling dbus hook object function for un-translated types
+				var result = [ serviceName ];
+				resolver.fulfill(result[0], true);
 			}
 			catch (e) {
-				alert("Exception removing service " + serviceName + " : " + cloudeebus.getError(e));
+				var errorStr = cloudeebus.getError(e);
+				cloudeebus.log("Method callback exception: " + errorStr);
+				resolver.reject(errorStr, true);
+			}		
+		}
+		
+		function ServiceRemovedErrorCB(error) {
+			var errorStr = cloudeebus.getError(error);
+			cloudeebus.log("Error removing service : " + self.name + ", error: " + errorStr);
+			self.promise.resolver.reject(errorStr, true);
+		}
+		
+		for (var idx in self.agents) {
+			if (self.agents[idx]) {
+				cloudeebus.log("Removing agent : " + JSON.stringify(self.agents[idx]));
+				self.delAgent(self.agents[idx]);
 			}
 		}
-	}
+		
+		var arglist = [
+		    self.name
+		    ];
 	
-	var arglist = [
-	    this.name
-	    ];
-
-	// call dbusSend with bus type, destination, object, message and arguments
-	this.wampSession.call("serviceRelease", arglist).then(ServiceRemovedSuccessCB, errorCB);
+		// call dbusSend with bus type, destination, object, message and arguments
+		self.wampSession.call("serviceRelease", arglist).then(ServiceRemovedSuccessCB, ServiceRemovedErrorCB);
+	});
+	
+	return promise;
 };
 
 cloudeebus.Service.prototype._searchMethod = function(ifName, method, objectJS) {
@@ -355,7 +361,12 @@ cloudeebus.Service.prototype._createWrapper = function(agent) {
 };
 
 cloudeebus.Service.prototype.addAgent = function(agent, successCB, errorCB) {
+	var self = this;
+	
 	function ServiceAddAgentSuccessCB(objPath) {
+		self.agents.push(agent);
+		agent.registered = true;
+		cloudeebus.log("Agent pushed : " + JSON.stringify(agent))
 		if (successCB) {
 			try {
 				successCB(objPath);
diff --git a/cloudeebus/cloudeebus.py b/cloudeebus/cloudeebus.py
index 4e046d7..e22ad07 100755
--- a/cloudeebus/cloudeebus.py
+++ b/cloudeebus/cloudeebus.py
@@ -608,7 +608,7 @@ class CloudeebusService:
             self.services.pop(self.srvName)
             return self.srvName
         else:
-            raise Exception(self.srvName + " do not exist")
+            raise Exception(self.srvName + " does not exist")
                    
     @exportRpc
     def serviceAddAgent(self, list):
diff --git a/doc/agent/server.html b/doc/agent/server.html
index f3ea25f..6fa35b7 100644
--- a/doc/agent/server.html
+++ b/doc/agent/server.html
@@ -18,6 +18,7 @@
         <center><h1>cloudeebus</h1></center>
         <br>
 		<textarea style="width:80%" rows="32" id="script">var sampleXml= '<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"\n"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">\n<node><interface name="org.cloudeebus.Sample1"><method name="Release"></method><method name="Add"><arg type="i" name="arg1"/><arg type="i" name="arg2"/><arg type="i" name="result" direction="out"/></method><method name="Variant"><arg type="a{sv}" name="arg1"/><arg type="a{sv}" name="result" direction="out"/></method><signal name="ResultChanged"><arg type="v" name="result"/></signal></interface><interface name="org.cloudeebus.Sample2"><method name="Div"><arg type="d" name="arg1"/><arg type="d" name="arg2"/><arg type="d" name="result" direction="out"/></method></interface></node>';
+
 cloudeebus.log = function(msg) {
   document.getElementById("log").innerHTML += msg + "\n";
 }
@@ -80,6 +81,7 @@ sampleObjectHandler2 = {
 };
 
 function addAgents(service) {
+  gService = service;
   var agent1 = new cloudeebus.Agent(service.name, "/org/cloudeebus/Sample", sampleObjectHandler, sampleXml);
   cloudeebus.log("Adding agent " + agent1.objectPath + " on " + service.name + ", mapped on Javascript object: 'sampleObjectHandler");
   service.addAgent(agent1, logCB, errorCB);
@@ -90,7 +92,11 @@ function addAgents(service) {
 }
 
 function connectSuccess() {
-  cloudeebus.SessionBus().addService("org.cloudeebus.Sample").then(addAgents, errorCB);
+  if (1)
+  	cloudeebus.SessionBus().addService("org.cloudeebus.Sample").then(addAgents, errorCB);
+  else {
+    gService.remove().then(logCB, errorCB);
+  }
 }
 
 cloudeebus.connect("ws://localhost:9003", null, connectSuccess, errorCB);
-- 
2.7.4