@appium/base-driver 10.2.0 → 10.2.2

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 (138) hide show
  1. package/LICENSE +201 -0
  2. package/build/lib/basedriver/capabilities.js +7 -7
  3. package/build/lib/basedriver/capabilities.js.map +1 -1
  4. package/build/lib/basedriver/commands/event.d.ts +1 -1
  5. package/build/lib/basedriver/commands/event.d.ts.map +1 -1
  6. package/build/lib/basedriver/commands/execute.d.ts +1 -1
  7. package/build/lib/basedriver/commands/execute.d.ts.map +1 -1
  8. package/build/lib/basedriver/commands/find.d.ts +1 -1
  9. package/build/lib/basedriver/commands/find.d.ts.map +1 -1
  10. package/build/lib/basedriver/commands/mixin.d.ts +1 -1
  11. package/build/lib/basedriver/commands/mixin.d.ts.map +1 -1
  12. package/build/lib/basedriver/commands/timeout.d.ts +1 -1
  13. package/build/lib/basedriver/commands/timeout.d.ts.map +1 -1
  14. package/build/lib/basedriver/device-settings.d.ts +14 -23
  15. package/build/lib/basedriver/device-settings.d.ts.map +1 -1
  16. package/build/lib/basedriver/device-settings.js +11 -26
  17. package/build/lib/basedriver/device-settings.js.map +1 -1
  18. package/build/lib/basedriver/helpers.d.ts +36 -57
  19. package/build/lib/basedriver/helpers.d.ts.map +1 -1
  20. package/build/lib/basedriver/helpers.js +148 -239
  21. package/build/lib/basedriver/helpers.js.map +1 -1
  22. package/build/lib/basedriver/logger.d.ts +1 -2
  23. package/build/lib/basedriver/logger.d.ts.map +1 -1
  24. package/build/lib/basedriver/logger.js +2 -2
  25. package/build/lib/basedriver/logger.js.map +1 -1
  26. package/build/lib/basedriver/validation.d.ts.map +1 -1
  27. package/build/lib/basedriver/validation.js +3 -3
  28. package/build/lib/basedriver/validation.js.map +1 -1
  29. package/build/lib/constants.d.ts +1 -1
  30. package/build/lib/constants.d.ts.map +1 -1
  31. package/build/lib/express/crash.d.ts +8 -2
  32. package/build/lib/express/crash.d.ts.map +1 -1
  33. package/build/lib/express/crash.js +6 -0
  34. package/build/lib/express/crash.js.map +1 -1
  35. package/build/lib/express/express-logging.d.ts +12 -2
  36. package/build/lib/express/express-logging.d.ts.map +1 -1
  37. package/build/lib/express/express-logging.js +34 -26
  38. package/build/lib/express/express-logging.js.map +1 -1
  39. package/build/lib/express/idempotency.d.ts +4 -10
  40. package/build/lib/express/idempotency.d.ts.map +1 -1
  41. package/build/lib/express/idempotency.js +69 -73
  42. package/build/lib/express/idempotency.js.map +1 -1
  43. package/build/lib/express/logger.d.ts +1 -2
  44. package/build/lib/express/logger.d.ts.map +1 -1
  45. package/build/lib/express/logger.js +2 -2
  46. package/build/lib/express/logger.js.map +1 -1
  47. package/build/lib/express/middleware.d.ts +37 -41
  48. package/build/lib/express/middleware.d.ts.map +1 -1
  49. package/build/lib/express/middleware.js +48 -60
  50. package/build/lib/express/middleware.js.map +1 -1
  51. package/build/lib/express/server.d.ts +57 -101
  52. package/build/lib/express/server.d.ts.map +1 -1
  53. package/build/lib/express/server.js +51 -128
  54. package/build/lib/express/server.js.map +1 -1
  55. package/build/lib/express/static.d.ts +10 -5
  56. package/build/lib/express/static.d.ts.map +1 -1
  57. package/build/lib/express/static.js +32 -42
  58. package/build/lib/express/static.js.map +1 -1
  59. package/build/lib/express/websocket.d.ts +22 -6
  60. package/build/lib/express/websocket.d.ts.map +1 -1
  61. package/build/lib/express/websocket.js +10 -15
  62. package/build/lib/express/websocket.js.map +1 -1
  63. package/build/lib/helpers/capabilities.d.ts +4 -16
  64. package/build/lib/helpers/capabilities.d.ts.map +1 -1
  65. package/build/lib/helpers/capabilities.js +36 -48
  66. package/build/lib/helpers/capabilities.js.map +1 -1
  67. package/build/lib/jsonwp-proxy/protocol-converter.d.ts +42 -78
  68. package/build/lib/jsonwp-proxy/protocol-converter.d.ts.map +1 -1
  69. package/build/lib/jsonwp-proxy/protocol-converter.js +87 -139
  70. package/build/lib/jsonwp-proxy/protocol-converter.js.map +1 -1
  71. package/build/lib/jsonwp-proxy/proxy.d.ts +1 -1
  72. package/build/lib/jsonwp-proxy/proxy.d.ts.map +1 -1
  73. package/build/lib/jsonwp-proxy/proxy.js +2 -2
  74. package/build/lib/jsonwp-proxy/proxy.js.map +1 -1
  75. package/build/lib/jsonwp-status/status.d.ts +113 -158
  76. package/build/lib/jsonwp-status/status.d.ts.map +1 -1
  77. package/build/lib/jsonwp-status/status.js +10 -14
  78. package/build/lib/jsonwp-status/status.js.map +1 -1
  79. package/build/lib/protocol/bidi-commands.d.ts +31 -36
  80. package/build/lib/protocol/bidi-commands.d.ts.map +1 -1
  81. package/build/lib/protocol/bidi-commands.js +5 -5
  82. package/build/lib/protocol/bidi-commands.js.map +1 -1
  83. package/build/lib/protocol/errors.d.ts.map +1 -1
  84. package/build/lib/protocol/helpers.d.ts +7 -11
  85. package/build/lib/protocol/helpers.d.ts.map +1 -1
  86. package/build/lib/protocol/helpers.js +5 -9
  87. package/build/lib/protocol/helpers.js.map +1 -1
  88. package/build/lib/protocol/index.d.ts +4 -21
  89. package/build/lib/protocol/index.d.ts.map +1 -1
  90. package/build/lib/protocol/index.js.map +1 -1
  91. package/build/lib/protocol/protocol.d.ts +15 -1
  92. package/build/lib/protocol/protocol.d.ts.map +1 -1
  93. package/build/lib/protocol/protocol.js +50 -20
  94. package/build/lib/protocol/protocol.js.map +1 -1
  95. package/build/lib/protocol/routes.d.ts +8 -15
  96. package/build/lib/protocol/routes.d.ts.map +1 -1
  97. package/build/lib/protocol/routes.js +18 -33
  98. package/build/lib/protocol/routes.js.map +1 -1
  99. package/lib/basedriver/capabilities.ts +1 -1
  100. package/lib/basedriver/commands/event.ts +2 -2
  101. package/lib/basedriver/commands/execute.ts +2 -2
  102. package/lib/basedriver/commands/find.ts +2 -2
  103. package/lib/basedriver/commands/mixin.ts +1 -1
  104. package/lib/basedriver/commands/timeout.ts +2 -2
  105. package/lib/basedriver/{device-settings.js → device-settings.ts} +24 -35
  106. package/lib/basedriver/{helpers.js → helpers.ts} +208 -266
  107. package/lib/basedriver/logger.ts +3 -0
  108. package/lib/basedriver/validation.ts +2 -2
  109. package/lib/constants.ts +1 -1
  110. package/lib/express/crash.ts +15 -0
  111. package/lib/express/express-logging.ts +84 -0
  112. package/lib/express/{idempotency.js → idempotency.ts} +105 -89
  113. package/lib/express/logger.ts +3 -0
  114. package/lib/express/middleware.ts +187 -0
  115. package/lib/express/{server.js → server.ts} +175 -167
  116. package/lib/express/static.ts +77 -0
  117. package/lib/express/websocket.ts +81 -0
  118. package/lib/helpers/capabilities.ts +83 -0
  119. package/lib/jsonwp-proxy/protocol-converter.ts +284 -0
  120. package/lib/jsonwp-proxy/proxy.js +1 -1
  121. package/lib/jsonwp-status/{status.js → status.ts} +12 -15
  122. package/lib/protocol/{bidi-commands.js → bidi-commands.ts} +7 -5
  123. package/lib/protocol/errors.ts +1 -1
  124. package/lib/protocol/{helpers.js → helpers.ts} +8 -11
  125. package/lib/protocol/protocol.ts +57 -26
  126. package/lib/protocol/{routes.js → routes.ts} +29 -40
  127. package/package.json +11 -11
  128. package/tsconfig.json +3 -1
  129. package/lib/basedriver/logger.js +0 -4
  130. package/lib/express/crash.js +0 -11
  131. package/lib/express/express-logging.js +0 -60
  132. package/lib/express/logger.js +0 -4
  133. package/lib/express/middleware.js +0 -171
  134. package/lib/express/static.js +0 -76
  135. package/lib/express/websocket.js +0 -79
  136. package/lib/helpers/capabilities.js +0 -93
  137. package/lib/jsonwp-proxy/protocol-converter.js +0 -317
  138. /package/lib/protocol/{index.js → index.ts} +0 -0
@@ -1 +1 @@
1
- {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../lib/protocol/errors.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,IAAI,eAAe,EAAC,MAAM,mBAAmB,CAAC;AACjE,OAAO,KAAK,EAAE,wBAAwB,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAKrE,cAAM,SAAU,SAAQ,KAAK;IACpB,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;gBAErB,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;IAQ/C,OAAO,CAAC,YAAY;CAiBrB;AAGD,qBAAa,aAAc,SAAQ,SAAS;IAC1C,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;gBAGvB,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,MAAM,EACzB,KAAK,CAAC,EAAE,KAAK;IASf,IAAI,UAAU,uBAEb;IAED,IAAI,UAAU,CAAC,KAAK,oBAAA,EAEnB;IAED;;;;;OAKG;IACH,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,wBAAwB;CAY7D;AAMD,qBAAa,iBAAkB,SAAQ,aAAa;IAClD,MAAM,CAAC,IAAI;IAIX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAShD;AAED,qBAAa,kBAAmB,SAAQ,aAAa;IACnD,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAUhD;AAED,qBAAa,gBAAiB,SAAQ,aAAa;IACjD,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,KAAK;IAGZ,MAAM,CAAC,SAAS;gBAIJ,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAWhD;AAED,qBAAa,mBAAoB,SAAQ,aAAa;IACpD,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAYhD;AAED,qBAAa,0BAA2B,SAAQ,aAAa;IAC3D,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAWhD;AAED,qBAAa,sBAAuB,SAAQ,aAAa;IACvD,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAWhD;AAED,qBAAa,wBAAyB,SAAQ,aAAa;IACzD,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAWhD;AAED,qBAAa,YAAa,SAAQ,aAAa;IAC7C,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAShD;AAED,qBAAa,kBAAmB,SAAQ,aAAa;IACnD,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAUhD;AAED,qBAAa,yBAA0B,SAAQ,aAAa;IAC1D,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAShD;AAED,qBAAa,2BAA4B,SAAQ,aAAa;IAC5D,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,KAAK;IAGZ,MAAM,CAAC,SAAS;gBAIJ,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAShD;AAED,qBAAa,4BAA6B,SAAQ,aAAa;IAC7D,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,KAAK;IAGZ,MAAM,CAAC,SAAS;gBAIJ,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAWhD;AAED,qBAAa,2BAA4B,SAAQ,aAAa;IAC5D,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,KAAK;IAGZ,MAAM,CAAC,SAAS;gBAIJ,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAUhD;AAED,qBAAa,wBAAyB,SAAQ,aAAa;IACzD,MAAM,CAAC,KAAK;IAGZ,MAAM,CAAC,SAAS;gBAIJ,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAUhD;AAED,qBAAa,eAAgB,SAAQ,aAAa;IAChD,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAShD;AAED,qBAAa,gBAAiB,SAAQ,aAAa;IACjD,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAShD;AAED,qBAAa,YAAa,SAAQ,aAAa;IAC7C,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAShD;AAED,qBAAa,iBAAkB,SAAQ,aAAa;IAClD,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,KAAK;IAGZ,MAAM,CAAC,SAAS;gBAIJ,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAWhD;AAED,qBAAa,oBAAqB,SAAQ,aAAa;IACrD,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,KAAK;IAGZ,MAAM,CAAC,SAAS;gBAIJ,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAShD;AAED,qBAAa,wBAAyB,SAAQ,aAAa;IACzD,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,KAAK;IAGZ,MAAM,CAAC,SAAS;gBAIJ,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAWhD;AAED,qBAAa,iBAAkB,SAAQ,aAAa;IAClD,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAUhD;AAED,qBAAa,sBAAuB,SAAQ,aAAa;IACvD,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAShD;AAED,qBAAa,wBAAyB,SAAQ,aAAa;IACzD,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAGA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAShD;AAED,qBAAa,gBAAiB,SAAQ,aAAa;IACjD,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAShD;AAED,qBAAa,gBAAiB,SAAQ,gBAAgB;CAAG;AAEzD,qBAAa,kBAAmB,SAAQ,aAAa;IACnD,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAShD;AAED,qBAAa,8BAA+B,SAAQ,aAAa;IAC/D,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAShD;AAED,qBAAa,uBAAwB,SAAQ,8BAA8B;CAAG;AAE9E,qBAAa,oBAAqB,SAAQ,aAAa;IACrD,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAShD;AAED,qBAAa,8BAA+B,SAAQ,aAAa;IAC/D,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAShD;AAED,qBAAa,oBAAqB,SAAQ,aAAa;IACrD,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAShD;AAED,qBAAa,sBAAuB,SAAQ,aAAa;IACvD,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAShD;AAED,qBAAa,0BAA2B,SAAQ,aAAa;IAC3D,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAShD;AAED,qBAAa,kBAAmB,SAAQ,aAAa;IACnD,MAAM,CAAC,IAAI;gBAIC,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAShD;AAED,qBAAa,mBAAoB,SAAQ,aAAa;IACpD,MAAM,CAAC,IAAI;gBAIC,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAShD;AAGD,qBAAa,sBAAuB,SAAQ,kBAAkB;gBAChD,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAGhD;AACD,qBAAa,mBAAoB,SAAQ,kBAAkB;gBAC7C,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAGhD;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,MAAM,CAAC,IAAI;IAGX,MAAM,CAAC,SAAS;IAGhB,MAAM,CAAC,KAAK;gBAIA,OAAO,GAAE,MAAW,EAAE,KAAK,CAAC,EAAE,KAAK;CAShD;AA4CD,qBAAa,kBAAmB,SAAQ,oBAAoB;gBAC9C,SAAS,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,EAAE;CAGnE;AAED;;;;;GAKG;AACH,qBAAa,iBAAkB,SAAQ,SAAS;IAC9C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAW;IACtC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAe;gBAGxC,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,GAAG,EACrB,UAAU,CAAC,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,KAAK;IAmBf,cAAc,IAAI,aAAa;IAe/B,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAalC;AAGD,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwCT,CAAC;AAmBX;;GAEG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,CAEjE;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,GAAE,MAAM,GAAG;IAAC,OAAO,EAAE,MAAM,CAAA;CAAM,GAAG,aAAa,CAO9G;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,aAAa,CAM3G;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE;IAAE,KAAK,EAAE,QAAQ,CAAA;CAAE,CAAC,CAwB9E;AAQD,UAAU,QAAQ;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,qBAAqB;IAC7B,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;CAC9B"}
1
+ {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../lib/protocol/errors.ts"],"names":[],"mappings":"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"}
@@ -1,22 +1,18 @@
1
1
  /**
2
2
  * Preprocesses the resulting value for API responses,
3
3
  * so they have keys for both W3C and JSONWP protocols.
4
- * The argument value is NOT mutated
4
+ * The argument value is NOT mutated.
5
5
  *
6
- * @param {Object | undefined} resValue The actual response value
7
- * @returns {Object | null} Either modified value or the same one if
8
- * nothing has been modified
6
+ * @param resValue - The actual response value
7
+ * @returns Either modified value or the same one if nothing has been modified
9
8
  */
10
- export function formatResponseValue(resValue: any | undefined): any | null;
9
+ export declare function formatResponseValue(resValue: object | undefined): object | null;
11
10
  /**
12
11
  * Properly formats the status for API responses,
13
12
  * so they are correct for the W3C protocol.
14
13
  *
15
- * @param {Object} responseBody
16
- * @returns {Object} The fixed response body
14
+ * @param responseBody - The response body
15
+ * @returns The fixed response body
17
16
  */
18
- export function ensureW3cResponse(responseBody: any): any;
19
- import { MJSONWP_ELEMENT_KEY } from '../constants';
20
- import { W3C_ELEMENT_KEY } from '../constants';
21
- export { MJSONWP_ELEMENT_KEY, W3C_ELEMENT_KEY };
17
+ export declare function ensureW3cResponse(responseBody: Record<string, unknown>): Record<string, unknown>;
22
18
  //# sourceMappingURL=helpers.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../lib/protocol/helpers.js"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AACH,8CAJW,MAAS,SAAS,GAChB,MAAS,IAAI,CAazB;AAED;;;;;;GAMG;AACH,0DAIC;oCAlCkD,cAAc;gCAAd,cAAc"}
1
+ {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../lib/protocol/helpers.ts"],"names":[],"mappings":"AAIA;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAU/E;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAIhG"}
@@ -3,22 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.W3C_ELEMENT_KEY = exports.MJSONWP_ELEMENT_KEY = void 0;
7
6
  exports.formatResponseValue = formatResponseValue;
8
7
  exports.ensureW3cResponse = ensureW3cResponse;
9
8
  const lodash_1 = __importDefault(require("lodash"));
10
9
  const helpers_1 = require("../basedriver/helpers");
11
10
  const constants_1 = require("../constants");
12
- Object.defineProperty(exports, "MJSONWP_ELEMENT_KEY", { enumerable: true, get: function () { return constants_1.MJSONWP_ELEMENT_KEY; } });
13
- Object.defineProperty(exports, "W3C_ELEMENT_KEY", { enumerable: true, get: function () { return constants_1.W3C_ELEMENT_KEY; } });
14
11
  /**
15
12
  * Preprocesses the resulting value for API responses,
16
13
  * so they have keys for both W3C and JSONWP protocols.
17
- * The argument value is NOT mutated
14
+ * The argument value is NOT mutated.
18
15
  *
19
- * @param {Object | undefined} resValue The actual response value
20
- * @returns {Object | null} Either modified value or the same one if
21
- * nothing has been modified
16
+ * @param resValue - The actual response value
17
+ * @returns Either modified value or the same one if nothing has been modified
22
18
  */
23
19
  function formatResponseValue(resValue) {
24
20
  if (lodash_1.default.isUndefined(resValue)) {
@@ -35,8 +31,8 @@ function formatResponseValue(resValue) {
35
31
  * Properly formats the status for API responses,
36
32
  * so they are correct for the W3C protocol.
37
33
  *
38
- * @param {Object} responseBody
39
- * @returns {Object} The fixed response body
34
+ * @param responseBody - The response body
35
+ * @returns The fixed response body
40
36
  */
41
37
  function ensureW3cResponse(responseBody) {
42
38
  return lodash_1.default.isPlainObject(responseBody)
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../lib/protocol/helpers.js"],"names":[],"mappings":";;;;;;AAaA,kDAUC;AASD,8CAIC;AApCD,oDAAuB;AACvB,mDAAoD;AACpD,4CAAkE;AAoC1D,oGApCA,+BAAmB,OAoCA;AAAE,gGApCA,2BAAe,OAoCA;AAlC5C;;;;;;;;GAQG;AACH,SAAgB,mBAAmB,CAAC,QAAQ;IAC1C,IAAI,gBAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,4BAA4B;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,4DAA4D;IAC5D,4DAA4D;IAC5D,sEAAsE;IACtE,8CAA8C;IAC9C,OAAO,IAAA,uBAAa,EAAC,QAAQ,EAAE,+BAAmB,EAAE,2BAAe,CAAC,CAAC;AACvE,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAAC,YAAY;IAC5C,OAAO,gBAAC,CAAC,aAAa,CAAC,YAAY,CAAC;QAClC,CAAC,CAAC,gBAAC,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC/C,CAAC,CAAC,YAAY,CAAC;AACnB,CAAC"}
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../lib/protocol/helpers.ts"],"names":[],"mappings":";;;;;AAYA,kDAUC;AASD,8CAIC;AAnCD,oDAAuB;AACvB,mDAAoD;AACpD,4CAAkE;AAElE;;;;;;;GAOG;AACH,SAAgB,mBAAmB,CAAC,QAA4B;IAC9D,IAAI,gBAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,4BAA4B;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,4DAA4D;IAC5D,4DAA4D;IAC5D,sEAAsE;IACtE,8CAA8C;IAC9C,OAAO,IAAA,uBAAa,EAAC,QAAQ,EAAE,+BAAmB,EAAE,2BAAe,CAAC,CAAC;AACvE,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAAC,YAAqC;IACrE,OAAO,gBAAC,CAAC,aAAa,CAAC,YAAY,CAAC;QAClC,CAAC,CAAE,gBAAC,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC,CAA6B;QAC5E,CAAC,CAAC,YAAY,CAAC;AACnB,CAAC"}
@@ -1,22 +1,5 @@
1
- import { routeConfiguringFunction } from './protocol';
2
- import { errors } from './errors';
3
- import { isErrorType } from './errors';
4
- import { makeArgs } from './protocol';
5
- import { checkParams } from './protocol';
6
- import { validateExecuteMethodParams } from './protocol';
7
- import { errorFromMJSONWPStatusCode } from './errors';
8
- import { errorFromW3CJsonCode } from './errors';
9
- import { ALL_COMMANDS } from './routes';
10
- import { METHOD_MAP } from './routes';
11
- import { routeToCommandName } from './routes';
12
- import { NO_SESSION_ID_COMMANDS } from './routes';
13
- import { isSessionCommand } from './protocol';
14
- import { determineProtocol } from './protocol';
15
- import { CREATE_SESSION_COMMAND } from './protocol';
16
- import { DELETE_SESSION_COMMAND } from './protocol';
17
- import { GET_STATUS_COMMAND } from './protocol';
18
- import { LIST_DRIVER_COMMANDS_COMMAND } from './protocol';
19
- import { LIST_DRIVER_EXTENSIONS_COMMAND } from './protocol';
20
- import { getResponseForW3CError } from './errors';
21
- export { routeConfiguringFunction, errors, isErrorType, makeArgs, checkParams, validateExecuteMethodParams, errorFromMJSONWPStatusCode, errorFromW3CJsonCode, ALL_COMMANDS, METHOD_MAP, routeToCommandName, NO_SESSION_ID_COMMANDS, isSessionCommand, determineProtocol, CREATE_SESSION_COMMAND, DELETE_SESSION_COMMAND, GET_STATUS_COMMAND, LIST_DRIVER_COMMANDS_COMMAND, LIST_DRIVER_EXTENSIONS_COMMAND, getResponseForW3CError };
1
+ import { isSessionCommand, routeConfiguringFunction, determineProtocol, CREATE_SESSION_COMMAND, DELETE_SESSION_COMMAND, GET_STATUS_COMMAND, LIST_DRIVER_COMMANDS_COMMAND, LIST_DRIVER_EXTENSIONS_COMMAND, makeArgs, checkParams, validateExecuteMethodParams } from './protocol';
2
+ import { NO_SESSION_ID_COMMANDS, ALL_COMMANDS, METHOD_MAP, routeToCommandName } from './routes';
3
+ import { errors, isErrorType, errorFromMJSONWPStatusCode, errorFromW3CJsonCode, getResponseForW3CError } from './errors';
4
+ export { routeConfiguringFunction, errors, isErrorType, makeArgs, checkParams, validateExecuteMethodParams, errorFromMJSONWPStatusCode, errorFromW3CJsonCode, ALL_COMMANDS, METHOD_MAP, routeToCommandName, NO_SESSION_ID_COMMANDS, isSessionCommand, determineProtocol, CREATE_SESSION_COMMAND, DELETE_SESSION_COMMAND, GET_STATUS_COMMAND, LIST_DRIVER_COMMANDS_COMMAND, LIST_DRIVER_EXTENSIONS_COMMAND, getResponseForW3CError, };
22
5
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/protocol/index.js"],"names":[],"mappings":"yCAYO,YAAY;uBAQZ,UAAU;4BAAV,UAAU;yBARV,YAAY;4BAAZ,YAAY;4CAAZ,YAAY;2CAQZ,UAAU;qCAAV,UAAU;6BAPkE,UAAU;2BAAV,UAAU;mCAAV,UAAU;uCAAV,UAAU;iCADtF,YAAY;kCAAZ,YAAY;uCAAZ,YAAY;uCAAZ,YAAY;mCAAZ,YAAY;6CAAZ,YAAY;+CAAZ,YAAY;uCAQZ,UAAU"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/protocol/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EACxB,iBAAiB,EACjB,sBAAsB,EACtB,sBAAsB,EACtB,kBAAkB,EAClB,4BAA4B,EAC5B,8BAA8B,EAC9B,QAAQ,EACR,WAAW,EACX,2BAA2B,EAC5B,MAAM,YAAY,CAAC;AACpB,OAAO,EAAC,sBAAsB,EAAE,YAAY,EAAE,UAAU,EAAE,kBAAkB,EAAC,MAAM,UAAU,CAAC;AAC9F,OAAO,EACL,MAAM,EACN,WAAW,EACX,0BAA0B,EAC1B,oBAAoB,EACpB,sBAAsB,EACvB,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,wBAAwB,EACxB,MAAM,EACN,WAAW,EACX,QAAQ,EACR,WAAW,EACX,2BAA2B,EAC3B,0BAA0B,EAC1B,oBAAoB,EACpB,YAAY,EACZ,UAAU,EACV,kBAAkB,EAClB,sBAAsB,EACtB,gBAAgB,EAChB,iBAAiB,EACjB,sBAAsB,EACtB,sBAAsB,EACtB,kBAAkB,EAClB,4BAA4B,EAC5B,8BAA8B,EAC9B,sBAAsB,GACvB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/protocol/index.js"],"names":[],"mappings":";;;AAAA,yCAYoB;AAuBlB,iGAlCA,2BAAgB,OAkCA;AAZhB,yGArBA,mCAAwB,OAqBA;AAaxB,kGAjCA,4BAAiB,OAiCA;AACjB,uGAjCA,iCAAsB,OAiCA;AACtB,uGAjCA,iCAAsB,OAiCA;AACtB,mGAjCA,6BAAkB,OAiCA;AAClB,6GAjCA,uCAA4B,OAiCA;AAC5B,+GAjCA,yCAA8B,OAiCA;AAf9B,yFAjBA,mBAAQ,OAiBA;AACR,4FAjBA,sBAAW,OAiBA;AACX,4GAjBA,sCAA2B,OAiBA;AAf7B,qCAA8F;AAqB5F,uGArBM,+BAAsB,OAqBN;AAHtB,6FAlB8B,qBAAY,OAkB9B;AACZ,2FAnB4C,mBAAU,OAmB5C;AACV,mGApBwD,2BAAkB,OAoBxD;AAnBpB,qCAMkB;AAIhB,uFATA,eAAM,OASA;AACN,4FATA,oBAAW,OASA;AAIX,2GAZA,mCAA0B,OAYA;AAC1B,qGAZA,6BAAoB,OAYA;AAYpB,uGAvBA,+BAAsB,OAuBA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/protocol/index.ts"],"names":[],"mappings":";;;AAAA,yCAYoB;AAuBlB,iGAlCA,2BAAgB,OAkCA;AAZhB,yGArBA,mCAAwB,OAqBA;AAaxB,kGAjCA,4BAAiB,OAiCA;AACjB,uGAjCA,iCAAsB,OAiCA;AACtB,uGAjCA,iCAAsB,OAiCA;AACtB,mGAjCA,6BAAkB,OAiCA;AAClB,6GAjCA,uCAA4B,OAiCA;AAC5B,+GAjCA,yCAA8B,OAiCA;AAf9B,yFAjBA,mBAAQ,OAiBA;AACR,4FAjBA,sBAAW,OAiBA;AACX,4GAjBA,sCAA2B,OAiBA;AAf7B,qCAA8F;AAqB5F,uGArBM,+BAAsB,OAqBN;AAHtB,6FAlB8B,qBAAY,OAkB9B;AACZ,2FAnB4C,mBAAU,OAmB5C;AACV,mGApBwD,2BAAkB,OAoBxD;AAnBpB,qCAMkB;AAIhB,uFATA,eAAM,OASA;AACN,4FATA,oBAAW,OASA;AAIX,2GAZA,mCAA0B,OAYA;AAC1B,qGAZA,6BAAoB,OAYA;AAYpB,uGAvBA,+BAAsB,OAuBA"}
@@ -1,5 +1,6 @@
1
1
  import { PROTOCOLS } from '../constants';
2
2
  import type { Core, PayloadParams } from '@appium/types';
3
+ import type { Request } from 'express';
3
4
  import type { RouteConfiguringFunction } from '../express/server';
4
5
  export declare const CREATE_SESSION_COMMAND = "createSession";
5
6
  export declare const DELETE_SESSION_COMMAND = "deleteSession";
@@ -8,10 +9,23 @@ export declare const LIST_DRIVER_COMMANDS_COMMAND = "listCommands";
8
9
  export declare const LIST_DRIVER_EXTENSIONS_COMMAND = "listExtensions";
9
10
  export declare const deprecatedCommandsLogged: Set<string>;
10
11
  export declare function determineProtocol(createSessionArgs: any[]): keyof typeof PROTOCOLS;
12
+ /**
13
+ * Extract and validate the sessionId from the Express route parameter.
14
+ * Express may return route params as string | string[] | undefined.
15
+ * Appium uses standard routes (e.g., /session/:sessionId) which should always be strings.
16
+ * Only `*` such as `/session/*sessionId` can return `string[]`.
17
+ * Then, this method will return the first element as the session id.
18
+ * It may break existing appium routing handling also, thus this method will log
19
+ * received parameters as well to help debugging.
20
+ * @param driver Running driver
21
+ * @param req The request in Express
22
+ * @returns The normalized sessionId (string or undefined)
23
+ */
24
+ export declare function getSessionId(driver: Core<any>, req: Request): string | undefined;
11
25
  export declare function isSessionCommand(command: string): boolean;
12
26
  export declare function checkParams(paramSpec: PayloadParams, args: Record<string, any>, protocol?: keyof typeof PROTOCOLS): Record<string, any>;
13
27
  export declare function makeArgs(requestParams: PayloadParams, jsonObj: any, payloadParams: PayloadParams): any[];
14
28
  export declare function validateExecuteMethodParams(params: any[], paramSpec?: PayloadParams): any[];
15
29
  export declare function routeConfiguringFunction(driver: Core<any>): RouteConfiguringFunction;
16
- export declare function driverShouldDoJwpProxy(driver: Core<any>, req: import('express').Request, command: string): boolean;
30
+ export declare function driverShouldDoJwpProxy(driver: Core<any>, req: Request, command: string): boolean;
17
31
  //# sourceMappingURL=protocol.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../lib/protocol/protocol.ts"],"names":[],"mappings":"AAcA,OAAO,EAAsB,SAAS,EAAoB,MAAM,cAAc,CAAC;AAI/E,OAAO,KAAK,EAAE,IAAI,EAAgB,aAAa,EAAsC,MAAM,eAAe,CAAC;AAI3G,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAElE,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AACtD,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AACtD,eAAO,MAAM,kBAAkB,cAAc,CAAC;AAC9C,eAAO,MAAM,4BAA4B,iBAAiB,CAAC;AAC3D,eAAO,MAAM,8BAA8B,mBAAmB,CAAC;AAE/D,eAAO,MAAM,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAAa,CAAC;AAE/D,wBAAgB,iBAAiB,CAAC,iBAAiB,EAAE,GAAG,EAAE,GAAG,MAAM,OAAO,SAAS,CAElF;AAkBD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEzD;AAmDD,wBAAgB,WAAW,CACzB,SAAS,EAAE,aAAa,EACxB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,QAAQ,CAAC,EAAE,MAAM,OAAO,SAAS,GAChC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAsErB;AASD,wBAAgB,QAAQ,CAAC,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,aAAa,GAAG,GAAG,EAAE,CAgDxG;AAED,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,SAAS,CAAC,EAAE,aAAa,GAAG,GAAG,EAAE,CAwB3F;AAGD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,wBAAwB,CAgCpF;AAsOD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,OAAO,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAmBlH"}
1
+ {"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../lib/protocol/protocol.ts"],"names":[],"mappings":"AAcA,OAAO,EAAsB,SAAS,EAAoB,MAAM,cAAc,CAAC;AAI/E,OAAO,KAAK,EAAC,IAAI,EAAgB,aAAa,EAAqC,MAAM,eAAe,CAAC;AAEzG,OAAO,KAAK,EAAC,OAAO,EAAwB,MAAM,SAAS,CAAC;AAE5D,OAAO,KAAK,EAAC,wBAAwB,EAAC,MAAM,mBAAmB,CAAC;AAEhE,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AACtD,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AACtD,eAAO,MAAM,kBAAkB,cAAc,CAAC;AAC9C,eAAO,MAAM,4BAA4B,iBAAiB,CAAC;AAC3D,eAAO,MAAM,8BAA8B,mBAAmB,CAAC;AAE/D,eAAO,MAAM,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAAa,CAAC;AAE/D,wBAAgB,iBAAiB,CAAC,iBAAiB,EAAE,GAAG,EAAE,GAAG,MAAM,OAAO,SAAS,CAElF;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAehF;AAiBD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEzD;AAmDD,wBAAgB,WAAW,CACzB,SAAS,EAAE,aAAa,EACxB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,QAAQ,CAAC,EAAE,MAAM,OAAO,SAAS,GAChC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAsErB;AASD,wBAAgB,QAAQ,CAAC,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,aAAa,GAAG,GAAG,EAAE,CAgDxG;AAED,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,SAAS,CAAC,EAAE,aAAa,GAAG,GAAG,EAAE,CAwB3F;AAGD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,wBAAwB,CAgCpF;AAuOD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAoBhG"}
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.deprecatedCommandsLogged = exports.LIST_DRIVER_EXTENSIONS_COMMAND = exports.LIST_DRIVER_COMMANDS_COMMAND = exports.GET_STATUS_COMMAND = exports.DELETE_SESSION_COMMAND = exports.CREATE_SESSION_COMMAND = void 0;
7
7
  exports.determineProtocol = determineProtocol;
8
+ exports.getSessionId = getSessionId;
8
9
  exports.isSessionCommand = isSessionCommand;
9
10
  exports.checkParams = checkParams;
10
11
  exports.makeArgs = makeArgs;
@@ -20,7 +21,7 @@ const bluebird_1 = __importDefault(require("bluebird"));
20
21
  const helpers_1 = require("./helpers");
21
22
  const constants_1 = require("../constants");
22
23
  const capabilities_1 = require("../helpers/capabilities");
23
- const logger_1 = __importDefault(require("../basedriver/logger"));
24
+ const logger_1 = require("../basedriver/logger");
24
25
  const helpers_2 = require("../basedriver/helpers");
25
26
  exports.CREATE_SESSION_COMMAND = 'createSession';
26
27
  exports.DELETE_SESSION_COMMAND = 'deleteSession';
@@ -31,6 +32,32 @@ exports.deprecatedCommandsLogged = new Set();
31
32
  function determineProtocol(createSessionArgs) {
32
33
  return lodash_1.default.some(createSessionArgs, capabilities_1.isW3cCaps) ? constants_1.PROTOCOLS.W3C : constants_1.PROTOCOLS.MJSONWP;
33
34
  }
35
+ /**
36
+ * Extract and validate the sessionId from the Express route parameter.
37
+ * Express may return route params as string | string[] | undefined.
38
+ * Appium uses standard routes (e.g., /session/:sessionId) which should always be strings.
39
+ * Only `*` such as `/session/*sessionId` can return `string[]`.
40
+ * Then, this method will return the first element as the session id.
41
+ * It may break existing appium routing handling also, thus this method will log
42
+ * received parameters as well to help debugging.
43
+ * @param driver Running driver
44
+ * @param req The request in Express
45
+ * @returns The normalized sessionId (string or undefined)
46
+ */
47
+ function getSessionId(driver, req) {
48
+ if (Array.isArray(req.params.sessionId)) {
49
+ const sessionId = req.params.sessionId[0];
50
+ getLogger(driver, sessionId).warn(`Received malformed sessionId as array from the route: ${req.originalUrl}. ` +
51
+ `This indicates the route definition issue. The route should start with '/session/:sessionId' (named parameter) ` +
52
+ `instead of '/session/*sessionId' (wildcard). ` +
53
+ `Using the first element as session id: ${sessionId}. ` +
54
+ `Please fix the route definition to prevent this error.`);
55
+ // This is to not log the message multiple times.
56
+ req.params.sessionId = sessionId;
57
+ return sessionId;
58
+ }
59
+ return req.params.sessionId;
60
+ }
34
61
  function extractProtocol(driver, sessionId = null) {
35
62
  const dstDriver = lodash_1.default.isFunction(driver.driverForSession) && sessionId
36
63
  ? driver.driverForSession(sessionId)
@@ -84,7 +111,7 @@ function pickKnownParams(args, unknownNames) {
84
111
  if (lodash_1.default.isEmpty(unknownNames)) {
85
112
  return args;
86
113
  }
87
- logger_1.default.info(`The following arguments are not known and will be ignored: ${unknownNames}`);
114
+ logger_1.log.info(`The following arguments are not known and will be ignored: ${unknownNames}`);
88
115
  return lodash_1.default.pickBy(args, (v, k) => !unknownNames.includes(k));
89
116
  }
90
117
  function checkParams(paramSpec, args, protocol) {
@@ -250,18 +277,19 @@ function buildHandler(app, method, path, spec, driver, isSessCmd) {
250
277
  let httpResBody = {};
251
278
  let httpStatus = 200;
252
279
  let newSessionId;
253
- let currentProtocol = extractProtocol(driver, req.params.sessionId);
280
+ const sessionId = getSessionId(driver, req);
281
+ let currentProtocol = extractProtocol(driver, sessionId);
254
282
  try {
255
283
  // if the route accessed is deprecated, log a warning
256
284
  if (spec.deprecated && spec.command && !exports.deprecatedCommandsLogged.has(spec.command)) {
257
285
  exports.deprecatedCommandsLogged.add(spec.command);
258
- getLogger(driver, req.params.sessionId).warn(`The ${method} ${path} endpoint has been deprecated and will be removed in a future ` +
286
+ getLogger(driver, sessionId).warn(`The ${method} ${path} endpoint has been deprecated and will be removed in a future ` +
259
287
  `version of Appium or your driver/plugin. Please use a different endpoint or contact the ` +
260
288
  `driver/plugin author to add explicit support for the endpoint before it is removed`);
261
289
  }
262
290
  // if this is a session command but we don't have a session,
263
291
  // error out early (especially before proxying)
264
- if (isSessCmd && !driver.sessionExists(req.params.sessionId)) {
292
+ if (isSessCmd && !driver.sessionExists(sessionId)) {
265
293
  throw new errors_1.errors.NoSuchDriverError();
266
294
  }
267
295
  // if the driver is currently proxying commands to another JSONWP server, bypass all our
@@ -275,11 +303,11 @@ function buildHandler(app, method, path, spec, driver, isSessCmd) {
275
303
  let didPluginOverrideProxy = false;
276
304
  if (isSessCmd && !spec.neverProxy && spec.command && driverShouldDoJwpProxy(driver, req, spec.command)) {
277
305
  if (!('pluginsToHandleCmd' in driver) || !lodash_1.default.isFunction(driver.pluginsToHandleCmd) ||
278
- driver.pluginsToHandleCmd(spec.command, req.params.sessionId).length === 0) {
306
+ driver.pluginsToHandleCmd(spec.command, sessionId).length === 0) {
279
307
  await doJwpProxy(driver, req, res);
280
308
  return;
281
309
  }
282
- getLogger(driver, req.params.sessionId).debug(`Would have proxied ` +
310
+ getLogger(driver, sessionId).debug(`Would have proxied ` +
283
311
  `command directly, but a plugin exists which might require its value, so will let ` +
284
312
  `its value be collected internally and made part of plugin chain`);
285
313
  didPluginOverrideProxy = true;
@@ -315,7 +343,7 @@ function buildHandler(app, method, path, spec, driver, isSessCmd) {
315
343
  validators_1.validators[spec.command](...args);
316
344
  }
317
345
  // run the driver command wrapped inside the argument validators
318
- getLogger(driver, req.params.sessionId).debug(`Calling %s.%s() with args: %s`, driver.constructor.name, spec.command, support_1.logger.markSensitive(lodash_1.default.truncate(JSON.stringify(args), { length: constants_1.MAX_LOG_BODY_LENGTH })));
346
+ getLogger(driver, sessionId).debug(`Calling %s.%s() with args: %s`, driver.constructor.name, spec.command, support_1.logger.markSensitive(lodash_1.default.truncate(JSON.stringify(args), { length: constants_1.MAX_LOG_BODY_LENGTH })));
319
347
  if (didPluginOverrideProxy) {
320
348
  // TODO for now we add this information on the args list, but that's mixing purposes here.
321
349
  // We really should add another 'options' parameter to 'executeCommand', but this would be
@@ -324,7 +352,7 @@ function buildHandler(app, method, path, spec, driver, isSessCmd) {
324
352
  }
325
353
  driverRes = await driver.executeCommand(spec.command, ...args);
326
354
  // Get the protocol after executeCommand
327
- currentProtocol = extractProtocol(driver, req.params.sessionId) || currentProtocol;
355
+ currentProtocol = extractProtocol(driver, sessionId) || currentProtocol;
328
356
  // If `executeCommand` was overridden and the method returns an object
329
357
  // with a protocol and value/error property, re-assign the protocol
330
358
  if (lodash_1.default.isPlainObject(driverRes) && lodash_1.default.has(driverRes, 'protocol')) {
@@ -350,10 +378,10 @@ function buildHandler(app, method, path, spec, driver, isSessCmd) {
350
378
  driverRes = (0, helpers_1.formatResponseValue)(driverRes);
351
379
  // delete should not return anything even if successful
352
380
  if (spec.command === exports.DELETE_SESSION_COMMAND) {
353
- getLogger(driver, req.params.sessionId).debug(`Received response: ${lodash_1.default.truncate(JSON.stringify(driverRes), {
381
+ getLogger(driver, sessionId).debug(`Received response: ${lodash_1.default.truncate(JSON.stringify(driverRes), {
354
382
  length: constants_1.MAX_LOG_BODY_LENGTH,
355
383
  })}`);
356
- getLogger(driver, req.params.sessionId).debug('But deleting session, so not returning');
384
+ getLogger(driver, sessionId).debug('But deleting session, so not returning');
357
385
  driverRes = null;
358
386
  }
359
387
  // if the status is not 0, throw the appropriate error for status code.
@@ -368,7 +396,7 @@ function buildHandler(app, method, path, spec, driver, isSessCmd) {
368
396
  }
369
397
  }
370
398
  httpResBody.value = driverRes;
371
- getLogger(driver, req.params.sessionId || newSessionId).debug(`Responding ` +
399
+ getLogger(driver, sessionId || newSessionId).debug(`Responding ` +
372
400
  `to client with driver.${spec.command}() result: ${lodash_1.default.truncate(JSON.stringify(driverRes), {
373
401
  length: constants_1.MAX_LOG_BODY_LENGTH,
374
402
  })}`);
@@ -381,12 +409,12 @@ function buildHandler(app, method, path, spec, driver, isSessCmd) {
381
409
  actualErr = err;
382
410
  }
383
411
  else {
384
- getLogger(driver, req.params.sessionId || newSessionId).warn('The thrown error object does not seem to be a valid instance of the Error class. This ' +
412
+ getLogger(driver, sessionId || newSessionId).warn('The thrown error object does not seem to be a valid instance of the Error class. This ' +
385
413
  'might be a genuine bug of a driver or a plugin.');
386
414
  actualErr = new Error(`${err ?? 'unknown'}`);
387
415
  }
388
416
  currentProtocol =
389
- currentProtocol || extractProtocol(driver, req.params.sessionId || newSessionId);
417
+ currentProtocol || extractProtocol(driver, sessionId || newSessionId);
390
418
  let errMsg = err.stacktrace || err.stack;
391
419
  if (!lodash_1.default.includes(errMsg, err.message)) {
392
420
  // if the message has more information, add it. but often the message
@@ -397,7 +425,7 @@ function buildHandler(app, method, path, spec, driver, isSessCmd) {
397
425
  actualErr = err.getActualError();
398
426
  }
399
427
  else {
400
- getLogger(driver, req.params.sessionId || newSessionId).debug(`Encountered internal error running command: ${errMsg}`);
428
+ getLogger(driver, sessionId || newSessionId).debug(`Encountered internal error running command: ${errMsg}`);
401
429
  }
402
430
  [httpStatus, httpResBody] = (0, errors_1.getResponseForW3CError)(actualErr);
403
431
  }
@@ -420,8 +448,9 @@ function buildHandler(app, method, path, spec, driver, isSessCmd) {
420
448
  });
421
449
  }
422
450
  function driverShouldDoJwpProxy(driver, req, command) {
451
+ const sessionId = getSessionId(driver, req);
423
452
  // drivers need to explicitly say when the proxy is active
424
- if (!driver.proxyActive(req.params.sessionId)) {
453
+ if (!driver.proxyActive(sessionId)) {
425
454
  return false;
426
455
  }
427
456
  // we should never proxy deleteSession because we need to give the containing
@@ -431,19 +460,20 @@ function driverShouldDoJwpProxy(driver, req, command) {
431
460
  }
432
461
  // validate avoidance schema, and say we shouldn't proxy if anything in the
433
462
  // avoid list matches our req
434
- if (driver.proxyRouteIsAvoided(req.params.sessionId, req.method, req.originalUrl, req.body)) {
463
+ if (driver.proxyRouteIsAvoided(sessionId, req.method, req.originalUrl, req.body)) {
435
464
  return false;
436
465
  }
437
466
  return true;
438
467
  }
439
468
  async function doJwpProxy(driver, req, res) {
440
- getLogger(driver, req.params.sessionId).info('Driver proxy active, passing request on via HTTP proxy');
469
+ const sessionId = getSessionId(driver, req);
470
+ getLogger(driver, sessionId).info('Driver proxy active, passing request on via HTTP proxy');
441
471
  // check that the inner driver has a proxy function
442
- if (!driver.canProxy(req.params.sessionId)) {
472
+ if (!driver.canProxy(sessionId)) {
443
473
  throw new Error('Trying to proxy to a server but the driver is unable to proxy');
444
474
  }
445
475
  try {
446
- await driver.executeCommand('proxyReqRes', req, res, req.params.sessionId);
476
+ await driver.executeCommand('proxyReqRes', req, res, sessionId);
447
477
  }
448
478
  catch (err) {
449
479
  if ((0, errors_1.isErrorType)(err, errors_1.errors.ProxyRequestError)) {
@@ -1 +1 @@
1
- {"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../../lib/protocol/protocol.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../../lib/protocol/protocol.ts"],"names":[],"mappings":"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"}
@@ -1,18 +1,10 @@
1
+ import type { HTTPMethod } from '@appium/types';
1
2
  /**
2
- *
3
- * @param {string} endpoint
4
- * @param {import('@appium/types').HTTPMethod} [method]
5
- * @param {string} [basePath=DEFAULT_BASE_PATH]
6
- * @returns {string|undefined}
3
+ * Define the routes: mapping of HTTP methods to particular driver commands, and
4
+ * any parameters that are expected in a request. Parameters can be `required` or
5
+ * `optional`.
7
6
  */
8
- export function routeToCommandName(endpoint: string, method?: import("@appium/types").HTTPMethod, basePath?: string): string | undefined;
9
- /**
10
- * define the routes, mapping of HTTP methods to particular driver commands, and
11
- * any parameters that are expected in a request parameters can be `required` or
12
- * `optional`
13
- * @satisfies {import('@appium/types').MethodMap<import('../basedriver/driver').BaseDriver>}
14
- */
15
- export const METHOD_MAP: {
7
+ export declare const METHOD_MAP: {
16
8
  readonly '/session': {
17
9
  readonly POST: {
18
10
  readonly command: "createSession";
@@ -826,6 +818,7 @@ export const METHOD_MAP: {
826
818
  };
827
819
  };
828
820
  };
829
- export const ALL_COMMANDS: any[];
830
- export const NO_SESSION_ID_COMMANDS: string[];
821
+ export declare const ALL_COMMANDS: any[];
822
+ export declare function routeToCommandName(endpoint: string, method?: HTTPMethod, basePath?: string): string | undefined;
823
+ export declare const NO_SESSION_ID_COMMANDS: string[];
831
824
  //# sourceMappingURL=routes.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../../lib/protocol/routes.js"],"names":[],"mappings":"AA+jBA;;;;;;GAMG;AACH,6CALW,MAAM,WACN,OAAO,eAAe,EAAE,UAAU,aAClC,MAAM,GACJ,MAAM,GAAC,SAAS,CA8C5B;AAxmBD;;;;;GAKG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwiBG;AAGH,iCAEyB;AAkEzB,8CAA0F"}
1
+ {"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../../lib/protocol/routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA0B,UAAU,EAAY,MAAM,eAAe,CAAC;AAUlF;;;;GAIG;AACH,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwiBe,CAAC;AAGvC,eAAO,MAAM,YAAY,OAED,CAAC;AAEzB,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,UAAU,EACnB,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,GAAG,SAAS,CA2CpB;AAOD,eAAO,MAAM,sBAAsB,UAAsD,CAAC"}
@@ -9,17 +9,15 @@ const lodash_1 = __importDefault(require("lodash"));
9
9
  const constants_1 = require("../constants");
10
10
  const path_to_regexp_1 = require("path-to-regexp");
11
11
  const lru_cache_1 = require("lru-cache");
12
- /** @type {LRUCache<string, string>} */
13
12
  const COMMAND_NAMES_CACHE = new lru_cache_1.LRUCache({
14
13
  max: 1024,
15
14
  });
16
15
  /**
17
- * define the routes, mapping of HTTP methods to particular driver commands, and
18
- * any parameters that are expected in a request parameters can be `required` or
19
- * `optional`
20
- * @satisfies {import('@appium/types').MethodMap<import('../basedriver/driver').BaseDriver>}
16
+ * Define the routes: mapping of HTTP methods to particular driver commands, and
17
+ * any parameters that are expected in a request. Parameters can be `required` or
18
+ * `optional`.
21
19
  */
22
- exports.METHOD_MAP = ({
20
+ exports.METHOD_MAP = {
23
21
  // #region W3C WebDriver
24
22
  // https://www.w3.org/TR/webdriver2/
25
23
  '/session': {
@@ -565,38 +563,32 @@ exports.METHOD_MAP = ({
565
563
  DELETE: { command: 'deleteVirtualPressureSource' },
566
564
  },
567
565
  // #endregion
568
- });
566
+ };
569
567
  // driver command names
570
568
  exports.ALL_COMMANDS = lodash_1.default.flatMap(lodash_1.default.values(exports.METHOD_MAP).map(lodash_1.default.values))
571
569
  .filter((m) => Boolean(m.command))
572
570
  .map((m) => m.command);
573
- /**
574
- *
575
- * @param {string} endpoint
576
- * @param {import('@appium/types').HTTPMethod} [method]
577
- * @param {string} [basePath=DEFAULT_BASE_PATH]
578
- * @returns {string|undefined}
579
- */
580
- function routeToCommandName(endpoint, method, basePath = constants_1.DEFAULT_BASE_PATH) {
581
- let normalizedEndpoint = basePath
582
- ? endpoint.replace(new RegExp(`^${lodash_1.default.escapeRegExp(basePath)}`), '')
571
+ function routeToCommandName(endpoint, method, basePath) {
572
+ const resolvedBasePath = basePath ?? constants_1.DEFAULT_BASE_PATH;
573
+ let normalizedEndpoint = resolvedBasePath
574
+ ? endpoint.replace(new RegExp(`^${lodash_1.default.escapeRegExp(resolvedBasePath)}`), '')
583
575
  : endpoint;
584
576
  normalizedEndpoint = `${lodash_1.default.startsWith(normalizedEndpoint, '/') ? '' : '/'}${normalizedEndpoint}`;
585
- /** @type {string} */
586
577
  let normalizedPathname;
587
578
  try {
588
579
  // we could use any prefix there as we anyway need to only extract the pathname
589
580
  normalizedPathname = new URL(`https://appium.io${normalizedEndpoint}`).pathname;
590
581
  }
591
582
  catch (err) {
592
- throw new Error(`'${endpoint}' cannot be translated to a command name: ${err.message}`);
583
+ const msg = err instanceof Error ? err.message : String(err);
584
+ throw new Error(`'${endpoint}' cannot be translated to a command name: ${msg}`);
593
585
  }
594
- const normalizedMethod = lodash_1.default.toUpper(method);
586
+ const normalizedMethod = lodash_1.default.toUpper(method ?? '');
595
587
  const cacheKey = toCommandNameCacheKey(normalizedPathname, normalizedMethod);
596
- if (COMMAND_NAMES_CACHE.has(cacheKey)) {
597
- return COMMAND_NAMES_CACHE.get(cacheKey) || undefined;
588
+ const cached = COMMAND_NAMES_CACHE.get(cacheKey);
589
+ if (cached !== undefined) {
590
+ return cached || undefined;
598
591
  }
599
- /** @type {string[]} */
600
592
  const possiblePathnames = [];
601
593
  if (!normalizedPathname.startsWith('/session/')) {
602
594
  possiblePathnames.push(`/session/any-session-id${normalizedPathname}`);
@@ -605,10 +597,9 @@ function routeToCommandName(endpoint, method, basePath = constants_1.DEFAULT_BAS
605
597
  for (const [routePath, routeSpec] of lodash_1.default.toPairs(exports.METHOD_MAP)) {
606
598
  const routeMatcher = (0, path_to_regexp_1.match)(routePath);
607
599
  if (possiblePathnames.some((pp) => routeMatcher(pp))) {
608
- const commandForAnyMethod = () => lodash_1.default.first((lodash_1.default.keys(routeSpec) ?? []).map((key) => routeSpec[key]?.command));
609
- const commandName = normalizedMethod
610
- ? routeSpec?.[normalizedMethod]?.command
611
- : commandForAnyMethod();
600
+ const spec = routeSpec;
601
+ const commandForAnyMethod = () => lodash_1.default.first(lodash_1.default.keys(spec).map((key) => spec[key]?.command));
602
+ const commandName = normalizedMethod ? spec[normalizedMethod]?.command : commandForAnyMethod();
612
603
  if (commandName) {
613
604
  COMMAND_NAMES_CACHE.set(cacheKey, commandName);
614
605
  return commandName;
@@ -619,12 +610,6 @@ function routeToCommandName(endpoint, method, basePath = constants_1.DEFAULT_BAS
619
610
  // and we want to cache this result
620
611
  COMMAND_NAMES_CACHE.set(cacheKey, '');
621
612
  }
622
- /**
623
- *
624
- * @param {string} endpoint
625
- * @param {string} [method]
626
- * @returns {string}
627
- */
628
613
  function toCommandNameCacheKey(endpoint, method) {
629
614
  return `${endpoint}:${method ?? ''}`;
630
615
  }