@vendure/job-queue-plugin 3.5.2-master-202512180239 → 3.5.2-master-202512190240
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.
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Injector, Job, JobBufferStorageStrategy } from '@vendure/core';
|
|
2
2
|
export declare class RedisJobBufferStorageStrategy implements JobBufferStorageStrategy {
|
|
3
3
|
private redis;
|
|
4
|
+
private prefix;
|
|
4
5
|
init(injector: Injector): void;
|
|
5
6
|
add(bufferId: string, job: Job<any>): Promise<Job<any>>;
|
|
6
7
|
bufferSize(bufferIds?: string[]): Promise<{
|
|
@@ -4,10 +4,12 @@ exports.RedisJobBufferStorageStrategy = void 0;
|
|
|
4
4
|
const core_1 = require("@vendure/core");
|
|
5
5
|
const ioredis_1 = require("ioredis");
|
|
6
6
|
const constants_1 = require("./constants");
|
|
7
|
+
const utils_1 = require("./utils");
|
|
7
8
|
const BUFFER_LIST_PREFIX = 'vendure-job-buffer';
|
|
8
9
|
class RedisJobBufferStorageStrategy {
|
|
9
10
|
init(injector) {
|
|
10
11
|
const options = injector.get(constants_1.BULLMQ_PLUGIN_OPTIONS);
|
|
12
|
+
this.prefix = `${(0, utils_1.getPrefix)(options)}:`;
|
|
11
13
|
if (options.connection instanceof ioredis_1.Redis) {
|
|
12
14
|
this.redis = options.connection;
|
|
13
15
|
}
|
|
@@ -44,7 +46,7 @@ class RedisJobBufferStorageStrategy {
|
|
|
44
46
|
return result;
|
|
45
47
|
}
|
|
46
48
|
keyName(bufferId) {
|
|
47
|
-
return `${BUFFER_LIST_PREFIX}:${bufferId}`;
|
|
49
|
+
return `${this.prefix}${BUFFER_LIST_PREFIX}:${bufferId}`;
|
|
48
50
|
}
|
|
49
51
|
toJobConfigString(job) {
|
|
50
52
|
var _a;
|
|
@@ -75,20 +77,17 @@ class RedisJobBufferStorageStrategy {
|
|
|
75
77
|
}
|
|
76
78
|
}
|
|
77
79
|
async getAllBufferIds() {
|
|
80
|
+
const keyPrefix = `${this.prefix}${BUFFER_LIST_PREFIX}:`;
|
|
78
81
|
const stream = this.redis instanceof ioredis_1.Redis
|
|
79
|
-
? this.redis.scanStream({
|
|
80
|
-
|
|
81
|
-
})
|
|
82
|
-
: this.redis.nodes()[0].scanStream({
|
|
83
|
-
match: `${BUFFER_LIST_PREFIX}:*`,
|
|
84
|
-
});
|
|
82
|
+
? this.redis.scanStream({ match: `${keyPrefix}*` })
|
|
83
|
+
: this.redis.nodes()[0].scanStream({ match: `${keyPrefix}*` });
|
|
85
84
|
const keys = await new Promise((resolve, reject) => {
|
|
86
85
|
const allKeys = [];
|
|
87
86
|
stream.on('data', _keys => allKeys.push(..._keys));
|
|
88
87
|
stream.on('end', () => resolve(allKeys));
|
|
89
88
|
stream.on('error', err => reject(err));
|
|
90
89
|
});
|
|
91
|
-
return keys.map(key => key.replace(
|
|
90
|
+
return keys.map(key => key.replace(keyPrefix, ''));
|
|
92
91
|
}
|
|
93
92
|
}
|
|
94
93
|
exports.RedisJobBufferStorageStrategy = RedisJobBufferStorageStrategy;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis-job-buffer-storage-strategy.js","sourceRoot":"","sources":["../../src/bullmq/redis-job-buffer-storage-strategy.ts"],"names":[],"mappings":";;;AAAA,wCAA2F;AAC3F,qCAAuD;AAEvD,2CAA+D;
|
|
1
|
+
{"version":3,"file":"redis-job-buffer-storage-strategy.js","sourceRoot":"","sources":["../../src/bullmq/redis-job-buffer-storage-strategy.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vendure/job-queue-plugin",
|
|
3
|
-
"version": "3.5.2-master-
|
|
3
|
+
"version": "3.5.2-master-202512190240",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"main": "package/index.js",
|
|
6
6
|
"types": "package/index.d.ts",
|
|
@@ -27,8 +27,8 @@
|
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"@google-cloud/pubsub": "^4.11.0",
|
|
30
|
-
"@vendure/common": "^3.5.2-master-
|
|
31
|
-
"@vendure/core": "^3.5.2-master-
|
|
30
|
+
"@vendure/common": "^3.5.2-master-202512190240",
|
|
31
|
+
"@vendure/core": "^3.5.2-master-202512190240",
|
|
32
32
|
"bullmq": "^5.4.2",
|
|
33
33
|
"ioredis": "^5.3.2",
|
|
34
34
|
"rimraf": "^5.0.5",
|