@bull-board/cli 9.4.0 → 9.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/queueFactory.js +9 -3
- package/dist/queueFactory.js.map +1 -1
- package/package.json +4 -4
package/dist/queueFactory.js
CHANGED
|
@@ -9,6 +9,12 @@ const bullMQAdapter_1 = require("@bull-board/api/bullMQAdapter");
|
|
|
9
9
|
const bull_1 = __importDefault(require("bull"));
|
|
10
10
|
const bullmq_1 = require("bullmq");
|
|
11
11
|
const describeError_1 = require("./describeError");
|
|
12
|
+
// Bull 4.16.5 is the last release on that major and pins ioredis 5, and BullMQ 5 pins it too, so
|
|
13
|
+
// both declare their client against a different copy of ioredis than the one the CLI holds. Same
|
|
14
|
+
// client at runtime, two nominally distinct declarations. BullMQ 6 takes ioredis as an optional
|
|
15
|
+
// peer and needs no cast.
|
|
16
|
+
const asBullClient = (redis) => redis;
|
|
17
|
+
const asBullMQConnection = (redis) => redis;
|
|
12
18
|
function createQueueFactory({ client, readOnly, queueOptions, onWarning, }) {
|
|
13
19
|
let bullSubscriber;
|
|
14
20
|
function createQueue(discovered) {
|
|
@@ -20,7 +26,7 @@ function createQueueFactory({ client, readOnly, queueOptions, onWarning, }) {
|
|
|
20
26
|
};
|
|
21
27
|
if (discovered.lib === 'bullmq') {
|
|
22
28
|
const queue = new bullmq_1.Queue(discovered.name, {
|
|
23
|
-
connection: client,
|
|
29
|
+
connection: asBullMQConnection(client),
|
|
24
30
|
prefix: discovered.prefix,
|
|
25
31
|
// The dashboard only reads the queues it discovers, so it must not write their meta hash.
|
|
26
32
|
skipMetasUpdate: true,
|
|
@@ -35,7 +41,7 @@ function createQueueFactory({ client, readOnly, queueOptions, onWarning, }) {
|
|
|
35
41
|
prefix: discovered.prefix,
|
|
36
42
|
createClient: (type) => {
|
|
37
43
|
if (type === 'client')
|
|
38
|
-
return client;
|
|
44
|
+
return asBullClient(client);
|
|
39
45
|
// Bull rejects a subscriber that has enableReadyCheck or maxRetriesPerRequest set.
|
|
40
46
|
if (!bullSubscriber) {
|
|
41
47
|
bullSubscriber = client.duplicate({
|
|
@@ -43,7 +49,7 @@ function createQueueFactory({ client, readOnly, queueOptions, onWarning, }) {
|
|
|
43
49
|
maxRetriesPerRequest: null,
|
|
44
50
|
});
|
|
45
51
|
}
|
|
46
|
-
return bullSubscriber;
|
|
52
|
+
return asBullClient(bullSubscriber);
|
|
47
53
|
},
|
|
48
54
|
});
|
|
49
55
|
queue.on('error', (error) => onWarning(`Queue "${discovered.name}" connection error: ${(0, describeError_1.describeError)(error)}`));
|
package/dist/queueFactory.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queueFactory.js","sourceRoot":"","sources":["../src/queueFactory.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"queueFactory.js","sourceRoot":"","sources":["../src/queueFactory.ts"],"names":[],"mappings":";;;;;AAgCA,gDAgEC;AAhGD,6DAA0D;AAC1D,iEAA8D;AAE9D,gDAA6B;AAC7B,mCAA8C;AAE9C,mDAAgD;AAOhD,iGAAiG;AACjG,iGAAiG;AACjG,gGAAgG;AAChG,0BAA0B;AAC1B,MAAM,YAAY,GAAG,CAAC,KAAY,EAAE,EAAE,CAAC,KAAmC,CAAC;AAC3E,MAAM,kBAAkB,GAAG,CAAC,KAAY,EAAE,EAAE,CAAC,KAAoC,CAAC;AAclF,SAAgB,kBAAkB,CAAC,EACjC,MAAM,EACN,QAAQ,EACR,YAAY,EACZ,SAAS,GACQ;IACjB,IAAI,cAAiC,CAAC;IAEtC,SAAS,WAAW,CAAC,UAA2B;;QAC9C,iFAAiF;QACjF,MAAM,OAAO,GAAiC;YAC5C,GAAG,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC;YAChC,YAAY,EAAE,QAAQ,IAAI,CAAA,MAAA,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,0CAAE,YAAY,MAAK,IAAI;SAC/E,CAAC;QAEF,IAAI,UAAU,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;YAChC,MAAM,KAAK,GAAG,IAAI,cAAW,CAAC,UAAU,CAAC,IAAI,EAAE;gBAC7C,UAAU,EAAE,kBAAkB,CAAC,MAAM,CAAC;gBACtC,MAAM,EAAE,UAAU,CAAC,MAAM;gBACzB,0FAA0F;gBAC1F,eAAe,EAAE,IAAI;aACtB,CAAC,CAAC;YACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE,CACjC,SAAS,CAAC,UAAU,UAAU,CAAC,IAAI,uBAAuB,IAAA,6BAAa,EAAC,KAAK,CAAC,EAAE,CAAC,CAClF,CAAC;YAEF,OAAO;gBACL,OAAO,EAAE,IAAI,6BAAa,CAAC,KAAK,EAAE,OAAO,CAAC;gBAC1C,KAAK,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE;aAC3B,CAAC;QACJ,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,cAAS,CAAC,UAAU,CAAC,IAAI,EAAE;YAC3C,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;gBACrB,IAAI,IAAI,KAAK,QAAQ;oBAAE,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC;gBACnD,mFAAmF;gBACnF,IAAI,CAAC,cAAc,EAAE,CAAC;oBACpB,cAAc,GAAG,MAAM,CAAC,SAAS,CAAC;wBAChC,gBAAgB,EAAE,KAAK;wBACvB,oBAAoB,EAAE,IAAI;qBAC3B,CAAC,CAAC;gBACL,CAAC;gBAED,OAAO,YAAY,CAAC,cAAc,CAAC,CAAC;YACtC,CAAC;SACF,CAAC,CAAC;QACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE,CACjC,SAAS,CAAC,UAAU,UAAU,CAAC,IAAI,uBAAuB,IAAA,6BAAa,EAAC,KAAK,CAAC,EAAE,CAAC,CAClF,CAAC;QAEF,OAAO;YACL,OAAO,EAAE,IAAI,yBAAW,CAAC,KAAK,EAAE,OAAO,CAAC;YACxC,KAAK,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE;SAC3B,CAAC;IACJ,CAAC;IAED,OAAO;QACL,WAAW;QACX,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,MAAM,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,EAAE,CAAA,CAAC;YAC7B,cAAc,GAAG,SAAS,CAAC;QAC7B,CAAC;KACF,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bull-board/cli",
|
|
3
|
-
"version": "9.
|
|
3
|
+
"version": "9.5.0",
|
|
4
4
|
"description": "Run the bull-board dashboard against a Redis instance from the command line.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"bull",
|
|
@@ -38,12 +38,12 @@
|
|
|
38
38
|
"test": "jest"
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@bull-board/api": "9.
|
|
42
|
-
"@bull-board/express": "9.
|
|
41
|
+
"@bull-board/api": "9.5.0",
|
|
42
|
+
"@bull-board/express": "9.5.0",
|
|
43
43
|
"bull": "^4.16.5",
|
|
44
44
|
"bullmq": "^5.81.3",
|
|
45
45
|
"express": "^5.2.1",
|
|
46
|
-
"ioredis": "^
|
|
46
|
+
"ioredis": "^6.0.0"
|
|
47
47
|
},
|
|
48
48
|
"devDependencies": {
|
|
49
49
|
"@types/express": "^5.0.6",
|