@strapi/core 5.61.0 → 5.62.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.
Files changed (140) hide show
  1. package/dist/Strapi.d.ts.map +1 -1
  2. package/dist/Strapi.js +2 -0
  3. package/dist/Strapi.js.map +1 -1
  4. package/dist/Strapi.mjs +2 -0
  5. package/dist/Strapi.mjs.map +1 -1
  6. package/dist/ee/entitlements.d.ts +6 -0
  7. package/dist/ee/entitlements.d.ts.map +1 -1
  8. package/dist/ee/entitlements.js +17 -4
  9. package/dist/ee/entitlements.js.map +1 -1
  10. package/dist/ee/entitlements.mjs +17 -5
  11. package/dist/ee/entitlements.mjs.map +1 -1
  12. package/dist/ee/index.d.ts +7 -12
  13. package/dist/ee/index.d.ts.map +1 -1
  14. package/dist/ee/index.js +19 -6
  15. package/dist/ee/index.js.map +1 -1
  16. package/dist/ee/index.mjs +21 -8
  17. package/dist/ee/index.mjs.map +1 -1
  18. package/dist/factories.d.ts +1 -1
  19. package/dist/factories.d.ts.map +1 -1
  20. package/dist/factories.js.map +1 -1
  21. package/dist/factories.mjs.map +1 -1
  22. package/dist/middlewares/errors.d.ts.map +1 -1
  23. package/dist/middlewares/errors.js +9 -0
  24. package/dist/middlewares/errors.js.map +1 -1
  25. package/dist/middlewares/errors.mjs +9 -0
  26. package/dist/middlewares/errors.mjs.map +1 -1
  27. package/dist/package.json.js +15 -15
  28. package/dist/package.json.mjs +15 -15
  29. package/dist/providers/registries.d.ts.map +1 -1
  30. package/dist/providers/registries.js +1 -0
  31. package/dist/providers/registries.js.map +1 -1
  32. package/dist/providers/registries.mjs +1 -0
  33. package/dist/providers/registries.mjs.map +1 -1
  34. package/dist/registries/policies.d.ts.map +1 -1
  35. package/dist/registries/policies.js +20 -0
  36. package/dist/registries/policies.js.map +1 -1
  37. package/dist/registries/policies.mjs +20 -0
  38. package/dist/registries/policies.mjs.map +1 -1
  39. package/dist/services/content-api/index.d.ts.map +1 -1
  40. package/dist/services/document-service/common.d.ts.map +1 -1
  41. package/dist/services/document-service/common.js +1 -1
  42. package/dist/services/document-service/common.js.map +1 -1
  43. package/dist/services/document-service/common.mjs +1 -1
  44. package/dist/services/document-service/common.mjs.map +1 -1
  45. package/dist/services/document-service/components.d.ts.map +1 -1
  46. package/dist/services/document-service/components.js +3 -3
  47. package/dist/services/document-service/components.js.map +1 -1
  48. package/dist/services/document-service/components.mjs +3 -3
  49. package/dist/services/document-service/components.mjs.map +1 -1
  50. package/dist/services/document-service/entries.js +3 -3
  51. package/dist/services/document-service/entries.js.map +1 -1
  52. package/dist/services/document-service/entries.mjs +3 -3
  53. package/dist/services/document-service/entries.mjs.map +1 -1
  54. package/dist/services/document-service/internationalization.d.ts +13 -1
  55. package/dist/services/document-service/internationalization.d.ts.map +1 -1
  56. package/dist/services/document-service/internationalization.js +58 -17
  57. package/dist/services/document-service/internationalization.js.map +1 -1
  58. package/dist/services/document-service/internationalization.mjs +59 -18
  59. package/dist/services/document-service/internationalization.mjs.map +1 -1
  60. package/dist/services/document-service/middlewares/errors.d.ts.map +1 -1
  61. package/dist/services/document-service/middlewares/errors.js +3 -12
  62. package/dist/services/document-service/middlewares/errors.js.map +1 -1
  63. package/dist/services/document-service/middlewares/errors.mjs +4 -13
  64. package/dist/services/document-service/middlewares/errors.mjs.map +1 -1
  65. package/dist/services/document-service/middlewares/middleware-manager.js +3 -3
  66. package/dist/services/document-service/middlewares/middleware-manager.js.map +1 -1
  67. package/dist/services/document-service/middlewares/middleware-manager.mjs +3 -3
  68. package/dist/services/document-service/middlewares/middleware-manager.mjs.map +1 -1
  69. package/dist/services/document-service/repository.d.ts.map +1 -1
  70. package/dist/services/document-service/repository.js +46 -10
  71. package/dist/services/document-service/repository.js.map +1 -1
  72. package/dist/services/document-service/repository.mjs +47 -11
  73. package/dist/services/document-service/repository.mjs.map +1 -1
  74. package/dist/services/document-service/transform/data.d.ts +1 -1
  75. package/dist/services/document-service/transform/data.d.ts.map +1 -1
  76. package/dist/services/document-service/transform/data.js +1 -1
  77. package/dist/services/document-service/transform/data.js.map +1 -1
  78. package/dist/services/document-service/transform/data.mjs +1 -1
  79. package/dist/services/document-service/transform/data.mjs.map +1 -1
  80. package/dist/services/document-service/transform/populate.js +1 -1
  81. package/dist/services/document-service/transform/populate.js.map +1 -1
  82. package/dist/services/document-service/transform/populate.mjs +1 -1
  83. package/dist/services/document-service/transform/populate.mjs.map +1 -1
  84. package/dist/services/document-service/transform/relations/extract/data-ids.d.ts +1 -1
  85. package/dist/services/document-service/transform/relations/extract/data-ids.d.ts.map +1 -1
  86. package/dist/services/document-service/transform/relations/extract/data-ids.js +1 -1
  87. package/dist/services/document-service/transform/relations/extract/data-ids.js.map +1 -1
  88. package/dist/services/document-service/transform/relations/extract/data-ids.mjs +1 -1
  89. package/dist/services/document-service/transform/relations/extract/data-ids.mjs.map +1 -1
  90. package/dist/services/document-service/transform/relations/transform/data-ids.d.ts +1 -1
  91. package/dist/services/document-service/transform/relations/transform/data-ids.d.ts.map +1 -1
  92. package/dist/services/document-service/transform/relations/transform/default-locale.d.ts +1 -1
  93. package/dist/services/document-service/transform/relations/transform/default-locale.d.ts.map +1 -1
  94. package/dist/services/document-service/transform/relations/transform/default-locale.js +0 -1
  95. package/dist/services/document-service/transform/relations/transform/default-locale.js.map +1 -1
  96. package/dist/services/document-service/transform/relations/transform/default-locale.mjs +0 -1
  97. package/dist/services/document-service/transform/relations/transform/default-locale.mjs.map +1 -1
  98. package/dist/services/document-service/transform/relations/utils/map-relation.d.ts +1 -1
  99. package/dist/services/document-service/transform/relations/utils/map-relation.d.ts.map +1 -1
  100. package/dist/services/document-service/transform/relations/utils/map-relation.js +1 -1
  101. package/dist/services/document-service/transform/relations/utils/map-relation.js.map +1 -1
  102. package/dist/services/document-service/transform/relations/utils/map-relation.mjs +1 -1
  103. package/dist/services/document-service/transform/relations/utils/map-relation.mjs.map +1 -1
  104. package/dist/services/document-service/utils/clean-component-join-table.js +1 -1
  105. package/dist/services/document-service/utils/clean-component-join-table.js.map +1 -1
  106. package/dist/services/document-service/utils/clean-component-join-table.mjs +1 -1
  107. package/dist/services/document-service/utils/clean-component-join-table.mjs.map +1 -1
  108. package/dist/services/document-service/utils/clone-relations.d.ts.map +1 -1
  109. package/dist/services/document-service/utils/clone-relations.js +249 -190
  110. package/dist/services/document-service/utils/clone-relations.js.map +1 -1
  111. package/dist/services/document-service/utils/clone-relations.mjs +250 -191
  112. package/dist/services/document-service/utils/clone-relations.mjs.map +1 -1
  113. package/dist/services/entity-service/index.d.ts.map +1 -1
  114. package/dist/services/entity-service/index.js +3 -12
  115. package/dist/services/entity-service/index.js.map +1 -1
  116. package/dist/services/entity-service/index.mjs +4 -13
  117. package/dist/services/entity-service/index.mjs.map +1 -1
  118. package/dist/services/metrics/sender.d.ts.map +1 -1
  119. package/dist/services/metrics/sender.js +4 -1
  120. package/dist/services/metrics/sender.js.map +1 -1
  121. package/dist/services/metrics/sender.mjs +4 -1
  122. package/dist/services/metrics/sender.mjs.map +1 -1
  123. package/dist/services/reloader.d.ts +1 -0
  124. package/dist/services/reloader.d.ts.map +1 -1
  125. package/dist/services/reloader.js +5 -0
  126. package/dist/services/reloader.js.map +1 -1
  127. package/dist/services/reloader.mjs +5 -0
  128. package/dist/services/reloader.mjs.map +1 -1
  129. package/dist/services/server/middleware.d.ts.map +1 -1
  130. package/dist/services/server/middleware.js +16 -4
  131. package/dist/services/server/middleware.js.map +1 -1
  132. package/dist/services/server/middleware.mjs +16 -4
  133. package/dist/services/server/middleware.mjs.map +1 -1
  134. package/dist/utils/database-input-errors.d.ts +11 -0
  135. package/dist/utils/database-input-errors.d.ts.map +1 -0
  136. package/dist/utils/database-input-errors.js +23 -0
  137. package/dist/utils/database-input-errors.js.map +1 -0
  138. package/dist/utils/database-input-errors.mjs +20 -0
  139. package/dist/utils/database-input-errors.mjs.map +1 -0
  140. package/package.json +15 -15
@@ -31,6 +31,8 @@ const defaultQueryOpts = {
31
31
  'Content-Type': 'application/json'
32
32
  }
33
33
  };
34
+ // Native fetch ignores `timeout`: it becomes a per-request AbortSignal and never reaches fetch
35
+ const { timeout, ...fetchDefaults } = defaultQueryOpts;
34
36
  /**
35
37
  * Add properties from the package.json strapi key in the metadata
36
38
  */ const addPackageJsonStrapiMetadata = (metadata, strapi)=>{
@@ -89,11 +91,12 @@ const defaultQueryOpts = {
89
91
  ...payload.groupProperties
90
92
  }
91
93
  }),
94
+ signal: AbortSignal.timeout(timeout),
92
95
  ...___default.default.merge({
93
96
  headers: {
94
97
  'X-Strapi-Event': event
95
98
  }
96
- }, defaultQueryOpts, opts)
99
+ }, fetchDefaults, opts)
97
100
  };
98
101
  try {
99
102
  const analyticsUrl = strapiUtils.env('STRAPI_ANALYTICS_URL', 'https://analytics.strapi.io');
@@ -1 +1 @@
1
- {"version":3,"file":"sender.js","sources":["../../../src/services/metrics/sender.ts"],"sourcesContent":["import os from 'os';\nimport path from 'path';\nimport _ from 'lodash';\nimport isDocker from 'is-docker';\nimport ciEnv from 'ci-info';\nimport { env, generateInstallId } from '@strapi/utils';\nimport type { Core } from '@strapi/types';\nimport { generateAdminUserHash } from './admin-user-hash';\n\n// Lazy: only resolved when telemetry is enabled and a sender is constructed\nlet lazyTsUtils: typeof import('@strapi/typescript-utils') | undefined;\nconst tsUtils = (): typeof import('@strapi/typescript-utils') => {\n if (!lazyTsUtils) {\n // eslint-disable-next-line @typescript-eslint/no-var-requires\n lazyTsUtils = require('@strapi/typescript-utils');\n }\n return lazyTsUtils as typeof import('@strapi/typescript-utils');\n};\n\nexport interface Payload {\n eventProperties?: Record<string, unknown>;\n userProperties?: Record<string, unknown>;\n groupProperties?: Record<string, unknown>;\n}\n\nexport type Sender = (\n event: string,\n payload?: Payload,\n opts?: Record<string, unknown>\n) => Promise<boolean>;\n\nconst defaultQueryOpts = {\n timeout: 1000,\n headers: { 'Content-Type': 'application/json' },\n};\n\n/**\n * Add properties from the package.json strapi key in the metadata\n */\nconst addPackageJsonStrapiMetadata = (metadata: Record<string, unknown>, strapi: Core.Strapi) => {\n const { packageJsonStrapi = {} } = strapi.config;\n\n _.defaults(metadata, packageJsonStrapi);\n};\n\n/**\n * Create a send function for event with all the necessary metadata\n */\nexport default (strapi: Core.Strapi): Sender => {\n const { uuid, installId: installIdFromPackageJson } = strapi.config;\n\n const installId = generateInstallId(uuid, installIdFromPackageJson);\n\n const serverRootPath = strapi.dirs.app.root;\n const adminRootPath = path.join(strapi.dirs.app.root, 'src', 'admin');\n\n const anonymousUserProperties = {\n environment: strapi.config.environment,\n os: os.type(),\n osPlatform: os.platform(),\n osArch: os.arch(),\n osRelease: os.release(),\n nodeVersion: process.versions.node,\n };\n\n const anonymousGroupProperties = {\n docker: process.env.DOCKER || isDocker(),\n isCI: ciEnv.isCI,\n version: strapi.config.get('info.strapi'),\n useTypescriptOnServer: tsUtils().isUsingTypeScriptSync(serverRootPath),\n useTypescriptOnAdmin: tsUtils().isUsingTypeScriptSync(adminRootPath),\n projectId: uuid,\n isHostedOnStrapiCloud: env('STRAPI_HOSTING', null) === 'strapi.cloud',\n };\n\n addPackageJsonStrapiMetadata(anonymousGroupProperties, strapi);\n\n return async (event: string, payload: Payload = {}, opts = {}) => {\n const userId = generateAdminUserHash(strapi);\n\n const eeGroupProps: Record<string, unknown> = {};\n if (strapi.ee?.subscriptionId !== undefined && strapi.ee?.subscriptionId !== null) {\n eeGroupProps.subscriptionId = strapi.ee.subscriptionId;\n }\n if (strapi.ee?.planPriceId !== undefined && strapi.ee?.planPriceId !== null) {\n eeGroupProps.planPriceId = strapi.ee.planPriceId;\n }\n\n const reqParams = {\n method: 'POST',\n body: JSON.stringify({\n event,\n userId,\n installId,\n eventProperties: payload.eventProperties,\n userProperties: userId ? { ...anonymousUserProperties, ...payload.userProperties } : {},\n groupProperties: {\n ...anonymousGroupProperties,\n projectType: strapi.EE ? 'Enterprise' : 'Community',\n ...eeGroupProps,\n ...payload.groupProperties,\n },\n }),\n ..._.merge({ headers: { 'X-Strapi-Event': event } }, defaultQueryOpts, opts),\n };\n\n try {\n const analyticsUrl = env('STRAPI_ANALYTICS_URL', 'https://analytics.strapi.io');\n const res = await strapi.fetch(`${analyticsUrl}/api/v2/track`, reqParams);\n return res.ok;\n } catch {\n return false;\n }\n };\n};\n"],"names":["lazyTsUtils","tsUtils","require","defaultQueryOpts","timeout","headers","addPackageJsonStrapiMetadata","metadata","strapi","packageJsonStrapi","config","_","defaults","uuid","installId","installIdFromPackageJson","generateInstallId","serverRootPath","dirs","app","root","adminRootPath","path","join","anonymousUserProperties","environment","os","type","osPlatform","platform","osArch","arch","osRelease","release","nodeVersion","process","versions","node","anonymousGroupProperties","docker","env","DOCKER","isDocker","isCI","ciEnv","version","get","useTypescriptOnServer","isUsingTypeScriptSync","useTypescriptOnAdmin","projectId","isHostedOnStrapiCloud","event","payload","opts","userId","generateAdminUserHash","eeGroupProps","ee","subscriptionId","undefined","planPriceId","reqParams","method","body","JSON","stringify","eventProperties","userProperties","groupProperties","projectType","EE","merge","analyticsUrl","res","fetch","ok"],"mappings":"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"}
1
+ {"version":3,"file":"sender.js","sources":["../../../src/services/metrics/sender.ts"],"sourcesContent":["import os from 'os';\nimport path from 'path';\nimport _ from 'lodash';\nimport isDocker from 'is-docker';\nimport ciEnv from 'ci-info';\nimport { env, generateInstallId } from '@strapi/utils';\nimport type { Core } from '@strapi/types';\nimport { generateAdminUserHash } from './admin-user-hash';\n\n// Lazy: only resolved when telemetry is enabled and a sender is constructed\nlet lazyTsUtils: typeof import('@strapi/typescript-utils') | undefined;\nconst tsUtils = (): typeof import('@strapi/typescript-utils') => {\n if (!lazyTsUtils) {\n // eslint-disable-next-line @typescript-eslint/no-var-requires\n lazyTsUtils = require('@strapi/typescript-utils');\n }\n return lazyTsUtils as typeof import('@strapi/typescript-utils');\n};\n\nexport interface Payload {\n eventProperties?: Record<string, unknown>;\n userProperties?: Record<string, unknown>;\n groupProperties?: Record<string, unknown>;\n}\n\nexport type Sender = (\n event: string,\n payload?: Payload,\n opts?: Record<string, unknown>\n) => Promise<boolean>;\n\nconst defaultQueryOpts = {\n timeout: 1000,\n headers: { 'Content-Type': 'application/json' },\n};\n\n// Native fetch ignores `timeout`: it becomes a per-request AbortSignal and never reaches fetch\nconst { timeout, ...fetchDefaults } = defaultQueryOpts;\n\n/**\n * Add properties from the package.json strapi key in the metadata\n */\nconst addPackageJsonStrapiMetadata = (metadata: Record<string, unknown>, strapi: Core.Strapi) => {\n const { packageJsonStrapi = {} } = strapi.config;\n\n _.defaults(metadata, packageJsonStrapi);\n};\n\n/**\n * Create a send function for event with all the necessary metadata\n */\nexport default (strapi: Core.Strapi): Sender => {\n const { uuid, installId: installIdFromPackageJson } = strapi.config;\n\n const installId = generateInstallId(uuid, installIdFromPackageJson);\n\n const serverRootPath = strapi.dirs.app.root;\n const adminRootPath = path.join(strapi.dirs.app.root, 'src', 'admin');\n\n const anonymousUserProperties = {\n environment: strapi.config.environment,\n os: os.type(),\n osPlatform: os.platform(),\n osArch: os.arch(),\n osRelease: os.release(),\n nodeVersion: process.versions.node,\n };\n\n const anonymousGroupProperties = {\n docker: process.env.DOCKER || isDocker(),\n isCI: ciEnv.isCI,\n version: strapi.config.get('info.strapi'),\n useTypescriptOnServer: tsUtils().isUsingTypeScriptSync(serverRootPath),\n useTypescriptOnAdmin: tsUtils().isUsingTypeScriptSync(adminRootPath),\n projectId: uuid,\n isHostedOnStrapiCloud: env('STRAPI_HOSTING', null) === 'strapi.cloud',\n };\n\n addPackageJsonStrapiMetadata(anonymousGroupProperties, strapi);\n\n return async (event: string, payload: Payload = {}, opts = {}) => {\n const userId = generateAdminUserHash(strapi);\n\n const eeGroupProps: Record<string, unknown> = {};\n if (strapi.ee?.subscriptionId !== undefined && strapi.ee?.subscriptionId !== null) {\n eeGroupProps.subscriptionId = strapi.ee.subscriptionId;\n }\n if (strapi.ee?.planPriceId !== undefined && strapi.ee?.planPriceId !== null) {\n eeGroupProps.planPriceId = strapi.ee.planPriceId;\n }\n\n const reqParams = {\n method: 'POST',\n body: JSON.stringify({\n event,\n userId,\n installId,\n eventProperties: payload.eventProperties,\n userProperties: userId ? { ...anonymousUserProperties, ...payload.userProperties } : {},\n groupProperties: {\n ...anonymousGroupProperties,\n projectType: strapi.EE ? 'Enterprise' : 'Community',\n ...eeGroupProps,\n ...payload.groupProperties,\n },\n }),\n signal: AbortSignal.timeout(timeout),\n ..._.merge({ headers: { 'X-Strapi-Event': event } }, fetchDefaults, opts),\n };\n\n try {\n const analyticsUrl = env('STRAPI_ANALYTICS_URL', 'https://analytics.strapi.io');\n const res = await strapi.fetch(`${analyticsUrl}/api/v2/track`, reqParams);\n return res.ok;\n } catch {\n return false;\n }\n };\n};\n"],"names":["lazyTsUtils","tsUtils","require","defaultQueryOpts","timeout","headers","fetchDefaults","addPackageJsonStrapiMetadata","metadata","strapi","packageJsonStrapi","config","_","defaults","uuid","installId","installIdFromPackageJson","generateInstallId","serverRootPath","dirs","app","root","adminRootPath","path","join","anonymousUserProperties","environment","os","type","osPlatform","platform","osArch","arch","osRelease","release","nodeVersion","process","versions","node","anonymousGroupProperties","docker","env","DOCKER","isDocker","isCI","ciEnv","version","get","useTypescriptOnServer","isUsingTypeScriptSync","useTypescriptOnAdmin","projectId","isHostedOnStrapiCloud","event","payload","opts","userId","generateAdminUserHash","eeGroupProps","ee","subscriptionId","undefined","planPriceId","reqParams","method","body","JSON","stringify","eventProperties","userProperties","groupProperties","projectType","EE","signal","AbortSignal","merge","analyticsUrl","res","fetch","ok"],"mappings":";;;;;;;;;;;;;;;;;;AASA;AACA,IAAIA,WAAAA;AACJ,MAAMC,OAAAA,GAAU,IAAA;AACd,IAAA,IAAI,CAACD,WAAAA,EAAa;;AAEhBA,QAAAA,WAAAA,GAAcE,OAAAA,CAAQ,0BAAA,CAAA;AACxB,IAAA;IACA,OAAOF,WAAAA;AACT,CAAA;AAcA,MAAMG,gBAAAA,GAAmB;IACvBC,OAAAA,EAAS,IAAA;IACTC,OAAAA,EAAS;QAAE,cAAA,EAAgB;AAAmB;AAChD,CAAA;AAEA;AACA,MAAM,EAAED,OAAO,EAAE,GAAGE,eAAe,GAAGH,gBAAAA;AAEtC;;IAGA,MAAMI,4BAAAA,GAA+B,CAACC,QAAAA,EAAmCC,MAAAA,GAAAA;AACvE,IAAA,MAAM,EAAEC,iBAAAA,GAAoB,EAAE,EAAE,GAAGD,OAAOE,MAAM;IAEhDC,kBAAAA,CAAEC,QAAQ,CAACL,QAAAA,EAAUE,iBAAAA,CAAAA;AACvB,CAAA;AAEA;;IAGA,mBAAe,CAAA,CAACD,MAAAA,GAAAA;IACd,MAAM,EAAEK,IAAI,EAAEC,SAAAA,EAAWC,wBAAwB,EAAE,GAAGP,OAAOE,MAAM;IAEnE,MAAMI,SAAAA,GAAYE,8BAAkBH,IAAAA,EAAME,wBAAAA,CAAAA;AAE1C,IAAA,MAAME,iBAAiBT,MAAAA,CAAOU,IAAI,CAACC,GAAG,CAACC,IAAI;IAC3C,MAAMC,aAAAA,GAAgBC,qBAAAA,CAAKC,IAAI,CAACf,MAAAA,CAAOU,IAAI,CAACC,GAAG,CAACC,IAAI,EAAE,KAAA,EAAO,OAAA,CAAA;AAE7D,IAAA,MAAMI,uBAAAA,GAA0B;QAC9BC,WAAAA,EAAajB,MAAAA,CAAOE,MAAM,CAACe,WAAW;AACtCC,QAAAA,EAAAA,EAAIA,oBAAGC,IAAI,EAAA;AACXC,QAAAA,UAAAA,EAAYF,oBAAGG,QAAQ,EAAA;AACvBC,QAAAA,MAAAA,EAAQJ,oBAAGK,IAAI,EAAA;AACfC,QAAAA,SAAAA,EAAWN,oBAAGO,OAAO,EAAA;QACrBC,WAAAA,EAAaC,OAAAA,CAAQC,QAAQ,CAACC;AAChC,KAAA;AAEA,IAAA,MAAMC,wBAAAA,GAA2B;AAC/BC,QAAAA,MAAAA,EAAQJ,OAAAA,CAAQK,GAAG,CAACC,MAAM,IAAIC,yBAAAA,EAAAA;AAC9BC,QAAAA,IAAAA,EAAMC,uBAAMD,IAAI;AAChBE,QAAAA,OAAAA,EAASrC,MAAAA,CAAOE,MAAM,CAACoC,GAAG,CAAC,aAAA,CAAA;QAC3BC,qBAAAA,EAAuB/C,OAAAA,EAAAA,CAAUgD,qBAAqB,CAAC/B,cAAAA,CAAAA;QACvDgC,oBAAAA,EAAsBjD,OAAAA,EAAAA,CAAUgD,qBAAqB,CAAC3B,aAAAA,CAAAA;QACtD6B,SAAAA,EAAWrC,IAAAA;QACXsC,qBAAAA,EAAuBX,eAAAA,CAAI,kBAAkB,IAAA,CAAA,KAAU;AACzD,KAAA;AAEAlC,IAAAA,4BAAAA,CAA6BgC,wBAAAA,EAA0B9B,MAAAA,CAAAA;IAEvD,OAAO,OAAO4C,OAAeC,OAAAA,GAAmB,EAAE,EAAEC,IAAAA,GAAO,EAAE,GAAA;AAC3D,QAAA,MAAMC,SAASC,mCAAAA,CAAsBhD,MAAAA,CAAAA;AAErC,QAAA,MAAMiD,eAAwC,EAAC;QAC/C,IAAIjD,MAAAA,CAAOkD,EAAE,EAAEC,cAAAA,KAAmBC,aAAapD,MAAAA,CAAOkD,EAAE,EAAEC,cAAAA,KAAmB,IAAA,EAAM;AACjFF,YAAAA,YAAAA,CAAaE,cAAc,GAAGnD,MAAAA,CAAOkD,EAAE,CAACC,cAAc;AACxD,QAAA;QACA,IAAInD,MAAAA,CAAOkD,EAAE,EAAEG,WAAAA,KAAgBD,aAAapD,MAAAA,CAAOkD,EAAE,EAAEG,WAAAA,KAAgB,IAAA,EAAM;AAC3EJ,YAAAA,YAAAA,CAAaI,WAAW,GAAGrD,MAAAA,CAAOkD,EAAE,CAACG,WAAW;AAClD,QAAA;AAEA,QAAA,MAAMC,SAAAA,GAAY;YAChBC,MAAAA,EAAQ,MAAA;YACRC,IAAAA,EAAMC,IAAAA,CAAKC,SAAS,CAAC;AACnBd,gBAAAA,KAAAA;AACAG,gBAAAA,MAAAA;AACAzC,gBAAAA,SAAAA;AACAqD,gBAAAA,eAAAA,EAAiBd,QAAQc,eAAe;AACxCC,gBAAAA,cAAAA,EAAgBb,MAAAA,GAAS;AAAE,oBAAA,GAAG/B,uBAAuB;AAAE,oBAAA,GAAG6B,QAAQe;AAAe,iBAAA,GAAI,EAAC;gBACtFC,eAAAA,EAAiB;AACf,oBAAA,GAAG/B,wBAAwB;oBAC3BgC,WAAAA,EAAa9D,MAAAA,CAAO+D,EAAE,GAAG,YAAA,GAAe,WAAA;AACxC,oBAAA,GAAGd,YAAY;AACf,oBAAA,GAAGJ,QAAQgB;AACb;AACF,aAAA,CAAA;YACAG,MAAAA,EAAQC,WAAAA,CAAYtE,OAAO,CAACA,OAAAA,CAAAA;YAC5B,GAAGQ,kBAAAA,CAAE+D,KAAK,CAAC;gBAAEtE,OAAAA,EAAS;oBAAE,gBAAA,EAAkBgD;AAAM;AAAE,aAAA,EAAG/C,eAAeiD,IAAAA;AACtE,SAAA;QAEA,IAAI;YACF,MAAMqB,YAAAA,GAAenC,gBAAI,sBAAA,EAAwB,6BAAA,CAAA;YACjD,MAAMoC,GAAAA,GAAM,MAAMpE,MAAAA,CAAOqE,KAAK,CAAC,CAAA,EAAGF,YAAAA,CAAa,aAAa,CAAC,EAAEb,SAAAA,CAAAA;AAC/D,YAAA,OAAOc,IAAIE,EAAE;AACf,QAAA,CAAA,CAAE,OAAM;YACN,OAAO,KAAA;AACT,QAAA;AACF,IAAA,CAAA;AACF,CAAA;;;;"}
@@ -21,6 +21,8 @@ const defaultQueryOpts = {
21
21
  'Content-Type': 'application/json'
22
22
  }
23
23
  };
24
+ // Native fetch ignores `timeout`: it becomes a per-request AbortSignal and never reaches fetch
25
+ const { timeout, ...fetchDefaults } = defaultQueryOpts;
24
26
  /**
25
27
  * Add properties from the package.json strapi key in the metadata
26
28
  */ const addPackageJsonStrapiMetadata = (metadata, strapi)=>{
@@ -79,11 +81,12 @@ const defaultQueryOpts = {
79
81
  ...payload.groupProperties
80
82
  }
81
83
  }),
84
+ signal: AbortSignal.timeout(timeout),
82
85
  ..._.merge({
83
86
  headers: {
84
87
  'X-Strapi-Event': event
85
88
  }
86
- }, defaultQueryOpts, opts)
89
+ }, fetchDefaults, opts)
87
90
  };
88
91
  try {
89
92
  const analyticsUrl = env('STRAPI_ANALYTICS_URL', 'https://analytics.strapi.io');
@@ -1 +1 @@
1
- {"version":3,"file":"sender.mjs","sources":["../../../src/services/metrics/sender.ts"],"sourcesContent":["import os from 'os';\nimport path from 'path';\nimport _ from 'lodash';\nimport isDocker from 'is-docker';\nimport ciEnv from 'ci-info';\nimport { env, generateInstallId } from '@strapi/utils';\nimport type { Core } from '@strapi/types';\nimport { generateAdminUserHash } from './admin-user-hash';\n\n// Lazy: only resolved when telemetry is enabled and a sender is constructed\nlet lazyTsUtils: typeof import('@strapi/typescript-utils') | undefined;\nconst tsUtils = (): typeof import('@strapi/typescript-utils') => {\n if (!lazyTsUtils) {\n // eslint-disable-next-line @typescript-eslint/no-var-requires\n lazyTsUtils = require('@strapi/typescript-utils');\n }\n return lazyTsUtils as typeof import('@strapi/typescript-utils');\n};\n\nexport interface Payload {\n eventProperties?: Record<string, unknown>;\n userProperties?: Record<string, unknown>;\n groupProperties?: Record<string, unknown>;\n}\n\nexport type Sender = (\n event: string,\n payload?: Payload,\n opts?: Record<string, unknown>\n) => Promise<boolean>;\n\nconst defaultQueryOpts = {\n timeout: 1000,\n headers: { 'Content-Type': 'application/json' },\n};\n\n/**\n * Add properties from the package.json strapi key in the metadata\n */\nconst addPackageJsonStrapiMetadata = (metadata: Record<string, unknown>, strapi: Core.Strapi) => {\n const { packageJsonStrapi = {} } = strapi.config;\n\n _.defaults(metadata, packageJsonStrapi);\n};\n\n/**\n * Create a send function for event with all the necessary metadata\n */\nexport default (strapi: Core.Strapi): Sender => {\n const { uuid, installId: installIdFromPackageJson } = strapi.config;\n\n const installId = generateInstallId(uuid, installIdFromPackageJson);\n\n const serverRootPath = strapi.dirs.app.root;\n const adminRootPath = path.join(strapi.dirs.app.root, 'src', 'admin');\n\n const anonymousUserProperties = {\n environment: strapi.config.environment,\n os: os.type(),\n osPlatform: os.platform(),\n osArch: os.arch(),\n osRelease: os.release(),\n nodeVersion: process.versions.node,\n };\n\n const anonymousGroupProperties = {\n docker: process.env.DOCKER || isDocker(),\n isCI: ciEnv.isCI,\n version: strapi.config.get('info.strapi'),\n useTypescriptOnServer: tsUtils().isUsingTypeScriptSync(serverRootPath),\n useTypescriptOnAdmin: tsUtils().isUsingTypeScriptSync(adminRootPath),\n projectId: uuid,\n isHostedOnStrapiCloud: env('STRAPI_HOSTING', null) === 'strapi.cloud',\n };\n\n addPackageJsonStrapiMetadata(anonymousGroupProperties, strapi);\n\n return async (event: string, payload: Payload = {}, opts = {}) => {\n const userId = generateAdminUserHash(strapi);\n\n const eeGroupProps: Record<string, unknown> = {};\n if (strapi.ee?.subscriptionId !== undefined && strapi.ee?.subscriptionId !== null) {\n eeGroupProps.subscriptionId = strapi.ee.subscriptionId;\n }\n if (strapi.ee?.planPriceId !== undefined && strapi.ee?.planPriceId !== null) {\n eeGroupProps.planPriceId = strapi.ee.planPriceId;\n }\n\n const reqParams = {\n method: 'POST',\n body: JSON.stringify({\n event,\n userId,\n installId,\n eventProperties: payload.eventProperties,\n userProperties: userId ? { ...anonymousUserProperties, ...payload.userProperties } : {},\n groupProperties: {\n ...anonymousGroupProperties,\n projectType: strapi.EE ? 'Enterprise' : 'Community',\n ...eeGroupProps,\n ...payload.groupProperties,\n },\n }),\n ..._.merge({ headers: { 'X-Strapi-Event': event } }, defaultQueryOpts, opts),\n };\n\n try {\n const analyticsUrl = env('STRAPI_ANALYTICS_URL', 'https://analytics.strapi.io');\n const res = await strapi.fetch(`${analyticsUrl}/api/v2/track`, reqParams);\n return res.ok;\n } catch {\n return false;\n }\n };\n};\n"],"names":["lazyTsUtils","tsUtils","require","defaultQueryOpts","timeout","headers","addPackageJsonStrapiMetadata","metadata","strapi","packageJsonStrapi","config","_","defaults","uuid","installId","installIdFromPackageJson","generateInstallId","serverRootPath","dirs","app","root","adminRootPath","path","join","anonymousUserProperties","environment","os","type","osPlatform","platform","osArch","arch","osRelease","release","nodeVersion","process","versions","node","anonymousGroupProperties","docker","env","DOCKER","isDocker","isCI","ciEnv","version","get","useTypescriptOnServer","isUsingTypeScriptSync","useTypescriptOnAdmin","projectId","isHostedOnStrapiCloud","event","payload","opts","userId","generateAdminUserHash","eeGroupProps","ee","subscriptionId","undefined","planPriceId","reqParams","method","body","JSON","stringify","eventProperties","userProperties","groupProperties","projectType","EE","merge","analyticsUrl","res","fetch","ok"],"mappings":"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"}
1
+ {"version":3,"file":"sender.mjs","sources":["../../../src/services/metrics/sender.ts"],"sourcesContent":["import os from 'os';\nimport path from 'path';\nimport _ from 'lodash';\nimport isDocker from 'is-docker';\nimport ciEnv from 'ci-info';\nimport { env, generateInstallId } from '@strapi/utils';\nimport type { Core } from '@strapi/types';\nimport { generateAdminUserHash } from './admin-user-hash';\n\n// Lazy: only resolved when telemetry is enabled and a sender is constructed\nlet lazyTsUtils: typeof import('@strapi/typescript-utils') | undefined;\nconst tsUtils = (): typeof import('@strapi/typescript-utils') => {\n if (!lazyTsUtils) {\n // eslint-disable-next-line @typescript-eslint/no-var-requires\n lazyTsUtils = require('@strapi/typescript-utils');\n }\n return lazyTsUtils as typeof import('@strapi/typescript-utils');\n};\n\nexport interface Payload {\n eventProperties?: Record<string, unknown>;\n userProperties?: Record<string, unknown>;\n groupProperties?: Record<string, unknown>;\n}\n\nexport type Sender = (\n event: string,\n payload?: Payload,\n opts?: Record<string, unknown>\n) => Promise<boolean>;\n\nconst defaultQueryOpts = {\n timeout: 1000,\n headers: { 'Content-Type': 'application/json' },\n};\n\n// Native fetch ignores `timeout`: it becomes a per-request AbortSignal and never reaches fetch\nconst { timeout, ...fetchDefaults } = defaultQueryOpts;\n\n/**\n * Add properties from the package.json strapi key in the metadata\n */\nconst addPackageJsonStrapiMetadata = (metadata: Record<string, unknown>, strapi: Core.Strapi) => {\n const { packageJsonStrapi = {} } = strapi.config;\n\n _.defaults(metadata, packageJsonStrapi);\n};\n\n/**\n * Create a send function for event with all the necessary metadata\n */\nexport default (strapi: Core.Strapi): Sender => {\n const { uuid, installId: installIdFromPackageJson } = strapi.config;\n\n const installId = generateInstallId(uuid, installIdFromPackageJson);\n\n const serverRootPath = strapi.dirs.app.root;\n const adminRootPath = path.join(strapi.dirs.app.root, 'src', 'admin');\n\n const anonymousUserProperties = {\n environment: strapi.config.environment,\n os: os.type(),\n osPlatform: os.platform(),\n osArch: os.arch(),\n osRelease: os.release(),\n nodeVersion: process.versions.node,\n };\n\n const anonymousGroupProperties = {\n docker: process.env.DOCKER || isDocker(),\n isCI: ciEnv.isCI,\n version: strapi.config.get('info.strapi'),\n useTypescriptOnServer: tsUtils().isUsingTypeScriptSync(serverRootPath),\n useTypescriptOnAdmin: tsUtils().isUsingTypeScriptSync(adminRootPath),\n projectId: uuid,\n isHostedOnStrapiCloud: env('STRAPI_HOSTING', null) === 'strapi.cloud',\n };\n\n addPackageJsonStrapiMetadata(anonymousGroupProperties, strapi);\n\n return async (event: string, payload: Payload = {}, opts = {}) => {\n const userId = generateAdminUserHash(strapi);\n\n const eeGroupProps: Record<string, unknown> = {};\n if (strapi.ee?.subscriptionId !== undefined && strapi.ee?.subscriptionId !== null) {\n eeGroupProps.subscriptionId = strapi.ee.subscriptionId;\n }\n if (strapi.ee?.planPriceId !== undefined && strapi.ee?.planPriceId !== null) {\n eeGroupProps.planPriceId = strapi.ee.planPriceId;\n }\n\n const reqParams = {\n method: 'POST',\n body: JSON.stringify({\n event,\n userId,\n installId,\n eventProperties: payload.eventProperties,\n userProperties: userId ? { ...anonymousUserProperties, ...payload.userProperties } : {},\n groupProperties: {\n ...anonymousGroupProperties,\n projectType: strapi.EE ? 'Enterprise' : 'Community',\n ...eeGroupProps,\n ...payload.groupProperties,\n },\n }),\n signal: AbortSignal.timeout(timeout),\n ..._.merge({ headers: { 'X-Strapi-Event': event } }, fetchDefaults, opts),\n };\n\n try {\n const analyticsUrl = env('STRAPI_ANALYTICS_URL', 'https://analytics.strapi.io');\n const res = await strapi.fetch(`${analyticsUrl}/api/v2/track`, reqParams);\n return res.ok;\n } catch {\n return false;\n }\n };\n};\n"],"names":["lazyTsUtils","tsUtils","require","defaultQueryOpts","timeout","headers","fetchDefaults","addPackageJsonStrapiMetadata","metadata","strapi","packageJsonStrapi","config","_","defaults","uuid","installId","installIdFromPackageJson","generateInstallId","serverRootPath","dirs","app","root","adminRootPath","path","join","anonymousUserProperties","environment","os","type","osPlatform","platform","osArch","arch","osRelease","release","nodeVersion","process","versions","node","anonymousGroupProperties","docker","env","DOCKER","isDocker","isCI","ciEnv","version","get","useTypescriptOnServer","isUsingTypeScriptSync","useTypescriptOnAdmin","projectId","isHostedOnStrapiCloud","event","payload","opts","userId","generateAdminUserHash","eeGroupProps","ee","subscriptionId","undefined","planPriceId","reqParams","method","body","JSON","stringify","eventProperties","userProperties","groupProperties","projectType","EE","signal","AbortSignal","merge","analyticsUrl","res","fetch","ok"],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  import type { Core } from '@strapi/types';
2
2
  export declare const createReloader: (strapi: Core.Strapi) => {
3
3
  (): void;
4
+ resumeWatching(): void;
4
5
  isReloading: boolean;
5
6
  isWatching: boolean;
6
7
  };
@@ -1 +1 @@
1
- {"version":3,"file":"reloader.d.ts","sourceRoot":"","sources":["../../src/services/reloader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAE1C,eAAO,MAAM,cAAc,GAAI,QAAQ,IAAI,CAAC,MAAM;;;;CAsCjD,CAAC"}
1
+ {"version":3,"file":"reloader.d.ts","sourceRoot":"","sources":["../../src/services/reloader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAE1C,eAAO,MAAM,cAAc,GAAI,QAAQ,IAAI,CAAC,MAAM;;;;;CA4CjD,CAAC"}
@@ -30,6 +30,11 @@ const createReloader = (strapi)=>{
30
30
  return state.isWatching;
31
31
  }
32
32
  });
33
+ // Turn watching back on without skipping the next reload.
34
+ // Use it when the write that turned watching off was refused, so no restart is pending.
35
+ reload.resumeWatching = ()=>{
36
+ state.isWatching = true;
37
+ };
33
38
  reload.isReloading = false;
34
39
  reload.isWatching = true;
35
40
  return reload;
@@ -1 +1 @@
1
- {"version":3,"file":"reloader.js","sources":["../../src/services/reloader.ts"],"sourcesContent":["import type { Core } from '@strapi/types';\n\nexport const createReloader = (strapi: Core.Strapi) => {\n const state = {\n shouldReload: 0,\n isWatching: true,\n };\n\n function reload() {\n if (state.shouldReload > 0) {\n // Reset the reloading state\n state.shouldReload -= 1;\n reload.isReloading = false;\n return;\n }\n\n if (strapi.config.get('autoReload')) {\n process.send?.('reload');\n }\n }\n\n Object.defineProperty(reload, 'isWatching', {\n configurable: true,\n enumerable: true,\n set(value) {\n // Special state when the reloader is disabled temporarly (see GraphQL plugin example).\n if (state.isWatching === false && value === true) {\n state.shouldReload += 1;\n }\n state.isWatching = value;\n },\n get() {\n return state.isWatching;\n },\n });\n\n reload.isReloading = false;\n reload.isWatching = true;\n\n return reload;\n};\n"],"names":["createReloader","strapi","state","shouldReload","isWatching","reload","isReloading","config","get","process","send","Object","defineProperty","configurable","enumerable","set","value"],"mappings":";;AAEO,MAAMA,iBAAiB,CAACC,MAAAA,GAAAA;AAC7B,IAAA,MAAMC,KAAAA,GAAQ;QACZC,YAAAA,EAAc,CAAA;QACdC,UAAAA,EAAY;AACd,KAAA;IAEA,SAASC,MAAAA,GAAAA;QACP,IAAIH,KAAAA,CAAMC,YAAY,GAAG,CAAA,EAAG;;AAE1BD,YAAAA,KAAAA,CAAMC,YAAY,IAAI,CAAA;AACtBE,YAAAA,MAAAA,CAAOC,WAAW,GAAG,KAAA;AACrB,YAAA;AACF,QAAA;AAEA,QAAA,IAAIL,MAAAA,CAAOM,MAAM,CAACC,GAAG,CAAC,YAAA,CAAA,EAAe;AACnCC,YAAAA,OAAAA,CAAQC,IAAI,GAAG,QAAA,CAAA;AACjB,QAAA;AACF,IAAA;IAEAC,MAAAA,CAAOC,cAAc,CAACP,MAAAA,EAAQ,YAAA,EAAc;QAC1CQ,YAAAA,EAAc,IAAA;QACdC,UAAAA,EAAY,IAAA;AACZC,QAAAA,GAAAA,CAAAA,CAAIC,KAAK,EAAA;;AAEP,YAAA,IAAId,KAAAA,CAAME,UAAU,KAAK,KAAA,IAASY,UAAU,IAAA,EAAM;AAChDd,gBAAAA,KAAAA,CAAMC,YAAY,IAAI,CAAA;AACxB,YAAA;AACAD,YAAAA,KAAAA,CAAME,UAAU,GAAGY,KAAAA;AACrB,QAAA,CAAA;AACAR,QAAAA,GAAAA,CAAAA,GAAAA;AACE,YAAA,OAAON,MAAME,UAAU;AACzB,QAAA;AACF,KAAA,CAAA;AAEAC,IAAAA,MAAAA,CAAOC,WAAW,GAAG,KAAA;AACrBD,IAAAA,MAAAA,CAAOD,UAAU,GAAG,IAAA;IAEpB,OAAOC,MAAAA;AACT;;;;"}
1
+ {"version":3,"file":"reloader.js","sources":["../../src/services/reloader.ts"],"sourcesContent":["import type { Core } from '@strapi/types';\n\nexport const createReloader = (strapi: Core.Strapi) => {\n const state = {\n shouldReload: 0,\n isWatching: true,\n };\n\n function reload() {\n if (state.shouldReload > 0) {\n // Reset the reloading state\n state.shouldReload -= 1;\n reload.isReloading = false;\n return;\n }\n\n if (strapi.config.get('autoReload')) {\n process.send?.('reload');\n }\n }\n\n Object.defineProperty(reload, 'isWatching', {\n configurable: true,\n enumerable: true,\n set(value) {\n // Special state when the reloader is disabled temporarly (see GraphQL plugin example).\n if (state.isWatching === false && value === true) {\n state.shouldReload += 1;\n }\n state.isWatching = value;\n },\n get() {\n return state.isWatching;\n },\n });\n\n // Turn watching back on without skipping the next reload.\n // Use it when the write that turned watching off was refused, so no restart is pending.\n reload.resumeWatching = () => {\n state.isWatching = true;\n };\n\n reload.isReloading = false;\n reload.isWatching = true;\n\n return reload;\n};\n"],"names":["createReloader","strapi","state","shouldReload","isWatching","reload","isReloading","config","get","process","send","Object","defineProperty","configurable","enumerable","set","value","resumeWatching"],"mappings":";;AAEO,MAAMA,iBAAiB,CAACC,MAAAA,GAAAA;AAC7B,IAAA,MAAMC,KAAAA,GAAQ;QACZC,YAAAA,EAAc,CAAA;QACdC,UAAAA,EAAY;AACd,KAAA;IAEA,SAASC,MAAAA,GAAAA;QACP,IAAIH,KAAAA,CAAMC,YAAY,GAAG,CAAA,EAAG;;AAE1BD,YAAAA,KAAAA,CAAMC,YAAY,IAAI,CAAA;AACtBE,YAAAA,MAAAA,CAAOC,WAAW,GAAG,KAAA;AACrB,YAAA;AACF,QAAA;AAEA,QAAA,IAAIL,MAAAA,CAAOM,MAAM,CAACC,GAAG,CAAC,YAAA,CAAA,EAAe;AACnCC,YAAAA,OAAAA,CAAQC,IAAI,GAAG,QAAA,CAAA;AACjB,QAAA;AACF,IAAA;IAEAC,MAAAA,CAAOC,cAAc,CAACP,MAAAA,EAAQ,YAAA,EAAc;QAC1CQ,YAAAA,EAAc,IAAA;QACdC,UAAAA,EAAY,IAAA;AACZC,QAAAA,GAAAA,CAAAA,CAAIC,KAAK,EAAA;;AAEP,YAAA,IAAId,KAAAA,CAAME,UAAU,KAAK,KAAA,IAASY,UAAU,IAAA,EAAM;AAChDd,gBAAAA,KAAAA,CAAMC,YAAY,IAAI,CAAA;AACxB,YAAA;AACAD,YAAAA,KAAAA,CAAME,UAAU,GAAGY,KAAAA;AACrB,QAAA,CAAA;AACAR,QAAAA,GAAAA,CAAAA,GAAAA;AACE,YAAA,OAAON,MAAME,UAAU;AACzB,QAAA;AACF,KAAA,CAAA;;;AAIAC,IAAAA,MAAAA,CAAOY,cAAc,GAAG,IAAA;AACtBf,QAAAA,KAAAA,CAAME,UAAU,GAAG,IAAA;AACrB,IAAA,CAAA;AAEAC,IAAAA,MAAAA,CAAOC,WAAW,GAAG,KAAA;AACrBD,IAAAA,MAAAA,CAAOD,UAAU,GAAG,IAAA;IAEpB,OAAOC,MAAAA;AACT;;;;"}
@@ -28,6 +28,11 @@ const createReloader = (strapi)=>{
28
28
  return state.isWatching;
29
29
  }
30
30
  });
31
+ // Turn watching back on without skipping the next reload.
32
+ // Use it when the write that turned watching off was refused, so no restart is pending.
33
+ reload.resumeWatching = ()=>{
34
+ state.isWatching = true;
35
+ };
31
36
  reload.isReloading = false;
32
37
  reload.isWatching = true;
33
38
  return reload;
@@ -1 +1 @@
1
- {"version":3,"file":"reloader.mjs","sources":["../../src/services/reloader.ts"],"sourcesContent":["import type { Core } from '@strapi/types';\n\nexport const createReloader = (strapi: Core.Strapi) => {\n const state = {\n shouldReload: 0,\n isWatching: true,\n };\n\n function reload() {\n if (state.shouldReload > 0) {\n // Reset the reloading state\n state.shouldReload -= 1;\n reload.isReloading = false;\n return;\n }\n\n if (strapi.config.get('autoReload')) {\n process.send?.('reload');\n }\n }\n\n Object.defineProperty(reload, 'isWatching', {\n configurable: true,\n enumerable: true,\n set(value) {\n // Special state when the reloader is disabled temporarly (see GraphQL plugin example).\n if (state.isWatching === false && value === true) {\n state.shouldReload += 1;\n }\n state.isWatching = value;\n },\n get() {\n return state.isWatching;\n },\n });\n\n reload.isReloading = false;\n reload.isWatching = true;\n\n return reload;\n};\n"],"names":["createReloader","strapi","state","shouldReload","isWatching","reload","isReloading","config","get","process","send","Object","defineProperty","configurable","enumerable","set","value"],"mappings":"AAEO,MAAMA,iBAAiB,CAACC,MAAAA,GAAAA;AAC7B,IAAA,MAAMC,KAAAA,GAAQ;QACZC,YAAAA,EAAc,CAAA;QACdC,UAAAA,EAAY;AACd,KAAA;IAEA,SAASC,MAAAA,GAAAA;QACP,IAAIH,KAAAA,CAAMC,YAAY,GAAG,CAAA,EAAG;;AAE1BD,YAAAA,KAAAA,CAAMC,YAAY,IAAI,CAAA;AACtBE,YAAAA,MAAAA,CAAOC,WAAW,GAAG,KAAA;AACrB,YAAA;AACF,QAAA;AAEA,QAAA,IAAIL,MAAAA,CAAOM,MAAM,CAACC,GAAG,CAAC,YAAA,CAAA,EAAe;AACnCC,YAAAA,OAAAA,CAAQC,IAAI,GAAG,QAAA,CAAA;AACjB,QAAA;AACF,IAAA;IAEAC,MAAAA,CAAOC,cAAc,CAACP,MAAAA,EAAQ,YAAA,EAAc;QAC1CQ,YAAAA,EAAc,IAAA;QACdC,UAAAA,EAAY,IAAA;AACZC,QAAAA,GAAAA,CAAAA,CAAIC,KAAK,EAAA;;AAEP,YAAA,IAAId,KAAAA,CAAME,UAAU,KAAK,KAAA,IAASY,UAAU,IAAA,EAAM;AAChDd,gBAAAA,KAAAA,CAAMC,YAAY,IAAI,CAAA;AACxB,YAAA;AACAD,YAAAA,KAAAA,CAAME,UAAU,GAAGY,KAAAA;AACrB,QAAA,CAAA;AACAR,QAAAA,GAAAA,CAAAA,GAAAA;AACE,YAAA,OAAON,MAAME,UAAU;AACzB,QAAA;AACF,KAAA,CAAA;AAEAC,IAAAA,MAAAA,CAAOC,WAAW,GAAG,KAAA;AACrBD,IAAAA,MAAAA,CAAOD,UAAU,GAAG,IAAA;IAEpB,OAAOC,MAAAA;AACT;;;;"}
1
+ {"version":3,"file":"reloader.mjs","sources":["../../src/services/reloader.ts"],"sourcesContent":["import type { Core } from '@strapi/types';\n\nexport const createReloader = (strapi: Core.Strapi) => {\n const state = {\n shouldReload: 0,\n isWatching: true,\n };\n\n function reload() {\n if (state.shouldReload > 0) {\n // Reset the reloading state\n state.shouldReload -= 1;\n reload.isReloading = false;\n return;\n }\n\n if (strapi.config.get('autoReload')) {\n process.send?.('reload');\n }\n }\n\n Object.defineProperty(reload, 'isWatching', {\n configurable: true,\n enumerable: true,\n set(value) {\n // Special state when the reloader is disabled temporarly (see GraphQL plugin example).\n if (state.isWatching === false && value === true) {\n state.shouldReload += 1;\n }\n state.isWatching = value;\n },\n get() {\n return state.isWatching;\n },\n });\n\n // Turn watching back on without skipping the next reload.\n // Use it when the write that turned watching off was refused, so no restart is pending.\n reload.resumeWatching = () => {\n state.isWatching = true;\n };\n\n reload.isReloading = false;\n reload.isWatching = true;\n\n return reload;\n};\n"],"names":["createReloader","strapi","state","shouldReload","isWatching","reload","isReloading","config","get","process","send","Object","defineProperty","configurable","enumerable","set","value","resumeWatching"],"mappings":"AAEO,MAAMA,iBAAiB,CAACC,MAAAA,GAAAA;AAC7B,IAAA,MAAMC,KAAAA,GAAQ;QACZC,YAAAA,EAAc,CAAA;QACdC,UAAAA,EAAY;AACd,KAAA;IAEA,SAASC,MAAAA,GAAAA;QACP,IAAIH,KAAAA,CAAMC,YAAY,GAAG,CAAA,EAAG;;AAE1BD,YAAAA,KAAAA,CAAMC,YAAY,IAAI,CAAA;AACtBE,YAAAA,MAAAA,CAAOC,WAAW,GAAG,KAAA;AACrB,YAAA;AACF,QAAA;AAEA,QAAA,IAAIL,MAAAA,CAAOM,MAAM,CAACC,GAAG,CAAC,YAAA,CAAA,EAAe;AACnCC,YAAAA,OAAAA,CAAQC,IAAI,GAAG,QAAA,CAAA;AACjB,QAAA;AACF,IAAA;IAEAC,MAAAA,CAAOC,cAAc,CAACP,MAAAA,EAAQ,YAAA,EAAc;QAC1CQ,YAAAA,EAAc,IAAA;QACdC,UAAAA,EAAY,IAAA;AACZC,QAAAA,GAAAA,CAAAA,CAAIC,KAAK,EAAA;;AAEP,YAAA,IAAId,KAAAA,CAAME,UAAU,KAAK,KAAA,IAASY,UAAU,IAAA,EAAM;AAChDd,gBAAAA,KAAAA,CAAMC,YAAY,IAAI,CAAA;AACxB,YAAA;AACAD,YAAAA,KAAAA,CAAME,UAAU,GAAGY,KAAAA;AACrB,QAAA,CAAA;AACAR,QAAAA,GAAAA,CAAAA,GAAAA;AACE,YAAA,OAAON,MAAME,UAAU;AACzB,QAAA;AACF,KAAA,CAAA;;;AAIAC,IAAAA,MAAAA,CAAOY,cAAc,GAAG,IAAA;AACtBf,QAAAA,KAAAA,CAAME,UAAU,GAAG,IAAA;AACrB,IAAA,CAAA;AAEAC,IAAAA,MAAAA,CAAOC,WAAW,GAAG,KAAA;AACrBD,IAAAA,MAAAA,CAAOD,UAAU,GAAG,IAAA;IAEpB,OAAOC,MAAAA;AACT;;;;"}
@@ -1 +1 @@
1
- {"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/services/server/middleware.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAiB1C,QAAA,MAAM,uBAAuB,GAAI,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,IAAI,CAAC,MAAM,6BAUtE,CAAC;AAIF;;GAEG;AACH,QAAA,MAAM,kBAAkB,GACtB,QAAQ,KAAK,CAAC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,EACnF,QAAQ,IAAI,CAAC,MAAM;UAGX,MAAM,GAAG,IAAI;aACV,IAAI,CAAC,iBAAiB;GA+DlC,CAAC;AAyBF,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,CAAC"}
1
+ {"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/services/server/middleware.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAyB1C,QAAA,MAAM,uBAAuB,GAAI,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,IAAI,CAAC,MAAM,6BAUtE,CAAC;AAIF;;GAEG;AACH,QAAA,MAAM,kBAAkB,GACtB,QAAQ,KAAK,CAAC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,EACnF,QAAQ,IAAI,CAAC,MAAM;UAGX,MAAM,GAAG,IAAI;aACV,IAAI,CAAC,iBAAiB;GAoElC,CAAC;AAyBF,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,CAAC"}
@@ -7,7 +7,13 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
7
7
 
8
8
  var path__default = /*#__PURE__*/_interopDefault(path);
9
9
 
10
- const instantiateMiddleware = (middlewareFactory, name, config, strapi)=>{
10
+ const instantiateMiddleware = (middlewareFactory, name, config, strapi, file)=>{
11
+ // A module without a default export (e.g. an ESM `.js` file with only named exports, loaded
12
+ // through Node's `require(esm)`) is registered as its namespace object, not as a factory
13
+ if (typeof middlewareFactory !== 'function') {
14
+ const location = file === undefined ? '' : ` in ${file}`;
15
+ throw new Error(`Middleware "${name}" is not a function (no default export?)${location}`);
16
+ }
11
17
  try {
12
18
  return middlewareFactory(config, {
13
19
  strapi
@@ -54,6 +60,9 @@ const dummyMiddleware = (_, next)=>next();
54
60
  const { name, resolve, config = {} } = item;
55
61
  if (name) {
56
62
  const middlewareFactory = strapi.middleware(name);
63
+ if (middlewareFactory === undefined) {
64
+ throw new Error(`Middleware ${name} not found.`);
65
+ }
57
66
  middlewares.push({
58
67
  name,
59
68
  handler: instantiateMiddleware(middlewareFactory, name, config, strapi) ?? dummyMiddleware
@@ -61,10 +70,10 @@ const dummyMiddleware = (_, next)=>next();
61
70
  continue;
62
71
  }
63
72
  if (resolve) {
64
- const resolvedMiddlewareFactory = resolveCustomMiddleware(resolve, strapi);
73
+ const { modulePath, middlewareFactory } = resolveCustomMiddleware(resolve, strapi);
65
74
  middlewares.push({
66
75
  name: resolve,
67
- handler: instantiateMiddleware(resolvedMiddlewareFactory, resolve, config, strapi) ?? dummyMiddleware
76
+ handler: instantiateMiddleware(middlewareFactory, resolve, config, strapi, modulePath) ?? dummyMiddleware
68
77
  });
69
78
  continue;
70
79
  }
@@ -88,7 +97,10 @@ const dummyMiddleware = (_, next)=>next();
88
97
  }
89
98
  }
90
99
  try {
91
- return strapiUtils.importDefault(modulePath);
100
+ return {
101
+ modulePath,
102
+ middlewareFactory: strapiUtils.importDefault(modulePath)
103
+ };
92
104
  } catch {
93
105
  throw new Error(`Could not load middleware "${modulePath}".`);
94
106
  }
@@ -1 +1 @@
1
- {"version":3,"file":"middleware.js","sources":["../../../src/services/server/middleware.ts"],"sourcesContent":["import path from 'path';\nimport { importDefault } from '@strapi/utils';\nimport type { Core } from '@strapi/types';\n\nconst instantiateMiddleware = (\n middlewareFactory: Core.MiddlewareFactory,\n name: string,\n config: unknown,\n strapi: Core.Strapi\n) => {\n try {\n return middlewareFactory(config, { strapi });\n } catch (e) {\n if (e instanceof Error) {\n throw new Error(`Middleware \"${name}\": ${e.message}`);\n }\n }\n};\n\nconst resolveRouteMiddlewares = (route: Core.Route, strapi: Core.Strapi) => {\n const middlewaresConfig = route?.config?.middlewares ?? [];\n\n if (!Array.isArray(middlewaresConfig)) {\n throw new Error('Route middlewares config must be an array');\n }\n\n const middlewares = resolveMiddlewares(middlewaresConfig, strapi);\n\n return middlewares.map(({ handler }) => handler);\n};\n\nconst dummyMiddleware: Core.MiddlewareHandler = (_, next) => next();\n\n/**\n * Initialize every configured middlewares\n */\nconst resolveMiddlewares = (\n config: Array<Core.MiddlewareName | Core.MiddlewareConfig | Core.MiddlewareHandler>,\n strapi: Core.Strapi\n) => {\n const middlewares: {\n name: string | null;\n handler: Core.MiddlewareHandler;\n }[] = [];\n\n for (const item of config) {\n if (typeof item === 'function') {\n middlewares.push({\n name: null,\n handler: item,\n });\n\n continue;\n }\n\n if (typeof item === 'string') {\n const middlewareFactory = strapi.middleware(item);\n\n if (!middlewareFactory) {\n throw new Error(`Middleware ${item} not found.`);\n }\n\n middlewares.push({\n name: item,\n handler: instantiateMiddleware(middlewareFactory, item, {}, strapi) ?? dummyMiddleware,\n });\n\n continue;\n }\n\n if (typeof item === 'object' && item !== null) {\n const { name, resolve, config = {} } = item;\n\n if (name) {\n const middlewareFactory = strapi.middleware(name);\n middlewares.push({\n name,\n handler:\n instantiateMiddleware(middlewareFactory, name, config, strapi) ?? dummyMiddleware,\n });\n\n continue;\n }\n\n if (resolve) {\n const resolvedMiddlewareFactory = resolveCustomMiddleware(resolve, strapi);\n middlewares.push({\n name: resolve,\n handler:\n instantiateMiddleware(resolvedMiddlewareFactory, resolve, config, strapi) ??\n dummyMiddleware,\n });\n\n continue;\n }\n\n throw new Error('Invalid middleware configuration. Missing name or resolve properties.');\n }\n\n throw new Error(\n 'Middleware config must either be a string or an object {name?: string, resolve?: string, config: any}.'\n );\n }\n\n return middlewares;\n};\n\n/**\n * Resolve middleware from package name or path\n */\nconst resolveCustomMiddleware = (resolve: string, strapi: Core.Strapi) => {\n let modulePath;\n\n try {\n modulePath = require.resolve(resolve);\n } catch (error) {\n if (error instanceof Error && 'code' in error && error.code === 'MODULE_NOT_FOUND') {\n modulePath = path.resolve(strapi.dirs.dist.root, resolve);\n } else {\n throw error;\n }\n }\n\n try {\n return importDefault(modulePath);\n } catch {\n throw new Error(`Could not load middleware \"${modulePath}\".`);\n }\n};\n\nexport { resolveRouteMiddlewares, resolveMiddlewares };\n"],"names":["instantiateMiddleware","middlewareFactory","name","config","strapi","e","Error","message","resolveRouteMiddlewares","route","middlewaresConfig","middlewares","Array","isArray","resolveMiddlewares","map","handler","dummyMiddleware","_","next","item","push","middleware","resolve","resolvedMiddlewareFactory","resolveCustomMiddleware","modulePath","require","error","code","path","dirs","dist","root","importDefault"],"mappings":"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"}
1
+ {"version":3,"file":"middleware.js","sources":["../../../src/services/server/middleware.ts"],"sourcesContent":["import path from 'path';\nimport { importDefault } from '@strapi/utils';\nimport type { Core } from '@strapi/types';\n\nconst instantiateMiddleware = (\n middlewareFactory: Core.MiddlewareFactory,\n name: string,\n config: unknown,\n strapi: Core.Strapi,\n file?: string\n) => {\n // A module without a default export (e.g. an ESM `.js` file with only named exports, loaded\n // through Node's `require(esm)`) is registered as its namespace object, not as a factory\n if (typeof middlewareFactory !== 'function') {\n const location = file === undefined ? '' : ` in ${file}`;\n throw new Error(`Middleware \"${name}\" is not a function (no default export?)${location}`);\n }\n\n try {\n return middlewareFactory(config, { strapi });\n } catch (e) {\n if (e instanceof Error) {\n throw new Error(`Middleware \"${name}\": ${e.message}`);\n }\n }\n};\n\nconst resolveRouteMiddlewares = (route: Core.Route, strapi: Core.Strapi) => {\n const middlewaresConfig = route?.config?.middlewares ?? [];\n\n if (!Array.isArray(middlewaresConfig)) {\n throw new Error('Route middlewares config must be an array');\n }\n\n const middlewares = resolveMiddlewares(middlewaresConfig, strapi);\n\n return middlewares.map(({ handler }) => handler);\n};\n\nconst dummyMiddleware: Core.MiddlewareHandler = (_, next) => next();\n\n/**\n * Initialize every configured middlewares\n */\nconst resolveMiddlewares = (\n config: Array<Core.MiddlewareName | Core.MiddlewareConfig | Core.MiddlewareHandler>,\n strapi: Core.Strapi\n) => {\n const middlewares: {\n name: string | null;\n handler: Core.MiddlewareHandler;\n }[] = [];\n\n for (const item of config) {\n if (typeof item === 'function') {\n middlewares.push({\n name: null,\n handler: item,\n });\n\n continue;\n }\n\n if (typeof item === 'string') {\n const middlewareFactory = strapi.middleware(item);\n\n if (!middlewareFactory) {\n throw new Error(`Middleware ${item} not found.`);\n }\n\n middlewares.push({\n name: item,\n handler: instantiateMiddleware(middlewareFactory, item, {}, strapi) ?? dummyMiddleware,\n });\n\n continue;\n }\n\n if (typeof item === 'object' && item !== null) {\n const { name, resolve, config = {} } = item;\n\n if (name) {\n const middlewareFactory = strapi.middleware(name);\n\n if (middlewareFactory === undefined) {\n throw new Error(`Middleware ${name} not found.`);\n }\n\n middlewares.push({\n name,\n handler:\n instantiateMiddleware(middlewareFactory, name, config, strapi) ?? dummyMiddleware,\n });\n\n continue;\n }\n\n if (resolve) {\n const { modulePath, middlewareFactory } = resolveCustomMiddleware(resolve, strapi);\n middlewares.push({\n name: resolve,\n handler:\n instantiateMiddleware(middlewareFactory, resolve, config, strapi, modulePath) ??\n dummyMiddleware,\n });\n\n continue;\n }\n\n throw new Error('Invalid middleware configuration. Missing name or resolve properties.');\n }\n\n throw new Error(\n 'Middleware config must either be a string or an object {name?: string, resolve?: string, config: any}.'\n );\n }\n\n return middlewares;\n};\n\n/**\n * Resolve middleware from package name or path\n */\nconst resolveCustomMiddleware = (resolve: string, strapi: Core.Strapi) => {\n let modulePath;\n\n try {\n modulePath = require.resolve(resolve);\n } catch (error) {\n if (error instanceof Error && 'code' in error && error.code === 'MODULE_NOT_FOUND') {\n modulePath = path.resolve(strapi.dirs.dist.root, resolve);\n } else {\n throw error;\n }\n }\n\n try {\n return { modulePath, middlewareFactory: importDefault(modulePath) };\n } catch {\n throw new Error(`Could not load middleware \"${modulePath}\".`);\n }\n};\n\nexport { resolveRouteMiddlewares, resolveMiddlewares };\n"],"names":["instantiateMiddleware","middlewareFactory","name","config","strapi","file","location","undefined","Error","e","message","resolveRouteMiddlewares","route","middlewaresConfig","middlewares","Array","isArray","resolveMiddlewares","map","handler","dummyMiddleware","_","next","item","push","middleware","resolve","modulePath","resolveCustomMiddleware","require","error","code","path","dirs","dist","root","importDefault"],"mappings":"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"}
@@ -1,7 +1,13 @@
1
1
  import path from 'path';
2
2
  import { importDefault } from '@strapi/utils';
3
3
 
4
- const instantiateMiddleware = (middlewareFactory, name, config, strapi)=>{
4
+ const instantiateMiddleware = (middlewareFactory, name, config, strapi, file)=>{
5
+ // A module without a default export (e.g. an ESM `.js` file with only named exports, loaded
6
+ // through Node's `require(esm)`) is registered as its namespace object, not as a factory
7
+ if (typeof middlewareFactory !== 'function') {
8
+ const location = file === undefined ? '' : ` in ${file}`;
9
+ throw new Error(`Middleware "${name}" is not a function (no default export?)${location}`);
10
+ }
5
11
  try {
6
12
  return middlewareFactory(config, {
7
13
  strapi
@@ -48,6 +54,9 @@ const dummyMiddleware = (_, next)=>next();
48
54
  const { name, resolve, config = {} } = item;
49
55
  if (name) {
50
56
  const middlewareFactory = strapi.middleware(name);
57
+ if (middlewareFactory === undefined) {
58
+ throw new Error(`Middleware ${name} not found.`);
59
+ }
51
60
  middlewares.push({
52
61
  name,
53
62
  handler: instantiateMiddleware(middlewareFactory, name, config, strapi) ?? dummyMiddleware
@@ -55,10 +64,10 @@ const dummyMiddleware = (_, next)=>next();
55
64
  continue;
56
65
  }
57
66
  if (resolve) {
58
- const resolvedMiddlewareFactory = resolveCustomMiddleware(resolve, strapi);
67
+ const { modulePath, middlewareFactory } = resolveCustomMiddleware(resolve, strapi);
59
68
  middlewares.push({
60
69
  name: resolve,
61
- handler: instantiateMiddleware(resolvedMiddlewareFactory, resolve, config, strapi) ?? dummyMiddleware
70
+ handler: instantiateMiddleware(middlewareFactory, resolve, config, strapi, modulePath) ?? dummyMiddleware
62
71
  });
63
72
  continue;
64
73
  }
@@ -82,7 +91,10 @@ const dummyMiddleware = (_, next)=>next();
82
91
  }
83
92
  }
84
93
  try {
85
- return importDefault(modulePath);
94
+ return {
95
+ modulePath,
96
+ middlewareFactory: importDefault(modulePath)
97
+ };
86
98
  } catch {
87
99
  throw new Error(`Could not load middleware "${modulePath}".`);
88
100
  }
@@ -1 +1 @@
1
- {"version":3,"file":"middleware.mjs","sources":["../../../src/services/server/middleware.ts"],"sourcesContent":["import path from 'path';\nimport { importDefault } from '@strapi/utils';\nimport type { Core } from '@strapi/types';\n\nconst instantiateMiddleware = (\n middlewareFactory: Core.MiddlewareFactory,\n name: string,\n config: unknown,\n strapi: Core.Strapi\n) => {\n try {\n return middlewareFactory(config, { strapi });\n } catch (e) {\n if (e instanceof Error) {\n throw new Error(`Middleware \"${name}\": ${e.message}`);\n }\n }\n};\n\nconst resolveRouteMiddlewares = (route: Core.Route, strapi: Core.Strapi) => {\n const middlewaresConfig = route?.config?.middlewares ?? [];\n\n if (!Array.isArray(middlewaresConfig)) {\n throw new Error('Route middlewares config must be an array');\n }\n\n const middlewares = resolveMiddlewares(middlewaresConfig, strapi);\n\n return middlewares.map(({ handler }) => handler);\n};\n\nconst dummyMiddleware: Core.MiddlewareHandler = (_, next) => next();\n\n/**\n * Initialize every configured middlewares\n */\nconst resolveMiddlewares = (\n config: Array<Core.MiddlewareName | Core.MiddlewareConfig | Core.MiddlewareHandler>,\n strapi: Core.Strapi\n) => {\n const middlewares: {\n name: string | null;\n handler: Core.MiddlewareHandler;\n }[] = [];\n\n for (const item of config) {\n if (typeof item === 'function') {\n middlewares.push({\n name: null,\n handler: item,\n });\n\n continue;\n }\n\n if (typeof item === 'string') {\n const middlewareFactory = strapi.middleware(item);\n\n if (!middlewareFactory) {\n throw new Error(`Middleware ${item} not found.`);\n }\n\n middlewares.push({\n name: item,\n handler: instantiateMiddleware(middlewareFactory, item, {}, strapi) ?? dummyMiddleware,\n });\n\n continue;\n }\n\n if (typeof item === 'object' && item !== null) {\n const { name, resolve, config = {} } = item;\n\n if (name) {\n const middlewareFactory = strapi.middleware(name);\n middlewares.push({\n name,\n handler:\n instantiateMiddleware(middlewareFactory, name, config, strapi) ?? dummyMiddleware,\n });\n\n continue;\n }\n\n if (resolve) {\n const resolvedMiddlewareFactory = resolveCustomMiddleware(resolve, strapi);\n middlewares.push({\n name: resolve,\n handler:\n instantiateMiddleware(resolvedMiddlewareFactory, resolve, config, strapi) ??\n dummyMiddleware,\n });\n\n continue;\n }\n\n throw new Error('Invalid middleware configuration. Missing name or resolve properties.');\n }\n\n throw new Error(\n 'Middleware config must either be a string or an object {name?: string, resolve?: string, config: any}.'\n );\n }\n\n return middlewares;\n};\n\n/**\n * Resolve middleware from package name or path\n */\nconst resolveCustomMiddleware = (resolve: string, strapi: Core.Strapi) => {\n let modulePath;\n\n try {\n modulePath = require.resolve(resolve);\n } catch (error) {\n if (error instanceof Error && 'code' in error && error.code === 'MODULE_NOT_FOUND') {\n modulePath = path.resolve(strapi.dirs.dist.root, resolve);\n } else {\n throw error;\n }\n }\n\n try {\n return importDefault(modulePath);\n } catch {\n throw new Error(`Could not load middleware \"${modulePath}\".`);\n }\n};\n\nexport { resolveRouteMiddlewares, resolveMiddlewares };\n"],"names":["instantiateMiddleware","middlewareFactory","name","config","strapi","e","Error","message","resolveRouteMiddlewares","route","middlewaresConfig","middlewares","Array","isArray","resolveMiddlewares","map","handler","dummyMiddleware","_","next","item","push","middleware","resolve","resolvedMiddlewareFactory","resolveCustomMiddleware","modulePath","require","error","code","path","dirs","dist","root","importDefault"],"mappings":"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"}
1
+ {"version":3,"file":"middleware.mjs","sources":["../../../src/services/server/middleware.ts"],"sourcesContent":["import path from 'path';\nimport { importDefault } from '@strapi/utils';\nimport type { Core } from '@strapi/types';\n\nconst instantiateMiddleware = (\n middlewareFactory: Core.MiddlewareFactory,\n name: string,\n config: unknown,\n strapi: Core.Strapi,\n file?: string\n) => {\n // A module without a default export (e.g. an ESM `.js` file with only named exports, loaded\n // through Node's `require(esm)`) is registered as its namespace object, not as a factory\n if (typeof middlewareFactory !== 'function') {\n const location = file === undefined ? '' : ` in ${file}`;\n throw new Error(`Middleware \"${name}\" is not a function (no default export?)${location}`);\n }\n\n try {\n return middlewareFactory(config, { strapi });\n } catch (e) {\n if (e instanceof Error) {\n throw new Error(`Middleware \"${name}\": ${e.message}`);\n }\n }\n};\n\nconst resolveRouteMiddlewares = (route: Core.Route, strapi: Core.Strapi) => {\n const middlewaresConfig = route?.config?.middlewares ?? [];\n\n if (!Array.isArray(middlewaresConfig)) {\n throw new Error('Route middlewares config must be an array');\n }\n\n const middlewares = resolveMiddlewares(middlewaresConfig, strapi);\n\n return middlewares.map(({ handler }) => handler);\n};\n\nconst dummyMiddleware: Core.MiddlewareHandler = (_, next) => next();\n\n/**\n * Initialize every configured middlewares\n */\nconst resolveMiddlewares = (\n config: Array<Core.MiddlewareName | Core.MiddlewareConfig | Core.MiddlewareHandler>,\n strapi: Core.Strapi\n) => {\n const middlewares: {\n name: string | null;\n handler: Core.MiddlewareHandler;\n }[] = [];\n\n for (const item of config) {\n if (typeof item === 'function') {\n middlewares.push({\n name: null,\n handler: item,\n });\n\n continue;\n }\n\n if (typeof item === 'string') {\n const middlewareFactory = strapi.middleware(item);\n\n if (!middlewareFactory) {\n throw new Error(`Middleware ${item} not found.`);\n }\n\n middlewares.push({\n name: item,\n handler: instantiateMiddleware(middlewareFactory, item, {}, strapi) ?? dummyMiddleware,\n });\n\n continue;\n }\n\n if (typeof item === 'object' && item !== null) {\n const { name, resolve, config = {} } = item;\n\n if (name) {\n const middlewareFactory = strapi.middleware(name);\n\n if (middlewareFactory === undefined) {\n throw new Error(`Middleware ${name} not found.`);\n }\n\n middlewares.push({\n name,\n handler:\n instantiateMiddleware(middlewareFactory, name, config, strapi) ?? dummyMiddleware,\n });\n\n continue;\n }\n\n if (resolve) {\n const { modulePath, middlewareFactory } = resolveCustomMiddleware(resolve, strapi);\n middlewares.push({\n name: resolve,\n handler:\n instantiateMiddleware(middlewareFactory, resolve, config, strapi, modulePath) ??\n dummyMiddleware,\n });\n\n continue;\n }\n\n throw new Error('Invalid middleware configuration. Missing name or resolve properties.');\n }\n\n throw new Error(\n 'Middleware config must either be a string or an object {name?: string, resolve?: string, config: any}.'\n );\n }\n\n return middlewares;\n};\n\n/**\n * Resolve middleware from package name or path\n */\nconst resolveCustomMiddleware = (resolve: string, strapi: Core.Strapi) => {\n let modulePath;\n\n try {\n modulePath = require.resolve(resolve);\n } catch (error) {\n if (error instanceof Error && 'code' in error && error.code === 'MODULE_NOT_FOUND') {\n modulePath = path.resolve(strapi.dirs.dist.root, resolve);\n } else {\n throw error;\n }\n }\n\n try {\n return { modulePath, middlewareFactory: importDefault(modulePath) };\n } catch {\n throw new Error(`Could not load middleware \"${modulePath}\".`);\n }\n};\n\nexport { resolveRouteMiddlewares, resolveMiddlewares };\n"],"names":["instantiateMiddleware","middlewareFactory","name","config","strapi","file","location","undefined","Error","e","message","resolveRouteMiddlewares","route","middlewaresConfig","middlewares","Array","isArray","resolveMiddlewares","map","handler","dummyMiddleware","_","next","item","push","middleware","resolve","modulePath","resolveCustomMiddleware","require","error","code","path","dirs","dist","root","importDefault"],"mappings":"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"}
@@ -0,0 +1,11 @@
1
+ import { errors as databaseErrors } from '@strapi/database';
2
+ /**
3
+ * Database errors raised when a value cannot be converted to the column type
4
+ * (e.g. a filter `filters[flag][$eq]=no` on a boolean). They are caused by the
5
+ * request input, so they are answered with a 400 ValidationError instead of a 500.
6
+ * Every other DatabaseError stays an internal error.
7
+ */
8
+ declare const databaseInputErrors: (typeof databaseErrors.InvalidTimeError)[];
9
+ declare const isDatabaseInputError: (error: unknown) => error is InstanceType<typeof databaseErrors.DatabaseError>;
10
+ export { databaseInputErrors, isDatabaseInputError };
11
+ //# sourceMappingURL=database-input-errors.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"database-input-errors.d.ts","sourceRoot":"","sources":["../../src/utils/database-input-errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE5D;;;;;GAKG;AACH,QAAA,MAAM,mBAAmB,4CAMxB,CAAC;AAEF,QAAA,MAAM,oBAAoB,GACxB,OAAO,OAAO,KACb,KAAK,IAAI,YAAY,CAAC,OAAO,cAAc,CAAC,aAAa,CAE3D,CAAC;AAEF,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,CAAC"}
@@ -0,0 +1,23 @@
1
+ 'use strict';
2
+
3
+ var database = require('@strapi/database');
4
+
5
+ /**
6
+ * Database errors raised when a value cannot be converted to the column type
7
+ * (e.g. a filter `filters[flag][$eq]=no` on a boolean). They are caused by the
8
+ * request input, so they are answered with a 400 ValidationError instead of a 500.
9
+ * Every other DatabaseError stays an internal error.
10
+ */ const databaseInputErrors = [
11
+ database.errors.InvalidTimeError,
12
+ database.errors.InvalidDateTimeError,
13
+ database.errors.InvalidDateError,
14
+ database.errors.InvalidRelationError,
15
+ database.errors.InvalidBooleanError
16
+ ];
17
+ const isDatabaseInputError = (error)=>{
18
+ return databaseInputErrors.some((errorClass)=>error instanceof errorClass);
19
+ };
20
+
21
+ exports.databaseInputErrors = databaseInputErrors;
22
+ exports.isDatabaseInputError = isDatabaseInputError;
23
+ //# sourceMappingURL=database-input-errors.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"database-input-errors.js","sources":["../../src/utils/database-input-errors.ts"],"sourcesContent":["import { errors as databaseErrors } from '@strapi/database';\n\n/**\n * Database errors raised when a value cannot be converted to the column type\n * (e.g. a filter `filters[flag][$eq]=no` on a boolean). They are caused by the\n * request input, so they are answered with a 400 ValidationError instead of a 500.\n * Every other DatabaseError stays an internal error.\n */\nconst databaseInputErrors = [\n databaseErrors.InvalidTimeError,\n databaseErrors.InvalidDateTimeError,\n databaseErrors.InvalidDateError,\n databaseErrors.InvalidRelationError,\n databaseErrors.InvalidBooleanError,\n];\n\nconst isDatabaseInputError = (\n error: unknown\n): error is InstanceType<typeof databaseErrors.DatabaseError> => {\n return databaseInputErrors.some((errorClass) => error instanceof errorClass);\n};\n\nexport { databaseInputErrors, isDatabaseInputError };\n"],"names":["databaseInputErrors","databaseErrors","InvalidTimeError","InvalidDateTimeError","InvalidDateError","InvalidRelationError","InvalidBooleanError","isDatabaseInputError","error","some","errorClass"],"mappings":";;;;AAEA;;;;;AAKC,UACKA,mBAAAA,GAAsB;AAC1BC,IAAAA,eAAAA,CAAeC,gBAAgB;AAC/BD,IAAAA,eAAAA,CAAeE,oBAAoB;AACnCF,IAAAA,eAAAA,CAAeG,gBAAgB;AAC/BH,IAAAA,eAAAA,CAAeI,oBAAoB;AACnCJ,IAAAA,eAAAA,CAAeK;AAChB;AAED,MAAMC,uBAAuB,CAC3BC,KAAAA,GAAAA;AAEA,IAAA,OAAOR,mBAAAA,CAAoBS,IAAI,CAAC,CAACC,aAAeF,KAAAA,YAAiBE,UAAAA,CAAAA;AACnE;;;;;"}
@@ -0,0 +1,20 @@
1
+ import { errors } from '@strapi/database';
2
+
3
+ /**
4
+ * Database errors raised when a value cannot be converted to the column type
5
+ * (e.g. a filter `filters[flag][$eq]=no` on a boolean). They are caused by the
6
+ * request input, so they are answered with a 400 ValidationError instead of a 500.
7
+ * Every other DatabaseError stays an internal error.
8
+ */ const databaseInputErrors = [
9
+ errors.InvalidTimeError,
10
+ errors.InvalidDateTimeError,
11
+ errors.InvalidDateError,
12
+ errors.InvalidRelationError,
13
+ errors.InvalidBooleanError
14
+ ];
15
+ const isDatabaseInputError = (error)=>{
16
+ return databaseInputErrors.some((errorClass)=>error instanceof errorClass);
17
+ };
18
+
19
+ export { databaseInputErrors, isDatabaseInputError };
20
+ //# sourceMappingURL=database-input-errors.mjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"database-input-errors.mjs","sources":["../../src/utils/database-input-errors.ts"],"sourcesContent":["import { errors as databaseErrors } from '@strapi/database';\n\n/**\n * Database errors raised when a value cannot be converted to the column type\n * (e.g. a filter `filters[flag][$eq]=no` on a boolean). They are caused by the\n * request input, so they are answered with a 400 ValidationError instead of a 500.\n * Every other DatabaseError stays an internal error.\n */\nconst databaseInputErrors = [\n databaseErrors.InvalidTimeError,\n databaseErrors.InvalidDateTimeError,\n databaseErrors.InvalidDateError,\n databaseErrors.InvalidRelationError,\n databaseErrors.InvalidBooleanError,\n];\n\nconst isDatabaseInputError = (\n error: unknown\n): error is InstanceType<typeof databaseErrors.DatabaseError> => {\n return databaseInputErrors.some((errorClass) => error instanceof errorClass);\n};\n\nexport { databaseInputErrors, isDatabaseInputError };\n"],"names":["databaseInputErrors","databaseErrors","InvalidTimeError","InvalidDateTimeError","InvalidDateError","InvalidRelationError","InvalidBooleanError","isDatabaseInputError","error","some","errorClass"],"mappings":";;AAEA;;;;;AAKC,UACKA,mBAAAA,GAAsB;AAC1BC,IAAAA,MAAAA,CAAeC,gBAAgB;AAC/BD,IAAAA,MAAAA,CAAeE,oBAAoB;AACnCF,IAAAA,MAAAA,CAAeG,gBAAgB;AAC/BH,IAAAA,MAAAA,CAAeI,oBAAoB;AACnCJ,IAAAA,MAAAA,CAAeK;AAChB;AAED,MAAMC,uBAAuB,CAC3BC,KAAAA,GAAAA;AAEA,IAAA,OAAOR,mBAAAA,CAAoBS,IAAI,CAAC,CAACC,aAAeF,KAAAA,YAAiBE,UAAAA,CAAAA;AACnE;;;;"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@strapi/core",
3
- "version": "5.61.0",
3
+ "version": "5.62.0",
4
4
  "description": "Core of Strapi",
5
5
  "homepage": "https://strapi.io",
6
6
  "bugs": {
@@ -61,15 +61,15 @@
61
61
  "@modelcontextprotocol/node": "2.1.1",
62
62
  "@modelcontextprotocol/server": "2.3.1",
63
63
  "@paralleldrive/cuid2": "2.2.2",
64
- "@strapi/admin": "5.61.0",
65
- "@strapi/database": "5.61.0",
66
- "@strapi/generators": "5.61.0",
67
- "@strapi/logger": "5.61.0",
68
- "@strapi/openapi": "5.61.0",
69
- "@strapi/permissions": "5.61.0",
70
- "@strapi/types": "5.61.0",
71
- "@strapi/typescript-utils": "5.61.0",
72
- "@strapi/utils": "5.61.0",
64
+ "@strapi/admin": "5.62.0",
65
+ "@strapi/database": "5.62.0",
66
+ "@strapi/generators": "5.62.0",
67
+ "@strapi/logger": "5.62.0",
68
+ "@strapi/openapi": "5.62.0",
69
+ "@strapi/permissions": "5.62.0",
70
+ "@strapi/types": "5.62.0",
71
+ "@strapi/typescript-utils": "5.62.0",
72
+ "@strapi/utils": "5.62.0",
73
73
  "@vercel/stega": "0.1.2",
74
74
  "bcryptjs": "2.4.3",
75
75
  "boxen": "5.1.2",
@@ -107,11 +107,11 @@
107
107
  "ora": "5.4.1",
108
108
  "package-json": "10.0.1",
109
109
  "pkg-up": "3.1.0",
110
- "qs": "6.16.1",
110
+ "qs": "6.16.2",
111
111
  "resolve.exports": "2.0.2",
112
112
  "semver": "7.7.4",
113
113
  "typescript": "5.9.3",
114
- "undici": "8.12.3",
114
+ "undici": "8.12.4",
115
115
  "yup": "0.32.9",
116
116
  "zod": "4.4.3"
117
117
  },
@@ -135,11 +135,11 @@
135
135
  "@types/node": "22.20.0",
136
136
  "ajv": "8.20.0",
137
137
  "ajv-formats": "3.0.1",
138
- "eslint-config-custom": "5.61.0",
138
+ "eslint-config-custom": "5.62.0",
139
139
  "supertest": "7.2.2",
140
- "tsconfig": "5.61.0",
140
+ "tsconfig": "5.62.0",
141
141
  "vitest": "catalog:",
142
- "vitest-config": "5.61.0"
142
+ "vitest-config": "5.62.0"
143
143
  },
144
144
  "engines": {
145
145
  "node": ">=22.0.0 <=26.x.x",