n8n-core 1.105.0 → 1.105.2
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/build.tsbuildinfo +1 -1
- package/dist/execution-engine/active-workflows.js +9 -4
- package/dist/execution-engine/active-workflows.js.map +1 -1
- package/dist/execution-engine/node-execution-context/poll-context.js +1 -1
- package/dist/execution-engine/node-execution-context/poll-context.js.map +1 -1
- package/dist/execution-engine/node-execution-context/trigger-context.js +1 -1
- package/dist/execution-engine/node-execution-context/trigger-context.js.map +1 -1
- package/dist/execution-engine/node-execution-context/utils/file-system-helper-functions.js +13 -1
- package/dist/execution-engine/node-execution-context/utils/file-system-helper-functions.js.map +1 -1
- package/dist/execution-engine/node-execution-context/utils/scheduling-helper-functions.d.ts +1 -1
- package/dist/execution-engine/node-execution-context/utils/scheduling-helper-functions.js +11 -2
- package/dist/execution-engine/node-execution-context/utils/scheduling-helper-functions.js.map +1 -1
- package/dist/execution-engine/scheduled-task-manager.d.ts +17 -10
- package/dist/execution-engine/scheduled-task-manager.js +88 -50
- package/dist/execution-engine/scheduled-task-manager.js.map +1 -1
- package/package.json +10 -10
|
@@ -89,11 +89,16 @@ let ActiveWorkflows = class ActiveWorkflows {
|
|
|
89
89
|
};
|
|
90
90
|
await executeTrigger(true);
|
|
91
91
|
for (const expression of cronExpressions) {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
throw new n8n_workflow_1.ApplicationError('The polling interval is too short. It has to be at least a minute.');
|
|
92
|
+
if (expression.split(' ').at(0)?.includes('*')) {
|
|
93
|
+
throw new n8n_workflow_1.UserError('The polling interval is too short. It has to be at least a minute.');
|
|
95
94
|
}
|
|
96
|
-
|
|
95
|
+
const ctx = {
|
|
96
|
+
workflowId: workflow.id,
|
|
97
|
+
timezone: workflow.timezone,
|
|
98
|
+
nodeId: node.id,
|
|
99
|
+
expression,
|
|
100
|
+
};
|
|
101
|
+
this.scheduledTaskManager.registerCron(ctx, executeTrigger);
|
|
97
102
|
}
|
|
98
103
|
}
|
|
99
104
|
async remove(workflowId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"active-workflows.js","sourceRoot":"","sources":["../../src/execution-engine/active-workflows.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,gCAAkC;
|
|
1
|
+
{"version":3,"file":"active-workflows.js","sourceRoot":"","sources":["../../src/execution-engine/active-workflows.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,gCAAkC;AAWlC,+CAMsB;AAEtB,4DAAwD;AAIxD,qEAAgE;AAChE,iEAA4D;AAGrD,IAAM,eAAe,GAArB,MAAM,eAAe;IAC3B,YACkB,MAAc,EACd,oBAA0C,EAC1C,kBAAsC,EACtC,aAA4B;QAH5B,WAAM,GAAN,MAAM,CAAQ;QACd,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,kBAAa,GAAb,aAAa,CAAe;QAGtC,oBAAe,GAA4C,EAAE,CAAC;IAFnE,CAAC;IAOJ,QAAQ,CAAC,UAAkB;QAC1B,OAAO,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IACxD,CAAC;IAKD,kBAAkB;QACjB,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC1C,CAAC;IAKD,GAAG,CAAC,UAAkB;QACrB,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;IACzC,CAAC;IASD,KAAK,CAAC,GAAG,CACR,UAAkB,EAClB,QAAkB,EAClB,cAA8C,EAC9C,IAAyB,EACzB,UAAgC,EAChC,mBAAgD,EAChD,gBAA0C;QAE1C,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,EAAE,CAAC;QAEhD,MAAM,gBAAgB,GAAuB,EAAE,CAAC;QAEhD,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;YACxC,IAAI,CAAC;gBACJ,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAC/D,QAAQ,EACR,WAAW,EACX,mBAAmB,EACnB,cAAc,EACd,IAAI,EACJ,UAAU,CACV,CAAC;gBACF,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;oBACnC,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;gBACxC,CAAC;YACF,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,MAAM,KAAK,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAEzD,MAAM,IAAI,sCAAuB,CAChC,iDAAiD,KAAK,CAAC,OAAO,GAAG,EACjE,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,CACnC,CAAC;YACH,CAAC;QACF,CAAC;QAED,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,EAAE,gBAAgB,EAAE,CAAC;QAExD,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,EAAE,CAAC;QAE7C,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAEtC,KAAK,MAAM,QAAQ,IAAI,YAAY,EAAE,CAAC;YACrC,IAAI,CAAC;gBACJ,MAAM,IAAI,CAAC,eAAe,CACzB,QAAQ,EACR,QAAQ,EACR,cAAc,EACd,gBAAgB,EAChB,IAAI,EACJ,UAAU,CACV,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBAEZ,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACnC,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;gBACzC,CAAC;gBAED,MAAM,KAAK,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAEzD,MAAM,IAAI,sCAAuB,CAChC,iDAAiD,KAAK,CAAC,OAAO,GAAG,EACjE,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,CAChC,CAAC;YACH,CAAC;QACF,CAAC;IACF,CAAC;IAKO,KAAK,CAAC,eAAe,CAC5B,IAAW,EACX,QAAkB,EAClB,cAA8C,EAC9C,gBAA0C,EAC1C,IAAyB,EACzB,UAAgC;QAEhC,MAAM,aAAa,GAAG,gBAAgB,CAAC,QAAQ,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;QAEzF,MAAM,SAAS,GAAG,aAAa,CAAC,gBAAgB,CAAC,WAAW,CAE3D,CAAC;QAGF,MAAM,eAAe,GAAG,CAAC,SAAS,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,+BAAgB,CAAC,CAAC;QAErE,MAAM,cAAc,GAAG,KAAK,EAAE,cAAc,GAAG,KAAK,EAAE,EAAE;YACvD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,QAAQ,CAAC,IAAI,GAAG,EAAE;gBAC9E,YAAY,EAAE,QAAQ,CAAC,IAAI;gBAC3B,UAAU,EAAE,QAAQ,CAAC,EAAE;aACvB,CAAC,CAAC;YAEH,IAAI,CAAC;gBACJ,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;gBAE1F,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;oBAC3B,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBACpC,CAAC;YACF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAIhB,IAAI,cAAc,EAAE,CAAC;oBACpB,MAAM,KAAK,CAAC;gBACb,CAAC;gBACD,aAAa,CAAC,WAAW,CAAC,KAAc,CAAC,CAAC;YAC3C,CAAC;QACF,CAAC,CAAC;QAGF,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;QAE3B,KAAK,MAAM,UAAU,IAAI,eAAe,EAAE,CAAC;YAC1C,IAAI,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAChD,MAAM,IAAI,wBAAS,CAAC,oEAAoE,CAAC,CAAC;YAC3F,CAAC;YAED,MAAM,GAAG,GAAgB;gBACxB,UAAU,EAAE,QAAQ,CAAC,EAAE;gBACvB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,MAAM,EAAE,IAAI,CAAC,EAAE;gBACf,UAAU;aACV,CAAC;YAEF,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;QAC7D,CAAC;IACF,CAAC;IAKD,KAAK,CAAC,MAAM,CAAC,UAAkB;QAC9B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YAChC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,UAAU,GAAG,CAAC,CAAC;YACnF,OAAO,KAAK,CAAC;QACd,CAAC;QAED,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAEtD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAC3C,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,gBAAgB,IAAI,EAAE,EAAE,CAAC;YAC1C,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;QACxC,CAAC;QAED,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAExC,OAAO,IAAI,CAAC;IACb,CAAC;IAED,KAAK,CAAC,uCAAuC;QAC5C,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAE5D,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAE3C,KAAK,MAAM,UAAU,IAAI,iBAAiB,EAAE,CAAC;YAC5C,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC/B,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qDAAqD,EAAE;YACxE,WAAW,EAAE,iBAAiB;SAC9B,CAAC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,QAA0B,EAAE,UAAkB;QACxE,IAAI,CAAC,QAAQ,CAAC,aAAa;YAAE,OAAO;QAEpC,IAAI,CAAC;YACJ,MAAM,QAAQ,CAAC,aAAa,EAAE,CAAC;QAChC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAI,CAAC,YAAY,gCAAiB,EAAE,CAAC;gBACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,mDAAmD,CAAC,CAAC,IAAI,CAAC,IAAI,kBAAkB,UAAU,GAAG,CAC7F,CAAC;gBACF,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;gBACvD,OAAO;YACR,CAAC;YAED,MAAM,KAAK,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAEzD,MAAM,IAAI,wCAAyB,CAClC,gDAAgD,UAAU,OAAO,KAAK,CAAC,OAAO,GAAG,EACjF,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,CAC5B,CAAC;QACH,CAAC;IACF,CAAC;CACD,CAAA;AAjOY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,YAAO,GAAE;qCAGiB,uBAAM;QACQ,6CAAoB;QACtB,yCAAkB;QACvB,8BAAa;GALlC,eAAe,CAiO3B"}
|
|
@@ -24,7 +24,7 @@ class PollContext extends node_execution_context_1.NodeExecutionContext {
|
|
|
24
24
|
returnJsonArray: return_json_array_1.returnJsonArray,
|
|
25
25
|
...(0, request_helper_functions_1.getRequestHelperFunctions)(workflow, node, additionalData),
|
|
26
26
|
...(0, binary_helper_functions_1.getBinaryHelperFunctions)(additionalData, workflow.id),
|
|
27
|
-
...(0, scheduling_helper_functions_1.getSchedulingFunctions)(workflow),
|
|
27
|
+
...(0, scheduling_helper_functions_1.getSchedulingFunctions)(workflow.id, workflow.timezone, node.id),
|
|
28
28
|
};
|
|
29
29
|
}
|
|
30
30
|
getActivationMode() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poll-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/poll-context.ts"],"names":[],"mappings":";;;AASA,+CAAuE;AAEvE,qEAAgE;AAChE,6EAA2E;AAC3E,+EAA6E;AAC7E,iEAA4D;AAC5D,qFAA6E;AAE7E,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,mCAAe;YACf,GAAG,IAAA,oDAAyB,EAAC,QAAQ,EAAE,IAAI,EAAE,cAAc,CAAC;YAC5D,GAAG,IAAA,kDAAwB,EAAC,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC;YACxD,GAAG,IAAA,oDAAsB,EAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"poll-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/poll-context.ts"],"names":[],"mappings":";;;AASA,+CAAuE;AAEvE,qEAAgE;AAChE,6EAA2E;AAC3E,+EAA6E;AAC7E,iEAA4D;AAC5D,qFAA6E;AAE7E,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,mCAAe;YACf,GAAG,IAAA,oDAAyB,EAAC,QAAQ,EAAE,IAAI,EAAE,cAAc,CAAC;YAC5D,GAAG,IAAA,kDAAwB,EAAC,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC;YACxD,GAAG,IAAA,oDAAsB,EAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC;SAClE,CAAC;IACH,CAAC;IAED,iBAAiB;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,cAAc,CAAoD,IAAY;QACnF,OAAO,MAAM,IAAI,CAAC,eAAe,CAAI,IAAI,CAAC,CAAC;IAC5C,CAAC;CACD;AA9BD,kCA8BC"}
|
|
@@ -26,7 +26,7 @@ class TriggerContext extends node_execution_context_1.NodeExecutionContext {
|
|
|
26
26
|
...(0, ssh_tunnel_helper_functions_1.getSSHTunnelFunctions)(),
|
|
27
27
|
...(0, request_helper_functions_1.getRequestHelperFunctions)(workflow, node, additionalData),
|
|
28
28
|
...(0, binary_helper_functions_1.getBinaryHelperFunctions)(additionalData, workflow.id),
|
|
29
|
-
...(0, scheduling_helper_functions_1.getSchedulingFunctions)(workflow),
|
|
29
|
+
...(0, scheduling_helper_functions_1.getSchedulingFunctions)(workflow.id, workflow.timezone, node.id),
|
|
30
30
|
};
|
|
31
31
|
}
|
|
32
32
|
getActivationMode() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trigger-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/trigger-context.ts"],"names":[],"mappings":";;;AASA,+CAAuE;AAEvE,qEAAgE;AAChE,6EAA2E;AAC3E,+EAA6E;AAC7E,iEAA4D;AAC5D,qFAA6E;AAC7E,qFAA4E;AAE5E,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,mCAAe;YACf,GAAG,IAAA,mDAAqB,GAAE;YAC1B,GAAG,IAAA,oDAAyB,EAAC,QAAQ,EAAE,IAAI,EAAE,cAAc,CAAC;YAC5D,GAAG,IAAA,kDAAwB,EAAC,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC;YACxD,GAAG,IAAA,oDAAsB,EAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"trigger-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/trigger-context.ts"],"names":[],"mappings":";;;AASA,+CAAuE;AAEvE,qEAAgE;AAChE,6EAA2E;AAC3E,+EAA6E;AAC7E,iEAA4D;AAC5D,qFAA6E;AAC7E,qFAA4E;AAE5E,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,mCAAe;YACf,GAAG,IAAA,mDAAqB,GAAE;YAC1B,GAAG,IAAA,oDAAyB,EAAC,QAAQ,EAAE,IAAI,EAAE,cAAc,CAAC;YAC5D,GAAG,IAAA,kDAAwB,EAAC,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC;YACxD,GAAG,IAAA,oDAAsB,EAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC;SAClE,CAAC;IACH,CAAC;IAED,iBAAiB;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,cAAc,CAAoD,IAAY;QACnF,OAAO,MAAM,IAAI,CAAC,eAAe,CAAI,IAAI,CAAC,CAAC;IAC5C,CAAC;CACD;AA/BD,wCA+BC"}
|
|
@@ -7,6 +7,7 @@ const di_1 = require("@n8n/di");
|
|
|
7
7
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
8
8
|
const node_fs_1 = require("node:fs");
|
|
9
9
|
const promises_1 = require("node:fs/promises");
|
|
10
|
+
const node_path_1 = require("node:path");
|
|
10
11
|
const constants_1 = require("../../../constants");
|
|
11
12
|
const instance_settings_1 = require("../../../instance-settings");
|
|
12
13
|
const getAllowedPaths = () => {
|
|
@@ -22,7 +23,18 @@ const getAllowedPaths = () => {
|
|
|
22
23
|
};
|
|
23
24
|
async function isFilePathBlocked(filePath) {
|
|
24
25
|
const allowedPaths = getAllowedPaths();
|
|
25
|
-
|
|
26
|
+
let resolvedFilePath = '';
|
|
27
|
+
try {
|
|
28
|
+
resolvedFilePath = await (0, promises_1.realpath)(filePath);
|
|
29
|
+
}
|
|
30
|
+
catch (error) {
|
|
31
|
+
if (error.code === 'ENOENT') {
|
|
32
|
+
resolvedFilePath = (0, node_path_1.resolve)(filePath);
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
throw error;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
26
38
|
const blockFileAccessToN8nFiles = process.env[constants_1.BLOCK_FILE_ACCESS_TO_N8N_FILES] !== 'false';
|
|
27
39
|
const restrictedPaths = blockFileAccessToN8nFiles ? getN8nRestrictedPaths() : [];
|
|
28
40
|
if (restrictedPaths.some((restrictedPath) => (0, backend_common_1.isContainedWithin)(restrictedPath, resolvedFilePath))) {
|
package/dist/execution-engine/node-execution-context/utils/file-system-helper-functions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-system-helper-functions.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/file-system-helper-functions.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"file-system-helper-functions.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/file-system-helper-functions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import type { SchedulingFunctions, Workflow } from 'n8n-workflow';
|
|
2
|
-
export declare const getSchedulingFunctions: (
|
|
2
|
+
export declare const getSchedulingFunctions: (workflowId: Workflow["id"], timezone: Workflow["timezone"], nodeId: string) => SchedulingFunctions;
|
|
@@ -3,10 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getSchedulingFunctions = void 0;
|
|
4
4
|
const di_1 = require("@n8n/di");
|
|
5
5
|
const scheduled_task_manager_1 = require("../../scheduled-task-manager");
|
|
6
|
-
const getSchedulingFunctions = (
|
|
6
|
+
const getSchedulingFunctions = (workflowId, timezone, nodeId) => {
|
|
7
7
|
const scheduledTaskManager = di_1.Container.get(scheduled_task_manager_1.ScheduledTaskManager);
|
|
8
8
|
return {
|
|
9
|
-
registerCron: (
|
|
9
|
+
registerCron: ({ expression, recurrence }, onTick) => {
|
|
10
|
+
const ctx = {
|
|
11
|
+
expression,
|
|
12
|
+
recurrence,
|
|
13
|
+
nodeId,
|
|
14
|
+
workflowId,
|
|
15
|
+
timezone,
|
|
16
|
+
};
|
|
17
|
+
return scheduledTaskManager.registerCron(ctx, onTick);
|
|
18
|
+
},
|
|
10
19
|
};
|
|
11
20
|
};
|
|
12
21
|
exports.getSchedulingFunctions = getSchedulingFunctions;
|
package/dist/execution-engine/node-execution-context/utils/scheduling-helper-functions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduling-helper-functions.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/scheduling-helper-functions.ts"],"names":[],"mappings":";;;AAAA,gCAAoC;AAGpC,yEAAoE;AAE7D,MAAM,sBAAsB,GAAG,
|
|
1
|
+
{"version":3,"file":"scheduling-helper-functions.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/scheduling-helper-functions.ts"],"names":[],"mappings":";;;AAAA,gCAAoC;AAGpC,yEAAoE;AAE7D,MAAM,sBAAsB,GAAG,CACrC,UAA0B,EAC1B,QAA8B,EAC9B,MAAc,EACQ,EAAE;IACxB,MAAM,oBAAoB,GAAG,cAAS,CAAC,GAAG,CAAC,6CAAoB,CAAC,CAAC;IACjE,OAAO;QACN,YAAY,EAAE,CAAC,EAAE,UAAU,EAAE,UAAU,EAAQ,EAAE,MAAM,EAAE,EAAE;YAC1D,MAAM,GAAG,GAAgB;gBACxB,UAAU;gBACV,UAAU;gBACV,MAAM;gBACN,UAAU;gBACV,QAAQ;aACR,CAAC;YAEF,OAAO,oBAAoB,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACvD,CAAC;KACD,CAAC;AACH,CAAC,CAAC;AAnBW,QAAA,sBAAsB,0BAmBjC"}
|
|
@@ -1,20 +1,27 @@
|
|
|
1
1
|
import { Logger } from '@n8n/backend-common';
|
|
2
2
|
import { CronLoggingConfig } from '@n8n/config';
|
|
3
3
|
import { CronJob } from 'cron';
|
|
4
|
-
import type {
|
|
4
|
+
import type { CronContext, Workflow } from 'n8n-workflow';
|
|
5
|
+
import { ErrorReporter } from '../errors';
|
|
5
6
|
import { InstanceSettings } from '../instance-settings';
|
|
7
|
+
type CronKey = string;
|
|
8
|
+
type Cron = {
|
|
9
|
+
job: CronJob;
|
|
10
|
+
summary: string;
|
|
11
|
+
ctx: CronContext;
|
|
12
|
+
};
|
|
13
|
+
type CronsByWorkflow = Map<Workflow['id'], Map<CronKey, Cron>>;
|
|
6
14
|
export declare class ScheduledTaskManager {
|
|
7
15
|
private readonly instanceSettings;
|
|
8
16
|
private readonly logger;
|
|
9
|
-
private readonly
|
|
10
|
-
readonly
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
}
|
|
14
|
-
|
|
15
|
-
constructor(instanceSettings: InstanceSettings, logger: Logger, config: CronLoggingConfig);
|
|
16
|
-
private logActiveCrons;
|
|
17
|
-
registerCron(workflow: Workflow, { expression, recurrence }: Cron, onTick: () => void): void;
|
|
17
|
+
private readonly errorReporter;
|
|
18
|
+
readonly cronsByWorkflow: CronsByWorkflow;
|
|
19
|
+
private logInterval?;
|
|
20
|
+
private get loggableCrons();
|
|
21
|
+
constructor(instanceSettings: InstanceSettings, logger: Logger, { activeInterval }: CronLoggingConfig, errorReporter: ErrorReporter);
|
|
22
|
+
registerCron(ctx: CronContext, onTick: () => void): void;
|
|
18
23
|
deregisterCrons(workflowId: string): void;
|
|
19
24
|
deregisterAllCrons(): void;
|
|
25
|
+
private toCronKey;
|
|
20
26
|
}
|
|
27
|
+
export {};
|
|
@@ -15,81 +15,118 @@ const config_1 = require("@n8n/config");
|
|
|
15
15
|
const constants_1 = require("@n8n/constants");
|
|
16
16
|
const di_1 = require("@n8n/di");
|
|
17
17
|
const cron_1 = require("cron");
|
|
18
|
+
const errors_1 = require("../errors");
|
|
18
19
|
const instance_settings_1 = require("../instance-settings");
|
|
19
20
|
let ScheduledTaskManager = class ScheduledTaskManager {
|
|
20
|
-
|
|
21
|
+
get loggableCrons() {
|
|
22
|
+
const loggableCrons = {};
|
|
23
|
+
for (const [workflowId, crons] of this.cronsByWorkflow) {
|
|
24
|
+
loggableCrons[`workflowId-${workflowId}`] = Array.from(crons.values()).map(({ summary }) => summary);
|
|
25
|
+
}
|
|
26
|
+
return loggableCrons;
|
|
27
|
+
}
|
|
28
|
+
constructor(instanceSettings, logger, { activeInterval }, errorReporter) {
|
|
21
29
|
this.instanceSettings = instanceSettings;
|
|
22
30
|
this.logger = logger;
|
|
23
|
-
this.
|
|
24
|
-
this.
|
|
31
|
+
this.errorReporter = errorReporter;
|
|
32
|
+
this.cronsByWorkflow = new Map();
|
|
25
33
|
this.logger = this.logger.scoped('cron');
|
|
26
|
-
if (
|
|
27
|
-
return;
|
|
28
|
-
this.logInterval = setInterval(() => this.logActiveCrons(), this.config.activeInterval * constants_1.Time.minutes.toMilliseconds);
|
|
29
|
-
}
|
|
30
|
-
logActiveCrons() {
|
|
31
|
-
const activeCrons = {};
|
|
32
|
-
for (const [workflowId, cronJobs] of this.cronMap) {
|
|
33
|
-
activeCrons[`workflow-${workflowId}`] = cronJobs.map(({ displayableCron }) => displayableCron);
|
|
34
|
-
}
|
|
35
|
-
if (Object.keys(activeCrons).length === 0)
|
|
34
|
+
if (activeInterval === 0)
|
|
36
35
|
return;
|
|
37
|
-
this.
|
|
36
|
+
this.logInterval = setInterval(() => {
|
|
37
|
+
if (Object.keys(this.loggableCrons).length === 0)
|
|
38
|
+
return;
|
|
39
|
+
this.logger.debug('Currently active crons', { active: this.loggableCrons });
|
|
40
|
+
}, activeInterval * constants_1.Time.minutes.toMilliseconds);
|
|
38
41
|
}
|
|
39
|
-
registerCron(
|
|
40
|
-
const
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
42
|
+
registerCron(ctx, onTick) {
|
|
43
|
+
const { workflowId, timezone, nodeId, expression, recurrence } = ctx;
|
|
44
|
+
const summary = recurrence?.activated
|
|
45
|
+
? `${expression} (every ${recurrence.intervalSize} ${recurrence.typeInterval})`
|
|
46
|
+
: expression;
|
|
47
|
+
const workflowCrons = this.cronsByWorkflow.get(workflowId);
|
|
48
|
+
const key = this.toCronKey({ workflowId, nodeId, expression, timezone, recurrence });
|
|
49
|
+
if (workflowCrons?.has(key)) {
|
|
50
|
+
this.errorReporter.error('Skipped registration for already registered cron', {
|
|
51
|
+
tags: { cron: 'duplicate' },
|
|
52
|
+
extra: {
|
|
53
|
+
workflowId,
|
|
54
|
+
timezone,
|
|
55
|
+
nodeId,
|
|
56
|
+
expression,
|
|
57
|
+
recurrence,
|
|
49
58
|
instanceRole: this.instanceSettings.instanceRole,
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
}
|
|
54
|
-
const
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
59
|
+
},
|
|
60
|
+
});
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
const job = new cron_1.CronJob(expression, () => {
|
|
64
|
+
if (!this.instanceSettings.isLeader)
|
|
65
|
+
return;
|
|
66
|
+
this.logger.debug('Executing cron for workflow', {
|
|
67
|
+
workflowId,
|
|
68
|
+
nodeId,
|
|
69
|
+
cron: summary,
|
|
70
|
+
instanceRole: this.instanceSettings.instanceRole,
|
|
71
|
+
});
|
|
72
|
+
onTick();
|
|
73
|
+
}, undefined, true, timezone);
|
|
74
|
+
const cron = { job, summary, ctx };
|
|
75
|
+
if (!workflowCrons) {
|
|
76
|
+
this.cronsByWorkflow.set(workflowId, new Map([[key, cron]]));
|
|
58
77
|
}
|
|
59
78
|
else {
|
|
60
|
-
|
|
79
|
+
workflowCrons.set(key, cron);
|
|
61
80
|
}
|
|
62
81
|
this.logger.debug('Registered cron for workflow', {
|
|
63
|
-
workflowId
|
|
64
|
-
cron:
|
|
82
|
+
workflowId,
|
|
83
|
+
cron: summary,
|
|
65
84
|
instanceRole: this.instanceSettings.instanceRole,
|
|
66
85
|
});
|
|
67
86
|
}
|
|
68
87
|
deregisterCrons(workflowId) {
|
|
69
|
-
const
|
|
70
|
-
if (
|
|
88
|
+
const workflowCrons = this.cronsByWorkflow.get(workflowId);
|
|
89
|
+
if (!workflowCrons || workflowCrons.size === 0)
|
|
71
90
|
return;
|
|
72
|
-
const
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
crons.push(cronEntry.displayableCron);
|
|
77
|
-
cronEntry.job.stop();
|
|
78
|
-
}
|
|
91
|
+
const summaries = [];
|
|
92
|
+
for (const cron of workflowCrons.values()) {
|
|
93
|
+
summaries.push(cron.summary);
|
|
94
|
+
cron.job.stop();
|
|
79
95
|
}
|
|
80
|
-
this.
|
|
96
|
+
this.cronsByWorkflow.delete(workflowId);
|
|
81
97
|
this.logger.info('Deregistered all crons for workflow', {
|
|
82
98
|
workflowId,
|
|
83
|
-
crons,
|
|
99
|
+
crons: summaries,
|
|
84
100
|
instanceRole: this.instanceSettings.instanceRole,
|
|
85
101
|
});
|
|
86
102
|
}
|
|
87
103
|
deregisterAllCrons() {
|
|
88
|
-
for (const workflowId of this.
|
|
104
|
+
for (const workflowId of this.cronsByWorkflow.keys()) {
|
|
89
105
|
this.deregisterCrons(workflowId);
|
|
90
106
|
}
|
|
91
|
-
|
|
92
|
-
|
|
107
|
+
clearInterval(this.logInterval);
|
|
108
|
+
this.logInterval = undefined;
|
|
109
|
+
}
|
|
110
|
+
toCronKey(ctx) {
|
|
111
|
+
const { recurrence, ...rest } = ctx;
|
|
112
|
+
const flattened = !recurrence
|
|
113
|
+
? rest
|
|
114
|
+
: {
|
|
115
|
+
...rest,
|
|
116
|
+
recurrenceActivated: recurrence.activated,
|
|
117
|
+
...(recurrence.activated && {
|
|
118
|
+
recurrenceIndex: recurrence.index,
|
|
119
|
+
recurrenceIntervalSize: recurrence.intervalSize,
|
|
120
|
+
recurrenceTypeInterval: recurrence.typeInterval,
|
|
121
|
+
}),
|
|
122
|
+
};
|
|
123
|
+
const sorted = Object.keys(flattened)
|
|
124
|
+
.sort()
|
|
125
|
+
.reduce((result, key) => {
|
|
126
|
+
result[key] = flattened[key];
|
|
127
|
+
return result;
|
|
128
|
+
}, {});
|
|
129
|
+
return JSON.stringify(sorted);
|
|
93
130
|
}
|
|
94
131
|
};
|
|
95
132
|
exports.ScheduledTaskManager = ScheduledTaskManager;
|
|
@@ -97,6 +134,7 @@ exports.ScheduledTaskManager = ScheduledTaskManager = __decorate([
|
|
|
97
134
|
(0, di_1.Service)(),
|
|
98
135
|
__metadata("design:paramtypes", [instance_settings_1.InstanceSettings,
|
|
99
136
|
backend_common_1.Logger,
|
|
100
|
-
config_1.CronLoggingConfig
|
|
137
|
+
config_1.CronLoggingConfig,
|
|
138
|
+
errors_1.ErrorReporter])
|
|
101
139
|
], ScheduledTaskManager);
|
|
102
140
|
//# sourceMappingURL=scheduled-task-manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduled-task-manager.js","sourceRoot":"","sources":["../../src/execution-engine/scheduled-task-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAAgD;AAChD,8CAAsC;AACtC,gCAAkC;AAClC,+BAA+B;AAG/B,2DAAuD;
|
|
1
|
+
{"version":3,"file":"scheduled-task-manager.js","sourceRoot":"","sources":["../../src/execution-engine/scheduled-task-manager.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.105.
|
|
3
|
+
"version": "1.105.2",
|
|
4
4
|
"description": "Core functionality of n8n",
|
|
5
5
|
"main": "dist/index",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -12,8 +12,8 @@
|
|
|
12
12
|
"files": [
|
|
13
13
|
"dist",
|
|
14
14
|
"bin",
|
|
15
|
-
"
|
|
16
|
-
"
|
|
15
|
+
"LICENSE.md",
|
|
16
|
+
"LICENSE_EE.md"
|
|
17
17
|
],
|
|
18
18
|
"devDependencies": {
|
|
19
19
|
"@types/express": "^5.0.1",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"@types/proxy-from-env": "^1.0.4",
|
|
24
24
|
"@types/uuid": "^10.0.0",
|
|
25
25
|
"@types/xml2js": "^0.4.14",
|
|
26
|
-
"@n8n/
|
|
27
|
-
"@n8n/
|
|
26
|
+
"@n8n/typescript-config": "1.3.0",
|
|
27
|
+
"@n8n/errors": "^0.4.0"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
30
|
"@aws-sdk/client-s3": "3.808.0",
|
|
@@ -58,13 +58,13 @@
|
|
|
58
58
|
"winston": "3.14.2",
|
|
59
59
|
"xml2js": "0.6.2",
|
|
60
60
|
"zod": "3.25.67",
|
|
61
|
-
"@n8n/backend-common": "^0.16.
|
|
62
|
-
"@n8n/client-oauth2": "0.28.0",
|
|
63
|
-
"@n8n/constants": "0.10.0",
|
|
61
|
+
"@n8n/backend-common": "^0.16.2",
|
|
64
62
|
"@n8n/config": "1.49.0",
|
|
65
|
-
"@n8n/
|
|
63
|
+
"@n8n/constants": "0.10.0",
|
|
64
|
+
"@n8n/decorators": "0.16.2",
|
|
65
|
+
"@n8n/client-oauth2": "0.28.0",
|
|
66
66
|
"@n8n/di": "0.9.0",
|
|
67
|
-
"n8n-workflow": "1.103.
|
|
67
|
+
"n8n-workflow": "1.103.2"
|
|
68
68
|
},
|
|
69
69
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
70
70
|
"homepage": "https://n8n.io",
|