Address comments

Author: minggangw

.github/workflows/linux-x64-build-and-test.yml

@@ -80,7 +80,7 @@ jobs:
         # Install any remaining runtime dependencies using rosdep
         rosdep init || true
         rosdep update
-        rosdep install --rosdistro rolling --from-paths /opt/ros/rolling/share --ignore-src -y --skip-keys "cyclonedds fastcdr fastdds iceoryx_binding_c rmw_connextdds rti-connext-dds-7.3.0 urdfdom_headers python3-pyqt6.qtsvg rosidl_buffer_py pybind11"
+        rosdep install --rosdistro rolling --from-paths /opt/ros/rolling/share --ignore-src -y --skip-keys "cyclonedds fastcdr fastdds iceoryx_binding_c rmw_connextdds rti-connext-dds-7.3.0 rti-connext-dds-7.7.0 urdfdom_headers python3-pyqt6.qtsvg rosidl_buffer_py pybind11"
 
     - name: Install test-msgs and mrpt_msgs on Linux
       if: ${{ matrix.ros_distribution != 'rolling' }}

lib/distro.js

@@ -49,13 +49,14 @@ const DistroUtils = {
    * @return {number} Return the rclnodejs distro identifier
    */
   getDistroId: function (distroName) {
-    const dname = distroName ? distroName.toLowerCase() : this.getDistroName();
+    const dname =
+      (distroName || this.getDistroName() || '').toLowerCase() || undefined;
 
-    if (DistroNameIdMap.has(dname)) {
+    if (dname && DistroNameIdMap.has(dname)) {
       return DistroNameIdMap.get(dname);
     }
 
-    // Unrecognized but set ROS_DISTRO → assume future distro; unset → unknown
+    // Unrecognized but provided/resolved distro name → assume future; unset → unknown
     return dname ? DistroId.FUTURE : DistroId.UNKNOWN;
   },
 

test/test-distro.js

@@ -80,7 +80,9 @@ describe('rclnodejs distro utils', function () {
     delete process.env.ROS_DISTRO;
     assert.equal(DistroUtils.getDistroId(), DistroUtils.DistroId.UNKNOWN);
 
-    process.env.ROS_DISTRO = backupEnvar;
+    if (backupEnvar !== undefined) {
+      process.env.ROS_DISTRO = backupEnvar;
+    }
     done();
   });