pulsar-client 1.4.1 → 1.5.0

package/README.md

@@ -46,13 +46,24 @@ Compatibility between each version of the Node.js client and the C++ client is a
 | 1.1.x          | 2.4.0 or later |
 | 1.2.x          | 2.5.0 or later |
 | 1.3.x          | 2.7.0 or later |
-| 1.4.x          | 2.8.0 or later |
+| 1.4.x - 1.5.x  | 2.8.0 or later |
 
 If an incompatible version of the C++ client is installed, you may fail to build or run this library.
 
 ## How to install
 
-### Please install pulsar-client in your project:
+### Install on windows
+
+1. [Build the Pulsar C++ client on windows](https://pulsar.apache.org/docs/en/next/client-libraries-cpp/).
+
+2. Set the variable `PULSAR_CPP_DIR` with the `pulsar-client-cpp` path in a Windows command tool.
+
+```shell
+# for example
+set PULSAR_CPP_DIR=C:\pulsar\pulsar-client-cpp
+```
+
+### Install pulsar-client to your project
 
 ```shell
 $ npm install pulsar-client
@@ -72,6 +83,10 @@ $ cd pulsar-client-node
 $ npm install
 ```
 
+> **Note**
+>
+> If you build `pulsar-client-node on` windows, you need to set the variable `PULSAR_CPP_DIR` first, then install npm (run the command `npm install`) in a Windows command-line tool.
+
 ### Rebuild Pulsar client library:
 
 ```shell

package/binding.gyp

@@ -18,14 +18,23 @@
 #
 
 {
+  'conditions': [
+    ['OS=="win"', {
+      'variables': {
+       'pulsar_cpp_dir%': '<!(echo %PULSAR_CPP_DIR%)',
+      },
+    }]
+  ],
   "targets": [
     {
       "target_name": "Pulsar",
+      "cflags_cc": ["-std=gnu++11"],
       "cflags!": ["-fno-exceptions"],
-      "cflags_cc!": ["-fno-exceptions"],
-      "include_dirs": ["<!@(node -p \"require('node-addon-api').include\")"],
-      "dependencies": ["<!@(node -p \"require('node-addon-api').gyp\")"],
-      "defines": ["NAPI_DISABLE_CPP_EXCEPTIONS"],
+      "cflags_cc!": ["-fno-exceptions", "-std=gnu++14", "-std=gnu++17"],
+      "include_dirs": [
+        "<!@(node -p \"require('node-addon-api').include\")",
+      ],
+      "defines": ["NAPI_VERSION=4", "NAPI_DISABLE_CPP_EXCEPTIONS=1"],
       "sources": [
         "src/addon.cc",
         "src/Message.cc",
@@ -39,7 +48,42 @@
         "src/Reader.cc",
         "src/ReaderConfig.cc",
       ],
-      "libraries": ["-lpulsar"],
+      'conditions': [
+        ['OS=="win"', {
+          "include_dirs": [
+            "<(pulsar_cpp_dir)\include",
+          ],
+          "libraries": [
+            "-l<(pulsar_cpp_dir)\\build\lib\Release\pulsar.lib"
+          ],
+          "dependencies": [
+            "<!(node -p \"require('node-addon-api').gyp\")"
+          ],
+          "copies": [
+            {
+              "destination": "<(PRODUCT_DIR)",
+              "files": [
+                "<(pulsar_cpp_dir)\\build\lib\Release\pulsar.dll",
+                "<(pulsar_cpp_dir)\\vcpkg_installed\\x64-windows\\bin\libcurl.dll",
+                "<(pulsar_cpp_dir)\\vcpkg_installed\\x64-windows\\bin\libprotobuf.dll",
+                "<(pulsar_cpp_dir)\\vcpkg_installed\\x64-windows\\bin\libssl-1_1-x64.dll",
+                "<(pulsar_cpp_dir)\\vcpkg_installed\\x64-windows\\bin\libcrypto-1_1-x64.dll",
+                "<(pulsar_cpp_dir)\\vcpkg_installed\\x64-windows\\bin\dl.dll",
+                "<(pulsar_cpp_dir)\\vcpkg_installed\\x64-windows\\bin\snappy.dll",
+                "<(pulsar_cpp_dir)\\vcpkg_installed\\x64-windows\\bin\zlib1.dll",
+                "<(pulsar_cpp_dir)\\vcpkg_installed\\x64-windows\\bin\zstd.dll",
+              ]
+            }
+          ]
+        }, {  # 'OS!="win"'
+          "libraries": [
+            "-lpulsar",
+          ],
+          "dependencies": [
+            "<!@(node -p \"require('node-addon-api').gyp\")"
+          ],
+        }]
+      ]
     }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pulsar-client",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "Pulsar Node.js client",
   "main": "index.js",
   "types": "index.d.ts",
@@ -51,10 +51,10 @@
     "typescript": "^4.1.3"
   },
   "dependencies": {
+    "@mapbox/node-pre-gyp": "^1.0.7",
     "bindings": "^1.5.0",
-    "node-addon-api": "^3.0.0",
-    "node-gyp": "^8.2.0",
-    "node-pre-gyp": "^0.15.0"
+    "node-addon-api": "^3.2.1",
+    "node-gyp": "^8.4.1"
   },
   "binary": {
     "module_name": "libpulsar",

package/src/Consumer.cc

@@ -164,6 +164,12 @@ class ConsumerNewInstanceWorker : public Napi::AsyncWorker {
 
     consumer->SetCConsumer(this->consumerWrapper);
     consumer->SetListenerCallback(this->listener);
+
+    if (this->listener) {
+      // resume to enable MessageListener function callback
+      resume_message_listener(this->consumerWrapper->cConsumer);
+    }
+
     this->deferred.Resolve(obj);
   }
   void OnError(const Napi::Error &e) { this->deferred.Reject(Napi::Error::New(Env(), e.Message()).Value()); }
@@ -183,6 +189,11 @@ class ConsumerNewInstanceWorker : public Napi::AsyncWorker {
     } else {
       worker->consumerWrapper->cConsumer = consumer;
       worker->listener = worker->consumerConfig->GetListenerCallback();
+
+      if (worker->listener) {
+        // pause, will resume in OnOK, to prevent MessageListener get a nullptr of consumer
+        pulsar_consumer_pause_message_listener(consumer);
+      }
     }
 
     delete worker->consumerConfig;