upgrade to eventemitter3 to avoid eventemitter2 module issues

Author: EzraBrooks

package-lock.json

@@ -41,7 +41,7 @@
   "dependencies": {
     "@xmldom/xmldom": "^0.8.0",
     "cbor-js": "^0.1.0",
-    "eventemitter2": "^6.4.0",
+    "eventemitter3": "^5.0.1",
     "object-assign": "^4.0.0",
     "pngparse": "^2.0.0",
     "webworkify": "^1.5.0",

package.json

@@ -6,9 +6,7 @@
 import Topic from '../core/Topic.js';
 import Message from '../core/Message.js';
 import Ros from '../core/Ros.js';
-// workaround for EventEmitter2 module issues
-import pkg from 'eventemitter2';
-const {EventEmitter2} = pkg;
+import {EventEmitter} from 'eventemitter3';
 
 /**
  * An actionlib action client.
@@ -20,7 +18,7 @@ const {EventEmitter2} = pkg;
  *  * 'result' - The result returned from the action server.
  *
  */
-export default class ActionClient extends EventEmitter2 {
+export default class ActionClient extends EventEmitter {
   /**
    * @param {Object} options
    * @param {Ros} options.ros - The ROSLIB.Ros connection handle.

src/actionlib/ActionClient.js

@@ -6,9 +6,7 @@
 
 import Topic from '../core/Topic.js';
 import Ros from '../core/Ros.js';
-// workaround for EventEmitter2 module issues
-import pkg from 'eventemitter2';
-const {EventEmitter2} = pkg;
+import {EventEmitter} from 'eventemitter3';
 
 /**
  * An actionlib action listener.
@@ -20,7 +18,7 @@ const {EventEmitter2} = pkg;
  *
 
  */
-export default class ActionListener extends EventEmitter2 {
+export default class ActionListener extends EventEmitter {
   /**
    * @param {Object} options
    * @param {Ros} options.ros - The ROSLIB.Ros connection handle.

src/actionlib/ActionListener.js

@@ -3,9 +3,7 @@
  * @author Russell Toris - rctoris@wpi.edu
  */
 
-// workaround for EventEmitter2 module issues
-import pkg from 'eventemitter2';
-const {EventEmitter2} = pkg;
+import { EventEmitter } from 'eventemitter3';
 import Message from '../core/Message.js';
 import ActionClient from './ActionClient.js';
 
@@ -15,7 +13,7 @@ import ActionClient from './ActionClient.js';
  * Emits the following events:
  *  * 'timeout' - If a timeout occurred while sending a goal.
  */
-export default class Goal extends EventEmitter2 {
+export default class Goal extends EventEmitter {
   /**
    * @param {Object} options
    * @param {ActionClient} options.actionClient - The ROSLIB.ActionClient to use with this goal.

src/actionlib/Goal.js

@@ -6,9 +6,7 @@
 import Topic from '../core/Topic.js';
 import Message from '../core/Message.js';
 import Ros from '../core/Ros.js';
-// workaround for EventEmitter2 module issues
-import pkg from 'eventemitter2';
-const {EventEmitter2} = pkg;
+import {EventEmitter} from 'eventemitter3';
 
 /**
  * An actionlib action server client.
@@ -17,7 +15,7 @@ const {EventEmitter2} = pkg;
  *  * 'goal' - Goal sent by action client.
  *  * 'cancel' - Action client has canceled the request.
  */
-export default class SimpleActionServer extends EventEmitter2 {
+export default class SimpleActionServer extends EventEmitter {
   /**
    * @param {Object} options
    * @param {Ros} options.ros - The ROSLIB.Ros connection handle.

src/actionlib/SimpleActionServer.js

@@ -3,16 +3,14 @@
  * @author Sebastian Castro - sebastian.castro@picknik.ai
  */
 
-// workaround for EventEmitter2 module issues
-import pkg from 'eventemitter2';
-const {EventEmitter2} = pkg;
+import {EventEmitter} from 'eventemitter3';
 import Ros from '../core/Ros.js';
 
 /**
  * A ROS 2 action client.
  * @template TGoal, TFeedback, TResult
  */
-export default class Action extends EventEmitter2 {
+export default class Action extends EventEmitter {
   /**
    * @param {Object} options
    * @param {Ros} options.ros - The ROSLIB.Ros connection handle.

src/core/Action.js

@@ -16,9 +16,7 @@ import Param from './Param.js';
 import TFClient from '../tf/TFClient.js';
 import ActionClient from '../actionlib/ActionClient.js';
 import SimpleActionServer from '../actionlib/SimpleActionServer.js';
-// workaround for EventEmitter2 module issues
-import pkg from 'eventemitter2';
-const {EventEmitter2} = pkg;
+import { EventEmitter } from 'eventemitter3';
 
 /**
  * Manages connection to the server and all interactions with ROS.
@@ -30,7 +28,7 @@ const {EventEmitter2} = pkg;
  *  * <topicName> - A message came from rosbridge with the given topic name.
  *  * <serviceID> - A service response came from rosbridge with the given ID.
  */
-export default class Ros extends EventEmitter2 {
+export default class Ros extends EventEmitter {
   /**
    * @param {Object} [options]
    * @param {string} [options.url] - The WebSocket URL for rosbridge. Can be specified later with `connect`.
@@ -57,9 +55,6 @@ export default class Ros extends EventEmitter2 {
       this.groovyCompatibility = options.groovyCompatibility;
     }
 
-    // Sets unlimited event listeners.
-    this.setMaxListeners(0);
-
     // begin by checking if a URL was given
     if (options.url) {
       this.connect(options.url);

src/core/Ros.js

@@ -6,15 +6,13 @@
 import ServiceResponse from './ServiceResponse.js';
 import ServiceRequest from './ServiceRequest.js';
 import Ros from './Ros.js';
-// workaround for EventEmitter2 module issues
-import pkg from 'eventemitter2';
-const {EventEmitter2} = pkg;
+import {EventEmitter} from 'eventemitter3';
 
 /**
  * A ROS service client.
  * @template TRequest, TResponse
  */
-export default class Service extends EventEmitter2 {
+export default class Service extends EventEmitter {
   /**
    * @param {Object} options
    * @param {Ros} options.ros - The ROSLIB.Ros connection handle.

src/core/Service.js

@@ -3,9 +3,7 @@
  * @author Brandon Alexander - baalexander@gmail.com
  */
 
-// workaround for EventEmitter2 module issues
-import pkg from 'eventemitter2';
-const {EventEmitter2} = pkg;
+import { EventEmitter } from 'eventemitter3';
 import Message from './Message.js';
 import Ros from './Ros.js';
 
@@ -17,7 +15,7 @@ import Ros from './Ros.js';
  *  * 'message' - The message data from rosbridge.
  * @template T
  */
-export default class Topic extends EventEmitter2 {
+export default class Topic extends EventEmitter {
   /**
    * @param {Object} options
    * @param {Ros} options.ros - The ROSLIB.Ros connection handle.
@@ -132,7 +130,7 @@ export default class Topic extends EventEmitter2 {
    * and remove all subscribe callbacks. To remove a callback, you must
    * explicitly pass the callback function in.
    *
-   * @param {import('eventemitter2').ListenerFn} [callback] - The callback to unregister, if
+   * @param {import('eventemitter3').EventEmitter.ListenerFn} [callback] - The callback to unregister, if
    *     provided and other listeners are registered the topic won't
    *     unsubscribe, just stop emitting to the passed listener.
    */

src/core/Topic.js

@@ -13,14 +13,12 @@ import Topic from '../core/Topic.js';
 import Transform from '../math/Transform.js';
 
 import Ros from '../core/Ros.js';
-// workaround for EventEmitter2 module issues
-import pkg from 'eventemitter2';
-const {EventEmitter2} = pkg;
+import { EventEmitter } from 'eventemitter3';
 
 /**
  * A TF Client that listens to TFs from tf2_web_republisher.
  */
-export default class TFClient extends EventEmitter2 {
+export default class TFClient extends EventEmitter {
   /**
    * @param {Object} options
    * @param {Ros} options.ros - The ROSLIB.Ros connection handle.