Make AdminClient inherit from Client

Author: milindl

lib/admin.js

@@ -48,7 +48,9 @@ var Client = require('./client');
 var util = require('util');
 var Kafka = require('../librdkafka');
 var LibrdKafkaError = require('./error');
-var shallowCopy = require('./util').shallowCopy;
+var { shallowCopy, bindingVersion } = require('./util');
+
+util.inherits(AdminClient, Client);
 
 /**
  * Create a new AdminClient for making topics, partitions, and more.
@@ -108,7 +110,7 @@ function AdminClient(conf) {
    * for the topic.
    */
 
-  this._client = new Kafka.AdminClient(conf);
+  Client.call(this, conf, Kafka.AdminClient);
   this._isConnected = false;
   this.globalConfig = conf;
 }
@@ -122,6 +124,7 @@ function AdminClient(conf) {
  * Unlike the other connect methods, this one is synchronous.
  */
 AdminClient.prototype.connect = function () {
+  this._client.configureCallbacks(true, this._cb_configs);
   LibrdKafkaError.wrap(this._client.connect(), true);
   this._isConnected = true;
 };
@@ -135,6 +138,9 @@ AdminClient.prototype.connect = function () {
 AdminClient.prototype.disconnect = function () {
   LibrdKafkaError.wrap(this._client.disconnect(), true);
   this._isConnected = false;
+  // The AdminClient doesn't provide a callback. So we can't
+  // wait for completion.
+  this._client.configureCallbacks(false, this._cb_configs);
 };
 
 /**

src/admin.cc

@@ -82,6 +82,9 @@ void AdminClient::Init(v8::Local<v8::Object> exports) {
   tpl->SetClassName(Nan::New("AdminClient").ToLocalChecked());
   tpl->InstanceTemplate()->SetInternalFieldCount(1);
 
+  // Inherited from NodeKafka::Connection
+  Nan::SetPrototypeMethod(tpl, "configureCallbacks", NodeConfigureCallbacks);
+
   // Admin client operations
   Nan::SetPrototypeMethod(tpl, "createTopic", NodeCreateTopic);
   Nan::SetPrototypeMethod(tpl, "deleteTopic", NodeDeleteTopic);