Merge branch 'master' into tweak-doc-wording

.github/workflows/release.yml

@@ -52,7 +52,7 @@ jobs:
           # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
           flake8 ./python --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
       - name: Release Python
-        if: ${{ contains(env.commitmsg, '(python)') }}
+        if: ${{ contains(env.commitmsg, 'python') }}
         run: |
           cd python
           pip install packaging

.github/workflows/test.yml

@@ -58,15 +58,15 @@ jobs:
             exit 1
           fi
 
-  compatibility:
+  node-redis:
     runs-on: ubuntu-latest
 
     name: testing node@${{ matrix.node-version }}, redis@${{ matrix.redis-version }}
 
     strategy:
       matrix:
         node-version: [lts/*, lts/-1, lts/-2, current]
-        redis-version: [7.0-alpine]
+        redis-version: [7-alpine]
         include:
           - node-version: 'lts/*'
             redis-version: 6-alpine
@@ -87,6 +87,56 @@ jobs:
       - run: yarn build
       - run: yarn test
 
+  node-dragonflydb:
+    runs-on: ubuntu-latest
+
+    env:
+      node-version: lts/*
+
+    name: testing node@lts/*, dragonflydb@latest
+
+    services:
+      dragonflydb:
+        image: docker.dragonflydb.io/dragonflydb/dragonfly
+        env:
+          DFLY_cluster_mode: emulated
+          DFLY_lock_on_hashtags: true
+        ports:
+          - 6379:6379
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3 # v3
+      - name: Use Node.js ${{ env.node-version }}
+        uses: actions/setup-node@v3 # v3
+        with:
+          node-version: lts/*
+          cache: 'yarn'
+      - run: yarn install --ignore-engines --frozen-lockfile --non-interactive
+      - run: yarn build
+      - run: BULLMQ_TEST_PREFIX={b} yarn test
+
+  # node-upstash:
+  #   runs-on: ubuntu-latest
+  #   continue-on-error: true
+
+  #   env:
+  #     node-version: lts/*
+  #     REDIS_HOST: ${{ secrets.REDIS_HOST }}
+
+  #   name: testing node@lts/*, upstash@latest
+  #   steps:
+  #     - name: Checkout repository
+  #       uses: actions/checkout@v3 # v3
+  #     - name: Use Node.js ${{ env.node-version }}
+  #       uses: actions/setup-node@v3 # v3
+  #       with:
+  #         node-version: lts/*
+  #         cache: 'yarn'
+  #     - run: yarn install --ignore-engines --frozen-lockfile --non-interactive
+  #     - run: yarn build
+  #     - run: yarn test
+
   python:
     runs-on: ubuntu-latest
 

.mocharc.js

@@ -3,4 +3,5 @@ module.exports = {
   file: ['./mocha.setup.ts'],
   spec: ['./tests/test_*.ts'],
   timeout: 4000,
+  'trace-warnings': true,
 };

README.md

@@ -38,7 +38,7 @@ You can find tutorials and news in this blog: https://blog.taskforce.sh/
 
 # Official FrontEnd
 
-[<img src="http://taskforce.sh/assets/logo_square.png" width="200" alt="Taskforce.sh, Inc" style="padding: 200px"/>](https://taskforce.sh)
+[<img src="http://taskforce.sh/assets/logo_square.png" width="150" alt="Taskforce.sh, Inc" style="padding: 200px"/>](https://taskforce.sh)
 
 Supercharge your queues with a professional front end:
 
@@ -49,6 +49,32 @@ Supercharge your queues with a professional front end:
 
 Sign up at [Taskforce.sh](https://taskforce.sh)
 
+# 🚀 Sponsors 🚀
+
+<table cellspacing="0" cellpadding="0" border="0">
+  <tr>
+    <td>
+      <a href="https://www.dragonflydb.io/">
+        <img src="https://raw.githubusercontent.com/dragonflydb/dragonfly/main/.github/images/logo-full.svg" width=550 alt="Dragonfly" />
+      </a>
+    </td>
+    <td>
+      Dragonfly is a new Redis™ drop-in replacement that is fully compatible with BullMQ and brings some important advantages over Redis™ such as massive
+      better performance by utilizing all CPU cores available and faster and more memory efficient data structures. Read more <a href="https://www.dragonflydb.io/docs/integrations/bullmq">here</a> on how to use it with BullMQ.
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <a href="https://dashboard.memetria.com/new?utm_campaign=BULLMQ">
+        <img src="https://www.memetria.com/images/logo/memetria-logo.svg" width=350 alt="Memetria for Redis" />
+      </a>
+    </td>
+    <td>
+    If you need high quality production Redis instances for your BullMQ project, please consider subscribing to <a href="https://dashboard.memetria.com/new?utm_campaign=BULLMQ">Memetria for Redis</a>, leaders in Redis hosting that works perfectly with BullMQ. Use the promo code "BULLMQ" when signing up to help us sponsor the development of BullMQ!    
+    </td>
+  </tr>
+</table>
+
 # Used by
 
 Some notable organizations using BullMQ:
@@ -115,8 +141,8 @@ Some notable organizations using BullMQ:
       <td valign="center">
        <a href="https://www.nocodb.com">
         <img
-          src="https://www.nocodb.com/brand/logo-text.png"
-          width="150"
+          src="https://github.com/nocodb/nocodb/raw/develop/packages/nc-gui/assets/img/icons/512x512.png"
+          width="50"
           alt="NoCodeDB"
         />
       </a>
@@ -200,14 +226,6 @@ Since there are a few job queue solutions, here is a table comparing them:
 | UI                        |        ✓        |        ✓        |        ✓        |   ✓   |          | ✓      |
 | Optimized for             | Jobs / Messages | Jobs / Messages | Jobs / Messages | Jobs  | Messages | Jobs   |
 
-# 🚀 Sponsor 🚀
-
-<a href="https://dashboard.memetria.com/new?utm_campaign=BULLMQ">
-  <img src="https://www.memetria.com/images/logo/memetria-logo.svg" width=300 alt="Memetria for Redis" />
-</a>
-
-If you need high quality production Redis instances for your BullMQ project, please consider subscribing to [Memetria for Redis](https://dashboard.memetria.com/new?utm_campaign=BULLMQ), leaders in Redis hosting that works perfectly with BullMQ. Use the promo code "BULLMQ" when signing up to help us sponsor the development of BullMQ!
-
 ## Contributing
 
 Fork the repo, make some changes, submit a pull-request! Here is the [contributing](contributing.md) doc that has more details.

docs/gitbook/SUMMARY.md

@@ -40,6 +40,8 @@
 * [Returning job data](guide/returning-job-data.md)
 * [Events](guide/events.md)
 * [QueueScheduler](guide/queuescheduler.md)
+* [Redis™ Compatibility](guide/redis-tm-compatibility/README.md)
+  * [Dragonfly](guide/redis-tm-compatibility/dragonfly.md)
 * [Architecture](guide/architecture.md)
 * [NestJs](guide/nestjs/README.md)
   * [Producers](guide/nestjs/producers.md)

docs/gitbook/bull/patterns/redis-cluster.md

@@ -11,3 +11,4 @@ const queue = new Queue('cluster', {
 ```
 
 If you use several queues in the same cluster, you should use different prefixes so that the queues are evenly placed in the cluster nodes.
+

docs/gitbook/bullmq-pro/batches.md

@@ -21,7 +21,7 @@ const worker = new WorkerPro(
       await doSomethingWithBatchedJob(batchedJob);
     }
   },
-  { connection, batches: { size: 10 } },
+  { connection, batch: { size: 10 } },
 );
 ```
 
@@ -50,7 +50,7 @@ const worker = new WorkerPro(
       }
     }
   },
-  { connection, batches: { size: 10 } },
+  { connection, batch: { size: 10 } },
 );
 ```