@songtonyli/dsh-cli 0.1.82 → 0.1.83

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 (382) hide show
  1. package/README.md +1 -1
  2. package/bin/dsh.mjs +1 -1
  3. package/node_modules/@aws-sdk/core/package.json +3 -3
  4. package/node_modules/@aws-sdk/credential-provider-env/package.json +4 -4
  5. package/node_modules/@aws-sdk/credential-provider-http/package.json +4 -4
  6. package/node_modules/@aws-sdk/credential-provider-ini/package.json +11 -11
  7. package/node_modules/@aws-sdk/credential-provider-login/package.json +5 -5
  8. package/node_modules/@aws-sdk/credential-provider-node/package.json +9 -9
  9. package/node_modules/@aws-sdk/credential-provider-process/package.json +4 -4
  10. package/node_modules/@aws-sdk/credential-provider-sso/package.json +6 -6
  11. package/node_modules/@aws-sdk/credential-provider-web-identity/package.json +5 -5
  12. package/node_modules/@aws-sdk/eventstream-handler-node/package.json +3 -3
  13. package/node_modules/@aws-sdk/middleware-eventstream/package.json +3 -3
  14. package/node_modules/@aws-sdk/middleware-websocket/package.json +4 -4
  15. package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/cognito-identity/index.js +1 -1
  16. package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/signin/index.js +1 -1
  17. package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sso/index.js +1 -1
  18. package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sso-oidc/index.js +1 -1
  19. package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sts/index.js +1 -1
  20. package/node_modules/@aws-sdk/nested-clients/package.json +5 -5
  21. package/node_modules/@aws-sdk/signature-v4-multi-region/package.json +2 -2
  22. package/node_modules/@aws-sdk/token-providers/package.json +5 -5
  23. package/node_modules/@aws-sdk/types/package.json +1 -1
  24. package/node_modules/@deepseek-ai/dsh-app-boot/lib/index.js +18 -12
  25. package/node_modules/@deepseek-ai/dsh-client-modules/lib/index.js +1 -1
  26. package/node_modules/@deepseek-ai/dsh-client-ui-sidebar/lib/client.js +1 -1
  27. package/node_modules/@deepseek-ai/dsh-experimental-agent-team-profile/README.i18n.yaml +4 -4
  28. package/node_modules/@deepseek-ai/dsh-experimental-agent-team-profile/README.md +2 -2
  29. package/node_modules/@deepseek-ai/dsh-experimental-agent-team-profile/README.zh.md +2 -2
  30. package/node_modules/@deepseek-ai/dsh-tui-app/README.i18n.yaml +6 -6
  31. package/node_modules/@deepseek-ai/dsh-tui-app/README.md +13 -0
  32. package/node_modules/@deepseek-ai/dsh-tui-app/README.zh.md +13 -0
  33. package/node_modules/@deepseek-ai/dsh-tui-app/lib/index.js +8037 -6888
  34. package/node_modules/@opentelemetry/api/README.md +4 -23
  35. package/node_modules/@opentelemetry/api/dist/api/context.cjs +100 -0
  36. package/node_modules/@opentelemetry/api/dist/api/context.mjs +100 -0
  37. package/node_modules/@opentelemetry/api/dist/api/diag.cjs +68 -0
  38. package/node_modules/@opentelemetry/api/dist/api/diag.mjs +68 -0
  39. package/node_modules/@opentelemetry/api/dist/api/logs.cjs +59 -0
  40. package/node_modules/@opentelemetry/api/dist/api/logs.mjs +59 -0
  41. package/node_modules/@opentelemetry/api/dist/api/metrics.cjs +46 -0
  42. package/node_modules/@opentelemetry/api/dist/api/metrics.mjs +46 -0
  43. package/node_modules/@opentelemetry/api/dist/api/propagation.cjs +74 -0
  44. package/node_modules/@opentelemetry/api/dist/api/propagation.mjs +74 -0
  45. package/node_modules/@opentelemetry/api/dist/api/trace.cjs +62 -0
  46. package/node_modules/@opentelemetry/api/dist/api/trace.mjs +62 -0
  47. package/node_modules/@opentelemetry/api/dist/baggage/context-helpers.cjs +48 -0
  48. package/node_modules/@opentelemetry/api/dist/baggage/context-helpers.mjs +45 -0
  49. package/node_modules/@opentelemetry/api/dist/baggage/internal/baggage-impl.cjs +36 -0
  50. package/node_modules/@opentelemetry/api/dist/baggage/internal/baggage-impl.mjs +36 -0
  51. package/node_modules/@opentelemetry/api/dist/baggage/internal/symbol.cjs +9 -0
  52. package/node_modules/@opentelemetry/api/dist/baggage/internal/symbol.mjs +9 -0
  53. package/node_modules/@opentelemetry/api/dist/baggage/utils.cjs +37 -0
  54. package/node_modules/@opentelemetry/api/dist/baggage/utils.mjs +36 -0
  55. package/node_modules/@opentelemetry/api/dist/context/NoopContextManager.cjs +27 -0
  56. package/node_modules/@opentelemetry/api/dist/context/NoopContextManager.mjs +27 -0
  57. package/node_modules/@opentelemetry/api/dist/context/context.cjs +41 -0
  58. package/node_modules/@opentelemetry/api/dist/context/context.mjs +40 -0
  59. package/node_modules/@opentelemetry/api/dist/context-api.cjs +10 -0
  60. package/node_modules/@opentelemetry/api/dist/context-api.mjs +11 -0
  61. package/node_modules/@opentelemetry/api/dist/diag/ComponentLogger.cjs +40 -0
  62. package/node_modules/@opentelemetry/api/dist/diag/ComponentLogger.mjs +40 -0
  63. package/node_modules/@opentelemetry/api/dist/diag/consoleLogger.cjs +62 -0
  64. package/node_modules/@opentelemetry/api/dist/diag/consoleLogger.mjs +61 -0
  65. package/node_modules/@opentelemetry/api/dist/diag/internal/logLevelLogger.cjs +23 -0
  66. package/node_modules/@opentelemetry/api/dist/diag/internal/logLevelLogger.mjs +23 -0
  67. package/node_modules/@opentelemetry/api/dist/diag/types.cjs +32 -0
  68. package/node_modules/@opentelemetry/api/dist/diag/types.mjs +32 -0
  69. package/node_modules/@opentelemetry/api/dist/diag-api.cjs +14 -0
  70. package/node_modules/@opentelemetry/api/dist/diag-api.mjs +15 -0
  71. package/node_modules/@opentelemetry/api/dist/experimental/index.cjs +4 -0
  72. package/node_modules/@opentelemetry/api/dist/experimental/index.mjs +2 -0
  73. package/node_modules/@opentelemetry/api/dist/experimental/trace/SugaredTracer.cjs +88 -0
  74. package/node_modules/@opentelemetry/api/dist/experimental/trace/SugaredTracer.mjs +87 -0
  75. package/node_modules/@opentelemetry/api/dist/index.cjs +71 -0
  76. package/node_modules/@opentelemetry/api/dist/index.mjs +37 -0
  77. package/node_modules/@opentelemetry/api/dist/internal/global-utils.cjs +52 -0
  78. package/node_modules/@opentelemetry/api/dist/internal/global-utils.mjs +50 -0
  79. package/node_modules/@opentelemetry/api/dist/internal/semver.cjs +83 -0
  80. package/node_modules/@opentelemetry/api/dist/internal/semver.mjs +82 -0
  81. package/node_modules/@opentelemetry/api/dist/logs/LogRecord.cjs +33 -0
  82. package/node_modules/@opentelemetry/api/dist/logs/LogRecord.mjs +33 -0
  83. package/node_modules/@opentelemetry/api/dist/logs/NoopLogger.cjs +20 -0
  84. package/node_modules/@opentelemetry/api/dist/logs/NoopLogger.mjs +18 -0
  85. package/node_modules/@opentelemetry/api/dist/logs/NoopLoggerProvider.cjs +13 -0
  86. package/node_modules/@opentelemetry/api/dist/logs/NoopLoggerProvider.mjs +12 -0
  87. package/node_modules/@opentelemetry/api/dist/logs/ProxyLogger.cjs +36 -0
  88. package/node_modules/@opentelemetry/api/dist/logs/ProxyLogger.mjs +36 -0
  89. package/node_modules/@opentelemetry/api/dist/logs/ProxyLoggerProvider.cjs +36 -0
  90. package/node_modules/@opentelemetry/api/dist/logs/ProxyLoggerProvider.mjs +36 -0
  91. package/node_modules/@opentelemetry/api/dist/logs-api.cjs +11 -0
  92. package/node_modules/@opentelemetry/api/dist/logs-api.mjs +12 -0
  93. package/node_modules/@opentelemetry/api/dist/metrics/Metric.cjs +15 -0
  94. package/node_modules/@opentelemetry/api/dist/metrics/Metric.mjs +15 -0
  95. package/node_modules/@opentelemetry/api/dist/metrics/NoopMeter.cjs +116 -0
  96. package/node_modules/@opentelemetry/api/dist/metrics/NoopMeter.mjs +98 -0
  97. package/node_modules/@opentelemetry/api/dist/metrics/NoopMeterProvider.cjs +17 -0
  98. package/node_modules/@opentelemetry/api/dist/metrics/NoopMeterProvider.mjs +16 -0
  99. package/node_modules/@opentelemetry/api/dist/metrics-api.cjs +11 -0
  100. package/node_modules/@opentelemetry/api/dist/metrics-api.mjs +12 -0
  101. package/node_modules/@opentelemetry/api/dist/propagation/NoopTextMapPropagator.cjs +19 -0
  102. package/node_modules/@opentelemetry/api/dist/propagation/NoopTextMapPropagator.mjs +19 -0
  103. package/node_modules/@opentelemetry/api/dist/propagation/TextMapPropagator.cjs +26 -0
  104. package/node_modules/@opentelemetry/api/dist/propagation/TextMapPropagator.mjs +25 -0
  105. package/node_modules/@opentelemetry/api/dist/propagation-api.cjs +11 -0
  106. package/node_modules/@opentelemetry/api/dist/propagation-api.mjs +12 -0
  107. package/node_modules/@opentelemetry/api/dist/trace/NonRecordingSpan.cjs +45 -0
  108. package/node_modules/@opentelemetry/api/dist/trace/NonRecordingSpan.mjs +45 -0
  109. package/node_modules/@opentelemetry/api/dist/trace/NoopTracer.cjs +44 -0
  110. package/node_modules/@opentelemetry/api/dist/trace/NoopTracer.mjs +44 -0
  111. package/node_modules/@opentelemetry/api/dist/trace/NoopTracerProvider.cjs +17 -0
  112. package/node_modules/@opentelemetry/api/dist/trace/NoopTracerProvider.mjs +17 -0
  113. package/node_modules/@opentelemetry/api/dist/trace/ProxyTracer.cjs +37 -0
  114. package/node_modules/@opentelemetry/api/dist/trace/ProxyTracer.mjs +38 -0
  115. package/node_modules/@opentelemetry/api/dist/trace/ProxyTracerProvider.cjs +41 -0
  116. package/node_modules/@opentelemetry/api/dist/trace/ProxyTracerProvider.mjs +42 -0
  117. package/node_modules/@opentelemetry/api/dist/trace/SamplingResult.cjs +30 -0
  118. package/node_modules/@opentelemetry/api/dist/trace/SamplingResult.mjs +30 -0
  119. package/node_modules/@opentelemetry/api/dist/trace/context-utils.cjs +67 -0
  120. package/node_modules/@opentelemetry/api/dist/trace/context-utils.mjs +62 -0
  121. package/node_modules/@opentelemetry/api/dist/trace/internal/tracestate-impl.cjs +77 -0
  122. package/node_modules/@opentelemetry/api/dist/trace/internal/tracestate-impl.mjs +77 -0
  123. package/node_modules/@opentelemetry/api/dist/trace/internal/tracestate-validators.cjs +28 -0
  124. package/node_modules/@opentelemetry/api/dist/trace/internal/tracestate-validators.mjs +27 -0
  125. package/node_modules/@opentelemetry/api/dist/trace/internal/utils.cjs +13 -0
  126. package/node_modules/@opentelemetry/api/dist/trace/internal/utils.mjs +13 -0
  127. package/node_modules/@opentelemetry/api/dist/trace/invalid-span-constants.cjs +24 -0
  128. package/node_modules/@opentelemetry/api/dist/trace/invalid-span-constants.mjs +22 -0
  129. package/node_modules/@opentelemetry/api/dist/trace/span_kind.cjs +35 -0
  130. package/node_modules/@opentelemetry/api/dist/trace/span_kind.mjs +35 -0
  131. package/node_modules/@opentelemetry/api/dist/trace/spancontext-utils.cjs +151 -0
  132. package/node_modules/@opentelemetry/api/dist/trace/spancontext-utils.mjs +148 -0
  133. package/node_modules/@opentelemetry/api/dist/trace/status.cjs +26 -0
  134. package/node_modules/@opentelemetry/api/dist/trace/status.mjs +26 -0
  135. package/node_modules/@opentelemetry/api/dist/trace/trace_flags.cjs +15 -0
  136. package/node_modules/@opentelemetry/api/dist/trace/trace_flags.mjs +15 -0
  137. package/node_modules/@opentelemetry/api/dist/trace-api.cjs +11 -0
  138. package/node_modules/@opentelemetry/api/dist/trace-api.mjs +12 -0
  139. package/node_modules/@opentelemetry/api/dist/version.cjs +6 -0
  140. package/node_modules/@opentelemetry/api/dist/version.mjs +6 -0
  141. package/node_modules/@opentelemetry/api/package.json +32 -34
  142. package/node_modules/@shikijs/vscode-textmate/dist/index.js +46 -1
  143. package/node_modules/@shikijs/vscode-textmate/package.json +9 -9
  144. package/node_modules/@smithy/core/dist-cjs/submodules/client/index.js +15 -2
  145. package/node_modules/@smithy/core/dist-cjs/submodules/event-streams/index.browser.js +10 -0
  146. package/node_modules/@smithy/core/dist-cjs/submodules/event-streams/index.js +10 -0
  147. package/node_modules/@smithy/core/dist-cjs/submodules/protocols/index.js +5 -5
  148. package/node_modules/@smithy/core/dist-es/submodules/client/smithy-client/command.js +16 -2
  149. package/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-codec/HeaderMarshaller.js +10 -0
  150. package/node_modules/@smithy/core/dist-es/submodules/protocols/json/codec-v2/JsonShapeSerializer2.js +5 -5
  151. package/node_modules/@smithy/core/package.json +1 -1
  152. package/node_modules/fast-uri/.github/workflows/release.yml +35 -0
  153. package/node_modules/fast-uri/README.md +8 -0
  154. package/node_modules/fast-uri/index.js +98 -18
  155. package/node_modules/fast-uri/lib/utils.js +52 -0
  156. package/node_modules/fast-uri/package.json +1 -1
  157. package/node_modules/fast-uri/test/host-delimiter-security.test.js +94 -0
  158. package/node_modules/fast-uri/test/relative-normalization-security.test.js +156 -0
  159. package/node_modules/fast-uri/test/reserved-path-normalization.test.js +32 -4
  160. package/node_modules/fast-uri/test/scheme-validation.test.js +53 -14
  161. package/node_modules/jose/README.md +2 -2
  162. package/node_modules/jose/dist/webapi/jwe/general/encrypt.js +3 -3
  163. package/node_modules/jose/dist/webapi/jwk/thumbprint.js +8 -8
  164. package/node_modules/jose/dist/webapi/jwks/local.js +2 -1
  165. package/node_modules/jose/dist/webapi/jwks/remote.js +4 -4
  166. package/node_modules/jose/dist/webapi/jws/general/sign.js +3 -3
  167. package/node_modules/jose/dist/webapi/jws/general/verify.js +3 -3
  168. package/node_modules/jose/dist/webapi/jwt/encrypt.js +2 -2
  169. package/node_modules/jose/dist/webapi/jwt/sign.js +2 -2
  170. package/node_modules/jose/dist/webapi/jwt/unsecured.js +3 -3
  171. package/node_modules/jose/dist/webapi/key/generate_secret.js +4 -4
  172. package/node_modules/jose/dist/webapi/lib/asn1.js +2 -2
  173. package/node_modules/jose/dist/webapi/lib/buffer_utils.js +4 -4
  174. package/node_modules/jose/dist/webapi/lib/content_encryption.js +8 -8
  175. package/node_modules/jose/dist/webapi/lib/jwe_decrypt.js +14 -14
  176. package/node_modules/jose/dist/webapi/lib/jwe_encrypt.js +3 -3
  177. package/node_modules/jose/dist/webapi/lib/jws_algorithms.js +2 -2
  178. package/node_modules/jose/dist/webapi/lib/jws_sign.js +11 -11
  179. package/node_modules/jose/dist/webapi/lib/jws_verify.js +19 -16
  180. package/node_modules/jose/dist/webapi/lib/jwt_claims_set.js +44 -43
  181. package/node_modules/jose/dist/webapi/lib/key.js +4 -4
  182. package/node_modules/jose/dist/webapi/lib/key_management.js +17 -17
  183. package/node_modules/jose/dist/webapi/lib/validate.js +10 -10
  184. package/node_modules/jose/dist/webapi/util/decode_jwt.js +12 -12
  185. package/node_modules/jose/dist/webapi/util/decode_protected_header.js +5 -5
  186. package/node_modules/jose/package.json +1 -1
  187. package/package.json +22 -22
  188. package/node_modules/@opentelemetry/api/build/esm/api/context.js +0 -68
  189. package/node_modules/@opentelemetry/api/build/esm/api/diag.js +0 -80
  190. package/node_modules/@opentelemetry/api/build/esm/api/metrics.js +0 -46
  191. package/node_modules/@opentelemetry/api/build/esm/api/propagation.js +0 -76
  192. package/node_modules/@opentelemetry/api/build/esm/api/trace.js +0 -66
  193. package/node_modules/@opentelemetry/api/build/esm/baggage/context-helpers.js +0 -45
  194. package/node_modules/@opentelemetry/api/build/esm/baggage/internal/baggage-impl.js +0 -40
  195. package/node_modules/@opentelemetry/api/build/esm/baggage/internal/symbol.js +0 -9
  196. package/node_modules/@opentelemetry/api/build/esm/baggage/types.js +0 -6
  197. package/node_modules/@opentelemetry/api/build/esm/baggage/utils.js +0 -36
  198. package/node_modules/@opentelemetry/api/build/esm/common/Attributes.js +0 -6
  199. package/node_modules/@opentelemetry/api/build/esm/common/Exception.js +0 -6
  200. package/node_modules/@opentelemetry/api/build/esm/common/Time.js +0 -2
  201. package/node_modules/@opentelemetry/api/build/esm/context/NoopContextManager.js +0 -23
  202. package/node_modules/@opentelemetry/api/build/esm/context/context.js +0 -48
  203. package/node_modules/@opentelemetry/api/build/esm/context/types.js +0 -6
  204. package/node_modules/@opentelemetry/api/build/esm/context-api.js +0 -13
  205. package/node_modules/@opentelemetry/api/build/esm/diag/ComponentLogger.js +0 -43
  206. package/node_modules/@opentelemetry/api/build/esm/diag/consoleLogger.js +0 -69
  207. package/node_modules/@opentelemetry/api/build/esm/diag/internal/logLevelLogger.js +0 -30
  208. package/node_modules/@opentelemetry/api/build/esm/diag/internal/noopLogger.js +0 -20
  209. package/node_modules/@opentelemetry/api/build/esm/diag/types.js +0 -30
  210. package/node_modules/@opentelemetry/api/build/esm/diag-api.js +0 -17
  211. package/node_modules/@opentelemetry/api/build/esm/experimental/index.js +0 -10
  212. package/node_modules/@opentelemetry/api/build/esm/experimental/trace/SugaredOptions.js +0 -6
  213. package/node_modules/@opentelemetry/api/build/esm/experimental/trace/SugaredTracer.js +0 -88
  214. package/node_modules/@opentelemetry/api/build/esm/index.js +0 -43
  215. package/node_modules/@opentelemetry/api/build/esm/internal/global-utils.js +0 -54
  216. package/node_modules/@opentelemetry/api/build/esm/internal/semver.js +0 -107
  217. package/node_modules/@opentelemetry/api/build/esm/metrics/Meter.js +0 -6
  218. package/node_modules/@opentelemetry/api/build/esm/metrics/MeterProvider.js +0 -6
  219. package/node_modules/@opentelemetry/api/build/esm/metrics/Metric.js +0 -15
  220. package/node_modules/@opentelemetry/api/build/esm/metrics/NoopMeter.js +0 -104
  221. package/node_modules/@opentelemetry/api/build/esm/metrics/NoopMeterProvider.js +0 -16
  222. package/node_modules/@opentelemetry/api/build/esm/metrics-api.js +0 -14
  223. package/node_modules/@opentelemetry/api/build/esm/propagation/NoopTextMapPropagator.js +0 -19
  224. package/node_modules/@opentelemetry/api/build/esm/propagation/TextMapPropagator.js +0 -33
  225. package/node_modules/@opentelemetry/api/build/esm/propagation-api.js +0 -14
  226. package/node_modules/@opentelemetry/api/build/esm/trace/NonRecordingSpan.js +0 -54
  227. package/node_modules/@opentelemetry/api/build/esm/trace/NoopTracer.js +0 -64
  228. package/node_modules/@opentelemetry/api/build/esm/trace/NoopTracerProvider.js +0 -17
  229. package/node_modules/@opentelemetry/api/build/esm/trace/ProxyTracer.js +0 -42
  230. package/node_modules/@opentelemetry/api/build/esm/trace/ProxyTracerProvider.js +0 -42
  231. package/node_modules/@opentelemetry/api/build/esm/trace/Sampler.js +0 -6
  232. package/node_modules/@opentelemetry/api/build/esm/trace/SamplingResult.js +0 -30
  233. package/node_modules/@opentelemetry/api/build/esm/trace/SpanOptions.js +0 -6
  234. package/node_modules/@opentelemetry/api/build/esm/trace/attributes.js +0 -6
  235. package/node_modules/@opentelemetry/api/build/esm/trace/context-utils.js +0 -62
  236. package/node_modules/@opentelemetry/api/build/esm/trace/internal/tracestate-impl.js +0 -90
  237. package/node_modules/@opentelemetry/api/build/esm/trace/internal/tracestate-validators.js +0 -30
  238. package/node_modules/@opentelemetry/api/build/esm/trace/internal/utils.js +0 -12
  239. package/node_modules/@opentelemetry/api/build/esm/trace/invalid-span-constants.js +0 -22
  240. package/node_modules/@opentelemetry/api/build/esm/trace/link.js +0 -6
  241. package/node_modules/@opentelemetry/api/build/esm/trace/span.js +0 -6
  242. package/node_modules/@opentelemetry/api/build/esm/trace/span_context.js +0 -6
  243. package/node_modules/@opentelemetry/api/build/esm/trace/span_kind.js +0 -35
  244. package/node_modules/@opentelemetry/api/build/esm/trace/spancontext-utils.js +0 -59
  245. package/node_modules/@opentelemetry/api/build/esm/trace/status.js +0 -26
  246. package/node_modules/@opentelemetry/api/build/esm/trace/trace_flags.js +0 -15
  247. package/node_modules/@opentelemetry/api/build/esm/trace/trace_state.js +0 -6
  248. package/node_modules/@opentelemetry/api/build/esm/trace/tracer.js +0 -6
  249. package/node_modules/@opentelemetry/api/build/esm/trace/tracer_options.js +0 -6
  250. package/node_modules/@opentelemetry/api/build/esm/trace/tracer_provider.js +0 -6
  251. package/node_modules/@opentelemetry/api/build/esm/trace-api.js +0 -14
  252. package/node_modules/@opentelemetry/api/build/esm/version.js +0 -7
  253. package/node_modules/@opentelemetry/api/build/esnext/api/context.js +0 -68
  254. package/node_modules/@opentelemetry/api/build/esnext/api/diag.js +0 -80
  255. package/node_modules/@opentelemetry/api/build/esnext/api/metrics.js +0 -46
  256. package/node_modules/@opentelemetry/api/build/esnext/api/propagation.js +0 -76
  257. package/node_modules/@opentelemetry/api/build/esnext/api/trace.js +0 -66
  258. package/node_modules/@opentelemetry/api/build/esnext/baggage/context-helpers.js +0 -45
  259. package/node_modules/@opentelemetry/api/build/esnext/baggage/internal/baggage-impl.js +0 -40
  260. package/node_modules/@opentelemetry/api/build/esnext/baggage/internal/symbol.js +0 -9
  261. package/node_modules/@opentelemetry/api/build/esnext/baggage/types.js +0 -6
  262. package/node_modules/@opentelemetry/api/build/esnext/baggage/utils.js +0 -36
  263. package/node_modules/@opentelemetry/api/build/esnext/common/Attributes.js +0 -6
  264. package/node_modules/@opentelemetry/api/build/esnext/common/Exception.js +0 -6
  265. package/node_modules/@opentelemetry/api/build/esnext/common/Time.js +0 -2
  266. package/node_modules/@opentelemetry/api/build/esnext/context/NoopContextManager.js +0 -23
  267. package/node_modules/@opentelemetry/api/build/esnext/context/context.js +0 -48
  268. package/node_modules/@opentelemetry/api/build/esnext/context/types.js +0 -6
  269. package/node_modules/@opentelemetry/api/build/esnext/context-api.js +0 -13
  270. package/node_modules/@opentelemetry/api/build/esnext/diag/ComponentLogger.js +0 -43
  271. package/node_modules/@opentelemetry/api/build/esnext/diag/consoleLogger.js +0 -69
  272. package/node_modules/@opentelemetry/api/build/esnext/diag/internal/logLevelLogger.js +0 -30
  273. package/node_modules/@opentelemetry/api/build/esnext/diag/internal/noopLogger.js +0 -20
  274. package/node_modules/@opentelemetry/api/build/esnext/diag/types.js +0 -30
  275. package/node_modules/@opentelemetry/api/build/esnext/diag-api.js +0 -17
  276. package/node_modules/@opentelemetry/api/build/esnext/experimental/index.js +0 -10
  277. package/node_modules/@opentelemetry/api/build/esnext/experimental/trace/SugaredOptions.js +0 -6
  278. package/node_modules/@opentelemetry/api/build/esnext/experimental/trace/SugaredTracer.js +0 -88
  279. package/node_modules/@opentelemetry/api/build/esnext/index.js +0 -43
  280. package/node_modules/@opentelemetry/api/build/esnext/internal/global-utils.js +0 -54
  281. package/node_modules/@opentelemetry/api/build/esnext/internal/semver.js +0 -107
  282. package/node_modules/@opentelemetry/api/build/esnext/metrics/Meter.js +0 -6
  283. package/node_modules/@opentelemetry/api/build/esnext/metrics/MeterProvider.js +0 -6
  284. package/node_modules/@opentelemetry/api/build/esnext/metrics/Metric.js +0 -15
  285. package/node_modules/@opentelemetry/api/build/esnext/metrics/NoopMeter.js +0 -104
  286. package/node_modules/@opentelemetry/api/build/esnext/metrics/NoopMeterProvider.js +0 -16
  287. package/node_modules/@opentelemetry/api/build/esnext/metrics-api.js +0 -14
  288. package/node_modules/@opentelemetry/api/build/esnext/propagation/NoopTextMapPropagator.js +0 -19
  289. package/node_modules/@opentelemetry/api/build/esnext/propagation/TextMapPropagator.js +0 -33
  290. package/node_modules/@opentelemetry/api/build/esnext/propagation-api.js +0 -14
  291. package/node_modules/@opentelemetry/api/build/esnext/trace/NonRecordingSpan.js +0 -54
  292. package/node_modules/@opentelemetry/api/build/esnext/trace/NoopTracer.js +0 -64
  293. package/node_modules/@opentelemetry/api/build/esnext/trace/NoopTracerProvider.js +0 -17
  294. package/node_modules/@opentelemetry/api/build/esnext/trace/ProxyTracer.js +0 -42
  295. package/node_modules/@opentelemetry/api/build/esnext/trace/ProxyTracerProvider.js +0 -42
  296. package/node_modules/@opentelemetry/api/build/esnext/trace/Sampler.js +0 -6
  297. package/node_modules/@opentelemetry/api/build/esnext/trace/SamplingResult.js +0 -30
  298. package/node_modules/@opentelemetry/api/build/esnext/trace/SpanOptions.js +0 -6
  299. package/node_modules/@opentelemetry/api/build/esnext/trace/attributes.js +0 -6
  300. package/node_modules/@opentelemetry/api/build/esnext/trace/context-utils.js +0 -62
  301. package/node_modules/@opentelemetry/api/build/esnext/trace/internal/tracestate-impl.js +0 -90
  302. package/node_modules/@opentelemetry/api/build/esnext/trace/internal/tracestate-validators.js +0 -30
  303. package/node_modules/@opentelemetry/api/build/esnext/trace/internal/utils.js +0 -12
  304. package/node_modules/@opentelemetry/api/build/esnext/trace/invalid-span-constants.js +0 -22
  305. package/node_modules/@opentelemetry/api/build/esnext/trace/link.js +0 -6
  306. package/node_modules/@opentelemetry/api/build/esnext/trace/span.js +0 -6
  307. package/node_modules/@opentelemetry/api/build/esnext/trace/span_context.js +0 -6
  308. package/node_modules/@opentelemetry/api/build/esnext/trace/span_kind.js +0 -35
  309. package/node_modules/@opentelemetry/api/build/esnext/trace/spancontext-utils.js +0 -59
  310. package/node_modules/@opentelemetry/api/build/esnext/trace/status.js +0 -26
  311. package/node_modules/@opentelemetry/api/build/esnext/trace/trace_flags.js +0 -15
  312. package/node_modules/@opentelemetry/api/build/esnext/trace/trace_state.js +0 -6
  313. package/node_modules/@opentelemetry/api/build/esnext/trace/tracer.js +0 -6
  314. package/node_modules/@opentelemetry/api/build/esnext/trace/tracer_options.js +0 -6
  315. package/node_modules/@opentelemetry/api/build/esnext/trace/tracer_provider.js +0 -6
  316. package/node_modules/@opentelemetry/api/build/esnext/trace-api.js +0 -14
  317. package/node_modules/@opentelemetry/api/build/esnext/version.js +0 -7
  318. package/node_modules/@opentelemetry/api/build/src/api/context.js +0 -72
  319. package/node_modules/@opentelemetry/api/build/src/api/diag.js +0 -84
  320. package/node_modules/@opentelemetry/api/build/src/api/metrics.js +0 -50
  321. package/node_modules/@opentelemetry/api/build/src/api/propagation.js +0 -80
  322. package/node_modules/@opentelemetry/api/build/src/api/trace.js +0 -70
  323. package/node_modules/@opentelemetry/api/build/src/baggage/context-helpers.js +0 -52
  324. package/node_modules/@opentelemetry/api/build/src/baggage/internal/baggage-impl.js +0 -44
  325. package/node_modules/@opentelemetry/api/build/src/baggage/internal/symbol.js +0 -12
  326. package/node_modules/@opentelemetry/api/build/src/baggage/types.js +0 -7
  327. package/node_modules/@opentelemetry/api/build/src/baggage/utils.js +0 -41
  328. package/node_modules/@opentelemetry/api/build/src/common/Attributes.js +0 -7
  329. package/node_modules/@opentelemetry/api/build/src/common/Exception.js +0 -7
  330. package/node_modules/@opentelemetry/api/build/src/common/Time.js +0 -3
  331. package/node_modules/@opentelemetry/api/build/src/context/NoopContextManager.js +0 -27
  332. package/node_modules/@opentelemetry/api/build/src/context/context.js +0 -52
  333. package/node_modules/@opentelemetry/api/build/src/context/types.js +0 -7
  334. package/node_modules/@opentelemetry/api/build/src/context-api.js +0 -16
  335. package/node_modules/@opentelemetry/api/build/src/diag/ComponentLogger.js +0 -47
  336. package/node_modules/@opentelemetry/api/build/src/diag/consoleLogger.js +0 -73
  337. package/node_modules/@opentelemetry/api/build/src/diag/internal/logLevelLogger.js +0 -34
  338. package/node_modules/@opentelemetry/api/build/src/diag/internal/noopLogger.js +0 -24
  339. package/node_modules/@opentelemetry/api/build/src/diag/types.js +0 -33
  340. package/node_modules/@opentelemetry/api/build/src/diag-api.js +0 -20
  341. package/node_modules/@opentelemetry/api/build/src/experimental/index.js +0 -15
  342. package/node_modules/@opentelemetry/api/build/src/experimental/trace/SugaredOptions.js +0 -7
  343. package/node_modules/@opentelemetry/api/build/src/experimental/trace/SugaredTracer.js +0 -93
  344. package/node_modules/@opentelemetry/api/build/src/index.js +0 -71
  345. package/node_modules/@opentelemetry/api/build/src/internal/global-utils.js +0 -60
  346. package/node_modules/@opentelemetry/api/build/src/internal/semver.js +0 -111
  347. package/node_modules/@opentelemetry/api/build/src/metrics/Meter.js +0 -7
  348. package/node_modules/@opentelemetry/api/build/src/metrics/MeterProvider.js +0 -7
  349. package/node_modules/@opentelemetry/api/build/src/metrics/Metric.js +0 -18
  350. package/node_modules/@opentelemetry/api/build/src/metrics/NoopMeter.js +0 -118
  351. package/node_modules/@opentelemetry/api/build/src/metrics/NoopMeterProvider.js +0 -20
  352. package/node_modules/@opentelemetry/api/build/src/metrics-api.js +0 -17
  353. package/node_modules/@opentelemetry/api/build/src/propagation/NoopTextMapPropagator.js +0 -23
  354. package/node_modules/@opentelemetry/api/build/src/propagation/TextMapPropagator.js +0 -36
  355. package/node_modules/@opentelemetry/api/build/src/propagation-api.js +0 -17
  356. package/node_modules/@opentelemetry/api/build/src/trace/NonRecordingSpan.js +0 -58
  357. package/node_modules/@opentelemetry/api/build/src/trace/NoopTracer.js +0 -68
  358. package/node_modules/@opentelemetry/api/build/src/trace/NoopTracerProvider.js +0 -21
  359. package/node_modules/@opentelemetry/api/build/src/trace/ProxyTracer.js +0 -46
  360. package/node_modules/@opentelemetry/api/build/src/trace/ProxyTracerProvider.js +0 -46
  361. package/node_modules/@opentelemetry/api/build/src/trace/Sampler.js +0 -7
  362. package/node_modules/@opentelemetry/api/build/src/trace/SamplingResult.js +0 -33
  363. package/node_modules/@opentelemetry/api/build/src/trace/SpanOptions.js +0 -7
  364. package/node_modules/@opentelemetry/api/build/src/trace/attributes.js +0 -7
  365. package/node_modules/@opentelemetry/api/build/src/trace/context-utils.js +0 -71
  366. package/node_modules/@opentelemetry/api/build/src/trace/internal/tracestate-impl.js +0 -94
  367. package/node_modules/@opentelemetry/api/build/src/trace/internal/tracestate-validators.js +0 -35
  368. package/node_modules/@opentelemetry/api/build/src/trace/internal/utils.js +0 -16
  369. package/node_modules/@opentelemetry/api/build/src/trace/invalid-span-constants.js +0 -25
  370. package/node_modules/@opentelemetry/api/build/src/trace/link.js +0 -7
  371. package/node_modules/@opentelemetry/api/build/src/trace/span.js +0 -7
  372. package/node_modules/@opentelemetry/api/build/src/trace/span_context.js +0 -7
  373. package/node_modules/@opentelemetry/api/build/src/trace/span_kind.js +0 -38
  374. package/node_modules/@opentelemetry/api/build/src/trace/spancontext-utils.js +0 -66
  375. package/node_modules/@opentelemetry/api/build/src/trace/status.js +0 -29
  376. package/node_modules/@opentelemetry/api/build/src/trace/trace_flags.js +0 -18
  377. package/node_modules/@opentelemetry/api/build/src/trace/trace_state.js +0 -7
  378. package/node_modules/@opentelemetry/api/build/src/trace/tracer.js +0 -7
  379. package/node_modules/@opentelemetry/api/build/src/trace/tracer_options.js +0 -7
  380. package/node_modules/@opentelemetry/api/build/src/trace/tracer_provider.js +0 -7
  381. package/node_modules/@opentelemetry/api/build/src/trace-api.js +0 -17
  382. package/node_modules/@opentelemetry/api/build/src/version.js +0 -10
@@ -15,7 +15,15 @@ const malformedSchemes = [
15
15
  'foo_bar:value',
16
16
  'éxample:value',
17
17
  'Kttp://example.com/',
18
- 'ſcheme:value'
18
+ 'ſcheme:value',
19
+ // RFC 3986 section 3.1 does not allow percent-encoding in a scheme.
20
+ '%4Aavascript:alert(1)',
21
+ '%6aavascript:alert(1)',
22
+ 'foo%2Bbar:value',
23
+ '%u006Aavascript:1',
24
+ 'ht%74ps://example.com/',
25
+ 'ma%69lto:user@example.org',
26
+ '%64ata:text/html,x'
19
27
  ]
20
28
 
21
29
  test('parse validates the decoded scheme against RFC 3986', (t) => {
@@ -23,10 +31,7 @@ test('parse validates the decoded scheme against RFC 3986', (t) => {
23
31
  ['a:value', 'a'],
24
32
  ['HTTP://example.com/', 'http'],
25
33
  ['a1+.-:value', 'a1+.-'],
26
- ['%4Aavascript:alert(1)', 'javascript'],
27
- ['foo%2Bbar:value', 'foo+bar'],
28
- ['%u006Aavascript:1', 'javascript'],
29
- ['ht%74ps://example.com/', 'https']
34
+ ['foo+bar:value', 'foo+bar']
30
35
  ]
31
36
 
32
37
  for (const [uri, scheme] of validSchemes) {
@@ -42,17 +47,41 @@ test('parse validates the decoded scheme against RFC 3986', (t) => {
42
47
  t.end()
43
48
  })
44
49
 
45
- test('decoded schemes select their scheme handlers', (t) => {
50
+ test('percent-encoded schemes do not select scheme handlers', (t) => {
46
51
  t.equal(
47
52
  fastURI.normalize('ht%74ps://example.com:443'),
48
- 'https://example.com/',
49
- 'HTTP normalization runs after decoding the scheme'
53
+ 'ht%74ps://example.com:443',
54
+ 'HTTP normalization does not run for an encoded scheme'
50
55
  )
51
56
 
52
57
  // 3.x has no mailto scheme handler (added in v4); use the ws handler to
53
- // verify that a percent-encoded scheme still selects its scheme handler
54
- const ws = fastURI.parse('we%62socket://example.com/')
55
- t.equal(ws.scheme, 'websocket', 'ws parsing runs after decoding the scheme')
58
+ // verify that a percent-encoded scheme does not select its scheme handler
59
+ const ws = fastURI.parse('w%73://example.com/a?b')
60
+ t.equal(ws.resourceName, undefined, 'ws parsing does not run for an encoded scheme')
61
+ t.equal(ws.error, MALFORMED_SCHEME_ERROR)
62
+ t.end()
63
+ })
64
+
65
+ test('normalization cannot synthesize a scheme from encoded input', (t) => {
66
+ const inputs = [
67
+ '%6Aavascript:alert(1)',
68
+ '%4A%41%56%41%53%43%52%49%50%54:alert(1)',
69
+ '%u006Aavascript:alert(1)',
70
+ 'j%61vascript:alert(1)',
71
+ '%64ata:text/html,<script>alert(1)</script>',
72
+ 'vb%73cript:msgbox(1)'
73
+ ]
74
+
75
+ for (const uri of inputs) {
76
+ const parsed = fastURI.parse(uri)
77
+ t.equal(parsed.error, MALFORMED_SCHEME_ERROR, uri + ' is malformed')
78
+ t.notOk(/^(?:javascript|data|vbscript):/i.test(String(parsed.scheme) + ':'), uri + ' parsed scheme is not decoded')
79
+ t.equal(fastURI.normalize(uri), uri, uri + ' normalizes to itself')
80
+ t.equal(fastURI.equal(uri, uri), false, uri + ' is not comparable')
81
+ t.throws(() => fastURI.resolve('https://example.com/app/', uri), /URI scheme is malformed\./, uri + ' is rejected by resolve')
82
+ }
83
+
84
+ t.equal(fastURI.equal('%68ttp://a/', 'http://a/'), false, 'encoded scheme does not alias a plain scheme')
56
85
  t.end()
57
86
  })
58
87
 
@@ -95,11 +124,21 @@ test('resolve rejects malformed decoded schemes in either input', (t) => {
95
124
  t.end()
96
125
  })
97
126
 
98
- test('serialize validates decoded component schemes', (t) => {
127
+ test('serialize validates component schemes without decoding them', (t) => {
99
128
  t.equal(
100
- fastURI.serialize({ scheme: 'foo%2Bbar', path: 'value' }),
129
+ fastURI.serialize({ scheme: 'foo+bar', path: 'value' }),
101
130
  'foo+bar:value',
102
- 'valid decoded scheme is serialized'
131
+ 'valid scheme is serialized'
132
+ )
133
+ t.throws(
134
+ () => fastURI.serialize({ scheme: 'foo%2Bbar', path: 'value' }),
135
+ /URI scheme is malformed\./,
136
+ 'percent-encoded scheme is rejected'
137
+ )
138
+ t.throws(
139
+ () => fastURI.serialize({ scheme: '%6Aavascript', path: 'alert(1)' }),
140
+ /URI scheme is malformed\./,
141
+ 'encoded scheme cannot serialize as javascript:'
103
142
  )
104
143
  t.throws(
105
144
  () => fastURI.serialize({ scheme: '//evil.example', path: '/pwn' }),
@@ -70,7 +70,7 @@ The `jose` module supports importing, exporting, and generating keys and secrets
70
70
 
71
71
  ### JSON Web Signature (JWS)
72
72
 
73
- The `jose` module supports signing and verification of JWS messages with arbitrary payloads in Compact, Flattened JSON, and General JSON serialization syntaxes.
73
+ The `jose` module supports digital signature and MAC computation and validation over arbitrary JWS Payloads using the JWS Compact Serialization and the flattened and general JWS JSON Serialization syntaxes ([RFC 7515, Section 7](https://www.rfc-editor.org/info/rfc7515/#section-7)).
74
74
 
75
75
  - Signing - [Compact](docs/jws/compact/sign/classes/CompactSign.md), [Flattened JSON](docs/jws/flattened/sign/classes/FlattenedSign.md), [General JSON](docs/jws/general/sign/classes/GeneralSign.md)
76
76
  - Verification - [Compact](docs/jws/compact/verify/functions/compactVerify.md), [Flattened JSON](docs/jws/flattened/verify/functions/flattenedVerify.md), [General JSON](docs/jws/general/verify/functions/generalVerify.md)
@@ -81,7 +81,7 @@ The `jose` module supports signing and verification of JWS messages with arbitra
81
81
 
82
82
  ### JSON Web Encryption (JWE)
83
83
 
84
- The `jose` module supports encryption and decryption of JWE messages with arbitrary plaintext in Compact, Flattened JSON, and General JSON serialization syntaxes.
84
+ The `jose` module supports encryption and authenticated decryption of arbitrary plaintext using the JWE Compact Serialization and the flattened and general JWE JSON Serialization syntaxes ([RFC 7516, Section 7](https://www.rfc-editor.org/info/rfc7516/#section-7)).
85
85
 
86
86
  - Encryption - [Compact](docs/jwe/compact/encrypt/classes/CompactEncrypt.md), [Flattened JSON](docs/jwe/flattened/encrypt/classes/FlattenedEncrypt.md), [General JSON](docs/jwe/general/encrypt/classes/GeneralEncrypt.md)
87
87
  - Decryption - [Compact](docs/jwe/compact/decrypt/functions/compactDecrypt.md), [Flattened JSON](docs/jwe/flattened/decrypt/functions/flattenedDecrypt.md), [General JSON](docs/jwe/general/decrypt/functions/generalDecrypt.md)
@@ -31,7 +31,7 @@ class GeneralEncrypt {
31
31
  #plaintext;
32
32
  #recipients = [];
33
33
  #protectedHeader;
34
- #unprotectedHeader;
34
+ #sharedUnprotectedHeader;
35
35
  #aad;
36
36
  constructor(plaintext) {
37
37
  this.#plaintext = plaintext;
@@ -44,7 +44,7 @@ class GeneralEncrypt {
44
44
  return assertNotSet(this.#protectedHeader, "setProtectedHeader"), this.#protectedHeader = protectedHeader, this;
45
45
  }
46
46
  setSharedUnprotectedHeader(sharedUnprotectedHeader) {
47
- return assertNotSet(this.#unprotectedHeader, "setSharedUnprotectedHeader"), this.#unprotectedHeader = sharedUnprotectedHeader, this;
47
+ return assertNotSet(this.#sharedUnprotectedHeader, "setSharedUnprotectedHeader"), this.#sharedUnprotectedHeader = sharedUnprotectedHeader, this;
48
48
  }
49
49
  setAdditionalAuthenticatedData(aad) {
50
50
  return this.#aad = aad, this;
@@ -54,7 +54,7 @@ class GeneralEncrypt {
54
54
  throw new JWEInvalid("at least one recipient must be added");
55
55
  assertUint8Array(this.#plaintext, "plaintext");
56
56
  const multiple = this.#recipients.length > 1;
57
- let enc, protectedHeader = this.#protectedHeader, sharedUnprotectedHeader = this.#unprotectedHeader;
57
+ let enc, protectedHeader = this.#protectedHeader, sharedUnprotectedHeader = this.#sharedUnprotectedHeader;
58
58
  const recipients = [];
59
59
  for (const recipient of this.#recipients) {
60
60
  const [unprotectedHeader, keyManagementParameters, key, crit] = recipient.state, input = [
@@ -19,30 +19,30 @@ async function calculateJwkThumbprint(key, digestAlgorithm) {
19
19
  throw new TypeError(invalidKeyInput(key, "CryptoKey", "KeyObject", "JSON Web Key"));
20
20
  if (digestAlgorithm ??= "sha256", digestAlgorithm !== "sha256" && digestAlgorithm !== "sha384" && digestAlgorithm !== "sha512")
21
21
  throw new TypeError('digestAlgorithm must one of "sha256", "sha384", or "sha512"');
22
- let components;
22
+ let requiredMembers;
23
23
  switch (jwk.kty) {
24
24
  case "AKP":
25
- check(jwk.alg, '"alg" (Algorithm) Parameter'), check(jwk.pub, '"pub" (Public key) Parameter'), components = { alg: jwk.alg, kty: jwk.kty, pub: jwk.pub };
25
+ check(jwk.alg, '"alg" (Algorithm) Parameter'), check(jwk.pub, '"pub" (Public key) Parameter'), requiredMembers = { alg: jwk.alg, kty: jwk.kty, pub: jwk.pub };
26
26
  break;
27
27
  case "EC":
28
- check(jwk.crv, '"crv" (Curve) Parameter'), check(jwk.x, '"x" (X Coordinate) Parameter'), check(jwk.y, '"y" (Y Coordinate) Parameter'), components = { crv: jwk.crv, kty: jwk.kty, x: jwk.x, y: jwk.y };
28
+ check(jwk.crv, '"crv" (Curve) Parameter'), check(jwk.x, '"x" (X Coordinate) Parameter'), check(jwk.y, '"y" (Y Coordinate) Parameter'), requiredMembers = { crv: jwk.crv, kty: jwk.kty, x: jwk.x, y: jwk.y };
29
29
  break;
30
30
  case "OKP":
31
- check(jwk.crv, '"crv" (Subtype of Key Pair) Parameter'), check(jwk.x, '"x" (Public Key) Parameter'), components = { crv: jwk.crv, kty: jwk.kty, x: jwk.x };
31
+ check(jwk.crv, '"crv" (Subtype of Key Pair) Parameter'), check(jwk.x, '"x" (Public Key) Parameter'), requiredMembers = { crv: jwk.crv, kty: jwk.kty, x: jwk.x };
32
32
  break;
33
33
  case "RSA":
34
- check(jwk.e, '"e" (Exponent) Parameter'), check(jwk.n, '"n" (Modulus) Parameter'), components = { e: jwk.e, kty: jwk.kty, n: jwk.n };
34
+ check(jwk.e, '"e" (Exponent) Parameter'), check(jwk.n, '"n" (Modulus) Parameter'), requiredMembers = { e: jwk.e, kty: jwk.kty, n: jwk.n };
35
35
  break;
36
36
  case "oct":
37
37
  if (typeof jwk.k != "string")
38
38
  throw new JWKInvalid('"k" (Key Value) Parameter missing or invalid');
39
- components = { k: jwk.k, kty: jwk.kty };
39
+ requiredMembers = { k: jwk.k, kty: jwk.kty };
40
40
  break;
41
41
  default:
42
42
  throw new JOSENotSupported('"kty" (Key Type) Parameter missing or unsupported');
43
43
  }
44
- const data = encode(JSON.stringify(components));
45
- return b64u(await digest(digestAlgorithm, data));
44
+ const thumbprintInput = encode(JSON.stringify(requiredMembers));
45
+ return b64u(await digest(digestAlgorithm, thumbprintInput));
46
46
  }
47
47
  async function calculateJwkThumbprintUri(key, digestAlgorithm) {
48
48
  digestAlgorithm ??= "sha256";
@@ -24,7 +24,8 @@ function createLocalJWKSet(jwks) {
24
24
  let snapshot;
25
25
  try {
26
26
  snapshot = structuredClone(jwks);
27
- } catch {
27
+ } catch (cause) {
28
+ throw new JWKSInvalid("JSON Web Key Set malformed", { cause });
28
29
  }
29
30
  if (!isJwkSet(snapshot))
30
31
  throw new JWKSInvalid("JSON Web Key Set malformed");
@@ -5,7 +5,7 @@ function isCloudflareWorkers() {
5
5
  return typeof WebSocketPair < "u" || typeof navigator < "u" && navigator.userAgent === "Cloudflare-Workers" || typeof EdgeRuntime < "u" && EdgeRuntime === "vercel";
6
6
  }
7
7
  let USER_AGENT;
8
- (typeof navigator > "u" || !navigator.userAgent?.startsWith?.("Mozilla/5.0 ")) && (USER_AGENT = "jose/v6.2.12");
8
+ (typeof navigator > "u" || !navigator.userAgent?.startsWith?.("Mozilla/5.0 ")) && (USER_AGENT = "jose/v6.2.13");
9
9
  const customFetch = /* @__PURE__ */ Symbol();
10
10
  async function fetchJwks(url, headers, signal, fetchImpl = fetch) {
11
11
  const response = await fetchImpl(url, {
@@ -14,14 +14,14 @@ async function fetchJwks(url, headers, signal, fetchImpl = fetch) {
14
14
  redirect: "manual",
15
15
  headers
16
16
  }).catch((err) => {
17
- throw err.name === "TimeoutError" ? new JWKSTimeout() : err;
17
+ throw err.name === "TimeoutError" ? new JWKSTimeout(void 0, { cause: err }) : err;
18
18
  });
19
19
  if (response.status !== 200)
20
20
  throw new JOSEError("Expected 200 OK from the JSON Web Key Set HTTP response");
21
21
  try {
22
22
  return await response.json();
23
- } catch {
24
- throw new JOSEError("Failed to parse the JSON Web Key Set HTTP response as JSON");
23
+ } catch (cause) {
24
+ throw new JOSEError("Failed to parse the JSON Web Key Set HTTP response as JSON", { cause });
25
25
  }
26
26
  }
27
27
  const jwksCache = /* @__PURE__ */ Symbol();
@@ -40,15 +40,15 @@ class GeneralSign {
40
40
  const jws = {
41
41
  signatures: [],
42
42
  payload: ""
43
- }, encoded = [];
43
+ }, encodedPayloadCache = [];
44
44
  let b64;
45
45
  for (const signature of this.#signatures) {
46
- const [protectedHeader, unprotectedHeader, key, crit] = signature.state, [{ payload, ...rest }, signatureB64] = await createSignature([this.#payload, protectedHeader, unprotectedHeader, crit, encoded], key);
46
+ const [protectedHeader, unprotectedHeader, key, crit] = signature.state, [{ payload, ...signatureMembers }, signatureB64] = await createSignature([this.#payload, protectedHeader, unprotectedHeader, crit, encodedPayloadCache], key);
47
47
  if (b64 === void 0)
48
48
  b64 = signatureB64, jws.payload = payload;
49
49
  else if (b64 !== signatureB64)
50
50
  throw new JWSInvalid("inconsistent use of JWS Unencoded Payload (RFC7797)");
51
- jws.signatures.push(rest);
51
+ jws.signatures.push(signatureMembers);
52
52
  }
53
53
  return jws;
54
54
  }
@@ -31,9 +31,9 @@ async function generalVerify(jws, key, options) {
31
31
  throw new JWSSignatureVerificationFailed();
32
32
  }
33
33
  const payload = inputPayload instanceof Uint8Array ? new Uint8Array(inputPayload) : inputPayload, candidates = signatureEntries.map((signature) => snapshotSignature(signature, payload)).filter((candidate) => candidate !== void 0);
34
- let modes = 0;
35
- for (const [, , mode] of candidates)
36
- if (modes |= mode, modes === 3)
34
+ let payloadEncodings = 0;
35
+ for (const [, , payloadEncoding] of candidates)
36
+ if (payloadEncodings |= payloadEncoding, payloadEncodings === 3)
37
37
  throw new JWSInvalid("inconsistent use of JWS Unencoded Payload (RFC7797)");
38
38
  for (const candidate of candidates)
39
39
  try {
@@ -1,5 +1,5 @@
1
1
  import { compactJWE, createJWE } from "../lib/jwe_encrypt.js";
2
- import { JWTClaimsBuilder, jwtClaim, jwtData } from "../lib/jwt_claims_set.js";
2
+ import { JWTClaimsBuilder, jwtClaim, jwtClaimsSetBytes } from "../lib/jwt_claims_set.js";
3
3
  import { assertNotSet } from "../lib/validate.js";
4
4
  const EncryptJWT_base = JWTClaimsBuilder;
5
5
  class EncryptJWT extends EncryptJWT_base {
@@ -29,7 +29,7 @@ class EncryptJWT extends EncryptJWT_base {
29
29
  return this.#replicateAudienceAsHeader = !0, this;
30
30
  }
31
31
  async encrypt(key, options) {
32
- const plaintext = jwtData(this);
32
+ const plaintext = jwtClaimsSetBytes(this);
33
33
  this.#input[1] && (this.#replicateIssuerAsHeader || this.#replicateSubjectAsHeader || this.#replicateAudienceAsHeader) && (this.#input[1] = {
34
34
  ...this.#input[1],
35
35
  iss: this.#replicateIssuerAsHeader ? jwtClaim(this, "iss") : void 0,
@@ -1,6 +1,6 @@
1
1
  import { createCompactSignature } from "../lib/jws_sign.js";
2
2
  import { JWTInvalid } from "../util/errors.js";
3
- import { JWTClaimsBuilder, jwtData } from "../lib/jwt_claims_set.js";
3
+ import { JWTClaimsBuilder, jwtClaimsSetBytes } from "../lib/jwt_claims_set.js";
4
4
  import { assertNotSet } from "../lib/validate.js";
5
5
  const SignJWT_base = JWTClaimsBuilder;
6
6
  class SignJWT extends SignJWT_base {
@@ -9,7 +9,7 @@ class SignJWT extends SignJWT_base {
9
9
  return assertNotSet(this.#protectedHeader, "setProtectedHeader"), this.#protectedHeader = protectedHeader, this;
10
10
  }
11
11
  async sign(key, options) {
12
- return createCompactSignature(jwtData(this), this.#protectedHeader, options?.crit, key, () => {
12
+ return createCompactSignature(jwtClaimsSetBytes(this), this.#protectedHeader, options?.crit, key, () => {
13
13
  throw new JWTInvalid("JWTs MUST NOT use unencoded payload");
14
14
  });
15
15
  }
@@ -1,12 +1,12 @@
1
1
  import * as b64u from "../util/base64url.js";
2
2
  import { decodeBase64url, parseJoseHeader, JWS_RECOGNIZED, validateB64, validateCrit } from "../lib/validate.js";
3
3
  import { JWSInvalid, JWTInvalid } from "../util/errors.js";
4
- import { validateClaimsSet, JWTClaimsBuilder, jwtData } from "../lib/jwt_claims_set.js";
4
+ import { validateClaimsSet, JWTClaimsBuilder, jwtClaimsSetBytes } from "../lib/jwt_claims_set.js";
5
5
  const UnsecuredJWT_base = JWTClaimsBuilder;
6
6
  class UnsecuredJWT extends UnsecuredJWT_base {
7
7
  encode() {
8
- const header = b64u.encode(JSON.stringify({ alg: "none" })), payload = b64u.encode(jwtData(this));
9
- return `${header}.${payload}.`;
8
+ const encodedProtectedHeader = b64u.encode(JSON.stringify({ alg: "none" })), encodedPayload = b64u.encode(jwtClaimsSetBytes(this));
9
+ return `${encodedProtectedHeader}.${encodedPayload}.`;
10
10
  }
11
11
  static decode(jwt, options) {
12
12
  if (typeof jwt != "string")
@@ -2,12 +2,12 @@ import { unsupportedAlg, algArgument } from "../lib/key_algorithm.js";
2
2
  import { validateExtractableOption } from "../lib/key.js";
3
3
  async function generateSecret(alg, options) {
4
4
  const extractable = validateExtractableOption(options?.extractable);
5
- let length, algorithm, keyUsages;
5
+ let keyLengthBits, algorithm, keyUsages;
6
6
  switch (alg) {
7
7
  case "HS256":
8
8
  case "HS384":
9
9
  case "HS512":
10
- length = +alg.slice(-3), algorithm = { name: "HMAC", hash: `SHA-${length}`, length }, keyUsages = ["sign", "verify"];
10
+ keyLengthBits = +alg.slice(-3), algorithm = { name: "HMAC", hash: `SHA-${keyLengthBits}`, length: keyLengthBits }, keyUsages = ["sign", "verify"];
11
11
  break;
12
12
  case "A128CBC-HS256":
13
13
  case "A192CBC-HS384":
@@ -16,7 +16,7 @@ async function generateSecret(alg, options) {
16
16
  case "A128KW":
17
17
  case "A192KW":
18
18
  case "A256KW":
19
- length = +alg.slice(1, 4), algorithm = { name: "AES-KW", length }, keyUsages = ["wrapKey", "unwrapKey"];
19
+ keyLengthBits = +alg.slice(1, 4), algorithm = { name: "AES-KW", length: keyLengthBits }, keyUsages = ["wrapKey", "unwrapKey"];
20
20
  break;
21
21
  case "A128GCMKW":
22
22
  case "A192GCMKW":
@@ -24,7 +24,7 @@ async function generateSecret(alg, options) {
24
24
  case "A128GCM":
25
25
  case "A192GCM":
26
26
  case "A256GCM":
27
- length = +alg.slice(1, 4), algorithm = { name: "AES-GCM", length }, keyUsages = ["encrypt", "decrypt"];
27
+ keyLengthBits = +alg.slice(1, 4), algorithm = { name: "AES-GCM", length: keyLengthBits }, keyUsages = ["encrypt", "decrypt"];
28
28
  break;
29
29
  default:
30
30
  unsupportedAlg(algArgument);
@@ -94,8 +94,8 @@ const parseECAlgorithmIdentifier = (state) => {
94
94
  try {
95
95
  const state = createASN1State(keyData);
96
96
  parseKeyHeader(state, keyFormat), algorithm = entry.resolve({ crv: parseECAlgorithmIdentifier(state) });
97
- } catch {
98
- throw new JOSENotSupported("Invalid or unsupported key format");
97
+ } catch (cause) {
98
+ throw new JOSENotSupported("Invalid or unsupported key format", { cause });
99
99
  }
100
100
  else
101
101
  algorithm = entry.subtle;
@@ -1,4 +1,4 @@
1
- const encoder = new TextEncoder(), decoder = new TextDecoder(), strictDecoder = new TextDecoder("utf-8", { fatal: !0 }), MAX_INT32 = 2 ** 32;
1
+ const encoder = new TextEncoder(), decoder = new TextDecoder(), strictDecoder = new TextDecoder("utf-8", { fatal: !0 }), UINT32_RANGE = 2 ** 32;
2
2
  function concat(...buffers) {
3
3
  const size = buffers.reduce((acc, { length }) => acc + length, 0), buf = new Uint8Array(size);
4
4
  let i = 0;
@@ -7,12 +7,12 @@ function concat(...buffers) {
7
7
  return buf;
8
8
  }
9
9
  function writeUInt32BE(buf, value, offset) {
10
- if (value < 0 || value >= MAX_INT32)
11
- throw new RangeError(`value must be >= 0 and <= ${MAX_INT32 - 1}. Received ${value}`);
10
+ if (value < 0 || value >= UINT32_RANGE)
11
+ throw new RangeError(`value must be >= 0 and <= ${UINT32_RANGE - 1}. Received ${value}`);
12
12
  buf.set([value >>> 24, value >>> 16, value >>> 8, value & 255], offset);
13
13
  }
14
14
  function uint64be(value) {
15
- const high = Math.floor(value / MAX_INT32), low = value % MAX_INT32, buf = new Uint8Array(8);
15
+ const high = Math.floor(value / UINT32_RANGE), low = value % UINT32_RANGE, buf = new Uint8Array(8);
16
16
  return writeUInt32BE(buf, high, 0), writeUInt32BE(buf, low, 4), buf;
17
17
  }
18
18
  function uint32be(value) {
@@ -15,20 +15,20 @@ function checkIvLength(enc, iv) {
15
15
  async function cbcKeySetup(enc, cek, usage) {
16
16
  if (!(cek instanceof Uint8Array))
17
17
  throw new TypeError(invalidKeyInput(cek, "Uint8Array"));
18
- const keySize = enc.cekBits >> 1, encKey = await crypto.subtle.importKey("raw", cek.subarray(keySize >> 3), "AES-CBC", !1, [usage]), macKey = await crypto.subtle.importKey("raw", cek.subarray(0, keySize >> 3), {
19
- hash: `SHA-${keySize << 1}`,
18
+ const keyLengthBits = enc.cekBits >> 1, encKey = await crypto.subtle.importKey("raw", cek.subarray(keyLengthBits >> 3), "AES-CBC", !1, [usage]), macKey = await crypto.subtle.importKey("raw", cek.subarray(0, keyLengthBits >> 3), {
19
+ hash: `SHA-${keyLengthBits << 1}`,
20
20
  name: "HMAC"
21
21
  }, !1, ["sign"]);
22
- return [encKey, macKey, keySize];
22
+ return [encKey, macKey, keyLengthBits];
23
23
  }
24
- async function cbcHmacTag(macKey, macData, keySize) {
25
- return new Uint8Array((await crypto.subtle.sign("HMAC", macKey, macData)).slice(0, keySize >> 3));
24
+ async function cbcHmacTag(macKey, macData, keyLengthBits) {
25
+ return new Uint8Array((await crypto.subtle.sign("HMAC", macKey, macData)).slice(0, keyLengthBits >> 3));
26
26
  }
27
27
  async function cbcEncrypt(enc, plaintext, cek, iv, aad) {
28
- const [encKey, macKey, keySize] = await cbcKeySetup(enc, cek, "encrypt"), ciphertext = new Uint8Array(await crypto.subtle.encrypt({
28
+ const [encKey, macKey, keyLengthBits] = await cbcKeySetup(enc, cek, "encrypt"), ciphertext = new Uint8Array(await crypto.subtle.encrypt({
29
29
  iv,
30
30
  name: "AES-CBC"
31
- }, encKey, plaintext)), macData = concat(aad, iv, ciphertext, uint64be(aad.length * 8)), tag = await cbcHmacTag(macKey, macData, keySize);
31
+ }, encKey, plaintext)), al = uint64be(aad.length * 8), macData = concat(aad, iv, ciphertext, al), tag = await cbcHmacTag(macKey, macData, keyLengthBits);
32
32
  return { ciphertext, tag, iv };
33
33
  }
34
34
  async function timingSafeEqual(a, b) {
@@ -36,7 +36,7 @@ async function timingSafeEqual(a, b) {
36
36
  return crypto.subtle.verify(algorithm, key, aHmac, b);
37
37
  }
38
38
  async function cbcDecrypt(enc, cek, ciphertext, iv, tag, aad) {
39
- const [encKey, macKey, keySize] = await cbcKeySetup(enc, cek, "decrypt"), macData = concat(aad, iv, ciphertext, uint64be(aad.length * 8)), expectedTag = await cbcHmacTag(macKey, macData, keySize);
39
+ const [encKey, macKey, keyLengthBits] = await cbcKeySetup(enc, cek, "decrypt"), al = uint64be(aad.length * 8), macData = concat(aad, iv, ciphertext, al), expectedTag = await cbcHmacTag(macKey, macData, keyLengthBits);
40
40
  try {
41
41
  if (await timingSafeEqual(tag, expectedTag))
42
42
  return new Uint8Array(await crypto.subtle.decrypt({ iv, name: "AES-CBC" }, encKey, ciphertext));
@@ -1,5 +1,5 @@
1
1
  import { decrypt, generateCek } from "./content_encryption.js";
2
- import { decodeBase64url, encodeBase64url, parseJoseHeader, isDisjoint, isObject, validateCrit, validateAlgorithms, JWE_RECOGNIZED } from "./validate.js";
2
+ import { decodeBase64url, encodeAsciiMember, parseJoseHeader, isDisjoint, isObject, validateCrit, validateAlgorithms, JWE_RECOGNIZED } from "./validate.js";
3
3
  import { JOSEAlgNotAllowed, JOSENotSupported, JWEInvalid } from "../util/errors.js";
4
4
  import { decryptKeyManagement } from "./key_management.js";
5
5
  import { decoder } from "./buffer_utils.js";
@@ -59,13 +59,13 @@ function checkRecipient(jwe) {
59
59
  }
60
60
  function shareJWE(jwe) {
61
61
  const { protected: encodedProtected, ciphertext, iv, tag, aad } = jwe;
62
- let parsedProt;
63
- return encodedProtected !== void 0 && (parsedProt = parseJoseHeader(encodedProtected, JWEInvalid, "JWE Protected Header is invalid")), [
64
- parsedProt,
62
+ let protectedHeader;
63
+ return encodedProtected !== void 0 && (protectedHeader = parseJoseHeader(encodedProtected, JWEInvalid, "JWE Protected Header is invalid")), [
64
+ protectedHeader,
65
65
  decodeBase64url(ciphertext, "ciphertext", JWEInvalid),
66
66
  iv !== void 0 ? decodeBase64url(iv, "iv", JWEInvalid) : void 0,
67
67
  tag !== void 0 ? decodeBase64url(tag, "tag", JWEInvalid) : void 0,
68
- encodeBase64url((encodedProtected ?? "") + (aad !== void 0 ? `.${aad}` : ""), "aad", JWEInvalid)
68
+ encodeAsciiMember((encodedProtected ?? "") + (aad !== void 0 ? `.${aad}` : ""), "aad", JWEInvalid)
69
69
  ];
70
70
  }
71
71
  function prepareDecrypt(options) {
@@ -78,16 +78,16 @@ function prepareDecrypt(options) {
78
78
  ];
79
79
  }
80
80
  async function decryptJWE(jwe, shared, key, token = shareJWE(jwe)) {
81
- const [parsedProt, ciphertext, iv, tag, additionalData] = token, { header, unprotected, aad } = jwe;
81
+ const [protectedHeader, ciphertext, iv, tag, additionalAuthenticatedData] = token, { header, unprotected, aad } = jwe;
82
82
  let joseHeader;
83
83
  if (header !== void 0 || unprotected !== void 0) {
84
- if (!isDisjoint(parsedProt, header, unprotected))
84
+ if (!isDisjoint(protectedHeader, header, unprotected))
85
85
  throw new JWEInvalid("JWE Protected, JWE Unprotected Header, and JWE Per-Recipient Unprotected Header Parameter names must be disjoint");
86
- joseHeader = { ...parsedProt, ...header, ...unprotected };
86
+ joseHeader = { ...protectedHeader, ...header, ...unprotected };
87
87
  } else
88
- joseHeader = parsedProt ?? {};
88
+ joseHeader = protectedHeader ?? {};
89
89
  const [keyManagementAlgorithms, contentEncryptionAlgorithms, crit, maxPBES2Count, maxDecompressedLength] = shared, { encrypted_key: encodedKey } = jwe;
90
- validateCrit(JWEInvalid, JWE_RECOGNIZED, crit, parsedProt, joseHeader), validateZip(joseHeader, parsedProt);
90
+ validateCrit(JWEInvalid, JWE_RECOGNIZED, crit, protectedHeader, joseHeader), validateZip(joseHeader, protectedHeader);
91
91
  const { alg, enc } = joseHeader;
92
92
  if (typeof alg != "string" || !alg)
93
93
  throw new JWEInvalid("missing JWE Algorithm (alg) in JWE Header");
@@ -122,13 +122,13 @@ async function decryptJWE(jwe, shared, key, token = shareJWE(jwe)) {
122
122
  encryptedKey = new Uint8Array();
123
123
  }
124
124
  let resolvedKey = !1;
125
- typeof key == "function" && (key = await key(parsedProt, jwe), resolvedKey = !0);
125
+ typeof key == "function" && (key = await key(protectedHeader, jwe), resolvedKey = !0);
126
126
  const algEntry = selected ?? jweAlgorithm(alg);
127
127
  isJWECEKTransport(algEntry) && encryptedKey === void 0 && (encryptedKey = new Uint8Array());
128
128
  const k = await prepareKey(algEntry.mode === "direct-encryption" ? encEntry : algEntry, key, "decrypt");
129
129
  let plaintext;
130
130
  if (algEntry.mode === "integrated-encryption")
131
- plaintext = await algEntry.decrypt(k, encryptedKey, ciphertext, additionalData, parsedProt, joseHeader);
131
+ plaintext = await algEntry.decrypt(k, encryptedKey, ciphertext, additionalAuthenticatedData, protectedHeader, joseHeader);
132
132
  else {
133
133
  const encryption = encEntry;
134
134
  let cek;
@@ -139,7 +139,7 @@ async function decryptJWE(jwe, shared, key, token = shareJWE(jwe)) {
139
139
  throw err;
140
140
  cek = generateCek(encryption);
141
141
  }
142
- plaintext = await decrypt(encryption, cek, ciphertext, iv, tag, additionalData);
142
+ plaintext = await decrypt(encryption, cek, ciphertext, iv, tag, additionalAuthenticatedData);
143
143
  }
144
144
  if (joseHeader.zip === "DEF") {
145
145
  const decompressionLimit = maxDecompressedLength ?? 25e4;
@@ -153,7 +153,7 @@ async function decryptJWE(jwe, shared, key, token = shareJWE(jwe)) {
153
153
  }
154
154
  return {
155
155
  plaintext,
156
- ...parsedProt && { protectedHeader: parsedProt },
156
+ ...protectedHeader && { protectedHeader },
157
157
  ...aad !== void 0 && {
158
158
  additionalAuthenticatedData: decodeBase64url(aad, "aad", JWEInvalid)
159
159
  },
@@ -48,17 +48,17 @@ async function encryptJWE(input, checked, key) {
48
48
  const algEntry = selected ?? jweAlgorithm(joseHeader.alg);
49
49
  let encryptedKey, parameters, cek;
50
50
  algEntry.mode === "integrated-encryption" ? cek = await prepareKey(algEntry, key, "encrypt") : [cek, encryptedKey, parameters] = await encryptKeyManagement(algEntry, encEntry, key, joseHeader, providedCek, keyManagementParameters), parameters && (unprotectedParameters ? unprotectedHeader = unprotectedHeader ? { ...unprotectedHeader, ...parameters } : parameters : protectedHeader = protectedHeader ? { ...protectedHeader, ...parameters } : parameters, checkDisjoint(protectedHeader, unprotectedHeader, sharedUnprotectedHeader));
51
- const protectedHeaderS = protectedHeader ? b64u(JSON.stringify(protectedHeader)) : "", aadMember = aad?.byteLength ? b64u(aad) : void 0, additionalData = encode(aadMember ? `${protectedHeaderS}.${aadMember}` : protectedHeaderS);
51
+ const encodedProtectedHeader = protectedHeader ? b64u(JSON.stringify(protectedHeader)) : "", encodedAad = aad?.byteLength ? b64u(aad) : void 0, additionalAuthenticatedData = encode(encodedAad ? `${encodedProtectedHeader}.${encodedAad}` : encodedProtectedHeader);
52
52
  let plaintext = inputPlaintext;
53
53
  joseHeader.zip === "DEF" && (plaintext = await compress(plaintext).catch((cause) => {
54
54
  throw new JWEInvalid("Failed to compress plaintext", { cause });
55
55
  }));
56
56
  let ciphertext, tag, iv;
57
- algEntry.mode === "integrated-encryption" ? [encryptedKey, ciphertext] = await algEntry.encrypt(cek, plaintext, additionalData, protectedHeader, joseHeader, keyManagementParameters) : { ciphertext, tag, iv } = await encrypt(encEntry, plaintext, cek, inputIv, additionalData);
57
+ algEntry.mode === "integrated-encryption" ? [encryptedKey, ciphertext] = await algEntry.encrypt(cek, plaintext, additionalAuthenticatedData, protectedHeader, joseHeader, keyManagementParameters) : { ciphertext, tag, iv } = await encrypt(encEntry, plaintext, cek, inputIv, additionalAuthenticatedData);
58
58
  const jwe = {
59
59
  ciphertext: b64u(ciphertext)
60
60
  };
61
- return iv && (jwe.iv = b64u(iv)), tag && (jwe.tag = b64u(tag)), encryptedKey?.byteLength && (jwe.encrypted_key = b64u(encryptedKey)), aadMember && (jwe.aad = aadMember), protectedHeader && (jwe.protected = protectedHeaderS), sharedUnprotectedHeader && (jwe.unprotected = sharedUnprotectedHeader), unprotectedHeader && (jwe.header = unprotectedHeader), jwe;
61
+ return iv && (jwe.iv = b64u(iv)), tag && (jwe.tag = b64u(tag)), encryptedKey?.byteLength && (jwe.encrypted_key = b64u(encryptedKey)), encodedAad && (jwe.aad = encodedAad), protectedHeader && (jwe.protected = encodedProtectedHeader), sharedUnprotectedHeader && (jwe.unprotected = sharedUnprotectedHeader), unprotectedHeader && (jwe.header = unprotectedHeader), jwe;
62
62
  }
63
63
  async function createJWE(input, key, options) {
64
64
  return encryptJWE(input, checkEncryptHeaders(input, options), key);
@@ -34,8 +34,8 @@ function eddsa() {
34
34
  usages: sig
35
35
  };
36
36
  }
37
- function mldsa(bits) {
38
- const subtle = { name: `ML-DSA-${bits}` };
37
+ function mldsa(parameterSet) {
38
+ const subtle = { name: `ML-DSA-${parameterSet}` };
39
39
  return {
40
40
  kty: ["AKP"],
41
41
  subtle,
@@ -5,10 +5,10 @@ import { JWSInvalid } from "../util/errors.js";
5
5
  import { concat, encode, encoder } from "./buffer_utils.js";
6
6
  import { prepareKey, rawKey, checkModulusLength } from "./key.js";
7
7
  async function createSignature(input, key, rejectUnencoded) {
8
- let [payload, protectedHeader, unprotectedHeader, crit] = input, protectedHeaderString = "";
8
+ let [payload, protectedHeader, unprotectedHeader, crit] = input, encodedProtectedHeader = "";
9
9
  if (protectedHeader !== void 0) {
10
10
  const normalized = serializeJoseHeader(JWSInvalid, protectedHeader);
11
- protectedHeader = normalized[0], protectedHeaderString = b64u(normalized[1]);
11
+ protectedHeader = normalized[0], encodedProtectedHeader = b64u(normalized[1]);
12
12
  }
13
13
  if (unprotectedHeader !== void 0 && (unprotectedHeader = serializeJoseHeader(JWSInvalid, unprotectedHeader)[0]), !protectedHeader && !unprotectedHeader)
14
14
  throw new JWSInvalid("either setProtectedHeader or setUnprotectedHeader must be called before #sign()");
@@ -22,19 +22,19 @@ async function createSignature(input, key, rejectUnencoded) {
22
22
  if (typeof alg != "string" || !alg)
23
23
  throw new JWSInvalid('JWS "alg" (Algorithm) Header Parameter missing or invalid');
24
24
  const entry = jwsAlgorithm(alg);
25
- let payloadS = "", payloadB = payload, data;
25
+ let encodedPayload = "", signingPayload = payload, signingInput;
26
26
  if (b64) {
27
- const encoded = input[4];
28
- encoded ? (payloadS = encoded[0] ??= b64u(payload), payloadB = encoded[1] ??= encode(payloadS)) : (payloadS = b64u(payload), data = encoder.encode(`${protectedHeaderString}.${payloadS}`));
27
+ const encodedPayloadCache = input[4];
28
+ encodedPayloadCache ? (encodedPayload = encodedPayloadCache[0] ??= b64u(payload), signingPayload = encodedPayloadCache[1] ??= encode(encodedPayload)) : (encodedPayload = b64u(payload), signingInput = encoder.encode(`${encodedProtectedHeader}.${encodedPayload}`));
29
29
  }
30
- data ??= concat(encode(protectedHeaderString), encode("."), payloadB);
31
- const k = await rawKey(await prepareKey(entry, key, "sign"), entry.subtle, "sign");
32
- entry.minRsaBits && checkModulusLength(entry.alg, k);
30
+ signingInput ??= concat(encode(encodedProtectedHeader), encode("."), signingPayload);
31
+ const signingKey = await rawKey(await prepareKey(entry, key, "sign"), entry.subtle, "sign");
32
+ entry.minRsaBits && checkModulusLength(entry.alg, signingKey);
33
33
  const jws = {
34
- signature: b64u(new Uint8Array(await crypto.subtle.sign(entry.signing, k, data))),
35
- payload: payloadS
34
+ signature: b64u(new Uint8Array(await crypto.subtle.sign(entry.signing, signingKey, signingInput))),
35
+ payload: encodedPayload
36
36
  };
37
- return protectedHeader && (jws.protected = protectedHeaderString), unprotectedHeader && (jws.header = unprotectedHeader), [jws, b64];
37
+ return protectedHeader && (jws.protected = encodedProtectedHeader), unprotectedHeader && (jws.header = unprotectedHeader), [jws, b64];
38
38
  }
39
39
  async function createCompactSignature(payload, protectedHeader, crit, key, rejectUnencoded) {
40
40
  const [jws] = await createSignature([payload, protectedHeader, void 0, crit], key, rejectUnencoded);