@miqro/core 1.3.4 → 1.3.9

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 (135) hide show
  1. package/README.md +81 -253
  2. package/dist/handler/api-router-utils.d.ts +11 -7
  3. package/dist/handler/api-router-utils.js +102 -15
  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 +4 -9
  9. package/dist/handler/app.js +10 -9
  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.d.ts +34 -1
  15. package/dist/handler/common/router-utils.js +139 -9
  16. package/dist/handler/common/router-utils.js.map +1 -1
  17. package/dist/handler/common/router.d.ts +19 -8
  18. package/dist/handler/common/router.js +32 -15
  19. package/dist/handler/common/router.js.map +1 -1
  20. package/dist/handler/index.d.ts +0 -3
  21. package/dist/handler/index.js +0 -3
  22. package/dist/handler/index.js.map +1 -1
  23. package/dist/handler/middleware/form.js +7 -1
  24. package/dist/handler/middleware/form.js.map +1 -1
  25. package/dist/handler/middleware/group.js +44 -2
  26. package/dist/handler/middleware/group.js.map +1 -1
  27. package/dist/handler/middleware/index.js +2 -6
  28. package/dist/handler/middleware/index.js.map +1 -1
  29. package/dist/handler/middleware/json.js +8 -2
  30. package/dist/handler/middleware/json.js.map +1 -1
  31. package/dist/handler/middleware/text.js +8 -1
  32. package/dist/handler/middleware/text.js.map +1 -1
  33. package/dist/handler/proxy.d.ts +2 -5
  34. package/dist/handler/proxy.js +2 -3
  35. package/dist/handler/proxy.js.map +1 -1
  36. package/dist/index.d.ts +1 -0
  37. package/dist/index.js +1 -0
  38. package/dist/index.js.map +1 -1
  39. package/dist/{util/test → test/common}/app.d.ts +2 -2
  40. package/dist/{util/test → test/common}/app.js +3 -2
  41. package/dist/test/common/app.js.map +1 -0
  42. package/dist/{util/test → test/common}/common.d.ts +0 -0
  43. package/dist/{util/test → test/common}/common.js +0 -0
  44. package/dist/test/common/common.js.map +1 -0
  45. package/dist/{util/test → test/common}/index.d.ts +1 -0
  46. package/dist/{util/test → test/common}/index.js +1 -0
  47. package/dist/test/common/index.js.map +1 -0
  48. package/dist/test/common/runner.d.ts +28 -0
  49. package/dist/test/common/runner.js +88 -0
  50. package/dist/test/common/runner.js.map +1 -0
  51. package/dist/test/index.d.ts +1 -0
  52. package/dist/{handler/response → test}/index.js +1 -3
  53. package/dist/test/index.js.map +1 -0
  54. package/dist/test/main.d.ts +1 -0
  55. package/dist/test/main.js +31 -0
  56. package/dist/test/main.js.map +1 -0
  57. package/dist/util/cli/index.d.ts +5 -1
  58. package/dist/util/cli/index.js +26 -0
  59. package/dist/util/cli/index.js.map +1 -1
  60. package/dist/util/error/parsererror.d.ts +2 -1
  61. package/dist/util/error/parsererror.js +5 -1
  62. package/dist/util/error/parsererror.js.map +1 -1
  63. package/dist/util/index.d.ts +0 -1
  64. package/dist/util/index.js +0 -1
  65. package/dist/util/index.js.map +1 -1
  66. package/dist/util/loader/index.d.ts +0 -3
  67. package/dist/util/loader/index.js +2 -9
  68. package/dist/util/loader/index.js.map +1 -1
  69. package/dist/util/logger/formatter.js +1 -1
  70. package/dist/util/logger/formatter.js.map +1 -1
  71. package/dist/util/parser/get.js +3 -6
  72. package/dist/util/parser/get.js.map +1 -1
  73. package/dist/util/request/index.d.ts +1 -1
  74. package/dist/util/request/index.js +1 -3
  75. package/dist/util/request/index.js.map +1 -1
  76. package/dist/util/session/common.d.ts +0 -1
  77. package/dist/util/session/common.js +0 -46
  78. package/dist/util/session/common.js.map +1 -1
  79. package/package.json +7 -11
  80. package/src/handler/api-router-utils.ts +108 -22
  81. package/src/handler/api-router.ts +30 -4
  82. package/src/handler/app.ts +10 -15
  83. package/src/handler/common/context.ts +14 -10
  84. package/src/handler/common/router-utils.ts +221 -49
  85. package/src/handler/common/router.ts +43 -15
  86. package/src/handler/index.ts +0 -3
  87. package/src/handler/middleware/form.ts +8 -2
  88. package/src/handler/middleware/group.ts +44 -2
  89. package/src/handler/middleware/index.ts +0 -4
  90. package/src/handler/middleware/json.ts +9 -3
  91. package/src/handler/middleware/text.ts +8 -1
  92. package/src/handler/proxy.ts +3 -8
  93. package/src/index.ts +1 -0
  94. package/src/{util/test → test/common}/app.ts +6 -5
  95. package/src/{util/test → test/common}/common.ts +0 -0
  96. package/src/{util/test → test/common}/index.ts +1 -0
  97. package/src/test/common/runner.ts +116 -0
  98. package/src/test/index.ts +1 -0
  99. package/src/test/main.ts +32 -0
  100. package/src/util/cli/index.ts +24 -1
  101. package/src/util/error/parsererror.ts +6 -1
  102. package/src/util/index.ts +0 -1
  103. package/src/util/loader/index.ts +1 -7
  104. package/src/util/logger/formatter.ts +1 -1
  105. package/src/util/parser/get.ts +3 -5
  106. package/src/util/request/index.ts +1 -1
  107. package/src/util/session/common.ts +0 -43
  108. package/test.md +0 -0
  109. package/tsconfig-test.json +13 -0
  110. package/dist/handler/api-handler.d.ts +0 -30
  111. package/dist/handler/api-handler.js +0 -42
  112. package/dist/handler/api-handler.js.map +0 -1
  113. package/dist/handler/feature-router.d.ts +0 -10
  114. package/dist/handler/feature-router.js +0 -90
  115. package/dist/handler/feature-router.js.map +0 -1
  116. package/dist/handler/response/html.d.ts +0 -10
  117. package/dist/handler/response/html.js +0 -34
  118. package/dist/handler/response/html.js.map +0 -1
  119. package/dist/handler/response/index.d.ts +0 -3
  120. package/dist/handler/response/index.js.map +0 -1
  121. package/dist/handler/response/json.d.ts +0 -2
  122. package/dist/handler/response/json.js +0 -21
  123. package/dist/handler/response/json.js.map +0 -1
  124. package/dist/handler/response/result.d.ts +0 -4
  125. package/dist/handler/response/result.js +0 -46
  126. package/dist/handler/response/result.js.map +0 -1
  127. package/dist/util/test/app.js.map +0 -1
  128. package/dist/util/test/common.js.map +0 -1
  129. package/dist/util/test/index.js.map +0 -1
  130. package/src/handler/api-handler.ts +0 -56
  131. package/src/handler/feature-router.ts +0 -90
  132. package/src/handler/response/html.ts +0 -36
  133. package/src/handler/response/index.ts +0 -3
  134. package/src/handler/response/json.ts +0 -19
  135. package/src/handler/response/result.ts +0 -40
@@ -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,28 @@
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<{
12
+ passed: number;
13
+ total: number;
14
+ ignored: number;
15
+ failed: {
16
+ error: any;
17
+ fullName: string;
18
+ }[];
19
+ }>;
20
+ export declare const runTestModules: (modules: string[], title?: string | string[] | undefined, logger?: Logger | Console) => Promise<{
21
+ passed: number;
22
+ total: number;
23
+ ignored: number;
24
+ failed: {
25
+ error: any;
26
+ fullName: string;
27
+ }[];
28
+ }>;
@@ -0,0 +1,88 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.runTestModules = exports.runTests = exports.it = exports.getTestCount = void 0;
4
+ const console_1 = require("console");
5
+ const util_1 = require("util");
6
+ const DEFAULT_TIMEOUT = 2000;
7
+ const tests = [];
8
+ const getTestCount = () => tests.length;
9
+ exports.getTestCount = getTestCount;
10
+ const it = (title, impl, options, logger = new console_1.Console(process.stdout)) => {
11
+ const category = options && options.category ? options.category : undefined;
12
+ const fullName = `${category ? `${category} [` : ""}${title}${category ? "]" : ""}`;
13
+ tests.push({
14
+ run: () => new Promise((resolve, reject) => {
15
+ const timeoutMS = options && options.timeout ? options.timeout : DEFAULT_TIMEOUT;
16
+ const timeout = setTimeout(() => {
17
+ reject(new Error((0, util_1.format)("%s failed\x1b[31m\n%s timeout %o\x1b", fullName, fullName, timeoutMS)));
18
+ }, timeoutMS);
19
+ try {
20
+ (async () => {
21
+ if (options && options.before) {
22
+ await options.before();
23
+ }
24
+ const startMS = Date.now();
25
+ await impl();
26
+ const took = Date.now() - startMS;
27
+ if (options && options.after) {
28
+ await options.after();
29
+ }
30
+ return took;
31
+ })().then((took) => {
32
+ clearTimeout(timeout);
33
+ logger.log("\x1b[32mpassed %s (took %sms)\x1b[0m", fullName, took);
34
+ resolve();
35
+ }).catch(e => {
36
+ clearTimeout(timeout);
37
+ reject(new Error((0, util_1.format)("%s failed\n%s finished with errors %o", fullName, fullName, e)));
38
+ });
39
+ }
40
+ catch (e) {
41
+ clearTimeout(timeout);
42
+ reject(new Error((0, util_1.format)("%s failed\n%s finished with errors %o", fullName, fullName, e)));
43
+ }
44
+ }), title,
45
+ category,
46
+ fullName
47
+ });
48
+ };
49
+ exports.it = it;
50
+ const runTests = async (title, logger = new console_1.Console(process.stdout)) => {
51
+ const titles = title ? title instanceof Array ? title : [title] : [undefined];
52
+ const ret = {
53
+ total: tests.length,
54
+ ignored: 0,
55
+ passed: 0,
56
+ failed: []
57
+ };
58
+ for (const test of tests) {
59
+ for (const title of titles) {
60
+ if (title && test.fullName.indexOf(title) !== -1 || !title) {
61
+ try {
62
+ await test.run();
63
+ ret.passed++;
64
+ }
65
+ catch (e) {
66
+ logger.error("\x1b[31m%s\x1b[0m", e);
67
+ ret.failed.push({
68
+ error: e,
69
+ fullName: test.fullName
70
+ });
71
+ }
72
+ }
73
+ else {
74
+ ret.ignored++;
75
+ }
76
+ }
77
+ }
78
+ return ret;
79
+ };
80
+ exports.runTests = runTests;
81
+ const runTestModules = async (modules, title, logger = new console_1.Console(process.stdout)) => {
82
+ for (const path of modules) {
83
+ require(path);
84
+ }
85
+ return await (0, exports.runTests)(title, logger);
86
+ };
87
+ exports.runTestModules = runTestModules;
88
+ //# sourceMappingURL=runner.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/test/common/runner.ts"],"names":[],"mappings":";;;AAAA,qCAAyC;AACzC,+BAA8B;AAI9B,MAAM,eAAe,GAAG,IAAI,CAAC;AAI7B,MAAM,KAAK,GAAW,EAAE,CAAC;AAElB,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC;AAAlC,QAAA,YAAY,gBAAsB;AAExC,MAAM,EAAE,GAAG,CAAC,KAAa,EAAE,IAAkB,EAAE,OAKrD,EAAE,SAA2B,IAAI,iBAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAQ,EAAE;IACjE,MAAM,QAAQ,GAAG,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5E,MAAM,QAAQ,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IACpF,KAAK,CAAC,IAAI,CAAC;QACT,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACzC,MAAM,SAAS,GAAG,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC;YACjF,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC9B,MAAM,CAAC,IAAI,KAAK,CAAC,IAAA,aAAM,EAAC,sCAAsC,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;YACnG,CAAC,EAAE,SAAS,CAAC,CAAC;YACd,IAAI;gBACF,CAAC,KAAK,IAAI,EAAE;oBACV,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE;wBAC7B,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;qBACxB;oBACD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;oBAC3B,MAAM,IAAI,EAAE,CAAC;oBACb,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC;oBAClC,IAAI,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE;wBAC5B,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;qBACvB;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;oBACjB,YAAY,CAAC,OAAO,CAAC,CAAC;oBACtB,MAAM,CAAC,GAAG,CAAC,sCAAsC,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;oBACnE,OAAO,EAAE,CAAC;gBACZ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;oBACX,YAAY,CAAC,OAAO,CAAC,CAAC;oBACtB,MAAM,CAAC,IAAI,KAAK,CAAC,IAAA,aAAM,EAAC,uCAAuC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5F,CAAC,CAAC,CAAC;aACJ;YAAC,OAAO,CAAC,EAAE;gBACV,YAAY,CAAC,OAAO,CAAC,CAAC;gBACtB,MAAM,CAAC,IAAI,KAAK,CAAC,IAAA,aAAM,EAAC,uCAAuC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;aAC3F;QACH,CAAC,CAAC,EAAE,KAAK;QACT,QAAQ;QACR,QAAQ;KACT,CAAC,CAAC;AACL,CAAC,CAAC;AA1CW,QAAA,EAAE,MA0Cb;AAEK,MAAM,QAAQ,GAAG,KAAK,EAAE,KAAyB,EAAE,SAA2B,IAAI,iBAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAQ7G,EAAE;IACH,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC9E,MAAM,GAAG,GAQL;QACF,KAAK,EAAE,KAAK,CAAC,MAAM;QACnB,OAAO,EAAE,CAAC;QACV,MAAM,EAAE,CAAC;QACT,MAAM,EAAE,EAAE;KACX,CAAC;IACF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,IAAI,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE;gBAC1D,IAAI;oBACF,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;oBACjB,GAAG,CAAC,MAAM,EAAE,CAAC;iBACd;gBAAC,OAAO,CAAC,EAAE;oBACV,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC;oBACrC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;wBACd,KAAK,EAAE,CAAC;wBACR,QAAQ,EAAE,IAAI,CAAC,QAAQ;qBACxB,CAAC,CAAA;iBACH;aACF;iBAAM;gBACL,GAAG,CAAC,OAAO,EAAE,CAAC;aACf;SACF;KACF;IACD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AA3CW,QAAA,QAAQ,YA2CnB;AAEK,MAAM,cAAc,GAAG,KAAK,EAAE,OAAiB,EAAE,KAAyB,EAAE,SAA2B,IAAI,iBAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAQtI,EAAE;IACH,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE;QAC1B,OAAO,CAAC,IAAI,CAAC,CAAC;KACf;IACD,OAAO,MAAM,IAAA,gBAAQ,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC,CAAA;AAbY,QAAA,cAAc,kBAa1B"}
@@ -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,31 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const path_1 = require("path");
4
+ const util_1 = require("../util");
5
+ const common_1 = require("./common");
6
+ const startMS = Date.now();
7
+ const args = util_1.CLIUtil.extractFlags(process.argv.slice(2));
8
+ const name = args.flags.n ? args.flags.n : "all";
9
+ const logger = console;
10
+ const modules = args.cmds;
11
+ (0, common_1.runTestModules)(modules.map(m => (0, path_1.resolve)(process.cwd(), m)), typeof name === "string" && name.toLowerCase() === "all" ? undefined : name, console).then((ret) => {
12
+ const took = Date.now() - startMS;
13
+ logger.log("");
14
+ logger.log("");
15
+ logger.log(ret.passed + " tests pased");
16
+ logger.log(ret.failed.length + " failed");
17
+ logger.log("took " + took + "ms");
18
+ logger.log("");
19
+ logger.log("");
20
+ if (ret.failed.length > 0) {
21
+ ret.failed.forEach(e => {
22
+ logger.error("\x1b[31m%s\x1b[0m", e.fullName);
23
+ logger.error("\x1b[31m%s\x1b[0m", e.error);
24
+ });
25
+ process.exit(1);
26
+ }
27
+ }).catch(e => {
28
+ logger.error(e);
29
+ process.exit(1);
30
+ });
31
+ //# 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,kCAA6C;AAC7C,qCAA0C;AAE1C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;AAE3B,MAAM,IAAI,GAAG,cAAO,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AACzD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAEjD,MAAM,MAAM,GAAG,OAAO,CAAC;AAEvB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC;AAC1B,IAAA,uBAAc,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;IAC7J,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC;IAClC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACf,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACf,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,cAAc,CAAC,CAAC;IACxC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC1C,MAAM,CAAC,GAAG,CAAC,OAAO,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;IAClC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACf,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACf,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACzB,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACrB,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC9C,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACX,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
@@ -1,12 +1,16 @@
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;
8
8
  section?: string;
9
9
  }>;
10
10
  export declare abstract class CLIUtil {
11
+ static extractFlags(args: string[]): {
12
+ flags: SimpleMap<string | string[]>;
13
+ cmds: string[];
14
+ };
11
15
  static cliFlow(cmds: CMDMapType, usage: string, logger: Logger | Console, cmdArg?: string, exit?: boolean): void;
12
16
  }
@@ -26,6 +26,32 @@ const routeCMDModule = async (cmdArg, cmds, logger, exit = true) => {
26
26
  }
27
27
  };
28
28
  class CLIUtil {
29
+ static extractFlags(args) {
30
+ const flags = {};
31
+ const cmds = [];
32
+ for (let i = 0; i < args.length; i++) {
33
+ const arg = args[i];
34
+ if (arg.indexOf("-") === 0) {
35
+ const argName = arg.substring(arg.indexOf("--") === 0 ? 2 : 1);
36
+ const argValue = args.length > i + 1 && args[i + 1] && args[i + 1].indexOf("-") != 0 ? args[i + 1] : "";
37
+ const flag = flags[argName];
38
+ if (flag instanceof Array) {
39
+ flag.push(argValue);
40
+ }
41
+ else if (flag) {
42
+ flags[argName] = [flag, argValue];
43
+ }
44
+ else {
45
+ flags[argName] = argValue;
46
+ }
47
+ i++;
48
+ }
49
+ else {
50
+ cmds.push(arg);
51
+ }
52
+ }
53
+ return { flags, cmds };
54
+ }
29
55
  // noinspection SpellCheckingInspection
30
56
  static cliFlow(cmds, usage, logger, cmdArg = process.argv[2], exit = true) {
31
57
  const flow = async () => {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/util/cli/index.ts"],"names":[],"mappings":";;;AAIA,uCAAuC;AACvC,MAAM,cAAc,GAAG,KAAK,EAAE,MAA0B,EAAE,IAAgB,EAAE,MAAwB,EAAE,IAAI,GAAG,IAAI,EAAiB,EAAE;IAClI,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;KAC/B;SAAM;QACL,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,UAAU,GAAG,MAAM,GAAG,aAAa,CAAC,CAAC;SACtD;aAAM;YACL,IAAI;gBACF,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC;aACzB;YAAC,OAAO,CAAM,EAAE;gBACf,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE;oBAClB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;iBACjB;gBACD,IAAI,IAAI,EAAE;oBACR,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iBACjB;aACF;SACF;KACF;AACH,CAAC,CAAA;AAKD,MAAsB,OAAO;IAC3B,uCAAuC;IAChC,MAAM,CAAC,OAAO,CAAC,IAAgB,EAAE,KAAa,EAAE,MAAwB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,GAAG,IAAI;QACpH,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;YACtB,IAAI;gBACF,MAAM,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;aAClD;YAAC,OAAO,CAAM,EAAE;gBACf,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE;oBAClB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;iBACzB;gBACD,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;gBACxB,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;gBACnC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBACnC,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE;wBACrB,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC;qBACzC;oBACD,MAAM,CAAC,IAAI,CAAC,KAAK,GAAG,KAAK,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;iBACnD;gBACD,IAAI,IAAI,EAAE;oBACR,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iBACjB;aACF;QACH,CAAC,CAAA;QACD,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACjB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA3BD,0BA2BC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/util/cli/index.ts"],"names":[],"mappings":"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"}
@@ -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
@@ -1 +1 @@
1
- {"version":3,"file":"parsererror.js","sourceRoot":"","sources":["../../../src/util/error/parsererror.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AAEnC,MAAa,iBAAkB,SAAQ,kBAAU;IAC/C,YAAY,OAAO,GAAG,aAAa,EAAS,OAAgB;QAC1D,KAAK,CAAC,OAAO,CAAC,CAAC;QAD2B,YAAO,GAAP,OAAO,CAAS;QAE1D,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CACF;AALD,8CAKC;AAED,MAAa,eAAgB,SAAQ,iBAAiB;CAAI;AAA1D,0CAA0D"}
1
+ {"version":3,"file":"parsererror.js","sourceRoot":"","sources":["../../../src/util/error/parsererror.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AAEnC,MAAa,iBAAkB,SAAQ,kBAAU;IAC/C,YAAY,OAAO,GAAG,aAAa,EAAS,OAAgB;QAC1D,KAAK,CAAC,OAAO,CAAC,CAAC;QAD2B,YAAO,GAAP,OAAO,CAAS;QAE1D,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CACF;AALD,8CAKC;AAED,MAAa,eAAgB,SAAQ,kBAAU;IAC7C,YAAY,OAAO,GAAG,aAAa;QACjC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC;IAChC,CAAC;CACF;AALD,0CAKC"}
@@ -6,4 +6,3 @@ export * from "./config";
6
6
  export * from "./logger";
7
7
  export * from "./session";
8
8
  export * from "./loader";
9
- export * from "./test";
@@ -18,7 +18,6 @@ __exportStar(require("./config"), exports);
18
18
  __exportStar(require("./logger"), exports);
19
19
  __exportStar(require("./session"), exports);
20
20
  __exportStar(require("./loader"), exports);
21
- __exportStar(require("./test"), exports);
22
21
  //export * from "./uuid";
23
22
  //export * from "./cookie";
24
23
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAwB;AACxB,2CAAyB;AACzB,4CAA0B;AAC1B,wCAAsB;AACtB,2CAAyB;AACzB,2CAAyB;AACzB,4CAA0B;AAC1B,2CAAyB;AACzB,yCAAuB;AACvB,yBAAyB;AACzB,2BAA2B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAwB;AACxB,2CAAyB;AACzB,4CAA0B;AAC1B,wCAAsB;AACtB,2CAAyB;AACzB,2CAAyB;AACzB,4CAA0B;AAC1B,2CAAyB;AACzB,yBAAyB;AACzB,2BAA2B"}