@endoer/n8n-nodes-brightdata-modified 1.1.2 → 1.1.4
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.
|
@@ -8,39 +8,52 @@ const WebScrapperDescription_1 = require("./WebScrapperDescription");
|
|
|
8
8
|
const SearchFunctions_1 = require("./SearchFunctions");
|
|
9
9
|
const GenericFunctions_1 = require("./GenericFunctions");
|
|
10
10
|
function isEmptyResponse(data) {
|
|
11
|
-
if (
|
|
11
|
+
if (data === null || data === undefined || data === false) {
|
|
12
12
|
return true;
|
|
13
|
+
}
|
|
13
14
|
if (typeof data === 'string') {
|
|
14
15
|
const html = data.trim();
|
|
15
16
|
if (html === '')
|
|
16
17
|
return true;
|
|
18
|
+
let textToStrip = html;
|
|
17
19
|
if (html.toLowerCase().includes('<body')) {
|
|
18
20
|
const bodyMatch = html.match(/<body[^>]*>([\s\S]*?)<\/body>/i);
|
|
19
21
|
if (bodyMatch) {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
.replace(/ /g, ' ')
|
|
25
|
-
.replace(/\s+/g, ' ')
|
|
26
|
-
.trim();
|
|
27
|
-
return bodyContent.length === 0;
|
|
22
|
+
textToStrip = bodyMatch[1];
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
return true;
|
|
28
26
|
}
|
|
29
27
|
}
|
|
30
|
-
const
|
|
28
|
+
const stripped = textToStrip
|
|
31
29
|
.replace(/<script[\s\S]*?<\/script>/gi, '')
|
|
32
30
|
.replace(/<style[\s\S]*?<\/style>/gi, '')
|
|
33
31
|
.replace(/<[^>]+>/g, ' ')
|
|
34
32
|
.replace(/ /g, ' ')
|
|
35
33
|
.replace(/\s+/g, ' ')
|
|
36
34
|
.trim();
|
|
37
|
-
return
|
|
35
|
+
return stripped.length === 0;
|
|
36
|
+
}
|
|
37
|
+
if (Array.isArray(data)) {
|
|
38
|
+
if (data.length === 0)
|
|
39
|
+
return true;
|
|
40
|
+
return data.every((item) => isEmptyResponse(item));
|
|
38
41
|
}
|
|
39
|
-
if (typeof data === 'object'
|
|
42
|
+
if (typeof data === 'object') {
|
|
40
43
|
const obj = data;
|
|
41
44
|
if (obj.error)
|
|
42
45
|
return true;
|
|
43
|
-
|
|
46
|
+
const keys = Object.keys(obj);
|
|
47
|
+
if (keys.length === 0)
|
|
48
|
+
return true;
|
|
49
|
+
if (keys.length === 1 && (keys[0] === 'status' || keys[0] === 'statusCode' || keys[0] === 'success')) {
|
|
50
|
+
return true;
|
|
51
|
+
}
|
|
52
|
+
return keys.every((key) => {
|
|
53
|
+
if (['status', 'statusCode', 'success', 'country_code'].includes(key))
|
|
54
|
+
return true;
|
|
55
|
+
return isEmptyResponse(obj[key]);
|
|
56
|
+
});
|
|
44
57
|
}
|
|
45
58
|
return false;
|
|
46
59
|
}
|
|
@@ -200,7 +213,7 @@ class BrightData {
|
|
|
200
213
|
}
|
|
201
214
|
}
|
|
202
215
|
if (!success) {
|
|
203
|
-
throw lastError;
|
|
216
|
+
throw lastError || new n8n_workflow_1.NodeOperationError(this.getNode(), 'All countries failed to return valid data');
|
|
204
217
|
}
|
|
205
218
|
}
|
|
206
219
|
catch (error) {
|
|
@@ -211,7 +224,11 @@ class BrightData {
|
|
|
211
224
|
throw error;
|
|
212
225
|
}
|
|
213
226
|
}
|
|
214
|
-
|
|
227
|
+
const filteredData = returnData.filter(item => !isEmptyResponse(item.json));
|
|
228
|
+
if (filteredData.length === 0 && returnData.length > 0) {
|
|
229
|
+
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'No valid non-empty data was received from any country.');
|
|
230
|
+
}
|
|
231
|
+
return [filteredData.length > 0 ? filteredData : returnData];
|
|
215
232
|
}
|
|
216
233
|
else {
|
|
217
234
|
return await this.helpers.executeRouting.call(this);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrightData.node.js","sourceRoot":"","sources":["../../../nodes/BrightData/BrightData.node.ts"],"names":[],"mappings":";;;AAAA,+CAQsB;AAEtB,qEAAoF;AACpF,mFAGyC;AACzC,qEAAoF;AACpF,uDAA8E;AAC9E,yDAA0D;
|
|
1
|
+
{"version":3,"file":"BrightData.node.js","sourceRoot":"","sources":["../../../nodes/BrightData/BrightData.node.ts"],"names":[],"mappings":"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"}
|