Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 21 additions & 19 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions src/actionlib/ActionClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

var Topic = require('../core/Topic');
var Message = require('../core/Message');
var EventEmitter2 = require('eventemitter2').EventEmitter2;
var EventEmitter = require('eventemitter3').EventEmitter;
var Ros = require('../core/Ros');

/**
Expand All @@ -18,7 +18,7 @@ var Ros = require('../core/Ros');
* * 'result' - The result returned from the action server.
*
*/
class ActionClient extends EventEmitter2 {
class ActionClient extends EventEmitter {
/**
* @param {Object} options
* @param {Ros} options.ros - The ROSLIB.Ros connection handle.
Expand Down
4 changes: 2 additions & 2 deletions src/actionlib/ActionListener.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

var Topic = require('../core/Topic');
var Message = require('../core/Message');
var EventEmitter2 = require('eventemitter2').EventEmitter2;
var EventEmitter = require('eventemitter3').EventEmitter;
var Ros = require('../core/Ros');

/**
Expand All @@ -19,7 +19,7 @@ var Ros = require('../core/Ros');
*

*/
class ActionListener extends EventEmitter2 {
class ActionListener extends EventEmitter {
/**
* @param {Object} options
* @param {Ros} options.ros - The ROSLIB.Ros connection handle.
Expand Down
4 changes: 2 additions & 2 deletions src/actionlib/Goal.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

var Message = require('../core/Message');
var EventEmitter2 = require('eventemitter2').EventEmitter2;
var EventEmitter = require('eventemitter3').EventEmitter;
var ActionClient = require('./ActionClient');

/**
Expand All @@ -13,7 +13,7 @@ var ActionClient = require('./ActionClient');
* Emits the following events:
* * 'timeout' - If a timeout occurred while sending a goal.
*/
class Goal extends EventEmitter2 {
class Goal extends EventEmitter {
/**
* @param {Object} options
* @param {ActionClient} options.actionClient - The ROSLIB.ActionClient to use with this goal.
Expand Down
4 changes: 2 additions & 2 deletions src/actionlib/SimpleActionServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

var Topic = require('../core/Topic');
var Message = require('../core/Message');
var EventEmitter2 = require('eventemitter2').EventEmitter2;
var EventEmitter = require('eventemitter3').EventEmitter;
var Ros = require('../core/Ros');

/**
Expand All @@ -15,7 +15,7 @@ var Ros = require('../core/Ros');
* * 'goal' - Goal sent by action client.
* * 'cancel' - Action client has canceled the request.
*/
class SimpleActionServer extends EventEmitter2 {
class SimpleActionServer extends EventEmitter {
/**
* @param {Object} options
* @param {Ros} options.ros - The ROSLIB.Ros connection handle.
Expand Down
4 changes: 2 additions & 2 deletions src/core/Action.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
* @author Sebastian Castro - sebastian.castro@picknik.ai
*/

var EventEmitter2 = require('eventemitter2').EventEmitter2;
var EventEmitter = require('eventemitter3').EventEmitter;
var Ros = require('../core/Ros');

/**
* A ROS 2 action client.
* @template TGoal, TFeedback, TResult
*/
class Action extends EventEmitter2 {
class Action extends EventEmitter {
/**
* @param {Object} options
* @param {Ros} options.ros - The ROSLIB.Ros connection handle.
Expand Down
7 changes: 2 additions & 5 deletions src/core/Ros.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const Topic = require('./Topic');
const Param = require('./Param');
const { TFClient } = require('../tf');
const { ActionClient, SimpleActionServer } = require('../actionlib');
var EventEmitter2 = require('eventemitter2').EventEmitter2;
var EventEmitter = require('eventemitter3').EventEmitter;

/**
* Manages connection to the server and all interactions with ROS.
Expand All @@ -28,7 +28,7 @@ var EventEmitter2 = require('eventemitter2').EventEmitter2;
* * <topicName> - A message came from rosbridge with the given topic name.
* * <serviceID> - A service response came from rosbridge with the given ID.
*/
class Ros extends EventEmitter2 {
class Ros extends EventEmitter {
/**
* @param {Object} [options]
* @param {string} [options.url] - The WebSocket URL for rosbridge. Can be specified later with `connect`.
Expand All @@ -55,9 +55,6 @@ 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);
Expand Down
4 changes: 2 additions & 2 deletions src/core/Service.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

var ServiceResponse = require('./ServiceResponse');
var ServiceRequest = require('./ServiceRequest');
var EventEmitter2 = require('eventemitter2').EventEmitter2;
var EventEmitter = require('eventemitter3').EventEmitter;
var Ros = require('../core/Ros');

/**
* A ROS service client.
* @template TRequest, TResponse
*/
class Service extends EventEmitter2 {
class Service extends EventEmitter {
/**
* @param {Object} options
* @param {Ros} options.ros - The ROSLIB.Ros connection handle.
Expand Down
6 changes: 3 additions & 3 deletions src/core/Topic.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @author Brandon Alexander - baalexander@gmail.com
*/

var EventEmitter2 = require('eventemitter2').EventEmitter2;
var EventEmitter = require('eventemitter3').EventEmitter;
var Message = require('./Message');
var Ros = require('../core/Ros');

Expand All @@ -15,7 +15,7 @@ var Ros = require('../core/Ros');
* * 'message' - The message data from rosbridge.
* @template T
*/
class Topic extends EventEmitter2 {
class Topic extends EventEmitter {
/**
* @param {Object} options
* @param {Ros} options.ros - The ROSLIB.Ros connection handle.
Expand Down Expand Up @@ -130,7 +130,7 @@ 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.
*/
Expand Down
4 changes: 2 additions & 2 deletions src/tf/TFClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @author David Gossow - dgossow@willowgarage.com
*/

const { EventEmitter2 } = require('eventemitter2');
var EventEmitter = require('eventemitter3').EventEmitter;
var ActionClient = require('../actionlib/ActionClient');
var Goal = require('../actionlib/Goal');

Expand All @@ -18,7 +18,7 @@ var Ros = require('../core/Ros');
/**
* A TF Client that listens to TFs from tf2_web_republisher.
*/
class TFClient extends EventEmitter2 {
class TFClient extends EventEmitter {
/**
* @param {Object} options
* @param {Ros} options.ros - The ROSLIB.Ros connection handle.
Expand Down
2 changes: 1 addition & 1 deletion test/require-shim.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
window.require = function require(path) {
switch (path) {
case 'eventemitter2': return EventEmitter2;
case 'eventemitter3': return EventEmitter3;
case '@xmldom/xmldom': return {DOMParser: DOMParser};
case 'cbor-js': return CBOR;
case '../src/util/cborTypedArrayTags.js': return cborTypedArrayTagger;
Expand Down
37 changes: 0 additions & 37 deletions test/ros.test.js

This file was deleted.