n8n 1.62.2 → 1.63.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/active-workflow-manager.js +1 -1
- package/dist/active-workflow-manager.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/base-command.js +2 -1
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/db/revert.js +3 -1
- package/dist/commands/db/revert.js.map +1 -1
- package/dist/commands/webhook.js +6 -2
- package/dist/commands/webhook.js.map +1 -1
- package/dist/commands/worker.js +6 -8
- package/dist/commands/worker.js.map +1 -1
- package/dist/concurrency/concurrency-control.service.d.ts +0 -1
- package/dist/concurrency/concurrency-control.service.js +5 -8
- package/dist/concurrency/concurrency-control.service.js.map +1 -1
- package/dist/constants.d.ts +1 -0
- package/dist/constants.js +1 -0
- package/dist/constants.js.map +1 -1
- package/dist/controllers/ai.controller.d.ts +15 -0
- package/dist/controllers/{ai-assistant.controller.js → ai.controller.js} +31 -15
- package/dist/controllers/ai.controller.js.map +1 -0
- package/dist/controllers/orchestration.controller.d.ts +0 -1
- package/dist/controllers/orchestration.controller.js +0 -12
- package/dist/controllers/orchestration.controller.js.map +1 -1
- package/dist/databases/migrations/common/1724951148974-AddApiKeysTable.d.ts +3 -2
- package/dist/databases/migrations/common/1724951148974-AddApiKeysTable.js +28 -0
- package/dist/databases/migrations/common/1724951148974-AddApiKeysTable.js.map +1 -1
- package/dist/databases/migrations/sqlite/1724951148974-AddApiKeysTable.d.ts +4 -2
- package/dist/databases/migrations/sqlite/1724951148974-AddApiKeysTable.js +28 -0
- package/dist/databases/migrations/sqlite/1724951148974-AddApiKeysTable.js.map +1 -1
- package/dist/environments/source-control/source-control-helper.ee.d.ts +1 -0
- package/dist/environments/source-control/source-control-helper.ee.js +12 -0
- package/dist/environments/source-control/source-control-helper.ee.js.map +1 -1
- package/dist/environments/source-control/source-control-import.service.ee.js +8 -6
- package/dist/environments/source-control/source-control-import.service.ee.js.map +1 -1
- package/dist/environments/source-control/source-control.controller.ee.js.map +1 -1
- package/dist/environments/source-control/source-control.service.ee.d.ts +1 -1
- package/dist/environments/source-control/source-control.service.ee.js +14 -7
- package/dist/environments/source-control/source-control.service.ee.js.map +1 -1
- package/dist/errors/response-errors/webhook-not-found.error.js +7 -3
- package/dist/errors/response-errors/webhook-not-found.error.js.map +1 -1
- package/dist/eventbus/message-event-bus-writer/message-event-bus-log-writer.js +1 -1
- package/dist/eventbus/message-event-bus-writer/message-event-bus-log-writer.js.map +1 -1
- package/dist/events/maps/pub-sub.event-map.d.ts +0 -9
- package/dist/events/maps/relay.event-map.d.ts +4 -0
- package/dist/events/relays/telemetry.event-relay.d.ts +1 -0
- package/dist/events/relays/telemetry.event-relay.js +7 -0
- package/dist/events/relays/telemetry.event-relay.js.map +1 -1
- package/dist/execution-lifecycle-hooks/shared/shared-hook-functions.d.ts +1 -1
- package/dist/execution-lifecycle-hooks/shared/shared-hook-functions.js +3 -1
- package/dist/execution-lifecycle-hooks/shared/shared-hook-functions.js.map +1 -1
- package/dist/license/license.controller.d.ts +11 -2
- package/dist/license/license.controller.js +28 -2
- package/dist/license/license.controller.js.map +1 -1
- package/dist/license/license.service.d.ts +9 -0
- package/dist/license/license.service.js +49 -5
- package/dist/license/license.service.js.map +1 -1
- package/dist/license.d.ts +1 -0
- package/dist/license.js +7 -3
- package/dist/license.js.map +1 -1
- package/dist/load-nodes-and-credentials.js +6 -7
- package/dist/load-nodes-and-credentials.js.map +1 -1
- package/dist/logging/logger.service.d.ts +10 -1
- package/dist/logging/logger.service.js +65 -12
- package/dist/logging/logger.service.js.map +1 -1
- package/dist/logging/types.d.ts +8 -5
- package/dist/requests.d.ts +2 -1
- package/dist/runners/task-managers/task-manager.d.ts +4 -2
- package/dist/runners/task-managers/task-manager.js +3 -1
- package/dist/runners/task-managers/task-manager.js.map +1 -1
- package/dist/runners/task-runner-process.js +1 -1
- package/dist/scaling/constants.d.ts +2 -0
- package/dist/scaling/constants.js +6 -1
- package/dist/scaling/constants.js.map +1 -1
- package/dist/scaling/pubsub/publisher.service.js +7 -1
- package/dist/scaling/pubsub/publisher.service.js.map +1 -1
- package/dist/scaling/pubsub/pubsub-handler.d.ts +22 -0
- package/dist/scaling/pubsub/pubsub-handler.js +87 -0
- package/dist/scaling/pubsub/pubsub-handler.js.map +1 -0
- package/dist/scaling/pubsub/pubsub.types.d.ts +3 -7
- package/dist/scaling/pubsub/subscriber.service.d.ts +5 -1
- package/dist/scaling/pubsub/subscriber.service.js +35 -2
- package/dist/scaling/pubsub/subscriber.service.js.map +1 -1
- package/dist/scaling/scaling.service.js +30 -24
- package/dist/scaling/scaling.service.js.map +1 -1
- package/dist/scaling/worker-server.d.ts +5 -4
- package/dist/scaling/worker-server.js +24 -33
- package/dist/scaling/worker-server.js.map +1 -1
- package/dist/scaling/worker-status.d.ts +24 -0
- package/dist/scaling/worker-status.js +57 -0
- package/dist/scaling/worker-status.js.map +1 -0
- package/dist/server.d.ts +1 -1
- package/dist/server.js +1 -1
- package/dist/server.js.map +1 -1
- package/dist/services/{ai-assistant.service.d.ts → ai.service.d.ts} +2 -2
- package/dist/services/{ai-assistant.service.js → ai.service.js} +13 -6
- package/dist/services/ai.service.js.map +1 -0
- package/dist/services/frontend.service.js +7 -2
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/import.service.js +1 -2
- package/dist/services/import.service.js.map +1 -1
- package/dist/services/orchestration/main/handle-command-message-main.d.ts +46 -0
- package/dist/services/orchestration/main/handle-command-message-main.js +1 -5
- package/dist/services/orchestration/main/handle-command-message-main.js.map +1 -1
- package/dist/services/orchestration/main/handle-worker-response-message-main.d.ts +0 -21
- package/dist/services/orchestration/main/handle-worker-response-message-main.js +2 -3
- package/dist/services/orchestration/main/handle-worker-response-message-main.js.map +1 -1
- package/dist/services/orchestration.service.d.ts +0 -1
- package/dist/services/orchestration.service.js +0 -7
- package/dist/services/orchestration.service.js.map +1 -1
- package/dist/services/redis-client.service.d.ts +1 -0
- package/dist/services/redis-client.service.js +3 -0
- package/dist/services/redis-client.service.js.map +1 -1
- package/dist/telemetry/index.js +8 -1
- package/dist/telemetry/index.js.map +1 -1
- package/dist/utils/path-util.d.ts +1 -0
- package/dist/utils/path-util.js +36 -0
- package/dist/utils/path-util.js.map +1 -0
- package/dist/wait-tracker.js +6 -5
- package/dist/wait-tracker.js.map +1 -1
- package/dist/webhooks/live-webhooks.js +2 -1
- package/dist/webhooks/live-webhooks.js.map +1 -1
- package/dist/webhooks/waiting-webhooks.d.ts +2 -0
- package/dist/webhooks/waiting-webhooks.js +37 -13
- package/dist/webhooks/waiting-webhooks.js.map +1 -1
- package/dist/workflow-execute-additional-data.d.ts +1 -1
- package/dist/workflow-execute-additional-data.js +2 -2
- package/dist/workflow-execute-additional-data.js.map +1 -1
- package/dist/workflows/workflow-history/workflow-history.service.ee.js +5 -1
- package/dist/workflows/workflow-history/workflow-history.service.ee.js.map +1 -1
- package/package.json +17 -18
- package/templates/form-trigger.handlebars +8 -0
- package/templates/send-and-wait-no-action-required.handlebars +73 -0
- package/dist/controllers/ai-assistant.controller.d.ts +0 -14
- package/dist/controllers/ai-assistant.controller.js.map +0 -1
- package/dist/errors/port-taken.error.d.ts +0 -4
- package/dist/errors/port-taken.error.js +0 -11
- package/dist/errors/port-taken.error.js.map +0 -1
- package/dist/services/ai-assistant.service.js.map +0 -1
- package/dist/services/orchestration/webhook/handle-command-message-webhook.d.ts +0 -124
- package/dist/services/orchestration/webhook/handle-command-message-webhook.js +0 -72
- package/dist/services/orchestration/webhook/handle-command-message-webhook.js.map +0 -1
- package/dist/services/orchestration/webhook/orchestration.handler.webhook.service.d.ts +0 -7
- package/dist/services/orchestration/webhook/orchestration.handler.webhook.service.js +0 -32
- package/dist/services/orchestration/webhook/orchestration.handler.webhook.service.js.map +0 -1
- package/dist/services/orchestration/worker/handle-command-message-worker.d.ts +0 -2
- package/dist/services/orchestration/worker/handle-command-message-worker.js +0 -147
- package/dist/services/orchestration/worker/handle-command-message-worker.js.map +0 -1
- package/dist/services/orchestration/worker/orchestration.handler.worker.service.d.ts +0 -8
- package/dist/services/orchestration/worker/orchestration.handler.worker.service.js +0 -34
- package/dist/services/orchestration/worker/orchestration.handler.worker.service.js.map +0 -1
|
@@ -209,7 +209,8 @@ class BaseCommand extends core_1.Command {
|
|
|
209
209
|
this.logger.debug('License init complete');
|
|
210
210
|
}
|
|
211
211
|
catch (e) {
|
|
212
|
-
|
|
212
|
+
const error = (0, n8n_workflow_1.ensureError)(e);
|
|
213
|
+
this.logger.error('Could not activate license', { error });
|
|
213
214
|
}
|
|
214
215
|
}
|
|
215
216
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../../src/commands/base-command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4BAA0B;AAC1B,wCAA2C;AAC3C,sCAA8C;AAC9C,uCAAmF;AACnF,+
|
|
1
|
+
{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../../src/commands/base-command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4BAA0B;AAC1B,wCAA2C;AAC3C,sCAA8C;AAC9C,uCAAmF;AACnF,+CAKsB;AACtB,mCAAmC;AAGnC,sDAA8B;AAC9B,2CAAsE;AACtE,8DAAgD;AAChD,6DAAsE;AACtE,yCAA2B;AAC3B,uDAAsD;AACtD,sFAAiF;AACjF,iFAA4E;AAC5E,iEAAiE;AACjE,qDAAiD;AACjD,gGAAwF;AACxF,uCAAoC;AACpC,6EAAuE;AACvE,6DAAkD;AAClD,6CAAyC;AACzC,uCAA0C;AAC1C,kEAA8D;AAC9D,0GAAkG;AAElG,MAAsB,WAAY,SAAQ,cAAO;IAAjD;;QACW,WAAM,GAAG,kBAAS,CAAC,GAAG,CAAC,uBAAM,CAAC,CAAC;QAM/B,qBAAgB,GAAqB,kBAAS,CAAC,GAAG,CAAC,2BAAgB,CAAC,CAAC;QAMrE,oBAAe,GAAoB,kBAAS,CAAC,GAAG,CAAC,kCAAe,CAAC,CAAC;QAIzD,iBAAY,GAAG,kBAAS,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC;QAKpD,+BAA0B,GAAG,gBAAM,CAAC,MAAM,CAAC,iCAAiC,CAAC,CAAC;QAG9E,2BAAsB,GAAG,KAAK,CAAC;IA4R1C,CAAC;IA1RA,KAAK,CAAC,IAAI;QACT,MAAM,IAAA,mCAAiB,GAAE,CAAC;QAC1B,IAAA,8CAAuB,GAAE,CAAC;QAE1B,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC;QAC7D,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE3D,IAAI,CAAC,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAC,sBAAS,CAAC,CAAC;QAC1C,MAAM,kBAAS,CAAC,GAAG,CAAC,oDAAuB,CAAC,CAAC,IAAI,EAAE,CAAC;QAEpD,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CACpB,KAAK,EAAE,KAAY,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAC7F,CAAC;QAIF,IAAI,yBAAa,IAAI,kBAAM,EAAE,CAAC;YAC7B,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;QACjC,CAAC;QAED,MAAM,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC;QAE1B,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,CACvB,KAAK,EAAE,KAAY,EAAE,EAAE,CACtB,MAAM,IAAI,CAAC,aAAa,CAAC,gDAAgD,EAAE,KAAK,CAAC,CAClF,CAAC;QAEF,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC;QAEpD,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,kIAAkI,CAClI,CAAC;QACH,CAAC;QAED,IAAI,OAAO,CAAC,GAAG,CAAC,wCAAwC,EAAE,CAAC;YAC1D,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,wLAAwL,CACxL,CAAC;QACH,CAAC;QAED,IAAI,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,OAAO,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;YACzE,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,kFAAkF,CAClF,CAAC;QACH,CAAC;QAED,IACC,OAAO,CAAC,GAAG,CAAC,mBAAmB;YAC/B,OAAO,CAAC,GAAG,CAAC,6BAA6B;YACzC,OAAO,CAAC,GAAG,CAAC,6BAA6B,EACxC,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,4RAA4R,CAC5R,CAAC;QACH,CAAC;QAED,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;QACtD,IAAI,iBAAiB,CAAC,OAAO,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC9D,MAAM,EAAE,wBAAwB,EAAE,GAAG,wDAAa,uCAAuC,GAAC,CAAC;YAC3F,MAAM,kBAAS,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,uBAAuB,EAAE,CAAC;QACzE,CAAC;QAGD,kBAAS,CAAC,GAAG,CAAC,mCAAe,CAAC,CAAC;QAE/B,MAAM,kBAAS,CAAC,GAAG,CAAC,uBAAa,CAAC,CAAC,IAAI,EAAE,CAAC;QAC1C,MAAM,kBAAS,CAAC,GAAG,CAAC,2CAAmB,CAAC,CAAC,IAAI,EAAE,CAAC;IACjD,CAAC;IAES,sBAAsB;QAC/B,IAAI,gBAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACrC,IAAI,CAAC,WAAW,GAAG,gBAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;YACnD,OAAO;QACR,CAAC;QAED,IAAI,CAAC,WAAW,GAAG,IAAA,mCAAsB,EAAC,IAAI,CAAC,gBAAgB,CAAC,YAAa,CAAC,CAAC;QAC/E,gBAAM,CAAC,GAAG,CAAC,mBAAmB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACnD,CAAC;IAES,KAAK,CAAC,WAAW;IAE3B,CAAC;IAES,KAAK,CAAC,gBAAgB;QAC/B,MAAM,YAAY,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;IAES,KAAK,CAAC,gBAAgB;QAC/B,IAAI,CAAC;YACJ,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACzD,CAAC;gBAAS,CAAC;YACV,OAAO,CAAC,IAAI,EAAE,CAAC;QAChB,CAAC;IACF,CAAC;IAES,KAAK,CAAC,aAAa,CAAC,OAAe,EAAE,KAAc;QAC5D,iCAAa,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QAC9E,MAAM,IAAA,oBAAK,EAAC,IAAI,CAAC,CAAC;QAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC3B,MAAM,UAAU,GAAG,gBAAM,CAAC,MAAM,CAAC,wBAAwB,CAAC,KAAK,IAAI,CAAC;QACpE,MAAM,WAAW,GAAG,gBAAM,CAAC,MAAM,CAAC,kCAAkC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAErF,IAAI,CAAC,UAAU,IAAI,CAAC,WAAW;YAAE,OAAO;QAExC,IAAI,UAAU,IAAI,CAAC,WAAW,EAAE,CAAC;YAChC,MAAM,IAAI,+BAAgB,CACzB,wIAAwI,CACxI,CAAC;QACH,CAAC;QAED,MAAM,UAAU,GAAG,kBAAS,CAAC,GAAG,CAAC,iBAAO,CAAC,CAAC,gBAAgB,CAAC,4BAAgB,CAAC,cAAc,CAAC,CAAC;QAE5F,IAAI,UAAU,IAAI,WAAW,IAAI,UAAU,EAAE,CAAC;YAC7C,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,8EAA8E,CAC9E,CAAC;YAEF,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAErC,OAAO;QACR,CAAC;QAED,IAAI,UAAU,IAAI,WAAW,IAAI,CAAC,UAAU,EAAE,CAAC;YAC9C,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,6JAA6J,CAC7J,CAAC;YAEF,MAAM,IAAI,CAAC,uBAAuB,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;YAEzD,OAAO;QACR,CAAC;QAED,IAAI,CAAC,UAAU,IAAI,WAAW,EAAE,CAAC;YAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,qFAAqF,CACrF,CAAC;YAEF,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAErC,OAAO;QACR,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,uBAAuB,CAAC,OAAO,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE;QACpE,MAAM,kBAAkB,GAAG,kBAAS,CAAC,GAAG,CAAC,6BAAkB,CAAC,CAAC;QAE7D,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE,CAAC;QAE3E,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,+BAAgB,CACzB,kFAAkF,CAClF,CAAC;QACH,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,EAAE,EAAE,CAAC;YACxB,MAAM,IAAI,+BAAgB,CACzB,gGAAgG,CAChG,CAAC;QACH,CAAC;QAED,IAAI,MAAM,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;YAC1B,MAAM,IAAI,+BAAgB,CACzB,oGAAoG,CACpG,CAAC;QACH,CAAC;QAED,IAAI,WAAW,CAAC,SAAS,KAAK,EAAE,EAAE,CAAC;YAClC,MAAM,IAAI,+BAAgB,CACzB,8FAA8F,CAC9F,CAAC;QACH,CAAC;QAED,IAAI,WAAW,CAAC,YAAY,KAAK,EAAE,EAAE,CAAC;YACrC,MAAM,IAAI,+BAAgB,CACzB,oGAAoG,CACpG,CAAC;QACH,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QAEvD,IAAI,CAAC;YACJ,MAAM,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;YACzD,kBAAkB,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAEnD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAClD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,MAAM,KAAK,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAEzD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1D,CAAC;IACF,CAAC;IAED,KAAK,CAAC,qBAAqB;QAC1B,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACrC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,MAAM,KAAK,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACzD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YAC9E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;QAED,MAAM,gBAAgB,GAAG,gBAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;QAC5D,MAAM,kBAAS,CAAC,GAAG,CAAC,4BAAiB,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,iBAAiB;QACtB,IAAI,CAAC,aAAa,GAAG,kBAAS,CAAC,GAAG,CAAC,8BAAa,CAAC,CAAC;QAClD,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,WAAW;QAChB,IAAI,CAAC,OAAO,GAAG,kBAAS,CAAC,GAAG,CAAC,iBAAO,CAAC,CAAC;QACtC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAE1B,MAAM,aAAa,GAAG,gBAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;QAE7D,IAAI,aAAa,EAAE,CAAC;YACnB,MAAM,OAAO,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YAE9D,IAAI,OAAO,EAAE,CAAC;gBACb,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YACzD,CAAC;YAED,IAAI,CAAC;gBACJ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;gBACnD,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;gBAC3C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;YAC5C,CAAC;YAAC,OAAO,CAAU,EAAE,CAAC;gBACrB,MAAM,KAAK,GAAG,IAAA,0BAAW,EAAC,CAAC,CAAC,CAAC;gBAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YAC5D,CAAC;QACF,CAAC;IACF,CAAC;IAED,KAAK,CAAC,mBAAmB;QACxB,MAAM,cAAc,GAAG,kBAAS,CAAC,GAAG,CAAC,oDAAsB,CAAC,CAAC;QAC7D,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC;IAC7B,CAAC;IAED,mBAAmB;QAClB,kBAAS,CAAC,GAAG,CAAC,oDAAsB,CAAC,CAAC,IAAI,EAAE,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAwB;QACrC,IAAI,kBAAM,IAAI,IAAI,CAAC,EAAE,KAAK,OAAO;YAAE,OAAO;QAC1C,IAAI,EAAE,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC;YAClC,MAAM,IAAA,oBAAK,EAAC,GAAG,CAAC,CAAC;YACjB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;QAClB,CAAC;QACD,MAAM,QAAQ,GAAG,KAAK,YAAY,aAAM,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACtF,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrB,CAAC;IAES,mBAAmB,CAAC,MAAc;QAC3C,OAAO,KAAK,IAAI,EAAE;YACjB,IAAI,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,EAAE,CAAC;gBAC3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,MAAM,4BAA4B,CAAC,CAAC;gBACjE,OAAO;YACR,CAAC;YAED,MAAM,kBAAkB,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;gBAGhD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,IAAI,CAAC,0BAA0B,GAAG,CAAC,CAAC;gBAC7E,MAAM,QAAQ,GAAG,4BAA4B,IAAI,CAAC,0BAA0B,UAAU,CAAC;gBACvF,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;YACzD,CAAC,EAAE,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC,CAAC;YAE3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,MAAM,oBAAoB,CAAC,CAAC;YACzD,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;YAEhC,MAAM,IAAI,CAAC,eAAe,CAAC,eAAe,EAAE,CAAC;YAE7C,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;YAEzB,YAAY,CAAC,kBAAkB,CAAC,CAAC;QAClC,CAAC,CAAC;IACH,CAAC;CACD;AArTD,kCAqTC"}
|
|
@@ -32,7 +32,9 @@ async function main(logger, connection, migrationExecutor) {
|
|
|
32
32
|
logger.error(message);
|
|
33
33
|
return;
|
|
34
34
|
}
|
|
35
|
-
await connection.undoLastMigration(
|
|
35
|
+
await connection.undoLastMigration({
|
|
36
|
+
transaction: lastMigrationInstance.transaction === false ? 'none' : 'each',
|
|
37
|
+
});
|
|
36
38
|
await connection.destroy();
|
|
37
39
|
}
|
|
38
40
|
class DbRevertMigrationCommand extends core_1.Command {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"revert.js","sourceRoot":"","sources":["../../../src/commands/db/revert.ts"],"names":[],"mappings":";;;AAeA,
|
|
1
|
+
{"version":3,"file":"revert.js","sourceRoot":"","sources":["../../../src/commands/db/revert.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/webhook.js
CHANGED
|
@@ -32,7 +32,8 @@ const n8n_workflow_1 = require("n8n-workflow");
|
|
|
32
32
|
const typedi_1 = require("typedi");
|
|
33
33
|
const active_executions_1 = require("../active-executions");
|
|
34
34
|
const config_1 = __importDefault(require("../config"));
|
|
35
|
-
const
|
|
35
|
+
const pubsub_handler_1 = require("../scaling/pubsub/pubsub-handler");
|
|
36
|
+
const subscriber_service_1 = require("../scaling/pubsub/subscriber.service");
|
|
36
37
|
const orchestration_webhook_service_1 = require("../services/orchestration/webhook/orchestration.webhook.service");
|
|
37
38
|
const webhook_server_1 = require("../webhooks/webhook-server");
|
|
38
39
|
const base_command_1 = require("./base-command");
|
|
@@ -93,7 +94,10 @@ class Webhook extends base_command_1.BaseCommand {
|
|
|
93
94
|
}
|
|
94
95
|
async initOrchestration() {
|
|
95
96
|
await typedi_1.Container.get(orchestration_webhook_service_1.OrchestrationWebhookService).init();
|
|
96
|
-
|
|
97
|
+
typedi_1.Container.get(pubsub_handler_1.PubSubHandler).init();
|
|
98
|
+
const subscriber = typedi_1.Container.get(subscriber_service_1.Subscriber);
|
|
99
|
+
await subscriber.subscribe('n8n.commands');
|
|
100
|
+
subscriber.setCommandMessageHandler();
|
|
97
101
|
}
|
|
98
102
|
}
|
|
99
103
|
exports.Webhook = Webhook;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../src/commands/webhook.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAiD;AACjD,+CAAgD;AAChD,mCAAmC;AAEnC,2DAAuD;AACvD,sDAA8B;AAC9B,
|
|
1
|
+
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../src/commands/webhook.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAiD;AACjD,+CAAgD;AAChD,mCAAmC;AAEnC,2DAAuD;AACvD,sDAA8B;AAC9B,oEAAgE;AAChE,4EAAiE;AACjE,kHAA6G;AAC7G,8DAA0D;AAE1D,iDAA6C;AAE7C,MAAa,OAAQ,SAAQ,0BAAW;IAavC,YAAY,IAAc,EAAE,SAAiB;QAC5C,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QALd,WAAM,GAAG,kBAAS,CAAC,GAAG,CAAC,8BAAa,CAAC,CAAC;QAEvC,2BAAsB,GAAG,IAAI,CAAC;QAItC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAC1E,CAAC;QACD,IAAI,CAAC,sBAAsB,EAAE,CAAC;IAC/B,CAAC;IAOD,KAAK,CAAC,WAAW;QAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAEtC,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAE9C,MAAM,kBAAS,CAAC,GAAG,CAAC,oCAAgB,CAAC,CAAC,QAAQ,EAAE,CAAC;QAClD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,CAAC,aAAa,CAAC,uCAAuC,EAAE,KAAK,CAAC,CAAC;QAC1E,CAAC;QAED,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,IAAI;QACT,IAAI,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,OAAO,EAAE,CAAC;YAalD,IAAI,CAAC,KAAK,CAAC,8DAA8D,CAAC,CAAC;QAC5E,CAAC;QAED,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAE/C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;QACrD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAExD,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;QAEnB,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC3C,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACjD,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAClD,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACjC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,GAAG;QACR,IAAI,gBAAM,CAAC,MAAM,CAAC,wBAAwB,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,+BAAgB,CACzB,qEAAqE,CACrE,CAAC;QACH,CAAC;QAED,MAAM,EAAE,cAAc,EAAE,GAAG,wDAAa,2BAA2B,GAAC,CAAC;QACrE,MAAM,kBAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,UAAU,EAAE,CAAC;QACjD,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAC1E,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC;QAG3D,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAAY;QACvB,MAAM,IAAI,CAAC,aAAa,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,iBAAiB;QACtB,MAAM,kBAAS,CAAC,GAAG,CAAC,2DAA2B,CAAC,CAAC,IAAI,EAAE,CAAC;QAExD,kBAAS,CAAC,GAAG,CAAC,8BAAa,CAAC,CAAC,IAAI,EAAE,CAAC;QACpC,MAAM,UAAU,GAAG,kBAAS,CAAC,GAAG,CAAC,+BAAU,CAAC,CAAC;QAC7C,MAAM,UAAU,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAC3C,UAAU,CAAC,wBAAwB,EAAE,CAAC;IACvC,CAAC;;AAzGF,0BA0GC;AAzGO,mBAAW,GAAG,8DAA8D,AAAjE,CAAkE;AAE7E,gBAAQ,GAAG,CAAC,eAAe,CAAC,AAApB,CAAqB;AAE7B,aAAK,GAAG;IACd,IAAI,EAAE,YAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;CAC/B,AAFW,CAEV"}
|
package/dist/commands/worker.js
CHANGED
|
@@ -36,8 +36,8 @@ const event_message_generic_1 = require("../eventbus/event-message-classes/event
|
|
|
36
36
|
const message_event_bus_1 = require("../eventbus/message-event-bus/message-event-bus");
|
|
37
37
|
const log_streaming_event_relay_1 = require("../events/relays/log-streaming.event-relay");
|
|
38
38
|
const job_processor_1 = require("../scaling/job-processor");
|
|
39
|
-
const
|
|
40
|
-
const
|
|
39
|
+
const pubsub_handler_1 = require("../scaling/pubsub/pubsub-handler");
|
|
40
|
+
const subscriber_service_1 = require("../scaling/pubsub/subscriber.service");
|
|
41
41
|
const orchestration_worker_service_1 = require("../services/orchestration/worker/orchestration.worker.service");
|
|
42
42
|
const base_command_1 = require("./base-command");
|
|
43
43
|
class Worker extends base_command_1.BaseCommand {
|
|
@@ -99,12 +99,10 @@ class Worker extends base_command_1.BaseCommand {
|
|
|
99
99
|
}
|
|
100
100
|
async initOrchestration() {
|
|
101
101
|
await typedi_1.Container.get(orchestration_worker_service_1.OrchestrationWorkerService).init();
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
getRunningJobsSummary: () => this.jobProcessor.getRunningJobsSummary(),
|
|
107
|
-
});
|
|
102
|
+
typedi_1.Container.get(pubsub_handler_1.PubSubHandler).init();
|
|
103
|
+
const subscriber = typedi_1.Container.get(subscriber_service_1.Subscriber);
|
|
104
|
+
await subscriber.subscribe('n8n.commands');
|
|
105
|
+
subscriber.setCommandMessageHandler();
|
|
108
106
|
}
|
|
109
107
|
async setConcurrency() {
|
|
110
108
|
const { flags } = await this.parse(Worker);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/commands/worker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAiD;AACjD,+CAAgD;AAChD,mCAAmC;AAEnC,sDAA8B;AAC9B,2CAAkD;AAClD,kGAA6F;AAC7F,sFAAiF;AACjF,yFAAmF;AACnF,2DAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/commands/worker.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,7 @@ let ConcurrencyControlService = class ConcurrencyControlService {
|
|
|
31
31
|
this.telemetry = telemetry;
|
|
32
32
|
this.eventService = eventService;
|
|
33
33
|
this.limitsToReport = exports.CLOUD_TEMP_REPORTABLE_THRESHOLDS.map((t) => exports.CLOUD_TEMP_PRODUCTION_LIMIT - t);
|
|
34
|
+
this.logger = this.logger.withScope('executions');
|
|
34
35
|
this.productionLimit = config_1.default.getEnv('executions.concurrency.productionLimit');
|
|
35
36
|
if (this.productionLimit === 0) {
|
|
36
37
|
throw new invalid_concurrency_limit_error_1.InvalidConcurrencyLimitError(this.productionLimit);
|
|
@@ -40,7 +41,6 @@ let ConcurrencyControlService = class ConcurrencyControlService {
|
|
|
40
41
|
}
|
|
41
42
|
if (this.productionLimit === -1 || config_1.default.getEnv('executions.mode') === 'queue') {
|
|
42
43
|
this.isEnabled = false;
|
|
43
|
-
this.log('Service disabled');
|
|
44
44
|
return;
|
|
45
45
|
}
|
|
46
46
|
this.productionQueue = new concurrency_queue_1.ConcurrencyQueue(this.productionLimit);
|
|
@@ -54,11 +54,11 @@ let ConcurrencyControlService = class ConcurrencyControlService {
|
|
|
54
54
|
}
|
|
55
55
|
});
|
|
56
56
|
this.productionQueue.on('execution-throttled', ({ executionId }) => {
|
|
57
|
-
this.
|
|
57
|
+
this.logger.debug('Execution throttled', { executionId });
|
|
58
58
|
this.eventService.emit('execution-throttled', { executionId });
|
|
59
59
|
});
|
|
60
60
|
this.productionQueue.on('execution-released', async (executionId) => {
|
|
61
|
-
this.
|
|
61
|
+
this.logger.debug('Execution released', { executionId });
|
|
62
62
|
});
|
|
63
63
|
}
|
|
64
64
|
has(executionId) {
|
|
@@ -100,8 +100,8 @@ let ConcurrencyControlService = class ConcurrencyControlService {
|
|
|
100
100
|
this.isEnabled = false;
|
|
101
101
|
}
|
|
102
102
|
logInit() {
|
|
103
|
-
this.
|
|
104
|
-
this.
|
|
103
|
+
this.logger.debug('Enabled');
|
|
104
|
+
this.logger.debug([
|
|
105
105
|
'Production execution concurrency is',
|
|
106
106
|
this.productionLimit === -1 ? 'unlimited' : 'limited to ' + this.productionLimit.toString(),
|
|
107
107
|
].join(' '));
|
|
@@ -119,9 +119,6 @@ let ConcurrencyControlService = class ConcurrencyControlService {
|
|
|
119
119
|
return this.productionLimit === -1;
|
|
120
120
|
throw new unknown_execution_mode_error_1.UnknownExecutionModeError(mode);
|
|
121
121
|
}
|
|
122
|
-
log(message, metadata) {
|
|
123
|
-
this.logger.debug(['[Concurrency Control]', message].join(' '), metadata);
|
|
124
|
-
}
|
|
125
122
|
shouldReport(capacity) {
|
|
126
123
|
return config_1.default.getEnv('deployment.type') === 'cloud' && this.limitsToReport.includes(capacity);
|
|
127
124
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"concurrency-control.service.js","sourceRoot":"","sources":["../../src/concurrency/concurrency-control.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,mCAAiC;AAEjC,sDAA8B;AAC9B,wFAAoF;AACpF,8FAAwF;AACxF,wFAAkF;AAClF,0DAAsD;AAEtD,6DAAkD;
|
|
1
|
+
{"version":3,"file":"concurrency-control.service.js","sourceRoot":"","sources":["../../src/concurrency/concurrency-control.service.ts"],"names":[],"mappings":"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"}
|
package/dist/constants.d.ts
CHANGED
|
@@ -65,6 +65,7 @@ export declare const LICENSE_FEATURES: {
|
|
|
65
65
|
readonly PROJECT_ROLE_EDITOR: "feat:projectRole:editor";
|
|
66
66
|
readonly PROJECT_ROLE_VIEWER: "feat:projectRole:viewer";
|
|
67
67
|
readonly AI_ASSISTANT: "feat:aiAssistant";
|
|
68
|
+
readonly ASK_AI: "feat:askAi";
|
|
68
69
|
readonly COMMUNITY_NODES_CUSTOM_REGISTRY: "feat:communityNodes:customRegistry";
|
|
69
70
|
};
|
|
70
71
|
export declare const LICENSE_QUOTAS: {
|
package/dist/constants.js
CHANGED
|
@@ -78,6 +78,7 @@ exports.LICENSE_FEATURES = {
|
|
|
78
78
|
PROJECT_ROLE_EDITOR: 'feat:projectRole:editor',
|
|
79
79
|
PROJECT_ROLE_VIEWER: 'feat:projectRole:viewer',
|
|
80
80
|
AI_ASSISTANT: 'feat:aiAssistant',
|
|
81
|
+
ASK_AI: 'feat:askAi',
|
|
81
82
|
COMMUNITY_NODES_CUSTOM_REGISTRY: 'feat:communityNodes:customRegistry',
|
|
82
83
|
};
|
|
83
84
|
exports.LICENSE_QUOTAS = {
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { AiAssistantSDK } from '@n8n_io/ai-assistant-sdk';
|
|
2
|
+
import type { Response } from 'express';
|
|
3
|
+
import { AiAssistantRequest } from '../requests';
|
|
4
|
+
import { AiService } from '../services/ai.service';
|
|
5
|
+
type FlushableResponse = Response & {
|
|
6
|
+
flush: () => void;
|
|
7
|
+
};
|
|
8
|
+
export declare class AiController {
|
|
9
|
+
private readonly aiService;
|
|
10
|
+
constructor(aiService: AiService);
|
|
11
|
+
chat(req: AiAssistantRequest.Chat, res: FlushableResponse): Promise<void>;
|
|
12
|
+
applySuggestion(req: AiAssistantRequest.ApplySuggestionPayload): Promise<AiAssistantSDK.ApplySuggestionResponse>;
|
|
13
|
+
askAi(req: AiAssistantRequest.AskAiPayload): Promise<AiAssistantSDK.AskAiResponsePayload>;
|
|
14
|
+
}
|
|
15
|
+
export {};
|
|
@@ -9,20 +9,20 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.
|
|
12
|
+
exports.AiController = void 0;
|
|
13
13
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
14
14
|
const node_assert_1 = require("node:assert");
|
|
15
15
|
const web_1 = require("node:stream/web");
|
|
16
16
|
const decorators_1 = require("../decorators");
|
|
17
17
|
const internal_server_error_1 = require("../errors/response-errors/internal-server.error");
|
|
18
|
-
const
|
|
19
|
-
let
|
|
20
|
-
constructor(
|
|
21
|
-
this.
|
|
18
|
+
const ai_service_1 = require("../services/ai.service");
|
|
19
|
+
let AiController = class AiController {
|
|
20
|
+
constructor(aiService) {
|
|
21
|
+
this.aiService = aiService;
|
|
22
22
|
}
|
|
23
23
|
async chat(req, res) {
|
|
24
24
|
try {
|
|
25
|
-
const aiResponse = await this.
|
|
25
|
+
const aiResponse = await this.aiService.chat(req.body, req.user);
|
|
26
26
|
if (aiResponse.body) {
|
|
27
27
|
res.header('Content-type', 'application/json-lines').flush();
|
|
28
28
|
await aiResponse.body.pipeTo(new web_1.WritableStream({
|
|
@@ -42,7 +42,17 @@ let AiAssistantController = class AiAssistantController {
|
|
|
42
42
|
}
|
|
43
43
|
async applySuggestion(req) {
|
|
44
44
|
try {
|
|
45
|
-
return await this.
|
|
45
|
+
return await this.aiService.applySuggestion(req.body, req.user);
|
|
46
|
+
}
|
|
47
|
+
catch (e) {
|
|
48
|
+
(0, node_assert_1.strict)(e instanceof Error);
|
|
49
|
+
n8n_workflow_1.ErrorReporterProxy.error(e);
|
|
50
|
+
throw new internal_server_error_1.InternalServerError(`Something went wrong: ${e.message}`);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
async askAi(req) {
|
|
54
|
+
try {
|
|
55
|
+
return await this.aiService.askAi(req.body, req.user);
|
|
46
56
|
}
|
|
47
57
|
catch (e) {
|
|
48
58
|
(0, node_assert_1.strict)(e instanceof Error);
|
|
@@ -51,21 +61,27 @@ let AiAssistantController = class AiAssistantController {
|
|
|
51
61
|
}
|
|
52
62
|
}
|
|
53
63
|
};
|
|
54
|
-
exports.
|
|
64
|
+
exports.AiController = AiController;
|
|
55
65
|
__decorate([
|
|
56
66
|
(0, decorators_1.Post)('/chat', { rateLimit: { limit: 100 } }),
|
|
57
67
|
__metadata("design:type", Function),
|
|
58
68
|
__metadata("design:paramtypes", [Object, Object]),
|
|
59
69
|
__metadata("design:returntype", Promise)
|
|
60
|
-
],
|
|
70
|
+
], AiController.prototype, "chat", null);
|
|
61
71
|
__decorate([
|
|
62
72
|
(0, decorators_1.Post)('/chat/apply-suggestion'),
|
|
63
73
|
__metadata("design:type", Function),
|
|
64
74
|
__metadata("design:paramtypes", [Object]),
|
|
65
75
|
__metadata("design:returntype", Promise)
|
|
66
|
-
],
|
|
67
|
-
|
|
68
|
-
(0, decorators_1.
|
|
69
|
-
__metadata("design:
|
|
70
|
-
|
|
71
|
-
|
|
76
|
+
], AiController.prototype, "applySuggestion", null);
|
|
77
|
+
__decorate([
|
|
78
|
+
(0, decorators_1.Post)('/ask-ai'),
|
|
79
|
+
__metadata("design:type", Function),
|
|
80
|
+
__metadata("design:paramtypes", [Object]),
|
|
81
|
+
__metadata("design:returntype", Promise)
|
|
82
|
+
], AiController.prototype, "askAi", null);
|
|
83
|
+
exports.AiController = AiController = __decorate([
|
|
84
|
+
(0, decorators_1.RestController)('/ai'),
|
|
85
|
+
__metadata("design:paramtypes", [ai_service_1.AiService])
|
|
86
|
+
], AiController);
|
|
87
|
+
//# sourceMappingURL=ai.controller.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ai.controller.js","sourceRoot":"","sources":["../../src/controllers/ai.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,+CAAkD;AAClD,6CAA+C;AAC/C,yCAAiD;AAEjD,6CAAoD;AACpD,0FAAqF;AAErF,sDAAkD;AAK3C,IAAM,YAAY,GAAlB,MAAM,YAAY;IACxB,YAA6B,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;IAAG,CAAC;IAG/C,AAAN,KAAK,CAAC,IAAI,CAAC,GAA4B,EAAE,GAAsB;QAC9D,IAAI,CAAC;YACJ,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;YACjE,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;gBACrB,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,wBAAwB,CAAC,CAAC,KAAK,EAAE,CAAC;gBAC7D,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAC3B,IAAI,oBAAc,CAAC;oBAClB,KAAK,CAAC,KAAK;wBACV,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;wBACjB,GAAG,CAAC,KAAK,EAAE,CAAC;oBACb,CAAC;iBACD,CAAC,CACF,CAAC;gBACF,GAAG,CAAC,GAAG,EAAE,CAAC;YACX,CAAC;QACF,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAA,oBAAM,EAAC,CAAC,YAAY,KAAK,CAAC,CAAC;YAC3B,iCAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC5B,MAAM,IAAI,2CAAmB,CAAC,yBAAyB,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACrE,CAAC;IACF,CAAC;IAGK,AAAN,KAAK,CAAC,eAAe,CACpB,GAA8C;QAE9C,IAAI,CAAC;YACJ,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QACjE,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAA,oBAAM,EAAC,CAAC,YAAY,KAAK,CAAC,CAAC;YAC3B,iCAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC5B,MAAM,IAAI,2CAAmB,CAAC,yBAAyB,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACrE,CAAC;IACF,CAAC;IAGK,AAAN,KAAK,CAAC,KAAK,CAAC,GAAoC;QAC/C,IAAI,CAAC;YACJ,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QACvD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAA,oBAAM,EAAC,CAAC,YAAY,KAAK,CAAC,CAAC;YAC3B,iCAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC5B,MAAM,IAAI,2CAAmB,CAAC,yBAAyB,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACrE,CAAC;IACF,CAAC;CACD,CAAA;AAjDY,oCAAY;AAIlB;IADL,IAAA,iBAAI,EAAC,OAAO,EAAE,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC;;;;wCAqB5C;AAGK;IADL,IAAA,iBAAI,EAAC,wBAAwB,CAAC;;;;mDAW9B;AAGK;IADL,IAAA,iBAAI,EAAC,SAAS,CAAC;;;;yCASf;uBAhDW,YAAY;IADxB,IAAA,2BAAc,EAAC,KAAK,CAAC;qCAEmB,sBAAS;GADrC,YAAY,CAiDxB"}
|
|
@@ -7,5 +7,4 @@ export declare class OrchestrationController {
|
|
|
7
7
|
constructor(orchestrationService: OrchestrationService, licenseService: License);
|
|
8
8
|
getWorkersStatus(req: OrchestrationRequest.Get): Promise<void>;
|
|
9
9
|
getWorkersStatusAll(): Promise<void>;
|
|
10
|
-
getWorkerIdsAll(): Promise<void>;
|
|
11
10
|
}
|
|
@@ -29,11 +29,6 @@ let OrchestrationController = class OrchestrationController {
|
|
|
29
29
|
return;
|
|
30
30
|
return await this.orchestrationService.getWorkerStatus();
|
|
31
31
|
}
|
|
32
|
-
async getWorkerIdsAll() {
|
|
33
|
-
if (!this.licenseService.isWorkerViewLicensed())
|
|
34
|
-
return;
|
|
35
|
-
return await this.orchestrationService.getWorkerIds();
|
|
36
|
-
}
|
|
37
32
|
};
|
|
38
33
|
exports.OrchestrationController = OrchestrationController;
|
|
39
34
|
__decorate([
|
|
@@ -50,13 +45,6 @@ __decorate([
|
|
|
50
45
|
__metadata("design:paramtypes", []),
|
|
51
46
|
__metadata("design:returntype", Promise)
|
|
52
47
|
], OrchestrationController.prototype, "getWorkersStatusAll", null);
|
|
53
|
-
__decorate([
|
|
54
|
-
(0, decorators_1.GlobalScope)('orchestration:list'),
|
|
55
|
-
(0, decorators_1.Post)('/worker/ids'),
|
|
56
|
-
__metadata("design:type", Function),
|
|
57
|
-
__metadata("design:paramtypes", []),
|
|
58
|
-
__metadata("design:returntype", Promise)
|
|
59
|
-
], OrchestrationController.prototype, "getWorkerIdsAll", null);
|
|
60
48
|
exports.OrchestrationController = OrchestrationController = __decorate([
|
|
61
49
|
(0, decorators_1.RestController)('/orchestration'),
|
|
62
50
|
__metadata("design:paramtypes", [orchestration_service_1.OrchestrationService,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orchestration.controller.js","sourceRoot":"","sources":["../../src/controllers/orchestration.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAiE;AACjE,uCAAoC;AAEpC,4EAAwE;AAGjE,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IACnC,YACkB,oBAA0C,EAC1C,cAAuB;QADvB,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,mBAAc,GAAd,cAAc,CAAS;IACtC,CAAC;IAQE,AAAN,KAAK,CAAC,gBAAgB,CAAC,GAA6B;QACnD,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,oBAAoB,EAAE;YAAE,OAAO;QACxD,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QACzB,OAAO,MAAM,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;IAC5D,CAAC;IAIK,AAAN,KAAK,CAAC,mBAAmB;QACxB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,oBAAoB,EAAE;YAAE,OAAO;QACxD,OAAO,MAAM,IAAI,CAAC,oBAAoB,CAAC,eAAe,EAAE,CAAC;IAC1D,CAAC;
|
|
1
|
+
{"version":3,"file":"orchestration.controller.js","sourceRoot":"","sources":["../../src/controllers/orchestration.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAiE;AACjE,uCAAoC;AAEpC,4EAAwE;AAGjE,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IACnC,YACkB,oBAA0C,EAC1C,cAAuB;QADvB,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,mBAAc,GAAd,cAAc,CAAS;IACtC,CAAC;IAQE,AAAN,KAAK,CAAC,gBAAgB,CAAC,GAA6B;QACnD,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,oBAAoB,EAAE;YAAE,OAAO;QACxD,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QACzB,OAAO,MAAM,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;IAC5D,CAAC;IAIK,AAAN,KAAK,CAAC,mBAAmB;QACxB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,oBAAoB,EAAE;YAAE,OAAO;QACxD,OAAO,MAAM,IAAI,CAAC,oBAAoB,CAAC,eAAe,EAAE,CAAC;IAC1D,CAAC;CACD,CAAA;AAxBY,0DAAuB;AAY7B;IAFL,IAAA,wBAAW,EAAC,oBAAoB,CAAC;IACjC,IAAA,iBAAI,EAAC,oBAAoB,CAAC;;;;+DAK1B;AAIK;IAFL,IAAA,wBAAW,EAAC,oBAAoB,CAAC;IACjC,IAAA,iBAAI,EAAC,gBAAgB,CAAC;;;;kEAItB;kCAvBW,uBAAuB;IADnC,IAAA,2BAAc,EAAC,gBAAgB,CAAC;qCAGQ,4CAAoB;QAC1B,iBAAO;GAH7B,uBAAuB,CAwBnC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type { MigrationContext } from '../../../databases/types';
|
|
2
|
-
export declare class AddApiKeysTable1724951148974 {
|
|
1
|
+
import type { MigrationContext, ReversibleMigration } from '../../../databases/types';
|
|
2
|
+
export declare class AddApiKeysTable1724951148974 implements ReversibleMigration {
|
|
3
3
|
up({ queryRunner, escape, runQuery, schemaBuilder: { createTable, column }, }: MigrationContext): Promise<void>;
|
|
4
|
+
down({ queryRunner, runQuery, schemaBuilder: { dropTable, addColumns, createIndex, column }, escape, isMysql, }: MigrationContext): Promise<void>;
|
|
4
5
|
}
|
|
@@ -28,6 +28,34 @@ class AddApiKeysTable1724951148974 {
|
|
|
28
28
|
})));
|
|
29
29
|
await queryRunner.query(`ALTER TABLE ${userTable} DROP COLUMN ${apiKeyColumn};`);
|
|
30
30
|
}
|
|
31
|
+
async down({ queryRunner, runQuery, schemaBuilder: { dropTable, addColumns, createIndex, column }, escape, isMysql, }) {
|
|
32
|
+
const userTable = escape.tableName('user');
|
|
33
|
+
const userApiKeysTable = escape.tableName('user_api_keys');
|
|
34
|
+
const apiKeyColumn = escape.columnName('apiKey');
|
|
35
|
+
const userIdColumn = escape.columnName('userId');
|
|
36
|
+
const idColumn = escape.columnName('id');
|
|
37
|
+
const createdAtColumn = escape.columnName('createdAt');
|
|
38
|
+
await addColumns('user', [column('apiKey').varchar()]);
|
|
39
|
+
await createIndex('user', ['apiKey'], true);
|
|
40
|
+
const queryToGetUsersApiKeys = isMysql
|
|
41
|
+
? `
|
|
42
|
+
SELECT ${userIdColumn},
|
|
43
|
+
${apiKeyColumn},
|
|
44
|
+
${createdAtColumn}
|
|
45
|
+
FROM ${userApiKeysTable} u
|
|
46
|
+
WHERE ${createdAtColumn} = (SELECT Min(${createdAtColumn})
|
|
47
|
+
FROM ${userApiKeysTable}
|
|
48
|
+
WHERE ${userIdColumn} = u.${userIdColumn});`
|
|
49
|
+
: `
|
|
50
|
+
SELECT DISTINCT ON
|
|
51
|
+
(${userIdColumn}) ${userIdColumn},
|
|
52
|
+
${apiKeyColumn}, ${createdAtColumn}
|
|
53
|
+
FROM ${userApiKeysTable}
|
|
54
|
+
ORDER BY ${userIdColumn}, ${createdAtColumn} ASC;`;
|
|
55
|
+
const oldestApiKeysPerUser = (await queryRunner.query(queryToGetUsersApiKeys));
|
|
56
|
+
await Promise.all(oldestApiKeysPerUser.map(async (user) => await runQuery(`UPDATE ${userTable} SET ${apiKeyColumn} = :apiKey WHERE ${idColumn} = :userId`, user)));
|
|
57
|
+
await dropTable('user_api_keys');
|
|
58
|
+
}
|
|
31
59
|
}
|
|
32
60
|
exports.AddApiKeysTable1724951148974 = AddApiKeysTable1724951148974;
|
|
33
61
|
//# sourceMappingURL=1724951148974-AddApiKeysTable.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"1724951148974-AddApiKeysTable.js","sourceRoot":"","sources":["../../../../src/databases/migrations/common/1724951148974-AddApiKeysTable.ts"],"names":[],"mappings":";;;AAEA,6DAA8D;AAE9D,MAAa,4BAA4B;IACxC,KAAK,CAAC,EAAE,CAAC,EACR,WAAW,EACX,MAAM,EACN,QAAQ,EACR,aAAa,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,GACpB;QAClB,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,gBAAgB,GAAG,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAC3D,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAGzC,MAAM,WAAW,CAAC,eAAe,CAAC;aAChC,WAAW,CACX,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,OAAO,EAChC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,OAAO,EAC7B,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,EACpC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAClC;aACA,cAAc,CAAC,QAAQ,EAAE;YACzB,SAAS,EAAE,MAAM;YACjB,UAAU,EAAE,IAAI;YAChB,QAAQ,EAAE,SAAS;SACnB,CAAC;aACD,WAAW,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC;aACtC,WAAW,CAAC,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC,cAAc,CAAC;QAE/C,MAAM,gBAAgB,GAAG,CAAC,MAAM,WAAW,CAAC,KAAK,CAChD,UAAU,QAAQ,KAAK,YAAY,SAAS,SAAS,UAAU,YAAY,cAAc,CACzF,CAA2B,CAAC;QAG7B,MAAM,OAAO,CAAC,GAAG,CAChB,gBAAgB,CAAC,GAAG,CACnB,KAAK,EAAE,IAAoC,EAAE,EAAE,CAC9C,MAAM,QAAQ,CACb,eAAe,gBAAgB,KAAK,QAAQ,KAAK,YAAY,KAAK,YAAY,KAAK,WAAW,0CAA0C,EACxI;YACC,EAAE,EAAE,IAAA,2BAAc,GAAE;YACpB,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,YAAY;SACnB,CACD,CACF,CACD,CAAC;QAGF,MAAM,WAAW,CAAC,KAAK,CAAC,eAAe,SAAS,gBAAgB,YAAY,GAAG,CAAC,CAAC;IAClF,CAAC;CACD;
|
|
1
|
+
{"version":3,"file":"1724951148974-AddApiKeysTable.js","sourceRoot":"","sources":["../../../../src/databases/migrations/common/1724951148974-AddApiKeysTable.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import type { MigrationContext } from '../../../databases/types';
|
|
2
|
-
export declare class AddApiKeysTable1724951148974 {
|
|
1
|
+
import type { MigrationContext, ReversibleMigration } from '../../../databases/types';
|
|
2
|
+
export declare class AddApiKeysTable1724951148974 implements ReversibleMigration {
|
|
3
|
+
transaction: false;
|
|
3
4
|
up({ queryRunner, tablePrefix, runQuery }: MigrationContext): Promise<void>;
|
|
5
|
+
down({ queryRunner, runQuery, tablePrefix, schemaBuilder: { dropTable, createIndex }, escape, }: MigrationContext): Promise<void>;
|
|
4
6
|
}
|
|
@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.AddApiKeysTable1724951148974 = void 0;
|
|
4
4
|
const generators_1 = require("../../../databases/utils/generators");
|
|
5
5
|
class AddApiKeysTable1724951148974 {
|
|
6
|
+
constructor() {
|
|
7
|
+
this.transaction = false;
|
|
8
|
+
}
|
|
6
9
|
async up({ queryRunner, tablePrefix, runQuery }) {
|
|
7
10
|
const tableName = `${tablePrefix}user_api_keys`;
|
|
8
11
|
await queryRunner.query(`
|
|
@@ -51,6 +54,31 @@ class AddApiKeysTable1724951148974 {
|
|
|
51
54
|
await queryRunner.query(`DROP TABLE ${tablePrefix}user;`);
|
|
52
55
|
await queryRunner.query('ALTER TABLE users_new RENAME TO user;');
|
|
53
56
|
}
|
|
57
|
+
async down({ queryRunner, runQuery, tablePrefix, schemaBuilder: { dropTable, createIndex }, escape, }) {
|
|
58
|
+
const userApiKeysTable = escape.tableName('user_api_keys');
|
|
59
|
+
const apiKeyColumn = escape.columnName('apiKey');
|
|
60
|
+
const userIdColumn = escape.columnName('userId');
|
|
61
|
+
const idColumn = escape.columnName('id');
|
|
62
|
+
const createdAtColumn = escape.columnName('createdAt');
|
|
63
|
+
const queryToGetUsersApiKeys = `
|
|
64
|
+
SELECT
|
|
65
|
+
${userIdColumn},
|
|
66
|
+
${apiKeyColumn},
|
|
67
|
+
${createdAtColumn}
|
|
68
|
+
FROM
|
|
69
|
+
${userApiKeysTable}
|
|
70
|
+
WHERE
|
|
71
|
+
${createdAtColumn} IN(
|
|
72
|
+
SELECT
|
|
73
|
+
MIN(${createdAtColumn})
|
|
74
|
+
FROM ${userApiKeysTable}
|
|
75
|
+
GROUP BY ${userIdColumn});`;
|
|
76
|
+
const oldestApiKeysPerUser = (await queryRunner.query(queryToGetUsersApiKeys));
|
|
77
|
+
await queryRunner.query(`ALTER TABLE ${tablePrefix}user ADD COLUMN "apiKey" varchar;`);
|
|
78
|
+
await createIndex('user', ['apiKey'], true);
|
|
79
|
+
await Promise.all(oldestApiKeysPerUser.map(async (user) => await runQuery(`UPDATE ${tablePrefix}user SET ${apiKeyColumn} = :apiKey WHERE ${idColumn} = :userId`, user)));
|
|
80
|
+
await dropTable('user_api_keys');
|
|
81
|
+
}
|
|
54
82
|
}
|
|
55
83
|
exports.AddApiKeysTable1724951148974 = AddApiKeysTable1724951148974;
|
|
56
84
|
//# sourceMappingURL=1724951148974-AddApiKeysTable.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"1724951148974-AddApiKeysTable.js","sourceRoot":"","sources":["../../../../src/databases/migrations/sqlite/1724951148974-AddApiKeysTable.ts"],"names":[],"mappings":";;;AAEA,6DAA8D;AAE9D,MAAa,4BAA4B;
|
|
1
|
+
{"version":3,"file":"1724951148974-AddApiKeysTable.js","sourceRoot":"","sources":["../../../../src/databases/migrations/sqlite/1724951148974-AddApiKeysTable.ts"],"names":[],"mappings":";;;AAEA,6DAA8D;AAE9D,MAAa,4BAA4B;IAAzC;QACC,gBAAW,GAAG,KAAc,CAAC;IAyH9B,CAAC;IAvHA,KAAK,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAoB;QAChE,MAAM,SAAS,GAAG,GAAG,WAAW,eAAe,CAAC;QAGhD,MAAM,WAAW,CAAC,KAAK,CAAC;kBACR,SAAS;;;;;;;;;;;GAWxB,CAAC,CAAC;QAEH,MAAM,gBAAgB,GAAG,CAAC,MAAM,WAAW,CAAC,KAAK,CAChD,4BAA4B,WAAW,iCAAiC,CACxE,CAA2B,CAAC;QAG7B,MAAM,OAAO,CAAC,GAAG,CAChB,gBAAgB,CAAC,GAAG,CACnB,KAAK,EAAE,IAAoC,EAAE,EAAE,CAC9C,MAAM,QAAQ,CACb,eAAe,SAAS,6EAA6E,EACrG;YACC,EAAE,EAAE,IAAA,2BAAc,GAAE;YACpB,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,YAAY;SACnB,CACD,CACF,CACD,CAAC;QAGF,MAAM,WAAW,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;GAiBvB,CAAC,CAAC;QAGH,MAAM,WAAW,CAAC,KAAK,CAAC;;;UAGhB,WAAW;GAClB,CAAC,CAAC;QAGH,MAAM,WAAW,CAAC,KAAK,CAAC,cAAc,WAAW,OAAO,CAAC,CAAC;QAG1D,MAAM,WAAW,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EACV,WAAW,EACX,QAAQ,EACR,WAAW,EACX,aAAa,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,EACzC,MAAM,GACY;QAClB,MAAM,gBAAgB,GAAG,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAC3D,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAEvD,MAAM,sBAAsB,GAAG;;KAE5B,YAAY;KACZ,YAAY;KACZ,eAAe;;IAEhB,gBAAgB;;IAEhB,eAAe;;UAET,eAAe;WACd,gBAAgB;cACb,YAAY,IAAI,CAAC;QAE7B,MAAM,oBAAoB,GAAG,CAAC,MAAM,WAAW,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAE5E,CAAC;QAEF,MAAM,WAAW,CAAC,KAAK,CAAC,eAAe,WAAW,mCAAmC,CAAC,CAAC;QAEvF,MAAM,WAAW,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;QAE5C,MAAM,OAAO,CAAC,GAAG,CAChB,oBAAoB,CAAC,GAAG,CACvB,KAAK,EAAE,IAAwC,EAAE,EAAE,CAClD,MAAM,QAAQ,CACb,UAAU,WAAW,YAAY,YAAY,oBAAoB,QAAQ,YAAY,EACrF,IAAI,CACJ,CACF,CACD,CAAC;QAEF,MAAM,SAAS,CAAC,eAAe,CAAC,CAAC;IAClC,CAAC;CACD;AA1HD,oEA0HC"}
|
|
@@ -38,12 +38,16 @@ exports.getRepoType = getRepoType;
|
|
|
38
38
|
exports.getTrackingInformationFromPullResult = getTrackingInformationFromPullResult;
|
|
39
39
|
exports.getTrackingInformationFromPrePushResult = getTrackingInformationFromPrePushResult;
|
|
40
40
|
exports.getTrackingInformationFromPostPushResult = getTrackingInformationFromPostPushResult;
|
|
41
|
+
exports.normalizeAndValidateSourceControlledFilePath = normalizeAndValidateSourceControlledFilePath;
|
|
41
42
|
const crypto_1 = require("crypto");
|
|
42
43
|
const fs_1 = require("fs");
|
|
44
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
45
|
+
const strict_1 = require("node:assert/strict");
|
|
43
46
|
const path_1 = __importDefault(require("path"));
|
|
44
47
|
const typedi_1 = require("typedi");
|
|
45
48
|
const license_1 = require("../../license");
|
|
46
49
|
const logger_service_1 = require("../../logging/logger.service");
|
|
50
|
+
const path_util_1 = require("../../utils/path-util");
|
|
47
51
|
const constants_1 = require("./constants");
|
|
48
52
|
function stringContainsExpression(testString) {
|
|
49
53
|
return /^=.*\{\{.*\}\}/.test(testString);
|
|
@@ -164,4 +168,12 @@ function getTrackingInformationFromPostPushResult(result) {
|
|
|
164
168
|
variablesPushed: uniques.filter((file) => file.pushed && file.file.startsWith('variable_stubs')).length ?? 0,
|
|
165
169
|
};
|
|
166
170
|
}
|
|
171
|
+
function normalizeAndValidateSourceControlledFilePath(gitFolderPath, filePath) {
|
|
172
|
+
(0, strict_1.ok)(path_1.default.isAbsolute(gitFolderPath), 'gitFolder must be an absolute path');
|
|
173
|
+
const normalizedPath = path_1.default.isAbsolute(filePath) ? filePath : path_1.default.join(gitFolderPath, filePath);
|
|
174
|
+
if (!(0, path_util_1.isContainedWithin)(gitFolderPath, filePath)) {
|
|
175
|
+
throw new n8n_workflow_1.ApplicationError(`File path ${filePath} is invalid`);
|
|
176
|
+
}
|
|
177
|
+
return normalizedPath;
|
|
178
|
+
}
|
|
167
179
|
//# sourceMappingURL=source-control-helper.ee.js.map
|