bullmq - npm Package Compare versions

Comparing version 1.15.0 to 1.15.1

dist/bullmq.d.ts

@@ -318,3 +318,4 @@ /// <reference types="node" />
     obliterate(opts?: {
-        force: boolean;
+        force?: boolean;
+        count?: number;
     }): Promise<void>;
@@ -658,3 +659,3 @@ trimEvents(maxLength: number): Promise<number>;
     static moveStalledJobsToWait(queue: QueueScheduler): Promise<any>;
-    static obliterate(queue: Queue, cursor: number, opts: {
+    static obliterate(queue: Queue, opts: {
         force: boolean;
@@ -661,0 +662,0 @@ count: number;

dist/classes/queue.d.ts

@@ -60,5 +60,6 @@ import { JobsOptions, QueueOptions, RepeatOptions } from '../interfaces';
     obliterate(opts?: {
-        force: boolean;
+        force?: boolean;
+        count?: number;
     }): Promise<void>;
     trimEvents(maxLength: number): Promise<number>;
 }

dist/classes/queue.js

@@ -151,4 +151,5 @@ "use strict";
      *
-     * @param { { force: boolean }} opts. Use force = true to force obliteration even
-     * with active jobs in the queue.
+     * @param { { force: boolean, count: number }} opts. Use force = true to force obliteration even
+     * with active jobs in the queue. Use count with the maximun number of deleted keys per iteration,
+     * 1000 is the default.
      */
@@ -159,3 +160,3 @@ async obliterate(opts) {
         do {
-            cursor = await scripts_1.Scripts.obliterate(this, cursor, Object.assign({ force: false, count: 5000 }, opts));
+            cursor = await scripts_1.Scripts.obliterate(this, Object.assign({ force: false, count: 1000 }, opts));
         } while (cursor);
@@ -162,0 +163,0 @@ }

dist/classes/scripts.d.ts

@@ -44,3 +44,3 @@ /**
     static moveStalledJobsToWait(queue: QueueScheduler): Promise<any>;
-    static obliterate(queue: Queue, cursor: number, opts: {
+    static obliterate(queue: Queue, opts: {
         force: boolean;
@@ -47,0 +47,0 @@ count: number;

dist/classes/scripts.js

@@ -311,7 +311,6 @@ /**
     }
-    static async obliterate(queue, cursor, opts) {
+    static async obliterate(queue, opts) {
         const client = await queue.client;
-        const pattern = `${queue.opts.prefix}:${queue.name}:*`;
-        const keys = [queue.keys.meta, queue.keys.active];
-        const args = [cursor, pattern, opts.count, opts.force ? 'force' : null];
+        const keys = [queue.keys.meta, queue.toKey('')];
+        const args = [opts.count, opts.force ? 'force' : null];
         const result = await client.obliterate(keys.concat(args));
@@ -318,0 +317,0 @@ if (result < 0) {

dist/test/test_obliterate.js

@@ -28,3 +28,3 @@ "use strict";
         const client = await queue.client;
-        const keys = await client.keys(`bull:${queue.name}*`);
+        const keys = await client.keys(`bull:${queue.name}:*`);
         chai_1.expect(keys.length).to.be.eql(0);
@@ -50,3 +50,3 @@ });
         const client = await queue.client;
-        const keys = await client.keys(`bull:${queue.name}*`);
+        const keys = await client.keys(`bull:${queue.name}:*`);
         chai_1.expect(keys.length).to.be.eql(0);
@@ -76,3 +76,3 @@ await worker.close();
             const client = await queue.client;
-            const keys = await client.keys(`bull:${queue.name}*`);
+            const keys = await client.keys(`bull:${queue.name}:*`);
             chai_1.expect(keys.length).to.be.not.eql(0);
@@ -102,3 +102,3 @@ await worker.close();
         const client = await queue.client;
-        const keys = await client.keys(`bull:${queue.name}*`);
+        const keys = await client.keys(`bull:${queue.name}:*`);
         chai_1.expect(keys.length).to.be.eql(0);
@@ -105,0 +105,0 @@ await worker.close();

docs/gitbook/CHANGELOG.md

@@ -0,1 +1,8 @@
+## [1.15.1](https://github.com/taskforcesh/bullmq/compare/v1.15.0...v1.15.1) (2021-03-19)
+
+
+### Bug Fixes
+
+* **obliterate:** safer implementation ([82f571f](https://github.com/taskforcesh/bullmq/commit/82f571f2548c61c776b897fd1c5050bb09c8afca))
+
 # [1.15.0](https://github.com/taskforcesh/bullmq/compare/v1.14.8...v1.15.0) (2021-03-18)
@@ -2,0 +9,0 @@

package.json

 {
   "name": "bullmq",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "description": "Queue for messages and jobs based on Redis",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

src/classes/queue.ts

@@ -220,6 +220,7 @@ import { get } from 'lodash';
    *
-   * @param { { force: boolean }} opts. Use force = true to force obliteration even
-   * with active jobs in the queue.
+   * @param { { force: boolean, count: number }} opts. Use force = true to force obliteration even
+   * with active jobs in the queue. Use count with the maximun number of deleted keys per iteration,
+   * 1000 is the default.
    */
-  async obliterate(opts?: { force: boolean }) {
+  async obliterate(opts?: { force?: boolean; count?: number }) {
     await this.pause();
@@ -229,5 +230,5 @@
     do {
-      cursor = await Scripts.obliterate(this, cursor, {
+      cursor = await Scripts.obliterate(this, {
         force: false,
-        count: 5000,
+        count: 1000,
         ...opts,
@@ -234,0 +235,0 @@ });

src/classes/scripts.ts

@@ -477,3 +477,2 @@ /**
     queue: Queue,
-    cursor: number,
     opts: { force: boolean; count: number },
@@ -483,7 +482,5 @@ ) {
 
-    const pattern = `${queue.opts.prefix}:${queue.name}:*`;
+    const keys: (string | number)[] = [queue.keys.meta, queue.toKey('')];
+    const args = [opts.count, opts.force ? 'force' : null];
 
-    const keys: (string | number)[] = [queue.keys.meta, queue.keys.active];
-    const args = [cursor, pattern, opts.count, opts.force ? 'force' : null];
-
     const result = await (<any>client).obliterate(keys.concat(args));
@@ -490,0 +487,0 @@ if (result < 0) {

src/test/test_obliterate.ts

@@ -32,3 +32,3 @@ import { Queue, QueueEvents, QueueScheduler, Worker } from '../classes';
     const client = await queue.client;
-    const keys = await client.keys(`bull:${queue.name}*`);
+    const keys = await client.keys(`bull:${queue.name}:*`);
 
@@ -60,3 +60,3 @@ expect(keys.length).to.be.eql(0);
     const client = await queue.client;
-    const keys = await client.keys(`bull:${queue.name}*`);
+    const keys = await client.keys(`bull:${queue.name}:*`);
     expect(keys.length).to.be.eql(0);
@@ -92,3 +92,3 @@
       const client = await queue.client;
-      const keys = await client.keys(`bull:${queue.name}*`);
+      const keys = await client.keys(`bull:${queue.name}:*`);
       expect(keys.length).to.be.not.eql(0);
@@ -125,3 +125,3 @@
     const client = await queue.client;
-    const keys = await client.keys(`bull:${queue.name}*`);
+    const keys = await client.keys(`bull:${queue.name}:*`);
     expect(keys.length).to.be.eql(0);
@@ -128,0 +128,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1216860

increased by0.29%

Lines of code

19674

increased by0.01%

No dependency changes