@strapi/core 5.60.0 → 5.61.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.
Files changed (43) hide show
  1. package/dist/package.json.js +16 -20
  2. package/dist/package.json.js.map +1 -1
  3. package/dist/package.json.mjs +16 -20
  4. package/dist/package.json.mjs.map +1 -1
  5. package/dist/providers/webhooks.d.ts.map +1 -1
  6. package/dist/providers/webhooks.js +1 -0
  7. package/dist/providers/webhooks.js.map +1 -1
  8. package/dist/providers/webhooks.mjs +1 -0
  9. package/dist/providers/webhooks.mjs.map +1 -1
  10. package/dist/services/document-service/events.d.ts.map +1 -1
  11. package/dist/services/document-service/events.js +2 -1
  12. package/dist/services/document-service/events.js.map +1 -1
  13. package/dist/services/document-service/events.mjs +2 -1
  14. package/dist/services/document-service/events.mjs.map +1 -1
  15. package/dist/services/entity-validator/index.d.ts.map +1 -1
  16. package/dist/services/entity-validator/index.js +35 -4
  17. package/dist/services/entity-validator/index.js.map +1 -1
  18. package/dist/services/entity-validator/index.mjs +35 -4
  19. package/dist/services/entity-validator/index.mjs.map +1 -1
  20. package/dist/services/mcp/handlers/handlePost.d.ts.map +1 -1
  21. package/dist/services/mcp/handlers/handlePost.js +2 -1
  22. package/dist/services/mcp/handlers/handlePost.js.map +1 -1
  23. package/dist/services/mcp/handlers/handlePost.mjs +2 -1
  24. package/dist/services/mcp/handlers/handlePost.mjs.map +1 -1
  25. package/dist/services/mcp/internal/McpConfiguration.d.ts +2 -0
  26. package/dist/services/mcp/internal/McpConfiguration.d.ts.map +1 -1
  27. package/dist/services/mcp/internal/McpConfiguration.js +17 -0
  28. package/dist/services/mcp/internal/McpConfiguration.js.map +1 -1
  29. package/dist/services/mcp/internal/McpConfiguration.mjs +17 -1
  30. package/dist/services/mcp/internal/McpConfiguration.mjs.map +1 -1
  31. package/dist/services/mcp/internal/McpServerFactory.d.ts +3 -1
  32. package/dist/services/mcp/internal/McpServerFactory.d.ts.map +1 -1
  33. package/dist/services/mcp/internal/McpServerFactory.js +4 -2
  34. package/dist/services/mcp/internal/McpServerFactory.js.map +1 -1
  35. package/dist/services/mcp/internal/McpServerFactory.mjs +4 -2
  36. package/dist/services/mcp/internal/McpServerFactory.mjs.map +1 -1
  37. package/dist/services/webhook-runner.d.ts +5 -6
  38. package/dist/services/webhook-runner.d.ts.map +1 -1
  39. package/dist/services/webhook-runner.js +23 -6
  40. package/dist/services/webhook-runner.js.map +1 -1
  41. package/dist/services/webhook-runner.mjs +23 -6
  42. package/dist/services/webhook-runner.mjs.map +1 -1
  43. package/package.json +16 -20
@@ -1 +1 @@
1
- {"version":3,"file":"webhook-runner.mjs","sources":["../../src/services/webhook-runner.ts"],"sourcesContent":["/**\n * The event hub is Strapi's event control center.\n */\n\nimport createdDebugger from 'debug';\nimport _ from 'lodash';\nimport type { Logger } from '@strapi/logger';\n\nimport type { Modules } from '@strapi/types';\nimport WorkerQueue from './worker-queue';\nimport type { EventHub } from './event-hub';\nimport type { Fetch } from '../utils/fetch';\n\ntype Webhook = Modules.WebhookStore.Webhook;\n\ninterface Config {\n defaultHeaders: Record<string, string>;\n}\n\ninterface ConstructorParameters {\n eventHub: EventHub;\n logger: Logger;\n configuration?: Record<string, unknown>;\n fetch: Fetch;\n}\n\ninterface Event {\n event: string;\n info: Record<string, unknown>;\n}\n\ntype Listener = (info: Record<string, unknown>) => Promise<void>;\n\nconst debug = createdDebugger('strapi:webhook');\n\nconst defaultConfiguration: Config = {\n defaultHeaders: {},\n};\n\n/**\n * Every event the webhook has to listen to, including the ones it only sends for some content types.\n */\nconst getEvents = ({ events, contentTypeEvents = {} }: Webhook) => {\n return [...new Set([...events, ...Object.values(contentTypeEvents).flat()])];\n};\n\n/**\n * A webhook is triggered by the events it listens to for every content type,\n * and by the events it listens to for the content type the event is about.\n */\nconst isTriggeredBy = (webhook: Webhook, event: string, info?: Event['info']) => {\n const { events, contentTypeEvents = {} } = webhook;\n const uid = info?.uid;\n\n if (events.includes(event)) {\n return true;\n }\n\n return (\n typeof uid === 'string' &&\n Object.hasOwn(contentTypeEvents, uid) &&\n contentTypeEvents[uid].includes(event)\n );\n};\n\nclass WebhookRunner {\n private eventHub: EventHub;\n\n private logger: Logger;\n\n private config: Config;\n\n private webhooksMap: Map<string, Webhook[]> = new Map();\n\n private listeners: Map<string, Listener> = new Map();\n\n private queue: WorkerQueue<Event, void>;\n\n private fetch: Fetch;\n\n constructor({ eventHub, logger, configuration = {}, fetch }: ConstructorParameters) {\n debug('Initialized webhook runner');\n this.eventHub = eventHub;\n this.logger = logger;\n this.fetch = fetch;\n\n if (typeof configuration !== 'object') {\n throw new Error(\n 'Invalid configuration provided to the webhookRunner.\\nCheck your server.json -> webhooks configuration'\n );\n }\n\n this.config = _.merge(defaultConfiguration, configuration);\n\n this.queue = new WorkerQueue({ logger, concurrency: 5 });\n\n this.queue.subscribe(this.executeListener.bind(this));\n }\n\n deleteListener(event: string) {\n debug(`Deleting listener for event '${event}'`);\n\n const fn = this.listeners.get(event);\n\n if (fn !== undefined) {\n this.eventHub.off(event, fn);\n this.listeners.delete(event);\n }\n }\n\n createListener(event: string) {\n debug(`Creating listener for event '${event}'`);\n if (this.listeners.has(event)) {\n this.logger.error(\n `The webhook runner is already listening for the event '${event}'. Did you mean to call .register() ?`\n );\n }\n\n const listen = async (info: Event['info']) => {\n this.queue.enqueue({ event, info });\n };\n\n this.listeners.set(event, listen);\n this.eventHub.on(event, listen);\n }\n\n async executeListener({ event, info }: Event) {\n debug(`Executing webhook for event '${event}'`);\n const webhooks = this.webhooksMap.get(event) || [];\n const activeWebhooks = webhooks.filter(\n (webhook) => webhook.isEnabled === true && isTriggeredBy(webhook, event, info)\n );\n\n for (const webhook of activeWebhooks) {\n await this.run(webhook, event, info).catch((error: unknown) => {\n this.logger.error('Error running webhook');\n this.logger.error(error);\n });\n }\n }\n\n run(webhook: Webhook, event: string, info = {}) {\n const { url, headers } = webhook;\n\n return this.fetch(url, {\n method: 'post',\n body: JSON.stringify({\n event,\n createdAt: new Date(),\n ...info,\n }),\n headers: {\n ...this.config.defaultHeaders,\n ...headers,\n 'X-Strapi-Event': event,\n 'Content-Type': 'application/json',\n },\n signal: AbortSignal.timeout(10000),\n })\n .then(async (res) => {\n if (res.ok) {\n return {\n statusCode: res.status,\n };\n }\n\n return {\n statusCode: res.status,\n message: await res.text(),\n };\n })\n .catch((err) => {\n return {\n statusCode: 500,\n message: err.message,\n };\n });\n }\n\n add(webhook: Webhook) {\n debug(`Registering webhook '${webhook.id}'`);\n getEvents(webhook).forEach((event) => {\n if (this.webhooksMap.has(event)) {\n this.webhooksMap.get(event)?.push(webhook);\n } else {\n this.webhooksMap.set(event, [webhook]);\n this.createListener(event);\n }\n });\n }\n\n update(webhook: Webhook) {\n debug(`Refreshing webhook '${webhook.id}'`);\n this.remove(webhook);\n this.add(webhook);\n }\n\n remove(webhook: Webhook) {\n debug(`Unregistering webhook '${webhook.id}'`);\n\n this.webhooksMap.forEach((webhooks, event) => {\n const filteredWebhooks = webhooks.filter((value) => value.id !== webhook.id);\n\n // Cleanup hanging listeners\n if (filteredWebhooks.length === 0) {\n this.webhooksMap.delete(event);\n this.deleteListener(event);\n } else {\n this.webhooksMap.set(event, filteredWebhooks);\n }\n });\n }\n}\n\n/**\n * Expose a factory function instead of the class\n */\nexport default function createWebhookRunner(opts: ConstructorParameters): WebhookRunner {\n return new WebhookRunner(opts);\n}\n\nexport type { WebhookRunner };\n"],"names":["debug","createdDebugger","defaultConfiguration","defaultHeaders","getEvents","events","contentTypeEvents","Set","Object","values","flat","isTriggeredBy","webhook","event","info","uid","includes","hasOwn","WebhookRunner","deleteListener","fn","listeners","get","undefined","eventHub","off","delete","createListener","has","logger","error","listen","queue","enqueue","set","on","executeListener","webhooks","webhooksMap","activeWebhooks","filter","isEnabled","run","catch","url","headers","fetch","method","body","JSON","stringify","createdAt","Date","config","signal","AbortSignal","timeout","then","res","ok","statusCode","status","message","text","err","add","id","forEach","push","update","remove","filteredWebhooks","value","length","configuration","Map","Error","_","merge","WorkerQueue","concurrency","subscribe","bind","createWebhookRunner","opts"],"mappings":"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"}
1
+ {"version":3,"file":"webhook-runner.mjs","sources":["../../src/services/webhook-runner.ts"],"sourcesContent":["/**\n * The event hub is Strapi's event control center.\n */\n\nimport createdDebugger from 'debug';\nimport _ from 'lodash';\nimport type { Logger } from '@strapi/logger';\n\nimport type { Modules } from '@strapi/types';\nimport WorkerQueue from './worker-queue';\nimport type { EventHub } from './event-hub';\nimport type { Fetch } from '../utils/fetch';\n\ntype Webhook = Modules.WebhookStore.Webhook;\ntype Event = Modules.WebhookRunner.Event;\n\ninterface Config {\n defaultHeaders: Record<string, string>;\n deduplicateReleaseWebhooks: boolean;\n}\n\ninterface ConstructorParameters {\n eventHub: EventHub;\n requestContext: Modules.RequestContext.RequestContext;\n logger: Logger;\n configuration?: Record<string, unknown>;\n fetch: Fetch;\n}\n\ntype Listener = (info: Record<string, unknown>) => Promise<void>;\n\nconst debug = createdDebugger('strapi:webhook');\n\nconst defaultConfiguration: Config = {\n defaultHeaders: {},\n deduplicateReleaseWebhooks: false,\n};\n\n/**\n * Every event the webhook has to listen to, including the ones it only sends for some content types.\n */\nconst getEvents = ({ events, contentTypeEvents = {} }: Webhook) => {\n return [...new Set([...events, ...Object.values(contentTypeEvents).flat()])];\n};\n\n/**\n * A webhook is triggered by the events it listens to for every content type,\n * and by the events it listens to for the content type the event is about.\n */\nconst isTriggeredBy = (webhook: Webhook, event: string, info?: Event['info']) => {\n const { events, contentTypeEvents = {} } = webhook;\n const uid = info?.uid;\n\n if (events.includes(event)) {\n return true;\n }\n\n return (\n typeof uid === 'string' &&\n Object.hasOwn(contentTypeEvents, uid) &&\n contentTypeEvents[uid].includes(event)\n );\n};\n\nclass WebhookRunner {\n private eventHub: EventHub;\n\n private requestContext: Modules.RequestContext.RequestContext;\n\n private logger: Logger;\n\n private config: Config;\n\n private webhooksMap: Map<string, Webhook[]> = new Map();\n\n private listeners: Map<string, Listener> = new Map();\n\n private queue: WorkerQueue<Event, void>;\n\n private fetch: Fetch;\n\n constructor({\n eventHub,\n requestContext,\n logger,\n configuration = {},\n fetch,\n }: ConstructorParameters) {\n debug('Initialized webhook runner');\n this.eventHub = eventHub;\n this.requestContext = requestContext;\n this.logger = logger;\n this.fetch = fetch;\n\n if (typeof configuration !== 'object') {\n throw new Error(\n 'Invalid configuration provided to the webhookRunner.\\nCheck your server.json -> webhooks configuration'\n );\n }\n\n this.config = _.merge({}, defaultConfiguration, configuration);\n\n this.queue = new WorkerQueue({ logger, concurrency: 5 });\n\n this.queue.subscribe(this.executeListener.bind(this));\n }\n\n deleteListener(event: string) {\n debug(`Deleting listener for event '${event}'`);\n\n const fn = this.listeners.get(event);\n\n if (fn !== undefined) {\n this.eventHub.off(event, fn);\n this.listeners.delete(event);\n }\n }\n\n createListener(event: string) {\n debug(`Creating listener for event '${event}'`);\n if (this.listeners.has(event)) {\n this.logger.error(\n `The webhook runner is already listening for the event '${event}'. Did you mean to call .register() ?`\n );\n }\n\n const listen = async (info: Event['info']) => {\n if (this.config.deduplicateReleaseWebhooks !== true) {\n this.queue.enqueue({ event, info });\n return;\n }\n\n const context = this.requestContext.get();\n const releaseAction: Modules.WebhookRunner.ReleaseAction | undefined =\n context?.state?.releaseAction;\n const isReleaseAction =\n releaseAction !== undefined &&\n releaseAction.event === event &&\n releaseAction.uid === info.uid &&\n releaseAction.documentId === _.get(info, 'entry.documentId') &&\n (releaseAction.locale ?? null) === (_.get(info, 'entry.locale') ?? null);\n const releaseId: Event['releaseId'] = isReleaseAction ? context?.state?.releaseId : undefined;\n\n this.queue.enqueue({ event, info, releaseId });\n };\n\n this.listeners.set(event, listen);\n this.eventHub.on(event, listen);\n }\n\n async executeListener({ event, info, releaseId }: Event) {\n debug(`Executing webhook for event '${event}'`);\n const webhooks = this.webhooksMap.get(event) || [];\n const activeWebhooks = webhooks.filter(\n (webhook) =>\n webhook.isEnabled === true &&\n isTriggeredBy(webhook, event, info) &&\n !(\n this.config.deduplicateReleaseWebhooks === true &&\n releaseId !== undefined &&\n ['entry.publish', 'entry.unpublish'].includes(event) &&\n webhook.events.includes('releases.publish')\n )\n );\n\n for (const webhook of activeWebhooks) {\n await this.run(webhook, event, info).catch((error: unknown) => {\n this.logger.error('Error running webhook');\n this.logger.error(error);\n });\n }\n }\n\n run(webhook: Webhook, event: string, info = {}) {\n const { url, headers } = webhook;\n\n return this.fetch(url, {\n method: 'post',\n body: JSON.stringify({\n event,\n createdAt: new Date(),\n ...info,\n }),\n headers: {\n ...this.config.defaultHeaders,\n ...headers,\n 'X-Strapi-Event': event,\n 'Content-Type': 'application/json',\n },\n signal: AbortSignal.timeout(10000),\n })\n .then(async (res) => {\n if (res.ok) {\n return {\n statusCode: res.status,\n };\n }\n\n return {\n statusCode: res.status,\n message: await res.text(),\n };\n })\n .catch((err) => {\n return {\n statusCode: 500,\n message: err.message,\n };\n });\n }\n\n add(webhook: Webhook) {\n debug(`Registering webhook '${webhook.id}'`);\n getEvents(webhook).forEach((event) => {\n if (this.webhooksMap.has(event)) {\n this.webhooksMap.get(event)?.push(webhook);\n } else {\n this.webhooksMap.set(event, [webhook]);\n this.createListener(event);\n }\n });\n }\n\n update(webhook: Webhook) {\n debug(`Refreshing webhook '${webhook.id}'`);\n this.remove(webhook);\n this.add(webhook);\n }\n\n remove(webhook: Webhook) {\n debug(`Unregistering webhook '${webhook.id}'`);\n\n this.webhooksMap.forEach((webhooks, event) => {\n const filteredWebhooks = webhooks.filter((value) => value.id !== webhook.id);\n\n // Cleanup hanging listeners\n if (filteredWebhooks.length === 0) {\n this.webhooksMap.delete(event);\n this.deleteListener(event);\n } else {\n this.webhooksMap.set(event, filteredWebhooks);\n }\n });\n }\n}\n\n/**\n * Expose a factory function instead of the class\n */\nexport default function createWebhookRunner(opts: ConstructorParameters): WebhookRunner {\n return new WebhookRunner(opts);\n}\n\nexport type { WebhookRunner };\n"],"names":["debug","createdDebugger","defaultConfiguration","defaultHeaders","deduplicateReleaseWebhooks","getEvents","events","contentTypeEvents","Set","Object","values","flat","isTriggeredBy","webhook","event","info","uid","includes","hasOwn","WebhookRunner","deleteListener","fn","listeners","get","undefined","eventHub","off","delete","createListener","has","logger","error","listen","config","queue","enqueue","context","requestContext","releaseAction","state","isReleaseAction","documentId","_","locale","releaseId","set","on","executeListener","webhooks","webhooksMap","activeWebhooks","filter","isEnabled","run","catch","url","headers","fetch","method","body","JSON","stringify","createdAt","Date","signal","AbortSignal","timeout","then","res","ok","statusCode","status","message","text","err","add","id","forEach","push","update","remove","filteredWebhooks","value","length","configuration","Map","Error","merge","WorkerQueue","concurrency","subscribe","bind","createWebhookRunner","opts"],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@strapi/core",
3
- "version": "5.60.0",
3
+ "version": "5.61.1",
4
4
  "description": "Core of Strapi",
5
5
  "homepage": "https://strapi.io",
6
6
  "bugs": {
@@ -51,8 +51,6 @@
51
51
  "lint": "run -T eslint . --max-warnings=0",
52
52
  "prepublishOnly": "yarn clean && yarn build",
53
53
  "test:ts": "run -T tsc -p tsconfig.json",
54
- "test:unit": "run -T jest",
55
- "test:unit:watch": "run -T jest --watch",
56
54
  "test:unit:vitest": "vitest run",
57
55
  "test:unit:vitest:watch": "vitest --watch"
58
56
  },
@@ -63,15 +61,15 @@
63
61
  "@modelcontextprotocol/node": "2.1.1",
64
62
  "@modelcontextprotocol/server": "2.3.1",
65
63
  "@paralleldrive/cuid2": "2.2.2",
66
- "@strapi/admin": "5.60.0",
67
- "@strapi/database": "5.60.0",
68
- "@strapi/generators": "5.60.0",
69
- "@strapi/logger": "5.60.0",
70
- "@strapi/openapi": "5.60.0",
71
- "@strapi/permissions": "5.60.0",
72
- "@strapi/types": "5.60.0",
73
- "@strapi/typescript-utils": "5.60.0",
74
- "@strapi/utils": "5.60.0",
64
+ "@strapi/admin": "5.61.1",
65
+ "@strapi/database": "5.61.1",
66
+ "@strapi/generators": "5.61.1",
67
+ "@strapi/logger": "5.61.1",
68
+ "@strapi/openapi": "5.61.1",
69
+ "@strapi/permissions": "5.61.1",
70
+ "@strapi/types": "5.61.1",
71
+ "@strapi/typescript-utils": "5.61.1",
72
+ "@strapi/utils": "5.61.1",
75
73
  "@vercel/stega": "0.1.2",
76
74
  "bcryptjs": "2.4.3",
77
75
  "boxen": "5.1.2",
@@ -109,7 +107,7 @@
109
107
  "ora": "5.4.1",
110
108
  "package-json": "10.0.1",
111
109
  "pkg-up": "3.1.0",
112
- "qs": "6.16.0",
110
+ "qs": "6.16.1",
113
111
  "resolve.exports": "2.0.2",
114
112
  "semver": "7.7.4",
115
113
  "typescript": "5.9.3",
@@ -126,7 +124,6 @@
126
124
  "@types/fs-extra": "11.0.4",
127
125
  "@types/global-agent": "3.0.0",
128
126
  "@types/http-errors": "2.0.4",
129
- "@types/jest": "29.5.2",
130
127
  "@types/json-logic-js": "2.0.8",
131
128
  "@types/koa": "2.15.2",
132
129
  "@types/koa-compress": "4.0.3",
@@ -135,18 +132,17 @@
135
132
  "@types/koa__router": "12.0.0",
136
133
  "@types/lodash": "^4.14.191",
137
134
  "@types/mime-types": "2.1.1",
138
- "@types/node": "20.19.41",
135
+ "@types/node": "22.20.0",
139
136
  "ajv": "8.20.0",
140
137
  "ajv-formats": "3.0.1",
141
- "eslint-config-custom": "5.60.0",
142
- "jest": "29.6.0",
138
+ "eslint-config-custom": "5.61.1",
143
139
  "supertest": "7.2.2",
144
- "tsconfig": "5.60.0",
140
+ "tsconfig": "5.61.1",
145
141
  "vitest": "catalog:",
146
- "vitest-config": "5.60.0"
142
+ "vitest-config": "5.61.1"
147
143
  },
148
144
  "engines": {
149
- "node": ">=20.0.0 <=26.x.x",
145
+ "node": ">=22.0.0 <=26.x.x",
150
146
  "npm": ">=6.0.0"
151
147
  }
152
148
  }