pulsar-client 1.9.0 → 1.10.0

package/.github/workflows/ci-build-release-napi.yml

@@ -41,6 +41,8 @@ jobs:
           - arm64
         nodejs:
           - 18
+        python:
+          - "3.10"
     steps:
       - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.nodejs }}
@@ -48,7 +50,12 @@ jobs:
         with:
           node-version: ${{ matrix.nodejs }}
           cache: 'npm'
-
+          
+      - name: Use Python ${{ matrix.python }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python }}
+          
       - name: Cache Dependencies
         id: cache-dependencies
         uses: actions/cache@v3
@@ -64,20 +71,10 @@ jobs:
             echo "ARCH=${{ matrix.arch }}" >> $GITHUB_ENV
           fi
 
-      - name: Build CPP dependencies lib
-        if: steps.cache-dependencies.outputs.cache-hit != 'true'
-        run: |
-          export ARCH=${{ env.ARCH }}
-          pkg/mac/build-cpp-deps-lib.sh
-
-      - name: Build CPP lib
-        if: steps.cache-pulsar.outputs.cache-hit != 'true'
-        run: |
-          export ARCH=${{ env.ARCH }}
-          pkg/mac/build-cpp-lib.sh
-
       - name: Build Node binaries lib
         run: |
+          export ARCH=${{ env.ARCH }}
+          pkg/mac/download-cpp-client.sh
           npm install --ignore-scripts
           npx node-pre-gyp configure --target_arch=${{ matrix.arch }}
           npx node-pre-gyp build --target_arch=${{ matrix.arch }}
@@ -162,6 +159,8 @@ jobs:
           - x86
         nodejs:
           - 18
+        python:
+          - "3.10"
     steps:
       - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.nodejs }}
@@ -171,6 +170,11 @@ jobs:
           architecture: ${{ matrix.arch }}
           cache: 'npm'
 
+      - name: Use Python ${{ matrix.python }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python }}
+
       - name: Cache CPP Client
         id: cache-dependencies
         uses: actions/cache@v3

package/.github/workflows/ci-pr-validation.yml

@@ -30,6 +30,10 @@ jobs:
     name: Run unit tests
     runs-on: ubuntu-22.04
     timeout-minutes: 120
+    strategy:
+      matrix:
+        python:
+          - "3.10"
 
     steps:
       - uses: actions/checkout@v3
@@ -38,9 +42,17 @@ jobs:
         with:
           node-version: 18
 
+      - name: Use Python ${{ matrix.python }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python }}
+          
       - name: Run Test
         run: |
           ./tests/run-unit-tests.sh
+      - name: Check license headers
+        run: |
+          npm run license:checkheader
 
   validation-yarn:
     name: Validation use yarn install
@@ -71,6 +83,8 @@ jobs:
           - arm64
         nodejs:
           - 18
+        python:
+          - "3.10"
     steps:
       - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.nodejs }}
@@ -78,13 +92,11 @@ jobs:
         with:
           node-version: ${{ matrix.nodejs }}
           cache: 'npm'
-
-      - name: Cache Dependencies
-        id: cache-dependencies
-        uses: actions/cache@v3
+          
+      - name: Use Python ${{ matrix.python }}
+        uses: actions/setup-python@v3
         with:
-          path: pkg/mac/build
-          key: ${{ runner.os }}-${{ matrix.arch }}-mac-${{ hashFiles('pkg/mac/build-cpp-deps-lib.sh') }}
+          python-version: ${{ matrix.python }}
 
       - name: Add arch env vars
         run: |
@@ -94,20 +106,10 @@ jobs:
             echo "ARCH=${{ matrix.arch }}" >> $GITHUB_ENV
           fi
 
-      - name: Build CPP dependencies lib
-        if: steps.cache-dependencies.outputs.cache-hit != 'true'
-        run: |
-          export ARCH=${{ env.ARCH }}
-          pkg/mac/build-cpp-deps-lib.sh
-
-      - name: Build CPP lib
-        if: steps.cache-pulsar.outputs.cache-hit != 'true'
-        run: |
-          export ARCH=${{ env.ARCH }}
-          pkg/mac/build-cpp-lib.sh
-
       - name: Build Node binaries lib
         run: |
+          export ARCH=${{ env.ARCH }}
+          pkg/mac/download-cpp-client.sh
           npm install --ignore-scripts
           npx node-pre-gyp configure --target_arch=${{ matrix.arch }}
           npx node-pre-gyp build --target_arch=${{ matrix.arch }}
@@ -194,6 +196,8 @@ jobs:
           - x86
         nodejs:
           - 18
+        python:
+          - "3.10"
     steps:
       - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.nodejs }}
@@ -203,6 +207,11 @@ jobs:
           architecture: ${{ matrix.arch }}
           cache: 'npm'
 
+      - name: Use Python ${{ matrix.python }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python }}
+
       - name: Cache CPP Client
         id: cache-dependencies
         uses: actions/cache@v3
@@ -244,6 +253,10 @@ jobs:
     timeout-minutes: 3000
     strategy:
       fail-fast: false
+      matrix:
+        python:
+          - "3.10"
+
     steps:
       - uses: actions/checkout@v3
       - name: Use Node.js 18
@@ -251,6 +264,10 @@ jobs:
         with:
           node-version: 18
           cache: 'npm'
+      - name: Use Python ${{ matrix.python }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python }}
       - name: Install CPP lib
         run: |
           export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=true
@@ -274,6 +291,10 @@ jobs:
     timeout-minutes: 3000
     strategy:
       fail-fast: false
+      matrix:
+        python:
+          - "3.10"
+          
     steps:
       - uses: actions/checkout@v3
       - name: Use Node.js 18
@@ -281,6 +302,12 @@ jobs:
         with:
           node-version: 18
           cache: 'npm'
+
+      - name: Use Python ${{ matrix.python }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python }}
+          
       - name: Install CPP lib
         run: |
           source pulsar-client-cpp.txt

package/GenCertFile.js

@@ -17,6 +17,6 @@
  * under the License.
  */
 
-const Client = require('./src/Client.js');
+const Client = require('./src/Client');
 
 Client.genCertFile();

package/docs/release-process.md

@@ -197,7 +197,7 @@ Source files:
 https://dist.apache.org/repos/dist/dev/pulsar/pulsar-client-node/pulsar-client-node-1.X.0-rc.1/
 
 Pulsar's KEYS file containing PGP keys we use to sign the release:
-https://dist.apache.org/repos/dist/dev/pulsar/KEYS
+https://downloads.apache.org/pulsar/KEYS
 
 SHA-512 checksum:
 5f6c7e1a096a3ae66eee71c552af89532ed86bf94da3f3d49836c080426ee5dcaabeda440a989d51772d2e67e2dca953eeee9ea83cfbc7c2a0847a0ec04b310f  apache-pulsar-client-node-1.X.0.tar.gz

package/examples/consumer_listener.js

@@ -19,9 +19,13 @@
 
 const Pulsar = require('../');
 
+// It will be released and disconnected when there are no references,
+// so declare it with let.
+let client;
+
 (async () => {
   // Create a client
-  const client = new Pulsar.Client({
+  client = new Pulsar.Client({
     serviceUrl: 'pulsar://localhost:6650',
     operationTimeoutSeconds: 30,
   });

package/index.d.ts

@@ -98,10 +98,12 @@ export interface ConsumerConfig {
   batchIndexAckEnabled?: boolean;
   regexSubscriptionMode?: RegexSubscriptionMode;
   deadLetterPolicy?: DeadLetterPolicy;
+  batchReceivePolicy?: ConsumerBatchReceivePolicy;
 }
 
 export class Consumer {
   receive(timeout?: number): Promise<Message>;
+  batchReceive(): Promise<Message []>;
   acknowledge(message: Message): Promise<null>;
   acknowledgeId(messageId: MessageId): Promise<null>;
   negativeAcknowledge(message: Message): void;
@@ -181,12 +183,18 @@ export interface DeadLetterPolicy {
   initialSubscriptionName?: string;
 }
 
+export interface ConsumerBatchReceivePolicy {
+  maxNumMessages?: number;
+  maxNumBytes?: number;
+  timeoutMs?: number;
+}
+
 export class AuthenticationTls {
   constructor(params: { certificatePath: string, privateKeyPath: string });
 }
 
 export class AuthenticationAthenz {
-  constructor(params: string | AthenzConfig);
+  constructor(params: string | AthenzConfig | AthenzX509Config);
 }
 
 export interface AthenzConfig {
@@ -198,9 +206,22 @@ export interface AthenzConfig {
   keyId?: string;
   principalHeader?: string;
   roleHeader?: string;
+  caCert?: string;
+  /**
+   * @deprecated
+   */
   tokenExpirationTime?: string;
 }
 
+export class AthenzX509Config {
+  providerDomain: string;
+  privateKey: string;
+  x509CertChain: string;
+  ztsUrl: string;
+  roleHeader?: string;
+  caCert?: string;
+}
+
 export class AuthenticationToken {
   constructor(params: { token: string });
 }

package/index.js

@@ -18,11 +18,11 @@
  */
 
 const PulsarBinding = require('./src/pulsar-binding');
-const AuthenticationTls = require('./src/AuthenticationTls.js');
-const AuthenticationAthenz = require('./src/AuthenticationAthenz.js');
-const AuthenticationToken = require('./src/AuthenticationToken.js');
-const AuthenticationOauth2 = require('./src/AuthenticationOauth2.js');
-const Client = require('./src/Client.js');
+const AuthenticationTls = require('./src/AuthenticationTls');
+const AuthenticationAthenz = require('./src/AuthenticationAthenz');
+const AuthenticationToken = require('./src/AuthenticationToken');
+const AuthenticationOauth2 = require('./src/AuthenticationOauth2');
+const Client = require('./src/Client');
 
 const LogLevel = {
   DEBUG: 0,

package/license-checker-config.json

@@ -0,0 +1,43 @@
+{
+  "license": "license-header.txt",
+  "trailingWhitespace": "TRIM",
+  "ignoreFile": ".gitignore",
+  "ignore": [
+    "NOTICE",
+    "**/*.txt",
+    "**/*.bat",
+    "**/*.pem",
+    "**/*.key",
+    "**/*.crt"
+  ],
+  "defaultFormat": {
+    "prepend": "#",
+    "eachLine": {
+      "prepend": "# "
+    },
+    "append": "#"
+  },
+  "licenseFormats": {
+    "c|cc|cpp|h|hpp|js|ts|css": {
+      "prepend": "/**",
+      "eachLine": {
+        "prepend": " * "
+      },
+      "append": " */"
+    },
+    "conf|gitignore|npmignore|eslintignore|sh|py|yml|yaml": {
+      "prepend": "#",
+      "eachLine": {
+        "prepend": "# "
+      },
+      "append": "#"
+    },
+    "html|xml|md": {
+      "prepend": "<!--\n",
+      "eachLine": {
+        "prepend": "    "
+      },
+      "append": "\n-->"
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pulsar-client",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "Pulsar Node.js client",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,8 +17,9 @@
     "lint": "clang-format-lint src/*.cc src/*.h && eslint --ext .js .",
     "format": "clang-format-lint --fix src/*.cc src/*.h && eslint --fix --ext .js .",
     "dtslint": "dtslint .",
-    "license:report": "mkdir -p report && grunt grunt-license-report",
-    "license:addheader": "license-check-and-add",
+    "license:report": "mkdir -p report && license-checker --json > report/licenses.json",
+    "license:checkheader": "license-check-and-add check",
+    "license:addheader": "license-check-and-add add",
     "test": "jest --verbose --detectOpenHandles",
     "docs": "typedoc"
   },
@@ -34,27 +35,26 @@
     "node": ">=10.16.0"
   },
   "devDependencies": {
-    "dtslint": "^4.2.0",
     "@seadub/clang-format-lint": "0.0.2",
     "@types/node": "^14.14.25",
     "clang-format": "^1.4.0",
     "commander": "^6.1.0",
     "delay": "^4.4.0",
+    "dtslint": "^4.2.0",
     "eslint": "^7.8.1",
     "eslint-config-airbnb-base": "^14.2.0",
     "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-jest": "^24.3.6",
-    "grunt": "^1.4.1",
-    "grunt-license-report": "^0.0.8",
     "hdr-histogram-js": "^2.0.1",
     "jest": "^27.2.4",
-    "license-check-and-add": "^2.3.6",
+    "license-check-and-add": "^4.0.5",
+    "license-checker": "^25.0.1",
     "lodash": "^4.17.21",
     "typedoc": "^0.23.28",
     "typescript": "^4.9.5"
   },
   "dependencies": {
-    "@mapbox/node-pre-gyp": "^1.0.9",
+    "@mapbox/node-pre-gyp": "^1.0.11",
     "bindings": "^1.5.0",
     "node-addon-api": "^4.3.0"
   },
@@ -64,57 +64,5 @@
     "host": "https://archive.apache.org/dist/pulsar/pulsar-client-node/",
     "remote_path": "pulsar-client-node-{version}",
     "package_name": "napi-{platform}-{libc}-{arch}.tar.gz"
-  },
-  "license-check-and-add-config": {
-    "folder": ".",
-    "license": "license-header.txt",
-    "exact_paths_method": "EXCLUDE",
-    "exact_paths": [
-      ".git/",
-      "build/",
-      "node_modules/",
-      "report/",
-      "LICENSE"
-    ],
-    "file_type_method": "EXCLUDE",
-    "file_types": [
-      ".json",
-      ".pem",
-      ".txt",
-      ".gz",
-      ".bat"
-    ],
-    "trailing_whitespace": "TRIM",
-    "insert_license": true,
-    "default_format": {
-      "prepend": "#",
-      "eachLine": {
-        "prepend": "# "
-      },
-      "append": "#"
-    },
-    "license_formats": {
-      "c|cc|cpp|h|hpp|js|ts|css": {
-        "prepend": "/**",
-        "eachLine": {
-          "prepend": " * "
-        },
-        "append": " */"
-      },
-      "conf|gitignore|npmignore|eslintignore|sh|py": {
-        "prepend": "#",
-        "eachLine": {
-          "prepend": "# "
-        },
-        "append": "#"
-      },
-      "html|xml|md": {
-        "prepend": "<!--\n",
-        "eachLine": {
-          "prepend": "    "
-        },
-        "append": "\n-->"
-      }
-    }
   }
 }

package/pkg/load_test.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-const Pulsar = require('../index.js');
+const Pulsar = require('../index');
 
 (async () => {
   Pulsar.Client.setLogHandler((level, file, line, message) => {

package/pkg/mac/{common.sh → download-cpp-client.sh}

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -19,19 +20,17 @@
 
 set -e -x
 
+ROOT_DIR=`cd $(dirname $0) && cd ../../ && pwd`
+source $ROOT_DIR/pulsar-client-cpp.txt
+
 if [ -z "$ARCH" ]; then
    export ARCH=$(uname -m)
 fi
 
-export MACOSX_DEPLOYMENT_TARGET=11.0
-
-MAC_BUILD_DIR=`cd $(dirname $0); pwd`
-ROOT_DIR=$(git rev-parse --show-toplevel)
-source $ROOT_DIR/pulsar-client-cpp.txt
-
-cd $MAC_BUILD_DIR
-mkdir -p build
-cd build
-mkdir -p install
-export PREFIX=`pwd`/install
+rm -rf $ROOT_DIR/pkg/mac/build-pulsar
+mkdir -p $ROOT_DIR/pkg/mac/build-pulsar/install
+cd $ROOT_DIR/pkg/mac
+curl -L -O ${CPP_CLIENT_BASE_URL}/macos-${ARCH}.zip
+unzip -d $ROOT_DIR/pkg/mac/build-pulsar/install macos-${ARCH}.zip
+rm -rf macos-${ARCH}.zip
 

package/pulsar-client-cpp.txt

@@ -1,2 +1,2 @@
-CPP_CLIENT_BASE_URL=https://archive.apache.org/dist/pulsar/pulsar-client-cpp-3.2.0
-CPP_CLIENT_VERSION=3.2.0
+CPP_CLIENT_BASE_URL=https://archive.apache.org/dist/pulsar/pulsar-client-cpp-3.4.2
+CPP_CLIENT_VERSION=3.4.2

package/src/Consumer.cc

@@ -38,6 +38,7 @@ void Consumer::Init(Napi::Env env, Napi::Object exports) {
       DefineClass(env, "Consumer",
                   {
                       InstanceMethod("receive", &Consumer::Receive),
+                      InstanceMethod("batchReceive", &Consumer::BatchReceive),
                       InstanceMethod("acknowledge", &Consumer::Acknowledge),
                       InstanceMethod("acknowledgeId", &Consumer::AcknowledgeId),
                       InstanceMethod("negativeAcknowledge", &Consumer::NegativeAcknowledge),
@@ -192,36 +193,17 @@ struct ConsumerNewInstanceContext {
 Napi::Value Consumer::NewInstance(const Napi::CallbackInfo &info, std::shared_ptr<pulsar_client_t> cClient) {
   auto deferred = ThreadSafeDeferred::New(info.Env());
   auto config = info[0].As<Napi::Object>();
-  std::shared_ptr<ConsumerConfig> consumerConfig = std::make_shared<ConsumerConfig>(config, &MessageListener);
+  std::shared_ptr<ConsumerConfig> consumerConfig = std::make_shared<ConsumerConfig>();
+
+  consumerConfig->InitConfig(deferred, config, &MessageListener);
+  if (deferred->IsDone()) {
+    return deferred->Promise();
+  }
 
   const std::string &topic = consumerConfig->GetTopic();
   const std::vector<std::string> &topics = consumerConfig->GetTopics();
   const std::string &topicsPattern = consumerConfig->GetTopicsPattern();
-  if (topic.empty() && topics.size() == 0 && topicsPattern.empty()) {
-    deferred->Reject(
-        std::string("Topic, topics or topicsPattern is required and must be specified as a string when "
-                    "creating consumer"));
-    return deferred->Promise();
-  }
   const std::string &subscription = consumerConfig->GetSubscription();
-  if (subscription.empty()) {
-    deferred->Reject(
-        std::string("Subscription is required and must be specified as a string when creating consumer"));
-    return deferred->Promise();
-  }
-  int32_t ackTimeoutMs = consumerConfig->GetAckTimeoutMs();
-  if (ackTimeoutMs != 0 && ackTimeoutMs < MIN_ACK_TIMEOUT_MILLIS) {
-    std::string msg("Ack timeout should be 0 or greater than or equal to " +
-                    std::to_string(MIN_ACK_TIMEOUT_MILLIS));
-    deferred->Reject(msg);
-    return deferred->Promise();
-  }
-  int32_t nAckRedeliverTimeoutMs = consumerConfig->GetNAckRedeliverTimeoutMs();
-  if (nAckRedeliverTimeoutMs < 0) {
-    std::string msg("NAck timeout should be greater than or equal to zero");
-    deferred->Reject(msg);
-    return deferred->Promise();
-  }
 
   auto ctx = new ConsumerNewInstanceContext(deferred, cClient, consumerConfig);
 
@@ -291,6 +273,39 @@ class ConsumerReceiveWorker : public Napi::AsyncWorker {
   int64_t timeout;
 };
 
+Napi::Value Consumer::BatchReceive(const Napi::CallbackInfo &info) {
+  auto deferred = ThreadSafeDeferred::New(Env());
+  auto ctx = new ExtDeferredContext(deferred);
+  pulsar_consumer_batch_receive_async(
+      this->cConsumer.get(),
+      [](pulsar_result result, pulsar_messages_t *rawMessages, void *ctx) {
+        auto deferredContext = static_cast<ExtDeferredContext *>(ctx);
+        auto deferred = deferredContext->deferred;
+        delete deferredContext;
+
+        if (result != pulsar_result_Ok) {
+          deferred->Reject(std::string("Failed to batch receive message: ") + pulsar_result_str(result));
+        } else {
+          deferred->Resolve([rawMessages](const Napi::Env env) {
+            int listSize = pulsar_messages_size(rawMessages);
+            Napi::Array jsArray = Napi::Array::New(env, listSize);
+            for (int i = 0; i < listSize; i++) {
+              pulsar_message_t *rawMessage = pulsar_messages_get(rawMessages, i);
+              pulsar_message_t *message = pulsar_message_create();
+              pulsar_message_copy(rawMessage, message);
+              Napi::Object obj =
+                  Message::NewInstance({}, std::shared_ptr<pulsar_message_t>(message, pulsar_message_free));
+              jsArray.Set(i, obj);
+            }
+            pulsar_messages_free(rawMessages);
+            return jsArray;
+          });
+        }
+      },
+      ctx);
+  return deferred->Promise();
+}
+
 Napi::Value Consumer::Receive(const Napi::CallbackInfo &info) {
   if (info[0].IsUndefined()) {
     auto deferred = ThreadSafeDeferred::New(Env());

package/src/Consumer.h

@@ -44,6 +44,7 @@ class Consumer : public Napi::ObjectWrap<Consumer> {
   MessageListenerCallback *listener;
 
   Napi::Value Receive(const Napi::CallbackInfo &info);
+  Napi::Value BatchReceive(const Napi::CallbackInfo &info);
   Napi::Value Acknowledge(const Napi::CallbackInfo &info);
   Napi::Value AcknowledgeId(const Napi::CallbackInfo &info);
   void NegativeAcknowledge(const Napi::CallbackInfo &info);

package/src/ConsumerConfig.cc

@@ -51,6 +51,10 @@ static const std::string CFG_DEAD_LETTER_POLICY = "deadLetterPolicy";
 static const std::string CFG_DLQ_POLICY_TOPIC = "deadLetterTopic";
 static const std::string CFG_DLQ_POLICY_MAX_REDELIVER_COUNT = "maxRedeliverCount";
 static const std::string CFG_DLQ_POLICY_INIT_SUB_NAME = "initialSubscriptionName";
+static const std::string CFG_BATCH_RECEIVE_POLICY = "batchReceivePolicy";
+static const std::string CFG_BATCH_RECEIVE_POLICY_MAX_NUM_MESSAGES = "maxNumMessages";
+static const std::string CFG_BATCH_RECEIVE_POLICY_MAX_NUM_BYTES = "maxNumBytes";
+static const std::string CFG_BATCH_RECEIVE_POLICY_TIMEOUT_MS = "timeoutMs";
 
 static const std::map<std::string, pulsar_consumer_type> SUBSCRIPTION_TYPE = {
     {"Exclusive", pulsar_ConsumerExclusive},
@@ -74,7 +78,7 @@ static const std::map<std::string, pulsar_consumer_crypto_failure_action> CONSUM
 
 void FinalizeListenerCallback(Napi::Env env, MessageListenerCallback *cb, void *) { delete cb; }
 
-ConsumerConfig::ConsumerConfig(const Napi::Object &consumerConfig, pulsar_message_listener messageListener)
+ConsumerConfig::ConsumerConfig()
     : topic(""),
       topicsPattern(""),
       subscription(""),
@@ -83,7 +87,10 @@ ConsumerConfig::ConsumerConfig(const Napi::Object &consumerConfig, pulsar_messag
       listener(nullptr) {
   this->cConsumerConfig = std::shared_ptr<pulsar_consumer_configuration_t>(
       pulsar_consumer_configuration_create(), pulsar_consumer_configuration_free);
+}
 
+void ConsumerConfig::InitConfig(std::shared_ptr<ThreadSafeDeferred> deferred,
+                                const Napi::Object &consumerConfig, pulsar_message_listener messageListener) {
   if (consumerConfig.Has(CFG_TOPIC) && consumerConfig.Get(CFG_TOPIC).IsString()) {
     this->topic = consumerConfig.Get(CFG_TOPIC).ToString().Utf8Value();
   }
@@ -101,9 +108,21 @@ ConsumerConfig::ConsumerConfig(const Napi::Object &consumerConfig, pulsar_messag
     this->topicsPattern = consumerConfig.Get(CFG_TOPICS_PATTERN).ToString().Utf8Value();
   }
 
+  if (this->topic.empty() && this->topics.size() == 0 && this->topicsPattern.empty()) {
+    deferred->Reject(
+        std::string("Topic, topics or topicsPattern is required and must be specified as a string when "
+                    "creating consumer"));
+    return;
+  }
+
   if (consumerConfig.Has(CFG_SUBSCRIPTION) && consumerConfig.Get(CFG_SUBSCRIPTION).IsString()) {
     this->subscription = consumerConfig.Get(CFG_SUBSCRIPTION).ToString().Utf8Value();
   }
+  if (subscription.empty()) {
+    deferred->Reject(
+        std::string("Subscription is required and must be specified as a string when creating consumer"));
+    return;
+  }
 
   if (consumerConfig.Has(CFG_SUBSCRIPTION_TYPE) && consumerConfig.Get(CFG_SUBSCRIPTION_TYPE).IsString()) {
     std::string subscriptionType = consumerConfig.Get(CFG_SUBSCRIPTION_TYPE).ToString().Utf8Value();
@@ -139,18 +158,25 @@ ConsumerConfig::ConsumerConfig(const Napi::Object &consumerConfig, pulsar_messag
 
   if (consumerConfig.Has(CFG_ACK_TIMEOUT) && consumerConfig.Get(CFG_ACK_TIMEOUT).IsNumber()) {
     this->ackTimeoutMs = consumerConfig.Get(CFG_ACK_TIMEOUT).ToNumber().Int64Value();
-    if (this->ackTimeoutMs == 0 || this->ackTimeoutMs >= MIN_ACK_TIMEOUT_MILLIS) {
-      pulsar_consumer_set_unacked_messages_timeout_ms(this->cConsumerConfig.get(), this->ackTimeoutMs);
+    if (this->ackTimeoutMs != 0 && ackTimeoutMs < MIN_ACK_TIMEOUT_MILLIS) {
+      std::string msg("Ack timeout should be 0 or greater than or equal to " +
+                      std::to_string(MIN_ACK_TIMEOUT_MILLIS));
+      deferred->Reject(msg);
+      return;
     }
+    pulsar_consumer_set_unacked_messages_timeout_ms(this->cConsumerConfig.get(), this->ackTimeoutMs);
   }
 
   if (consumerConfig.Has(CFG_NACK_REDELIVER_TIMEOUT) &&
       consumerConfig.Get(CFG_NACK_REDELIVER_TIMEOUT).IsNumber()) {
     this->nAckRedeliverTimeoutMs = consumerConfig.Get(CFG_NACK_REDELIVER_TIMEOUT).ToNumber().Int64Value();
-    if (this->nAckRedeliverTimeoutMs >= 0) {
-      pulsar_configure_set_negative_ack_redelivery_delay_ms(this->cConsumerConfig.get(),
-                                                            this->nAckRedeliverTimeoutMs);
+    if (nAckRedeliverTimeoutMs < 0) {
+      std::string msg("NAck timeout should be greater than or equal to zero");
+      deferred->Reject(msg);
+      return;
     }
+    pulsar_configure_set_negative_ack_redelivery_delay_ms(this->cConsumerConfig.get(),
+                                                          this->nAckRedeliverTimeoutMs);
   }
 
   if (consumerConfig.Has(CFG_RECV_QUEUE) && consumerConfig.Get(CFG_RECV_QUEUE).IsNumber()) {
@@ -265,6 +291,39 @@ ConsumerConfig::ConsumerConfig(const Napi::Object &consumerConfig, pulsar_messag
     }
     pulsar_consumer_configuration_set_dlq_policy(this->cConsumerConfig.get(), &dlq_policy);
   }
+
+  if (consumerConfig.Has(CFG_BATCH_RECEIVE_POLICY) &&
+      consumerConfig.Get(CFG_BATCH_RECEIVE_POLICY).IsObject()) {
+    Napi::Object propObj = consumerConfig.Get(CFG_BATCH_RECEIVE_POLICY).ToObject();
+    int maxNumMessages = -1;
+    if (propObj.Has(CFG_BATCH_RECEIVE_POLICY_MAX_NUM_MESSAGES) &&
+        propObj.Get(CFG_BATCH_RECEIVE_POLICY_MAX_NUM_MESSAGES).IsNumber()) {
+      maxNumMessages = propObj.Get(CFG_BATCH_RECEIVE_POLICY_MAX_NUM_MESSAGES).ToNumber().Int32Value();
+    }
+    int maxNumBytes = 10 * 1024 * 1024;
+    if (propObj.Has(CFG_BATCH_RECEIVE_POLICY_MAX_NUM_BYTES) &&
+        propObj.Get(CFG_BATCH_RECEIVE_POLICY_MAX_NUM_BYTES).IsNumber()) {
+      maxNumBytes = propObj.Get(CFG_BATCH_RECEIVE_POLICY_MAX_NUM_BYTES).ToNumber().Int64Value();
+    }
+    int timeoutMs = 100;
+    if (propObj.Has(CFG_BATCH_RECEIVE_POLICY_TIMEOUT_MS) &&
+        propObj.Get(CFG_BATCH_RECEIVE_POLICY_TIMEOUT_MS).IsNumber()) {
+      timeoutMs = propObj.Get(CFG_BATCH_RECEIVE_POLICY_TIMEOUT_MS).ToNumber().Int64Value();
+    }
+    if (maxNumMessages <= 0 && maxNumBytes <= 0 && timeoutMs <= 0) {
+      std::string msg("At least one of maxNumMessages, maxNumBytes and timeoutMs must be specified.");
+      deferred->Reject(msg);
+      return;
+    }
+    pulsar_consumer_batch_receive_policy_t batch_receive_policy{maxNumMessages, maxNumBytes, timeoutMs};
+    int result = pulsar_consumer_configuration_set_batch_receive_policy(this->cConsumerConfig.get(),
+                                                                        &batch_receive_policy);
+    if (result == -1) {
+      std::string msg("Set batch receive policy failed: C client returned failure");
+      deferred->Reject(msg);
+      return;
+    }
+  }
 }
 
 ConsumerConfig::~ConsumerConfig() {

package/src/ConsumerConfig.h

@@ -21,14 +21,17 @@
 #define CONSUMER_CONFIG_H
 
 #include <pulsar/c/consumer_configuration.h>
+#include "ThreadSafeDeferred.h"
 #include "MessageListener.h"
 
 #define MIN_ACK_TIMEOUT_MILLIS 10000
 
 class ConsumerConfig {
  public:
-  ConsumerConfig(const Napi::Object &consumerConfig, pulsar_message_listener messageListener);
+  ConsumerConfig();
   ~ConsumerConfig();
+  void InitConfig(std::shared_ptr<ThreadSafeDeferred> deferred, const Napi::Object &consumerConfig,
+                  pulsar_message_listener messageListener);
   std::shared_ptr<pulsar_consumer_configuration_t> GetCConsumerConfig();
   std::string GetTopic();
   std::vector<std::string> GetTopics();

package/src/ThreadSafeDeferred.cc

@@ -96,3 +96,7 @@ void ThreadSafeDeferred::Reject(const std::string &errorMsg) {
   this->fate = EFate::REJECTED;
   this->tsf.Release();
 }
+
+bool ThreadSafeDeferred::IsDone() const {
+  return this->fate == EFate::RESOLVED || this->fate == EFate::REJECTED;
+}

package/src/ThreadSafeDeferred.h

@@ -73,6 +73,7 @@ class ThreadSafeDeferred : public Napi::Promise::Deferred {
   inline void Reject() { this->Reject(""); }
   void Reject(
       const std::string &);  // <- if only Reject were virtual... But we can live without polymorphism here
+  bool IsDone() const;
 
   static std::shared_ptr<ThreadSafeDeferred> New(const Napi::Env env);
 };

package/tests/client.test.js

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-const httpRequest = require('./http_utils.js');
-const Pulsar = require('../index.js');
+const httpRequest = require('./http_utils');
+const Pulsar = require('../index');
 
 const baseUrl = 'http://localhost:8080';
 

package/tests/consumer.test.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-const Pulsar = require('../index.js');
+const Pulsar = require('../index');
 
 (() => {
   describe('Consumer', () => {
@@ -122,6 +122,37 @@ const Pulsar = require('../index.js');
           nAckRedeliverTimeoutMs: -12,
         })).rejects.toThrow('NAck timeout should be greater than or equal to zero');
       });
+
+      test('Ack timeout less 10000', async () => {
+        await expect(client.subscribe({
+          topic: 'test-topic',
+          subscription: 'sub1',
+          subscriptionType: 'Shared',
+          ackTimeoutMs: 100,
+        })).rejects.toThrow('Ack timeout should be 0 or greater than or equal to 10000');
+      });
+
+      test('NAck timeout less 0', async () => {
+        await expect(client.subscribe({
+          topic: 'test-topic',
+          subscription: 'sub1',
+          subscriptionType: 'Shared',
+          nAckRedeliverTimeoutMs: -1,
+        })).rejects.toThrow('NAck timeout should be greater than or equal to zero');
+      });
+
+      test('Batch Receive Config Error', async () => {
+        await expect(client.subscribe({
+          topic: 'test-batch-receive-policy-error',
+          subscription: 'sub1',
+          subscriptionType: 'Shared',
+          batchReceivePolicy: {
+            maxNumMessages: -1,
+            maxNumBytes: -1,
+            timeoutMs: -1,
+          },
+        })).rejects.toThrow('At least one of maxNumMessages, maxNumBytes and timeoutMs must be specified.');
+      });
     });
 
     describe('Close', () => {
@@ -137,7 +168,7 @@ const Pulsar = require('../index.js');
 
         await expect(consumer.close()).resolves.toEqual(null);
 
-        await expect(consumer.close()).rejects.toThrow('Failed to close consumer: AlreadyClosed');
+        await expect(consumer.close()).resolves.toEqual(null);
       });
     });
 
@@ -315,6 +346,89 @@ const Pulsar = require('../index.js');
         consumer.close();
         dlqConsumer.close();
       });
+
+      test('Batch Receive by maxNumberMessages', async () => {
+        const topicName = 'batch-receive-test-topic';
+        const producer = await client.createProducer({
+          topic: topicName,
+        });
+
+        const consumer = await client.subscribe({
+          topic: topicName,
+          subscription: 'sub1',
+          subscriptionType: 'Shared',
+          batchReceivePolicy: {
+            maxNumMessages: 10,
+            maxNumBytes: -1,
+            timeoutMs: 500,
+          },
+        });
+        const num = 10;
+        const messages = [];
+        for (let i = 0; i < num; i += 1) {
+          const msg = `my-message-${i}`;
+          await producer.send({ data: Buffer.from(msg) });
+          messages.push(msg);
+        }
+
+        const receiveMessages = await consumer.batchReceive();
+        expect(receiveMessages.length).toEqual(num);
+        const results = [];
+        for (let i = 0; i < receiveMessages.length; i += 1) {
+          const msg = receiveMessages[i];
+          console.log(msg.getData().toString());
+          results.push(msg.getData().toString());
+        }
+        expect(results).toEqual(messages);
+
+        // assert no more msgs.
+        expect(await consumer.batchReceive()).toEqual([]);
+
+        await producer.close();
+        await consumer.close();
+      });
+
+      test('Batch Receive by timeOutMs', async () => {
+        const topicName = 'batch-receive-test-topic-timeout';
+        const producer = await client.createProducer({
+          topic: topicName,
+        });
+
+        const consumer = await client.subscribe({
+          topic: topicName,
+          subscription: 'sub1',
+          subscriptionType: 'Shared',
+          batchReceivePolicy: {
+            maxNumMessages: 100,
+            maxNumBytes: -1,
+            timeoutMs: 500,
+          },
+        });
+        // just send 10 message waite trigger timeout.
+        const num = 10;
+        const messages = [];
+        for (let i = 0; i < num; i += 1) {
+          const msg = `my-message-${i}`;
+          await producer.send({ data: Buffer.from(msg) });
+          messages.push(msg);
+        }
+
+        const receiveMessages = await consumer.batchReceive();
+        expect(receiveMessages.length).toEqual(num);
+        const results = [];
+        for (let i = 0; i < receiveMessages.length; i += 1) {
+          const msg = receiveMessages[i];
+          console.log(msg.getData().toString());
+          results.push(msg.getData().toString());
+        }
+        expect(results).toEqual(messages);
+
+        // assert no more msgs.
+        expect(await consumer.batchReceive()).toEqual([]);
+
+        await producer.close();
+        await consumer.close();
+      });
     });
   });
 })();

package/tests/end_to_end.test.js

@@ -18,7 +18,7 @@
  */
 
 const lodash = require('lodash');
-const Pulsar = require('../index.js');
+const Pulsar = require('../index');
 
 (() => {
   describe('End To End', () => {

package/tests/producer.test.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-const Pulsar = require('../index.js');
+const Pulsar = require('../index');
 
 (() => {
   describe('Producer', () => {

package/tests/reader.test.js

@@ -18,7 +18,7 @@
  */
 
 const lodash = require('lodash');
-const Pulsar = require('../index.js');
+const Pulsar = require('../index');
 const httpRequest = require('./http_utils');
 
 const baseUrl = 'http://localhost:8080';

package/tstest.ts

@@ -37,6 +37,16 @@ import Pulsar = require('./index');
     principalHeader: 'Athenz-Principal-Auth',
     roleHeader: 'Athenz-Role-Auth',
     tokenExpirationTime: '3600',
+    caCert: 'file:///path/to/cacert.pem',
+  });
+
+  const authAthenz3: Pulsar.AuthenticationAthenz = new Pulsar.AuthenticationAthenz({
+    providerDomain: 'athenz.provider.domain',
+    privateKey: 'file:///path/to/private.key',
+    ztsUrl: 'https://localhost:8443',
+    roleHeader: 'Athenz-Role-Auth',
+    x509CertChain: 'file:///path/to/x509cert.pem',
+    caCert: 'file:///path/to/cacert.pem',
   });
 
   const authOauth2PrivateKey: Pulsar.AuthenticationOauth2 = new Pulsar.AuthenticationOauth2({

package/Gruntfile.js

@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = (grunt) => {
-  grunt.loadNpmTasks('grunt-license-report');
-  grunt.initConfig({
-    pkg: grunt.file.readJSON('package.json'),
-    'grunt-license-report': {
-      output: {
-        path: './report/licenses',
-        format: 'html',
-      },
-    },
-  });
-};

package/build-support/dep-version.py

@@ -1,24 +0,0 @@
-#!/usr/bin/env python3
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import yaml, sys
-
-deps = yaml.safe_load(open("dependencies.yaml"))
-print(deps[sys.argv[1]])

package/dependencies.yaml

@@ -1,28 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Only used for MacOS builds
-boost: 1.80.0
-cmake: 3.24.2
-protobuf: 3.20.0
-zlib: 1.2.13
-zstd: 1.5.2
-snappy: 1.1.9
-openssl: 1.1.1s
-curl: 7.85.0

package/pkg/mac/build-cpp-deps-lib.sh

@@ -1,186 +0,0 @@
-#!/usr/bin/env bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-source $(dirname $0)/common.sh
-
-cd $ROOT_DIR
-
-pip3 install pyyaml
-
-dep=$ROOT_DIR/build-support/dep-version.py
-ZLIB_VERSION=$($dep zlib)
-OPENSSL_VERSION=$($dep openssl)
-BOOST_VERSION=$($dep boost)
-PROTOBUF_VERSION=$($dep protobuf)
-ZSTD_VERSION=$($dep zstd)
-SNAPPY_VERSION=$($dep snappy)
-CURL_VERSION=$($dep curl)
-
-cd $MAC_BUILD_DIR/build
-
-##############################################################################
-if [ ! -f zlib-${ZLIB_VERSION}.done ]; then
-    echo "Building ZLib"
-    curl -O -L https://zlib.net/fossils/zlib-${ZLIB_VERSION}.tar.gz
-    tar xfz zlib-$ZLIB_VERSION.tar.gz
-    pushd zlib-$ZLIB_VERSION
-      CFLAGS="-fPIC -O3 -arch ${ARCH} -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" ./configure --prefix=$PREFIX
-      make -j16
-      make install
-    popd
-
-    rm -rf zlib-$ZLIB_VERSION.tar.gz zlib-$ZLIB_VERSION
-    touch zlib-${ZLIB_VERSION}.done
-else
-    echo "Using cached ZLib"
-fi
-
-###############################################################################
-OPENSSL_VERSION_UNDERSCORE=$(echo $OPENSSL_VERSION | sed 's/\./_/g')
-if [ ! -f openssl-OpenSSL_${OPENSSL_VERSION_UNDERSCORE}.done ]; then
-    echo "Building OpenSSL"
-    curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_${OPENSSL_VERSION_UNDERSCORE}.tar.gz
-    tar xfz OpenSSL_${OPENSSL_VERSION_UNDERSCORE}.tar.gz
-    pushd openssl-OpenSSL_${OPENSSL_VERSION_UNDERSCORE}
-        if [ $ARCH = 'arm64' ]; then
-          PLATFORM=darwin64-arm64-cc
-        else
-          PLATFORM=darwin64-x86_64-cc
-        fi
-        ./Configure --prefix=$PREFIX no-shared no-unit-test $PLATFORM
-        make -j8
-        make install_sw
-    popd
-
-    rm -rf OpenSSL_${OPENSSL_VERSION_UNDERSCORE}.tar.gz openssl-OpenSSL_${OPENSSL_VERSION_UNDERSCORE}
-    touch openssl-OpenSSL_${OPENSSL_VERSION_UNDERSCORE}.done
-else
-    echo "Using cached OpenSSL"
-fi
-
-###############################################################################
-BOOST_VERSION_=${BOOST_VERSION//./_}
-DIR=boost-src-${BOOST_VERSION}
-if [ ! -f $DIR.done ]; then
-    echo "Building Boost"
-    curl -O -L https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_}.tar.gz
-    tar xfz boost_${BOOST_VERSION_}.tar.gz
-    rm -rf $DIR
-    mv boost_${BOOST_VERSION_} $DIR
-
-    pushd $DIR
-      ./bootstrap.sh --prefix=$PREFIX --with-libraries=system
-      ./b2 address-model=64 cxxflags="-fPIC -arch ${ARCH} -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" \
-                link=static threading=multi \
-                variant=release \
-                install
-    popd
-
-    rm -rf $DIR boost_${BOOST_VERSION_}.tar.gz
-    touch $DIR.done
-else
-    echo "Using cached Boost"
-fi
-
-###############################################################################
-if [ ! -f protobuf-${PROTOBUF_VERSION}.done ]; then
-    echo "Building Protobuf"
-    curl -O -L  https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-cpp-${PROTOBUF_VERSION}.tar.gz
-    tar xfz protobuf-cpp-${PROTOBUF_VERSION}.tar.gz
-    pushd protobuf-${PROTOBUF_VERSION}
-      CXXFLAGS="-fPIC -arch arm64 -arch x86_64 -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" \
-            ./configure --prefix=$PREFIX
-      make -j16 V=1
-      make install
-    popd
-
-    pushd install/lib
-      echo "Propose target arch static lib" ${ARCH}
-      mv libprotobuf.a libprotobuf_universal.a
-      lipo libprotobuf_universal.a -thin ${ARCH} -output libprotobuf.a
-    popd
-
-    rm -rf protobuf-${PROTOBUF_VERSION} protobuf-cpp-${PROTOBUF_VERSION}.tar.gz
-    touch protobuf-${PROTOBUF_VERSION}.done
-else
-    echo "Using cached Protobuf"
-fi
-
-###############################################################################
-if [ ! -f zstd-${ZSTD_VERSION}.done ]; then
-    echo "Building ZStd"
-    curl -O -L https://github.com/facebook/zstd/releases/download/v${ZSTD_VERSION}/zstd-${ZSTD_VERSION}.tar.gz
-    tar xfz zstd-${ZSTD_VERSION}.tar.gz
-    pushd zstd-${ZSTD_VERSION}
-      CFLAGS="-fPIC -O3 -arch ${ARCH} -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" \
-          PREFIX=$PREFIX  \
-          make -j16 -C lib install
-    popd
-
-    rm -rf zstd-${ZSTD_VERSION} zstd-${ZSTD_VERSION}.tar.gz
-    touch zstd-${ZSTD_VERSION}.done
-else
-    echo "Using cached ZStd"
-fi
-
-###############################################################################
-if [ ! -f snappy-${SNAPPY_VERSION}.done ]; then
-    echo "Building Snappy"
-    curl -O -L https://github.com/google/snappy/archive/refs/tags/${SNAPPY_VERSION}.tar.gz
-    tar xfz ${SNAPPY_VERSION}.tar.gz
-    pushd snappy-${SNAPPY_VERSION}
-      CXXFLAGS="-fPIC -O3 -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" \
-          cmake . -DCMAKE_OSX_ARCHITECTURES=${ARCH} -DCMAKE_INSTALL_PREFIX=$PREFIX -DSNAPPY_BUILD_TESTS=OFF -DSNAPPY_BUILD_BENCHMARKS=OFF
-      make -j16
-      make install
-      touch .done
-    popd
-
-    rm -rf snappy-${SNAPPY_VERSION} ${SNAPPY_VERSION}.tar.gz
-    touch snappy-${SNAPPY_VERSION}.done
-else
-    echo "Using cached Snappy"
-fi
-
-###############################################################################
-if [ ! -f curl-${CURL_VERSION}.done ]; then
-    echo "Building LibCurl"
-    CURL_VERSION_=${CURL_VERSION//./_}
-    curl -O -L  https://github.com/curl/curl/releases/download/curl-${CURL_VERSION_}/curl-${CURL_VERSION}.tar.gz
-    tar xfz curl-${CURL_VERSION}.tar.gz
-    pushd curl-${CURL_VERSION}
-      CFLAGS="-fPIC -arch ${ARCH} -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" \
-            ./configure --with-ssl=$PREFIX \
-              --without-nghttp2 \
-              --without-libidn2 \
-              --disable-ldap \
-              --without-brotli \
-              --without-secure-transport \
-              --disable-ipv6 \
-              --prefix=$PREFIX \
-              --host=$ARCH-apple-darwin
-      make -j16 install
-    popd
-
-    rm -rf curl-${CURL_VERSION} curl-${CURL_VERSION}.tar.gz
-    touch curl-${CURL_VERSION}.done
-else
-    echo "Using cached LibCurl"
-fi

package/pkg/mac/build-cpp-lib.sh

@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-source $(dirname $0)/common.sh
-
-PULSAR_DIR=${MAC_BUILD_DIR}/build-pulsar
-PULSAR_PREFIX=${PULSAR_DIR}/install
-mkdir -p $PULSAR_PREFIX
-cd $PULSAR_DIR
-
-## Fetch from official release
-curl -O -L "$CPP_CLIENT_BASE_URL"/apache-pulsar-client-cpp-${CPP_CLIENT_VERSION}.tar.gz
-tar xfz apache-pulsar-client-cpp-${CPP_CLIENT_VERSION}.tar.gz
-pushd apache-pulsar-client-cpp-${CPP_CLIENT_VERSION}
-  rm -f CMakeCache.txt
-  cmake . \
-      -DCMAKE_OSX_ARCHITECTURES=${ARCH} \
-      -DCMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} \
-      -DCMAKE_INSTALL_PREFIX=$PULSAR_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_PREFIX_PATH=$PREFIX \
-      -DCMAKE_INSTALL_LIBDIR=$PULSAR_PREFIX/lib \
-      -DLINK_STATIC=ON \
-      -DBUILD_TESTS=OFF \
-      -DBUILD_PYTHON_WRAPPER=OFF \
-      -DBUILD_DYNAMIC_LIB=OFF \
-      -DPROTOC_PATH=$PREFIX/bin/protoc
-  make -j16 install
-popd
-
-rm -rf apache-pulsar-client-cpp-${CPP_CLIENT_VERSION}.tar.gz apache-pulsar-client-cpp-${CPP_CLIENT_VERSION}