Merge pull request RobotWebTools#48 from OTL/add_service_fail_callback

Add service fail callback
k-aguete · Oct 7, 2013 · cc42fee · cc42fee
2 parents a00fc0d + 791844a
commit cc42fee
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/build/roslib.js b/build/roslib.js
@@ -432,7 +432,7 @@ ROSLIB.Ros.prototype.connect = function(url) {
       if (message.op === 'publish') {
         that.emit(message.topic, message.msg);
       } else if (message.op === 'service_response') {
-        that.emit(message.id, message.values);
+        that.emit(message.id, message);
       }
     }
 
@@ -611,14 +611,21 @@ ROSLIB.Service = function(options) {
  * @param request - the ROSLIB.ServiceRequest to send
  * @param callback - function with params:
  *   * response - the response from the service request
+ * @param failedCallback - the callback function when the service call failed (optional)
  */
-ROSLIB.Service.prototype.callService = function(request, callback) {
+ROSLIB.Service.prototype.callService = function(request, callback, failedCallback) {
   this.ros.idCounter++;
   var serviceCallId = 'call_service:' + this.name + ':' + this.ros.idCounter;
 
-  this.ros.once(serviceCallId, function(data) {
-    var response = new ROSLIB.ServiceResponse(data);
-    callback(response);
+  this.ros.once(serviceCallId, function(message) {
+    if (message.result !== undefined && message.result === false) {
+      if (typeof failedCallback === 'function') {
+        failedCallback();
+      }
+    } else {
+      var response = new ROSLIB.ServiceResponse(message.values);
+      callback(response);
+    }
   });
 
   var requestValues = [];

diff --git a/build/roslib.min.js b/build/roslib.min.js
diff --git a/src/core/Ros.js b/src/core/Ros.js
@@ -118,7 +118,7 @@ ROSLIB.Ros.prototype.connect = function(url) {
       if (message.op === 'publish') {
         that.emit(message.topic, message.msg);
       } else if (message.op === 'service_response') {
-        that.emit(message.id, message.values);
+        that.emit(message.id, message);
       }
     }
 

diff --git a/src/core/Service.js b/src/core/Service.js
@@ -24,14 +24,21 @@ ROSLIB.Service = function(options) {
  * @param request - the ROSLIB.ServiceRequest to send
  * @param callback - function with params:
  *   * response - the response from the service request
+ * @param failedCallback - the callback function when the service call failed (optional)
  */
-ROSLIB.Service.prototype.callService = function(request, callback) {
+ROSLIB.Service.prototype.callService = function(request, callback, failedCallback) {
   this.ros.idCounter++;
   var serviceCallId = 'call_service:' + this.name + ':' + this.ros.idCounter;
 
-  this.ros.once(serviceCallId, function(data) {
-    var response = new ROSLIB.ServiceResponse(data);
-    callback(response);
+  this.ros.once(serviceCallId, function(message) {
+    if (message.result !== undefined && message.result === false) {
+      if (typeof failedCallback === 'function') {
+        failedCallback();
+      }
+    } else {
+      var response = new ROSLIB.ServiceResponse(message.values);
+      callback(response);
+    }
   });
 
   var requestValues = [];