Merge pull request RobotWebTools#250 from sevenbitbyte/SESSION_STATUS

Support status level messages
valleen · Mar 1, 2017 · e899b6d · e899b6d
2 parents ac61584 + 03db06e
commit e899b6d
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 6 deletions.
diff --git a/build/roslib.js b/build/roslib.js
@@ -1623,6 +1623,22 @@ Ros.prototype.callOnConnection = function(message) {
   }
 };
 
+/**
+ * Sends a set_level request to the server
+ *
+ * @param level - Status level (none, error, warning, info)
+ * @param id - Optional: Operation ID to change status level on
+ */
+Ros.prototype.setStatusLevel = function(level, id){
+  var levelMsg = {
+    op: 'set_level',
+    level: level,
+    id: id
+  };
+
+  this.callOnConnection(levelMsg);
+};
+
 /**
  * Retrieves Action Servers in ROS as an array of string
  *
@@ -1875,7 +1891,7 @@ Ros.prototype.getNodes = function(callback, failedCallback) {
 };
 
 /**
-  * Retrieves list subscribed topics, publishing topics and services of a specific node 
+  * Retrieves list subscribed topics, publishing topics and services of a specific node
   *
   * @param node name of the node:
   * @param callback - function with params:
@@ -2269,7 +2285,7 @@ if(typeof bson !== 'undefined'){
  * Events listeners for a WebSocket or TCP socket to a JavaScript
  * ROS Client. Sets up Messages for a given topic to trigger an
  * event on the ROS client.
- * 
+ *
  * @namespace SocketAdapter
  * @private
  */
@@ -2281,6 +2297,12 @@ function SocketAdapter(client) {
       client.emit(message.id, message);
     } else if (message.op === 'call_service') {
       client.emit(message.service, message);
+    } else if(message.op === 'status'){
+      if(message.id){
+        client.emit('status:'+message.id, message);
+      } else {
+        client.emit('status', message);
+      }
     }
   }
 

diff --git a/build/roslib.min.js b/build/roslib.min.js
diff --git a/src/core/Ros.js b/src/core/Ros.js
@@ -134,6 +134,22 @@ Ros.prototype.callOnConnection = function(message) {
   }
 };
 
+/**
+ * Sends a set_level request to the server
+ *
+ * @param level - Status level (none, error, warning, info)
+ * @param id - Optional: Operation ID to change status level on
+ */
+Ros.prototype.setStatusLevel = function(level, id){
+  var levelMsg = {
+    op: 'set_level',
+    level: level,
+    id: id
+  };
+
+  this.callOnConnection(levelMsg);
+};
+
 /**
  * Retrieves Action Servers in ROS as an array of string
  *
@@ -386,7 +402,7 @@ Ros.prototype.getNodes = function(callback, failedCallback) {
 };
 
 /**
-  * Retrieves list subscribed topics, publishing topics and services of a specific node 
+  * Retrieves list subscribed topics, publishing topics and services of a specific node
   *
   * @param node name of the node:
   * @param callback - function with params:

diff --git a/src/core/SocketAdapter.js b/src/core/SocketAdapter.js
@@ -19,7 +19,7 @@ if(typeof bson !== 'undefined'){
  * Events listeners for a WebSocket or TCP socket to a JavaScript
  * ROS Client. Sets up Messages for a given topic to trigger an
  * event on the ROS client.
- * 
+ *
  * @namespace SocketAdapter
  * @private
  */
@@ -31,6 +31,12 @@ function SocketAdapter(client) {
       client.emit(message.id, message);
     } else if (message.op === 'call_service') {
       client.emit(message.service, message);
+    } else if(message.op === 'status'){
+      if(message.id){
+        client.emit('status:'+message.id, message);
+      } else {
+        client.emit('status', message);
+      }
     }
   }