pulsar-client 1.11.0-rc.1 → 1.11.0-rc.3

package/index.d.ts

@@ -30,6 +30,7 @@ export interface ClientConfig {
   tlsValidateHostname?: boolean;
   tlsAllowInsecureConnection?: boolean;
   statsIntervalInSeconds?: number;
+  listenerName?: string;
   log?: (level: LogLevel, file: string, line: number, message: string) => void;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pulsar-client",
-  "version": "1.11.0-rc.1",
+  "version": "1.11.0-rc.3",
   "description": "Pulsar Node.js client",
   "main": "index.js",
   "types": "index.d.ts",

package/src/Client.cc

@@ -40,6 +40,7 @@ static const std::string CFG_TLS_VALIDATE_HOSTNAME = "tlsValidateHostname";
 static const std::string CFG_TLS_ALLOW_INSECURE = "tlsAllowInsecureConnection";
 static const std::string CFG_STATS_INTERVAL = "statsIntervalInSeconds";
 static const std::string CFG_LOG = "log";
+static const std::string CFG_LISTENER_NAME = "listenerName";
 
 LogCallback *Client::logCallback = nullptr;
 
@@ -186,6 +187,11 @@ Client::Client(const Napi::CallbackInfo &info) : Napi::ObjectWrap<Client>(info)
     pulsar_client_configuration_set_stats_interval_in_seconds(cClientConfig.get(), statsIntervalInSeconds);
   }
 
+  if (clientConfig.Has(CFG_LISTENER_NAME) && clientConfig.Get(CFG_LISTENER_NAME).IsString()) {
+    Napi::String listenerName = clientConfig.Get(CFG_LISTENER_NAME).ToString();
+    pulsar_client_configuration_set_listener_name(cClientConfig.get(), listenerName.Utf8Value().c_str());
+  }
+
   try {
     this->cClient = std::shared_ptr<pulsar_client_t>(
         pulsar_client_create(serviceUrl.Utf8Value().c_str(), cClientConfig.get()), pulsar_client_free);

package/src/Reader.cc

@@ -60,17 +60,19 @@ struct ReaderListenerProxyData {
 void ReaderListenerProxy(Napi::Env env, Napi::Function jsCallback, ReaderListenerProxyData *data) {
   Napi::Object msg = Message::NewInstance({}, data->cMessage);
   Reader *reader = data->reader;
-
-  Napi::Value ret = jsCallback.Call({msg, reader->Value()});
-  if (ret.IsPromise()) {
-    Napi::Promise promise = ret.As<Napi::Promise>();
-    Napi::Value thenValue = promise.Get("then");
-    if (thenValue.IsFunction()) {
-      Napi::Function then = thenValue.As<Napi::Function>();
-      Napi::Function callback =
-          Napi::Function::New(env, [data](const Napi::CallbackInfo &info) { data->callback(); });
-      then.Call(promise, {callback});
-      return;
+  // `reader` might be null in certain cases, segmentation fault might happend without this null check.
+  if (reader) {
+    Napi::Value ret = jsCallback.Call({msg, reader->Value()});
+    if (ret.IsPromise()) {
+      Napi::Promise promise = ret.As<Napi::Promise>();
+      Napi::Value thenValue = promise.Get("then");
+      if (thenValue.IsFunction()) {
+        Napi::Function then = thenValue.As<Napi::Function>();
+        Napi::Function callback =
+            Napi::Function::New(env, [data](const Napi::CallbackInfo &info) { data->callback(); });
+        then.Call(promise, {callback});
+        return;
+      }
     }
   }
   data->callback();

package/tests/conf/standalone.conf

@@ -38,6 +38,13 @@ bindAddress=0.0.0.0
 # Hostname or IP address the service advertises to the outside world. If not set, the value of InetAddress.getLocalHost().getHostName() is used.
 advertisedAddress=localhost
 
+# Used to specify multiple advertised listeners for the broker.
+# The value must format as <listener_name>:pulsar://<host>:<port>,
+# multiple listeners should separate with commas.
+# Do not use this configuration with advertisedAddress and brokerServicePort.
+# The Default value is absent means use advertisedAddress and brokerServicePort.
+advertisedListeners=localhost6650:pulsar://localhost:6650,localhost6651:pulsar+ssl://localhost:6651,localhost8443:pulsar+ssl://localhost:8443
+
 # Name of the cluster to which this broker belongs to
 clusterName=standalone
 

package/tests/end_to_end.test.js

@@ -23,15 +23,16 @@ const Pulsar = require('../index');
 (() => {
   describe('End To End', () => {
     test.each([
-      ['pulsar://localhost:6650'],
-      ['pulsar+ssl://localhost:6651'],
-      ['http://localhost:8080'],
-      ['https://localhost:8443'],
-    ])('Produce/Consume to %s', async (serviceUrl) => {
+      { serviceUrl: 'pulsar://localhost:6650', listenerName: undefined },
+      { serviceUrl: 'pulsar+ssl://localhost:6651', listenerName: 'localhost6651' },
+      { serviceUrl: 'http://localhost:8080', listenerName: undefined },
+      { serviceUrl: 'https://localhost:8443', listenerName: 'localhost8443' },
+    ])('Produce/Consume to $serviceUrl', async ({ serviceUrl, listenerName }) => {
       const client = new Pulsar.Client({
         serviceUrl,
         tlsTrustCertsFilePath: `${__dirname}/certificate/server.crt`,
         operationTimeoutSeconds: 30,
+        listenerName,
       });
 
       const topic = 'persistent://public/default/produce-consume';

package/tests/reader.test.js

@@ -130,5 +130,46 @@ const baseUrl = 'http://localhost:8080';
       await reader.close();
       await client.close();
     });
+
+    test('Reader should not throw segmentation fault when create and close', async () => {
+      const NUM_ITS = 1000;
+      const its = Array.from({ length: NUM_ITS }, (_, i) => i);
+
+      const client = new Pulsar.Client({
+        serviceUrl: 'pulsar://localhost:6650',
+      });
+
+      const producer = await client.createProducer({
+        topic: 'persistent://public/default/my-topic',
+        sendTimeoutMs: 30000,
+        batchingEnabled: true,
+      });
+
+      // Send messages
+      for (let i = 0; i < 10; i += 1) {
+        const msg = `my-message-${i}`;
+        producer.send({
+          data: Buffer.from(msg),
+        });
+        console.log(`Sent message: ${msg}`);
+      }
+      await producer.flush();
+
+      await Promise.all(
+        its.map(async () => {
+          const reader = await client.createReader({
+            topic: 'persistent://public/default/my-topic',
+            startMessageId: Pulsar.MessageId.earliest(),
+            listener: (message) => {
+              console.log(message.getData().toString());
+            },
+          });
+          await reader.close();
+        }),
+      );
+      await producer.close();
+      await client.close();
+      expect(true).toBe(true);
+    });
   });
 })();