rticonnextdds-connector 1.2.2 → 1.3.1

package/README.md

@@ -26,31 +26,22 @@ The `examples/nodejs` directory provides several examples:
 ## Dependencies
 
 RTI Connector for JavaScript has the following dependencies, which are also listed in `package.json`:
-* [ref-napi](https://www.npmjs.com/package/ref-napi): turns Buffer instances into "pointers"
-* [ref-struct-napi](https://www.npmjs.com/package/ref-struct-napi): create ABI-compilant "Struct" instances on top of Buffers
-* [ffi-napi](https://www.npmjs.com/package/ffi-napi): used for loading and calling dynamic libraries using pure JavaScript
+* [koffi](https://koffi.dev/): used for loading and calling dynamic libraries using pure JavaScript
 * [events](https://www.npmjs.com/package/events): used for the 'EventEmitter' (legacy implementation of RTI Connector)
 
 Additionally to run the `web_socket` example, [socket.io](https://github.com/Automattic/socket.io) and [OpenLayers](https://openlayers.org) are required.
 
 Additional dependencies are required to run the unit tests and some of the examples. Please see the README files in the appropriate directory.
 
-### Python dependency
-
-Some of the dependencies are shipped as source code and use [node-gyp](https://github.com/nodejs/node-gyp) to be compiled locally. `node-gyp` requires Python 2.7 and does not work with Python 3. The requirements for `node-gyp` can be found at:
-* [unix](https://github.com/nodejs/node-gyp#on-unix)
-* [darwin](https://github.com/nodejs/node-gyp#on-macos)
-* [windows](https://github.com/nodejs/node-gyp#on-windows)
-
 ### C/C++ compiler dependency
 
 The dependency [ref](https://www.npmjs.com/package/ref) is shipped as source code and requires a C++11 compiler.
 
 ## License
 
-RTI Connector for JavaScript and RTI Connector for Python are part of the Connext
-DDS Professional Package. If you have a valid license for the RTI Connext DDS
-Professional Package, such license shall govern your use of RTI Connector for
-Python and RTI Connector for JavaScript. All other use of this software shall
+RTI Connector for JavaScript is part of the Connext
+Professional Package. If you have a valid license for the RTI Connext
+Professional Package, such license shall govern your use of
+RTI Connector for JavaScript. All other use of this software shall
 be governed solely by the terms of RTI’s Software License for Non-Commercial
-Use #4040, included at the top level of the `Connector for Python repository
+Use #4040.

package/README.rst

@@ -34,11 +34,7 @@ Dependencies
 
 RTI Connector for JavaScript has the following dependencies, which are
 also listed in ``package.json``: \*
-`ref-napi <https://www.npmjs.com/package/ref-napi>`__: turns Buffer
-instances into "pointers" \*
-`ref-struct-napi <https://www.npmjs.com/package/ref-struct-napi>`__:
-create ABI-compilant "Struct" instances on top of Buffers \*
-`ffi-napi <https://www.npmjs.com/package/ffi-napi>`__: used for loading
+`koffi <https://koffi.dev/>`__: used for loading
 and calling dynamic libraries using pure JavaScript \*
 `events <https://www.npmjs.com/package/events>`__: used for the
 'EventEmitter' (legacy implementation of RTI Connector)
@@ -50,17 +46,6 @@ Additionally to run the ``web_socket`` example,
 Additional dependencies are required to run the unit tests and some of
 the examples. Please see the README files in the appropriate directory.
 
-Python dependency
-~~~~~~~~~~~~~~~~~
-
-Some of the dependencies are shipped as source code and use
-`node-gyp <https://github.com/nodejs/node-gyp>`__ to be compiled
-locally. ``node-gyp`` requires Python 2.7 and does not work with Python
-3. The requirements for ``node-gyp`` can be found at: \*
-`unix <https://github.com/nodejs/node-gyp#on-unix>`__ \*
-`darwin <https://github.com/nodejs/node-gyp#on-macos>`__ \*
-`windows <https://github.com/nodejs/node-gyp#on-windows>`__
-
 C/C++ compiler dependency
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -70,10 +55,9 @@ source code and requires a C++11 compiler.
 License
 -------
 
-RTI Connector for JavaScript and RTI Connector for Python are part of
-the Connext DDS Professional Package. If you have a valid license for
-the RTI Connext DDS Professional Package, such license shall govern your
-use of RTI Connector for Python and RTI Connector for JavaScript. All
+RTI Connector for JavaScript is part of
+the Connext Professional Package. If you have a valid license for
+the RTI Connext Professional Package, such license shall govern your
+use of RTI Connector for JavaScript. All
 other use of this software shall be governed solely by the terms of
-RTI’s Software License for Non-Commercial Use #4040, included at the top
-level of the \`Connector for Python repository
+RTI’s Software License for Non-Commercial Use #4040.

package/examples/nodejs/simple/writer.js

@@ -6,7 +6,7 @@
 * This code contains trade secrets of Real-Time Innovations, Inc.             *
 ******************************************************************************/
 
-const sleep = require('sleep')
+const msleep = require('util').promisify(setTimeout)
 const path = require('path')
 const rti = require('rticonnextdds-connector')
 const configFile = path.join(__dirname, '/../ShapeExample.xml')
@@ -26,7 +26,7 @@ const run = async () => {
       output.instance.setString('color', 'BLUE')
       output.write()
 
-      sleep.msleep(500)
+      await msleep(500)
     }
 
     console.log('Exiting...')

package/examples/nodejs/web_socket/indexMaps.html

@@ -13,7 +13,7 @@
     <!-- The line below is only needed for old environments like Internet Explorer and Android 4.x -->
     <script src="/socket.io/socket.io.js"></script>
     <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=requestAnimationFrame,Element.prototype.classList,URL"></script>
-    <script src="https://cdn.rawgit.com/openlayers/openlayers.github.io/master/en/v6.0.1/build/ol.js"></script>
+    <script src="https://cdn.rawgit.com/openlayers/openlayers.github.io/main/dist/en/v6.0.1/build/ol.js"></script>
     <style>
       .map {
         width: 100%;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rticonnextdds-connector",
-  "version": "1.2.2",
+  "version": "1.3.1",
   "description": "RTI Connector for JavaScript",
   "main": "rticonnextdds-connector.js",
   "files": [
@@ -14,18 +14,12 @@
   },
   "dependencies": {
     "events": "^3.2.0",
-    "ref-napi": "^3.0.1",
-    "ref-struct-napi": "^1.1.1",
-    "ffi-napi": "^3.1.0",
-    "sleep": "^6.3.0"
+    "koffi": "^2.8.9"
   },
   "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"
+    "test-junit": "mocha ./test/nodejs/ --reporter mocha-junit-reporter",
+    "test-json": "mocha ./test/nodejs/ --reporter json --reporter-option output=test-results.json"
   },
   "keywords": [
     "rti",
@@ -43,15 +37,10 @@
   },
   "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",
+    "mocha": "^10.2.0",
+    "mocha-junit-reporter": "^2.2.0",
     "sinon": "^10.0.0"
   }
 }

package/rticonnextdds-connector.js

@@ -7,25 +7,16 @@
 ******************************************************************************/
 
 const os = require('os')
-const ref = require('ref-napi')
-const ffi = require('ffi-napi')
 const path = require('path')
-const StructType = require('ref-struct-napi')
+const koffi = require('koffi');
 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
- * us to pass it by value into the Core when creating a :class:`Connector` object.
- *
- * @private
- */
-const _ConnectorOptions = StructType({
-  enable_on_data_event: ref.types.int,
-  one_based_sequence_indexing: ref.types.int
-})
+const _ConnectorOptions = koffi.struct('RTI_Connector_Options', {
+  enable_on_data_event: 'int',
+  one_based_sequence_indexing: 'int'
+});
+
+const RTI_HANDLE = koffi.pointer('RTI_HANDLE', koffi.opaque());
 
 // We ignore the loading of the libraries in code coverage since it is
 // not easily testable
@@ -70,7 +61,6 @@ class _ConnectorBinding {
         case 'win32':
           libDir = 'win-x64'
           libName = 'rtiddsconnector.dll'
-          additionalLib = 'vcruntime140.dll'
           isWindows = true
           break
         default:
@@ -85,96 +75,66 @@ class _ConnectorBinding {
       console.log('Warning: 32-bit ' + os.platform() + ' is not supported')
     }
 
-    if (additionalLib !== null) {
-      try {
-        ffi.Library(path.join(__dirname, '/rticonnextdds-connector/lib/', libDir, '/', additionalLib))
-      } catch (_) {
-        // ignore this error and try to run without explicitly loading the VC++ runtime
-      }
-    }
+    this.library = path.join(__dirname, '/rticonnextdds-connector/lib/', libDir, '/', libName)
 
-    // 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'))
-    }
+    this.api = koffi.load(this.library);
 
-    this.library = path.join(__dirname, '/rticonnextdds-connector/lib/', libDir, '/', libName)
     // Obtain FFI'd methods for all of the APIs which we require from the binding,
     // specifying the argument types and return types. If any of the types are
     // not builtin Node types then we have to use the ref module to represent them.
-    this.api = ffi.Library(this.library, {
-      RTI_Connector_new: ['pointer', ['string', 'string', ref.refType(_ConnectorOptions)]],
-      RTI_Connector_delete: ['void', ['pointer']],
-      RTI_Connector_get_datawriter: ['pointer', ['pointer', 'string']],
-      RTI_Connector_get_datareader: ['pointer', ['pointer', 'string']],
-      RTI_Connector_get_native_sample: ['pointer', ['pointer', 'string', 'int']],
-      RTI_Connector_set_number_into_samples: ['int', ['pointer', 'string', 'string', 'double']],
-      RTI_Connector_set_boolean_into_samples: ['int', ['pointer', 'string', 'string', 'int']],
-      RTI_Connector_set_string_into_samples: ['int', ['pointer', 'string', 'string', 'string']],
-      RTI_Connector_clear_member: ['int', ['pointer', 'string', 'string']],
-      RTI_Connector_write: ['int', ['pointer', 'string', 'string']],
-      RTI_Connector_wait_for_acknowledgments: ['int', ['pointer', 'int']],
-      RTI_Connector_read: ['int', ['pointer', 'string']],
-      RTI_Connector_take: ['int', ['pointer', 'string']],
-      RTI_Connector_wait_for_data: ['int', ['pointer', 'int']],
-      RTI_Connector_wait_for_data_on_reader: ['int', ['pointer', 'int']],
-      RTI_Connector_wait_for_matched_publication: ['int', ['pointer', 'int', 'pointer']],
-      RTI_Connector_wait_for_matched_subscription: ['int', ['pointer', 'int', 'pointer']],
-      RTI_Connector_get_matched_subscriptions: ['int', ['pointer', ref.refType('char *')]],
-      RTI_Connector_get_matched_publications: ['int', ['pointer', ref.refType('char *')]],
-      RTI_Connector_clear: ['int', ['pointer', 'string']],
-      RTI_Connector_get_boolean_from_infos: ['int', ['pointer', ref.refType('int'), 'string', 'int', 'string']],
-      RTI_Connector_get_json_from_infos: ['int', ['pointer', 'string', 'int', 'string', ref.refType('char *')]],
-      RTI_Connector_get_sample_count: ['int', ['pointer', 'string', ref.refType('double')]],
-      RTI_Connector_get_number_from_sample: ['int', ['pointer', ref.refType('double'), 'string', 'int', 'string']],
-      RTI_Connector_get_boolean_from_sample: ['int', ['pointer', ref.refType('int'), 'string', 'int', 'string']],
-      RTI_Connector_get_string_from_sample: ['int', ['pointer', ref.refType('char *'), 'string', 'int', 'string']],
-      RTI_Connector_get_any_from_sample: ['int', ['pointer', ref.refType('double'), ref.refType('int'), ref.refType('char *'), ref.refType('int'), 'string', 'int', 'string']],
-      RTI_Connector_get_any_from_info: ['int', ['pointer', ref.refType('double'), ref.refType('int'), ref.refType('char *'), ref.refType('int'), 'string', 'int', 'string']],
-      RTI_Connector_get_json_sample: ['int', ['pointer', 'string', 'int', ref.refType('char *')]],
-      RTI_Connector_get_json_member: ['int', ['pointer', 'string', 'int', 'string', ref.refType('char *')]],
-      RTI_Connector_set_json_instance: ['int', ['pointer', 'string', 'string']],
-      RTI_Connector_get_last_error_message: ['char *', []],
-      RTI_Connector_get_native_instance: ['int', ['pointer', 'string', ref.refType('pointer')]],
-      RTI_Connector_free_string: ['void', ['char *']],
-      RTI_Connector_set_max_objects_per_thread: ['int', ['int']],
-      RTIDDSConnector_getJSONInstance:['char *', ['pointer', 'string']],
+    
+    const RTI_Connector_free_string = this.api.func('RTI_Connector_free_string', 'void', ['char *']);
+    const AllocatedString = koffi.disposable('AllocatedString', 'string', RTI_Connector_free_string);
+    
+    this.RTI_Connector_new = this.api.func('RTI_Connector_new', RTI_HANDLE, ['string', 'string', koffi.pointer(_ConnectorOptions)]);
+      this.RTI_Connector_delete = this.api.func('RTI_Connector_delete', 'void', ['RTI_HANDLE']);
+      this.RTI_Connector_get_datawriter = this.api.func('RTI_Connector_get_datawriter', 'RTI_HANDLE', ['RTI_HANDLE', 'string']);
+      this.RTI_Connector_get_datareader = this.api.func('RTI_Connector_get_datareader', 'RTI_HANDLE', ['RTI_HANDLE', 'string']);
+      this.RTI_Connector_get_native_sample = this.api.func('RTI_Connector_get_native_sample', 'RTI_HANDLE', ['RTI_HANDLE', 'string', 'int']);
+      this.RTI_Connector_set_number_into_samples = this.api.func('RTI_Connector_set_number_into_samples', 'int', ['RTI_HANDLE', 'string', 'string', 'double']);
+      this.RTI_Connector_set_boolean_into_samples = this.api.func('RTI_Connector_set_boolean_into_samples', 'int', ['RTI_HANDLE', 'string', 'string', 'bool']);
+      this.RTI_Connector_set_string_into_samples = this.api.func('RTI_Connector_set_string_into_samples', 'int', ['RTI_HANDLE', 'string', 'string', 'string']);
+      this.RTI_Connector_clear_member = this.api.func('RTI_Connector_clear_member', 'int', ['RTI_HANDLE', 'string', 'string']);
+      this.RTI_Connector_write = this.api.func('RTI_Connector_write', 'int', ['RTI_HANDLE', 'string', 'string']);
+      this.RTI_Connector_wait_for_acknowledgments = this.api.func('RTI_Connector_wait_for_acknowledgments', 'int', ['RTI_HANDLE', 'int']);
+      this.RTI_Connector_read = this.api.func('RTI_Connector_read', 'int', ['RTI_HANDLE', 'string']);
+      this.RTI_Connector_take = this.api.func('RTI_Connector_take', 'int', ['RTI_HANDLE', 'string']);
+      this.RTI_Connector_wait_for_data = this.api.func('RTI_Connector_wait_for_data', 'int', ['RTI_HANDLE', 'int']);
+      this.RTI_Connector_wait_for_data_on_reader = this.api.func('RTI_Connector_wait_for_data_on_reader', 'int', ['RTI_HANDLE', 'int']);
+      this.RTI_Connector_wait_for_matched_publication = this.api.func('RTI_Connector_wait_for_matched_publication', 'int', ['RTI_HANDLE', 'int', koffi.out(koffi.pointer('int'))]);
+      this.RTI_Connector_wait_for_matched_subscription = this.api.func('RTI_Connector_wait_for_matched_subscription', 'int', ['RTI_HANDLE', 'int', koffi.out(koffi.pointer('int'))]);
+      this.RTI_Connector_get_matched_subscriptions = this.api.func('RTI_Connector_get_matched_subscriptions', 'int', ['RTI_HANDLE', koffi.out(koffi.pointer(AllocatedString))]);
+      this.RTI_Connector_get_matched_publications = this.api.func('RTI_Connector_get_matched_publications', 'int', ['RTI_HANDLE', koffi.out(koffi.pointer(AllocatedString))]);
+      this.RTI_Connector_clear = this.api.func('RTI_Connector_clear', 'int', ['RTI_HANDLE', 'string']);
+      this.RTI_Connector_get_boolean_from_infos = this.api.func('RTI_Connector_get_boolean_from_infos', 'int', ['RTI_HANDLE', koffi.out(koffi.pointer('bool')), 'string', 'int', 'string']);
+      this.RTI_Connector_get_json_from_infos = this.api.func('RTI_Connector_get_json_from_infos', 'int', ['RTI_HANDLE', 'string', 'int', 'string', koffi.out(koffi.pointer(AllocatedString))]);
+      this.RTI_Connector_get_sample_count = this.api.func('RTI_Connector_get_sample_count', 'int', ['RTI_HANDLE', 'string', koffi.out(koffi.pointer('double'))]);
+      this.RTI_Connector_get_number_from_sample = this.api.func('RTI_Connector_get_number_from_sample', 'int', ['RTI_HANDLE', koffi.out(koffi.pointer('double')), 'string', 'int', 'string']);
+      this.RTI_Connector_get_boolean_from_sample = this.api.func('RTI_Connector_get_boolean_from_sample', 'int', ['RTI_HANDLE', koffi.out(koffi.pointer('int')), 'string', 'int', 'string']);
+      this.RTI_Connector_get_string_from_sample = this.api.func('RTI_Connector_get_string_from_sample', 'int', ['RTI_HANDLE', koffi.out(koffi.pointer(AllocatedString)), 'string', 'int', 'string']);
+      this.RTI_Connector_get_any_from_sample = this.api.func('RTI_Connector_get_any_from_sample', 'int', ['RTI_HANDLE',koffi.out(koffi.pointer('double')), koffi.out(koffi.pointer('int')), koffi.out(koffi.pointer(AllocatedString)), koffi.out(koffi.pointer('int')), 'string', 'int', 'string']);
+      this.RTI_Connector_get_any_from_info = this.api.func('RTI_Connector_get_any_from_info', 'int', ['RTI_HANDLE', koffi.out(koffi.pointer('double')), koffi.out(koffi.pointer('int')), koffi.out(koffi.pointer(AllocatedString)), koffi.out(koffi.pointer('int')), 'string', 'int', 'string']);
+      this.RTI_Connector_get_json_sample = this.api.func('RTI_Connector_get_json_sample', 'int', ['RTI_HANDLE', 'string', 'int', koffi.out(koffi.pointer(AllocatedString))]);
+      this.RTI_Connector_get_json_member = this.api.func('RTI_Connector_get_json_member', 'int', ['RTI_HANDLE', 'string', 'int', 'string', koffi.out(koffi.pointer(AllocatedString))]);
+      this.RTI_Connector_set_json_instance = this.api.func('RTI_Connector_set_json_instance', 'int', ['RTI_HANDLE', 'string', 'string']);
+      this.RTI_Connector_get_last_error_message = this.api.func('RTI_Connector_get_last_error_message', AllocatedString, []);
+      this.RTI_Connector_get_native_instance = this.api.func('RTI_Connector_get_native_instance', 'int', ['RTI_HANDLE', 'string', koffi.out(koffi.pointer(RTI_HANDLE))]);
+      this.RTIDDSConnector_getJSONInstance = this.api.func('RTIDDSConnector_getJSONInstance', AllocatedString, ['RTI_HANDLE', 'string']);
       // This API is only used in the unit tests
-      RTI_Connector_create_test_scenario: ['int', ['pointer', 'int', 'pointer']],
-      RTI_Connector_get_build_versions: ['int', [ref.refType('char *'), ref.refType('char *')]]
-    })
+      this.RTI_Connector_create_test_scenario = this.api.func('RTI_Connector_create_test_scenario', 'int', ['RTI_HANDLE', 'int', 'RTI_HANDLE']);
+      this.RTI_Connector_get_build_versions = this.api.func('RTI_Connector_get_build_versions', 'int', [koffi.out(koffi.pointer('string')), koffi.out(koffi.pointer('string'))]);
   }
 }
 
 // Create an instance of the connectorBinding class, allowing us to call the FFI'd methods
 const connectorBinding = new _ConnectorBinding()
 
-/**
- * Copies a natively allocated string into a Node.js string and frees the
- * native memory.
- *
- * @param {Buffer} cstring - The string returned by the core
- *
- * @private
- */
-function _moveCString (cstring) {
-  const ret = ref.readCString(cstring)
-  connectorBinding.api.RTI_Connector_free_string(cstring)
-  return ret
-}
-
 /**
  * Obtains the last error message from the *RTI Connext DDS* Core
  * @private
  */
 function _getLastDdsErrorMessage () {
-  const cStr = connectorBinding.api.RTI_Connector_get_last_error_message()
-  if (cStr !== null) {
-    return _moveCString(cStr)
-  } else {
-    return ''
-  }
+  return connectorBinding.RTI_Connector_get_last_error_message()
 }
 
 /**
@@ -298,10 +258,10 @@ function _isNumber (value) {
  * @private
  */
 function _getAnyValue (getter, connector, inputName, index, fieldName) {
-  const numberVal = ref.alloc('double')
-  const boolVal = ref.alloc('int')
-  const stringVal = ref.alloc('char *')
-  let selection = ref.alloc('int')
+  let numberVal = [null]
+  let boolVal = [null]
+  let stringVal = [null]
+  let selection = [null]
   const retcode = getter(
     connector,
     numberVal,
@@ -315,13 +275,13 @@ function _getAnyValue (getter, connector, inputName, index, fieldName) {
   if (retcode === _ReturnCodes.noData) {
     return null
   }
-  selection = selection.deref()
+  selection = selection[0]
   if (selection === _AnyValueKind.connector_number) {
-    return numberVal.deref()
+    return numberVal[0]
   } else if (selection === _AnyValueKind.connector_boolean) {
-    return !!boolVal.deref()
+    return !!boolVal[0]
   } else if (selection === _AnyValueKind.connector_string) {
-    const nodeStr = _moveCString(stringVal.deref())
+    const nodeStr = stringVal[0]
     // 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)
@@ -359,13 +319,13 @@ class Infos {
    * @private
    */
   getLength () {
-    const length = ref.alloc('double')
-    const retcode = connectorBinding.api.RTI_Connector_get_sample_count(
+    let length = [null];
+    const retcode = connectorBinding.RTI_Connector_get_sample_count(
       this.input.connector.native,
       this.input.name,
       length)
     _checkRetcode(retcode)
-    return length.deref()
+    return length[0]
   }
 
   /**
@@ -382,8 +342,8 @@ class Infos {
     } else {
       // Increment index since Lua arrays are 1-indexed
       index += 1
-      const value = ref.alloc('int')
-      const retcode = connectorBinding.api.RTI_Connector_get_boolean_from_infos(
+      let value = [null]
+      const retcode = connectorBinding.RTI_Connector_get_boolean_from_infos(
         this.input.connector.native,
         value,
         this.input.name,
@@ -393,7 +353,7 @@ class Infos {
       if (retcode === _ReturnCodes.noData) {
         return null
       }
-      return value.deref()
+      return value[0]
     }
   }
 }
@@ -428,7 +388,7 @@ class SampleIterator {
    *   contains valid data.
    * @property {SampleInfo} infos - The meta-data associated with the
    *   current sample.
-   * @property {pointer} native - A native handle that allows accessing
+   * @property {RTI_HANDLE} native - A native handle that allows accessing
    *   additional *Connext DDS* APIs in C.
    */
   constructor (input, index) {
@@ -554,9 +514,9 @@ class SampleIterator {
   }
 
   /**
-   * The native pointer to the DynamicData sample.
+   * The native RTI_HANDLE to the DynamicData sample.
    *
-   * @type {pointer}
+   * @type {RTI_HANDLE}
    * @private
    */
   get native () {
@@ -775,8 +735,8 @@ class Samples {
    * @private
    */
   getLength () {
-    const length = ref.alloc('double')
-    const retcode = connectorBinding.api.RTI_Connector_get_sample_count(
+    let length = [null]
+    const retcode = connectorBinding.RTI_Connector_get_sample_count(
       this.input.connector.native,
       this.input.name,
       length)
@@ -784,7 +744,7 @@ class Samples {
     // We use ~~ to convert from double -> int. This is required to allow:
     // for (var i =0; i < input.samples.getLength(); ++i)
     // It works since we are doing a bitwise complement (double not).
-    return ~~length.deref()
+    return ~~length[0]
   }
 
   /**
@@ -804,8 +764,8 @@ class Samples {
     } else {
       // Increment index since C API is based on Lua with 1-based indexes
       index += 1
-      const value = ref.alloc('double')
-      const retcode = connectorBinding.api.RTI_Connector_get_number_from_sample(
+      let value = [null]
+      const retcode = connectorBinding.RTI_Connector_get_number_from_sample(
         this.input.connector.native,
         value,
         this.input.name,
@@ -816,7 +776,7 @@ class Samples {
       if (retcode === _ReturnCodes.noData) {
         return null
       } else {
-        return value.deref()
+        return value[0]
       }
     }
   }
@@ -838,8 +798,8 @@ class Samples {
     } else {
       // Increment index since C API is based on Lua with 1-based indexes
       index += 1
-      const value = ref.alloc('int')
-      const retcode = connectorBinding.api.RTI_Connector_get_boolean_from_sample(
+      let value = [null]
+      const retcode = connectorBinding.RTI_Connector_get_boolean_from_sample(
         this.input.connector.native,
         value,
         this.input.name,
@@ -850,7 +810,7 @@ class Samples {
       if (retcode === _ReturnCodes.noData) {
         return null
       } else {
-        return value.deref()
+        return value[0]
       }
     }
   }
@@ -872,8 +832,8 @@ class Samples {
     } else {
       // Increment index since C API is based on Lua with 1-based indexes
       index += 1
-      const value = ref.alloc('char *')
-      const retcode = connectorBinding.api.RTI_Connector_get_string_from_sample(
+      let value = [null]
+      const retcode = connectorBinding.RTI_Connector_get_string_from_sample(
         this.input.connector.native,
         value,
         this.input.name,
@@ -883,7 +843,7 @@ class Samples {
       if (retcode === _ReturnCodes.noData) {
         return null
       } else {
-        return _moveCString(value.deref())
+        return value[0]
       }
     }
   }
@@ -906,7 +866,7 @@ class Samples {
       throw new TypeError('fieldName must be a string')
     } else {
       return _getAnyValue(
-        connectorBinding.api.RTI_Connector_get_any_from_sample,
+        connectorBinding.RTI_Connector_get_any_from_sample,
         this.input.connector.native,
         this.input.name,
         index,
@@ -931,7 +891,7 @@ class Samples {
     } else {
       // Increment index since Lua arrays are 1-indexed
       index += 1
-      const cStr = ref.alloc('char *')
+      let str = [null]
       let retcode = _ReturnCodes.noData
       // memberName is "optional" - if supplied we will get the JSON object for
       // a specific complex member in the sample
@@ -939,25 +899,25 @@ class Samples {
         if (!_isString(memberName)) {
           throw new TypeError('memberName must be a string')
         } else {
-          retcode = connectorBinding.api.RTI_Connector_get_json_member(
+          retcode = connectorBinding.RTI_Connector_get_json_member(
             this.input.connector.native,
             this.input.name,
             index,
             memberName,
-            cStr)
+            str)
         }
       } else {
-        retcode = connectorBinding.api.RTI_Connector_get_json_sample(
+        retcode = connectorBinding.RTI_Connector_get_json_sample(
           this.input.connector.native,
           this.input.name,
           index,
-          cStr)
+          str)
       }
       _checkRetcode(retcode)
       if (retcode === _ReturnCodes.noData) {
         return null
       }
-      return JSON.parse(_moveCString(cStr.deref()))
+      return JSON.parse(str[0])
     }
   }
 
@@ -966,8 +926,8 @@ class Samples {
    * additional *Connext DDS* APIs in C.
    *
    * @param {number} index The index of the sample for which to obtain
-   *   the native pointer.
-   * @returns {pointer} A native pointer to the sample.
+   *   the native RTI_HANDLE.
+   * @returns {RTI_HANDLE} A native RTI_HANDLE to the sample.
    */
   getNative (index) {
     if (!_isValidIndex(index)) {
@@ -975,7 +935,7 @@ class Samples {
     } else {
       // Increment index since Lua arrays are 1-indexed
       index += 1
-      return connectorBinding.api.RTI_Connector_get_native_sample(
+      return connectorBinding.RTI_Connector_get_native_sample(
         this.input.connector.native,
         this.input.name,
         index)
@@ -1036,7 +996,7 @@ class SampleInfo {
       throw new TypeError('fieldName must be a string')
     } else {
       return _getAnyValue(
-        connectorBinding.api.RTI_Connector_get_any_from_info,
+        connectorBinding.RTI_Connector_get_any_from_info,
         this.input.connector.native,
         this.input.name,
         this.index,
@@ -1058,7 +1018,7 @@ class Input {
    *  * connector (:class:`Connector`) - The Connector creates this Input.
    *  * name (string) - The name of the Input (the name used in
    *    :meth:`Connector.getInput`).
-   *  * native (pointer) - A native handle that allows accessing additional
+   *  * native (RTI_HANDLE) - A native handle that allows accessing additional
    *    *Connext DDS* APIs in C.
    *  * matchedPublications (JSON) - A JSON object containing information
    *    about all the publications currently matched with this Input.
@@ -1066,10 +1026,10 @@ class Input {
   constructor (connector, name) {
     this.connector = connector
     this.name = name
-    this.native = connectorBinding.api.RTI_Connector_get_datareader(
+    this.native = connectorBinding.RTI_Connector_get_datareader(
       this.connector.native,
       this.name)
-    if (this.native.isNull()) {
+    if (this.native == null) {
       throw new Error('Invalid Subscription::DataReader name')
     }
     // We use the '_' since samples is the name of the property and we want
@@ -1093,7 +1053,7 @@ class Input {
    * operation has been called.
    */
   read () {
-    _checkRetcode(connectorBinding.api.RTI_Connector_read(
+    _checkRetcode(connectorBinding.RTI_Connector_read(
       this.connector.native,
       this.name))
   }
@@ -1105,7 +1065,7 @@ class Input {
    * :meth:`Input.samples`.
    */
   take () {
-    _checkRetcode(connectorBinding.api.RTI_Connector_take(
+    _checkRetcode(connectorBinding.RTI_Connector_take(
       this.connector.native,
       this.name))
   }
@@ -1153,8 +1113,8 @@ class Input {
         throw new Error('Can not concurrently wait on the same Input')
       } else {
         this.waitSetBusy = true
-        const currentChangeCount = ref.alloc('int')
-        connectorBinding.api.RTI_Connector_wait_for_matched_publication.async(
+        let currentChangeCount = [null]
+        connectorBinding.RTI_Connector_wait_for_matched_publication.async(
           this.native,
           timeout,
           currentChangeCount,
@@ -1163,7 +1123,7 @@ class Input {
             if (err) {
               return reject(err)
             } else if (res === _ReturnCodes.ok) {
-              return resolve(currentChangeCount.deref())
+              return resolve(currentChangeCount[0])
             } else if (res === _ReturnCodes.timeout) {
               return reject(new TimeoutError('Timeout error'))
             } else {
@@ -1192,12 +1152,12 @@ class Input {
    * @type {JSON}
    */
   get matchedPublications () {
-    const cStr = ref.alloc('char *')
-    const retcode = connectorBinding.api.RTI_Connector_get_matched_publications(
+    let str = [null]
+    const retcode = connectorBinding.RTI_Connector_get_matched_publications(
       this.native,
-      cStr)
+      str)
     _checkRetcode(retcode)
-    return JSON.parse(_moveCString(cStr.deref()))
+    return JSON.parse(str[0])
   }
 
   /**
@@ -1225,7 +1185,7 @@ class Input {
         throw new Error('Can not concurrently wait on the same Input')
       } else {
         this.waitSetBusy = true
-        connectorBinding.api.RTI_Connector_wait_for_data_on_reader.async(
+        connectorBinding.RTI_Connector_wait_for_data_on_reader.async(
           this.native,
           timeout,
           (err, res) => {
@@ -1259,7 +1219,7 @@ class Instance {
    * Attributes:
    *  * ``output`` (:class:`Output`) - The :class:`Output` that owns
    *    this Instance.
-   *  * ``native`` (pointer) - Native handle to this Instance that allows
+   *  * ``native`` (RTI_HANDLE) - Native handle to this Instance that allows
    *    for additional *Connext DDS Pro* C APIs to be called.
    */
   constructor (output) {
@@ -1278,7 +1238,7 @@ class Instance {
     if (!_isString(fieldName)) {
       throw new TypeError('fieldName must be a string')
     } else {
-      const retcode = connectorBinding.api.RTI_Connector_clear_member(
+      const retcode = connectorBinding.RTI_Connector_clear_member(
         this.output.connector.native,
         this.output.name,
         fieldName)
@@ -1308,7 +1268,7 @@ class Instance {
         throw new TypeError('value must be a number')
       }
     } else {
-      _checkRetcode(connectorBinding.api.RTI_Connector_set_number_into_samples(
+      _checkRetcode(connectorBinding.RTI_Connector_set_number_into_samples(
         this.output.connector.native,
         this.output.name,
         fieldName,
@@ -1333,7 +1293,7 @@ class Instance {
         throw new TypeError('value must be a boolean')
       }
     } else {
-      const retcode = connectorBinding.api.RTI_Connector_set_boolean_into_samples(
+      const retcode = connectorBinding.RTI_Connector_set_boolean_into_samples(
         this.output.connector.native,
         this.output.name,
         fieldName,
@@ -1359,7 +1319,7 @@ class Instance {
         throw new TypeError('value must be a boolean')
       }
     } else {
-      const retcode = connectorBinding.api.RTI_Connector_set_string_into_samples(
+      const retcode = connectorBinding.RTI_Connector_set_string_into_samples(
         this.output.connector.native,
         this.output.name,
         fieldName,
@@ -1388,7 +1348,7 @@ class Instance {
    *   (field names) and values (values for the fields).
    */
   setFromJson (jsonObj) {
-    _checkRetcode(connectorBinding.api.RTI_Connector_set_json_instance(
+    _checkRetcode(connectorBinding.RTI_Connector_set_json_instance(
       this.output.connector.native,
       this.output.name,
       JSON.stringify(jsonObj)))
@@ -1443,14 +1403,13 @@ class Instance {
    * @returns {JSON} The value of this instance as a JSON object.
    */
   getJson () {
-    const nativeStr = connectorBinding.api.RTIDDSConnector_getJSONInstance(
+    const result = connectorBinding.RTIDDSConnector_getJSONInstance(
       this.output.connector.native,
       this.output.name)
-    // Now move the native string
-    if (nativeStr === null) {
+    if (result === null) {
       throw new Error('Failed to create JSON object of instance')
     } else {
-      return JSON.parse(_moveCString(nativeStr))
+      return JSON.parse(result)
     }
   }
 
@@ -1468,16 +1427,16 @@ class Instance {
    * The native C object.
    *
    * This property allows accessing additional *Connext DDS* APIs in C.
-   * @type {pointer}
+   * @type {RTI_HANDLE}
    */
   get native () {
-    const nativePointer = ref.alloc('pointer')
-    const retcode = connectorBinding.api.RTI_Connector_get_native_instance(
+    let nativePointer = [null]
+    const retcode = connectorBinding.RTI_Connector_get_native_instance(
       this.output.connector.native,
       this.output.name,
       nativePointer)
     _checkRetcode(retcode)
-    return nativePointer.deref()
+    return nativePointer[0]
   }
 }
 
@@ -1487,6 +1446,7 @@ class Instance {
 class Output {
   /**
    * This class is used to publish data for a DDS Topic.
+   *
    * To get an Output object, use :meth:`Connector.getOutput`.
    *
    * Attributes:
@@ -1496,7 +1456,7 @@ class Output {
    *    that created this object.
    *  * ``name`` (str) - The name of this Output (the name used in
    *    :meth:`Connector.getOutput`).
-   *  * ``native`` (pointer) - The native handle that allows accessing
+   *  * ``native`` (RTI_HANDLE) - The native handle that allows accessing
    *    additional *Connext DDS* APIs in C.
    *  * ``matchedSubscriptions`` (JSON) - Information about matched
    *    subscriptions (see below).
@@ -1505,10 +1465,10 @@ class Output {
   constructor (connector, name) {
     this.connector = connector
     this.name = name
-    this.native = connectorBinding.api.RTI_Connector_get_datawriter(
+    this.native = connectorBinding.RTI_Connector_get_datawriter(
       this.connector.native,
       this.name)
-    if (this.native.isNull()) {
+    if (this.native == null) {
       throw new Error('Invalid Publisher::DataWriter name')
     }
     this.instance = new Instance(this)
@@ -1551,16 +1511,16 @@ class Output {
    *   throws :class:`TimeoutError`.
    */
   write (params) {
-    let cStr
+    let str
     if (params === undefined) {
-      cStr = null
+      str = null
     } else {
-      cStr = JSON.stringify(params)
+      str = JSON.stringify(params)
     }
-    _checkRetcode(connectorBinding.api.RTI_Connector_write(
+    _checkRetcode(connectorBinding.RTI_Connector_write(
       this.connector.native,
       this.name,
-      cStr))
+      str))
   }
 
   /**
@@ -1577,7 +1537,7 @@ class Output {
    *  y = 0
    */
   clearMembers () {
-    _checkRetcode(connectorBinding.api.RTI_Connector_clear(
+    _checkRetcode(connectorBinding.RTI_Connector_clear(
       this.connector.native,
       this.name))
   }
@@ -1607,7 +1567,7 @@ class Output {
       } else if (!_isNumber(timeout)) {
         throw new TypeError('timeout must be a number')
       }
-      connectorBinding.api.RTI_Connector_wait_for_acknowledgments.async(
+      connectorBinding.RTI_Connector_wait_for_acknowledgments.async(
         this.native,
         timeout,
         (err, res) => {
@@ -1655,9 +1615,9 @@ class Output {
       if (this.waitsetBusy) {
         throw new Error('Can not concurrently wait on the same Output')
       } else {
-        const currentChangeCount = ref.alloc('int')
+        let currentChangeCount = [null]
         this.waitsetBusy = true
-        connectorBinding.api.RTI_Connector_wait_for_matched_subscription.async(
+        connectorBinding.RTI_Connector_wait_for_matched_subscription.async(
           this.native,
           timeout,
           currentChangeCount,
@@ -1666,7 +1626,7 @@ class Output {
             if (err) {
               return reject(err)
             } else if (res === _ReturnCodes.ok) {
-              return resolve(currentChangeCount.deref())
+              return resolve(currentChangeCount[0])
             } else if (res === _ReturnCodes.timeout) {
               return reject(new TimeoutError('Timeout error'))
             } else {
@@ -1694,12 +1654,12 @@ class Output {
    * @type {JSON}
    */
   get matchedSubscriptions () {
-    const cStr = ref.alloc('char *')
-    const retcode = connectorBinding.api.RTI_Connector_get_matched_subscriptions(
+    let str = [null]
+    const retcode = connectorBinding.RTI_Connector_get_matched_subscriptions(
       this.native,
-      cStr)
+      str)
     _checkRetcode(retcode)
-    return JSON.parse(_moveCString(cStr.deref()))
+    return JSON.parse(str[0])
   }
 
   /* istanbul ignore next */
@@ -1753,14 +1713,15 @@ class Connector extends EventEmitter {
    */
   constructor (configName, url) {
     super()
-    const options = new _ConnectorOptions()
-    options.one_based_sequence_indexing = 0
-    options.enable_on_data_event = 1
-    this.native = connectorBinding.api.RTI_Connector_new(
+    const options = {
+      one_based_sequence_indexing: 0, 
+      enable_on_data_event: 1
+    };
+    this.native = connectorBinding.RTI_Connector_new(
       configName,
       url,
-      options.ref())
-    if (this.native.isNull()) {
+      options)
+    if (this.native == null) {
       throw new Error('Invalid participant profile, xml path or xml profile')
     }
     this.on('newListener', this.newListenerCallBack)
@@ -1798,7 +1759,7 @@ class Connector extends EventEmitter {
       // is also used by the waitForCallbackFinalization API, and in that case we
       // should not delete anything
       if (cleanup) {
-        connectorBinding.api.RTI_Connector_delete(this.native)
+        connectorBinding.RTI_Connector_delete(this.native)
         this.native = null
       }
       // Call the resolve() callback of the passed promise
@@ -1965,7 +1926,7 @@ class Connector extends EventEmitter {
         throw new Error('Can not concurrently wait on the same Connector object')
       } else {
         this.waitSetBusy = true
-        connectorBinding.api.RTI_Connector_wait_for_data.async(
+        connectorBinding.RTI_Connector_wait_for_data.async(
           this.native,
           timeout,
           (err, res) => {
@@ -2074,26 +2035,15 @@ class Connector extends EventEmitter {
   }
 
   /**
-   * Allows you to increase the number of :class:`Connector` instances that 
-   * can be created.
+   * This method is deprecated since the max_objects_per_thread now grows
+   * dynamically.
    *
-   * The default value is 2048 (which allows for approximately 15 instances 
-   * of :class:`Connector` to be created in a single application). If you need 
-   * to create more than 8 instances of :class:`Connector`, you can increase 
-   * the value from the default.
+   * Note this method is deprecated in the Ironside release. This static method
+   * only exists to not break user's applications which are already using it.
    *
-   * .. note::
-   *   This is a static method. It can only be called before creating a 
-   *   :class:`Connector` instance.
-   *
-   * See `SYSTEM_RESOURCE_LIMITS QoS Policy 
-   * <https://community.rti.com/static/documentation/connext-dds/current/doc/manuals/connext_dds_professional/users_manual/index.htm#users_manual/SYSTEM_RESOURCE_LIMITS_QoS.htm>`__
-   * in the *RTI Connext DDS Core Libraries User's Manual* for more information.
-   *
-   * @param {number} value The value for ``max_objects_per_thread``
+   * @private
    */
   static setMaxObjectsPerThread (value) {
-    _checkRetcode(connectorBinding.api.RTI_Connector_set_max_objects_per_thread(value))
   }
 
   /**
@@ -2114,17 +2064,17 @@ class Connector extends EventEmitter {
     // 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(
+    let nativeConnectorVersion = [null]
+    let nativeCoreCVersion = [null]
+    _checkRetcode(connectorBinding.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())
+    versionStr += nativeCoreCVersion[0] + '\n'
+    versionStr += nativeConnectorVersion[0]
     return versionStr
   }
 }

package/rticonnextdds-connector/README.md

@@ -1,43 +0,0 @@
-rticonnextdds-connector
-=======
-
-*(This repository hosts the common Connector native library and shouldn't be cloned.
-See the **[Python](https://github.com/rticommunity/rticonnextdds-connector-py)** or
-**[JavaScript](https://github.com/rticommunity/rticonnextdds-connector-js)** bindings.)*
-
-### RTI Connector for Connext DDS 6.1.0 - Getting Started
-RTI Connext DDS is a software connectivity framework for real-time distributed applications. 
-It uses the publish-subscribe communications model to make data distribution efficient and robust. 
-At its core is the world’s leading ultra-high performance, distributed networking databus.
-
-RTI Connector is a family of simplified APIs for publishing and subscribing to 
-the Connext DDS Databus in programming languages such as Python and JavaScript.
-
-*Connector* was created to quickly and easily develop demos
-and proofs of concept. It can be useful for anybody who needs
-a quick way to script tests and interact with Connext DDS using different scripting languages.
-
-*Connector* can be used to quickly create tests for your distributed system and, thanks
-to the binding with scripting languages and the use of XML, to easily integrate
-with many other available technologies.
-
-The *Connector* library is provided in binary form for selected architectures.
-Scripting language bindings and examples are provided in source format.
-
-### Language Support
-
- * **[Python](https://github.com/rticommunity/rticonnextdds-connector-py)** (Fully supported)
- * **[JavaScript](https://github.com/rticommunity/rticonnextdds-connector-js)** (Fully supported)
- * **[C#](https://github.com/rticommunity/rticonnextdds-connector-cs)** (Experimental support only)
- * **[Go](https://github.com/rticommunity/rticonnextdds-connector-go)** (Experimental support only)
- * **[Lua (through RTI Prototyper)](https://community.rti.com/downloads/experimental/rti-prototyper-with-lua)** (Experimental support only)
- * **[C](https://github.com/rticommunity/rticonnextdds-connector/tree/master/examples/lua_c_integration)** (Experimental support only)
-
-### Support
-If you have questions, use the [RTI Community Forum](https://community.rti.com/forums/technical-questions).
-
-### License
-
-(For Python and JavaScript, a different license in their respective repositories applies.)
-
-This software is an experimental ("pre-production") product. The Software is provided "as is," with no warranty of any type, including any warranty for fitness for any purpose. RTI is under no obligation to maintain or support the software. RTI shall not be liable for any incidental or consequential damages arising out of the use or inability to use the software.