fix: Resolve race condition causing unnecessary license renewals (#12966)

Co-authored-by: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
This commit is contained in:
Cornelius Suermann 2025-01-31 12:23:04 +01:00 committed by GitHub
parent 118be24d25
commit d9d64083d3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 33 additions and 19 deletions

View file

@ -96,7 +96,7 @@
"@n8n/task-runner": "workspace:*",
"@n8n/typeorm": "0.3.20-12",
"@n8n_io/ai-assistant-sdk": "1.13.0",
"@n8n_io/license-sdk": "2.15.0",
"@n8n_io/license-sdk": "2.15.1",
"@oclif/core": "4.0.7",
"@rudderstack/rudder-sdk-node": "2.0.9",
"@sentry/node": "catalog:",

View file

@ -401,7 +401,9 @@ export class License {
}
async reinit() {
this.manager?.reset();
if (this.manager) {
await this.manager.reset();
}
await this.init({ forceRecreate: true });
this.logger.debug('License reinitialized');
}

View file

@ -443,7 +443,7 @@ importers:
version: 3.666.0(@aws-sdk/client-sts@3.666.0)
'@getzep/zep-cloud':
specifier: 1.0.12
version: 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(ilqk5sp4kmqg6yh3rv76amkknm))
version: 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(uhxpxbd3xjubkjdqqkxxpkezmi))
'@getzep/zep-js':
specifier: 0.9.0
version: 0.9.0
@ -470,7 +470,7 @@ importers:
version: 0.3.2(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)
'@langchain/community':
specifier: 0.3.24
version: 0.3.24(knkgly4tvsbdesqmuf53sm5qpe)
version: 0.3.24(xbnzedcvjhnriori3dst4asz2q)
'@langchain/core':
specifier: 'catalog:'
version: 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
@ -557,7 +557,7 @@ importers:
version: 23.0.1
langchain:
specifier: 0.3.11
version: 0.3.11(ilqk5sp4kmqg6yh3rv76amkknm)
version: 0.3.11(uhxpxbd3xjubkjdqqkxxpkezmi)
lodash:
specifier: 'catalog:'
version: 4.17.21
@ -803,8 +803,8 @@ importers:
specifier: 1.13.0
version: 1.13.0
'@n8n_io/license-sdk':
specifier: 2.15.0
version: 2.15.0
specifier: 2.15.1
version: 2.15.1
'@oclif/core':
specifier: 4.0.7
version: 4.0.7
@ -4514,8 +4514,8 @@ packages:
resolution: {integrity: sha512-16kftFTeX3/lBinHJaBK0OL1lB4FpPaUoHX4h25AkvgHvmjUHpWNY2ZtKos0rY89+pkzDsNxMZqSUkeKU45iRg==}
engines: {node: '>=20.15', pnpm: '>=8.14'}
'@n8n_io/license-sdk@2.15.0':
resolution: {integrity: sha512-EmEAHNJu7S0dDom2E7OOT3cfrJyy0gpmyAX0z6WUkcZgST0ZvXLxCLpaQHY+sD5vOwTwitWq9WFKyCRmbBJVIQ==}
'@n8n_io/license-sdk@2.15.1':
resolution: {integrity: sha512-z7gf0sDpJ8R6JqS05yqSbOFBCV54d8zSne6xbGrpyKoWs0EpCzCBia3YTfYbULi8m+d6JfqnRTiqFQPa1VZpkg==}
engines: {node: '>=18.12.1'}
'@n8n_io/riot-tmpl@4.0.0':
@ -16030,7 +16030,7 @@ snapshots:
'@gar/promisify@1.1.3':
optional: true
'@getzep/zep-cloud@1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(ilqk5sp4kmqg6yh3rv76amkknm))':
'@getzep/zep-cloud@1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(uhxpxbd3xjubkjdqqkxxpkezmi))':
dependencies:
form-data: 4.0.0
node-fetch: 2.7.0(encoding@0.1.13)
@ -16039,7 +16039,7 @@ snapshots:
zod: 3.24.1
optionalDependencies:
'@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
langchain: 0.3.11(ilqk5sp4kmqg6yh3rv76amkknm)
langchain: 0.3.11(uhxpxbd3xjubkjdqqkxxpkezmi)
transitivePeerDependencies:
- encoding
@ -16578,7 +16578,7 @@ snapshots:
- aws-crt
- encoding
'@langchain/community@0.3.24(knkgly4tvsbdesqmuf53sm5qpe)':
'@langchain/community@0.3.24(xbnzedcvjhnriori3dst4asz2q)':
dependencies:
'@browserbasehq/stagehand': 1.9.0(@playwright/test@1.49.1)(deepmerge@4.3.1)(dotenv@16.4.5)(encoding@0.1.13)(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))(zod@3.24.1)
'@ibm-cloud/watsonx-ai': 1.1.2
@ -16589,7 +16589,7 @@ snapshots:
flat: 5.0.2
ibm-cloud-sdk-core: 5.1.0
js-yaml: 4.1.0
langchain: 0.3.11(ilqk5sp4kmqg6yh3rv76amkknm)
langchain: 0.3.11(uhxpxbd3xjubkjdqqkxxpkezmi)
langsmith: 0.2.15(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
openai: 4.78.1(encoding@0.1.13)(zod@3.24.1)
uuid: 10.0.0
@ -16604,7 +16604,7 @@ snapshots:
'@aws-sdk/credential-provider-node': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)
'@azure/storage-blob': 12.18.0(encoding@0.1.13)
'@browserbasehq/sdk': 2.0.0(encoding@0.1.13)
'@getzep/zep-cloud': 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(ilqk5sp4kmqg6yh3rv76amkknm))
'@getzep/zep-cloud': 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(uhxpxbd3xjubkjdqqkxxpkezmi))
'@getzep/zep-js': 0.9.0
'@google-ai/generativelanguage': 2.6.0(encoding@0.1.13)
'@google-cloud/storage': 7.12.1(encoding@0.1.13)
@ -16991,7 +16991,7 @@ snapshots:
'@n8n_io/ai-assistant-sdk@1.13.0': {}
'@n8n_io/license-sdk@2.15.0':
'@n8n_io/license-sdk@2.15.1':
dependencies:
crypto-js: 4.2.0
node-machine-id: 1.1.12
@ -19930,6 +19930,14 @@ snapshots:
transitivePeerDependencies:
- debug
axios@1.7.4(debug@4.4.0):
dependencies:
follow-redirects: 1.15.6(debug@4.4.0)
form-data: 4.0.0
proxy-from-env: 1.1.0
transitivePeerDependencies:
- debug
axios@1.7.7:
dependencies:
follow-redirects: 1.15.6(debug@4.3.6)
@ -22200,6 +22208,10 @@ snapshots:
optionalDependencies:
debug: 4.3.7
follow-redirects@1.15.6(debug@4.4.0):
optionalDependencies:
debug: 4.4.0
for-each@0.3.3:
dependencies:
is-callable: 1.2.7
@ -22801,7 +22813,7 @@ snapshots:
'@types/debug': 4.1.12
'@types/node': 18.16.16
'@types/tough-cookie': 4.0.2
axios: 1.7.4
axios: 1.7.4(debug@4.4.0)
camelcase: 6.3.0
debug: 4.4.0
dotenv: 16.4.5
@ -22811,7 +22823,7 @@ snapshots:
isstream: 0.1.2
jsonwebtoken: 9.0.2
mime-types: 2.1.35
retry-axios: 2.6.0(axios@1.7.4(debug@4.4.0))
retry-axios: 2.6.0(axios@1.7.4)
tough-cookie: 4.1.3
transitivePeerDependencies:
- supports-color
@ -23818,7 +23830,7 @@ snapshots:
kuler@2.0.0: {}
langchain@0.3.11(ilqk5sp4kmqg6yh3rv76amkknm):
langchain@0.3.11(uhxpxbd3xjubkjdqqkxxpkezmi):
dependencies:
'@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
'@langchain/openai': 0.3.17(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)
@ -26223,7 +26235,7 @@ snapshots:
ret@0.1.15: {}
retry-axios@2.6.0(axios@1.7.4(debug@4.4.0)):
retry-axios@2.6.0(axios@1.7.4):
dependencies:
axios: 1.7.4