n8n-core 1.67.0 → 1.67.1
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/NodeExecuteFunctions.d.ts +8 -1
- package/dist/NodeExecuteFunctions.js +27 -13
- package/dist/NodeExecuteFunctions.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/node-execution-context/execute-single-context.js +2 -4
- package/dist/node-execution-context/execute-single-context.js.map +1 -1
- package/dist/node-execution-context/hook-context.js +1 -2
- package/dist/node-execution-context/hook-context.js.map +1 -1
- package/dist/node-execution-context/load-options-context.js +2 -4
- package/dist/node-execution-context/load-options-context.js.map +1 -1
- package/dist/node-execution-context/poll-context.js +3 -6
- package/dist/node-execution-context/poll-context.js.map +1 -1
- package/dist/node-execution-context/trigger-context.js +4 -8
- package/dist/node-execution-context/trigger-context.js.map +1 -1
- package/dist/node-execution-context/webhook-context.js +2 -4
- package/dist/node-execution-context/webhook-context.js.map +1 -1
- package/package.json +3 -3
- package/dist/node-execution-context/helpers/binary-helpers.d.ts +0 -15
- package/dist/node-execution-context/helpers/binary-helpers.js +0 -117
- package/dist/node-execution-context/helpers/binary-helpers.js.map +0 -1
- package/dist/node-execution-context/helpers/request-helpers.d.ts +0 -20
- package/dist/node-execution-context/helpers/request-helpers.js +0 -192
- package/dist/node-execution-context/helpers/request-helpers.js.map +0 -1
- package/dist/node-execution-context/helpers/scheduling-helpers.d.ts +0 -8
- package/dist/node-execution-context/helpers/scheduling-helpers.js +0 -21
- package/dist/node-execution-context/helpers/scheduling-helpers.js.map +0 -1
- package/dist/node-execution-context/helpers/ssh-tunnel-helpers.d.ts +0 -6
- package/dist/node-execution-context/helpers/ssh-tunnel-helpers.js +0 -20
- package/dist/node-execution-context/helpers/ssh-tunnel-helpers.js.map +0 -1
|
@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.ExecuteSingleContext = void 0;
|
|
4
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
5
|
const NodeExecuteFunctions_1 = require("../NodeExecuteFunctions");
|
|
6
|
-
const binary_helpers_1 = require("./helpers/binary-helpers");
|
|
7
|
-
const request_helpers_1 = require("./helpers/request-helpers");
|
|
8
6
|
const node_execution_context_1 = require("./node-execution-context");
|
|
9
7
|
class ExecuteSingleContext extends node_execution_context_1.NodeExecutionContext {
|
|
10
8
|
constructor(workflow, node, additionalData, mode, runExecutionData, runIndex, connectionInputData, inputData, itemIndex, executeData, abortSignal) {
|
|
@@ -19,8 +17,8 @@ class ExecuteSingleContext extends node_execution_context_1.NodeExecutionContext
|
|
|
19
17
|
this.helpers = {
|
|
20
18
|
createDeferredPromise: n8n_workflow_1.createDeferredPromise,
|
|
21
19
|
returnJsonArray: NodeExecuteFunctions_1.returnJsonArray,
|
|
22
|
-
...
|
|
23
|
-
...
|
|
20
|
+
...(0, NodeExecuteFunctions_1.getRequestHelperFunctions)(workflow, node, additionalData, runExecutionData, connectionInputData),
|
|
21
|
+
...(0, NodeExecuteFunctions_1.getBinaryHelperFunctions)(additionalData, workflow.id),
|
|
24
22
|
assertBinaryData: (propertyName, inputIndex = 0) => (0, NodeExecuteFunctions_1.assertBinaryData)(inputData, node, itemIndex, propertyName, inputIndex),
|
|
25
23
|
getBinaryDataBuffer: async (propertyName, inputIndex = 0) => await (0, NodeExecuteFunctions_1.getBinaryDataBuffer)(inputData, itemIndex, propertyName, inputIndex),
|
|
26
24
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-single-context.js","sourceRoot":"","sources":["../../src/node-execution-context/execute-single-context.ts"],"names":[],"mappings":";;;AAgBA,+CAKsB;AAGtB,
|
|
1
|
+
{"version":3,"file":"execute-single-context.js","sourceRoot":"","sources":["../../src/node-execution-context/execute-single-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,14 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.HookContext = void 0;
|
|
4
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
5
|
const NodeExecuteFunctions_1 = require("../NodeExecuteFunctions");
|
|
6
|
-
const request_helpers_1 = require("./helpers/request-helpers");
|
|
7
6
|
const node_execution_context_1 = require("./node-execution-context");
|
|
8
7
|
class HookContext extends node_execution_context_1.NodeExecutionContext {
|
|
9
8
|
constructor(workflow, node, additionalData, mode, activation, webhookData) {
|
|
10
9
|
super(workflow, node, additionalData, mode);
|
|
11
10
|
this.activation = activation;
|
|
12
11
|
this.webhookData = webhookData;
|
|
13
|
-
this.helpers =
|
|
12
|
+
this.helpers = (0, NodeExecuteFunctions_1.getRequestHelperFunctions)(workflow, node, additionalData);
|
|
14
13
|
}
|
|
15
14
|
getActivationMode() {
|
|
16
15
|
return this.activation;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hook-context.js","sourceRoot":"","sources":["../../src/node-execution-context/hook-context.ts"],"names":[],"mappings":";;;AAeA,+CAAgD;AAGhD,
|
|
1
|
+
{"version":3,"file":"hook-context.js","sourceRoot":"","sources":["../../src/node-execution-context/hook-context.ts"],"names":[],"mappings":";;;AAeA,+CAAgD;AAGhD,iEAOgC;AAEhC,qEAAgE;AAEhE,MAAa,WAAY,SAAQ,6CAAoB;IAGpD,YACC,QAAkB,EAClB,IAAW,EACX,cAA8C,EAC9C,IAAyB,EACR,UAAgC,EAChC,WAA0B;QAE3C,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;QAH3B,eAAU,GAAV,UAAU,CAAsB;QAChC,gBAAW,GAAX,WAAW,CAAe;QAI3C,IAAI,CAAC,OAAO,GAAG,IAAA,gDAAyB,EAAC,QAAQ,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;IAC1E,CAAC;IAED,iBAAiB;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,cAAc,CAAoD,IAAY;QACnF,OAAO,MAAM,IAAA,qCAAc,EAAI,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAChG,CAAC;IAED,gBAAgB,CACf,aAAqB,EAErB,aAAmB,EACnB,OAAkC;QAElC,MAAM,gBAAgB,GAA6B,IAAI,CAAC;QACxD,MAAM,SAAS,GAAG,CAAC,CAAC;QACpB,MAAM,QAAQ,GAAG,CAAC,CAAC;QACnB,MAAM,mBAAmB,GAAyB,EAAE,CAAC;QAErD,OAAO,IAAA,uCAAgB,EACtB,IAAI,CAAC,QAAQ,EACb,gBAAgB,EAChB,QAAQ,EACR,mBAAmB,EACnB,IAAI,CAAC,IAAI,EACT,aAAa,EACb,SAAS,EACT,IAAI,CAAC,IAAI,EACT,IAAA,wCAAiB,EAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,EAAE,gBAAgB,CAAC,EACnE,SAAS,EACT,aAAa,EACb,OAAO,CACP,CAAC;IACH,CAAC;IAED,iBAAiB,CAAC,IAAiB;QAClC,OAAO,IAAA,wCAAiB,EACvB,IAAI,EACJ,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,IAAI,EACT,IAAA,wCAAiB,EAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EACvD,IAAI,CAAC,WAAW,EAAE,MAAM,CACxB,CAAC;IACH,CAAC;IAED,cAAc;QACb,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACpC,MAAM,IAAI,+BAAgB,CAAC,qCAAqC,CAAC,CAAC;QACnE,CAAC;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC;IACjD,CAAC;IAED,qBAAqB,CAAC,IAAiB;QACtC,OAAO,IAAA,4CAAqB,EAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9D,CAAC;CACD;AAzED,kCAyEC"}
|
|
@@ -4,16 +4,14 @@ exports.LoadOptionsContext = void 0;
|
|
|
4
4
|
const lodash_1 = require("lodash");
|
|
5
5
|
const ExtractValue_1 = require("../ExtractValue");
|
|
6
6
|
const NodeExecuteFunctions_1 = require("../NodeExecuteFunctions");
|
|
7
|
-
const request_helpers_1 = require("./helpers/request-helpers");
|
|
8
|
-
const ssh_tunnel_helpers_1 = require("./helpers/ssh-tunnel-helpers");
|
|
9
7
|
const node_execution_context_1 = require("./node-execution-context");
|
|
10
8
|
class LoadOptionsContext extends node_execution_context_1.NodeExecutionContext {
|
|
11
9
|
constructor(workflow, node, additionalData, path) {
|
|
12
10
|
super(workflow, node, additionalData, 'internal');
|
|
13
11
|
this.path = path;
|
|
14
12
|
this.helpers = {
|
|
15
|
-
...
|
|
16
|
-
...
|
|
13
|
+
...(0, NodeExecuteFunctions_1.getSSHTunnelFunctions)(),
|
|
14
|
+
...(0, NodeExecuteFunctions_1.getRequestHelperFunctions)(workflow, node, additionalData),
|
|
17
15
|
};
|
|
18
16
|
}
|
|
19
17
|
async getCredentials(type) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-options-context.js","sourceRoot":"","sources":["../../src/node-execution-context/load-options-context.ts"],"names":[],"mappings":";;;AAAA,mCAA6B;AAa7B,iDAA8C;AAE9C,
|
|
1
|
+
{"version":3,"file":"load-options-context.js","sourceRoot":"","sources":["../../src/node-execution-context/load-options-context.ts"],"names":[],"mappings":";;;AAAA,mCAA6B;AAa7B,iDAA8C;AAE9C,iEAMgC;AAEhC,qEAAgE;AAEhE,MAAa,kBAAmB,SAAQ,6CAAoB;IAG3D,YACC,QAAkB,EAClB,IAAW,EACX,cAA8C,EAC7B,IAAY;QAE7B,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;QAFjC,SAAI,GAAJ,IAAI,CAAQ;QAI7B,IAAI,CAAC,OAAO,GAAG;YACd,GAAG,IAAA,4CAAqB,GAAE;YAC1B,GAAG,IAAA,gDAAyB,EAAC,QAAQ,EAAE,IAAI,EAAE,cAAc,CAAC;SAC5D,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAAoD,IAAY;QACnF,OAAO,MAAM,IAAA,qCAAc,EAAI,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAChG,CAAC;IAED,uBAAuB,CACtB,aAAqB,EACrB,OAAkC;QAElC,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC;QAEjE,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YACrC,aAAa,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5F,CAAC;QAED,IAAI,UAAU,GAAG,IAAA,YAAG,EAAC,cAAc,EAAE,aAAa,CAAC,CAAC;QAGpD,IAAI,OAAO,EAAE,YAAY,EAAE,CAAC;YAC3B,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CAC3D,IAAI,CAAC,IAAI,CAAC,IAAI,EACd,IAAI,CAAC,IAAI,CAAC,WAAW,CACrB,CAAC;YACF,UAAU,GAAG,IAAA,2BAAY,EACxB,UAAU,EACV,aAAa,EACb,IAAI,CAAC,IAAI,EACT,QAAQ,CACkB,CAAC;QAC7B,CAAC;QAED,OAAO,UAAU,CAAC;IACnB,CAAC;IAED,wBAAwB;QACvB,OAAO,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC;IAClD,CAAC;IAED,gBAAgB,CACf,aAAqB,EAErB,aAAmB,EACnB,OAAkC;QAElC,MAAM,gBAAgB,GAA6B,IAAI,CAAC;QACxD,MAAM,SAAS,GAAG,CAAC,CAAC;QACpB,MAAM,QAAQ,GAAG,CAAC,CAAC;QACnB,MAAM,mBAAmB,GAAyB,EAAE,CAAC;QAErD,OAAO,IAAA,uCAAgB,EACtB,IAAI,CAAC,QAAQ,EACb,gBAAgB,EAChB,QAAQ,EACR,mBAAmB,EACnB,IAAI,CAAC,IAAI,EACT,aAAa,EACb,SAAS,EACT,IAAI,CAAC,IAAI,EACT,IAAA,wCAAiB,EAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,EAAE,gBAAgB,CAAC,EACnE,SAAS,EACT,aAAa,EACb,OAAO,CACP,CAAC;IACH,CAAC;CACD;AAhFD,gDAgFC"}
|
|
@@ -3,9 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.PollContext = void 0;
|
|
4
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
5
|
const NodeExecuteFunctions_1 = require("../NodeExecuteFunctions");
|
|
6
|
-
const binary_helpers_1 = require("./helpers/binary-helpers");
|
|
7
|
-
const request_helpers_1 = require("./helpers/request-helpers");
|
|
8
|
-
const scheduling_helpers_1 = require("./helpers/scheduling-helpers");
|
|
9
6
|
const node_execution_context_1 = require("./node-execution-context");
|
|
10
7
|
const throwOnEmit = () => {
|
|
11
8
|
throw new n8n_workflow_1.ApplicationError('Overwrite PollContext.__emit function');
|
|
@@ -22,9 +19,9 @@ class PollContext extends node_execution_context_1.NodeExecutionContext {
|
|
|
22
19
|
this.helpers = {
|
|
23
20
|
createDeferredPromise: n8n_workflow_1.createDeferredPromise,
|
|
24
21
|
returnJsonArray: NodeExecuteFunctions_1.returnJsonArray,
|
|
25
|
-
...
|
|
26
|
-
...
|
|
27
|
-
...
|
|
22
|
+
...(0, NodeExecuteFunctions_1.getRequestHelperFunctions)(workflow, node, additionalData),
|
|
23
|
+
...(0, NodeExecuteFunctions_1.getBinaryHelperFunctions)(additionalData, workflow.id),
|
|
24
|
+
...(0, NodeExecuteFunctions_1.getSchedulingFunctions)(workflow),
|
|
28
25
|
};
|
|
29
26
|
}
|
|
30
27
|
getActivationMode() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poll-context.js","sourceRoot":"","sources":["../../src/node-execution-context/poll-context.ts"],"names":[],"mappings":";;;AAaA,+CAAuE;AAGvE,
|
|
1
|
+
{"version":3,"file":"poll-context.js","sourceRoot":"","sources":["../../src/node-execution-context/poll-context.ts"],"names":[],"mappings":";;;AAaA,+CAAuE;AAGvE,iEAQgC;AAEhC,qEAAgE;AAEhE,MAAM,WAAW,GAAG,GAAG,EAAE;IACxB,MAAM,IAAI,+BAAgB,CAAC,uCAAuC,CAAC,CAAC;AACrE,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,GAAG,EAAE;IAC7B,MAAM,IAAI,+BAAgB,CAAC,4CAA4C,CAAC,CAAC;AAC1E,CAAC,CAAC;AAEF,MAAa,WAAY,SAAQ,6CAAoB;IAGpD,YACC,QAAkB,EAClB,IAAW,EACX,cAA8C,EAC9C,IAAyB,EACR,UAAgC,EACxC,SAAmC,WAAW,EAC9C,cAA6C,gBAAgB;QAEtE,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;QAJ3B,eAAU,GAAV,UAAU,CAAsB;QACxC,WAAM,GAAN,MAAM,CAAwC;QAC9C,gBAAW,GAAX,WAAW,CAAkD;QAItE,IAAI,CAAC,OAAO,GAAG;YACd,qBAAqB,EAArB,oCAAqB;YACrB,eAAe,EAAf,sCAAe;YACf,GAAG,IAAA,gDAAyB,EAAC,QAAQ,EAAE,IAAI,EAAE,cAAc,CAAC;YAC5D,GAAG,IAAA,+CAAwB,EAAC,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC;YACxD,GAAG,IAAA,6CAAsB,EAAC,QAAQ,CAAC;SACnC,CAAC;IACH,CAAC;IAED,iBAAiB;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,cAAc,CAAoD,IAAY;QACnF,OAAO,MAAM,IAAA,qCAAc,EAAI,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAChG,CAAC;IAED,gBAAgB,CACf,aAAqB,EAErB,aAAmB,EACnB,OAAkC;QAElC,MAAM,gBAAgB,GAA6B,IAAI,CAAC;QACxD,MAAM,SAAS,GAAG,CAAC,CAAC;QACpB,MAAM,QAAQ,GAAG,CAAC,CAAC;QACnB,MAAM,mBAAmB,GAAyB,EAAE,CAAC;QAErD,OAAO,IAAA,uCAAgB,EACtB,IAAI,CAAC,QAAQ,EACb,gBAAgB,EAChB,QAAQ,EACR,mBAAmB,EACnB,IAAI,CAAC,IAAI,EACT,aAAa,EACb,SAAS,EACT,IAAI,CAAC,IAAI,EACT,IAAA,wCAAiB,EAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,EAAE,gBAAgB,CAAC,EACnE,SAAS,EACT,aAAa,EACb,OAAO,CACP,CAAC;IACH,CAAC;CACD;AAzDD,kCAyDC"}
|
|
@@ -3,10 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.TriggerContext = void 0;
|
|
4
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
5
|
const NodeExecuteFunctions_1 = require("../NodeExecuteFunctions");
|
|
6
|
-
const binary_helpers_1 = require("./helpers/binary-helpers");
|
|
7
|
-
const request_helpers_1 = require("./helpers/request-helpers");
|
|
8
|
-
const scheduling_helpers_1 = require("./helpers/scheduling-helpers");
|
|
9
|
-
const ssh_tunnel_helpers_1 = require("./helpers/ssh-tunnel-helpers");
|
|
10
6
|
const node_execution_context_1 = require("./node-execution-context");
|
|
11
7
|
const throwOnEmit = () => {
|
|
12
8
|
throw new n8n_workflow_1.ApplicationError('Overwrite TriggerContext.emit function');
|
|
@@ -23,10 +19,10 @@ class TriggerContext extends node_execution_context_1.NodeExecutionContext {
|
|
|
23
19
|
this.helpers = {
|
|
24
20
|
createDeferredPromise: n8n_workflow_1.createDeferredPromise,
|
|
25
21
|
returnJsonArray: NodeExecuteFunctions_1.returnJsonArray,
|
|
26
|
-
...
|
|
27
|
-
...
|
|
28
|
-
...
|
|
29
|
-
...
|
|
22
|
+
...(0, NodeExecuteFunctions_1.getSSHTunnelFunctions)(),
|
|
23
|
+
...(0, NodeExecuteFunctions_1.getRequestHelperFunctions)(workflow, node, additionalData),
|
|
24
|
+
...(0, NodeExecuteFunctions_1.getBinaryHelperFunctions)(additionalData, workflow.id),
|
|
25
|
+
...(0, NodeExecuteFunctions_1.getSchedulingFunctions)(workflow),
|
|
30
26
|
};
|
|
31
27
|
}
|
|
32
28
|
getActivationMode() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trigger-context.js","sourceRoot":"","sources":["../../src/node-execution-context/trigger-context.ts"],"names":[],"mappings":";;;AAaA,+CAAuE;AAGvE,
|
|
1
|
+
{"version":3,"file":"trigger-context.js","sourceRoot":"","sources":["../../src/node-execution-context/trigger-context.ts"],"names":[],"mappings":";;;AAaA,+CAAuE;AAGvE,iEASgC;AAEhC,qEAAgE;AAEhE,MAAM,WAAW,GAAG,GAAG,EAAE;IACxB,MAAM,IAAI,+BAAgB,CAAC,wCAAwC,CAAC,CAAC;AACtE,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,GAAG,EAAE;IAC7B,MAAM,IAAI,+BAAgB,CAAC,6CAA6C,CAAC,CAAC;AAC3E,CAAC,CAAC;AAEF,MAAa,cAAe,SAAQ,6CAAoB;IAGvD,YACC,QAAkB,EAClB,IAAW,EACX,cAA8C,EAC9C,IAAyB,EACR,UAAgC,EACxC,OAAkC,WAAW,EAC7C,YAA4C,gBAAgB;QAErE,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;QAJ3B,eAAU,GAAV,UAAU,CAAsB;QACxC,SAAI,GAAJ,IAAI,CAAyC;QAC7C,cAAS,GAAT,SAAS,CAAmD;QAIrE,IAAI,CAAC,OAAO,GAAG;YACd,qBAAqB,EAArB,oCAAqB;YACrB,eAAe,EAAf,sCAAe;YACf,GAAG,IAAA,4CAAqB,GAAE;YAC1B,GAAG,IAAA,gDAAyB,EAAC,QAAQ,EAAE,IAAI,EAAE,cAAc,CAAC;YAC5D,GAAG,IAAA,+CAAwB,EAAC,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC;YACxD,GAAG,IAAA,6CAAsB,EAAC,QAAQ,CAAC;SACnC,CAAC;IACH,CAAC;IAED,iBAAiB;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,cAAc,CAAoD,IAAY;QACnF,OAAO,MAAM,IAAA,qCAAc,EAAI,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAChG,CAAC;IAED,gBAAgB,CACf,aAAqB,EAErB,aAAmB,EACnB,OAAkC;QAElC,MAAM,gBAAgB,GAA6B,IAAI,CAAC;QACxD,MAAM,SAAS,GAAG,CAAC,CAAC;QACpB,MAAM,QAAQ,GAAG,CAAC,CAAC;QACnB,MAAM,mBAAmB,GAAyB,EAAE,CAAC;QAErD,OAAO,IAAA,uCAAgB,EACtB,IAAI,CAAC,QAAQ,EACb,gBAAgB,EAChB,QAAQ,EACR,mBAAmB,EACnB,IAAI,CAAC,IAAI,EACT,aAAa,EACb,SAAS,EACT,IAAI,CAAC,IAAI,EACT,IAAA,wCAAiB,EAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,EAAE,gBAAgB,CAAC,EACnE,SAAS,EACT,aAAa,EACb,OAAO,CACP,CAAC;IACH,CAAC;CACD;AA1DD,wCA0DC"}
|
|
@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.WebhookContext = void 0;
|
|
4
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
5
|
const NodeExecuteFunctions_1 = require("../NodeExecuteFunctions");
|
|
6
|
-
const binary_helpers_1 = require("./helpers/binary-helpers");
|
|
7
|
-
const request_helpers_1 = require("./helpers/request-helpers");
|
|
8
6
|
const node_execution_context_1 = require("./node-execution-context");
|
|
9
7
|
class WebhookContext extends node_execution_context_1.NodeExecutionContext {
|
|
10
8
|
constructor(workflow, node, additionalData, mode, webhookData, closeFunctions, runExecutionData) {
|
|
@@ -15,8 +13,8 @@ class WebhookContext extends node_execution_context_1.NodeExecutionContext {
|
|
|
15
13
|
this.helpers = {
|
|
16
14
|
createDeferredPromise: n8n_workflow_1.createDeferredPromise,
|
|
17
15
|
returnJsonArray: NodeExecuteFunctions_1.returnJsonArray,
|
|
18
|
-
...
|
|
19
|
-
...
|
|
16
|
+
...(0, NodeExecuteFunctions_1.getRequestHelperFunctions)(workflow, node, additionalData),
|
|
17
|
+
...(0, NodeExecuteFunctions_1.getBinaryHelperFunctions)(additionalData, workflow.id),
|
|
20
18
|
};
|
|
21
19
|
this.nodeHelpers = {
|
|
22
20
|
copyBinaryFile: async (filePath, fileName, mimeType) => await (0, NodeExecuteFunctions_1.copyBinaryFile)(this.workflow.id, this.additionalData.executionId, filePath, fileName, mimeType),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook-context.js","sourceRoot":"","sources":["../../src/node-execution-context/webhook-context.ts"],"names":[],"mappings":";;;AAoBA,+CAAuE;AAGvE,
|
|
1
|
+
{"version":3,"file":"webhook-context.js","sourceRoot":"","sources":["../../src/node-execution-context/webhook-context.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "n8n-core",
|
|
3
|
-
"version": "1.67.
|
|
3
|
+
"version": "1.67.1",
|
|
4
4
|
"description": "Core functionality of n8n",
|
|
5
5
|
"main": "dist/index",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -47,9 +47,9 @@
|
|
|
47
47
|
"uuid": "10.0.0",
|
|
48
48
|
"xml2js": "0.6.2",
|
|
49
49
|
"zod": "3.23.8",
|
|
50
|
-
"n8n-workflow": "1.66.0",
|
|
51
50
|
"@n8n/client-oauth2": "0.21.0",
|
|
52
|
-
"@n8n/config": "1.17.0"
|
|
51
|
+
"@n8n/config": "1.17.0",
|
|
52
|
+
"n8n-workflow": "1.66.0"
|
|
53
53
|
},
|
|
54
54
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
55
55
|
"homepage": "https://n8n.io",
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
import type { BinaryHelperFunctions, IWorkflowExecuteAdditionalData, Workflow, IBinaryData } from 'n8n-workflow';
|
|
2
|
-
import type { Readable } from 'stream';
|
|
3
|
-
export declare class BinaryHelpers {
|
|
4
|
-
private readonly workflow;
|
|
5
|
-
private readonly additionalData;
|
|
6
|
-
private readonly binaryDataService;
|
|
7
|
-
constructor(workflow: Workflow, additionalData: IWorkflowExecuteAdditionalData);
|
|
8
|
-
get exported(): BinaryHelperFunctions;
|
|
9
|
-
getBinaryPath(binaryDataId: string): string;
|
|
10
|
-
getBinaryMetadata(binaryDataId: string): Promise<import("../..").BinaryData.Metadata>;
|
|
11
|
-
getBinaryStream(binaryDataId: string, chunkSize?: number): Promise<Readable>;
|
|
12
|
-
prepareBinaryData(binaryData: Buffer | Readable, filePath?: string, mimeType?: string): Promise<IBinaryData>;
|
|
13
|
-
setBinaryDataBuffer(binaryData: IBinaryData, bufferOrStream: Buffer | Readable): Promise<IBinaryData>;
|
|
14
|
-
copyBinaryFile(): Promise<never>;
|
|
15
|
-
}
|
|
@@ -1,117 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.BinaryHelpers = void 0;
|
|
7
|
-
const file_type_1 = __importDefault(require("file-type"));
|
|
8
|
-
const http_1 = require("http");
|
|
9
|
-
const mime_types_1 = __importDefault(require("mime-types"));
|
|
10
|
-
const n8n_workflow_1 = require("n8n-workflow");
|
|
11
|
-
const path_1 = __importDefault(require("path"));
|
|
12
|
-
const typedi_1 = __importDefault(require("typedi"));
|
|
13
|
-
const BinaryData_service_1 = require("../../BinaryData/BinaryData.service");
|
|
14
|
-
const utils_1 = require("../../BinaryData/utils");
|
|
15
|
-
const NodeExecuteFunctions_1 = require("../../NodeExecuteFunctions");
|
|
16
|
-
class BinaryHelpers {
|
|
17
|
-
constructor(workflow, additionalData) {
|
|
18
|
-
this.workflow = workflow;
|
|
19
|
-
this.additionalData = additionalData;
|
|
20
|
-
this.binaryDataService = typedi_1.default.get(BinaryData_service_1.BinaryDataService);
|
|
21
|
-
}
|
|
22
|
-
get exported() {
|
|
23
|
-
return {
|
|
24
|
-
getBinaryPath: this.getBinaryPath.bind(this),
|
|
25
|
-
getBinaryMetadata: this.getBinaryMetadata.bind(this),
|
|
26
|
-
getBinaryStream: this.getBinaryStream.bind(this),
|
|
27
|
-
binaryToBuffer: utils_1.binaryToBuffer,
|
|
28
|
-
binaryToString: NodeExecuteFunctions_1.binaryToString,
|
|
29
|
-
prepareBinaryData: this.prepareBinaryData.bind(this),
|
|
30
|
-
setBinaryDataBuffer: this.setBinaryDataBuffer.bind(this),
|
|
31
|
-
copyBinaryFile: this.copyBinaryFile.bind(this),
|
|
32
|
-
};
|
|
33
|
-
}
|
|
34
|
-
getBinaryPath(binaryDataId) {
|
|
35
|
-
return this.binaryDataService.getPath(binaryDataId);
|
|
36
|
-
}
|
|
37
|
-
async getBinaryMetadata(binaryDataId) {
|
|
38
|
-
return await this.binaryDataService.getMetadata(binaryDataId);
|
|
39
|
-
}
|
|
40
|
-
async getBinaryStream(binaryDataId, chunkSize) {
|
|
41
|
-
return await this.binaryDataService.getAsStream(binaryDataId, chunkSize);
|
|
42
|
-
}
|
|
43
|
-
async prepareBinaryData(binaryData, filePath, mimeType) {
|
|
44
|
-
let fileExtension;
|
|
45
|
-
if (binaryData instanceof http_1.IncomingMessage) {
|
|
46
|
-
if (!filePath) {
|
|
47
|
-
try {
|
|
48
|
-
const { responseUrl } = binaryData;
|
|
49
|
-
filePath =
|
|
50
|
-
binaryData.contentDisposition?.filename ??
|
|
51
|
-
((responseUrl && new URL(responseUrl).pathname) ?? binaryData.req?.path)?.slice(1);
|
|
52
|
-
}
|
|
53
|
-
catch { }
|
|
54
|
-
}
|
|
55
|
-
if (!mimeType) {
|
|
56
|
-
mimeType = binaryData.contentType;
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
if (!mimeType) {
|
|
60
|
-
if (filePath) {
|
|
61
|
-
const mimeTypeLookup = mime_types_1.default.lookup(filePath);
|
|
62
|
-
if (mimeTypeLookup) {
|
|
63
|
-
mimeType = mimeTypeLookup;
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
if (!mimeType) {
|
|
67
|
-
if (Buffer.isBuffer(binaryData)) {
|
|
68
|
-
const fileTypeData = await file_type_1.default.fromBuffer(binaryData);
|
|
69
|
-
if (fileTypeData) {
|
|
70
|
-
mimeType = fileTypeData.mime;
|
|
71
|
-
fileExtension = fileTypeData.ext;
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
else if (binaryData instanceof http_1.IncomingMessage) {
|
|
75
|
-
mimeType = binaryData.headers['content-type'];
|
|
76
|
-
}
|
|
77
|
-
else {
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
if (!fileExtension && mimeType) {
|
|
82
|
-
fileExtension = mime_types_1.default.extension(mimeType) || undefined;
|
|
83
|
-
}
|
|
84
|
-
if (!mimeType) {
|
|
85
|
-
mimeType = 'text/plain';
|
|
86
|
-
}
|
|
87
|
-
const returnData = {
|
|
88
|
-
mimeType,
|
|
89
|
-
fileType: (0, n8n_workflow_1.fileTypeFromMimeType)(mimeType),
|
|
90
|
-
fileExtension,
|
|
91
|
-
data: '',
|
|
92
|
-
};
|
|
93
|
-
if (filePath) {
|
|
94
|
-
if (filePath.includes('?')) {
|
|
95
|
-
filePath = filePath.split('?').shift();
|
|
96
|
-
}
|
|
97
|
-
const filePathParts = path_1.default.parse(filePath);
|
|
98
|
-
if (filePathParts.dir !== '') {
|
|
99
|
-
returnData.directory = filePathParts.dir;
|
|
100
|
-
}
|
|
101
|
-
returnData.fileName = filePathParts.base;
|
|
102
|
-
const extractedFileExtension = filePathParts.ext.slice(1);
|
|
103
|
-
if (extractedFileExtension) {
|
|
104
|
-
returnData.fileExtension = extractedFileExtension;
|
|
105
|
-
}
|
|
106
|
-
}
|
|
107
|
-
return await this.setBinaryDataBuffer(returnData, binaryData);
|
|
108
|
-
}
|
|
109
|
-
async setBinaryDataBuffer(binaryData, bufferOrStream) {
|
|
110
|
-
return await this.binaryDataService.store(this.workflow.id, this.additionalData.executionId, bufferOrStream, binaryData);
|
|
111
|
-
}
|
|
112
|
-
async copyBinaryFile() {
|
|
113
|
-
throw new n8n_workflow_1.ApplicationError('`copyBinaryFile` has been removed. Please upgrade this node.');
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
exports.BinaryHelpers = BinaryHelpers;
|
|
117
|
-
//# sourceMappingURL=binary-helpers.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"binary-helpers.js","sourceRoot":"","sources":["../../../src/node-execution-context/helpers/binary-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
import type { RequestHelperFunctions, IAdditionalCredentialOptions, IAllExecuteFunctions, IHttpRequestOptions, INode, INodeExecutionData, IOAuth2Options, IRequestOptions, IRunExecutionData, IWorkflowExecuteAdditionalData, PaginationOptions, Workflow } from 'n8n-workflow';
|
|
2
|
-
import { httpRequest } from '../../NodeExecuteFunctions';
|
|
3
|
-
export declare class RequestHelpers {
|
|
4
|
-
private readonly context;
|
|
5
|
-
private readonly workflow;
|
|
6
|
-
private readonly node;
|
|
7
|
-
private readonly additionalData;
|
|
8
|
-
private readonly runExecutionData;
|
|
9
|
-
private readonly connectionInputData;
|
|
10
|
-
constructor(context: IAllExecuteFunctions, workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData, runExecutionData?: IRunExecutionData | null, connectionInputData?: INodeExecutionData[]);
|
|
11
|
-
get exported(): RequestHelperFunctions;
|
|
12
|
-
get httpRequest(): typeof httpRequest;
|
|
13
|
-
httpRequestWithAuthentication(credentialsType: string, requestOptions: IHttpRequestOptions, additionalCredentialOptions?: IAdditionalCredentialOptions): Promise<any>;
|
|
14
|
-
requestWithAuthenticationPaginated(requestOptions: IRequestOptions, itemIndex: number, paginationOptions: PaginationOptions, credentialsType?: string, additionalCredentialOptions?: IAdditionalCredentialOptions): Promise<unknown[]>;
|
|
15
|
-
request(uriOrObject: string | IRequestOptions, options?: IRequestOptions): Promise<any>;
|
|
16
|
-
requestWithAuthentication(credentialsType: string, requestOptions: IRequestOptions, additionalCredentialOptions?: IAdditionalCredentialOptions, itemIndex?: number): Promise<any>;
|
|
17
|
-
requestOAuth1(credentialsType: string, requestOptions: IRequestOptions): Promise<any>;
|
|
18
|
-
requestOAuth2(credentialsType: string, requestOptions: IRequestOptions, oAuth2Options?: IOAuth2Options): Promise<any>;
|
|
19
|
-
private getResolvedValue;
|
|
20
|
-
}
|
|
@@ -1,192 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.RequestHelpers = void 0;
|
|
4
|
-
const crypto_1 = require("crypto");
|
|
5
|
-
const lodash_1 = require("lodash");
|
|
6
|
-
const n8n_workflow_1 = require("n8n-workflow");
|
|
7
|
-
const stream_1 = require("stream");
|
|
8
|
-
const NodeExecuteFunctions_1 = require("../../NodeExecuteFunctions");
|
|
9
|
-
class RequestHelpers {
|
|
10
|
-
constructor(context, workflow, node, additionalData, runExecutionData = null, connectionInputData = []) {
|
|
11
|
-
this.context = context;
|
|
12
|
-
this.workflow = workflow;
|
|
13
|
-
this.node = node;
|
|
14
|
-
this.additionalData = additionalData;
|
|
15
|
-
this.runExecutionData = runExecutionData;
|
|
16
|
-
this.connectionInputData = connectionInputData;
|
|
17
|
-
}
|
|
18
|
-
get exported() {
|
|
19
|
-
return {
|
|
20
|
-
httpRequest: NodeExecuteFunctions_1.httpRequest,
|
|
21
|
-
httpRequestWithAuthentication: this.httpRequestWithAuthentication.bind(this),
|
|
22
|
-
requestWithAuthenticationPaginated: this.requestWithAuthenticationPaginated.bind(this),
|
|
23
|
-
request: this.request.bind(this),
|
|
24
|
-
requestWithAuthentication: this.requestWithAuthentication.bind(this),
|
|
25
|
-
requestOAuth1: this.requestOAuth1.bind(this),
|
|
26
|
-
requestOAuth2: this.requestOAuth2.bind(this),
|
|
27
|
-
};
|
|
28
|
-
}
|
|
29
|
-
get httpRequest() {
|
|
30
|
-
return NodeExecuteFunctions_1.httpRequest;
|
|
31
|
-
}
|
|
32
|
-
async httpRequestWithAuthentication(credentialsType, requestOptions, additionalCredentialOptions) {
|
|
33
|
-
return await NodeExecuteFunctions_1.httpRequestWithAuthentication.call(this.context, credentialsType, requestOptions, this.workflow, this.node, this.additionalData, additionalCredentialOptions);
|
|
34
|
-
}
|
|
35
|
-
async requestWithAuthenticationPaginated(requestOptions, itemIndex, paginationOptions, credentialsType, additionalCredentialOptions) {
|
|
36
|
-
const responseData = [];
|
|
37
|
-
if (!requestOptions.qs) {
|
|
38
|
-
requestOptions.qs = {};
|
|
39
|
-
}
|
|
40
|
-
requestOptions.resolveWithFullResponse = true;
|
|
41
|
-
requestOptions.simple = false;
|
|
42
|
-
let tempResponseData;
|
|
43
|
-
let makeAdditionalRequest;
|
|
44
|
-
let paginateRequestData;
|
|
45
|
-
const runIndex = 0;
|
|
46
|
-
const additionalKeys = {
|
|
47
|
-
$request: requestOptions,
|
|
48
|
-
$response: {},
|
|
49
|
-
$version: this.node.typeVersion,
|
|
50
|
-
$pageCount: 0,
|
|
51
|
-
};
|
|
52
|
-
const executeData = {
|
|
53
|
-
data: {},
|
|
54
|
-
node: this.node,
|
|
55
|
-
source: null,
|
|
56
|
-
};
|
|
57
|
-
const hashData = {
|
|
58
|
-
identicalCount: 0,
|
|
59
|
-
previousLength: 0,
|
|
60
|
-
previousHash: '',
|
|
61
|
-
};
|
|
62
|
-
do {
|
|
63
|
-
paginateRequestData = this.getResolvedValue(paginationOptions.request, itemIndex, runIndex, executeData, additionalKeys, false);
|
|
64
|
-
const tempRequestOptions = (0, NodeExecuteFunctions_1.applyPaginationRequestData)(requestOptions, paginateRequestData);
|
|
65
|
-
if (!(0, NodeExecuteFunctions_1.validateUrl)(tempRequestOptions.uri)) {
|
|
66
|
-
throw new n8n_workflow_1.NodeOperationError(this.node, `'${paginateRequestData.url}' is not a valid URL.`, {
|
|
67
|
-
itemIndex,
|
|
68
|
-
runIndex,
|
|
69
|
-
type: 'invalid_url',
|
|
70
|
-
});
|
|
71
|
-
}
|
|
72
|
-
if (credentialsType) {
|
|
73
|
-
tempResponseData = await this.requestWithAuthentication(credentialsType, tempRequestOptions, additionalCredentialOptions);
|
|
74
|
-
}
|
|
75
|
-
else {
|
|
76
|
-
tempResponseData = await this.request(tempRequestOptions);
|
|
77
|
-
}
|
|
78
|
-
const newResponse = Object.assign({
|
|
79
|
-
body: {},
|
|
80
|
-
headers: {},
|
|
81
|
-
statusCode: 0,
|
|
82
|
-
}, (0, lodash_1.pick)(tempResponseData, ['body', 'headers', 'statusCode']));
|
|
83
|
-
let contentBody;
|
|
84
|
-
if (newResponse.body instanceof stream_1.Readable && paginationOptions.binaryResult !== true) {
|
|
85
|
-
contentBody = await (0, NodeExecuteFunctions_1.binaryToString)(newResponse.body);
|
|
86
|
-
const responseContentType = newResponse.headers['content-type']?.toString() ?? '';
|
|
87
|
-
if (responseContentType.includes('application/json')) {
|
|
88
|
-
newResponse.body = (0, n8n_workflow_1.jsonParse)(contentBody, { fallbackValue: {} });
|
|
89
|
-
}
|
|
90
|
-
else {
|
|
91
|
-
newResponse.body = contentBody;
|
|
92
|
-
}
|
|
93
|
-
tempResponseData.__bodyResolved = true;
|
|
94
|
-
tempResponseData.body = newResponse.body;
|
|
95
|
-
}
|
|
96
|
-
else {
|
|
97
|
-
contentBody = newResponse.body;
|
|
98
|
-
}
|
|
99
|
-
if (paginationOptions.binaryResult !== true || tempResponseData.headers.etag) {
|
|
100
|
-
let contentLength = 0;
|
|
101
|
-
if ('content-length' in tempResponseData.headers) {
|
|
102
|
-
contentLength = parseInt(tempResponseData.headers['content-length']) || 0;
|
|
103
|
-
}
|
|
104
|
-
if (hashData.previousLength === contentLength) {
|
|
105
|
-
let hash;
|
|
106
|
-
if (tempResponseData.headers.etag) {
|
|
107
|
-
hash = tempResponseData.headers.etag;
|
|
108
|
-
}
|
|
109
|
-
else {
|
|
110
|
-
if (typeof contentBody !== 'string') {
|
|
111
|
-
contentBody = JSON.stringify(contentBody);
|
|
112
|
-
}
|
|
113
|
-
hash = (0, crypto_1.createHash)('md5').update(contentBody).digest('base64');
|
|
114
|
-
}
|
|
115
|
-
if (hashData.previousHash === hash) {
|
|
116
|
-
hashData.identicalCount += 1;
|
|
117
|
-
if (hashData.identicalCount > 2) {
|
|
118
|
-
throw new n8n_workflow_1.NodeOperationError(this.node, 'The returned response was identical 5x, so requests got stopped', {
|
|
119
|
-
itemIndex,
|
|
120
|
-
description: 'Check if "Pagination Completed When" has been configured correctly.',
|
|
121
|
-
});
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
else {
|
|
125
|
-
hashData.identicalCount = 0;
|
|
126
|
-
}
|
|
127
|
-
hashData.previousHash = hash;
|
|
128
|
-
}
|
|
129
|
-
else {
|
|
130
|
-
hashData.identicalCount = 0;
|
|
131
|
-
}
|
|
132
|
-
hashData.previousLength = contentLength;
|
|
133
|
-
}
|
|
134
|
-
responseData.push(tempResponseData);
|
|
135
|
-
additionalKeys.$response = newResponse;
|
|
136
|
-
additionalKeys.$pageCount = additionalKeys.$pageCount + 1;
|
|
137
|
-
const maxRequests = this.getResolvedValue(paginationOptions.maxRequests, itemIndex, runIndex, executeData, additionalKeys, false);
|
|
138
|
-
if (maxRequests && additionalKeys.$pageCount >= maxRequests) {
|
|
139
|
-
break;
|
|
140
|
-
}
|
|
141
|
-
makeAdditionalRequest = this.getResolvedValue(paginationOptions.continue, itemIndex, runIndex, executeData, additionalKeys, false);
|
|
142
|
-
if (makeAdditionalRequest) {
|
|
143
|
-
if (paginationOptions.requestInterval) {
|
|
144
|
-
const requestInterval = this.getResolvedValue(paginationOptions.requestInterval, itemIndex, runIndex, executeData, additionalKeys, false);
|
|
145
|
-
await (0, n8n_workflow_1.sleep)(requestInterval);
|
|
146
|
-
}
|
|
147
|
-
if (tempResponseData.statusCode < 200 || tempResponseData.statusCode >= 300) {
|
|
148
|
-
let data = tempResponseData.body;
|
|
149
|
-
if (data instanceof stream_1.Readable && paginationOptions.binaryResult !== true) {
|
|
150
|
-
data = await (0, NodeExecuteFunctions_1.binaryToString)(data);
|
|
151
|
-
}
|
|
152
|
-
else if (typeof data === 'object') {
|
|
153
|
-
data = JSON.stringify(data);
|
|
154
|
-
}
|
|
155
|
-
throw Object.assign(new Error(`${tempResponseData.statusCode} - "${data?.toString()}"`), {
|
|
156
|
-
statusCode: tempResponseData.statusCode,
|
|
157
|
-
error: data,
|
|
158
|
-
isAxiosError: true,
|
|
159
|
-
response: {
|
|
160
|
-
headers: tempResponseData.headers,
|
|
161
|
-
status: tempResponseData.statusCode,
|
|
162
|
-
statusText: tempResponseData.statusMessage,
|
|
163
|
-
},
|
|
164
|
-
});
|
|
165
|
-
}
|
|
166
|
-
}
|
|
167
|
-
} while (makeAdditionalRequest);
|
|
168
|
-
return responseData;
|
|
169
|
-
}
|
|
170
|
-
async request(uriOrObject, options) {
|
|
171
|
-
return await (0, NodeExecuteFunctions_1.proxyRequestToAxios)(this.workflow, this.additionalData, this.node, uriOrObject, options);
|
|
172
|
-
}
|
|
173
|
-
async requestWithAuthentication(credentialsType, requestOptions, additionalCredentialOptions, itemIndex) {
|
|
174
|
-
return await NodeExecuteFunctions_1.requestWithAuthentication.call(this.context, credentialsType, requestOptions, this.workflow, this.node, this.additionalData, additionalCredentialOptions, itemIndex);
|
|
175
|
-
}
|
|
176
|
-
async requestOAuth1(credentialsType, requestOptions) {
|
|
177
|
-
return await NodeExecuteFunctions_1.requestOAuth1.call(this.context, credentialsType, requestOptions);
|
|
178
|
-
}
|
|
179
|
-
async requestOAuth2(credentialsType, requestOptions, oAuth2Options) {
|
|
180
|
-
return await NodeExecuteFunctions_1.requestOAuth2.call(this.context, credentialsType, requestOptions, this.node, this.additionalData, oAuth2Options);
|
|
181
|
-
}
|
|
182
|
-
getResolvedValue(parameterValue, itemIndex, runIndex, executeData, additionalKeys, returnObjectAsString = false) {
|
|
183
|
-
const mode = 'internal';
|
|
184
|
-
if (typeof parameterValue === 'object' ||
|
|
185
|
-
(typeof parameterValue === 'string' && parameterValue.charAt(0) === '=')) {
|
|
186
|
-
return this.workflow.expression.getParameterValue(parameterValue, this.runExecutionData, runIndex, itemIndex, this.node.name, this.connectionInputData, mode, additionalKeys ?? {}, executeData, returnObjectAsString);
|
|
187
|
-
}
|
|
188
|
-
return parameterValue;
|
|
189
|
-
}
|
|
190
|
-
}
|
|
191
|
-
exports.RequestHelpers = RequestHelpers;
|
|
192
|
-
//# sourceMappingURL=request-helpers.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"request-helpers.js","sourceRoot":"","sources":["../../../src/node-execution-context/helpers/request-helpers.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AACpC,mCAA8B;AAC9B,+CAAoE;AAqBpE,mCAAkC;AAGlC,iEAUgC;AAEhC,MAAa,cAAc;IAC1B,YACkB,OAA6B,EAC7B,QAAkB,EAClB,IAAW,EACX,cAA8C,EAC9C,mBAA6C,IAAI,EACjD,sBAA4C,EAAE;QAL9C,YAAO,GAAP,OAAO,CAAsB;QAC7B,aAAQ,GAAR,QAAQ,CAAU;QAClB,SAAI,GAAJ,IAAI,CAAO;QACX,mBAAc,GAAd,cAAc,CAAgC;QAC9C,qBAAgB,GAAhB,gBAAgB,CAAiC;QACjD,wBAAmB,GAAnB,mBAAmB,CAA2B;IAC7D,CAAC;IAEJ,IAAI,QAAQ;QACX,OAAO;YACN,WAAW,EAAX,kCAAW;YACX,6BAA6B,EAAE,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC;YAC5E,kCAAkC,EAAE,IAAI,CAAC,kCAAkC,CAAC,IAAI,CAAC,IAAI,CAAC;YACtF,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;YAChC,yBAAyB,EAAE,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC;YACpE,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;YAC5C,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;SAC5C,CAAC;IACH,CAAC;IAED,IAAI,WAAW;QACd,OAAO,kCAAW,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,6BAA6B,CAClC,eAAuB,EACvB,cAAmC,EACnC,2BAA0D;QAG1D,OAAO,MAAM,oDAA6B,CAAC,IAAI,CAC9C,IAAI,CAAC,OAAO,EACZ,eAAe,EACf,cAAc,EACd,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,cAAc,EACnB,2BAA2B,CAC3B,CAAC;IACH,CAAC;IAGD,KAAK,CAAC,kCAAkC,CACvC,cAA+B,EAC/B,SAAiB,EACjB,iBAAoC,EACpC,eAAwB,EACxB,2BAA0D;QAE1D,MAAM,YAAY,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC;YACxB,cAAc,CAAC,EAAE,GAAG,EAAE,CAAC;QACxB,CAAC;QACD,cAAc,CAAC,uBAAuB,GAAG,IAAI,CAAC;QAC9C,cAAc,CAAC,MAAM,GAAG,KAAK,CAAC;QAE9B,IAAI,gBAAsC,CAAC;QAC3C,IAAI,qBAA8B,CAAC;QACnC,IAAI,mBAAiD,CAAC;QAEtD,MAAM,QAAQ,GAAG,CAAC,CAAC;QAEnB,MAAM,cAAc,GAAG;YACtB,QAAQ,EAAE,cAAc;YACxB,SAAS,EAAE,EAA0B;YACrC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;YAC/B,UAAU,EAAE,CAAC;SACb,CAAC;QAEF,MAAM,WAAW,GAAiB;YACjC,IAAI,EAAE,EAAE;YACR,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,IAAI;SACZ,CAAC;QAEF,MAAM,QAAQ,GAAG;YAChB,cAAc,EAAE,CAAC;YACjB,cAAc,EAAE,CAAC;YACjB,YAAY,EAAE,EAAE;SAChB,CAAC;QAEF,GAAG,CAAC;YACH,mBAAmB,GAAG,IAAI,CAAC,gBAAgB,CAC1C,iBAAiB,CAAC,OAA4C,EAC9D,SAAS,EACT,QAAQ,EACR,WAAW,EACX,cAAc,EACd,KAAK,CACqC,CAAC;YAE5C,MAAM,kBAAkB,GAAG,IAAA,iDAA0B,EAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC;YAE3F,IAAI,CAAC,IAAA,kCAAW,EAAC,kBAAkB,CAAC,GAAa,CAAC,EAAE,CAAC;gBACpD,MAAM,IAAI,iCAAkB,CAC3B,IAAI,CAAC,IAAI,EACT,IAAI,mBAAmB,CAAC,GAAG,uBAAuB,EAClD;oBACC,SAAS;oBACT,QAAQ;oBACR,IAAI,EAAE,aAAa;iBACnB,CACD,CAAC;YACH,CAAC;YAED,IAAI,eAAe,EAAE,CAAC;gBAErB,gBAAgB,GAAG,MAAM,IAAI,CAAC,yBAAyB,CACtD,eAAe,EACf,kBAAkB,EAClB,2BAA2B,CAC3B,CAAC;YACH,CAAC;iBAAM,CAAC;gBAEP,gBAAgB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;YAC3D,CAAC;YAED,MAAM,WAAW,GAAyB,MAAM,CAAC,MAAM,CACtD;gBACC,IAAI,EAAE,EAAE;gBACR,OAAO,EAAE,EAAE;gBACX,UAAU,EAAE,CAAC;aACb,EACD,IAAA,aAAI,EAAC,gBAAgB,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC,CACzD,CAAC;YAEF,IAAI,WAA8C,CAAC;YAEnD,IAAI,WAAW,CAAC,IAAI,YAAY,iBAAQ,IAAI,iBAAiB,CAAC,YAAY,KAAK,IAAI,EAAE,CAAC;gBAErF,WAAW,GAAG,MAAM,IAAA,qCAAc,EAAC,WAAW,CAAC,IAAyB,CAAC,CAAC;gBAE1E,MAAM,mBAAmB,GAAG,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;gBAClF,IAAI,mBAAmB,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;oBACtD,WAAW,CAAC,IAAI,GAAG,IAAA,wBAAS,EAAC,WAAW,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,CAAC;gBAClE,CAAC;qBAAM,CAAC;oBACP,WAAW,CAAC,IAAI,GAAG,WAAW,CAAC;gBAChC,CAAC;gBACD,gBAAgB,CAAC,cAAc,GAAG,IAAI,CAAC;gBACvC,gBAAgB,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;YAC1C,CAAC;iBAAM,CAAC;gBACP,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC;YAChC,CAAC;YAED,IAAI,iBAAiB,CAAC,YAAY,KAAK,IAAI,IAAI,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBAI9E,IAAI,aAAa,GAAG,CAAC,CAAC;gBACtB,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,OAAO,EAAE,CAAC;oBAClD,aAAa,GAAG,QAAQ,CAAC,gBAAgB,CAAC,OAAO,CAAC,gBAAgB,CAAW,CAAC,IAAI,CAAC,CAAC;gBACrF,CAAC;gBAED,IAAI,QAAQ,CAAC,cAAc,KAAK,aAAa,EAAE,CAAC;oBAC/C,IAAI,IAAY,CAAC;oBACjB,IAAI,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;wBAEnC,IAAI,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAc,CAAC;oBAChD,CAAC;yBAAM,CAAC;wBAEP,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;4BACrC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;wBAC3C,CAAC;wBACD,IAAI,GAAG,IAAA,mBAAU,EAAC,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;oBAC/D,CAAC;oBAED,IAAI,QAAQ,CAAC,YAAY,KAAK,IAAI,EAAE,CAAC;wBACpC,QAAQ,CAAC,cAAc,IAAI,CAAC,CAAC;wBAC7B,IAAI,QAAQ,CAAC,cAAc,GAAG,CAAC,EAAE,CAAC;4BAEjC,MAAM,IAAI,iCAAkB,CAC3B,IAAI,CAAC,IAAI,EACT,iEAAiE,EACjE;gCACC,SAAS;gCACT,WAAW,EACV,qEAAqE;6BACtE,CACD,CAAC;wBACH,CAAC;oBACF,CAAC;yBAAM,CAAC;wBACP,QAAQ,CAAC,cAAc,GAAG,CAAC,CAAC;oBAC7B,CAAC;oBACD,QAAQ,CAAC,YAAY,GAAG,IAAI,CAAC;gBAC9B,CAAC;qBAAM,CAAC;oBACP,QAAQ,CAAC,cAAc,GAAG,CAAC,CAAC;gBAC7B,CAAC;gBACD,QAAQ,CAAC,cAAc,GAAG,aAAa,CAAC;YACzC,CAAC;YAED,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAEpC,cAAc,CAAC,SAAS,GAAG,WAAW,CAAC;YACvC,cAAc,CAAC,UAAU,GAAG,cAAc,CAAC,UAAU,GAAG,CAAC,CAAC;YAE1D,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CACxC,iBAAiB,CAAC,WAAW,EAC7B,SAAS,EACT,QAAQ,EACR,WAAW,EACX,cAAc,EACd,KAAK,CACK,CAAC;YAEZ,IAAI,WAAW,IAAI,cAAc,CAAC,UAAU,IAAI,WAAW,EAAE,CAAC;gBAC7D,MAAM;YACP,CAAC;YAED,qBAAqB,GAAG,IAAI,CAAC,gBAAgB,CAC5C,iBAAiB,CAAC,QAAQ,EAC1B,SAAS,EACT,QAAQ,EACR,WAAW,EACX,cAAc,EACd,KAAK,CACM,CAAC;YAEb,IAAI,qBAAqB,EAAE,CAAC;gBAC3B,IAAI,iBAAiB,CAAC,eAAe,EAAE,CAAC;oBACvC,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAC5C,iBAAiB,CAAC,eAAe,EACjC,SAAS,EACT,QAAQ,EACR,WAAW,EACX,cAAc,EACd,KAAK,CACK,CAAC;oBAEZ,MAAM,IAAA,oBAAK,EAAC,eAAe,CAAC,CAAC;gBAC9B,CAAC;gBACD,IAAI,gBAAgB,CAAC,UAAU,GAAG,GAAG,IAAI,gBAAgB,CAAC,UAAU,IAAI,GAAG,EAAE,CAAC;oBAK7E,IAAI,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC;oBACjC,IAAI,IAAI,YAAY,iBAAQ,IAAI,iBAAiB,CAAC,YAAY,KAAK,IAAI,EAAE,CAAC;wBACzE,IAAI,GAAG,MAAM,IAAA,qCAAc,EAAC,IAAyB,CAAC,CAAC;oBACxD,CAAC;yBAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;wBACrC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;oBAC7B,CAAC;oBAED,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,gBAAgB,CAAC,UAAU,OAAO,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE;wBACxF,UAAU,EAAE,gBAAgB,CAAC,UAAU;wBACvC,KAAK,EAAE,IAAI;wBACX,YAAY,EAAE,IAAI;wBAClB,QAAQ,EAAE;4BACT,OAAO,EAAE,gBAAgB,CAAC,OAAO;4BACjC,MAAM,EAAE,gBAAgB,CAAC,UAAU;4BACnC,UAAU,EAAE,gBAAgB,CAAC,aAAa;yBAC1C;qBACD,CAAC,CAAC;gBACJ,CAAC;YACF,CAAC;QACF,CAAC,QAAQ,qBAAqB,EAAE;QAEhC,OAAO,YAAY,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,WAAqC,EAAE,OAAyB;QAE7E,OAAO,MAAM,IAAA,0CAAmB,EAC/B,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,IAAI,EACT,WAAW,EACX,OAAO,CACP,CAAC;IACH,CAAC;IAED,KAAK,CAAC,yBAAyB,CAC9B,eAAuB,EACvB,cAA+B,EAC/B,2BAA0D,EAC1D,SAAkB;QAGlB,OAAO,MAAM,gDAAyB,CAAC,IAAI,CAC1C,IAAI,CAAC,OAAO,EACZ,eAAe,EACf,cAAc,EACd,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,cAAc,EACnB,2BAA2B,EAC3B,SAAS,CACT,CAAC;IACH,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,eAAuB,EAAE,cAA+B;QAE3E,OAAO,MAAM,oCAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,EAAE,cAAc,CAAC,CAAC;IAChF,CAAC;IAED,KAAK,CAAC,aAAa,CAClB,eAAuB,EACvB,cAA+B,EAC/B,aAA8B;QAG9B,OAAO,MAAM,oCAAa,CAAC,IAAI,CAC9B,IAAI,CAAC,OAAO,EACZ,eAAe,EACf,cAAc,EACd,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,cAAc,EACnB,aAAa,CACb,CAAC;IACH,CAAC;IAEO,gBAAgB,CACvB,cAAsC,EACtC,SAAiB,EACjB,QAAgB,EAChB,WAAyB,EACzB,cAAiD,EACjD,oBAAoB,GAAG,KAAK;QAE5B,MAAM,IAAI,GAAwB,UAAU,CAAC;QAE7C,IACC,OAAO,cAAc,KAAK,QAAQ;YAClC,CAAC,OAAO,cAAc,KAAK,QAAQ,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,EACvE,CAAC;YACF,OAAO,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAChD,cAAc,EACd,IAAI,CAAC,gBAAgB,EACrB,QAAQ,EACR,SAAS,EACT,IAAI,CAAC,IAAI,CAAC,IAAI,EACd,IAAI,CAAC,mBAAmB,EACxB,IAAI,EACJ,cAAc,IAAI,EAAE,EACpB,WAAW,EACX,oBAAoB,CACpB,CAAC;QACH,CAAC;QAED,OAAO,cAAc,CAAC;IACvB,CAAC;CACD;AAtVD,wCAsVC"}
|