feat: merge upstream

Author: AVVS

.github/workflows/npm-publish.yml

@@ -0,0 +1,25 @@
+# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
+# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
+
+name: Publish node-rdkafka
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  publish-npm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          registry-url: https://registry.npmjs.org/
+          cache: "npm"
+      - run: npm ci
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

.github/workflows/test.yml

@@ -0,0 +1,41 @@
+name: Build & Test
+
+on:
+  push:
+    branches: ["master"]
+  pull_request:
+    branches: ["master"]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        node: [14, 16, 18, 19]
+        os: [ubuntu-22.04]
+        include:
+          # single mac test due to minute multipliers
+          # https://docs.github.com/en/billing/managing-billing-for-github-actions/about-billing-for-github-actions
+          - node: 18
+            os: macos-12
+          # single windows test due to node.js 14 node-gyp / vs 2022 issues
+          - node: 18
+            os: windows-2022
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - name: Install Node ${{ matrix.node }} in ${{ runner.os }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+          cache: "npm"
+      - name: Install Windows packages
+        if: runner.os == 'Windows'
+        run: ./win_install.ps1
+      - name: Build
+        run: npm ci
+      # skipping on windows for now due to Make / mocha exit code issues
+      - name: Test
+        if: runner.os != 'Windows'
+        run: npm test

CONTRIBUTING.md

@@ -220,3 +220,9 @@ Steps to update:
 1. Run end to end tests: `npm run test:e2e`. This requires running kafka & zookeeper locally.
 
 1. Update the version numbers referenced in the [`README.md`](https://github.com/Blizzard/node-rdkafka/blob/master/README.md) file to the new version.
+
+## Publishing new npm version
+
+1. Increment the `version` in `package.json` and merge that change in.
+
+1. Create a new github release. Set the tag & release title to the same string as `version` in `package.json`.

README.md

@@ -67,7 +67,7 @@ Windows build **is not** compiled from `librdkafka` source but it is rather link
 >>>>>>> 52b40e99abc811b2c4be1d3e62dd021e4bb1f6d4
 
 Requirements:
- * [node-gyp for Windows](https://github.com/nodejs/node-gyp#on-windows)  (the easies way to get it: `npm install --global --production windows-build-tools`, if your node version is 6.x or below, please use `npm install --global --production windows-build-tools@3.1.0`)
+ * [node-gyp for Windows](https://github.com/nodejs/node-gyp#on-windows)
 
 **Note:** I _still_ do not recommend using `node-rdkafka` in production on Windows. This feature was in high demand and is provided to help develop, but we do not test against Windows, and windows support may lag behind Linux/Mac support because those platforms are the ones used to develop this library. Contributors are welcome if any Windows issues are found :)
 

binding.gyp

@@ -43,7 +43,7 @@
               }
             ],
             'cflags_cc' : [
-              '-std=c++14'
+              '-std=c++17'
             ],
             'msvs_settings': {
               'VCLinkerTool': {
@@ -122,7 +122,7 @@
                 'OS=="linux"',
                 {
                   'cflags_cc' : [
-                    '-std=c++14'
+                    '-std=c++17'
                   ],
                   'cflags_cc!': [
                     '-fno-rtti'
@@ -140,7 +140,7 @@
                     ],
                     'OTHER_CPLUSPLUSFLAGS': [
                       '-I/usr/local/opt/openssl/include',
-                      '-std=c++14'
+                      '-std=c++17'
                     ],
                   },
                 }

ci/update-version.js

@@ -11,7 +11,7 @@ function parseVersion(tag) {
   const { major, minor, prerelease, patch } = semver.parse(tag);
 
   // Describe will give is commits since last tag
-  const [ commitsSinceTag, hash ] = prerelease[0] ? prerelease[0].split('-') : [
+  const [commitsSinceTag, hash] = prerelease[0] ? prerelease[0].split('-') : [
     1,
     process.env.TRAVIS_COMMIT || ''
   ];
@@ -84,19 +84,23 @@ function getBranch(cb) {
 }
 
 function getPackageVersion(tag, branch) {
-  let baseVersion = `v${tag.major}.${tag.minor}.${tag.patch}`;
+  const baseVersion = `v${tag.major}.${tag.minor}.${tag.patch}`;
 
-  if (tag.commit === 0 && branch === 'master') {
-    return baseVersion;
-  }
+  console.log(`Package version is "${baseVersion}"`);
 
-  baseVersion += '-';
+  // never publish with an suffix
+  // fixes https://github.com/Blizzard/node-rdkafka/issues/981
+  // baseVersion += '-';
 
-  if (branch !== 'master') {
-    baseVersion += (tag.commit + 1 + '.' + branch);
-  } else {
-    baseVersion += (tag.commit + 1);
-  }
+  // if (tag.commit === 0 && branch === 'master') {
+  //   return baseVersion;
+  // }
+
+  // if (branch !== 'master') {
+  //   baseVersion += (tag.commit + 1 + '.' + branch);
+  // } else {
+  //   baseVersion += (tag.commit + 1);
+  // }
 
   return baseVersion;
 }

lib/kafka-consumer.js

@@ -385,7 +385,7 @@ KafkaConsumer.prototype.unsubscribe = function() {
  * is fetched.
  */
 KafkaConsumer.prototype.consume = function(number, cb) {
-  var timeoutMs = this._consumeTimeout || DEFAULT_CONSUME_TIME_OUT;
+  var timeoutMs = this._consumeTimeout !== undefined ? this._consumeTimeout : DEFAULT_CONSUME_TIME_OUT;
   var self = this;
 
   if ((number && typeof number === 'number') || (number && cb)) {