Merge branch 'Blizzard:master' into master

Author: classicvalues

CONTRIBUTING.md

@@ -204,7 +204,7 @@ Steps to update:
 
     ```bash
     cd deps/librdkafka
-    git checkout 77a013b7a2611f7bdc091afa1e56b1a46d1c52f5 # for version 1.70
+    git checkout 063a9ae7a65cebdf1cc128da9815c05f91a2a996 # for version 1.8.2
     ```
 
 1. Update [`config.d.ts`](https://github.com/Blizzard/node-rdkafka/blob/master/config.d.ts) and [`errors.d.ts`](https://github.com/Blizzard/node-rdkafka/blob/master/errors.d.ts) TypeScript definitions by running:

README.md

@@ -16,7 +16,7 @@ I am looking for *your* help to make this project even better! If you're interes
 
 The `node-rdkafka` library is a high-performance NodeJS client for [Apache Kafka](http://kafka.apache.org/) that wraps the native  [librdkafka](https://github.com/edenhill/librdkafka) library.  All the complexity of balancing writes across partitions and managing (possibly ever-changing) brokers should be encapsulated in the library.
 
-__This library currently uses `librdkafka` version `1.7.0`.__
+__This library currently uses `librdkafka` version `1.8.2`.__
 
 ## Reference Docs
 
@@ -59,7 +59,7 @@ Using Alpine Linux? Check out the [docs](https://github.com/Blizzard/node-rdkafk
 
 ### Windows
 
-Windows build **is not** compiled from `librdkafka` source but it is rather linked against the appropriate version of [NuGet librdkafka.redist](https://www.nuget.org/packages/librdkafka.redist/) static binary that gets downloaded from `https://globalcdn.nuget.org/packages/librdkafka.redist.1.7.0.nupkg` during installation. This download link can be changed using the environment variable `NODE_RDKAFKA_NUGET_BASE_URL` that defaults to `https://globalcdn.nuget.org/packages/` when it's no set.
+Windows build **is not** compiled from `librdkafka` source but it is rather linked against the appropriate version of [NuGet librdkafka.redist](https://www.nuget.org/packages/librdkafka.redist/) static binary that gets downloaded from `https://globalcdn.nuget.org/packages/librdkafka.redist.1.8.2.nupkg` during installation. This download link can be changed using the environment variable `NODE_RDKAFKA_NUGET_BASE_URL` that defaults to `https://globalcdn.nuget.org/packages/` when it's no set.
 
 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, pleasse use `npm install --global --production windows-build-tools@3.1.0`)
@@ -96,7 +96,7 @@ var Kafka = require('node-rdkafka');
 
 ## Configuration
 
-You can pass many configuration options to `librdkafka`.  A full list can be found in `librdkafka`'s [Configuration.md](https://github.com/edenhill/librdkafka/blob/v1.7.0/CONFIGURATION.md)
+You can pass many configuration options to `librdkafka`.  A full list can be found in `librdkafka`'s [Configuration.md](https://github.com/edenhill/librdkafka/blob/v1.8.2/CONFIGURATION.md)
 
 Configuration keys that have the suffix `_cb` are designated as callbacks. Some
 of these keys are informational and you can choose to opt-in (for example, `dr_cb`). Others are callbacks designed to
@@ -131,7 +131,7 @@ You can also get the version of `librdkafka`
 const Kafka = require('node-rdkafka');
 console.log(Kafka.librdkafkaVersion);
 
-// #=> 1.7.0
+// #=> 1.8.2
 ```
 
 ## Sending Messages
@@ -144,7 +144,7 @@ var producer = new Kafka.Producer({
 });
 ```
 
-A `Producer` requires only `metadata.broker.list` (the Kafka brokers) to be created.  The values in this list are separated by commas.  For other configuration options, see the [Configuration.md](https://github.com/edenhill/librdkafka/blob/v1.7.0/CONFIGURATION.md) file described previously.
+A `Producer` requires only `metadata.broker.list` (the Kafka brokers) to be created.  The values in this list are separated by commas.  For other configuration options, see the [Configuration.md](https://github.com/edenhill/librdkafka/blob/v1.8.2/CONFIGURATION.md) file described previously.
 
 The following example illustrates a list with several `librdkafka` options set.
 

ci/librdkafka-defs-generator.js

@@ -181,7 +181,7 @@ function updateErrorDefinitions(file) {
   const error_js_file = path.resolve(__dirname, '../lib/error.js');
   const error_js = fs.readFileSync(error_js_file)
     .toString()
-    .replace(/(\/\/.*\n)?LibrdKafkaError.codes = {[^}]+/g, `${getHeader(file)}\nLibrdKafkaError.codes = {\n${body}`)
+    .replace(/(\/\/.*\r?\n)?LibrdKafkaError.codes = {[^}]+/g, `${getHeader(file)}\nLibrdKafkaError.codes = {\n${body}`)
 
   fs.writeFileSync(error_js_file, error_js);
   fs.writeFileSync(path.resolve(__dirname, '../errors.d.ts'), `${getHeader(file)}\nexport const CODES: { ERRORS: {${body.replace(/[ \.]*(\*\/\r?\n  \w+: )(-?\d+),?/g, ' (**$2**) $1number,')}}}`)

config.d.ts

@@ -1,4 +1,4 @@
-// ====== Generated from librdkafka 1.7.0 file CONFIGURATION.md ======
+// ====== Generated from librdkafka 1.8.2 file CONFIGURATION.md ======
 // Code that generated this is a derivative work of the code from Nam Nguyen
 // https://gist.github.com/ntgn81/066c2c8ec5b4238f85d1e9168a04e3fb
 
@@ -406,6 +406,11 @@ export interface GlobalConfig {
      */
     "ssl.ca.location"?: string;
 
+    /**
+     * CA certificate string (PEM format) for verifying the broker's key.
+     */
+    "ssl.ca.pem"?: string;
+
     /**
      * CA certificate as set by rd_kafka_conf_set_ssl_cert()
      */

deps/librdkafka

@@ -18,7 +18,7 @@
 outputDir = 'librdkafka.redist'
 outputFile = outputDir + '.zip'
 dllPath = outputDir + '/runtimes/win{}-x64/native'.format(librdkafkaWinSufix)
-libPath = outputDir + '/build/native/lib/win{}/x64/win{}-x64-Release/v120'.format(librdkafkaWinSufix, librdkafkaWinSufix)
+libPath = outputDir + '/build/native/lib/win{}/x64/win{}-x64-Release/v140'.format(librdkafkaWinSufix, librdkafkaWinSufix)
 includePath = outputDir + '/build/native/include/librdkafka'
 
 # download librdkafka from nuget
@@ -62,13 +62,14 @@ def createdir(dir):
 shutil.copy2(includePath + '/rdkafka.h', depsIncludeDir)
 shutil.copy2(includePath + '/rdkafkacpp.h', depsIncludeDir)
 
-shutil.copy2(dllPath + '/zlib.dll', buildReleaseDir)
-shutil.copy2(dllPath + '/msvcr120.dll', buildReleaseDir)
+shutil.copy2(dllPath + '/libcrypto-1_1-x64.dll', buildReleaseDir)
 shutil.copy2(dllPath + '/librdkafka.dll', buildReleaseDir)
 shutil.copy2(dllPath + '/librdkafkacpp.dll', buildReleaseDir)
-if not librdkafkaVersion.startswith('0.'):
-    shutil.copy2(dllPath + '/libzstd.dll', buildReleaseDir)
-    shutil.copy2(dllPath + '/msvcp120.dll', buildReleaseDir)
+shutil.copy2(dllPath + '/libssl-1_1-x64.dll', buildReleaseDir)
+shutil.copy2(dllPath + '/msvcp140.dll', buildReleaseDir)
+shutil.copy2(dllPath + '/vcruntime140.dll', buildReleaseDir)
+shutil.copy2(dllPath + '/zlib1.dll', buildReleaseDir)
+shutil.copy2(dllPath + '/zstd.dll', buildReleaseDir)
 
 # clean up
 os.remove(outputFile)

deps/windows-install.py

@@ -1,4 +1,4 @@
-// ====== Generated from librdkafka 1.7.0 file src-cpp/rdkafkacpp.h ======
+// ====== Generated from librdkafka 1.8.2 file src-cpp/rdkafkacpp.h ======
 export const CODES: { ERRORS: {
   /* Internal errors to rdkafka: */
   /** Begin internal error codes (**-200**) */

errors.d.ts

@@ -27,7 +27,7 @@ LibrdKafkaError.wrap = errorWrap;
  * @enum {number}
  * @constant
  */
-// ====== Generated from librdkafka 1.7.0 file src-cpp/rdkafkacpp.h ======
+// ====== Generated from librdkafka 1.8.2 file src-cpp/rdkafkacpp.h ======
 LibrdKafkaError.codes = {
 
   /* Internal errors to rdkafka: */

lib/error.js

@@ -2,7 +2,7 @@
   "name": "node-rdkafka",
   "version": "v2.12.0",
   "description": "Node.js bindings for librdkafka",
-  "librdkafka": "1.7.0",
+  "librdkafka": "1.8.2",
   "main": "lib/index.js",
   "scripts": {
     "configure": "node-gyp configure",