Merge pull request #153 from minggangw/fix-issue-148

Add '/' when the namespace doesn't stat with it.

Author: qiuzhong

lib/node.js

@@ -35,6 +35,12 @@ class Node {
     this._services = [];
     this._timers = [];
     this._name = name;
+
+    if (namespace.length === 0) {
+      namespace = '/';
+    } else if (!namespace.startsWith('/')) {
+      namespace = '/' + namespace;
+    }
     this._namespace = namespace;
     this.spinning = false;
   }
@@ -244,14 +250,14 @@ class Node {
    * @return {string}
    */
   name() {
-    return this._name;
+    return rclnodejs.getNodeName(this.handle);
   }
 
   /* Get the namespace of the node.
    * @return {string}
    */
   namespace() {
-    return this._namespace;
+    return rclnodejs.getNamespace(this.handle);
   }
 }
 

src/rcl_bindings.cpp

@@ -593,6 +593,29 @@ NAN_METHOD(ExpandTopicName) {
   info.GetReturnValue().Set(Nan::New<v8::String>(topic).ToLocalChecked());
 }
 
+NAN_METHOD(GetNodeName) {
+  RclHandle* node_handle = RclHandle::Unwrap<RclHandle>(info[0]->ToObject());
+  rcl_node_t* node = reinterpret_cast<rcl_node_t*>(node_handle->ptr());
+  const char * node_name = rcl_node_get_name(node);
+  if (!node_name) {
+    info.GetReturnValue().Set(Nan::Undefined());
+  } else {
+    info.GetReturnValue().Set(Nan::New<v8::String>(node_name).ToLocalChecked());
+  }
+}
+
+NAN_METHOD(GetNamespace) {
+  RclHandle* node_handle = RclHandle::Unwrap<RclHandle>(info[0]->ToObject());
+  rcl_node_t* node = reinterpret_cast<rcl_node_t*>(node_handle->ptr());
+  const char * node_namespace = rcl_node_get_namespace(node);
+  if (!node_namespace) {
+    info.GetReturnValue().Set(Nan::Undefined());
+  } else {
+    info.GetReturnValue().Set(
+        Nan::New<v8::String>(node_namespace).ToLocalChecked());
+  }
+}
+
 const rmw_qos_profile_t* GetQoSProfileFromString(
     const std::string& profile) {
   const rmw_qos_profile_t* qos_profile = nullptr;
@@ -685,6 +708,8 @@ BindingMethod binding_methods[] = {
     {"validateTopicName", ValidateTopicName},
     {"validateNamespace", ValidateNamespace},
     {"expandTopicName", ExpandTopicName},
+    {"getNodeName", GetNodeName},
+    {"getNamespace", GetNamespace},
     {"", nullptr}};
 
 }  // namespace rclnodejs