@platformatic/rdkafka 4.0.1 → 4.1.0

package/test/kafka-consumer-worker.js

@@ -21,28 +21,31 @@ if (WorkerThreads.isMainThread) {
   return;
 }
 
-const interval = setInterval(() => {
+var interval = setInterval(function() {
   process._rawDebug('waiting for parent');
 }, 1000);
 
 var stream = Kafka.KafkaConsumer.createReadStream({
  	'metadata.broker.list': 'localhost:9092',
   'client.id': 'kafka-mocha-consumer',
- 	'group.id': 'kafka-mocha-grp',
-  'allow.auto.create.topics': true,
+  'group.id': WorkerThreads.workerData.groupId,
   'enable.auto.commit': false,
   'rebalance_cb': true,
-}, {}, {
-  topics: ['topic']
+}, {
+  'auto.offset.reset': 'earliest'
+}, {
+  topics: [WorkerThreads.workerData.topic]
 });
 
 stream.on('data', function(message) {
   process._rawDebug('received message', message);
-  WorkerThreads.parentPort?.postMessage({ message });
+  if (WorkerThreads.parentPort) {
+    WorkerThreads.parentPort.postMessage({ message: message });
+  }
   stream.consumer.commitMessage(message);
   stream.consumer.disconnect();
   stream.close(function () {
-    setTimeout(() => {
+    setTimeout(function() {
       process._rawDebug('exiting');
       clearInterval(interval);
       process.exit(0);

package/test/kafka-consumer.spec.js

@@ -31,7 +31,7 @@ module.exports = {
         client.disconnect(cb);
         client = null;
       } else {
-        cb()
+        cb();
       }
     },
     'does not modify config and clones it': function () {
@@ -54,30 +54,41 @@ module.exports = {
     },
     'does not crash in a worker': function (cb) {
       this.timeout(30000);
-      var consumer = new worker_threads.Worker(
-        path.join(__dirname, 'kafka-consumer-worker.js')
-      );
-
-      consumer.on('message', function(msg) {
-        process._rawDebug('got message');
-        t.strictEqual(Buffer.from(msg.message.value).toString(), 'my message');
-      });
-
-      let stream
-
-      consumer.on('exit', function(code) {
-        process._rawDebug('exiting');
-        stream.end();
-        t.strictEqual(code, 0);
-        cb();
-      });
-
-      stream = KafkaProducer.createWriteStream({
+      var topic = 'node-rdkafka-worker-' + Date.now();
+      var stream = KafkaProducer.createWriteStream({
         'metadata.broker.list': 'localhost:9092',
         'client.id': 'kafka-mocha-producer',
         'dr_cb': true
       }, {}, {
-        topic: 'topic'
+        topic: topic
+      });
+
+      stream.producer.once('delivery-report', function(err) {
+        if (err) {
+          cb(err);
+          return;
+        }
+
+        var consumer = new worker_threads.Worker(
+          path.join(__dirname, 'kafka-consumer-worker.js'),
+          { workerData: { topic: topic, groupId: topic } }
+        );
+        var timeout = setTimeout(function() {
+          consumer.terminate();
+        }, 25000);
+
+        consumer.on('message', function(msg) {
+          process._rawDebug('got message');
+          t.strictEqual(Buffer.from(msg.message.value).toString(), 'my message');
+        });
+
+        consumer.on('exit', function(code) {
+          process._rawDebug('exiting');
+          clearTimeout(timeout);
+          stream.end();
+          t.strictEqual(code, 0);
+          cb();
+        });
       });
 
       stream.write(Buffer.from('my message'));

package/ci/update-version.js

@@ -1,123 +0,0 @@
-const path = require('path');
-const semver = require('semver');
-const { spawn } = require('child_process');
-const fs = require('fs');
-
-const root = path.resolve(__dirname, '..');
-const pjsPath = path.resolve(root, 'package.json');
-const pjs = require(pjsPath);
-
-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('-') : [
-    1,
-    process.env.TRAVIS_COMMIT || ''
-  ];
-
-  return {
-    major,
-    minor,
-    prerelease,
-    patch,
-    commit: commitsSinceTag - 1,
-    hash
-  };
-}
-
-function getCommandOutput(command, args, cb) {
-  let output = '';
-
-  const cmd = spawn(command, args);
-
-  cmd.stdout.on('data', (data) => {
-    output += data;
-  });
-
-  cmd.on('close', (code) => {
-    if (code != 0) {
-      cb(new Error(`Command returned unsuccessful code: ${code}`));
-      return;
-    }
-
-    cb(null, output.trim());
-  });
-}
-
-function getVersion(cb) {
-  // https://docs.travis-ci.com/user/environment-variables/
-  if (process.env.TRAVIS_TAG) {
-    setImmediate(() => cb(null, parseVersion(process.env.TRAVIS_TAG.trim())));
-    return;
-  }
-
-  getCommandOutput('git', ['describe', '--tags'], (err, result) => {
-    if (err) {
-      cb(err);
-      return;
-    }
-
-    cb(null, parseVersion(result.trim()));
-  });
-}
-
-function getBranch(cb) {
-  if (process.env.TRAVIS_TAG) {
-    // TRAVIS_BRANCH matches TRAVIS_TAG when TRAVIS_TAG is set
-    // "git branch --contains tags/TRAVIS_TAG" doesn't work on travis so we have to assume 'master'
-    setImmediate(() => cb(null, 'master'));
-    return;
-  } else if (process.env.TRAVIS_BRANCH) {
-    setImmediate(() => cb(null, process.env.TRAVIS_BRANCH.trim()));
-    return;
-  }
-
-  getCommandOutput('git', ['rev-parse', '--abbrev-ref', 'HEAD'], (err, result) => {
-    if (err) {
-      cb(err);
-      return;
-    }
-
-    cb(null, result.trim());
-  });
-}
-
-function getPackageVersion(tag, branch) {
-  const baseVersion = `v${tag.major}.${tag.minor}.${tag.patch}`;
-
-  console.log(`Package version is "${baseVersion}"`);
-
-  // never publish with an suffix
-  // fixes https://github.com/Blizzard/node-rdkafka/issues/981
-  // baseVersion += '-';
-
-  // if (tag.commit === 0 && branch === 'master') {
-  //   return baseVersion;
-  // }
-
-  // if (branch !== 'master') {
-  //   baseVersion += (tag.commit + 1 + '.' + branch);
-  // } else {
-  //   baseVersion += (tag.commit + 1);
-  // }
-
-  return baseVersion;
-}
-
-getVersion((err, tag) => {
-  if (err) {
-    throw err;
-  }
-
-  getBranch((err, branch) => {
-    if (err) {
-      throw err;
-    }
-
-    pjs.version = getPackageVersion(tag, branch);
-
-    fs.writeFileSync(pjsPath, JSON.stringify(pjs, null, 2));
-  })
-
-});

package/deps/librdkafka/.semaphore/project.yml

@@ -1,43 +0,0 @@
-# This file is managed by ServiceBot plugin - Semaphore. The content in this file is created using a common
-# template and configurations in service.yml.
-# Modifications in this file will be overwritten by generated content in the nightly run.
-# For more information, please refer to the page:
-# https://confluentinc.atlassian.net/wiki/spaces/Foundations/pages/2871296194/Add+SemaphoreCI
-apiVersion: v1alpha
-kind: Project
-metadata:
-  name: librdkafka
-  description: ""
-spec:
-  visibility: private
-  repository:
-    url: git@github.com:confluentinc/librdkafka.git
-    run_on:
-    - tags
-    - branches
-    pipeline_file: .semaphore/semaphore.yml
-    integration_type: github_app
-    status:
-      pipeline_files:
-      - path: .semaphore/semaphore.yml
-        level: pipeline
-    whitelist:
-      branches:
-      - master
-      - /semaphore.*/
-      - /dev_.*/
-      - /feature\/.*/
-  custom_permissions: true
-  debug_permissions:
-  - empty
-  - default_branch
-  - non_default_branch
-  - pull_request
-  - forked_pull_request
-  - tag
-  attach_permissions:
-  - default_branch
-  - non_default_branch
-  - pull_request
-  - forked_pull_request
-  - tag

package/deps/librdkafka/.semaphore/project_public.yml

@@ -1,20 +0,0 @@
-# This file is managed by ServiceBot plugin - Semaphore. The content in this file is created using a common
-# template and configurations in service.yml.
-# Modifications in this file will be overwritten by generated content in the nightly run.
-# For more information, please refer to the page:
-# https://confluentinc.atlassian.net/wiki/spaces/Foundations/pages/2871296194/Add+SemaphoreCI
-apiVersion: v1alpha
-kind: Project
-metadata:
-  name: librdkafka
-  description: ""
-spec:
-  visibility: private
-  repository:
-    url: git@github.com:confluentinc/librdkafka.git
-    pipeline_file: .semaphore/semaphore.yml
-    integration_type: github_app
-    status:
-      pipeline_files:
-      - path: .semaphore/semaphore.yml
-        level: pipeline

package/deps/librdkafka/win32/install-openssl.ps1

@@ -1,33 +0,0 @@
-$OpenSSLVersion = "1_1_1k"
-$OpenSSLExe = "OpenSSL-$OpenSSLVersion.exe"
-
-if (!(Test-Path("C:\OpenSSL-Win32"))) {
-   instDir = "C:\OpenSSL-Win32"
-   $exeFull = "Win32$OpenSSLExe"
-   $exePath = "$($env:USERPROFILE)\$exeFull"
-
-   Write-Host "Downloading and installing OpenSSL v1.1 32-bit ..." -ForegroundColor Cyan
-   (New-Object Net.WebClient).DownloadFile('https://slproweb.com/download/$exeFull', $exePath)
-
-   Write-Host "Installing to $instDir..."
-   cmd /c start /wait $exePath /silent /verysilent /sp- /suppressmsgboxes /DIR=$instDir
-   Write-Host "Installed" -ForegroundColor Green
-} else {
-   echo "OpenSSL-Win32 already exists: not downloading"
-}
-
-
-if (!(Test-Path("C:\OpenSSL-Win64"))) {
-   instDir = "C:\OpenSSL-Win64"
-   $exeFull = "Win64$OpenSSLExe"
-   $exePath = "$($env:USERPROFILE)\$exeFull"
-
-   Write-Host "Downloading and installing OpenSSL v1.1 64-bit ..." -ForegroundColor Cyan
-   (New-Object Net.WebClient).DownloadFile('https://slproweb.com/download/$exeFull', $exePath)
-
-   Write-Host "Installing to $instDir..."
-   cmd /c start /wait $exePath /silent /verysilent /sp- /suppressmsgboxes /DIR=$instDir
-   Write-Host "Installed" -ForegroundColor Green
-} else {
-   echo "OpenSSL-Win64 already exists: not downloading"
-}