Address comments

Author: minggangw

lib/node.js

@@ -861,11 +861,11 @@ class Node extends rclnodejs.ShadowNode {
     if (!(publisher instanceof Publisher)) {
       throw new TypeError('Invalid argument');
     }
-    if (publisher._eventHandlers) {
-      publisher._eventHandlers.forEach((handler) => {
+    if (publisher.events) {
+      publisher.events.forEach((handler) => {
         this._destroyEntity(handler, this._events);
       });
-      publisher._eventHandlers = [];
+      publisher.events = [];
     }
     this._destroyEntity(publisher, this._publishers, false);
   }
@@ -879,11 +879,11 @@ class Node extends rclnodejs.ShadowNode {
     if (!(subscription instanceof Subscription)) {
       throw new TypeError('Invalid argument');
     }
-    if (subscription._eventHandlers) {
-      subscription._eventHandlers.forEach((handler) => {
+    if (subscription.events) {
+      subscription.events.forEach((handler) => {
         this._destroyEntity(handler, this._events);
       });
-      subscription._eventHandlers = [];
+      subscription.events = [];
     }
 
     this._destroyEntity(subscription, this._subscriptions);

lib/publisher.js

@@ -27,8 +27,8 @@ class Publisher extends Entity {
   constructor(handle, typeClass, topic, options, node, eventCallbacks) {
     super(handle, typeClass, options);
     if (node && eventCallbacks) {
-      this._eventHandlers = eventCallbacks.createEventHandlers(this.handle);
-      node._events = node._events.concat(this._eventHandlers);
+      this._events = eventCallbacks.createEventHandlers(this.handle);
+      node._events.push(...this._events);
     }
   }
 
@@ -111,18 +111,26 @@ class Publisher extends Entity {
     return rclnodejs.waitForAllAcked(this._handle, timeout);
   }
 
-  get eventHandlers() {
-    if (!this._eventHandlers) {
+  /**
+   * Get the event handlers for this publisher.
+   * @returns {Array} The array of event handlers for this publisher.
+   */
+  get events() {
+    if (!this._events) {
       throw new Error('Event handlers are not set for this publisher.');
     }
-    return this._eventHandlers;
+    return this._events;
   }
 
-  set eventHandlers(eventHandlers) {
-    if (this._eventHandlers) {
+  /**
+   * Set the event handlers for this publisher.
+   * @param {Array} events - The array of event handlers to be set for this publisher.
+   */
+  set events(events) {
+    if (this._events) {
       throw new Error('Event handlers are already set for this publisher.');
     }
-    this._eventHandlers = eventHandlers;
+    this._events = events;
   }
 }
 

lib/subscription.js

@@ -44,8 +44,8 @@ class Subscription extends Entity {
     this._isRaw = options.isRaw || false;
 
     if (node && eventCallbacks) {
-      this._eventHandlers = eventCallbacks.createEventHandlers(this.handle);
-      node._events = node._events.concat(this._eventHandlers);
+      this._events = eventCallbacks.createEventHandlers(this.handle);
+      node._events.push(...this._events);
     }
   }
 
@@ -152,6 +152,22 @@ class Subscription extends Entity {
   get publisherCount() {
     return rclnodejs.getPublisherCount(this._handle);
   }
+
+  /**
+   * Get the event handlers for this subscription.
+   * @returns {Array} The array of event handlers for this subscription.
+   */
+  get events() {
+    return this._events;
+  }
+
+  /**
+   * Set the event handlers for this subscription.
+   * @param {Array} events - The array of event handlers for this subscription.
+   */
+  set events(events) {
+    this._events = events;
+  }
 }
 
 module.exports = Subscription;