@miqro/core 1.3.6 → 1.3.8

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 (125) hide show
  1. package/README.md +38 -96
  2. package/dist/handler/api-router-utils.d.ts +12 -1
  3. package/dist/handler/api-router-utils.js +86 -1
  4. package/dist/handler/api-router-utils.js.map +1 -1
  5. package/dist/handler/api-router.d.ts +29 -2
  6. package/dist/handler/api-router.js +2 -2
  7. package/dist/handler/api-router.js.map +1 -1
  8. package/dist/handler/app.d.ts +2 -1
  9. package/dist/handler/app.js +4 -2
  10. package/dist/handler/app.js.map +1 -1
  11. package/dist/handler/common/context.d.ts +1 -1
  12. package/dist/handler/common/context.js +14 -9
  13. package/dist/handler/common/context.js.map +1 -1
  14. package/dist/handler/common/router-utils.js +60 -5
  15. package/dist/handler/common/router-utils.js.map +1 -1
  16. package/dist/handler/index.d.ts +0 -3
  17. package/dist/handler/index.js +0 -3
  18. package/dist/handler/index.js.map +1 -1
  19. package/dist/handler/middleware/form.js +7 -1
  20. package/dist/handler/middleware/form.js.map +1 -1
  21. package/dist/handler/middleware/group.js +44 -2
  22. package/dist/handler/middleware/group.js.map +1 -1
  23. package/dist/handler/middleware/index.js +2 -6
  24. package/dist/handler/middleware/index.js.map +1 -1
  25. package/dist/handler/middleware/json.js +8 -2
  26. package/dist/handler/middleware/json.js.map +1 -1
  27. package/dist/handler/middleware/text.js +8 -1
  28. package/dist/handler/middleware/text.js.map +1 -1
  29. package/dist/handler/proxy.d.ts +2 -5
  30. package/dist/handler/proxy.js +2 -3
  31. package/dist/handler/proxy.js.map +1 -1
  32. package/dist/index.d.ts +1 -0
  33. package/dist/index.js +1 -0
  34. package/dist/index.js.map +1 -1
  35. package/dist/{util/test → test/common}/app.d.ts +2 -2
  36. package/dist/{util/test → test/common}/app.js +3 -2
  37. package/dist/test/common/app.js.map +1 -0
  38. package/dist/{util/test → test/common}/common.d.ts +0 -0
  39. package/dist/{util/test → test/common}/common.js +0 -0
  40. package/dist/test/common/common.js.map +1 -0
  41. package/dist/{util/test → test/common}/index.d.ts +1 -0
  42. package/dist/{util/test → test/common}/index.js +1 -0
  43. package/dist/test/common/index.js.map +1 -0
  44. package/dist/test/common/runner.d.ts +13 -0
  45. package/dist/test/common/runner.js +92 -0
  46. package/dist/test/common/runner.js.map +1 -0
  47. package/dist/test/index.d.ts +1 -0
  48. package/dist/{handler/response → test}/index.js +1 -3
  49. package/dist/test/index.js.map +1 -0
  50. package/dist/test/main.d.ts +1 -0
  51. package/dist/test/main.js +19 -0
  52. package/dist/test/main.js.map +1 -0
  53. package/dist/util/cli/index.d.ts +1 -1
  54. package/dist/util/error/parsererror.d.ts +2 -1
  55. package/dist/util/error/parsererror.js +5 -1
  56. package/dist/util/error/parsererror.js.map +1 -1
  57. package/dist/util/index.d.ts +0 -1
  58. package/dist/util/index.js +0 -1
  59. package/dist/util/index.js.map +1 -1
  60. package/dist/util/loader/index.d.ts +0 -3
  61. package/dist/util/loader/index.js +2 -9
  62. package/dist/util/loader/index.js.map +1 -1
  63. package/dist/util/request/index.d.ts +1 -1
  64. package/dist/util/request/index.js +1 -3
  65. package/dist/util/request/index.js.map +1 -1
  66. package/dist/util/session/common.d.ts +0 -1
  67. package/dist/util/session/common.js +0 -46
  68. package/dist/util/session/common.js.map +1 -1
  69. package/package.json +6 -11
  70. package/src/handler/api-router-utils.ts +91 -2
  71. package/src/handler/api-router.ts +30 -4
  72. package/src/handler/app.ts +2 -1
  73. package/src/handler/common/context.ts +14 -10
  74. package/src/handler/common/router-utils.ts +199 -144
  75. package/src/handler/index.ts +0 -3
  76. package/src/handler/middleware/form.ts +8 -2
  77. package/src/handler/middleware/group.ts +44 -2
  78. package/src/handler/middleware/index.ts +0 -4
  79. package/src/handler/middleware/json.ts +9 -3
  80. package/src/handler/middleware/text.ts +8 -1
  81. package/src/handler/proxy.ts +3 -8
  82. package/src/index.ts +1 -0
  83. package/src/{util/test → test/common}/app.ts +6 -5
  84. package/src/{util/test → test/common}/common.ts +0 -0
  85. package/src/{util/test → test/common}/index.ts +1 -0
  86. package/src/test/common/runner.ts +97 -0
  87. package/src/test/index.ts +1 -0
  88. package/src/test/main.ts +17 -0
  89. package/src/util/cli/index.ts +1 -1
  90. package/src/util/error/parsererror.ts +6 -1
  91. package/src/util/index.ts +0 -1
  92. package/src/util/loader/index.ts +1 -7
  93. package/src/util/request/index.ts +1 -1
  94. package/src/util/session/common.ts +0 -43
  95. package/tsconfig-test.json +13 -0
  96. package/dist/handler/api-handler.d.ts +0 -29
  97. package/dist/handler/api-handler.js +0 -42
  98. package/dist/handler/api-handler.js.map +0 -1
  99. package/dist/handler/feature-router.d.ts +0 -12
  100. package/dist/handler/feature-router.js +0 -90
  101. package/dist/handler/feature-router.js.map +0 -1
  102. package/dist/handler/response/html.d.ts +0 -10
  103. package/dist/handler/response/html.js +0 -34
  104. package/dist/handler/response/html.js.map +0 -1
  105. package/dist/handler/response/index.d.ts +0 -3
  106. package/dist/handler/response/index.js.map +0 -1
  107. package/dist/handler/response/json.d.ts +0 -2
  108. package/dist/handler/response/json.js +0 -21
  109. package/dist/handler/response/json.js.map +0 -1
  110. package/dist/handler/response/result.d.ts +0 -4
  111. package/dist/handler/response/result.js +0 -46
  112. package/dist/handler/response/result.js.map +0 -1
  113. package/dist/util/client.d.ts +0 -17
  114. package/dist/util/client.js +0 -55
  115. package/dist/util/client.js.map +0 -1
  116. package/dist/util/test/app.js.map +0 -1
  117. package/dist/util/test/common.js.map +0 -1
  118. package/dist/util/test/index.js.map +0 -1
  119. package/src/handler/api-handler.ts +0 -55
  120. package/src/handler/feature-router.ts +0 -92
  121. package/src/handler/response/html.ts +0 -36
  122. package/src/handler/response/index.ts +0 -3
  123. package/src/handler/response/json.ts +0 -19
  124. package/src/handler/response/result.ts +0 -40
  125. package/src/util/client.ts +0 -64
@@ -1 +1 @@
1
- {"version":3,"file":"router-utils.js","sourceRoot":"","sources":["../../../src/handler/common/router-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"router-utils.js","sourceRoot":"","sources":["../../../src/handler/common/router-utils.ts"],"names":[],"mappings":";;;AAAA,qCAAkC;AAGlC,qDAAiF;AACjF,+CAAmD;AACnD,8CAAgE;AAChE,mDAA8E;AAC9E,+CAAyD;AAGzD,MAAM,YAAY,GAAG,CAAC,OAAsC,EAAE,MAAe,EAAgB,EAAE,CAC7F,KAAK,EAAE,GAAY,EAAgB,EAAE;IACnC,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5C,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACxC,OAAO,SAAS,CAAC;KAClB;SAAM;QACL,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;QACrC,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,UAAU,CAAC,CAAC;QACvD,IAAI;YACF,IAAI,OAAO,YAAY,KAAK,EAAE;gBAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACvC,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;oBACrB,IAAI;wBACF,MAAM,aAAa,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,cAAK,CAAC,CAAC,eAAe,KAAK,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,eAAe,CAAC,CAAC;wBACjI,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;wBACvE,OAAO,aAAa,CAAC;qBACtB;oBAAC,OAAO,CAAC,EAAE;wBACV,IAAI,CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;4BAC5B,MAAM,CAAC,CAAC;yBACT;6BAAM;4BACL,SAAS;yBACV;qBACF;iBACF;aACF;iBAAM;gBACL,MAAM,aAAa,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,cAAK,CAAC,CAAC,eAAe,KAAK,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;gBACnJ,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;gBACvE,OAAO,aAAa,CAAC;aACtB;SACF;QAAC,OAAO,CAAC,EAAE;YACV,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,UAAU,CAAC,CAAC;YAC7D,MAAM,CAAC,CAAC;SACT;KACF;AACH,CAAC,CAAC;AAGJ,MAAM,eAAe,GAAG,GAAkB,EAAE,CAC1C,KAAK,EAAE,GAAY,EAAiB,EAAE;IACpC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAC9C,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5C,MAAM,IAAI,KAAK,CAAC,+FAA+F,CAAC,CAAC;KAClH;SAAM;QACL,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACvD,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;QAC9C,IAAI,UAAU,KAAK,SAAS,EAAE;YAC5B,MAAM,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SAC5B;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,+FAA+F,CAAC,CAAC;SAClH;KACF;AACH,CAAC,CAAC;AAsCJ,MAAa,aAAa;IAOxB,YAAmB,OAA+D,EAAmB,IAAwB,EAAmB,MAA0B,EAAE,OAA8B;QAArG,SAAI,GAAJ,IAAI,CAAoB;QAAmB,WAAM,GAAN,MAAM,CAAoB;QACxK,IAAI,CAAC,MAAM,GAAG,IAAA,6BAAY,EAAC,IAAI,CAAC,CAAC;QAEjC,IAAI,QAAQ,GAA4B,EAAE,CAAA;QAC1C,IAAI,CAAC,QAAQ,GAAG,OAAO,YAAY,eAAM,CAAC;QAE1C,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,OAAO,YAAY,KAAK,CAAC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAChF,qBAAqB;YACrB,IAAI,OAAO,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;aAC/E;YACD,MAAM,WAAW,GAAI,OAA8B,CAAC,OAAO,CAAC;YAC5D,MAAM,UAAU,GAAG;gBACjB,GAAI,OAA8B;aACnC,CAAC;YACF,OAAQ,UAAkB,CAAC,OAAO,CAAC;YACnC,OAAO,GAAG,WAAW,CAAC;YACtB,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC;SAC3B;aAAM;YACL,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;SACxB;QACD,MAAM,aAAa,GAAG,OAAO,YAAY,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAA4B,CAAC;QAEhG,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,aAAa,CAAC,MAAM,KAAK,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,UAAU,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE;YAC7I,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;SAClC;QAGD,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YAC3C,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;SACrD;QACD,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACxC,QAAQ,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,IAAA,wBAAc,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SACzH;QACD,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACvC,QAAQ,CAAC,IAAI,CAAC,IAAA,0BAAkB,EAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;SACxD;QACD,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACxC,QAAQ,CAAC,IAAI,CAAC,IAAA,oBAAY,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;SACnD;QAED,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAE1C,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;YACzC,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,SAAS,EAAE;gBAC7C,QAAsB,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;aACjD;iBAAM;gBACJ,QAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;gBACtF,QAAsB,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;aACjD;SACF;QACD,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC;IAC1B,CAAC;IAEM,UAAU,CAAC,MAAqB,EAAE,EAAE,OAAO,GAAG,GAAG;QACtD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9E,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAE/C,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,MAAM,MAAM,GAAW,IAAI,CAAC,OAAO,CAAC,CAAC,CAAW,CAAC;YACjD,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,OAAO,GAAG,KAAK,EAAE,CAAC,CAAC;SAC9C;aAAM,IAAI,IAAI,CAAC,OAAO,EAAE;YACvB,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,GAAG,KAAK,EAAE,CAAC,EAAE;gBAC9B,GAAG,CAAC,GAAG,OAAO,GAAG,KAAK,EAAE,CAAC,GAAG,EAAE,CAAC;aAChC;YACD,IAAI,GAAG,CAAC,GAAG,OAAO,GAAG,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE;gBACtC,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;aACjE;YACD,GAAG,CAAC,GAAG,OAAO,GAAG,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG;gBACnC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;gBACrC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;gBACvB,UAAU,EAAE,GAAG,OAAO,GAAG,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE;gBAC/M,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;gBAC3B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;oBAC9B,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;oBAC/B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO;oBACrC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM;oBACnC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK;iBAClC,CAAC,CAAC,CAAC,SAAS;gBACb,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;aAChC,CAAC;SACH;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,GAAY,EAAE,UAA+C,EAAE,aAA8B;QAC/G,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC5C,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC1B,IAAI,CAAC,YAAY,eAAM,EAAE;gBACvB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE;oBAC3F,OAAO,KAAK,CAAC;iBACd;aACF;iBAAM;gBACL,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,EAAE;oBACxC,OAAO,KAAK,CAAC;iBACd;aACF;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,OAAO,CACZ,MAAc,EACd,UAA+C,EAC/C,aAA8B;QAI9B,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,EAAE;YACzD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;gBAC3B,OAAO;oBACL,KAAK,EAAE,IAAI;iBACZ,CAAC;aACH;YACD,OAAO,IAAA,kCAAiB,EAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,CAAC;SACxF;QACD,OAAO;YACL,KAAK,EAAE,KAAK;SACb,CAAC;IACJ,CAAC;IAEO,WAAW,CAAC,MAAe,EAAE,GAAY;QAC/C,IAAI,MAAM,KAAK,KAAK,EAAE;YACpB,8EAA8E;YAC9E,OAAO,KAAK,CAAC;SACd;aAAM,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,SAAS,EAAE;YAClD,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC;YACpD,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC1B;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA1ID,sCA0IC"}
@@ -1,8 +1,5 @@
1
1
  export * from "./app";
2
- export * from "./api-handler";
3
2
  export * from "./api-router";
4
- export * from "./response";
5
3
  export * from "./common";
6
- export * from "./feature-router";
7
4
  export * from "./proxy";
8
5
  export * from "./middleware";
@@ -11,11 +11,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
11
11
  };
12
12
  Object.defineProperty(exports, "__esModule", { value: true });
13
13
  __exportStar(require("./app"), exports);
14
- __exportStar(require("./api-handler"), exports);
15
14
  __exportStar(require("./api-router"), exports);
16
- __exportStar(require("./response"), exports);
17
15
  __exportStar(require("./common"), exports);
18
- __exportStar(require("./feature-router"), exports);
19
16
  __exportStar(require("./proxy"), exports);
20
17
  __exportStar(require("./middleware"), exports);
21
18
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/handler/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAAsB;AACtB,gDAA8B;AAC9B,+CAA6B;AAC7B,6CAA2B;AAC3B,2CAAyB;AACzB,mDAAiC;AACjC,0CAAwB;AACxB,+CAA6B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/handler/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAAsB;AACtB,+CAA6B;AAC7B,2CAAyB;AACzB,0CAAwB;AACxB,+CAA6B"}
@@ -21,9 +21,15 @@ const URLEncodedParser = (options) => {
21
21
  type = typeS;
22
22
  maxKeys = maxKeysS !== "undefined" ? parseInt(maxKeysS, 10) : DEFAULT_FORM_MAX_KEYS;
23
23
  }
24
+ const readBuffer = (0, buffer_1.ReadBuffer)({
25
+ limit
26
+ });
24
27
  return async (ctx) => {
25
28
  try {
26
29
  const isType = ctx.body === undefined && ctx.headers["content-type"] ? ctx.headers["content-type"].toLocaleLowerCase().indexOf(type.toLocaleLowerCase()) !== -1 : false;
30
+ if (isType && !ctx.buffer) {
31
+ await readBuffer(ctx);
32
+ }
27
33
  if (isType && ctx.buffer && ctx.buffer.length <= limit) {
28
34
  const string = ctx.buffer.toString();
29
35
  if (string) {
@@ -40,7 +46,7 @@ const URLEncodedParser = (options) => {
40
46
  }
41
47
  }
42
48
  catch (e) {
43
- if (e && e.name === "ParseOptionsError") {
49
+ if (e && e.name === "BadRequestError") {
44
50
  throw e;
45
51
  }
46
52
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"form.js","sourceRoot":"","sources":["../../../src/handler/middleware/form.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"form.js","sourceRoot":"","sources":["../../../src/handler/middleware/form.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,50 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.GroupPolicyHandler = void 0;
4
- const session_1 = require("../../util/session");
5
4
  const error_1 = require("../../util/error");
5
+ const policyCheck = (session, options) => {
6
+ switch (options.groupPolicy) {
7
+ case "at_least_one":
8
+ for (const group of options.groups) {
9
+ if (group instanceof Array) {
10
+ let ret = true;
11
+ for (const g of group) {
12
+ if (session.groups.indexOf(g) === -1) {
13
+ ret = false;
14
+ break;
15
+ }
16
+ }
17
+ if (ret) {
18
+ return true;
19
+ }
20
+ }
21
+ else {
22
+ if (session.groups.indexOf(group) !== -1) {
23
+ return true;
24
+ }
25
+ }
26
+ }
27
+ return false;
28
+ case "all":
29
+ for (const group of options.groups) {
30
+ if (group instanceof Array) {
31
+ for (const g of group) {
32
+ if (session.groups.indexOf(g) === -1) {
33
+ return false;
34
+ }
35
+ }
36
+ }
37
+ else {
38
+ if (session.groups.indexOf(group) === -1) {
39
+ return false;
40
+ }
41
+ }
42
+ }
43
+ return true;
44
+ default:
45
+ throw new error_1.ParseOptionsError(`policy [${options.groupPolicy}] not implemented!!`);
46
+ }
47
+ };
6
48
  const GroupPolicyHandler = (options) => {
7
49
  return async (ctx) => {
8
50
  try {
@@ -10,7 +52,7 @@ const GroupPolicyHandler = (options) => {
10
52
  throw new error_1.UnAuthorizedError(`No Session!`);
11
53
  }
12
54
  else {
13
- const result = await (0, session_1.policyCheck)(ctx.session, options);
55
+ const result = await policyCheck(ctx.session, options);
14
56
  if (result) {
15
57
  ctx.logger.debug("groups validated!");
16
58
  }
@@ -1 +1 @@
1
- {"version":3,"file":"group.js","sourceRoot":"","sources":["../../../src/handler/middleware/group.ts"],"names":[],"mappings":";;;AAAA,gDAA8D;AAC9D,4CAAqE;AAG9D,MAAM,kBAAkB,GAAG,CAAC,OAAoB,EAAiB,EAAE;IACxE,OAAO,KAAK,EAAE,GAAY,EAAiB,EAAE;QAC3C,IAAI;YACF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;gBAChB,MAAM,IAAI,yBAAiB,CAAC,aAAa,CAAC,CAAC;aAC5C;iBAAM;gBACL,MAAM,MAAM,GAAG,MAAM,IAAA,qBAAW,EAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACvD,IAAI,MAAM,EAAE;oBACV,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;iBACvC;qBAAM;oBACL,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBACrI,MAAM,IAAI,sBAAc,CAAC,oDAAoD,CAAC,CAAC;iBAChF;aACF;SACF;QAAC,OAAO,CAAM,EAAE;YACf,0FAA0F;YAC1F,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE;gBAChC,MAAM,CAAC,CAAC;aACT;iBAAM;gBACL,MAAM,IAAI,yBAAiB,CAAC,oDAAoD,CAAC,CAAC;aACnF;SACF;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAvBW,QAAA,kBAAkB,sBAuB7B"}
1
+ {"version":3,"file":"group.js","sourceRoot":"","sources":["../../../src/handler/middleware/group.ts"],"names":[],"mappings":";;;AACA,4CAAwF;AAGxF,MAAM,WAAW,GAAG,CAAC,OAAgB,EAAE,OAAoB,EAAW,EAAE;IACtE,QAAQ,OAAO,CAAC,WAAW,EAAE;QAC3B,KAAK,cAAc;YACjB,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE;gBAClC,IAAI,KAAK,YAAY,KAAK,EAAE;oBAC1B,IAAI,GAAG,GAAG,IAAI,CAAC;oBACf,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;wBACrB,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE;4BACpC,GAAG,GAAG,KAAK,CAAC;4BACZ,MAAM;yBACP;qBACF;oBACD,IAAI,GAAG,EAAE;wBACP,OAAO,IAAI,CAAC;qBACb;iBACF;qBAAM;oBACL,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;wBACxC,OAAO,IAAI,CAAC;qBACb;iBACF;aACF;YACD,OAAO,KAAK,CAAC;QACf,KAAK,KAAK;YACR,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE;gBAClC,IAAI,KAAK,YAAY,KAAK,EAAE;oBAC1B,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;wBACrB,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE;4BACpC,OAAO,KAAK,CAAC;yBACd;qBACF;iBACF;qBAAM;oBACL,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;wBACxC,OAAO,KAAK,CAAC;qBACd;iBACF;aACF;YACD,OAAO,IAAI,CAAC;QACd;YACE,MAAM,IAAI,yBAAiB,CAAC,WAAW,OAAO,CAAC,WAAW,qBAAqB,CAAC,CAAC;KACpF;AACH,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,CAAC,OAAoB,EAAiB,EAAE;IACxE,OAAO,KAAK,EAAE,GAAY,EAAiB,EAAE;QAC3C,IAAI;YACF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;gBAChB,MAAM,IAAI,yBAAiB,CAAC,aAAa,CAAC,CAAC;aAC5C;iBAAM;gBACL,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACvD,IAAI,MAAM,EAAE;oBACV,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;iBACvC;qBAAM;oBACL,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBACrI,MAAM,IAAI,sBAAc,CAAC,oDAAoD,CAAC,CAAC;iBAChF;aACF;SACF;QAAC,OAAO,CAAM,EAAE;YACf,0FAA0F;YAC1F,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE;gBAChC,MAAM,CAAC,CAAC;aACT;iBAAM;gBACL,MAAM,IAAI,yBAAiB,CAAC,oDAAoD,CAAC,CAAC;aACnF;SACF;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAvBW,QAAA,kBAAkB,sBAuB7B"}
@@ -16,7 +16,6 @@ const logger_1 = require("./logger");
16
16
  const tag_1 = require("./tag");
17
17
  const cors_1 = require("./cors");
18
18
  const cookie_1 = require("./cookie");
19
- const buffer_1 = require("./buffer");
20
19
  const json_1 = require("./json");
21
20
  const text_1 = require("./text");
22
21
  const form_1 = require("./form");
@@ -30,8 +29,8 @@ __exportStar(require("./group"), exports);
30
29
  __exportStar(require("./parse"), exports);
31
30
  __exportStar(require("./tag"), exports);
32
31
  __exportStar(require("./cookie"), exports);
33
- var buffer_2 = require("./buffer");
34
- Object.defineProperty(exports, "ReadBuffer", { enumerable: true, get: function () { return buffer_2.ReadBuffer; } });
32
+ var buffer_1 = require("./buffer");
33
+ Object.defineProperty(exports, "ReadBuffer", { enumerable: true, get: function () { return buffer_1.ReadBuffer; } });
35
34
  const middleware = () => {
36
35
  const ret = [];
37
36
  if ((0, config_1.isFeatureEnabled)("REQUEST_LOGGER", true)) {
@@ -43,9 +42,6 @@ const middleware = () => {
43
42
  if ((0, config_1.isFeatureEnabled)("CORS", false)) {
44
43
  ret.push((0, cors_1.CORS)());
45
44
  }
46
- if ((0, config_1.isFeatureEnabled)("READ_BUFFER", true)) {
47
- ret.push((0, buffer_1.ReadBuffer)());
48
- }
49
45
  if ((0, config_1.isFeatureEnabled)("COOKIE_PARSER", true)) {
50
46
  ret.push((0, cookie_1.CookieParser)());
51
47
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/handler/middleware/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,8CAAqD;AAGrD,qCAAyC;AACzC,+BAAoC;AACpC,iCAA8B;AAC9B,qCAAwC;AACxC,qCAAsC;AACtC,iCAAoC;AACpC,iCAAoC;AACpC,iCAA0C;AAE1C,2CAAyB;AACzB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,4CAA0B;AAC1B,0CAAwB;AACxB,0CAAwB;AACxB,wCAAsB;AACtB,2CAAyB;AACzB,mCAAsC;AAA7B,oGAAA,UAAU,OAAA;AAEZ,MAAM,UAAU,GAAG,GAAc,EAAE;IACtC,MAAM,GAAG,GAAc,EAAE,CAAC;IAC1B,IAAI,IAAA,yBAAgB,EAAC,gBAAgB,EAAE,IAAI,CAAC,EAAE;QAC1C,GAAG,CAAC,IAAI,CAAC,IAAA,sBAAa,GAAE,CAAC,CAAC;KAC7B;IACD,IAAI,IAAA,yBAAgB,EAAC,cAAc,EAAE,KAAK,CAAC,EAAE;QACzC,GAAG,CAAC,IAAI,CAAC,IAAA,iBAAW,GAAE,CAAC,CAAC;KAC3B;IACD,IAAI,IAAA,yBAAgB,EAAC,MAAM,EAAE,KAAK,CAAC,EAAE;QACjC,GAAG,CAAC,IAAI,CAAC,IAAA,WAAI,GAAE,CAAC,CAAC;KACpB;IACD,IAAI,IAAA,yBAAgB,EAAC,aAAa,EAAE,IAAI,CAAC,EAAE;QACvC,GAAG,CAAC,IAAI,CAAC,IAAA,mBAAU,GAAE,CAAC,CAAC;KAC1B;IACD,IAAI,IAAA,yBAAgB,EAAC,eAAe,EAAE,IAAI,CAAC,EAAE;QACzC,GAAG,CAAC,IAAI,CAAC,IAAA,qBAAY,GAAE,CAAC,CAAC;KAC5B;IACD,IAAI,IAAA,yBAAgB,EAAC,aAAa,EAAE,IAAI,CAAC,EAAE;QACvC,GAAG,CAAC,IAAI,CAAC,IAAA,iBAAU,GAAE,CAAC,CAAC;KAC1B;IACD,IAAI,IAAA,yBAAgB,EAAC,oBAAoB,EAAE,IAAI,CAAC,EAAE;QAC9C,GAAG,CAAC,IAAI,CAAC,IAAA,uBAAgB,GAAE,CAAC,CAAC;KAChC;IACD,IAAI,IAAA,yBAAgB,EAAC,aAAa,EAAE,IAAI,CAAC,EAAE;QACvC,GAAG,CAAC,IAAI,CAAC,IAAA,iBAAU,GAAE,CAAC,CAAC;KAC1B;IACD,OAAO,GAAG,CAAC;AACf,CAAC,CAAC;AA3BW,QAAA,UAAU,cA2BrB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/handler/middleware/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,8CAAqD;AAGrD,qCAAyC;AACzC,+BAAoC;AACpC,iCAA8B;AAC9B,qCAAwC;AACxC,iCAAoC;AACpC,iCAAoC;AACpC,iCAA0C;AAE1C,2CAAyB;AACzB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,4CAA0B;AAC1B,0CAAwB;AACxB,0CAAwB;AACxB,wCAAsB;AACtB,2CAAyB;AACzB,mCAAsC;AAA7B,oGAAA,UAAU,OAAA;AAEZ,MAAM,UAAU,GAAG,GAAc,EAAE;IACtC,MAAM,GAAG,GAAc,EAAE,CAAC;IAC1B,IAAI,IAAA,yBAAgB,EAAC,gBAAgB,EAAE,IAAI,CAAC,EAAE;QAC1C,GAAG,CAAC,IAAI,CAAC,IAAA,sBAAa,GAAE,CAAC,CAAC;KAC7B;IACD,IAAI,IAAA,yBAAgB,EAAC,cAAc,EAAE,KAAK,CAAC,EAAE;QACzC,GAAG,CAAC,IAAI,CAAC,IAAA,iBAAW,GAAE,CAAC,CAAC;KAC3B;IACD,IAAI,IAAA,yBAAgB,EAAC,MAAM,EAAE,KAAK,CAAC,EAAE;QACjC,GAAG,CAAC,IAAI,CAAC,IAAA,WAAI,GAAE,CAAC,CAAC;KACpB;IACD,IAAI,IAAA,yBAAgB,EAAC,eAAe,EAAE,IAAI,CAAC,EAAE;QACzC,GAAG,CAAC,IAAI,CAAC,IAAA,qBAAY,GAAE,CAAC,CAAC;KAC5B;IACD,IAAI,IAAA,yBAAgB,EAAC,aAAa,EAAE,IAAI,CAAC,EAAE;QACvC,GAAG,CAAC,IAAI,CAAC,IAAA,iBAAU,GAAE,CAAC,CAAC;KAC1B;IACD,IAAI,IAAA,yBAAgB,EAAC,oBAAoB,EAAE,IAAI,CAAC,EAAE;QAC9C,GAAG,CAAC,IAAI,CAAC,IAAA,uBAAgB,GAAE,CAAC,CAAC;KAChC;IACD,IAAI,IAAA,yBAAgB,EAAC,aAAa,EAAE,IAAI,CAAC,EAAE;QACvC,GAAG,CAAC,IAAI,CAAC,IAAA,iBAAU,GAAE,CAAC,CAAC;KAC1B;IACD,OAAO,GAAG,CAAC;AACf,CAAC,CAAC;AAxBW,QAAA,UAAU,cAwBrB"}
@@ -19,15 +19,21 @@ const JSONParser = (options) => {
19
19
  limit = parseInt(limitS, 10);
20
20
  type = typeS;
21
21
  }
22
+ const readBuffer = (0, buffer_1.ReadBuffer)({
23
+ limit
24
+ });
22
25
  return async (ctx) => {
23
26
  try {
24
27
  const isType = ctx.body === undefined && ctx.headers["content-type"] ? ctx.headers["content-type"].toLocaleLowerCase().indexOf(type.toLocaleLowerCase()) !== -1 : false;
28
+ if (isType && !ctx.buffer) {
29
+ await readBuffer(ctx);
30
+ }
25
31
  if (isType && ctx.buffer && ctx.buffer.length <= limit) {
26
32
  const string = ctx.buffer.toString();
27
33
  if (string) {
28
34
  const parsed = JSON.parse(string);
29
35
  if (parsed instanceof Array && strict) {
30
- throw new error_1.BadRequestError(`body cannot be an array`, 'body');
36
+ throw new error_1.BadRequestError(`body cannot be an array`);
31
37
  }
32
38
  ctx.body = parsed;
33
39
  }
@@ -38,7 +44,7 @@ const JSONParser = (options) => {
38
44
  }
39
45
  }
40
46
  catch (e) {
41
- if (e && e.name === "ParseOptionsError") {
47
+ if (e && e.name === "BadRequestError") {
42
48
  throw e;
43
49
  }
44
50
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"json.js","sourceRoot":"","sources":["../../../src/handler/middleware/json.ts"],"names":[],"mappings":";;;AACA,4CAAmD;AACnD,8CAAsD;AACtD,qCAAqD;AAE9C,MAAM,UAAU,GAAG,CAAC,OAI1B,EAAiB,EAAE;IAClB,IAAI,MAAM,GAAG,IAAI,CAAC;IAClB,IAAI,KAAK,GAAG,kCAAyB,CAAC;IACtC,IAAI,IAAI,GAAG,kBAAkB,CAAC;IAC9B,IAAI,OAAO,EAAE;QACX,MAAM,GAAG,OAAO,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;QAChE,KAAK,GAAG,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;QAC5D,IAAI,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;KACzD;SAAM;QACL,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,GAC5B,IAAA,0BAAiB,EAAC,CAAC,mBAAmB,EAAE,oBAAoB,EAAE,kBAAkB,CAAC,EAAE,CAAC,MAAM,CAAC,kCAAyB,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAA;QACrJ,MAAM,GAAG,OAAO,KAAK,MAAM,CAAC;QAC5B,KAAK,GAAG,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC7B,IAAI,GAAG,KAAK,CAAC;KACd;IACD,OAAO,KAAK,EAAE,GAAY,EAAiB,EAAE;QAC3C,IAAI;YACF,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,iBAAiB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YACxK,IAAI,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,KAAK,EAAE;gBACtD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACrC,IAAI,MAAM,EAAE;oBACV,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;oBAClC,IAAI,MAAM,YAAY,KAAK,IAAI,MAAM,EAAE;wBACrC,MAAM,IAAI,uBAAe,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC;qBAC9D;oBACD,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC;iBACnB;aACF;iBAAM,IAAI,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,KAAK,EAAE;gBAC5D,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,GAAG,CAAC,MAAM,CAAC,MAAM,MAAM,KAAK,gEAAgE,CAAC,CAAC;gBACpI,MAAM,IAAI,uBAAe,CAAC,iBAAiB,GAAG,CAAC,MAAM,CAAC,MAAM,MAAM,KAAK,EAAE,CAAC,CAAC;aAC5E;SACF;QAAC,OAAO,CAAM,EAAE;YACf,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,mBAAmB,EAAE;gBACvC,MAAM,CAAC,CAAC;aACT;iBAAM;gBACL,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACpB,MAAM,IAAI,uBAAe,EAAE,CAAC;aAC7B;SACF;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AA5CW,QAAA,UAAU,cA4CrB"}
1
+ {"version":3,"file":"json.js","sourceRoot":"","sources":["../../../src/handler/middleware/json.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@ exports.TextParser = void 0;
4
4
  const error_1 = require("../../util/error");
5
5
  const config_1 = require("../../util/config");
6
6
  const buffer_1 = require("./buffer");
7
+ const buffer_2 = require("./buffer");
7
8
  const TextParser = (options) => {
8
9
  let limit = buffer_1.DEFAULT_READ_BUFFER_LIMIT;
9
10
  let type = "plain/text";
@@ -16,9 +17,15 @@ const TextParser = (options) => {
16
17
  limit = parseInt(limitS, 10);
17
18
  type = typeS;
18
19
  }
20
+ const readBuffer = (0, buffer_2.ReadBuffer)({
21
+ limit
22
+ });
19
23
  return async (ctx) => {
20
24
  try {
21
25
  const isType = ctx.body === undefined && ctx.headers["content-type"] ? ctx.headers["content-type"].toLocaleLowerCase().indexOf(type.toLocaleLowerCase()) !== -1 : false;
26
+ if (isType && !ctx.buffer) {
27
+ await readBuffer(ctx);
28
+ }
22
29
  if (isType && ctx.buffer && ctx.buffer.length <= limit) {
23
30
  const string = ctx.buffer.toString();
24
31
  ctx.body = string;
@@ -29,7 +36,7 @@ const TextParser = (options) => {
29
36
  }
30
37
  }
31
38
  catch (e) {
32
- if (e && e.name === "ParseOptionsError") {
39
+ if (e && e.name === "BadRequestError") {
33
40
  throw e;
34
41
  }
35
42
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"text.js","sourceRoot":"","sources":["../../../src/handler/middleware/text.ts"],"names":[],"mappings":";;;AACA,4CAAmD;AACnD,8CAAsD;AACtD,qCAAqD;AAE9C,MAAM,UAAU,GAAG,CAAC,OAG1B,EAAiB,EAAE;IAClB,IAAI,KAAK,GAAG,kCAAyB,CAAC;IACtC,IAAI,IAAI,GAAG,YAAY,CAAC;IACxB,IAAI,OAAO,EAAE;QACX,KAAK,GAAG,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;QAC5D,IAAI,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;KACzD;SAAM;QACL,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GACnB,IAAA,0BAAiB,EAAC,CAAC,wBAAwB,EAAE,uBAAuB,CAAC,EAAE,CAAC,MAAM,CAAC,kCAAyB,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;QAC5H,KAAK,GAAG,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC7B,IAAI,GAAG,KAAK,CAAC;KACd;IACD,OAAO,KAAK,EAAE,GAAY,EAAiB,EAAE;QAC3C,IAAI;YACF,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,iBAAiB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YACxK,IAAI,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,KAAK,EAAE;gBACtD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACrC,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC;aACnB;iBAAM,IAAI,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,KAAK,EAAE;gBAC5D,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,GAAG,CAAC,MAAM,CAAC,MAAM,MAAM,KAAK,qEAAqE,CAAC,CAAC;gBACzI,MAAM,IAAI,uBAAe,CAAC,iBAAiB,GAAG,CAAC,MAAM,CAAC,MAAM,MAAM,KAAK,EAAE,CAAC,CAAC;aAC5E;SACF;QAAC,OAAO,CAAM,EAAE;YACf,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,mBAAmB,EAAE;gBACvC,MAAM,CAAC,CAAC;aACT;iBAAM;gBACL,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACpB,MAAM,IAAI,uBAAe,EAAE,CAAC;aAC7B;SACF;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAlCW,QAAA,UAAU,cAkCrB"}
1
+ {"version":3,"file":"text.js","sourceRoot":"","sources":["../../../src/handler/middleware/text.ts"],"names":[],"mappings":";;;AACA,4CAAmD;AACnD,8CAAsD;AACtD,qCAAqD;AACrD,qCAAsC;AAE/B,MAAM,UAAU,GAAG,CAAC,OAG1B,EAAiB,EAAE;IAClB,IAAI,KAAK,GAAG,kCAAyB,CAAC;IACtC,IAAI,IAAI,GAAG,YAAY,CAAC;IACxB,IAAI,OAAO,EAAE;QACX,KAAK,GAAG,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;QAC5D,IAAI,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;KACzD;SAAM;QACL,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GACnB,IAAA,0BAAiB,EAAC,CAAC,wBAAwB,EAAE,uBAAuB,CAAC,EAAE,CAAC,MAAM,CAAC,kCAAyB,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;QAC5H,KAAK,GAAG,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC7B,IAAI,GAAG,KAAK,CAAC;KACd;IACD,MAAM,UAAU,GAAG,IAAA,mBAAU,EAAC;QAC5B,KAAK;KACN,CAAC,CAAC;IACH,OAAO,KAAK,EAAE,GAAY,EAAiB,EAAE;QAC3C,IAAI;YACF,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,iBAAiB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YACxK,IAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE;gBACxB,MAAM,UAAU,CAAC,GAAG,CAAC,CAAC;aACvB;YACD,IAAI,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,KAAK,EAAE;gBACtD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACrC,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC;aACnB;iBAAM,IAAI,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,KAAK,EAAE;gBAC5D,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,GAAG,CAAC,MAAM,CAAC,MAAM,MAAM,KAAK,qEAAqE,CAAC,CAAC;gBACzI,MAAM,IAAI,uBAAe,CAAC,iBAAiB,GAAG,CAAC,MAAM,CAAC,MAAM,MAAM,KAAK,EAAE,CAAC,CAAC;aAC5E;SACF;QAAC,OAAO,CAAM,EAAE;YACf,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,iBAAiB,EAAE;gBACrC,MAAM,CAAC,CAAC;aACT;iBAAM;gBACL,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACpB,MAAM,IAAI,uBAAe,EAAE,CAAC;aAC7B;SACF;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAxCW,QAAA,UAAU,cAwCrB"}
@@ -1,10 +1,7 @@
1
1
  import { RequestOptions, RequestResponse } from "../util/request";
2
2
  import { Context, Handler } from "./common";
3
3
  export interface ProxyServiceInterface {
4
- resolveRequest(ctx: Context): Promise<RequestOptions>;
4
+ resolve(ctx: Context): Promise<RequestOptions>;
5
5
  }
6
- export interface ProxyOptionsInterface {
7
- proxyService: ProxyServiceInterface;
8
- }
9
- export declare const ProxyHandler: (options: ProxyOptionsInterface) => Handler<RequestResponse>;
6
+ export declare const ProxyHandler: (resolver: ProxyServiceInterface) => Handler<RequestResponse>;
10
7
  export declare const ProxyResponseHandler: () => Handler<void>;
@@ -2,9 +2,8 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ProxyResponseHandler = exports.ProxyHandler = void 0;
4
4
  const request_1 = require("../util/request");
5
- const ProxyHandler = (options) => async (ctx) => {
6
- const resolver = options.proxyService;
7
- const requestConfig = await resolver.resolveRequest(ctx);
5
+ const ProxyHandler = (resolver) => async (ctx) => {
6
+ const requestConfig = await resolver.resolve(ctx);
8
7
  try {
9
8
  ctx.logger.debug("proxy resolveRequest to [%o]", requestConfig);
10
9
  const response = await (0, request_1.request)(requestConfig);
@@ -1 +1 @@
1
- {"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../src/handler/proxy.ts"],"names":[],"mappings":";;;AAAA,6CAA2E;AAWpE,MAAM,YAAY,GAAG,CAAC,OAA8B,EAA4B,EAAE,CACvF,KAAK,EAAE,GAAG,EAA4B,EAAE;IACtC,MAAM,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC;IACtC,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;IACzD,IAAI;QACF,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,aAAa,CAAC,CAAC;QAChE,MAAM,QAAQ,GAAG,MAAM,IAAA,iBAAO,EAAC,aAAa,CAAC,CAAC;QAC9C,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC1C,OAAO,QAAQ,CAAC;KACjB;IAAC,OAAO,CAAM,EAAE;QACf,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,EAAE,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;QAC5F,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,IAAI,EAAE;YACnC,OAAO,CAAC,CAAC;SACV;aAAM;YACL,MAAM,CAAC,CAAC;SACT;KACF;AACH,CAAC,CAAA;AAjBU,QAAA,YAAY,gBAiBtB;AAEI,MAAM,oBAAoB,GAAG,GAAkB,EAAE,CACtD,KAAK,EAAE,GAAY,EAAiB,EAAE;IACpC,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5C,MAAM,IAAI,KAAK,CAAC,+FAA+F,CAAC,CAAC;KAClH;SAAM;QACL,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACvD,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAC5C,MAAM,GAAG,CAAC,GAAG,CAAC;YACZ,OAAO,EAAE,UAAU,CAAC,OAAO;YAC3B,IAAI,EAAE,UAAU,CAAC,IAAI;YACrB,MAAM,EAAE,UAAU,CAAC,MAAM;SAC1B,CAAC,CAAC;KACJ;AACH,CAAC,CAAA;AAbU,QAAA,oBAAoB,wBAa9B"}
1
+ {"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../src/handler/proxy.ts"],"names":[],"mappings":";;;AAAA,6CAA2E;AAOpE,MAAM,YAAY,GAAG,CAAC,QAA+B,EAA4B,EAAE,CACxF,KAAK,EAAE,GAAG,EAA4B,EAAE;IACtC,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAClD,IAAI;QACF,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,aAAa,CAAC,CAAC;QAChE,MAAM,QAAQ,GAAG,MAAM,IAAA,iBAAO,EAAC,aAAa,CAAC,CAAC;QAC9C,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC1C,OAAO,QAAQ,CAAC;KACjB;IAAC,OAAO,CAAM,EAAE;QACf,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,EAAE,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;QAC5F,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,IAAI,EAAE;YACnC,OAAO,CAAC,CAAC;SACV;aAAM;YACL,MAAM,CAAC,CAAC;SACT;KACF;AACH,CAAC,CAAA;AAhBU,QAAA,YAAY,gBAgBtB;AAEI,MAAM,oBAAoB,GAAG,GAAkB,EAAE,CACtD,KAAK,EAAE,GAAY,EAAiB,EAAE;IACpC,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5C,MAAM,IAAI,KAAK,CAAC,+FAA+F,CAAC,CAAC;KAClH;SAAM;QACL,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACvD,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAC5C,MAAM,GAAG,CAAC,GAAG,CAAC;YACZ,OAAO,EAAE,UAAU,CAAC,OAAO;YAC3B,IAAI,EAAE,UAAU,CAAC,IAAI;YACrB,MAAM,EAAE,UAAU,CAAC,MAAM;SAC1B,CAAC,CAAC;KACJ;AACH,CAAC,CAAA;AAbU,QAAA,oBAAoB,wBAa9B"}
package/dist/index.d.ts CHANGED
@@ -1,2 +1,3 @@
1
1
  export * from "./handler";
2
2
  export * from "./util";
3
+ export * from "./test";
package/dist/index.js CHANGED
@@ -12,4 +12,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
12
12
  Object.defineProperty(exports, "__esModule", { value: true });
13
13
  __exportStar(require("./handler"), exports);
14
14
  __exportStar(require("./util"), exports);
15
+ __exportStar(require("./test"), exports);
15
16
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA0B;AAC1B,yCAAuB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA0B;AAC1B,yCAAuB;AACvB,yCAAuB"}
@@ -1,3 +1,3 @@
1
- import { RequestOptions, RequestResponse } from "../request";
1
+ import { RequestOptions, RequestResponse } from "../../util/request";
2
2
  import { App } from "../../handler/app";
3
- export declare const TestHelper: (app: App, options: RequestOptions, cb?: ((response: RequestResponse) => void) | undefined) => Promise<RequestResponse | void>;
3
+ export declare const TestHelper: (app: App, options: RequestOptions, cb?: ((response: RequestResponse) => void) | undefined) => Promise<RequestResponse>;
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.TestHelper = void 0;
4
- const request_1 = require("../request");
4
+ const request_1 = require("../../util/request");
5
5
  const fs_1 = require("fs");
6
6
  const http_1 = require("http");
7
7
  const TestHelper = async (app, options, cb) => {
@@ -13,6 +13,7 @@ const TestHelper = async (app, options, cb) => {
13
13
  return new Promise((resolve, reject) => {
14
14
  server.listen(unixSocket, () => {
15
15
  (0, request_1.request)({
16
+ disableThrow: true,
16
17
  ...options,
17
18
  socketPath: unixSocket
18
19
  }).then((response) => {
@@ -36,7 +37,7 @@ const TestHelper = async (app, options, cb) => {
36
37
  catch (ee) {
37
38
  reject(ee);
38
39
  }
39
- resolve();
40
+ resolve(undefined);
40
41
  }
41
42
  else {
42
43
  reject(e);
@@ -0,0 +1 @@
1
+ {"version":3,"file":"app.js","sourceRoot":"","sources":["../../../src/test/common/app.ts"],"names":[],"mappings":";;;AAAA,gDAA8E;AAE9E,2BAA4C;AAC5C,+BAAoC;AAE7B,MAAM,UAAU,GAAG,KAAK,EAAE,GAAQ,EAAE,OAAuB,EAAE,EAAwC,EAA4B,EAAE;IACxI,MAAM,UAAU,GAAG,0BAA0B,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;IAC1D,IAAI,IAAA,eAAU,EAAC,UAAU,CAAC,EAAE;QAC1B,IAAA,eAAU,EAAC,UAAU,CAAC,CAAC;KACxB;IACD,MAAM,MAAM,GAAG,IAAA,mBAAY,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC1C,OAAO,IAAI,OAAO,CAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtD,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,EAAE;YAC7B,IAAA,iBAAO,EAAC;gBACN,YAAY,EAAE,IAAI;gBAClB,GAAG,OAAO;gBACV,UAAU,EAAE,UAAU;aACvB,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACnB,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE;oBAChB,IAAI,EAAE,EAAE;wBACN,IAAI;4BACF,EAAE,CAAC,QAAQ,CAAC,CAAC;yBACd;wBAAC,OAAO,EAAE,EAAE;4BACX,MAAM,CAAC,EAAE,CAAC,CAAC;yBACZ;qBACF;oBACD,OAAO,CAAC,QAAQ,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAM,EAAE,EAAE;gBAClB,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE;oBAChB,IAAI,EAAE,EAAE;wBACN,IAAI;4BACF,EAAE,CAAC,CAAQ,CAAC,CAAC;yBACd;wBAAC,OAAO,EAAE,EAAE;4BACX,MAAM,CAAC,EAAE,CAAC,CAAC;yBACZ;wBACD,OAAO,CAAC,SAAgB,CAAC,CAAC;qBAC3B;yBAAM;wBACL,MAAM,CAAC,CAAC,CAAC,CAAC;qBACX;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAA;AAvCY,QAAA,UAAU,cAuCtB"}
File without changes
File without changes
@@ -0,0 +1 @@
1
+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/test/common/common.ts"],"names":[],"mappings":";;;AAOO,MAAM,IAAI,GAAG,CAAC,EAAY,EAAgB,EAAE;IACjD,MAAM,GAAG,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;QAC7B,GAAG,CAAC,SAAS,EAAE,CAAC;QAChB,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxB,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;IACrB,CAAC,CAAC;IACF,GAAG,CAAC,SAAS,GAAG,CAAC,CAAC;IAClB,GAAG,CAAC,QAAQ,GAAG,EAAS,CAAC;IACzB,OAAO,GAAG,CAAC;AACb,CAAC,CAAA;AATY,QAAA,IAAI,QAShB"}
@@ -1,2 +1,3 @@
1
1
  export * from "./common";
2
2
  export * from "./app";
3
+ export * from "./runner";
@@ -12,4 +12,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
12
12
  Object.defineProperty(exports, "__esModule", { value: true });
13
13
  __exportStar(require("./common"), exports);
14
14
  __exportStar(require("./app"), exports);
15
+ __exportStar(require("./runner"), exports);
15
16
  //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/test/common/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyB;AACzB,wCAAsB;AACtB,2CAAyB"}
@@ -0,0 +1,13 @@
1
+ import { Console } from "console";
2
+ import { Logger } from "../../util";
3
+ export declare type TestFunction = () => void | Promise<void>;
4
+ export declare const getTestCount: () => number;
5
+ export declare const it: (title: string, impl: TestFunction, options?: {
6
+ category?: string | undefined;
7
+ timeout?: number | undefined;
8
+ before?: TestFunction | undefined;
9
+ after?: TestFunction | undefined;
10
+ } | undefined, logger?: Logger | Console) => void;
11
+ export declare const runTests: (title?: string | string[] | undefined, logger?: Logger | Console) => Promise<void>;
12
+ export declare const runTestModules: (modules: string[], title?: string | string[] | undefined) => Promise<void>;
13
+ export declare const runTestDir: (dirs: string[], title?: string | string[] | undefined, exts?: string[]) => Promise<void>;
@@ -0,0 +1,92 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.runTestDir = exports.runTestModules = exports.runTests = exports.it = exports.getTestCount = void 0;
4
+ const console_1 = require("console");
5
+ const fs_1 = require("fs");
6
+ const path_1 = require("path");
7
+ const util_1 = require("util");
8
+ const DEFAULT_TIMEOUT = 2000;
9
+ const tests = [];
10
+ const getTestCount = () => tests.length;
11
+ exports.getTestCount = getTestCount;
12
+ const it = (title, impl, options, logger = new console_1.Console(process.stdout)) => {
13
+ const category = options && options.category ? options.category : undefined;
14
+ const fullName = `${category ? `${category} [` : ""}${title}${category ? "]" : ""}`;
15
+ tests.push({
16
+ run: () => new Promise((resolve, reject) => {
17
+ const timeoutMS = options && options.timeout ? options.timeout : DEFAULT_TIMEOUT;
18
+ const timeout = setTimeout(() => {
19
+ reject(new Error((0, util_1.format)("\n\n%s failed\x1b[31m\n%s timeout %o\x1b", fullName, fullName, timeoutMS)));
20
+ }, timeoutMS);
21
+ try {
22
+ (async () => {
23
+ if (options && options.before) {
24
+ await options.before();
25
+ }
26
+ const startMS = Date.now();
27
+ await impl();
28
+ const took = Date.now() - startMS;
29
+ if (options && options.after) {
30
+ await options.after();
31
+ }
32
+ return took;
33
+ })().then((took) => {
34
+ clearTimeout(timeout);
35
+ logger.log("\x1b[32mpassed %s (took %sms)\x1b[0m\n", fullName, took);
36
+ resolve();
37
+ }).catch(e => {
38
+ clearTimeout(timeout);
39
+ reject(new Error((0, util_1.format)("\n\n%s failed\x1b[31m\n%s finished with errors %o\x1b", fullName, fullName, e)));
40
+ });
41
+ }
42
+ catch (e) {
43
+ clearTimeout(timeout);
44
+ reject(new Error((0, util_1.format)("\n\n%s failed\x1b[31m\n%s finished with errors %o\x1b", fullName, fullName, e)));
45
+ }
46
+ }), title,
47
+ category,
48
+ fullName
49
+ });
50
+ };
51
+ exports.it = it;
52
+ const runTests = async (title, logger = new console_1.Console(process.stdout)) => {
53
+ const titles = title ? title instanceof Array ? title : [title] : undefined;
54
+ for (const test of tests) {
55
+ if (!titles || titles.indexOf(test.title) !== -1) {
56
+ try {
57
+ await test.run();
58
+ }
59
+ catch (e) {
60
+ logger.error(e);
61
+ process.exit(1);
62
+ }
63
+ }
64
+ }
65
+ };
66
+ exports.runTests = runTests;
67
+ const runTestModules = async (modules, title) => {
68
+ for (const path of modules) {
69
+ require(path);
70
+ }
71
+ await (0, exports.runTests)(title);
72
+ };
73
+ exports.runTestModules = runTestModules;
74
+ const runTestDir = async (dirs, title, exts = ["test.js"]) => {
75
+ for (const dir of dirs) {
76
+ const files = (0, fs_1.readdirSync)((0, path_1.resolve)(process.cwd(), dir));
77
+ for (const f of files) {
78
+ const path = (0, path_1.resolve)(dir, f);
79
+ if (!(0, fs_1.lstatSync)(path).isDirectory()) {
80
+ for (const ext of exts) {
81
+ const name = (0, path_1.basename)(f);
82
+ if (name.indexOf(ext) === name.length - ext.length) {
83
+ require(path);
84
+ }
85
+ }
86
+ }
87
+ }
88
+ }
89
+ await (0, exports.runTests)(title);
90
+ };
91
+ exports.runTestDir = runTestDir;
92
+ //# sourceMappingURL=runner.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/test/common/runner.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ export * from "./common";
@@ -10,7 +10,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
10
10
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
11
11
  };
12
12
  Object.defineProperty(exports, "__esModule", { value: true });
13
- __exportStar(require("./html"), exports);
14
- __exportStar(require("./json"), exports);
15
- __exportStar(require("./result"), exports);
13
+ __exportStar(require("./common"), exports);
16
14
  //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyB"}
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,19 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const path_1 = require("path");
4
+ const common_1 = require("./common");
5
+ const startMS = Date.now();
6
+ const name = process.argv[2];
7
+ if (!name) {
8
+ throw new Error("bad arguments");
9
+ }
10
+ const modules = process.argv.slice(3);
11
+ (0, common_1.runTestModules)(modules.map(m => (0, path_1.resolve)(process.cwd(), m)), name.toLowerCase() !== "all" ? name : undefined).then(() => {
12
+ const took = Date.now() - startMS;
13
+ const count = (0, common_1.getTestCount)();
14
+ console.log("\n\n" + count + " tests pased took " + took + "ms\n\n");
15
+ }).catch(e => {
16
+ console.error(e);
17
+ process.exit(1);
18
+ });
19
+ //# sourceMappingURL=main.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/test/main.ts"],"names":[],"mappings":";;AAAA,+BAA+B;AAC/B,qCAAwD;AAExD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;AAC3B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC7B,IAAI,CAAC,IAAI,EAAE;IACT,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;CAClC;AACD,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACtC,IAAA,uBAAc,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;IACrH,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC;IAClC,MAAM,KAAK,GAAG,IAAA,qBAAY,GAAE,CAAC;IAC7B,OAAO,CAAC,GAAG,CAAC,MAAM,GAAG,KAAK,GAAG,oBAAoB,GAAG,IAAI,GAAG,QAAQ,CAAC,CAAC;AACvE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
@@ -1,7 +1,7 @@
1
1
  /// <reference types="node" />
2
2
  import { SimpleMap } from "../parser/common";
3
3
  import { Logger } from "../logger";
4
- import { Callback } from "../test";
4
+ import { Callback } from "../../test/common";
5
5
  export declare type CMDMapType = SimpleMap<{
6
6
  cb: Callback<void> | Callback<Promise<void>>;
7
7
  description: string;
@@ -3,5 +3,6 @@ export declare class ParseOptionsError extends NamedError {
3
3
  argAttr?: string | undefined;
4
4
  constructor(message?: string, argAttr?: string | undefined);
5
5
  }
6
- export declare class BadRequestError extends ParseOptionsError {
6
+ export declare class BadRequestError extends NamedError {
7
+ constructor(message?: string);
7
8
  }
@@ -10,7 +10,11 @@ class ParseOptionsError extends named_1.NamedError {
10
10
  }
11
11
  }
12
12
  exports.ParseOptionsError = ParseOptionsError;
13
- class BadRequestError extends ParseOptionsError {
13
+ class BadRequestError extends named_1.NamedError {
14
+ constructor(message = "BAD REQUEST") {
15
+ super(message);
16
+ this.name = "BadRequestError";
17
+ }
14
18
  }
15
19
  exports.BadRequestError = BadRequestError;
16
20
  //# sourceMappingURL=parsererror.js.map