@songtonyli/dsh-cli 0.1.81 → 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 (424) hide show
  1. package/README.md +1 -1
  2. package/bin/dsh.mjs +1 -1
  3. package/node_modules/@aws-sdk/core/dist-cjs/submodules/protocols/index.js +94 -1589
  4. package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/index.js +1 -7
  5. package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/AwsJsonRpcProtocol.js +1 -3
  6. package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/AwsRestJsonProtocol.js +1 -3
  7. package/node_modules/@aws-sdk/core/package.json +3 -3
  8. package/node_modules/@aws-sdk/credential-provider-env/package.json +4 -4
  9. package/node_modules/@aws-sdk/credential-provider-http/package.json +4 -4
  10. package/node_modules/@aws-sdk/credential-provider-ini/package.json +11 -11
  11. package/node_modules/@aws-sdk/credential-provider-login/package.json +5 -5
  12. package/node_modules/@aws-sdk/credential-provider-node/package.json +9 -9
  13. package/node_modules/@aws-sdk/credential-provider-process/package.json +4 -4
  14. package/node_modules/@aws-sdk/credential-provider-sso/package.json +6 -6
  15. package/node_modules/@aws-sdk/credential-provider-web-identity/package.json +5 -5
  16. package/node_modules/@aws-sdk/eventstream-handler-node/package.json +3 -3
  17. package/node_modules/@aws-sdk/middleware-eventstream/package.json +3 -3
  18. package/node_modules/@aws-sdk/middleware-websocket/package.json +4 -4
  19. package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/cognito-identity/index.js +1 -1
  20. package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/signin/index.js +1 -1
  21. package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sso/index.js +1 -1
  22. package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sso-oidc/index.js +1 -1
  23. package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sts/index.js +1 -1
  24. package/node_modules/@aws-sdk/nested-clients/package.json +5 -5
  25. package/node_modules/@aws-sdk/signature-v4-multi-region/package.json +2 -2
  26. package/node_modules/@aws-sdk/token-providers/dist-cjs/index.js +37 -19
  27. package/node_modules/@aws-sdk/token-providers/dist-es/fromSso.js +37 -19
  28. package/node_modules/@aws-sdk/token-providers/package.json +5 -5
  29. package/node_modules/@aws-sdk/types/package.json +1 -1
  30. package/node_modules/@deepseek-ai/dsh-app-boot/lib/index.js +18 -12
  31. package/node_modules/@deepseek-ai/dsh-client-modules/lib/index.js +1 -1
  32. package/node_modules/@deepseek-ai/dsh-client-ui-sidebar/lib/client.js +1 -1
  33. package/node_modules/@deepseek-ai/dsh-experimental-agent-team-profile/README.i18n.yaml +4 -4
  34. package/node_modules/@deepseek-ai/dsh-experimental-agent-team-profile/README.md +2 -2
  35. package/node_modules/@deepseek-ai/dsh-experimental-agent-team-profile/README.zh.md +2 -2
  36. package/node_modules/@deepseek-ai/dsh-subprocess-local/README.i18n.yaml +14 -14
  37. package/node_modules/@deepseek-ai/dsh-subprocess-local/README.md +7 -5
  38. package/node_modules/@deepseek-ai/dsh-subprocess-local/README.zh.md +7 -5
  39. package/node_modules/@deepseek-ai/dsh-subprocess-local/lib/index.js +15 -3
  40. package/node_modules/@deepseek-ai/dsh-subprocess-local/lib/runner-launch-f9xQyTek.js +1669 -0
  41. package/node_modules/@deepseek-ai/dsh-subprocess-local/lib/runner.js +1 -1
  42. package/node_modules/@deepseek-ai/dsh-tui-app/README.i18n.yaml +19 -16
  43. package/node_modules/@deepseek-ai/dsh-tui-app/README.md +38 -8
  44. package/node_modules/@deepseek-ai/dsh-tui-app/README.zh.md +38 -8
  45. package/node_modules/@deepseek-ai/dsh-tui-app/lib/index.js +8457 -7005
  46. package/node_modules/@opentelemetry/api/README.md +4 -23
  47. package/node_modules/@opentelemetry/api/dist/api/context.cjs +100 -0
  48. package/node_modules/@opentelemetry/api/dist/api/context.mjs +100 -0
  49. package/node_modules/@opentelemetry/api/dist/api/diag.cjs +68 -0
  50. package/node_modules/@opentelemetry/api/dist/api/diag.mjs +68 -0
  51. package/node_modules/@opentelemetry/api/dist/api/logs.cjs +59 -0
  52. package/node_modules/@opentelemetry/api/dist/api/logs.mjs +59 -0
  53. package/node_modules/@opentelemetry/api/dist/api/metrics.cjs +46 -0
  54. package/node_modules/@opentelemetry/api/dist/api/metrics.mjs +46 -0
  55. package/node_modules/@opentelemetry/api/dist/api/propagation.cjs +74 -0
  56. package/node_modules/@opentelemetry/api/dist/api/propagation.mjs +74 -0
  57. package/node_modules/@opentelemetry/api/dist/api/trace.cjs +62 -0
  58. package/node_modules/@opentelemetry/api/dist/api/trace.mjs +62 -0
  59. package/node_modules/@opentelemetry/api/dist/baggage/context-helpers.cjs +48 -0
  60. package/node_modules/@opentelemetry/api/dist/baggage/context-helpers.mjs +45 -0
  61. package/node_modules/@opentelemetry/api/dist/baggage/internal/baggage-impl.cjs +36 -0
  62. package/node_modules/@opentelemetry/api/dist/baggage/internal/baggage-impl.mjs +36 -0
  63. package/node_modules/@opentelemetry/api/dist/baggage/internal/symbol.cjs +9 -0
  64. package/node_modules/@opentelemetry/api/dist/baggage/internal/symbol.mjs +9 -0
  65. package/node_modules/@opentelemetry/api/dist/baggage/utils.cjs +37 -0
  66. package/node_modules/@opentelemetry/api/dist/baggage/utils.mjs +36 -0
  67. package/node_modules/@opentelemetry/api/dist/context/NoopContextManager.cjs +27 -0
  68. package/node_modules/@opentelemetry/api/dist/context/NoopContextManager.mjs +27 -0
  69. package/node_modules/@opentelemetry/api/dist/context/context.cjs +41 -0
  70. package/node_modules/@opentelemetry/api/dist/context/context.mjs +40 -0
  71. package/node_modules/@opentelemetry/api/dist/context-api.cjs +10 -0
  72. package/node_modules/@opentelemetry/api/dist/context-api.mjs +11 -0
  73. package/node_modules/@opentelemetry/api/dist/diag/ComponentLogger.cjs +40 -0
  74. package/node_modules/@opentelemetry/api/dist/diag/ComponentLogger.mjs +40 -0
  75. package/node_modules/@opentelemetry/api/dist/diag/consoleLogger.cjs +62 -0
  76. package/node_modules/@opentelemetry/api/dist/diag/consoleLogger.mjs +61 -0
  77. package/node_modules/@opentelemetry/api/dist/diag/internal/logLevelLogger.cjs +23 -0
  78. package/node_modules/@opentelemetry/api/dist/diag/internal/logLevelLogger.mjs +23 -0
  79. package/node_modules/@opentelemetry/api/dist/diag/types.cjs +32 -0
  80. package/node_modules/@opentelemetry/api/dist/diag/types.mjs +32 -0
  81. package/node_modules/@opentelemetry/api/dist/diag-api.cjs +14 -0
  82. package/node_modules/@opentelemetry/api/dist/diag-api.mjs +15 -0
  83. package/node_modules/@opentelemetry/api/dist/experimental/index.cjs +4 -0
  84. package/node_modules/@opentelemetry/api/dist/experimental/index.mjs +2 -0
  85. package/node_modules/@opentelemetry/api/dist/experimental/trace/SugaredTracer.cjs +88 -0
  86. package/node_modules/@opentelemetry/api/dist/experimental/trace/SugaredTracer.mjs +87 -0
  87. package/node_modules/@opentelemetry/api/dist/index.cjs +71 -0
  88. package/node_modules/@opentelemetry/api/dist/index.mjs +37 -0
  89. package/node_modules/@opentelemetry/api/dist/internal/global-utils.cjs +52 -0
  90. package/node_modules/@opentelemetry/api/dist/internal/global-utils.mjs +50 -0
  91. package/node_modules/@opentelemetry/api/dist/internal/semver.cjs +83 -0
  92. package/node_modules/@opentelemetry/api/dist/internal/semver.mjs +82 -0
  93. package/node_modules/@opentelemetry/api/dist/logs/LogRecord.cjs +33 -0
  94. package/node_modules/@opentelemetry/api/dist/logs/LogRecord.mjs +33 -0
  95. package/node_modules/@opentelemetry/api/dist/logs/NoopLogger.cjs +20 -0
  96. package/node_modules/@opentelemetry/api/dist/logs/NoopLogger.mjs +18 -0
  97. package/node_modules/@opentelemetry/api/dist/logs/NoopLoggerProvider.cjs +13 -0
  98. package/node_modules/@opentelemetry/api/dist/logs/NoopLoggerProvider.mjs +12 -0
  99. package/node_modules/@opentelemetry/api/dist/logs/ProxyLogger.cjs +36 -0
  100. package/node_modules/@opentelemetry/api/dist/logs/ProxyLogger.mjs +36 -0
  101. package/node_modules/@opentelemetry/api/dist/logs/ProxyLoggerProvider.cjs +36 -0
  102. package/node_modules/@opentelemetry/api/dist/logs/ProxyLoggerProvider.mjs +36 -0
  103. package/node_modules/@opentelemetry/api/dist/logs-api.cjs +11 -0
  104. package/node_modules/@opentelemetry/api/dist/logs-api.mjs +12 -0
  105. package/node_modules/@opentelemetry/api/dist/metrics/Metric.cjs +15 -0
  106. package/node_modules/@opentelemetry/api/dist/metrics/Metric.mjs +15 -0
  107. package/node_modules/@opentelemetry/api/dist/metrics/NoopMeter.cjs +116 -0
  108. package/node_modules/@opentelemetry/api/dist/metrics/NoopMeter.mjs +98 -0
  109. package/node_modules/@opentelemetry/api/dist/metrics/NoopMeterProvider.cjs +17 -0
  110. package/node_modules/@opentelemetry/api/dist/metrics/NoopMeterProvider.mjs +16 -0
  111. package/node_modules/@opentelemetry/api/dist/metrics-api.cjs +11 -0
  112. package/node_modules/@opentelemetry/api/dist/metrics-api.mjs +12 -0
  113. package/node_modules/@opentelemetry/api/dist/propagation/NoopTextMapPropagator.cjs +19 -0
  114. package/node_modules/@opentelemetry/api/dist/propagation/NoopTextMapPropagator.mjs +19 -0
  115. package/node_modules/@opentelemetry/api/dist/propagation/TextMapPropagator.cjs +26 -0
  116. package/node_modules/@opentelemetry/api/dist/propagation/TextMapPropagator.mjs +25 -0
  117. package/node_modules/@opentelemetry/api/dist/propagation-api.cjs +11 -0
  118. package/node_modules/@opentelemetry/api/dist/propagation-api.mjs +12 -0
  119. package/node_modules/@opentelemetry/api/dist/trace/NonRecordingSpan.cjs +45 -0
  120. package/node_modules/@opentelemetry/api/dist/trace/NonRecordingSpan.mjs +45 -0
  121. package/node_modules/@opentelemetry/api/dist/trace/NoopTracer.cjs +44 -0
  122. package/node_modules/@opentelemetry/api/dist/trace/NoopTracer.mjs +44 -0
  123. package/node_modules/@opentelemetry/api/dist/trace/NoopTracerProvider.cjs +17 -0
  124. package/node_modules/@opentelemetry/api/dist/trace/NoopTracerProvider.mjs +17 -0
  125. package/node_modules/@opentelemetry/api/dist/trace/ProxyTracer.cjs +37 -0
  126. package/node_modules/@opentelemetry/api/dist/trace/ProxyTracer.mjs +38 -0
  127. package/node_modules/@opentelemetry/api/dist/trace/ProxyTracerProvider.cjs +41 -0
  128. package/node_modules/@opentelemetry/api/dist/trace/ProxyTracerProvider.mjs +42 -0
  129. package/node_modules/@opentelemetry/api/dist/trace/SamplingResult.cjs +30 -0
  130. package/node_modules/@opentelemetry/api/dist/trace/SamplingResult.mjs +30 -0
  131. package/node_modules/@opentelemetry/api/dist/trace/context-utils.cjs +67 -0
  132. package/node_modules/@opentelemetry/api/dist/trace/context-utils.mjs +62 -0
  133. package/node_modules/@opentelemetry/api/dist/trace/internal/tracestate-impl.cjs +77 -0
  134. package/node_modules/@opentelemetry/api/dist/trace/internal/tracestate-impl.mjs +77 -0
  135. package/node_modules/@opentelemetry/api/dist/trace/internal/tracestate-validators.cjs +28 -0
  136. package/node_modules/@opentelemetry/api/dist/trace/internal/tracestate-validators.mjs +27 -0
  137. package/node_modules/@opentelemetry/api/dist/trace/internal/utils.cjs +13 -0
  138. package/node_modules/@opentelemetry/api/dist/trace/internal/utils.mjs +13 -0
  139. package/node_modules/@opentelemetry/api/dist/trace/invalid-span-constants.cjs +24 -0
  140. package/node_modules/@opentelemetry/api/dist/trace/invalid-span-constants.mjs +22 -0
  141. package/node_modules/@opentelemetry/api/dist/trace/span_kind.cjs +35 -0
  142. package/node_modules/@opentelemetry/api/dist/trace/span_kind.mjs +35 -0
  143. package/node_modules/@opentelemetry/api/dist/trace/spancontext-utils.cjs +151 -0
  144. package/node_modules/@opentelemetry/api/dist/trace/spancontext-utils.mjs +148 -0
  145. package/node_modules/@opentelemetry/api/dist/trace/status.cjs +26 -0
  146. package/node_modules/@opentelemetry/api/dist/trace/status.mjs +26 -0
  147. package/node_modules/@opentelemetry/api/dist/trace/trace_flags.cjs +15 -0
  148. package/node_modules/@opentelemetry/api/dist/trace/trace_flags.mjs +15 -0
  149. package/node_modules/@opentelemetry/api/dist/trace-api.cjs +11 -0
  150. package/node_modules/@opentelemetry/api/dist/trace-api.mjs +12 -0
  151. package/node_modules/@opentelemetry/api/dist/version.cjs +6 -0
  152. package/node_modules/@opentelemetry/api/dist/version.mjs +6 -0
  153. package/node_modules/@opentelemetry/api/package.json +32 -34
  154. package/node_modules/@shikijs/vscode-textmate/dist/index.js +46 -1
  155. package/node_modules/@shikijs/vscode-textmate/package.json +9 -9
  156. package/node_modules/@smithy/core/dist-cjs/submodules/client/index.js +15 -2
  157. package/node_modules/@smithy/core/dist-cjs/submodules/event-streams/index.browser.js +10 -0
  158. package/node_modules/@smithy/core/dist-cjs/submodules/event-streams/index.js +10 -0
  159. package/node_modules/@smithy/core/dist-cjs/submodules/protocols/index.js +5 -5
  160. package/node_modules/@smithy/core/dist-es/submodules/client/smithy-client/command.js +16 -2
  161. package/node_modules/@smithy/core/dist-es/submodules/event-streams/eventstream-codec/HeaderMarshaller.js +10 -0
  162. package/node_modules/@smithy/core/dist-es/submodules/protocols/json/codec-v2/JsonShapeSerializer2.js +5 -5
  163. package/node_modules/@smithy/core/package.json +1 -1
  164. package/node_modules/execa/lib/convert/duplex.js +8 -4
  165. package/node_modules/execa/lib/convert/readable.js +3 -8
  166. package/node_modules/execa/lib/convert/writable.js +6 -5
  167. package/node_modules/execa/lib/io/input-sync.js +2 -1
  168. package/node_modules/execa/lib/io/max-buffer.js +2 -1
  169. package/node_modules/execa/lib/io/output-sync.js +2 -1
  170. package/node_modules/execa/lib/methods/create.js +7 -0
  171. package/node_modules/execa/lib/methods/node.js +1 -1
  172. package/node_modules/execa/lib/methods/script.js +3 -3
  173. package/node_modules/execa/lib/resolve/all-async.js +2 -1
  174. package/node_modules/execa/lib/resolve/wait-subprocess.js +6 -0
  175. package/node_modules/execa/lib/stdio/handle-async.js +3 -2
  176. package/node_modules/execa/lib/stdio/handle.js +8 -3
  177. package/node_modules/execa/lib/transform/generator.js +7 -0
  178. package/node_modules/execa/lib/transform/run-sync.js +17 -5
  179. package/node_modules/execa/package.json +1 -1
  180. package/node_modules/fast-uri/.github/workflows/release.yml +35 -0
  181. package/node_modules/fast-uri/README.md +8 -0
  182. package/node_modules/fast-uri/index.js +98 -18
  183. package/node_modules/fast-uri/lib/utils.js +52 -0
  184. package/node_modules/fast-uri/package.json +1 -1
  185. package/node_modules/fast-uri/test/host-delimiter-security.test.js +94 -0
  186. package/node_modules/fast-uri/test/relative-normalization-security.test.js +156 -0
  187. package/node_modules/fast-uri/test/reserved-path-normalization.test.js +32 -4
  188. package/node_modules/fast-uri/test/scheme-validation.test.js +53 -14
  189. package/node_modules/jose/README.md +2 -2
  190. package/node_modules/jose/dist/webapi/jwe/general/encrypt.js +3 -3
  191. package/node_modules/jose/dist/webapi/jwk/thumbprint.js +8 -8
  192. package/node_modules/jose/dist/webapi/jwks/local.js +2 -1
  193. package/node_modules/jose/dist/webapi/jwks/remote.js +4 -4
  194. package/node_modules/jose/dist/webapi/jws/general/sign.js +3 -3
  195. package/node_modules/jose/dist/webapi/jws/general/verify.js +3 -3
  196. package/node_modules/jose/dist/webapi/jwt/encrypt.js +2 -2
  197. package/node_modules/jose/dist/webapi/jwt/sign.js +2 -2
  198. package/node_modules/jose/dist/webapi/jwt/unsecured.js +3 -3
  199. package/node_modules/jose/dist/webapi/key/generate_secret.js +4 -4
  200. package/node_modules/jose/dist/webapi/lib/asn1.js +2 -2
  201. package/node_modules/jose/dist/webapi/lib/buffer_utils.js +4 -4
  202. package/node_modules/jose/dist/webapi/lib/content_encryption.js +8 -8
  203. package/node_modules/jose/dist/webapi/lib/jwe_decrypt.js +14 -14
  204. package/node_modules/jose/dist/webapi/lib/jwe_encrypt.js +3 -3
  205. package/node_modules/jose/dist/webapi/lib/jws_algorithms.js +2 -2
  206. package/node_modules/jose/dist/webapi/lib/jws_sign.js +11 -11
  207. package/node_modules/jose/dist/webapi/lib/jws_verify.js +19 -16
  208. package/node_modules/jose/dist/webapi/lib/jwt_claims_set.js +44 -43
  209. package/node_modules/jose/dist/webapi/lib/key.js +4 -4
  210. package/node_modules/jose/dist/webapi/lib/key_management.js +17 -17
  211. package/node_modules/jose/dist/webapi/lib/validate.js +10 -10
  212. package/node_modules/jose/dist/webapi/util/decode_jwt.js +12 -12
  213. package/node_modules/jose/dist/webapi/util/decode_protected_header.js +5 -5
  214. package/node_modules/jose/package.json +1 -1
  215. package/package.json +23 -23
  216. package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/JsonSettings.js +0 -1
  217. package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v1/JsonCodec.js +0 -20
  218. package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v1/JsonSettings.js +0 -1
  219. package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v1/JsonShapeDeserializer.js +0 -160
  220. package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v1/JsonShapeSerializer.js +0 -193
  221. package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v2/JsonBytesStringAdapter.js +0 -103
  222. package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v2/JsonCodec2.js +0 -20
  223. package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v2/JsonShapeDeserializer2.js +0 -200
  224. package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v2/JsonShapeSerializer2.js +0 -519
  225. package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/detectBufferParsing.js +0 -18
  226. package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/jsonReplacer.js +0 -46
  227. package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/jsonReviver.js +0 -121
  228. package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/needsReviver.js +0 -41
  229. package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/parseJsonBody.js +0 -89
  230. package/node_modules/@opentelemetry/api/build/esm/api/context.js +0 -68
  231. package/node_modules/@opentelemetry/api/build/esm/api/diag.js +0 -80
  232. package/node_modules/@opentelemetry/api/build/esm/api/metrics.js +0 -46
  233. package/node_modules/@opentelemetry/api/build/esm/api/propagation.js +0 -76
  234. package/node_modules/@opentelemetry/api/build/esm/api/trace.js +0 -66
  235. package/node_modules/@opentelemetry/api/build/esm/baggage/context-helpers.js +0 -45
  236. package/node_modules/@opentelemetry/api/build/esm/baggage/internal/baggage-impl.js +0 -40
  237. package/node_modules/@opentelemetry/api/build/esm/baggage/internal/symbol.js +0 -9
  238. package/node_modules/@opentelemetry/api/build/esm/baggage/types.js +0 -6
  239. package/node_modules/@opentelemetry/api/build/esm/baggage/utils.js +0 -36
  240. package/node_modules/@opentelemetry/api/build/esm/common/Attributes.js +0 -6
  241. package/node_modules/@opentelemetry/api/build/esm/common/Exception.js +0 -6
  242. package/node_modules/@opentelemetry/api/build/esm/common/Time.js +0 -2
  243. package/node_modules/@opentelemetry/api/build/esm/context/NoopContextManager.js +0 -23
  244. package/node_modules/@opentelemetry/api/build/esm/context/context.js +0 -48
  245. package/node_modules/@opentelemetry/api/build/esm/context/types.js +0 -6
  246. package/node_modules/@opentelemetry/api/build/esm/context-api.js +0 -13
  247. package/node_modules/@opentelemetry/api/build/esm/diag/ComponentLogger.js +0 -43
  248. package/node_modules/@opentelemetry/api/build/esm/diag/consoleLogger.js +0 -69
  249. package/node_modules/@opentelemetry/api/build/esm/diag/internal/logLevelLogger.js +0 -30
  250. package/node_modules/@opentelemetry/api/build/esm/diag/internal/noopLogger.js +0 -20
  251. package/node_modules/@opentelemetry/api/build/esm/diag/types.js +0 -30
  252. package/node_modules/@opentelemetry/api/build/esm/diag-api.js +0 -17
  253. package/node_modules/@opentelemetry/api/build/esm/experimental/index.js +0 -10
  254. package/node_modules/@opentelemetry/api/build/esm/experimental/trace/SugaredOptions.js +0 -6
  255. package/node_modules/@opentelemetry/api/build/esm/experimental/trace/SugaredTracer.js +0 -88
  256. package/node_modules/@opentelemetry/api/build/esm/index.js +0 -43
  257. package/node_modules/@opentelemetry/api/build/esm/internal/global-utils.js +0 -54
  258. package/node_modules/@opentelemetry/api/build/esm/internal/semver.js +0 -107
  259. package/node_modules/@opentelemetry/api/build/esm/metrics/Meter.js +0 -6
  260. package/node_modules/@opentelemetry/api/build/esm/metrics/MeterProvider.js +0 -6
  261. package/node_modules/@opentelemetry/api/build/esm/metrics/Metric.js +0 -15
  262. package/node_modules/@opentelemetry/api/build/esm/metrics/NoopMeter.js +0 -104
  263. package/node_modules/@opentelemetry/api/build/esm/metrics/NoopMeterProvider.js +0 -16
  264. package/node_modules/@opentelemetry/api/build/esm/metrics-api.js +0 -14
  265. package/node_modules/@opentelemetry/api/build/esm/propagation/NoopTextMapPropagator.js +0 -19
  266. package/node_modules/@opentelemetry/api/build/esm/propagation/TextMapPropagator.js +0 -33
  267. package/node_modules/@opentelemetry/api/build/esm/propagation-api.js +0 -14
  268. package/node_modules/@opentelemetry/api/build/esm/trace/NonRecordingSpan.js +0 -54
  269. package/node_modules/@opentelemetry/api/build/esm/trace/NoopTracer.js +0 -64
  270. package/node_modules/@opentelemetry/api/build/esm/trace/NoopTracerProvider.js +0 -17
  271. package/node_modules/@opentelemetry/api/build/esm/trace/ProxyTracer.js +0 -42
  272. package/node_modules/@opentelemetry/api/build/esm/trace/ProxyTracerProvider.js +0 -42
  273. package/node_modules/@opentelemetry/api/build/esm/trace/Sampler.js +0 -6
  274. package/node_modules/@opentelemetry/api/build/esm/trace/SamplingResult.js +0 -30
  275. package/node_modules/@opentelemetry/api/build/esm/trace/SpanOptions.js +0 -6
  276. package/node_modules/@opentelemetry/api/build/esm/trace/attributes.js +0 -6
  277. package/node_modules/@opentelemetry/api/build/esm/trace/context-utils.js +0 -62
  278. package/node_modules/@opentelemetry/api/build/esm/trace/internal/tracestate-impl.js +0 -90
  279. package/node_modules/@opentelemetry/api/build/esm/trace/internal/tracestate-validators.js +0 -30
  280. package/node_modules/@opentelemetry/api/build/esm/trace/internal/utils.js +0 -12
  281. package/node_modules/@opentelemetry/api/build/esm/trace/invalid-span-constants.js +0 -22
  282. package/node_modules/@opentelemetry/api/build/esm/trace/link.js +0 -6
  283. package/node_modules/@opentelemetry/api/build/esm/trace/span.js +0 -6
  284. package/node_modules/@opentelemetry/api/build/esm/trace/span_context.js +0 -6
  285. package/node_modules/@opentelemetry/api/build/esm/trace/span_kind.js +0 -35
  286. package/node_modules/@opentelemetry/api/build/esm/trace/spancontext-utils.js +0 -59
  287. package/node_modules/@opentelemetry/api/build/esm/trace/status.js +0 -26
  288. package/node_modules/@opentelemetry/api/build/esm/trace/trace_flags.js +0 -15
  289. package/node_modules/@opentelemetry/api/build/esm/trace/trace_state.js +0 -6
  290. package/node_modules/@opentelemetry/api/build/esm/trace/tracer.js +0 -6
  291. package/node_modules/@opentelemetry/api/build/esm/trace/tracer_options.js +0 -6
  292. package/node_modules/@opentelemetry/api/build/esm/trace/tracer_provider.js +0 -6
  293. package/node_modules/@opentelemetry/api/build/esm/trace-api.js +0 -14
  294. package/node_modules/@opentelemetry/api/build/esm/version.js +0 -7
  295. package/node_modules/@opentelemetry/api/build/esnext/api/context.js +0 -68
  296. package/node_modules/@opentelemetry/api/build/esnext/api/diag.js +0 -80
  297. package/node_modules/@opentelemetry/api/build/esnext/api/metrics.js +0 -46
  298. package/node_modules/@opentelemetry/api/build/esnext/api/propagation.js +0 -76
  299. package/node_modules/@opentelemetry/api/build/esnext/api/trace.js +0 -66
  300. package/node_modules/@opentelemetry/api/build/esnext/baggage/context-helpers.js +0 -45
  301. package/node_modules/@opentelemetry/api/build/esnext/baggage/internal/baggage-impl.js +0 -40
  302. package/node_modules/@opentelemetry/api/build/esnext/baggage/internal/symbol.js +0 -9
  303. package/node_modules/@opentelemetry/api/build/esnext/baggage/types.js +0 -6
  304. package/node_modules/@opentelemetry/api/build/esnext/baggage/utils.js +0 -36
  305. package/node_modules/@opentelemetry/api/build/esnext/common/Attributes.js +0 -6
  306. package/node_modules/@opentelemetry/api/build/esnext/common/Exception.js +0 -6
  307. package/node_modules/@opentelemetry/api/build/esnext/common/Time.js +0 -2
  308. package/node_modules/@opentelemetry/api/build/esnext/context/NoopContextManager.js +0 -23
  309. package/node_modules/@opentelemetry/api/build/esnext/context/context.js +0 -48
  310. package/node_modules/@opentelemetry/api/build/esnext/context/types.js +0 -6
  311. package/node_modules/@opentelemetry/api/build/esnext/context-api.js +0 -13
  312. package/node_modules/@opentelemetry/api/build/esnext/diag/ComponentLogger.js +0 -43
  313. package/node_modules/@opentelemetry/api/build/esnext/diag/consoleLogger.js +0 -69
  314. package/node_modules/@opentelemetry/api/build/esnext/diag/internal/logLevelLogger.js +0 -30
  315. package/node_modules/@opentelemetry/api/build/esnext/diag/internal/noopLogger.js +0 -20
  316. package/node_modules/@opentelemetry/api/build/esnext/diag/types.js +0 -30
  317. package/node_modules/@opentelemetry/api/build/esnext/diag-api.js +0 -17
  318. package/node_modules/@opentelemetry/api/build/esnext/experimental/index.js +0 -10
  319. package/node_modules/@opentelemetry/api/build/esnext/experimental/trace/SugaredOptions.js +0 -6
  320. package/node_modules/@opentelemetry/api/build/esnext/experimental/trace/SugaredTracer.js +0 -88
  321. package/node_modules/@opentelemetry/api/build/esnext/index.js +0 -43
  322. package/node_modules/@opentelemetry/api/build/esnext/internal/global-utils.js +0 -54
  323. package/node_modules/@opentelemetry/api/build/esnext/internal/semver.js +0 -107
  324. package/node_modules/@opentelemetry/api/build/esnext/metrics/Meter.js +0 -6
  325. package/node_modules/@opentelemetry/api/build/esnext/metrics/MeterProvider.js +0 -6
  326. package/node_modules/@opentelemetry/api/build/esnext/metrics/Metric.js +0 -15
  327. package/node_modules/@opentelemetry/api/build/esnext/metrics/NoopMeter.js +0 -104
  328. package/node_modules/@opentelemetry/api/build/esnext/metrics/NoopMeterProvider.js +0 -16
  329. package/node_modules/@opentelemetry/api/build/esnext/metrics-api.js +0 -14
  330. package/node_modules/@opentelemetry/api/build/esnext/propagation/NoopTextMapPropagator.js +0 -19
  331. package/node_modules/@opentelemetry/api/build/esnext/propagation/TextMapPropagator.js +0 -33
  332. package/node_modules/@opentelemetry/api/build/esnext/propagation-api.js +0 -14
  333. package/node_modules/@opentelemetry/api/build/esnext/trace/NonRecordingSpan.js +0 -54
  334. package/node_modules/@opentelemetry/api/build/esnext/trace/NoopTracer.js +0 -64
  335. package/node_modules/@opentelemetry/api/build/esnext/trace/NoopTracerProvider.js +0 -17
  336. package/node_modules/@opentelemetry/api/build/esnext/trace/ProxyTracer.js +0 -42
  337. package/node_modules/@opentelemetry/api/build/esnext/trace/ProxyTracerProvider.js +0 -42
  338. package/node_modules/@opentelemetry/api/build/esnext/trace/Sampler.js +0 -6
  339. package/node_modules/@opentelemetry/api/build/esnext/trace/SamplingResult.js +0 -30
  340. package/node_modules/@opentelemetry/api/build/esnext/trace/SpanOptions.js +0 -6
  341. package/node_modules/@opentelemetry/api/build/esnext/trace/attributes.js +0 -6
  342. package/node_modules/@opentelemetry/api/build/esnext/trace/context-utils.js +0 -62
  343. package/node_modules/@opentelemetry/api/build/esnext/trace/internal/tracestate-impl.js +0 -90
  344. package/node_modules/@opentelemetry/api/build/esnext/trace/internal/tracestate-validators.js +0 -30
  345. package/node_modules/@opentelemetry/api/build/esnext/trace/internal/utils.js +0 -12
  346. package/node_modules/@opentelemetry/api/build/esnext/trace/invalid-span-constants.js +0 -22
  347. package/node_modules/@opentelemetry/api/build/esnext/trace/link.js +0 -6
  348. package/node_modules/@opentelemetry/api/build/esnext/trace/span.js +0 -6
  349. package/node_modules/@opentelemetry/api/build/esnext/trace/span_context.js +0 -6
  350. package/node_modules/@opentelemetry/api/build/esnext/trace/span_kind.js +0 -35
  351. package/node_modules/@opentelemetry/api/build/esnext/trace/spancontext-utils.js +0 -59
  352. package/node_modules/@opentelemetry/api/build/esnext/trace/status.js +0 -26
  353. package/node_modules/@opentelemetry/api/build/esnext/trace/trace_flags.js +0 -15
  354. package/node_modules/@opentelemetry/api/build/esnext/trace/trace_state.js +0 -6
  355. package/node_modules/@opentelemetry/api/build/esnext/trace/tracer.js +0 -6
  356. package/node_modules/@opentelemetry/api/build/esnext/trace/tracer_options.js +0 -6
  357. package/node_modules/@opentelemetry/api/build/esnext/trace/tracer_provider.js +0 -6
  358. package/node_modules/@opentelemetry/api/build/esnext/trace-api.js +0 -14
  359. package/node_modules/@opentelemetry/api/build/esnext/version.js +0 -7
  360. package/node_modules/@opentelemetry/api/build/src/api/context.js +0 -72
  361. package/node_modules/@opentelemetry/api/build/src/api/diag.js +0 -84
  362. package/node_modules/@opentelemetry/api/build/src/api/metrics.js +0 -50
  363. package/node_modules/@opentelemetry/api/build/src/api/propagation.js +0 -80
  364. package/node_modules/@opentelemetry/api/build/src/api/trace.js +0 -70
  365. package/node_modules/@opentelemetry/api/build/src/baggage/context-helpers.js +0 -52
  366. package/node_modules/@opentelemetry/api/build/src/baggage/internal/baggage-impl.js +0 -44
  367. package/node_modules/@opentelemetry/api/build/src/baggage/internal/symbol.js +0 -12
  368. package/node_modules/@opentelemetry/api/build/src/baggage/types.js +0 -7
  369. package/node_modules/@opentelemetry/api/build/src/baggage/utils.js +0 -41
  370. package/node_modules/@opentelemetry/api/build/src/common/Attributes.js +0 -7
  371. package/node_modules/@opentelemetry/api/build/src/common/Exception.js +0 -7
  372. package/node_modules/@opentelemetry/api/build/src/common/Time.js +0 -3
  373. package/node_modules/@opentelemetry/api/build/src/context/NoopContextManager.js +0 -27
  374. package/node_modules/@opentelemetry/api/build/src/context/context.js +0 -52
  375. package/node_modules/@opentelemetry/api/build/src/context/types.js +0 -7
  376. package/node_modules/@opentelemetry/api/build/src/context-api.js +0 -16
  377. package/node_modules/@opentelemetry/api/build/src/diag/ComponentLogger.js +0 -47
  378. package/node_modules/@opentelemetry/api/build/src/diag/consoleLogger.js +0 -73
  379. package/node_modules/@opentelemetry/api/build/src/diag/internal/logLevelLogger.js +0 -34
  380. package/node_modules/@opentelemetry/api/build/src/diag/internal/noopLogger.js +0 -24
  381. package/node_modules/@opentelemetry/api/build/src/diag/types.js +0 -33
  382. package/node_modules/@opentelemetry/api/build/src/diag-api.js +0 -20
  383. package/node_modules/@opentelemetry/api/build/src/experimental/index.js +0 -15
  384. package/node_modules/@opentelemetry/api/build/src/experimental/trace/SugaredOptions.js +0 -7
  385. package/node_modules/@opentelemetry/api/build/src/experimental/trace/SugaredTracer.js +0 -93
  386. package/node_modules/@opentelemetry/api/build/src/index.js +0 -71
  387. package/node_modules/@opentelemetry/api/build/src/internal/global-utils.js +0 -60
  388. package/node_modules/@opentelemetry/api/build/src/internal/semver.js +0 -111
  389. package/node_modules/@opentelemetry/api/build/src/metrics/Meter.js +0 -7
  390. package/node_modules/@opentelemetry/api/build/src/metrics/MeterProvider.js +0 -7
  391. package/node_modules/@opentelemetry/api/build/src/metrics/Metric.js +0 -18
  392. package/node_modules/@opentelemetry/api/build/src/metrics/NoopMeter.js +0 -118
  393. package/node_modules/@opentelemetry/api/build/src/metrics/NoopMeterProvider.js +0 -20
  394. package/node_modules/@opentelemetry/api/build/src/metrics-api.js +0 -17
  395. package/node_modules/@opentelemetry/api/build/src/propagation/NoopTextMapPropagator.js +0 -23
  396. package/node_modules/@opentelemetry/api/build/src/propagation/TextMapPropagator.js +0 -36
  397. package/node_modules/@opentelemetry/api/build/src/propagation-api.js +0 -17
  398. package/node_modules/@opentelemetry/api/build/src/trace/NonRecordingSpan.js +0 -58
  399. package/node_modules/@opentelemetry/api/build/src/trace/NoopTracer.js +0 -68
  400. package/node_modules/@opentelemetry/api/build/src/trace/NoopTracerProvider.js +0 -21
  401. package/node_modules/@opentelemetry/api/build/src/trace/ProxyTracer.js +0 -46
  402. package/node_modules/@opentelemetry/api/build/src/trace/ProxyTracerProvider.js +0 -46
  403. package/node_modules/@opentelemetry/api/build/src/trace/Sampler.js +0 -7
  404. package/node_modules/@opentelemetry/api/build/src/trace/SamplingResult.js +0 -33
  405. package/node_modules/@opentelemetry/api/build/src/trace/SpanOptions.js +0 -7
  406. package/node_modules/@opentelemetry/api/build/src/trace/attributes.js +0 -7
  407. package/node_modules/@opentelemetry/api/build/src/trace/context-utils.js +0 -71
  408. package/node_modules/@opentelemetry/api/build/src/trace/internal/tracestate-impl.js +0 -94
  409. package/node_modules/@opentelemetry/api/build/src/trace/internal/tracestate-validators.js +0 -35
  410. package/node_modules/@opentelemetry/api/build/src/trace/internal/utils.js +0 -16
  411. package/node_modules/@opentelemetry/api/build/src/trace/invalid-span-constants.js +0 -25
  412. package/node_modules/@opentelemetry/api/build/src/trace/link.js +0 -7
  413. package/node_modules/@opentelemetry/api/build/src/trace/span.js +0 -7
  414. package/node_modules/@opentelemetry/api/build/src/trace/span_context.js +0 -7
  415. package/node_modules/@opentelemetry/api/build/src/trace/span_kind.js +0 -38
  416. package/node_modules/@opentelemetry/api/build/src/trace/spancontext-utils.js +0 -66
  417. package/node_modules/@opentelemetry/api/build/src/trace/status.js +0 -29
  418. package/node_modules/@opentelemetry/api/build/src/trace/trace_flags.js +0 -18
  419. package/node_modules/@opentelemetry/api/build/src/trace/trace_state.js +0 -7
  420. package/node_modules/@opentelemetry/api/build/src/trace/tracer.js +0 -7
  421. package/node_modules/@opentelemetry/api/build/src/trace/tracer_options.js +0 -7
  422. package/node_modules/@opentelemetry/api/build/src/trace/tracer_provider.js +0 -7
  423. package/node_modules/@opentelemetry/api/build/src/trace-api.js +0 -17
  424. package/node_modules/@opentelemetry/api/build/src/version.js +0 -10
@@ -0,0 +1,156 @@
1
+ 'use strict'
2
+
3
+ const test = require('tape')
4
+ const fastURI = require('..')
5
+
6
+ const ABSOLUTE_BASES = [
7
+ 'http://h/p/q/r',
8
+ 'http://h/',
9
+ 'foo://h/a/b/',
10
+ 'http://h/p/q/'
11
+ ]
12
+
13
+ const RELATIVE_BASES = ['', 'base', 'relative/base']
14
+
15
+ test('normalize keeps the meaning of relative-path references', (t) => {
16
+ const cases = [
17
+ ['a/../b', 'b'],
18
+ ['x/..', './'],
19
+ ['../x', '../x'],
20
+ ['./../x', '../x'],
21
+ ['a/b/../../..', '..'],
22
+ ['a/./b', 'a/b'],
23
+ ['a/b/..', 'a/'],
24
+ ['.', './'],
25
+ ['..', '..'],
26
+ ['../', '../'],
27
+ ['../../a/./b/../c', '../../a/c'],
28
+ ['a//..', 'a/'],
29
+ ['a/../b?q#f', 'b?q#f']
30
+ ]
31
+ for (const [input, expected] of cases) {
32
+ t.equal(fastURI.normalize(input), expected, `${input} -> ${expected}`)
33
+ }
34
+ t.end()
35
+ })
36
+
37
+ test('normalize never turns a relative-path reference into a root or network path', (t) => {
38
+ t.equal(fastURI.normalize('.//x'), './/x', 'leading empty segment is kept behind "."')
39
+ t.equal(fastURI.normalize('a/..//x'), './/x', 'collapsed prefix does not expose "//"')
40
+ t.equal(fastURI.parse(fastURI.normalize('a/..//x')).host, undefined, 'no authority is introduced')
41
+ t.equal(fastURI.normalize('./a:b'), './a:b', 'first-segment colon is kept behind a "." segment (RFC 3986 section 4.2)')
42
+ t.equal(fastURI.parse(fastURI.normalize('./a:b')).scheme, undefined, 'no scheme is introduced')
43
+ t.end()
44
+ })
45
+
46
+ test('normalize keeps the existing behavior for root-relative and absolute paths', (t) => {
47
+ t.equal(fastURI.normalize('/a/../b'), '/b')
48
+ t.equal(fastURI.normalize('/../x'), '/x')
49
+ t.equal(fastURI.normalize('http://h/a/../../b'), 'http://h/b')
50
+ t.end()
51
+ })
52
+
53
+ test('equal does not alias relative references with different targets', (t) => {
54
+ t.equal(fastURI.equal('../x', 'x'), false)
55
+ t.equal(fastURI.equal('a/../b', '/b'), false)
56
+ t.equal(fastURI.equal('x/..', '/'), false)
57
+ t.equal(fastURI.equal('a/../b', 'b'), true)
58
+ t.end()
59
+ })
60
+
61
+ test('resolving a normalized relative reference matches resolving the original', (t) => {
62
+ for (const base of [...ABSOLUTE_BASES, ...RELATIVE_BASES]) {
63
+ for (const ref of ['a/../b', 'x/..', '../x', './../x', 'a/b/../../..', '.', '..', './/x']) {
64
+ t.equal(
65
+ fastURI.resolve(base, fastURI.normalize(ref)),
66
+ fastURI.resolve(base, ref),
67
+ `${base} + ${ref}`
68
+ )
69
+ }
70
+ }
71
+ t.equal(fastURI.resolve('http://h/p/q/r', fastURI.normalize('a/../b')), 'http://h/p/q/b')
72
+ t.equal(fastURI.resolve('http://h/p/q/r', fastURI.normalize('../x')), 'http://h/p/x')
73
+ t.end()
74
+ })
75
+
76
+ test('property: normalization of relative references is resolution-preserving and idempotent', (t) => {
77
+ const segments = ['a', 'b', '.', '..', '', 'a:b']
78
+ // Deterministic linear congruential generator so failures are reproducible.
79
+ let seed = 0x5ec02
80
+ const next = (n) => {
81
+ seed = (seed * 1103515245 + 12345) % 2147483648
82
+ return Math.floor((seed / 2147483648) * n)
83
+ }
84
+
85
+ let failures = 0
86
+ let checked = 0
87
+ for (let i = 0; i < 4000; i++) {
88
+ const length = 1 + next(6)
89
+ const parts = []
90
+ for (let j = 0; j < length; j++) parts.push(segments[next(segments.length)])
91
+ const ref = parts.join('/')
92
+ // Only relative-path references: empty refs, refs starting with "/", and
93
+ // refs whose first segment contains ":" are not affected by this change.
94
+ if (ref === '' || ref[0] === '/' || fastURI.parse(ref).scheme !== undefined) continue
95
+
96
+ checked++
97
+ const normalized = fastURI.normalize(ref)
98
+ if (fastURI.normalize(normalized) !== normalized) {
99
+ failures++
100
+ t.fail(`not idempotent: ${ref} -> ${normalized} -> ${fastURI.normalize(normalized)}`)
101
+ }
102
+ // 3.x's removeDotSegments (used by resolve) collapses a trailing "//" to
103
+ // "/" (fixed in v4 by #185), so resolve() itself is inconsistent for
104
+ // these paths regardless of normalization.
105
+ if (normalized.endsWith('//')) continue
106
+ for (const base of ABSOLUTE_BASES) {
107
+ const expected = fastURI.resolve(base, ref)
108
+ const actual = fastURI.resolve(base, normalized)
109
+ if (actual !== expected) {
110
+ failures++
111
+ t.fail(`${base} + ${ref}: normalized ${normalized} resolves to ${actual}, expected ${expected}`)
112
+ }
113
+ }
114
+ }
115
+
116
+ t.ok(checked > 1000, `checked ${checked} relative references`)
117
+ t.equal(failures, 0, 'no relative reference changed meaning')
118
+ t.end()
119
+ })
120
+
121
+ test('suffix normalization preserves relative path meaning', (t) => {
122
+ const options = { reference: 'suffix', scheme: 'x' }
123
+ for (const [input, expected] of [
124
+ ['a/../b', 'b'],
125
+ ['x/..', './'],
126
+ ['a/../a:b', './a:b']
127
+ ]) {
128
+ t.equal(fastURI.normalize(input, options), expected, `${input} -> ${expected}`)
129
+ }
130
+ t.end()
131
+ })
132
+
133
+ test('normalize does not promote a colon-first relative reference to a scheme (skipEscape)', (t) => {
134
+ // RFC 3986 section 4.2: a first path segment containing ":" must stay
135
+ // protected by a leading "./", or it is mistaken for a scheme. Collapsing
136
+ // the protecting dot segment must not expose the colon. The default path
137
+ // escapes the colon; with skipEscape the colon is emitted raw and the
138
+ // reference is reparsed as absolute (scheme "a"), changing its meaning.
139
+ const colonRefs = ['./a:b', 'a/../a:b']
140
+ for (const ref of colonRefs) {
141
+ const normalized = fastURI.normalize(ref, { skipEscape: true })
142
+ t.equal(
143
+ fastURI.parse(normalized).scheme,
144
+ undefined,
145
+ `${ref} -> ${normalized} must not introduce a scheme`
146
+ )
147
+ for (const base of ABSOLUTE_BASES) {
148
+ t.equal(
149
+ fastURI.resolve(base, normalized, { skipEscape: true }),
150
+ fastURI.resolve(base, ref, { skipEscape: true }),
151
+ `${base} + ${ref}: normalized ${normalized} must resolve the same`
152
+ )
153
+ }
154
+ }
155
+ t.end()
156
+ })
@@ -77,13 +77,13 @@ test('serialize uses the RFC 3986 path character set without opening escapes', (
77
77
  )
78
78
  t.equal(
79
79
  fastURI.serialize({ path: './a:b/c:d' }),
80
- 'a%3Ab/c:d',
81
- 'escapes a first-segment colon exposed by dot-segment removal'
80
+ './a:b/c:d',
81
+ 'a first-segment colon exposed by dot-segment removal is kept behind a "." segment'
82
82
  )
83
83
  t.equal(
84
84
  fastURI.normalize('./a:b'),
85
- 'a%3Ab',
86
- 'normalization keeps a relative path from becoming a scheme'
85
+ './a:b',
86
+ 'normalization keeps a relative path from becoming a scheme without re-encoding the colon'
87
87
  )
88
88
  t.equal(
89
89
  fastURI.serialize({ path: '/Kſ' }),
@@ -107,3 +107,31 @@ test('equal distinguishes escaped reserved path data from literal syntax', (t) =
107
107
  )
108
108
  t.end()
109
109
  })
110
+
111
+ // A suffix reference never emits its scheme token, so it is a scheme-less
112
+ // (path-noscheme) reference: a bare ':' in its first path segment must be
113
+ // escaped, or the serialized output reparses as an absolute URI with a scheme.
114
+ // @see https://github.com/fastify/fast-uri/security/advisories/GHSA-333x-w4r6-6crp
115
+ test('suffix reference escapes a first-segment colon instead of emitting a scheme', (t) => {
116
+ const dangerous = /^(?:javascript|data|vbscript):/i
117
+ const options = { reference: 'suffix', scheme: 'x' }
118
+
119
+ for (const input of ['javascript:alert(1)', '%6Aavascript:alert(1)', 'data:text/html,x', 'vbscript:msgbox(1)']) {
120
+ t.notOk(dangerous.test(fastURI.normalize(input, options)), `${input} normalizes to an inert reference`)
121
+ }
122
+
123
+ t.equal(
124
+ fastURI.normalize('javascript:alert(1)', options),
125
+ 'javascript%3Aalert(1)',
126
+ 'escapes the leading-segment colon to %3A'
127
+ )
128
+ t.notOk(
129
+ dangerous.test(fastURI.resolve('https://a.example/base/', '%6Aavascript:alert(1)', { reference: 'suffix' })),
130
+ 'resolve in suffix mode does not emit a live scheme'
131
+ )
132
+
133
+ // legitimate suffix usage is unchanged
134
+ t.equal(fastURI.normalize('path/to/file', options), 'path/to/file', 'plain path unchanged')
135
+ t.equal(fastURI.normalize('a/b:c', options), 'a/b:c', 'colon in a later segment stays literal')
136
+ t.end()
137
+ })
@@ -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));