n8n-nodes-bozonx-redis-sugar 1.22.0 → 1.24.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/nodes/RedisListSugar/redisClient.d.ts +1 -1
- package/dist/nodes/RedisListSugar/redisClient.js +5 -3
- package/dist/nodes/RedisListSugar/redisClient.js.map +1 -1
- package/dist/nodes/RedisQueueComplete/BozonxRedisQueueComplete.node.js +13 -25
- package/dist/nodes/RedisQueueComplete/BozonxRedisQueueComplete.node.js.map +1 -1
- package/dist/nodes/RedisQueueComplete/redisClient.d.ts +1 -1
- package/dist/nodes/RedisQueueComplete/redisClient.js +5 -3
- package/dist/nodes/RedisQueueComplete/redisClient.js.map +1 -1
- package/dist/nodes/RedisQueueConsumer/BozonxRedisQueueConsumer.node.js +76 -115
- package/dist/nodes/RedisQueueConsumer/BozonxRedisQueueConsumer.node.js.map +1 -1
- package/dist/nodes/RedisQueueConsumer/redisClient.d.ts +1 -1
- package/dist/nodes/RedisQueueConsumer/redisClient.js +5 -3
- package/dist/nodes/RedisQueueConsumer/redisClient.js.map +1 -1
- package/dist/nodes/RedisQueueProducer/BozonxRedisQueueProducer.node.js +131 -118
- package/dist/nodes/RedisQueueProducer/BozonxRedisQueueProducer.node.js.map +1 -1
- package/dist/nodes/RedisQueueProducer/redisClient.d.ts +1 -1
- package/dist/nodes/RedisQueueProducer/redisClient.js +7 -3
- package/dist/nodes/RedisQueueProducer/redisClient.js.map +1 -1
- package/dist/nodes/RedisStreamProducer/redisClient.d.ts +1 -1
- package/dist/nodes/RedisStreamProducer/redisClient.js +5 -3
- package/dist/nodes/RedisStreamProducer/redisClient.js.map +1 -1
- package/dist/nodes/RedisStreamTrigger/BozonxRedisStreamTrigger.node.js +17 -79
- package/dist/nodes/RedisStreamTrigger/BozonxRedisStreamTrigger.node.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -24,20 +24,20 @@ class BozonxRedisQueueProducer {
|
|
|
24
24
|
],
|
|
25
25
|
properties: [
|
|
26
26
|
{
|
|
27
|
-
displayName: '
|
|
28
|
-
name: '
|
|
27
|
+
displayName: 'Callback ID',
|
|
28
|
+
name: 'callbackId',
|
|
29
29
|
type: 'string',
|
|
30
30
|
default: '',
|
|
31
31
|
placeholder: 'Leave empty to use current workflow ID',
|
|
32
|
-
description: '
|
|
32
|
+
description: 'Identifier that links this producer to a specific trigger. Leave empty to use the current workflow ID.',
|
|
33
33
|
},
|
|
34
34
|
{
|
|
35
|
-
displayName: '
|
|
36
|
-
name: '
|
|
35
|
+
displayName: 'Queue Identifier',
|
|
36
|
+
name: 'queueIdentifier',
|
|
37
37
|
type: 'string',
|
|
38
38
|
default: '',
|
|
39
|
-
placeholder: 'e.g., user-123,
|
|
40
|
-
description: 'Optional
|
|
39
|
+
placeholder: 'e.g., user-123, chat-456',
|
|
40
|
+
description: 'Optional identifier to create parallel queues (e.g., per user or chat). Jobs with the same identifier are processed sequentially, but different identifiers can run in parallel.',
|
|
41
41
|
},
|
|
42
42
|
{
|
|
43
43
|
displayName: 'Data (YAML / JSON)',
|
|
@@ -89,133 +89,146 @@ class BozonxRedisQueueProducer {
|
|
|
89
89
|
const tls = (creds === null || creds === void 0 ? void 0 : creds.tls) || false;
|
|
90
90
|
const db = (_b = creds === null || creds === void 0 ? void 0 : creds.db) !== null && _b !== void 0 ? _b : 0;
|
|
91
91
|
const client = await (0, redisClient_1.getRedisClientConnected)({ host, port, username, password, tls, db });
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
const
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
dataObj
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
try {
|
|
115
|
-
dataObj = (0, js_yaml_1.load)(dataParam);
|
|
92
|
+
const blockingClient = await (0, redisClient_1.getRedisClientConnected)({ host, port, username, password, tls, db }, true);
|
|
93
|
+
try {
|
|
94
|
+
for (let i = 0; i < items.length; i++) {
|
|
95
|
+
try {
|
|
96
|
+
let callbackId = String(this.getNodeParameter('callbackId', i, '') || '').trim();
|
|
97
|
+
const queueIdentifier = String(this.getNodeParameter('queueIdentifier', i, '') || '').trim();
|
|
98
|
+
const lockTTL = this.getNodeParameter('lockTTL', i);
|
|
99
|
+
const responseTimeout = this.getNodeParameter('responseTimeout', i);
|
|
100
|
+
const includeInputFields = this.getNodeParameter('includeInputFields', i, false);
|
|
101
|
+
if (!callbackId) {
|
|
102
|
+
const workflow = this.getWorkflow();
|
|
103
|
+
callbackId = workflow.id || 'default-queue';
|
|
104
|
+
}
|
|
105
|
+
if (lockTTL < 1) {
|
|
106
|
+
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Lock TTL must be at least 1 second', {
|
|
107
|
+
itemIndex: i,
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
const dataParam = this.getNodeParameter('data', i, undefined);
|
|
111
|
+
let dataObj;
|
|
112
|
+
if (dataParam === undefined || dataParam === '') {
|
|
113
|
+
dataObj = items[i].json;
|
|
116
114
|
}
|
|
117
|
-
|
|
115
|
+
else if (typeof dataParam === 'string') {
|
|
118
116
|
try {
|
|
119
|
-
dataObj =
|
|
117
|
+
dataObj = (0, js_yaml_1.load)(dataParam);
|
|
120
118
|
}
|
|
121
|
-
catch
|
|
122
|
-
|
|
119
|
+
catch {
|
|
120
|
+
try {
|
|
121
|
+
dataObj = JSON.parse(dataParam);
|
|
122
|
+
}
|
|
123
|
+
catch (jsonError) {
|
|
124
|
+
throw new n8n_workflow_1.NodeOperationError(this.getNode(), `Invalid YAML or JSON provided in Data: ${jsonError.message}`, { itemIndex: i });
|
|
125
|
+
}
|
|
123
126
|
}
|
|
124
127
|
}
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
dataObj = dataParam;
|
|
128
|
-
}
|
|
129
|
-
const executionId = this.getExecutionId();
|
|
130
|
-
const jobId = `${queueId}:${executionId}:${i}:${Math.random().toString(36).substring(2, 7)}`;
|
|
131
|
-
const jobPayload = {
|
|
132
|
-
jobId,
|
|
133
|
-
data: dataObj,
|
|
134
|
-
lockTTL,
|
|
135
|
-
};
|
|
136
|
-
const jobData = JSON.stringify(jobPayload);
|
|
137
|
-
const queueKey = jobName ? `queue:${queueId}:${jobName}` : `queue:${queueId}`;
|
|
138
|
-
const responseKey = `response:${queueId}:${jobId}`;
|
|
139
|
-
const queueTTL = (0, redisClient_1.calculateQueueTTL)(lockTTL);
|
|
140
|
-
const c = client;
|
|
141
|
-
const position = (await c.sendCommand(['RPUSH', queueKey, jobData]));
|
|
142
|
-
await c.sendCommand(['EXPIRE', queueKey, String(queueTTL)]);
|
|
143
|
-
const isFirst = position === 1;
|
|
144
|
-
const startTime = Date.now();
|
|
145
|
-
const timeoutMs = responseTimeout * 1000;
|
|
146
|
-
let executionStartTime = null;
|
|
147
|
-
const lockTTLMs = lockTTL * 1000;
|
|
148
|
-
while (true) {
|
|
149
|
-
const now = Date.now();
|
|
150
|
-
const elapsedTotal = now - startTime;
|
|
151
|
-
if (elapsedTotal >= timeoutMs) {
|
|
152
|
-
throw new n8n_workflow_1.NodeOperationError(this.getNode(), `Response timeout after ${responseTimeout} seconds for job ${jobId}`, { itemIndex: i });
|
|
128
|
+
else {
|
|
129
|
+
dataObj = dataParam;
|
|
153
130
|
}
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
131
|
+
const executionId = this.getExecutionId();
|
|
132
|
+
const jobId = `${callbackId}:${queueIdentifier || 'default'}:${executionId}:${i}:${Math.random().toString(36).substring(2, 7)}`;
|
|
133
|
+
const jobPayload = {
|
|
134
|
+
jobId,
|
|
135
|
+
data: dataObj,
|
|
136
|
+
lockTTL,
|
|
137
|
+
queueIdentifier,
|
|
138
|
+
position: i,
|
|
139
|
+
isFirst: i === 0,
|
|
140
|
+
isLast: i === items.length - 1,
|
|
141
|
+
};
|
|
142
|
+
const jobData = JSON.stringify(jobPayload);
|
|
143
|
+
const queueKey = `queue:${callbackId}`;
|
|
144
|
+
const responseKey = `response:${callbackId}:${jobId}`;
|
|
145
|
+
const queueTTL = (0, redisClient_1.calculateQueueTTL)(lockTTL);
|
|
146
|
+
const c = client;
|
|
147
|
+
const bc = blockingClient;
|
|
148
|
+
const position = (await c.sendCommand(['RPUSH', queueKey, jobData]));
|
|
149
|
+
await c.sendCommand(['EXPIRE', queueKey, String(queueTTL)]);
|
|
150
|
+
const isFirst = position === 1;
|
|
151
|
+
const startTime = Date.now();
|
|
152
|
+
const timeoutMs = responseTimeout * 1000;
|
|
153
|
+
let executionStartTime = null;
|
|
154
|
+
const lockTTLMs = lockTTL * 1000;
|
|
155
|
+
while (true) {
|
|
156
|
+
const now = Date.now();
|
|
157
|
+
const elapsedTotal = now - startTime;
|
|
158
|
+
if (elapsedTotal >= timeoutMs) {
|
|
159
|
+
throw new n8n_workflow_1.NodeOperationError(this.getNode(), `Response timeout after ${responseTimeout} seconds for job ${jobId}`, { itemIndex: i });
|
|
158
160
|
}
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
blpopTimeout = Math.min(blpopTimeout, remainingExec);
|
|
165
|
-
}
|
|
166
|
-
blpopTimeout = Math.max(blpopTimeout, 1);
|
|
167
|
-
const res = (await c.sendCommand([
|
|
168
|
-
'BLPOP',
|
|
169
|
-
responseKey,
|
|
170
|
-
String(blpopTimeout),
|
|
171
|
-
]));
|
|
172
|
-
if (res && Array.isArray(res) && res.length >= 2) {
|
|
173
|
-
const responseData = res[1];
|
|
174
|
-
let parsedResponse;
|
|
175
|
-
try {
|
|
176
|
-
parsedResponse = JSON.parse(responseData);
|
|
161
|
+
if (executionStartTime !== null) {
|
|
162
|
+
const executionElapsed = now - executionStartTime;
|
|
163
|
+
if (executionElapsed >= lockTTLMs) {
|
|
164
|
+
throw new n8n_workflow_1.NodeOperationError(this.getNode(), `Execution timeout: Job ${jobId} exceeded Lock TTL (${lockTTL}s). It might be stuck or the consumer has crashed.`, { itemIndex: i });
|
|
165
|
+
}
|
|
177
166
|
}
|
|
178
|
-
|
|
179
|
-
|
|
167
|
+
const remainingTotal = Math.ceil((timeoutMs - elapsedTotal) / 1000);
|
|
168
|
+
let blpopTimeout = Math.min(remainingTotal, 5);
|
|
169
|
+
if (executionStartTime !== null) {
|
|
170
|
+
const remainingExec = Math.ceil((lockTTLMs - (now - executionStartTime)) / 1000);
|
|
171
|
+
blpopTimeout = Math.min(blpopTimeout, remainingExec);
|
|
180
172
|
}
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
173
|
+
blpopTimeout = Math.max(blpopTimeout, 1);
|
|
174
|
+
const res = (await bc.sendCommand([
|
|
175
|
+
'BLPOP',
|
|
176
|
+
responseKey,
|
|
177
|
+
String(blpopTimeout),
|
|
178
|
+
]));
|
|
179
|
+
if (res && Array.isArray(res) && res.length >= 2) {
|
|
180
|
+
const responseData = res[1];
|
|
181
|
+
let parsedResponse;
|
|
182
|
+
try {
|
|
183
|
+
parsedResponse = JSON.parse(responseData);
|
|
184
|
+
}
|
|
185
|
+
catch (parseError) {
|
|
186
|
+
throw new n8n_workflow_1.NodeOperationError(this.getNode(), `Failed to parse response data: ${parseError.message}`, { itemIndex: i });
|
|
187
|
+
}
|
|
188
|
+
const result = {
|
|
189
|
+
callbackId,
|
|
190
|
+
queueIdentifier: queueIdentifier || null,
|
|
191
|
+
jobId,
|
|
192
|
+
position,
|
|
193
|
+
isFirst,
|
|
194
|
+
data: parsedResponse.data,
|
|
195
|
+
isLast: parsedResponse.isLast,
|
|
196
|
+
};
|
|
197
|
+
returnData.push({
|
|
198
|
+
json: includeInputFields ? { ...items[i].json, result } : { result },
|
|
199
|
+
pairedItem: { item: i },
|
|
200
|
+
});
|
|
201
|
+
break;
|
|
202
|
+
}
|
|
203
|
+
const jobIndex = (await c.sendCommand(['LPOS', queueKey, jobData]));
|
|
204
|
+
if (jobIndex === null) {
|
|
205
|
+
if (executionStartTime === null) {
|
|
206
|
+
executionStartTime = Date.now();
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
else {
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
catch (error) {
|
|
214
|
+
if (this.continueOnFail()) {
|
|
190
215
|
returnData.push({
|
|
191
|
-
json:
|
|
216
|
+
json: { error: error.message },
|
|
192
217
|
pairedItem: { item: i },
|
|
193
218
|
});
|
|
194
|
-
|
|
219
|
+
continue;
|
|
195
220
|
}
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
if (executionStartTime === null) {
|
|
199
|
-
executionStartTime = Date.now();
|
|
200
|
-
}
|
|
201
|
-
}
|
|
202
|
-
else {
|
|
203
|
-
executionStartTime = null;
|
|
221
|
+
if (error instanceof n8n_workflow_1.NodeOperationError) {
|
|
222
|
+
throw error;
|
|
204
223
|
}
|
|
224
|
+
throw new n8n_workflow_1.NodeOperationError(this.getNode(), error, { itemIndex: i });
|
|
205
225
|
}
|
|
206
226
|
}
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
});
|
|
213
|
-
continue;
|
|
214
|
-
}
|
|
215
|
-
if (error instanceof n8n_workflow_1.NodeOperationError) {
|
|
216
|
-
throw error;
|
|
217
|
-
}
|
|
218
|
-
throw new n8n_workflow_1.NodeOperationError(this.getNode(), error, { itemIndex: i });
|
|
227
|
+
}
|
|
228
|
+
finally {
|
|
229
|
+
const bc = blockingClient;
|
|
230
|
+
if (bc.quit) {
|
|
231
|
+
await bc.quit().catch(() => { });
|
|
219
232
|
}
|
|
220
233
|
}
|
|
221
234
|
return [returnData];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BozonxRedisQueueProducer.node.js","sourceRoot":"","sources":["../../../nodes/RedisQueueProducer/BozonxRedisQueueProducer.node.ts"],"names":[],"mappings":";;;AAAA,+CAOsB;AACtB,qCAA2C;AAC3C,+CAA2E;AAE3E,MAAa,wBAAwB;IAArC;QACC,gBAAW,GAAyB;YACnC,WAAW,EAAE,iBAAiB;YAC9B,IAAI,EAAE,0BAA0B;YAChC,KAAK,EAAE,CAAC,QAAQ,CAAC;YACjB,OAAO,EAAE,CAAC;YACV,WAAW,EAAE,oEAAoE;YACjF,QAAQ,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE;YACrC,IAAI,EAAE,+BAA+B;YACrC,MAAM,EAAE,CAAC,MAAM,CAAC;YAChB,OAAO,EAAE,CAAC,MAAM,CAAC;YACjB,WAAW,EAAE;gBACZ;oBACC,IAAI,EAAE,aAAa;oBACnB,QAAQ,EAAE,IAAI;iBACd;aACD;YACD,UAAU,EAAE;gBACX;oBACC,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"BozonxRedisQueueProducer.node.js","sourceRoot":"","sources":["../../../nodes/RedisQueueProducer/BozonxRedisQueueProducer.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,5 +6,5 @@ export interface RedisConnectionOptions {
|
|
|
6
6
|
tls?: boolean;
|
|
7
7
|
db?: number;
|
|
8
8
|
}
|
|
9
|
-
export declare function getRedisClientConnected(opts: RedisConnectionOptions): Promise<unknown>;
|
|
9
|
+
export declare function getRedisClientConnected(opts: RedisConnectionOptions, standalone?: boolean): Promise<unknown>;
|
|
10
10
|
export declare function calculateQueueTTL(timeoutSec: number): number;
|
|
@@ -61,10 +61,10 @@ function buildUrl(opts) {
|
|
|
61
61
|
const dbPath = typeof opts.db === 'number' ? `/${opts.db}` : '';
|
|
62
62
|
return `${proto}://${authPart}${opts.host}:${opts.port}${dbPath}`;
|
|
63
63
|
}
|
|
64
|
-
async function getRedisClientConnected(opts) {
|
|
64
|
+
async function getRedisClientConnected(opts, standalone = false) {
|
|
65
65
|
const url = buildUrl(opts);
|
|
66
66
|
const cached = clients.get(url);
|
|
67
|
-
if (cached) {
|
|
67
|
+
if (cached && !standalone) {
|
|
68
68
|
if (cached.isOpen)
|
|
69
69
|
return cached;
|
|
70
70
|
try {
|
|
@@ -88,7 +88,11 @@ async function getRedisClientConnected(opts) {
|
|
|
88
88
|
client.on('error', () => {
|
|
89
89
|
});
|
|
90
90
|
await withTimeout(client.connect(), REDIS_CONNECT_DEADLINE_MS, `Redis connect timeout after ${REDIS_CONNECT_DEADLINE_MS}ms`);
|
|
91
|
-
|
|
91
|
+
if (!standalone) {
|
|
92
|
+
if (!standalone) {
|
|
93
|
+
clients.set(url, client);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
92
96
|
return client;
|
|
93
97
|
}
|
|
94
98
|
function calculateQueueTTL(timeoutSec) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redisClient.js","sourceRoot":"","sources":["../../../nodes/RedisQueueProducer/redisClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2CA,
|
|
1
|
+
{"version":3,"file":"redisClient.js","sourceRoot":"","sources":["../../../nodes/RedisQueueProducer/redisClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,4 +6,4 @@ export interface RedisConnectionOptions {
|
|
|
6
6
|
tls?: boolean;
|
|
7
7
|
db?: number;
|
|
8
8
|
}
|
|
9
|
-
export declare function getRedisClientConnected(opts: RedisConnectionOptions): Promise<unknown>;
|
|
9
|
+
export declare function getRedisClientConnected(opts: RedisConnectionOptions, standalone?: boolean): Promise<unknown>;
|
|
@@ -60,10 +60,10 @@ function buildUrl(opts) {
|
|
|
60
60
|
const dbPath = typeof opts.db === 'number' ? `/${opts.db}` : '';
|
|
61
61
|
return `${proto}://${authPart}${opts.host}:${opts.port}${dbPath}`;
|
|
62
62
|
}
|
|
63
|
-
async function getRedisClientConnected(opts) {
|
|
63
|
+
async function getRedisClientConnected(opts, standalone = false) {
|
|
64
64
|
const url = buildUrl(opts);
|
|
65
65
|
const cached = clients.get(url);
|
|
66
|
-
if (cached) {
|
|
66
|
+
if (cached && !standalone) {
|
|
67
67
|
if (cached.isOpen)
|
|
68
68
|
return cached;
|
|
69
69
|
try {
|
|
@@ -87,7 +87,9 @@ async function getRedisClientConnected(opts) {
|
|
|
87
87
|
client.on('error', () => {
|
|
88
88
|
});
|
|
89
89
|
await withTimeout(client.connect(), REDIS_CONNECT_DEADLINE_MS, `Redis connect timeout after ${REDIS_CONNECT_DEADLINE_MS}ms`);
|
|
90
|
-
|
|
90
|
+
if (!standalone) {
|
|
91
|
+
clients.set(url, client);
|
|
92
|
+
}
|
|
91
93
|
return client;
|
|
92
94
|
}
|
|
93
95
|
//# sourceMappingURL=redisClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redisClient.js","sourceRoot":"","sources":["../../../nodes/RedisStreamProducer/redisClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4CA,0DAqCC;AAjFD,mCAAoF;AAWpF,MAAM,yBAAyB,GAAG,KAAK,CAAC;AAExC,SAAS,WAAW,CAAI,OAAmB,EAAE,SAAiB,EAAE,OAAe;IAC9E,IAAI,OAAoD,CAAC;IACzD,OAAO,OAAO,CAAC,IAAI,CAAC;QACnB,OAAO;QACP,IAAI,OAAO,CAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;YAC5B,OAAO,GAAG,IAAA,mBAAY,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;QACrE,CAAC,CAAC;KACF,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;QACf,IAAI,OAAO;YAAE,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;IACtC,CAAC,CAAe,CAAC;AAClB,CAAC;AAGD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAmB,CAAC;AAE3C,SAAS,QAAQ,CAAC,IAA4B;;IAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;IAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ;QAC7B,CAAC,CAAC,GAAG,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,kBAAkB,CAAC,MAAA,IAAI,CAAC,QAAQ,mCAAI,EAAE,CAAC,GAAG;QACpF,CAAC,CAAC,IAAI,CAAC,QAAQ;YACd,CAAC,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG;YAC1C,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,MAAM,GAAG,OAAO,IAAI,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAChE,OAAO,GAAG,KAAK,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,GAAG,MAAM,EAAE,CAAC;AACnE,CAAC;AAOM,KAAK,UAAU,uBAAuB,CAAC,IAA4B;
|
|
1
|
+
{"version":3,"file":"redisClient.js","sourceRoot":"","sources":["../../../nodes/RedisStreamProducer/redisClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,7 +51,9 @@ class BozonxRedisStreamTrigger {
|
|
|
51
51
|
const tls = (creds === null || creds === void 0 ? void 0 : creds.tls) || false;
|
|
52
52
|
const db = (_b = creds === null || creds === void 0 ? void 0 : creds.db) !== null && _b !== void 0 ? _b : 0;
|
|
53
53
|
const client = await (0, redisClient_1.getRedisClientConnected)({ host, port, username, password, tls, db });
|
|
54
|
+
const blockingClient = await (0, redisClient_1.getRedisClientConnected)({ host, port, username, password, tls, db }, true);
|
|
54
55
|
const c = client;
|
|
56
|
+
const bc = blockingClient;
|
|
55
57
|
const streamKey = this.getNodeParameter('streamKey', 0).trim();
|
|
56
58
|
const blockMs = 10000;
|
|
57
59
|
const count = 50;
|
|
@@ -94,7 +96,7 @@ class BozonxRedisStreamTrigger {
|
|
|
94
96
|
if (blockMs && blockMs > 0)
|
|
95
97
|
cmd.push('BLOCK', String(blockMs));
|
|
96
98
|
cmd.push('STREAMS', streamKey, lastId);
|
|
97
|
-
const res = await
|
|
99
|
+
const res = await bc.sendCommand(cmd);
|
|
98
100
|
if (!res || !Array.isArray(res) || res.length === 0) {
|
|
99
101
|
continue;
|
|
100
102
|
}
|
|
@@ -135,69 +137,17 @@ class BozonxRedisStreamTrigger {
|
|
|
135
137
|
payload = fields['payload'];
|
|
136
138
|
}
|
|
137
139
|
else {
|
|
138
|
-
|
|
139
|
-
for (const [k, sv] of Object.entries(fields)) {
|
|
140
|
-
const t = sv.trim();
|
|
141
|
-
let val = sv;
|
|
142
|
-
if (t === 'true')
|
|
143
|
-
val = true;
|
|
144
|
-
else if (t === 'false')
|
|
145
|
-
val = false;
|
|
146
|
-
else if (t === 'null')
|
|
147
|
-
val = null;
|
|
148
|
-
else if ((t.startsWith('{') && t.endsWith('}')) ||
|
|
149
|
-
(t.startsWith('[') && t.endsWith(']'))) {
|
|
150
|
-
try {
|
|
151
|
-
val = JSON.parse(t);
|
|
152
|
-
}
|
|
153
|
-
catch {
|
|
154
|
-
void 0;
|
|
155
|
-
}
|
|
156
|
-
}
|
|
157
|
-
else {
|
|
158
|
-
const n = Number(t);
|
|
159
|
-
if (t !== '' && Number.isFinite(n))
|
|
160
|
-
val = n;
|
|
161
|
-
}
|
|
162
|
-
typed[k] = val;
|
|
163
|
-
}
|
|
164
|
-
payload = typed;
|
|
140
|
+
payload = { ...fields };
|
|
165
141
|
}
|
|
166
142
|
}
|
|
167
143
|
else if (Object.keys(fields).length > 0) {
|
|
168
|
-
|
|
169
|
-
for (const [k, sv] of Object.entries(fields)) {
|
|
170
|
-
const t = sv.trim();
|
|
171
|
-
let val = sv;
|
|
172
|
-
if (t === 'true')
|
|
173
|
-
val = true;
|
|
174
|
-
else if (t === 'false')
|
|
175
|
-
val = false;
|
|
176
|
-
else if (t === 'null')
|
|
177
|
-
val = null;
|
|
178
|
-
else if ((t.startsWith('{') && t.endsWith('}')) ||
|
|
179
|
-
(t.startsWith('[') && t.endsWith(']'))) {
|
|
180
|
-
try {
|
|
181
|
-
val = JSON.parse(t);
|
|
182
|
-
}
|
|
183
|
-
catch {
|
|
184
|
-
void 0;
|
|
185
|
-
}
|
|
186
|
-
}
|
|
187
|
-
else {
|
|
188
|
-
const n = Number(t);
|
|
189
|
-
if (t !== '' && Number.isFinite(n))
|
|
190
|
-
val = n;
|
|
191
|
-
}
|
|
192
|
-
typed[k] = val;
|
|
193
|
-
}
|
|
194
|
-
payload = typed;
|
|
144
|
+
payload = { ...fields };
|
|
195
145
|
}
|
|
196
146
|
else {
|
|
197
147
|
payload = null;
|
|
198
148
|
}
|
|
199
149
|
const result = { payload, _stream: streamKey, _id: id };
|
|
200
|
-
outItems.push({ json:
|
|
150
|
+
outItems.push({ json: result });
|
|
201
151
|
}
|
|
202
152
|
if (outItems.length > 0) {
|
|
203
153
|
this.emit([outItems]);
|
|
@@ -208,6 +158,9 @@ class BozonxRedisStreamTrigger {
|
|
|
208
158
|
continue;
|
|
209
159
|
}
|
|
210
160
|
}
|
|
161
|
+
if (bc.quit) {
|
|
162
|
+
await bc.quit().catch(() => { });
|
|
163
|
+
}
|
|
211
164
|
};
|
|
212
165
|
void readLoop();
|
|
213
166
|
return {
|
|
@@ -222,7 +175,7 @@ class BozonxRedisStreamTrigger {
|
|
|
222
175
|
if (blockMs && blockMs > 0)
|
|
223
176
|
cmd.push('BLOCK', String(blockMs));
|
|
224
177
|
cmd.push('STREAMS', streamKey, lastId);
|
|
225
|
-
const res = await
|
|
178
|
+
const res = await bc.sendCommand(cmd);
|
|
226
179
|
if (!res || !Array.isArray(res) || res.length === 0)
|
|
227
180
|
return;
|
|
228
181
|
const entriesWrap = res[0];
|
|
@@ -245,34 +198,19 @@ class BozonxRedisStreamTrigger {
|
|
|
245
198
|
fields[k] = v;
|
|
246
199
|
}
|
|
247
200
|
let payload = null;
|
|
248
|
-
if (Object.keys(fields).length === 1) {
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
const parsed = JSON.parse(fields['data']);
|
|
252
|
-
payload =
|
|
253
|
-
typeof parsed === 'object' && parsed !== null
|
|
254
|
-
? parsed
|
|
255
|
-
: { value: parsed };
|
|
256
|
-
}
|
|
257
|
-
catch {
|
|
258
|
-
payload = { data: fields['data'] };
|
|
259
|
-
}
|
|
260
|
-
}
|
|
261
|
-
else if (fields['payload'] !== undefined) {
|
|
262
|
-
payload = fields['payload'];
|
|
201
|
+
if (Object.keys(fields).length === 1 && fields['data'] !== undefined) {
|
|
202
|
+
try {
|
|
203
|
+
payload = JSON.parse(fields['data']);
|
|
263
204
|
}
|
|
264
|
-
|
|
265
|
-
payload = {
|
|
205
|
+
catch {
|
|
206
|
+
payload = { data: fields['data'] };
|
|
266
207
|
}
|
|
267
208
|
}
|
|
268
|
-
else if (Object.keys(fields).length > 0) {
|
|
269
|
-
payload = { ...fields };
|
|
270
|
-
}
|
|
271
209
|
else {
|
|
272
|
-
payload =
|
|
210
|
+
payload = { ...fields };
|
|
273
211
|
}
|
|
274
212
|
const result = { payload, _stream: streamKey, _id: id };
|
|
275
|
-
outItems.push({ json:
|
|
213
|
+
outItems.push({ json: result });
|
|
276
214
|
}
|
|
277
215
|
if (outItems.length > 0)
|
|
278
216
|
this.emit([outItems]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BozonxRedisStreamTrigger.node.js","sourceRoot":"","sources":["../../../nodes/RedisStreamTrigger/BozonxRedisStreamTrigger.node.ts"],"names":[],"mappings":";;;AAAA,+CAOsB;AACtB,oEAA6E;AAQ7E,MAAa,wBAAwB;IAArC;QACC,gBAAW,GAAyB;YACnC,WAAW,EAAE,mBAAmB;YAChC,IAAI,EAAE,0BAA0B;YAChC,KAAK,EAAE,CAAC,SAAS,CAAC;YAClB,OAAO,EAAE,CAAC;YACV,WAAW,EAAE,8DAA8D;YAC3E,QAAQ,EAAE,EAAE,IAAI,EAAE,mBAAmB,EAAE;YACvC,IAAI,EAAE,+BAA+B;YACrC,MAAM,EAAE,EAAE;YACV,OAAO,EAAE,CAAC,MAAM,CAAC;YACjB,WAAW,EAAE;gBACZ;oBACC,IAAI,EAAE,aAAa;oBACnB,QAAQ,EAAE,IAAI;iBACd;aACD;YACD,UAAU,EAAE;gBACX;oBACC,WAAW,EAAE,YAAY;oBACzB,IAAI,EAAE,WAAW;oBACjB,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,iBAAiB;oBAC1B,QAAQ,EAAE,IAAI;oBACd,WAAW,EAAE,+DAA+D;iBAC5E;gBACD;oBACC,WAAW,EAAE,yBAAyB;oBACtC,IAAI,EAAE,cAAc;oBACpB,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,CAAC;oBACV,WAAW,EACV,mHAAmH;iBACpH;aACD;YACD,YAAY,EAAE,IAAI;SAClB,CAAC;
|
|
1
|
+
{"version":3,"file":"BozonxRedisStreamTrigger.node.js","sourceRoot":"","sources":["../../../nodes/RedisStreamTrigger/BozonxRedisStreamTrigger.node.ts"],"names":[],"mappings":"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"}
|