rticonnextdds-connector 1.1.0 → 1.2.0-rc5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rticonnextdds-connector",
-  "version": "1.1.0",
+  "version": "1.2.0-rc5",
   "description": "RTI Connector for JavaScript",
   "main": "rticonnextdds-connector.js",
   "files": [
@@ -19,6 +19,14 @@
     "ffi-napi": "^3.1.0",
     "sleep": "^6.3.0"
   },
+  "scripts": {
+    "test": "mocha ./test/nodejs/",
+    "test-ci": "mocha ./test/nodejs/ --reporter mocha-junit-reporter",
+    "coverage": "nyc --reporter=clover --reporter=lcov --reporter=text-summary --check-coverage npm run test",
+    "coverage-ci": "nyc --reporter=clover --reporter=lcov --reporter=text-summary --check-coverage npm run test-ci",
+    "lint": "eslint rticonnextdds-connector.js test/nodejs/ --ext .js",
+    "lint-fix": "eslint --fix rticonnextdds-connector.js test/nodejs/ --ext .js"
+  },
   "keywords": [
     "rti",
     "dds",
@@ -33,5 +41,17 @@
   "bugs": {
     "url": "https://github.com/rticommunity/rticonnextdds-connector-js/issues"
   },
-  "homepage": "https://github.com/rticommunity/rticonnextdds-connector-js"
+  "homepage": "https://github.com/rticommunity/rticonnextdds-connector-js",
+  "devDependencies": {
+    "babel-eslint": "^10.1.0",
+    "chai": "^4.3.4",
+    "chai-as-promised": "^7.1.1",
+    "eslint": "^7.29.0",
+    "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.23.4",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^5.1.0",
+    "nyc": "^15.1.0",
+    "sinon": "^10.0.0"
+  }
 }

package/rticonnextdds-connector.js

@@ -17,16 +17,19 @@ const EventEmitter = require('events').EventEmitter
  * The Node.js representation of the RTI_Connector_Options structure within
  * the core.
  *
- * We define it here using the module ref-struct (require above). This allows 
+ * We define it here using the module ref-struct (require above). This allows
  * us to pass it by value into the Core when creating a :class:`Connector` object.
  *
  * @private
  */
-var _ConnectorOptions = StructType({
+const _ConnectorOptions = StructType({
   enable_on_data_event: ref.types.int,
   one_based_sequence_indexing: ref.types.int
 })
 
+// We ignore the loading of the libraries in code coverage since it is
+// not easily testable
+/* istanbul ignore next */
 class _ConnectorBinding {
   constructor () {
     let libDir = ''
@@ -36,50 +39,50 @@ class _ConnectorBinding {
 
     // Obtain the name of the library that contains the Connector native libraries
     if (os.arch() === 'arm64') {
-        if (os.platform() === 'linux') {
-            libDir = 'linux-arm64'
-            libName = 'librtiddsconnector.so'
-        } else {
-            throw new Error('This platform (' + os.platform() + ' ' + os.arch() + ') is not supported')
-        }
-      } else if (os.arch() === 'arm') {
-        if (os.platform() === 'linux') {
-            libDir = 'linux-arm'
-            libName = 'librtiddsconnector.so'
-        } else {
-            throw new Error('This platform (' + os.platform() + ' ' + os.arch() + ') is not supported')
-        }
+      if (os.platform() === 'linux') {
+        libDir = 'linux-arm64'
+        libName = 'librtiddsconnector.so'
+      } else {
+        throw new Error('This platform (' + os.platform() + ' ' + os.arch() + ') is not supported')
+      }
+    } else if (os.arch() === 'arm') {
+      if (os.platform() === 'linux') {
+        libDir = 'linux-arm'
+        libName = 'librtiddsconnector.so'
+      } else {
+        throw new Error('This platform (' + os.platform() + ' ' + os.arch() + ') is not supported')
+      }
     } else {
-        // Note that we are intentionally not checking if os.arch() is x64.
-        // This allows somebody with access to 32-bit libraries to replace them
-        // in the corresponding x64 directory and we will try to load them.
-        // This behaviour is not officially supported.
-        switch (os.platform()) {
+      // Note that we are intentionally not checking if os.arch() is x64.
+      // This allows somebody with access to 32-bit libraries to replace them
+      // in the corresponding x64 directory and we will try to load them.
+      // This behaviour is not officially supported.
+      switch (os.platform()) {
         case 'darwin':
-            libDir = 'osx-x64'
-            libName = 'librtiddsconnector.dylib'
-            break
+          libDir = 'osx-x64'
+          libName = 'librtiddsconnector.dylib'
+          break
         case 'linux':
-            libDir = 'linux-x64'
-            libName = 'librtiddsconnector.so'
-            break
+          libDir = 'linux-x64'
+          libName = 'librtiddsconnector.so'
+          break
         // Windows returns win32 even on 64-bit platforms
         case 'win32':
-            libDir = 'win-x64'
-            libName = 'rtiddsconnector.dll'
-            additionalLib = 'msvcr120.dll'
-            isWindows = true
-            break
+          libDir = 'win-x64'
+          libName = 'rtiddsconnector.dll'
+          additionalLib = 'msvcr120.dll'
+          isWindows = true
+          break
         default:
-            throw new Error(os.platform() + ' not yet supported')
-        }
+          throw new Error(os.platform() + ' not yet supported')
+      }
     }
 
     // Connector is not supported on a (non ARM) 32-bit platform
     // We continue, incase the user has manually replaced the libraries within
     // the directory which we are going to load.
     if (os.arch() === 'ia32') {
-        console.log('Warning: 32-bit ' + os.platform() + ' is not supported')
+      console.log('Warning: 32-bit ' + os.platform() + ' is not supported')
     }
 
     if (additionalLib !== null) {
@@ -92,8 +95,8 @@ class _ConnectorBinding {
 
     // On Windows we need to explicitly load the dependent libraries
     if (isWindows) {
-        ffi.Library(path.join(__dirname, '/rticonnextdds-connector/lib/', libDir, '/', 'nddscore.dll'))
-        ffi.Library(path.join(__dirname, '/rticonnextdds-connector/lib/', libDir, '/', 'nddsc.dll'))
+      ffi.Library(path.join(__dirname, '/rticonnextdds-connector/lib/', libDir, '/', 'nddscore.dll'))
+      ffi.Library(path.join(__dirname, '/rticonnextdds-connector/lib/', libDir, '/', 'nddsc.dll'))
     }
 
     this.library = path.join(__dirname, '/rticonnextdds-connector/lib/', libDir, '/', libName)
@@ -138,13 +141,14 @@ class _ConnectorBinding {
       RTI_Connector_set_max_objects_per_thread: ['int', ['int']],
       RTIDDSConnector_getJSONInstance:['char *', ['pointer', 'string']],
       // This API is only used in the unit tests
-      RTI_Connector_create_test_scenario: ['int', ['pointer', 'int', 'pointer']]
+      RTI_Connector_create_test_scenario: ['int', ['pointer', 'int', 'pointer']],
+      RTI_Connector_get_build_versions: ['int', [ref.refType('char *'), ref.refType('char *')]]
     })
   }
 }
 
 // Create an instance of the connectorBinding class, allowing us to call the FFI'd methods
-var connectorBinding = new _ConnectorBinding()
+const connectorBinding = new _ConnectorBinding()
 
 /**
  * Copies a natively allocated string into a Node.js string and frees the
@@ -222,7 +226,7 @@ class TimeoutError extends Error {
  */
 class DDSError extends Error {
   /**
-   * This error is thrown when an error is encountered from within one of the 
+   * This error is thrown when an error is encountered from within one of the
    * APIs within the *RTI Connext DDS* Core.
    * @private
    */
@@ -236,7 +240,7 @@ class DDSError extends Error {
 }
 
 /**
- * Checks the value returned by the functions in the core for success and 
+ * Checks the value returned by the functions in the core for success and
  * throws the appropriate error on failure.
  *
  * We do not handle DDS_RETCODE_NO_DATA here, since in some operations (those
@@ -318,13 +322,17 @@ function _getAnyValue (getter, connector, inputName, index, fieldName) {
     return !!boolVal.deref()
   } else if (selection === _AnyValueKind.connector_string) {
     const nodeStr = _moveCString(stringVal.deref())
-    // Try to convert the returned string to a JSON object. We can now return
-    // one of two things:
+    // If this is NOT a numeric string, try to convert the returned string to a
+    // JSON object. We can now return one of two things:
     // - An actual string (if the JSON.parse call fails)
     // - A JSON object (if the JSON.parse call succeeds)
-    try {
-      return JSON.parse(nodeStr)
-    } catch (err) {
+    if (isNaN(nodeStr)) {
+      try {
+        return JSON.parse(nodeStr)
+      } catch (err) {
+        return nodeStr
+      }
+    } else {
       return nodeStr
     }
   } else {
@@ -336,7 +344,7 @@ function _getAnyValue (getter, connector, inputName, index, fieldName) {
 /**
  * Provides access to the meta-data contained in samples read by an input.
  *
- * Note: The Infos class is deprecated and should not be used directly. 
+ * Note: The Infos class is deprecated and should not be used directly.
  * Instead, use :meth:`SampleIterator.info`.
  *
  * @private
@@ -363,7 +371,7 @@ class Infos {
   /**
    * Checks if the sample at the given index contains valid data.
    *
-   * @param {number} index - The index of the sample in the :class:`Input`'s 
+   * @param {number} index - The index of the sample in the :class:`Input`'s
    *   queue to check for valid data
    * @returns{boolean} True if the sample contains valid data
    * @private
@@ -399,14 +407,14 @@ class SampleIterator {
   /**
    * A SampleIterator provides access to the data receieved by an :class:`Input`.
    *
-   * The :attr:`Input.samples` attribute implements a :class:`SampleIterator`, 
-   * meaning it can be iterated over. An individual sample can be accessed 
+   * The :attr:`Input.samples` attribute implements a :class:`SampleIterator`,
+   * meaning it can be iterated over. An individual sample can be accessed
    * using :meth:`Input.samples.get`.
    *
    * See :class:`ValidSampleIterator`.
    *
    * This class provides both an iterator and iterable, and is used internally
-   * by the :class:`Samples` class. The following options to iterate over the 
+   * by the :class:`Samples` class. The following options to iterate over the
    * samples exist::
    *
    *   // option 1 - The iterable can be used in for...of loops
@@ -416,11 +424,11 @@ class SampleIterator {
    *   // option 3 - Returns a generator which must be incremented by the application
    *   const iterator = input.samples.iterator()
    *
-   * @property {boolean} validData - Whether or not the current sample 
+   * @property {boolean} validData - Whether or not the current sample
    *   contains valid data.
-   * @property {SampleInfo} infos - The meta-data associated with the 
+   * @property {SampleInfo} infos - The meta-data associated with the
    *   current sample.
-   * @property {pointer} native - A native handle that allows accessing 
+   * @property {pointer} native - A native handle that allows accessing
    *   additional *Connext DDS* APIs in C.
    */
   constructor (input, index) {
@@ -435,10 +443,10 @@ class SampleIterator {
   /**
    * Whether or not this sample contains valid data.
    *
-   * If ``false``, the methods to obtain values of the samples 
-   * (e.g., :meth:`SampleIterator.getNumber`, 
-   * :meth:`SampleIterator.getBoolean`, :meth:`SampleIterator.getJson`, 
-   * :meth:`SampleIterator.getString`) should not be called. To avoid 
+   * If ``false``, the methods to obtain values of the samples
+   * (e.g., :meth:`SampleIterator.getNumber`,
+   * :meth:`SampleIterator.getBoolean`, :meth:`SampleIterator.getJson`,
+   * :meth:`SampleIterator.getString`) should not be called. To avoid
    * this restraint, use a :class:`ValidSampleIterator`.
    * @type {boolean}
    */
@@ -457,17 +465,17 @@ class SampleIterator {
    *
    * * ``'source_timestamp'`` returns an integer representing nanoseconds
    * * ``'reception_timestamp'`` returns an integer representing nanoseconds
-   * * ``'sample_identity'`` or ``'identity'`` returns a JSON object 
+   * * ``'sample_identity'`` or ``'identity'`` returns a JSON object
    *   (see :meth:`Output.write`)
-   * * ``'related_sample_identity'`` returns a JSON object 
+   * * ``'related_sample_identity'`` returns a JSON object
    *   (see :meth:`Output.write`)
-   * * ``'valid_data'`` returns a boolean (equivalent to 
+   * * ``'valid_data'`` returns a boolean (equivalent to
    *   :attr:`SampleIterator.validData`)
    * * ``'view_state'``, returns a string (either "NEW" or "NOT_NEW")
    * * ``'instance_state'``, returns a string (one of "ALIVE", "NOT_ALIVE_DISPOSED" or "NOT_ALIVE_NO_WRITERS")
    * * ``'sample_state'``, returns a string (either "READ" or "NOT_READ")
    *
-   * These fields are documented in `The SampleInfo Structure 
+   * These fields are documented in `The SampleInfo Structure
    * <https://community.rti.com/static/documentation/connext-dds/current/doc/manuals/connext_dds_professional/users_manual/index.htm#users_manual/The_SampleInfo_Structure.htm>`__
    * section in the *RTI Connext DDS Core Libraries User's Manual*.
    *
@@ -482,7 +490,7 @@ class SampleIterator {
    *
    * See :ref:`Accessing the data samples`.
    *
-   * @param {string} [memberName] - The name of the complex member or field 
+   * @param {string} [memberName] - The name of the complex member or field
    *   to obtain.
    * @returns {JSON} The obtained JSON object.
    */
@@ -493,6 +501,11 @@ class SampleIterator {
   /**
    * Gets the value of a numeric field in this sample.
    *
+   * .. note::
+   *   This operation should not be used with values with an aboslute value
+   *   larger than `Number.MAX_SAFE_INTEGER`. See :ref:`Accessing 64-bit integers`
+   *   for more information.
+   *
    * @param {string} fieldName - The name of the field.
    * @returns {number} The numeric value of the field.
    */
@@ -579,7 +592,7 @@ class SampleIterator {
 /**
  * Iterates and provides access to data samples with valid data.
  *
- * This iterator provides the same methods as :class:`SampleIterator`. 
+ * This iterator provides the same methods as :class:`SampleIterator`.
  * It can be obtained using :attr:`Input.samples.validDataIter`.
  * @extends SampleIterator
  *
@@ -619,12 +632,12 @@ class ValidSampleIterator extends SampleIterator {
  */
 class Samples {
   /**
-   * This class provides access to data samples read by an 
-   * :class:`Input` (using either the :meth:`Input.read` 
+   * This class provides access to data samples read by an
+   * :class:`Input` (using either the :meth:`Input.read`
    * or :meth:`Input.take` methods).
    *
-   * This class implements a ``[Symbol.iterator]()`` method, making it an 
-   * iterable. This allows it to be used in ``for... of`` loops, to iterate 
+   * This class implements a ``[Symbol.iterator]()`` method, making it an
+   * iterable. This allows it to be used in ``for... of`` loops, to iterate
    * through available samples::
    *
    *    for (const sample of input.samples) {
@@ -639,12 +652,12 @@ class Samples {
    *
    * The samples returned by these methods may only contain meta-data
    * (see :attr:`SampleIterator.info`). The :attr:`Samples.validDataIter`
-   * iterable only iterates over samples that contain valid data 
+   * iterable only iterates over samples that contain valid data
    * (a :class:`ValidSampleIterator`).
    *
-   * :class:`Samples` and :class:`ValidSampleIterator` both also provide 
-   * generators to the samples, allowing applications to define their own 
-   * iterables (see :meth:`Samples.iterator()` and 
+   * :class:`Samples` and :class:`ValidSampleIterator` both also provide
+   * generators to the samples, allowing applications to define their own
+   * iterables (see :meth:`Samples.iterator()` and
    * :meth:`ValidSampleIterator.iterator()`).
    *
    * ``Samples`` is the type of the property :meth:`Input.samples`.
@@ -652,9 +665,9 @@ class Samples {
    * For more information and examples, see :ref:`Accessing the data samples`.
    *
    * Attributes:
-   *  * length (number) - The number of samples available since the last time 
+   *  * length (number) - The number of samples available since the last time
    *    :meth:`Input.read` or :meth:`Input.take` was called.
-   *  * validDataIter (:class:`ValidSampleIterator`) - The class used to 
+   *  * validDataIter (:class:`ValidSampleIterator`) - The class used to
    *    iterate through the available samples that have valid data.
    */
   constructor (input) {
@@ -664,18 +677,18 @@ class Samples {
   /**
    * Returns an iterator to the data samples, starting at the index specified.
    *
-   * The iterator provides access to all the data samples retrieved by the 
+   * The iterator provides access to all the data samples retrieved by the
    * most recent call to :meth:`Input.read` or :meth:`Input.take`.
    *
-   * This iterator may return samples with invalid data (samples that only 
+   * This iterator may return samples with invalid data (samples that only
    * contain meta-data).
-   * Use :attr:`Samples.validDataIter` to avoid having to check 
+   * Use :attr:`Samples.validDataIter` to avoid having to check
    * :attr:`SampleIterator.validData`.
    *
-   * @param {number} [index] The index of the sample from which the iteration 
+   * @param {number} [index] The index of the sample from which the iteration
    *   should begin. By default, the iterator begins with the first sample.
    *
-   * @returns :class:`SampleIterator` - An iterator to the samples (which 
+   * @returns :class:`SampleIterator` - An iterator to the samples (which
    *   implements both iterable and iterator logic).
    */
   get (index) {
@@ -690,7 +703,7 @@ class Samples {
    *
    * This iterable may return samples with invalid data (samples that only contain
    * meta-data).
-   * Use :attr:`Samples.validDataIter` to avoid having to check 
+   * Use :attr:`Samples.validDataIter` to avoid having to check
    * :attr:`SampleIterator.validData`.
    *
    * Allows for the following syntax::
@@ -735,13 +748,13 @@ class Samples {
    * Returns an iterator to the data samples that contain valid data.
    *
    * The iterator provides access to all the data samples retrieved by the most
-   * recent call to :meth:`Input.read` or :meth:`Input.take`, and skips samples 
+   * recent call to :meth:`Input.read` or :meth:`Input.take`, and skips samples
    * with invalid data (meta-data only).
    *
    * By using this iterator, it is not necessary to check if each sample contains
    * valid data.
    *
-   * @returns {ValidSampleIterator} An iterator to the samples containing valid 
+   * @returns {ValidSampleIterator} An iterator to the samples containing valid
    *   data (which implements both iterable and iterator logic).
    */
   get validDataIter () {
@@ -905,8 +918,8 @@ class Samples {
    * Gets a JSON object with the values of all the fields of this sample.
    *
    * @param {number} index The index of the sample.
-   * @param {string} [memberName] The name of the complex member. The type 
-   *   of the member with name memberName must be an array, sequence, struct, 
+   * @param {string} [memberName] The name of the complex member. The type
+   *   of the member with name memberName must be an array, sequence, struct,
    *   value or union.
    * @returns {JSON} The obtained JSON object.
    *
@@ -949,10 +962,10 @@ class Samples {
   }
 
   /**
-   * Obtains a native handle to the sample, which can be used to access 
+   * Obtains a native handle to the sample, which can be used to access
    * additional *Connext DDS* APIs in C.
    *
-   * @param {number} index The index of the sample for which to obtain 
+   * @param {number} index The index of the sample for which to obtain
    *   the native pointer.
    * @returns {pointer} A native pointer to the sample.
    */
@@ -972,9 +985,9 @@ class Samples {
   /**
    * This method is deprecated, use :meth:`Samples.getJson`.
    *
-   * @param {number} index - The index of the sample for which to obtain 
+   * @param {number} index - The index of the sample for which to obtain
    *   the JSON object.
-   * @param {string} [memberName] - The name of the complex member for 
+   * @param {string} [memberName] - The name of the complex member for
    *   which to obtain the JSON object.
    * @returns {JSON} A JSON object representing the current sample.
    * @private
@@ -1003,14 +1016,14 @@ class SampleInfo {
    *
    * * ``'source_timestamp'`` returns an integer representing nanoseconds
    * * ``'reception_timestamp'`` returns an integer representing nanoseconds
-   * * ``'sample_identity'`` or ``'identity'`` returns a JSON object 
+   * * ``'sample_identity'`` or ``'identity'`` returns a JSON object
    *   (see :meth:`Output.write`)
-   * * ``'related_sample_identity'`` returns a JSON object 
+   * * ``'related_sample_identity'`` returns a JSON object
    *   (see :meth:`Output.write`)
-   * * ``'valid_data'`` returns a boolean (equivalent to 
+   * * ``'valid_data'`` returns a boolean (equivalent to
    *   :attr:`SampleIterator.validData`)
    *
-   * These fields are documented in `The SampleInfo Structure 
+   * These fields are documented in `The SampleInfo Structure
    * <https://community.rti.com/static/documentation/connext-dds/current/doc/manuals/connext_dds_professional/users_manual/index.htm#users_manual/The_SampleInfo_Structure.htm>`__
    * section in the *RTI Connext DDS Core Libraries User's Manual*.
    *
@@ -1043,11 +1056,11 @@ class Input {
    *
    * Attributes:
    *  * connector (:class:`Connector`) - The Connector creates this Input.
-   *  * name (string) - The name of the Input (the name used in 
+   *  * name (string) - The name of the Input (the name used in
    *    :meth:`Connector.getInput`).
-   *  * native (pointer) - A native handle that allows accessing additional 
+   *  * native (pointer) - A native handle that allows accessing additional
    *    *Connext DDS* APIs in C.
-   *  * matchedPublications (JSON) - A JSON object containing information 
+   *  * matchedPublications (JSON) - A JSON object containing information
    *    about all the publications currently matched with this Input.
    */
   constructor (connector, name) {
@@ -1075,8 +1088,8 @@ class Input {
   /**
    * Accesses the samples received by this Input.
    *
-   * This operation performs the same operation as :meth:`Input.take` but 
-   * the samples remain accessible (in the internal queue) after the 
+   * This operation performs the same operation as :meth:`Input.take` but
+   * the samples remain accessible (in the internal queue) after the
    * operation has been called.
    */
   read () {
@@ -1088,7 +1101,7 @@ class Input {
   /**
    * Accesses the samples receieved by this Input.
    *
-   * After calling this method, the samples are accessible using 
+   * After calling this method, the samples are accessible using
    * :meth:`Input.samples`.
    */
   take () {
@@ -1115,18 +1128,18 @@ class Input {
    * .. note::
    *   This operation is asynchronous.
    *
-   * This method waits for the specified timeout (or if no timeout is 
+   * This method waits for the specified timeout (or if no timeout is
    * specified, it waits forever), for a match (or unmatch) to occur.
-   * @param {number} [timeout] The maximum time to wait, in milliseconds. 
+   * @param {number} [timeout] The maximum time to wait, in milliseconds.
    *   By default, infinite.
-   * @throws {TimeoutError} :class:`TimeoutError` will be thrown if the 
+   * @throws {TimeoutError} :class:`TimeoutError` will be thrown if the
    *   timeout expires before any publications are matched.
-   * @returns {Promise} Promise object resolving with the change in the 
-   *   current number of matched outputs. If this is a positive number, 
-   *   the input has matched with new publishers. If it is negative, the 
-   *   input has unmatched from an output. It is possible for multiple 
-   *   matches and/or unmatches to be returned (e.g., 0 could be returned, 
-   *   indicating that the input matched the same number of outputs as it 
+   * @returns {Promise} Promise object resolving with the change in the
+   *   current number of matched outputs. If this is a positive number,
+   *   the input has matched with new publishers. If it is negative, the
+   *   input has unmatched from an output. It is possible for multiple
+   *   matches and/or unmatches to be returned (e.g., 0 could be returned,
+   *   indicating that the input matched the same number of outputs as it
    *   unmatched).
    */
   waitForPublications (timeout) {
@@ -1165,15 +1178,15 @@ class Input {
   /**
    * Returns information about matched publications.
    *
-   * This property returns a JSON array, with each element of the 
+   * This property returns a JSON array, with each element of the
    * array containing information about a matched publication.
    *
-   * Currently the only information contained in this JSON object is 
-   * the publication name of the matched publication. If the matched 
-   * publication doesn't have a name, the name for that specific 
+   * Currently the only information contained in this JSON object is
+   * the publication name of the matched publication. If the matched
+   * publication doesn't have a name, the name for that specific
    * publication will be null.
    *
-   * Note that :class:`Connector` Outputs are automatically assigned 
+   * Note that :class:`Connector` Outputs are automatically assigned
    * a name from the ``data_writer name`` element in the XML configuration.
    *
    * @type {JSON}
@@ -1193,11 +1206,11 @@ class Input {
    * .. note::
    *   This operation is asynchronous.
    *
-   * @param {number} [timeout] The maximum time to wait, in milliseconds. 
+   * @param {number} [timeout] The maximum time to wait, in milliseconds.
    *   By default, infinite.
-   * @throws {TimeoutError} :class:`TimeoutError` will be thrown if the 
+   * @throws {TimeoutError} :class:`TimeoutError` will be thrown if the
    *   timeout expires before data is received.
-   * @returns {Promise} A ``Promise`` which will be resolved once data is 
+   * @returns {Promise} A ``Promise`` which will be resolved once data is
    *   available, or rejected if the timeout expires.
    */
   wait (timeout) {
@@ -1236,17 +1249,17 @@ class Instance {
   /**
    * A data sample.
    *
-   * :class:`Instance` is the type obtained through ``Output.instance`` 
+   * :class:`Instance` is the type obtained through ``Output.instance``
    * and is the object that is published by :meth:`Output.write`.
    *
-   * An Instance has an associated DDS Type, specified in the XML 
-   * configuration, and it allows setting the values for the fields of 
+   * An Instance has an associated DDS Type, specified in the XML
+   * configuration, and it allows setting the values for the fields of
    * the DDS Type.
    *
    * Attributes:
-   *  * ``output`` (:class:`Output`) - The :class:`Output` that owns 
+   *  * ``output`` (:class:`Output`) - The :class:`Output` that owns
    *    this Instance.
-   *  * ``native`` (pointer) - Native handle to this Instance that allows 
+   *  * ``native`` (pointer) - Native handle to this Instance that allows
    *    for additional *Connext DDS Pro* C APIs to be called.
    */
   constructor (output) {
@@ -1256,9 +1269,9 @@ class Instance {
   /**
    * Resets a member to its default value.
    *
-   * The effect is the same as that of :meth:`Output.clearMembers`, except 
+   * The effect is the same as that of :meth:`Output.clearMembers`, except
    * that only one member is cleared.
-   * @param {string} fieldName The name of the field. It can be a complex 
+   * @param {string} fieldName The name of the field. It can be a complex
    *   member or a primitive member.
    */
   clearMember (fieldName) {
@@ -1276,8 +1289,13 @@ class Instance {
   /**
    * Sets a numeric field.
    *
+   * .. note::
+   *   This operation should not be used with values with an aboslute value
+   *   larger than `Number.MAX_SAFE_INTEGER`. See :ref:`Accessing 64-bit integers`
+   *   for more information.
+   *
    * @param {string} fieldName - The name of the field.
-   * @param {number} value - A numeric value, or null, to unset an 
+   * @param {number} value - A numeric value, or null, to unset an
    *   optional member.
    */
   setNumber (fieldName, value) {
@@ -1302,7 +1320,7 @@ class Instance {
    * Sets a boolean field.
    *
    * @param {string} fieldName - The name of the field.
-   * @param {boolean} value - A boolean value, or null, to unset an 
+   * @param {boolean} value - A boolean value, or null, to unset an
    *   optional member.
    */
   setBoolean (fieldName, value) {
@@ -1328,7 +1346,7 @@ class Instance {
    * Sets a string field.
    *
    * @param {string} fieldName - The name of the field.
-   * @param {number} value - A string  value, or null, to unset an 
+   * @param {string|null} value - A string value, or null, to unset an
    *   optional member.
    */
   setString (fieldName, value) {
@@ -1353,20 +1371,20 @@ class Instance {
   /**
    * Sets the member values specified in a JSON object.
    *
-   * The keys in the JSON object are the member names of the DDS Type 
-   * associated with the Output, and the values are the values to set 
+   * The keys in the JSON object are the member names of the DDS Type
+   * associated with the Output, and the values are the values to set
    * for those members.
    *
-   * This method sets the values of those members that are explicitly 
-   * specified in the JSON object. Any member that is not specified in 
+   * This method sets the values of those members that are explicitly
+   * specified in the JSON object. Any member that is not specified in
    * the JSON object will retain its previous value.
    *
-   * To clear members that are not in the JSON object, call 
-   * :meth:`Output.clearMembers` before this method. You can also 
-   * explicitly set any value in the JSON object to *null* to reset that 
+   * To clear members that are not in the JSON object, call
+   * :meth:`Output.clearMembers` before this method. You can also
+   * explicitly set any value in the JSON object to *null* to reset that
    * field to its default value.
    *
-   * @param {JSON} jsonObj - The JSON object containing the keys 
+   * @param {JSON} jsonObj - The JSON object containing the keys
    *   (field names) and values (values for the fields).
    */
   setFromJson (jsonObj) {
@@ -1379,16 +1397,16 @@ class Instance {
   /**
    * Sets the value of fieldName.
    *
-   * The type of the argument ``value`` must correspond with the type of the 
+   * The type of the argument ``value`` must correspond with the type of the
    * field with name ``fieldName`` (as defined in the configuration XML file).
    *
-   * This method is an alternative to 
-   * :meth:`Instance.setNumber`, :meth:`Instance.setString` and 
-   * :meth:`Instance.setBoolean`. The main difference is that it is 
+   * This method is an alternative to
+   * :meth:`Instance.setNumber`, :meth:`Instance.setString` and
+   * :meth:`Instance.setBoolean`. The main difference is that it is
    * type-independent (in that the same method can be used for all fields).
    *
    * @param {string} fieldName The name of the field.
-   * @param {number|boolean|string|null} value The value to set. Note that 
+   * @param {number|boolean|string|null} value The value to set. Note that
    *   ``null`` is used to unset an optional member.
    */
   set (fieldName, value) {
@@ -1417,17 +1435,22 @@ class Instance {
   /**
    * Retrives the value of this instance as a JSON object.
    *
+   * .. note::
+   *   This operation should not be used with values with an aboslute value
+   *   larger than `Number.MAX_SAFE_INTEGER`. See :ref:`Accessing 64-bit integers`
+   *   for more information.
+   *
    * @returns {JSON} The value of this instance as a JSON object.
    */
   getJson () {
     const nativeStr = connectorBinding.api.RTIDDSConnector_getJSONInstance(
-        this.output.connector.native,
-        this.output.name)
+      this.output.connector.native,
+      this.output.name)
     // Now move the native string
     if (nativeStr === null) {
-        throw new Error('Failed to create JSON object of instance')
+      throw new Error('Failed to create JSON object of instance')
     } else {
-        return JSON.parse(_moveCString(nativeStr))
+      return JSON.parse(_moveCString(nativeStr))
     }
   }
 
@@ -1467,15 +1490,15 @@ class Output {
    * To get an Output object, use :meth:`Connector.getOutput`.
    *
    * Attributes:
-   *  * ``instance`` (:class:`Instance`) - The data that is written when 
+   *  * ``instance`` (:class:`Instance`) - The data that is written when
    *    :meth:`Output.write` is called.
-   *  * ``connector`` (:class:`Connector`) - The :class:`Connector` object 
+   *  * ``connector`` (:class:`Connector`) - The :class:`Connector` object
    *    that created this object.
-   *  * ``name`` (str) - The name of this Output (the name used in 
+   *  * ``name`` (str) - The name of this Output (the name used in
    *    :meth:`Connector.getOutput`).
-   *  * ``native`` (pointer) - The native handle that allows accessing 
+   *  * ``native`` (pointer) - The native handle that allows accessing
    *    additional *Connext DDS* APIs in C.
-   *  * ``matchedSubscriptions`` (JSON) - Information about matched 
+   *  * ``matchedSubscriptions`` (JSON) - Information about matched
    *    subscriptions (see below).
    *
    */
@@ -1495,40 +1518,40 @@ class Output {
   /**
    * Publishes the values of the current Instance.
    *
-   * Note that after writing it, the Instance's values remain unchanged. 
-   * If, for the next write, you need to start from scratch, you must 
+   * Note that after writing it, the Instance's values remain unchanged.
+   * If, for the next write, you need to start from scratch, you must
    * first call :meth:`Output.clearMembers`.
    *
-   * This method accepts an optional JSON object as a parameter, which may 
+   * This method accepts an optional JSON object as a parameter, which may
    * specify the parameters to use in the `write` call.
-   * The supported parameters are a subset of those documented in the 
+   * The supported parameters are a subset of those documented in the
    * `Writing Data section <https://community.rti.com/static/documentation/connext-dds/current/doc/manuals/connext_dds_professional/users_manual/index.htm#users_manual/Writing_Data.htm?Highlight=DDS_WriteParams_t>`__
    * of the *RTI Connext DDS Core Libraries User's Manual*. These are:
    *
    * * ``action`` – One of ``write`` (default), ``dispose`` or ``unregister``
-   * * ``source_timestamp`` – An integer representing the total number of 
+   * * ``source_timestamp`` – An integer representing the total number of
    *   nanoseconds
-   * * ``identity`` – A JSON object containing the fields ``writer_guid`` and 
+   * * ``identity`` – A JSON object containing the fields ``writer_guid`` and
    *   ``sequence_number``
-   * * ``related_sample_identity`` – Used for request-reply communications. 
+   * * ``related_sample_identity`` – Used for request-reply communications.
    *   It has the same format as identity
    *
    * @example output.write()
-   * @example output.write({ 
-   *     action: 'dispose', 
-   *     identity: { writer_guid: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16], sequence_number: 1 } 
+   * @example output.write({
+   *     action: 'dispose',
+   *     identity: { writer_guid: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16], sequence_number: 1 }
    * })
    *
    * @param {JSON} [params] [Optional] The optional parameters described above
-   * @throws {TimeoutError} The write method can block under multiple 
-   *   circumstances (see 'Blocking During a write()' in the `Writing Data section 
+   * @throws {TimeoutError} The write method can block under multiple
+   *   circumstances (see 'Blocking During a write()' in the `Writing Data section
    *   <https://community.rti.com/static/documentation/connext-dds/current/doc/manuals/connext_dds_professional/users_manual/index.htm#users_manual/Writing_Data.htm>`__
    *   of the *RTI Connext DDS Core Libraries User's Manual*.)
-   *   If the blocking time exceeds the ``max_blocking_time``, this method 
+   *   If the blocking time exceeds the ``max_blocking_time``, this method
    *   throws :class:`TimeoutError`.
    */
   write (params) {
-    var cStr
+    let cStr
     if (params === undefined) {
       cStr = null
     } else {
@@ -1543,10 +1566,10 @@ class Output {
   /**
    * Resets the values of the members of this :class:`Instance`.
    *
-   * If the member is defined with a *default* attribute in the configuration 
-   * file, it gets that value. Otherwise, numbers are set to 0 and strings are 
+   * If the member is defined with a *default* attribute in the configuration
+   * file, it gets that value. Otherwise, numbers are set to 0 and strings are
    * set to empty. Sequences are cleared and optional members are set to 'null'.
-   * For example, if this Output's type is *ShapeType*, then ``clearMembers()`` 
+   * For example, if this Output's type is *ShapeType*, then ``clearMembers()``
    * sets::
    *  color = 'RED'
    *  shapesize = 30
@@ -1560,7 +1583,7 @@ class Output {
   }
 
   /**
-   * Waits until all matching reliable subscriptions have acknowledged all the 
+   * Waits until all matching reliable subscriptions have acknowledged all the
    * samples that have currently been written.
    *
    * This method only waits if this Output is configured with a reliable QoS.
@@ -1568,13 +1591,13 @@ class Output {
    * .. note::
    *   This operation is asynchronous
    *
-   * @param {timeout} [timeout] The maximum time to wait, in milliseconds. 
+   * @param {timeout} [timeout] The maximum time to wait, in milliseconds.
    *   By default, infinite.
    * @throws {TimeoutError} :class:`TimeoutError` will be thrown if the timeout
-   *   expires before all matching reliable subscriptions acknowledge all the 
+   *   expires before all matching reliable subscriptions acknowledge all the
    *   samples.
-   * @returns {Promise} Promise object which will be rejected if not all matching 
-   *   reliable subscriptions acknowledge all of the samples within the specified 
+   * @returns {Promise} Promise object which will be rejected if not all matching
+   *   reliable subscriptions acknowledge all of the samples within the specified
    *   timeout.
    */
   wait (timeout) {
@@ -1589,10 +1612,14 @@ class Output {
         timeout,
         (err, res) => {
           if (err) {
-            reject(err)
+            return reject(err)
+          } else if (res === _ReturnCodes.ok) {
+            return resolve()
+          } else if (res === _ReturnCodes.timeout) {
+            return reject(new TimeoutError('Timeout error'))
+          } else {
+            return reject(new DDSError('res: ' + res))
           }
-          _checkRetcode(res)
-          resolve()
         }
       )
     })
@@ -1601,21 +1628,21 @@ class Output {
   /**
    * Waits for this Output to match or unmatch a compatible DDS Publication.
    *
-   * This method waits for the specified timeout (or if no timeout is 
+   * This method waits for the specified timeout (or if no timeout is
    * specified, it waits forever), for a match (or unmatch) to occur.
    *
    * .. note::
    *   This operation is asynchronous
    *
-   * @param {number} [timeout] - The maximum time to wait, in milliseconds. 
+   * @param {number} [timeout] - The maximum time to wait, in milliseconds.
    *   By default, infinite.
-   * @throws {TimeoutError} :class:`TimeoutError` will be thrown if the 
+   * @throws {TimeoutError} :class:`TimeoutError` will be thrown if the
    *   timeout expires before a subscription is matched.
-   * @returns {Promise} Promise object resolving with the change in the 
-   *   current number of matched inputs. If this is a positive number, the 
-   *   output has matched with new subscribers. If it is negative, the output 
-   *   has unmatched from a subscription. It is possible for multiple matches 
-   *   and/or unmatches to be returned (e.g., 0 could be returned, indicating 
+   * @returns {Promise} Promise object resolving with the change in the
+   *   current number of matched inputs. If this is a positive number, the
+   *   output has matched with new subscribers. If it is negative, the output
+   *   has unmatched from a subscription. It is possible for multiple matches
+   *   and/or unmatches to be returned (e.g., 0 could be returned, indicating
    *   that the output matched the same number of inputs as it unmatched).
    */
   waitForSubscriptions (timeout) {
@@ -1643,7 +1670,7 @@ class Output {
             } else if (res === _ReturnCodes.timeout) {
               return reject(new TimeoutError('Timeout error'))
             } else {
-              return reject(new DDSError('DDS error'))
+              return reject(new DDSError('res: ' + res))
             }
           }
         )
@@ -1654,14 +1681,14 @@ class Output {
   /**
    * Provides information about matched subscriptions.
    *
-   * This property returns a JSON array, with each element of the array 
+   * This property returns a JSON array, with each element of the array
    * containing information about a matched subscription.
    *
-   * Currently the only information contained in this JSON object is the 
+   * Currently the only information contained in this JSON object is the
    * subscription name of the matched subscription. If the matched subscription
    * doesn't have a name, the name for that specific subscription will be null.
    *
-   * Note that :class:`Connector` Inputs are automatically assigned a name from 
+   * Note that :class:`Connector` Inputs are automatically assigned a name from
    * the ``data_reader name`` element in the XML configuration.
    *
    * @type {JSON}
@@ -1675,6 +1702,7 @@ class Output {
     return JSON.parse(_moveCString(cStr.deref()))
   }
 
+  /* istanbul ignore next */
   // Deprecated, use clearMembers
   clear_members () { // eslint-disable-line camelcase
     return this.clearMembers()
@@ -1685,9 +1713,9 @@ class Output {
  * Loads a configuration and creates its Inputs and Outputs.
  *
  * .. note::
- *   The :class:`Connector` class inherits from 
+ *   The :class:`Connector` class inherits from
  *   `EventEmitter <https://nodejs.org/api/events.html#events_class_eventemitter>`__.
- *   This allows us to support event-based notification for data, using the 
+ *   This allows us to support event-based notification for data, using the
  *   following syntax:
  *
  *   .. code-block:: javascript
@@ -1696,32 +1724,32 @@ class Output {
  *
  *   Please refer to :ref:`Reading data (Input)` for more information.
  *
- * A :class:`Connector` instance loads a configuration file from an XML 
+ * A :class:`Connector` instance loads a configuration file from an XML
  * document. For example::
  *   const connector = new rti.Connector('MyParticipantLibrary::MyParticipant', 'MyExample.xml')
  *
- * After creating it, the :class:`Connector` object's Inputs can be used to 
- * read data, and the Outputs to write data. The methods 
- * :meth:`Connector.getOutput` and :meth:`Connector.getInput` return an 
+ * After creating it, the :class:`Connector` object's Inputs can be used to
+ * read data, and the Outputs to write data. The methods
+ * :meth:`Connector.getOutput` and :meth:`Connector.getInput` return an
  * :class:`Input` and :class:`Output`, respectively.
  *
- * An application can create multiple :class:`Connector` instances for the 
+ * An application can create multiple :class:`Connector` instances for the
  * same or different configurations.
  */
 class Connector extends EventEmitter {
   /**
-   * @arg {string} configName The configuration to load. The configName format 
-   *   is `LibraryName::ParticipantName`, where LibraryName is the name 
-   *   attribute of a ``<domain_participant_library>`` tag, and 
-   *   ParticipantName is the name attribute of a ``<domain_participant>`` tag 
+   * @arg {string} configName The configuration to load. The configName format
+   *   is `LibraryName::ParticipantName`, where LibraryName is the name
+   *   attribute of a ``<domain_participant_library>`` tag, and
+   *   ParticipantName is the name attribute of a ``<domain_participant>`` tag
    *   within that library.
-   * @arg {string} url A URL locating the XML document. It can be a file path 
-   *   (e.g., ``/tmp/my_dds_config.xml``), a string containing the full XML 
+   * @arg {string} url A URL locating the XML document. It can be a file path
+   *   (e.g., ``/tmp/my_dds_config.xml``), a string containing the full XML
    *   document with the following format: ``str://"<dds>...</dds>"``, or a
-   *   combination of multiple files or strings, as explained in the 
+   *   combination of multiple files or strings, as explained in the
    *   `URL Groups <https://community.rti.com/static/documentation/connext-dds/current/doc/manuals/connext_dds_professional/users_manual/index.htm#users_manual/URL_Groups.htm>`__
    *   section of the *Connext DDS Core Libraries User's Manual*.
-   * 
+   *
    */
   constructor (configName, url) {
     super()
@@ -1742,18 +1770,18 @@ class Connector extends EventEmitter {
   }
 
   /**
-   * This method is used internally by the public APIs 
-   * :meth:`Connector.close` and 
+   * This method is used internally by the public APIs
+   * :meth:`Connector.close` and
    * :meth:`Connector.waitForCallbackFinalization`. It should not be used
    * directly by applications.
    *
-   * @param {function} resolve The resolve() callback to call once waitSetBusy 
+   * @param {function} resolve The resolve() callback to call once waitSetBusy
    *   is false.
-   * @param {function} reject The reject() callback to call if we timeout, 
+   * @param {function} reject The reject() callback to call if we timeout,
    *   or if another error occurs.
-   * @param {number} iterations Maximum number of iterations to perform 
+   * @param {number} iterations Maximum number of iterations to perform
    *   before timing out.
-   * @param {boolean} cleanup Whether or not the :class:`Connector` object 
+   * @param {boolean} cleanup Whether or not the :class:`Connector` object
    *   should be deleted once the waitset is no longer busy.
    * @private
    */
@@ -1783,27 +1811,27 @@ class Connector extends EventEmitter {
    * by the :class:`Connector` are no longer in use.
    *
    * .. note::
-   *   This returned promise will be rejected if there are any listeners 
-   *   registered for the ``on_data_available`` event. Ensure that they have 
-   *   all been removed before calling this method using 
+   *   This returned promise will be rejected if there are any listeners
+   *   registered for the ``on_data_available`` event. Ensure that they have
+   *   all been removed before calling this method using
    *   ``connector.removeAllListeners(on_data_available)``.
    *
-   * It is currently only necessary to call this method if you remove all of 
+   * It is currently only necessary to call this method if you remove all of
    * the listeners for the ``on_data_available`` event and at some point in the
-   * future wish to use the same :class:`Connector` object to get notifications 
-   * of new data (via the :meth:`Connector.wait` method, or by re-adding a 
+   * future wish to use the same :class:`Connector` object to get notifications
+   * of new data (via the :meth:`Connector.wait` method, or by re-adding a
    * listener for the ``on_data_available`` event).
    *
-   * This operation does **not** free any resources. It is still necessary to 
-   * call :meth:`Connector.close` when the :class:`Connector` is no longer 
+   * This operation does **not** free any resources. It is still necessary to
+   * call :meth:`Connector.close` when the :class:`Connector` is no longer
    * required.
    *
-   * @argument {number} [timeout] Optional parameter to indicate the timeout 
-   *   of the operation, in seconds. By default, 10s. If this operation does 
-   *   not complete within the specified timeout, the returned Promise will 
+   * @argument {number} [timeout] Optional parameter to indicate the timeout
+   *   of the operation, in seconds. By default, 10s. If this operation does
+   *   not complete within the specified timeout, the returned Promise will
    *   be rejected.
-   * @returns {Promise} A Promise that will be resolved once the resources 
-   *   being used internally by the :class:`Connector` object are no longer 
+   * @returns {Promise} A Promise that will be resolved once the resources
+   *   being used internally by the :class:`Connector` object are no longer
    *   in use.
    */
   waitForCallbackFinalization (timeout) {
@@ -1819,12 +1847,12 @@ class Connector extends EventEmitter {
   /**
    * Frees all the resources created by this :class:`Connector` instance.
    *
-   * @argument {number} [timeout] Optional parameter to indicate the timeout 
-   *   of the operation, in seconds. By default, 10s. If this operation does 
-   *   not complete within the specified timeout, the returned Promise will 
+   * @argument {number} [timeout] Optional parameter to indicate the timeout
+   *   of the operation, in seconds. By default, 10s. If this operation does
+   *   not complete within the specified timeout, the returned Promise will
    *   be rejected.
-   * @returns {Promise} Which resolves once the :class:`Connector` object has 
-   *   been freed. It is only necessary to wait for this promise to resolve 
+   * @returns {Promise} Which resolves once the :class:`Connector` object has
+   *   been freed. It is only necessary to wait for this promise to resolve
    *   if you have attached a listener for the ``on_data_available`` event.
    */
   close (timeout) {
@@ -1851,7 +1879,7 @@ class Connector extends EventEmitter {
   /**
    * Returns the :class:`Input` named inputName.
    *
-   * ``inputName`` identifies a ``<data_reader>`` tag in the configuration 
+   * ``inputName`` identifies a ``<data_reader>`` tag in the configuration
    * loaded by the :class:`Connector`. For example::
    *
    *   const connector = new rti.Connector('MyParticipantLibrary::MyParticipant', 'MyExample.xml')
@@ -1872,7 +1900,7 @@ class Connector extends EventEmitter {
    *       ...
    *     <domain_participant_library>
    *
-   * @param {string} inputName The name of the ``data_reader`` to load, with the 
+   * @param {string} inputName The name of the ``data_reader`` to load, with the
    *   format `SubscriberName::DataReaderName`.
    * @returns {Input} The Input, if it exists.
    */
@@ -1883,7 +1911,7 @@ class Connector extends EventEmitter {
   /**
    * Returns the :class:`Output` named outputName.
    *
-   * ``outputName`` identifies a ``<data_writer>`` tag in the configuration 
+   * ``outputName`` identifies a ``<data_writer>`` tag in the configuration
    * loaded by the :class:`Connector`. For example::
    *
    *   const connector = new rti.Connector('MyParticipantLibrary::MyParticipant', 'MyExample.xml')
@@ -1904,7 +1932,7 @@ class Connector extends EventEmitter {
    *       ...
    *     <domain_participant_library>
    *
-   * @param {string} outputName The name of the ``data_writer`` to load, with 
+   * @param {string} outputName The name of the ``data_writer`` to load, with
    *   the format ``PublisherName::DataWriterName``.
    * @returns {Output} The Output, if it exists.
    */
@@ -1918,11 +1946,11 @@ class Connector extends EventEmitter {
    * .. note::
    *   This operation is asynchronous.
    *
-   * @param {number} timeout The maximum time to wait, in milliseconds. 
+   * @param {number} timeout The maximum time to wait, in milliseconds.
    *   By default, infinite.
-   * @throws {TimeoutError} :class:`TimeoutError` will be thrown if the 
+   * @throws {TimeoutError} :class:`TimeoutError` will be thrown if the
    *   timeout expires before data is received.
-   * @returns {Promise} A ``Promise`` which will be resolved once data 
+   * @returns {Promise} A ``Promise`` which will be resolved once data
    *   is available, or rejected once the timeout expires.
    */
   wait (timeout) {
@@ -1957,17 +1985,17 @@ class Connector extends EventEmitter {
   }
 
   /**
-   * Emits the ``on_data_available`` event when any Inputs within this 
+   * Emits the ``on_data_available`` event when any Inputs within this
    * :class:`Connector` object receive data.
    *
    * .. note::
    *   This operation is asynchronous
    *
-   * This API is used internally to emit the ``on_data_available`` event when 
-   * data is received on any of the Inputs contained within this 
+   * This API is used internally to emit the ``on_data_available`` event when
+   * data is received on any of the Inputs contained within this
    * :class:`Connector` object.
    *
-   * The :class:`Connector` class extends EventEmitter, meaning that callbacks 
+   * The :class:`Connector` class extends EventEmitter, meaning that callbacks
    * can be registered for specific events using the following syntax:
    *
    * .. code-block:: javascript
@@ -1979,9 +2007,9 @@ class Connector extends EventEmitter {
    *    // ...
    *    connector.off('on_data_available', myCallback)
    *
-   * Once the ``on_data_available`` event has fired, either :meth:`Input.read` 
-   * or :meth:`Input.take` should be called on the :class:`Input` that has 
-   * new data. This will prevent ``on_data_available`` from being fired more 
+   * Once the ``on_data_available`` event has fired, either :meth:`Input.read`
+   * or :meth:`Input.take` should be called on the :class:`Input` that has
+   * new data. This will prevent ``on_data_available`` from being fired more
    * than once for the same data.
    *
    * @private
@@ -2067,6 +2095,38 @@ class Connector extends EventEmitter {
   static setMaxObjectsPerThread (value) {
     _checkRetcode(connectorBinding.api.RTI_Connector_set_max_objects_per_thread(value))
   }
+
+  /**
+   * Returns the version of Connector.
+   *
+   * This static method provides the build IDs of the native libraries being used
+   * by Connector, as well as the version of the Connector API.
+   *
+   * .. note::
+   *   This is a static method. It can be called before creating a
+   *   :class:`Connector` instance.
+   *
+   * @returns {string} A string containing information about the version of Connector.
+   */
+  static getVersion () {
+    // Obtain version of Connector from package.json
+    const versionString = require('./package.json').version
+    // Parse numbers out of string
+    const versionNumbers = versionString.split('.')
+    // Now get the build IDs of the native libraries
+    const nativeConnectorVersion = ref.alloc('char *')
+    const nativeCoreCVersion = ref.alloc('char *')
+    _checkRetcode(connectorBinding.api.RTI_Connector_get_build_versions(
+      nativeCoreCVersion,
+      nativeConnectorVersion))
+
+    // Now create the string containing all of the above information
+    let versionStr = 'RTI Connector for JavaScript, version ' +
+        versionNumbers[0] + '.' + versionNumbers[1] + '.' + versionNumbers[2] + '\n'
+    versionStr += ref.readCString(nativeCoreCVersion.deref()) + '\n'
+    versionStr += ref.readCString(nativeConnectorVersion.deref())
+    return versionStr
+  }
 }
 
 // Export the API