@endoer/n8n-nodes-brightdata-modified 1.1.4 → 1.1.6
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.
|
@@ -7,56 +7,6 @@ const MarketplaceDatasetDescription_1 = require("./MarketplaceDatasetDescription
|
|
|
7
7
|
const WebScrapperDescription_1 = require("./WebScrapperDescription");
|
|
8
8
|
const SearchFunctions_1 = require("./SearchFunctions");
|
|
9
9
|
const GenericFunctions_1 = require("./GenericFunctions");
|
|
10
|
-
function isEmptyResponse(data) {
|
|
11
|
-
if (data === null || data === undefined || data === false) {
|
|
12
|
-
return true;
|
|
13
|
-
}
|
|
14
|
-
if (typeof data === 'string') {
|
|
15
|
-
const html = data.trim();
|
|
16
|
-
if (html === '')
|
|
17
|
-
return true;
|
|
18
|
-
let textToStrip = html;
|
|
19
|
-
if (html.toLowerCase().includes('<body')) {
|
|
20
|
-
const bodyMatch = html.match(/<body[^>]*>([\s\S]*?)<\/body>/i);
|
|
21
|
-
if (bodyMatch) {
|
|
22
|
-
textToStrip = bodyMatch[1];
|
|
23
|
-
}
|
|
24
|
-
else {
|
|
25
|
-
return true;
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
|
-
const stripped = textToStrip
|
|
29
|
-
.replace(/<script[\s\S]*?<\/script>/gi, '')
|
|
30
|
-
.replace(/<style[\s\S]*?<\/style>/gi, '')
|
|
31
|
-
.replace(/<[^>]+>/g, ' ')
|
|
32
|
-
.replace(/ /g, ' ')
|
|
33
|
-
.replace(/\s+/g, ' ')
|
|
34
|
-
.trim();
|
|
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));
|
|
41
|
-
}
|
|
42
|
-
if (typeof data === 'object') {
|
|
43
|
-
const obj = data;
|
|
44
|
-
if (obj.error)
|
|
45
|
-
return true;
|
|
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
|
-
});
|
|
57
|
-
}
|
|
58
|
-
return false;
|
|
59
|
-
}
|
|
60
10
|
class BrightData {
|
|
61
11
|
constructor() {
|
|
62
12
|
this.description = {
|
|
@@ -188,23 +138,29 @@ class BrightData {
|
|
|
188
138
|
};
|
|
189
139
|
}
|
|
190
140
|
const responseData = await GenericFunctions_1.brightdataApiRequest.call(this, 'POST', '/request', body);
|
|
191
|
-
if (
|
|
192
|
-
throw new n8n_workflow_1.NodeOperationError(this.getNode(),
|
|
193
|
-
}
|
|
194
|
-
if (workingCountry !== country) {
|
|
195
|
-
workingCountry = country;
|
|
196
|
-
if (usePersistence) {
|
|
197
|
-
workflowStaticData.lastWorkingCountry = country;
|
|
198
|
-
}
|
|
141
|
+
if (!responseData || responseData === '') {
|
|
142
|
+
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Raw response is empty');
|
|
199
143
|
}
|
|
200
144
|
const executionData = this.helpers.returnJsonArray(responseData);
|
|
145
|
+
const processedEntries = [];
|
|
201
146
|
for (const entry of executionData) {
|
|
202
147
|
if (typeof entry.json !== 'object' || entry.json === null) {
|
|
203
|
-
entry.json = {
|
|
148
|
+
entry.json = { body: entry.json };
|
|
149
|
+
}
|
|
150
|
+
if (!entry.json.body && !entry.json.data && !entry.json.html) {
|
|
151
|
+
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Parsed content is empty');
|
|
204
152
|
}
|
|
205
153
|
entry.json.country_code = country;
|
|
206
|
-
|
|
154
|
+
entry.json.version_check = "1.1.5-final";
|
|
155
|
+
processedEntries.push(entry);
|
|
207
156
|
}
|
|
157
|
+
if (workingCountry !== country) {
|
|
158
|
+
workingCountry = country;
|
|
159
|
+
if (usePersistence) {
|
|
160
|
+
workflowStaticData.lastWorkingCountry = country;
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
returnData.push(...processedEntries);
|
|
208
164
|
success = true;
|
|
209
165
|
break;
|
|
210
166
|
}
|
|
@@ -213,7 +169,7 @@ class BrightData {
|
|
|
213
169
|
}
|
|
214
170
|
}
|
|
215
171
|
if (!success) {
|
|
216
|
-
throw lastError || new n8n_workflow_1.NodeOperationError(this.getNode(), 'All countries failed to return
|
|
172
|
+
throw lastError || new n8n_workflow_1.NodeOperationError(this.getNode(), 'All countries failed to return data');
|
|
217
173
|
}
|
|
218
174
|
}
|
|
219
175
|
catch (error) {
|
|
@@ -224,11 +180,7 @@ class BrightData {
|
|
|
224
180
|
throw error;
|
|
225
181
|
}
|
|
226
182
|
}
|
|
227
|
-
|
|
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];
|
|
183
|
+
return [returnData];
|
|
232
184
|
}
|
|
233
185
|
else {
|
|
234
186
|
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":";;;AAAA,+CAQsB;AAEtB,qEAAoF;AACpF,mFAGyC;AACzC,qEAAoF;AACpF,uDAA8E;AAC9E,yDAA0D;AAG1D,MAAa,UAAU;IAAvB;QACC,gBAAW,GAAyB;YACnC,WAAW,EAAE,YAAY;YACzB,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,4BAA4B;YAClC,KAAK,EAAE,CAAC,WAAW,CAAC;YACpB,OAAO,EAAE,CAAC;YACV,QAAQ,EAAE,8DAA8D;YACxE,WAAW,EACV,0HAA0H;YAC3H,QAAQ,EAAE;gBACT,IAAI,EAAE,YAAY;aAClB;YACD,YAAY,EAAE,IAAI;YAClB,MAAM,EAAE,CAAC,kCAAmB,CAAC,IAAI,CAAC;YAClC,OAAO,EAAE,CAAC,kCAAmB,CAAC,IAAI,CAAC;YACnC,WAAW,EAAE;gBACZ;oBACC,IAAI,EAAE,eAAe;oBACrB,QAAQ,EAAE,IAAI;iBACd;aACD;YACD,eAAe,EAAE;gBAChB,sBAAsB,EAAE,IAAI;gBAC5B,OAAO,EAAE,4BAA4B;gBACrC,OAAO,EAAE;oBACR,MAAM,EAAE,kBAAkB;oBAC1B,cAAc,EAAE,kBAAkB;iBAClC;aACD;YACD,UAAU,EAAE;gBACX;oBACC,WAAW,EAAE,UAAU;oBACvB,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,SAAS;oBACf,gBAAgB,EAAE,IAAI;oBACtB,OAAO,EAAE;wBACR;4BACC,IAAI,EAAE,qBAAqB;4BAC3B,KAAK,EAAE,oBAAoB;yBAC3B;wBACD;4BACC,IAAI,EAAE,aAAa;4BACnB,KAAK,EAAE,aAAa;yBACpB;wBACD;4BACC,IAAI,EAAE,cAAc;4BACpB,KAAK,EAAE,aAAa;yBACpB;qBACD;oBACD,OAAO,EAAE,aAAa;iBACtB;gBACD,GAAG,8CAAqB;gBACxB,GAAG,0CAAiB;gBACpB,GAAG,4DAA4B;gBAC/B,GAAG,wDAAwB;gBAC3B,GAAG,8CAAqB;gBACxB,GAAG,0CAAiB;aACpB;SACD,CAAC;QAEF,YAAO,GAAG;YACT,UAAU,EAAE;gBACX,cAAc,EAAE,gCAAc;gBAC9B,YAAY,EAAE,8BAAY;gBAC1B,WAAW,EAAE,6BAAW;aACxB;SACD,CAAC;IAoIH,CAAC;IAlIA,KAAK,CAAC,OAAO;QACZ,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAClC,MAAM,UAAU,GAAyB,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,CAAC,CAAW,CAAC;QAChE,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,CAAW,CAAC;QAElE,IAAI,QAAQ,KAAK,aAAa,EAAE,CAAC;YAChC,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,CAAC,EAAE,KAAK,CAAY,CAAC;YACpF,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;YAC9D,IAAI,cAAc,GAAG,CAAC,cAAc,IAAI,kBAAkB,CAAC,kBAAkB,CAEjE,CAAC;YAEb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACvC,IAAI,CAAC;oBACJ,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,EAAE,KAAK,CAAY,CAAC;oBACtF,MAAM,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAsB,CAAC;oBACpF,MAAM,cAAc,GAAG,kBAAkB,CAAC,KAAK,CAAC;oBAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAsB,CAAC;oBACvE,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC;oBAE5B,IAAI,cAAc,GAAG,CAAC,cAAc,CAAC,CAAC;oBACtC,IAAI,cAAc,EAAE,CAAC;wBACpB,cAAc,GAAG,CAAC,cAAc,EAAE,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,cAAc,CAAC,CAAC,CAAC;oBAC1F,CAAC;oBAED,IAAI,eAAe,EAAE,CAAC;wBACrB,MAAM,sBAAsB,GAAG,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,EAAE,CAAC,EAAE,EAAE,CAAW,CAAC;wBAC7F,IAAI,sBAAsB,EAAE,CAAC;4BAC5B,MAAM,MAAM,GAAG,sBAAsB;iCACnC,KAAK,CAAC,QAAQ,CAAC;iCACf,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;iCACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;4BACnB,cAAc,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,cAAc,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;wBAC/D,CAAC;oBACF,CAAC;oBAED,IAAI,SAAc,CAAC;oBACnB,IAAI,OAAO,GAAG,KAAK,CAAC;oBAEpB,KAAK,MAAM,OAAO,IAAI,cAAc,EAAE,CAAC;wBACtC,IAAI,CAAC;4BACJ,IAAI,IAAI,GAAgB,EAAE,CAAC;4BAC3B,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gCAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAW,CAAC;gCAC5D,MAAM,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC,CAAW,CAAC;gCACtD,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAW,CAAC;gCAC5D,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,aAAa,EAAE,CAAC,EAAE,EAAE,CAAW,CAAC;gCACzE,IAAI,GAAG;oCACN,IAAI;oCACJ,OAAO;oCACP,MAAM;oCACN,GAAG;oCACH,MAAM,EAAE,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;iCAClD,CAAC;gCACF,IAAI,UAAU,EAAE,CAAC;oCAChB,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;gCAC/B,CAAC;4BACF,CAAC;iCAAM,IAAI,SAAS,KAAK,WAAW,EAAE,CAAC;gCACtC,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAW,CAAC;gCAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAW,CAAC;gCAC3D,MAAM,GAAG,GAAG,mCAAmC,kBAAkB,CAChE,KAAK,CACL,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,aAAa,CAAC;gCACxC,IAAI,GAAG;oCACN,IAAI;oCACJ,OAAO;oCACP,GAAG;oCACH,MAAM,EAAE,KAAK;iCACb,CAAC;4BACH,CAAC;4BAED,MAAM,YAAY,GAAG,MAAM,uCAAoB,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;4BAErF,IAAI,CAAC,YAAY,IAAI,YAAY,KAAK,EAAE,EAAE,CAAC;gCAC1C,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,uBAAuB,CAAC,CAAC;4BACvE,CAAC;4BAED,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;4BACjE,MAAM,gBAAgB,GAAyB,EAAE,CAAC;4BAElD,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE,CAAC;gCACnC,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;oCAC3D,KAAK,CAAC,IAAI,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;gCACnC,CAAC;gCAGD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;oCAC9D,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,yBAAyB,CAAC,CAAC;gCACzE,CAAC;gCAED,KAAK,CAAC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC;gCAClC,KAAK,CAAC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;gCACzC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;4BAC9B,CAAC;4BAGD,IAAI,cAAc,KAAK,OAAO,EAAE,CAAC;gCAChC,cAAc,GAAG,OAAO,CAAC;gCACzB,IAAI,cAAc,EAAE,CAAC;oCACpB,kBAAkB,CAAC,kBAAkB,GAAG,OAAO,CAAC;gCACjD,CAAC;4BACF,CAAC;4BAED,UAAU,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,CAAC;4BACrC,OAAO,GAAG,IAAI,CAAC;4BACf,MAAM;wBAEP,CAAC;wBAAC,OAAO,KAAK,EAAE,CAAC;4BAChB,SAAS,GAAG,KAAK,CAAC;wBACnB,CAAC;oBACF,CAAC;oBAED,IAAI,CAAC,OAAO,EAAE,CAAC;wBACd,MAAM,SAAS,IAAI,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,qCAAqC,CAAC,CAAC;oBAClG,CAAC;gBACF,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAChB,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;wBAC3B,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;wBACpD,SAAS;oBACV,CAAC;oBACD,MAAM,KAAK,CAAC;gBACb,CAAC;YACF,CAAC;YAED,OAAO,CAAC,UAAU,CAAC,CAAC;QACrB,CAAC;aAAM,CAAC;YACP,OAAO,MAAO,IAAI,CAAC,OAAe,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9D,CAAC;IACF,CAAC;CACD;AAvMD,gCAuMC"}
|