@loopback/rest 6.1.0 → 6.2.0

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 (33) hide show
  1. package/CHANGELOG.md +13 -0
  2. package/dist/body-parsers/body-parser.js +3 -0
  3. package/dist/body-parsers/body-parser.js.map +1 -1
  4. package/dist/index.js +1 -1
  5. package/dist/providers/find-route.provider.js +5 -0
  6. package/dist/providers/find-route.provider.js.map +1 -1
  7. package/dist/providers/invoke-method.provider.js +19 -3
  8. package/dist/providers/invoke-method.provider.js.map +1 -1
  9. package/dist/providers/parse-params.provider.js +4 -0
  10. package/dist/providers/parse-params.provider.js.map +1 -1
  11. package/dist/request-context.js.map +1 -1
  12. package/dist/rest.server.d.ts +1 -0
  13. package/dist/rest.server.js +4 -4
  14. package/dist/rest.server.js.map +1 -1
  15. package/dist/router/base-route.js +3 -3
  16. package/dist/router/base-route.js.map +1 -1
  17. package/dist/router/controller-route.js +1 -1
  18. package/dist/router/controller-route.js.map +1 -1
  19. package/dist/router/handler-route.js +1 -1
  20. package/dist/router/handler-route.js.map +1 -1
  21. package/dist/router/redirect-route.js +1 -1
  22. package/dist/router/redirect-route.js.map +1 -1
  23. package/package.json +12 -12
  24. package/src/body-parsers/body-parser.ts +3 -0
  25. package/src/providers/find-route.provider.ts +10 -0
  26. package/src/providers/invoke-method.provider.ts +19 -3
  27. package/src/providers/parse-params.provider.ts +6 -0
  28. package/src/request-context.ts +2 -1
  29. package/src/rest.server.ts +7 -5
  30. package/src/router/base-route.ts +3 -3
  31. package/src/router/controller-route.ts +1 -1
  32. package/src/router/handler-route.ts +3 -1
  33. package/src/router/redirect-route.ts +1 -1
package/CHANGELOG.md CHANGED
@@ -3,6 +3,19 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ # [6.2.0](https://github.com/strongloop/loopback-next/compare/@loopback/rest@6.1.0...@loopback/rest@6.2.0) (2020-08-27)
7
+
8
+
9
+ ### Features
10
+
11
+ * **rest:** add more debugging statements for middleware ([de2f5be](https://github.com/strongloop/loopback-next/commit/de2f5bee6415d55c53ca14cdf989cb37b06c7f47))
12
+ * **rest:** improve route description to include verb and path ([3b7fcca](https://github.com/strongloop/loopback-next/commit/3b7fccafa57cfb7fd2ee1495dc81dbc87ab6e94e))
13
+ * **rest:** make sure rest options are passed to http-server ([e9af196](https://github.com/strongloop/loopback-next/commit/e9af1961dfe2aaae3c07e3100f6fe538797943e0))
14
+
15
+
16
+
17
+
18
+
6
19
  # [6.1.0](https://github.com/strongloop/loopback-next/compare/@loopback/rest@6.0.0...@loopback/rest@6.1.0) (2020-08-19)
7
20
 
8
21
 
@@ -31,17 +31,20 @@ let RequestBodyParser = class RequestBodyParser {
31
31
  if (customParser) {
32
32
  // Invoke the custom parser
33
33
  const body = await this._invokeCustomParser(customParser, request);
34
+ debug('Parsed request body', body);
34
35
  return Object.assign(requestBody, body);
35
36
  }
36
37
  else {
37
38
  const parser = this._findParser(matchedMediaType);
38
39
  if (parser) {
39
40
  const body = await parser.parse(request);
41
+ debug('Parsed request body', body);
40
42
  return Object.assign(requestBody, body);
41
43
  }
42
44
  }
43
45
  }
44
46
  catch (err) {
47
+ debug('Request body parsing error', err);
45
48
  throw body_parser_helpers_1.normalizeParsingError(err);
46
49
  }
47
50
  throw rest_http_error_1.RestHttpErrors.unsupportedMediaType(matchedMediaType);
@@ -1 +1 @@
1
- {"version":3,"file":"body-parser.js","sourceRoot":"","sources":["../../src/body-parsers/body-parser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"body-parser.js","sourceRoot":"","sources":["../../src/body-parsers/body-parser.ts"],"names":[],"mappings":"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"}
package/dist/index.js CHANGED
@@ -4,7 +4,7 @@
4
4
  // This file is licensed under the MIT License.
5
5
  // License text available at https://opensource.org/licenses/MIT
6
6
  Object.defineProperty(exports, "__esModule", { value: true });
7
- exports.HttpErrors = void 0;
7
+ exports.HttpErrors = exports.writeErrorToResponse = void 0;
8
8
  const tslib_1 = require("tslib");
9
9
  /**
10
10
  * The REST API package for loopback-next.
@@ -8,9 +8,11 @@ exports.FindRouteMiddlewareProvider = exports.FindRouteProvider = void 0;
8
8
  const tslib_1 = require("tslib");
9
9
  const core_1 = require("@loopback/core");
10
10
  const express_1 = require("@loopback/express");
11
+ const debug_1 = tslib_1.__importDefault(require("debug"));
11
12
  const http_handler_1 = require("../http-handler");
12
13
  const keys_1 = require("../keys");
13
14
  const sequence_1 = require("../sequence");
15
+ const debug = debug_1.default('loopback:rest:find-route');
14
16
  let FindRouteProvider = class FindRouteProvider {
15
17
  constructor(context, handler) {
16
18
  this.context = context;
@@ -21,6 +23,7 @@ let FindRouteProvider = class FindRouteProvider {
21
23
  }
22
24
  action(request) {
23
25
  const found = this.handler.findRoute(request);
26
+ debug('Route found for %s %s', request.method, request.originalUrl, found);
24
27
  found.updateBindings(this.context);
25
28
  return found;
26
29
  }
@@ -38,7 +41,9 @@ let FindRouteMiddlewareProvider = class FindRouteMiddlewareProvider {
38
41
  }
39
42
  value() {
40
43
  return async (ctx, next) => {
44
+ debug('Finding route for %s %s', ctx.request.method, ctx.request.originalUrl);
41
45
  const route = this.findRoute(ctx.request);
46
+ debug('Route found', route);
42
47
  ctx.bind(keys_1.RestBindings.Operation.ROUTE).to(route);
43
48
  return next();
44
49
  };
@@ -1 +1 @@
1
- {"version":3,"file":"find-route.provider.js","sourceRoot":"","sources":["../../src/providers/find-route.provider.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,yCAA+D;AAC/D,+CAA2D;AAC3D,kDAA4C;AAC5C,kCAA+C;AAE/C,0CAAiD;AAGjD,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAC5B,YAC+C,OAAgB,EACrB,OAAoB;QADf,YAAO,GAAP,OAAO,CAAS;QACrB,YAAO,GAAP,OAAO,CAAa;IAC3D,CAAC;IAEJ,KAAK;QACH,OAAO,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,OAAgB;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC9C,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnC,OAAO,KAAK,CAAC;IACf,CAAC;CACF,CAAA;AAfY,iBAAiB;IAEzB,mBAAA,aAAM,CAAC,mBAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACjC,mBAAA,aAAM,CAAC,mBAAY,CAAC,OAAO,CAAC,CAAA;6CADyB,cAAO;QACZ,0BAAW;GAHnD,iBAAiB,CAe7B;AAfY,8CAAiB;AAuB9B,IAAa,2BAA2B,GAAxC,MAAa,2BAA2B;IACtC,YAEY,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;IAC7B,CAAC;IAEJ,KAAK;QACH,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACzB,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC1C,GAAG,CAAC,IAAI,CAAC,mBAAY,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;YACjD,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;CACF,CAAA;AAbY,2BAA2B;IANvC,WAAI,CACH,sBAAY,CAAC;QACX,KAAK,EAAE,+BAAoB,CAAC,UAAU;QACtC,KAAK,EAAE,eAAQ,CAAC,qBAAqB;KACtC,CAAC,CACH;IAGI,mBAAA,aAAM,CAAC,mBAAY,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA;;GAFvC,2BAA2B,CAavC;AAbY,kEAA2B"}
1
+ {"version":3,"file":"find-route.provider.js","sourceRoot":"","sources":["../../src/providers/find-route.provider.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,yCAA+D;AAC/D,+CAA2D;AAC3D,0DAAiC;AACjC,kDAA4C;AAC5C,kCAA+C;AAE/C,0CAAiD;AAGjD,MAAM,KAAK,GAAG,eAAY,CAAC,0BAA0B,CAAC,CAAC;AAEvD,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAC5B,YAC+C,OAAgB,EACrB,OAAoB;QADf,YAAO,GAAP,OAAO,CAAS;QACrB,YAAO,GAAP,OAAO,CAAa;IAC3D,CAAC;IAEJ,KAAK;QACH,OAAO,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,OAAgB;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC9C,KAAK,CAAC,uBAAuB,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAC3E,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnC,OAAO,KAAK,CAAC;IACf,CAAC;CACF,CAAA;AAhBY,iBAAiB;IAEzB,mBAAA,aAAM,CAAC,mBAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACjC,mBAAA,aAAM,CAAC,mBAAY,CAAC,OAAO,CAAC,CAAA;6CADyB,cAAO;QACZ,0BAAW;GAHnD,iBAAiB,CAgB7B;AAhBY,8CAAiB;AAwB9B,IAAa,2BAA2B,GAAxC,MAAa,2BAA2B;IACtC,YAEY,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;IAC7B,CAAC;IAEJ,KAAK;QACH,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACzB,KAAK,CACH,yBAAyB,EACzB,GAAG,CAAC,OAAO,CAAC,MAAM,EAClB,GAAG,CAAC,OAAO,CAAC,WAAW,CACxB,CAAC;YACF,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC1C,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;YAC5B,GAAG,CAAC,IAAI,CAAC,mBAAY,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;YACjD,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;CACF,CAAA;AAnBY,2BAA2B;IANvC,WAAI,CACH,sBAAY,CAAC;QACX,KAAK,EAAE,+BAAoB,CAAC,UAAU;QACtC,KAAK,EAAE,eAAQ,CAAC,qBAAqB;KACtC,CAAC,CACH;IAGI,mBAAA,aAAM,CAAC,mBAAY,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA;;GAFvC,2BAA2B,CAmBvC;AAnBY,kEAA2B"}
@@ -8,8 +8,10 @@ exports.InvokeMethodMiddlewareProvider = exports.InvokeMethodProvider = void 0;
8
8
  const tslib_1 = require("tslib");
9
9
  const core_1 = require("@loopback/core");
10
10
  const express_1 = require("@loopback/express");
11
+ const debug_1 = tslib_1.__importDefault(require("debug"));
11
12
  const keys_1 = require("../keys");
12
13
  const sequence_1 = require("../sequence");
14
+ const debug = debug_1.default('loopback:rest:invoke-method');
13
15
  let InvokeMethodProvider = class InvokeMethodProvider {
14
16
  constructor(context) {
15
17
  this.context = context;
@@ -34,9 +36,23 @@ let InvokeMethodMiddlewareProvider = class InvokeMethodMiddlewareProvider {
34
36
  return async (ctx, next) => {
35
37
  const route = await ctx.get(keys_1.RestBindings.Operation.ROUTE);
36
38
  const params = await ctx.get(keys_1.RestBindings.Operation.PARAMS);
37
- const retVal = await this.invokeMethod(route, params);
38
- ctx.bind(keys_1.RestBindings.Operation.RETURN_VALUE).to(retVal);
39
- return retVal;
39
+ if (debug.enabled) {
40
+ debug('Invoking method %s with', route.describe(), params);
41
+ }
42
+ try {
43
+ const retVal = await this.invokeMethod(route, params);
44
+ ctx.bind(keys_1.RestBindings.Operation.RETURN_VALUE).to(retVal);
45
+ if (debug.enabled) {
46
+ debug('Return value from %s', route.describe(), retVal);
47
+ }
48
+ return retVal;
49
+ }
50
+ catch (err) {
51
+ if (debug.enabled) {
52
+ debug('Error thrown from %s', route.describe(), err);
53
+ }
54
+ throw err;
55
+ }
40
56
  };
41
57
  }
42
58
  };
@@ -1 +1 @@
1
- {"version":3,"file":"invoke-method.provider.js","sourceRoot":"","sources":["../../src/providers/invoke-method.provider.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,yCAA+D;AAC/D,+CAA2D;AAC3D,kCAA+C;AAE/C,0CAAiD;AAGjD,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAC/B,YAAyD,OAAgB;QAAhB,YAAO,GAAP,OAAO,CAAS;IAAG,CAAC;IAE7E,KAAK;QACH,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,CAAC,KAAiB,EAAE,IAAmB;QAC3C,OAAO,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;CACF,CAAA;AAVY,oBAAoB;IAClB,mBAAA,aAAM,CAAC,mBAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;6CAAoB,cAAO;GAD9D,oBAAoB,CAUhC;AAVY,oDAAoB;AAmBjC,IAAa,8BAA8B,GAA3C,MAAa,8BAA8B;IACzC,YAEY,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IACnC,CAAC;IAEJ,KAAK;QACH,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACzB,MAAM,KAAK,GAAe,MAAM,GAAG,CAAC,GAAG,CAAC,mBAAY,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACtE,MAAM,MAAM,GAAkB,MAAM,GAAG,CAAC,GAAG,CACzC,mBAAY,CAAC,SAAS,CAAC,MAAM,CAC9B,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACtD,GAAG,CAAC,IAAI,CAAC,mBAAY,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;YACzD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;CACF,CAAA;AAjBY,8BAA8B;IAP1C,WAAI,CACH,sBAAY,CAAC;QACX,KAAK,EAAE,+BAAoB,CAAC,aAAa;QACzC,cAAc,EAAE,+BAAoB,CAAC,YAAY;QACjD,KAAK,EAAE,eAAQ,CAAC,qBAAqB;KACtC,CAAC,CACH;IAGI,mBAAA,aAAM,CAAC,mBAAY,CAAC,eAAe,CAAC,aAAa,CAAC,CAAA;;GAF1C,8BAA8B,CAiB1C;AAjBY,wEAA8B"}
1
+ {"version":3,"file":"invoke-method.provider.js","sourceRoot":"","sources":["../../src/providers/invoke-method.provider.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,yCAA+D;AAC/D,+CAA2D;AAC3D,0DAAiC;AACjC,kCAA+C;AAE/C,0CAAiD;AAGjD,MAAM,KAAK,GAAG,eAAY,CAAC,6BAA6B,CAAC,CAAC;AAE1D,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAC/B,YAAyD,OAAgB;QAAhB,YAAO,GAAP,OAAO,CAAS;IAAG,CAAC;IAE7E,KAAK;QACH,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,CAAC,KAAiB,EAAE,IAAmB;QAC3C,OAAO,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;CACF,CAAA;AAVY,oBAAoB;IAClB,mBAAA,aAAM,CAAC,mBAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;6CAAoB,cAAO;GAD9D,oBAAoB,CAUhC;AAVY,oDAAoB;AAmBjC,IAAa,8BAA8B,GAA3C,MAAa,8BAA8B;IACzC,YAEY,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IACnC,CAAC;IAEJ,KAAK;QACH,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACzB,MAAM,KAAK,GAAe,MAAM,GAAG,CAAC,GAAG,CAAC,mBAAY,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACtE,MAAM,MAAM,GAAkB,MAAM,GAAG,CAAC,GAAG,CACzC,mBAAY,CAAC,SAAS,CAAC,MAAM,CAC9B,CAAC;YACF,IAAI,KAAK,CAAC,OAAO,EAAE;gBACjB,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC;aAC5D;YACD,IAAI;gBACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBACtD,GAAG,CAAC,IAAI,CAAC,mBAAY,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;gBACzD,IAAI,KAAK,CAAC,OAAO,EAAE;oBACjB,KAAK,CAAC,sBAAsB,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC;iBACzD;gBACD,OAAO,MAAM,CAAC;aACf;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,KAAK,CAAC,OAAO,EAAE;oBACjB,KAAK,CAAC,sBAAsB,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,GAAG,CAAC,CAAC;iBACtD;gBACD,MAAM,GAAG,CAAC;aACX;QACH,CAAC,CAAC;IACJ,CAAC;CACF,CAAA;AA9BY,8BAA8B;IAP1C,WAAI,CACH,sBAAY,CAAC;QACX,KAAK,EAAE,+BAAoB,CAAC,aAAa;QACzC,cAAc,EAAE,+BAAoB,CAAC,YAAY;QACjD,KAAK,EAAE,eAAQ,CAAC,qBAAqB;KACtC,CAAC,CACH;IAGI,mBAAA,aAAM,CAAC,mBAAY,CAAC,eAAe,CAAC,aAAa,CAAC,CAAA;;GAF1C,8BAA8B,CA8B1C;AA9BY,wEAA8B"}
@@ -8,11 +8,13 @@ exports.ParseParamsMiddlewareProvider = exports.ParseParamsProvider = void 0;
8
8
  const tslib_1 = require("tslib");
9
9
  const core_1 = require("@loopback/core");
10
10
  const express_1 = require("@loopback/express");
11
+ const debug_1 = tslib_1.__importDefault(require("debug"));
11
12
  const body_parsers_1 = require("../body-parsers");
12
13
  const keys_1 = require("../keys");
13
14
  const parser_1 = require("../parser");
14
15
  const sequence_1 = require("../sequence");
15
16
  const ajv_factory_provider_1 = require("../validation/ajv-factory.provider");
17
+ const debug = debug_1.default('loopback:rest:parse-param');
16
18
  /**
17
19
  * Provides the function for parsing args in requests at runtime.
18
20
  *
@@ -45,8 +47,10 @@ let ParseParamsMiddlewareProvider = class ParseParamsMiddlewareProvider {
45
47
  value() {
46
48
  return async (ctx, next) => {
47
49
  const route = await ctx.get(keys_1.RestBindings.Operation.ROUTE);
50
+ debug('Parsing parameters for %s %s', route.verb, route.path);
48
51
  const params = await this.parseParams(ctx.request, route);
49
52
  ctx.bind(keys_1.RestBindings.Operation.PARAMS).to(params);
53
+ debug('Parameters', params);
50
54
  return next();
51
55
  };
52
56
  }
@@ -1 +1 @@
1
- {"version":3,"file":"parse-params.provider.js","sourceRoot":"","sources":["../../src/providers/parse-params.provider.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,yCAAsD;AACtD,+CAA2D;AAC3D,kDAAkD;AAClD,kCAA+C;AAC/C,sCAA6C;AAE7C,0CAAiD;AAEjD,6EAAkF;AAClF;;;;GAIG;AACH,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;IAC9B,YAEU,iBAAoC,EAKpC,oBAAuC,qDAA8B,EAErE,UAAuB;QAPvB,sBAAiB,GAAjB,iBAAiB,CAAmB;QAKpC,sBAAiB,GAAjB,iBAAiB,CAAoD;QAErE,eAAU,GAAV,UAAU,CAAa;IAC9B,CAAC;IAEJ,KAAK;QACH,OAAO,CAAC,OAAgB,EAAE,KAAoB,EAAE,EAAE,CAChD,2BAAkB,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,iBAAiB,EAAE;YACzD,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,GAAG,IAAI,CAAC,iBAAiB;SAC1B,CAAC,CAAC;IACP,CAAC;CACF,CAAA;AApBY,mBAAmB;IAE3B,mBAAA,aAAM,CAAC,mBAAY,CAAC,mBAAmB,CAAC,CAAA;IAExC,mBAAA,aAAM,CACL,mBAAY,CAAC,2BAA2B,CAAC,YAAY,CAAC,YAAY,CAAC,EACnE,EAAC,QAAQ,EAAE,IAAI,EAAC,CACjB,CAAA;IAEA,mBAAA,aAAM,CAAC,mBAAY,CAAC,WAAW,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAA;6CANxB,gCAAiB;GAHnC,mBAAmB,CAoB/B;AApBY,kDAAmB;AA6BhC,IAAa,6BAA6B,GAA1C,MAAa,6BAA6B;IACxC,YAEY,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IACjC,CAAC;IAEJ,KAAK;QACH,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACzB,MAAM,KAAK,GAAkB,MAAM,GAAG,CAAC,GAAG,CAAC,mBAAY,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACzE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC1D,GAAG,CAAC,IAAI,CAAC,mBAAY,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;YACnD,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;CACF,CAAA;AAdY,6BAA6B;IAPzC,WAAI,CACH,sBAAY,CAAC;QACX,KAAK,EAAE,+BAAoB,CAAC,YAAY;QACxC,cAAc,EAAE,+BAAoB,CAAC,UAAU;QAC/C,KAAK,EAAE,eAAQ,CAAC,qBAAqB;KACtC,CAAC,CACH;IAGI,mBAAA,aAAM,CAAC,mBAAY,CAAC,eAAe,CAAC,YAAY,CAAC,CAAA;;GAFzC,6BAA6B,CAczC;AAdY,sEAA6B"}
1
+ {"version":3,"file":"parse-params.provider.js","sourceRoot":"","sources":["../../src/providers/parse-params.provider.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,yCAAsD;AACtD,+CAA2D;AAC3D,0DAAiC;AACjC,kDAAkD;AAClD,kCAA+C;AAC/C,sCAA6C;AAE7C,0CAAiD;AAEjD,6EAAkF;AAElF,MAAM,KAAK,GAAG,eAAY,CAAC,2BAA2B,CAAC,CAAC;AAExD;;;;GAIG;AACH,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;IAC9B,YAEU,iBAAoC,EAKpC,oBAAuC,qDAA8B,EAErE,UAAuB;QAPvB,sBAAiB,GAAjB,iBAAiB,CAAmB;QAKpC,sBAAiB,GAAjB,iBAAiB,CAAoD;QAErE,eAAU,GAAV,UAAU,CAAa;IAC9B,CAAC;IAEJ,KAAK;QACH,OAAO,CAAC,OAAgB,EAAE,KAAoB,EAAE,EAAE,CAChD,2BAAkB,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,iBAAiB,EAAE;YACzD,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,GAAG,IAAI,CAAC,iBAAiB;SAC1B,CAAC,CAAC;IACP,CAAC;CACF,CAAA;AApBY,mBAAmB;IAE3B,mBAAA,aAAM,CAAC,mBAAY,CAAC,mBAAmB,CAAC,CAAA;IAExC,mBAAA,aAAM,CACL,mBAAY,CAAC,2BAA2B,CAAC,YAAY,CAAC,YAAY,CAAC,EACnE,EAAC,QAAQ,EAAE,IAAI,EAAC,CACjB,CAAA;IAEA,mBAAA,aAAM,CAAC,mBAAY,CAAC,WAAW,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAA;6CANxB,gCAAiB;GAHnC,mBAAmB,CAoB/B;AApBY,kDAAmB;AA6BhC,IAAa,6BAA6B,GAA1C,MAAa,6BAA6B;IACxC,YAEY,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IACjC,CAAC;IAEJ,KAAK;QACH,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACzB,MAAM,KAAK,GAAkB,MAAM,GAAG,CAAC,GAAG,CAAC,mBAAY,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACzE,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC9D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC1D,GAAG,CAAC,IAAI,CAAC,mBAAY,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;YACnD,KAAK,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YAC5B,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;CACF,CAAA;AAhBY,6BAA6B;IAPzC,WAAI,CACH,sBAAY,CAAC;QACX,KAAK,EAAE,+BAAoB,CAAC,YAAY;QACxC,cAAc,EAAE,+BAAoB,CAAC,UAAU;QAC/C,KAAK,EAAE,eAAQ,CAAC,qBAAqB;KACtC,CAAC,CACH;IAGI,mBAAA,aAAM,CAAC,mBAAY,CAAC,eAAe,CAAC,YAAY,CAAC,CAAA;;GAFzC,6BAA6B,CAgBzC;AAhBY,sEAA6B"}
@@ -1 +1 @@
1
- {"version":3,"file":"request-context.js","sourceRoot":"","sources":["../src/request-context.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"request-context.js","sourceRoot":"","sources":["../src/request-context.ts"],"names":[],"mappings":"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"}
@@ -80,6 +80,7 @@ export declare class RestServer extends BaseMiddlewareRegistry implements Server
80
80
  protected _httpServer: HttpServer | undefined;
81
81
  protected _expressApp?: express.Application;
82
82
  get listening(): boolean;
83
+ get httpServer(): HttpServer | undefined;
83
84
  /**
84
85
  * The base url for the server, including the basePath if set. For example,
85
86
  * the value will be 'http://localhost:3000/api' if `basePath` is set to
@@ -112,6 +112,9 @@ let RestServer = class RestServer extends express_1.BaseMiddlewareRegistry {
112
112
  get listening() {
113
113
  return this._httpServer ? this._httpServer.listening : false;
114
114
  }
115
+ get httpServer() {
116
+ return this._httpServer;
117
+ }
115
118
  /**
116
119
  * The base url for the server, including the basePath if set. For example,
117
120
  * the value will be 'http://localhost:3000/api' if `basePath` is set to
@@ -643,10 +646,7 @@ let RestServer = class RestServer extends express_1.BaseMiddlewareRegistry {
643
646
  debug('RestServer is not listening as listenOnStart flag is set to false.');
644
647
  return;
645
648
  }
646
- const serverOptions = {};
647
- if (protocol === 'https')
648
- Object.assign(serverOptions, httpsOptions);
649
- Object.assign(serverOptions, { port, host, protocol, path });
649
+ const serverOptions = { ...httpsOptions, port, host, protocol, path };
650
650
  this._httpServer = new http_server_1.HttpServer(this.requestHandler, serverOptions);
651
651
  await this._httpServer.start();
652
652
  this.bind(keys_1.RestBindings.PORT).to(this._httpServer.port);
@@ -1 +1 @@
1
- {"version":3,"file":"rest.server.js","sourceRoot":"","sources":["../src/rest.server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rest.server.js","sourceRoot":"","sources":["../src/rest.server.ts"],"names":[],"mappings":"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"}
@@ -21,10 +21,10 @@ class BaseRoute {
21
21
  this.verb = verb.toLowerCase();
22
22
  }
23
23
  describe() {
24
- return `"${this.verb} ${this.path}"`;
24
+ return `${this.verb} ${this.path}`;
25
25
  }
26
26
  toString() {
27
- return `${this.constructor.name} - ${this.verb} ${this.path}`;
27
+ return `${this.constructor.name} - ${this.describe()}`;
28
28
  }
29
29
  }
30
30
  exports.BaseRoute = BaseRoute;
@@ -34,7 +34,7 @@ class RouteSource {
34
34
  this.type = 'route';
35
35
  }
36
36
  toString() {
37
- return `${this.value.verb} ${this.value.path}`;
37
+ return this.value.toString();
38
38
  }
39
39
  }
40
40
  exports.RouteSource = RouteSource;
@@ -1 +1 @@
1
- {"version":3,"file":"base-route.js","sourceRoot":"","sources":["../../src/router/base-route.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;AAOhE;;GAEG;AACH,MAAsB,SAAS;IAG7B;;;;;OAKG;IACH,YACE,IAAY,EACI,IAAY,EACZ,IAAqB;QADrB,SAAI,GAAJ,IAAI,CAAQ;QACZ,SAAI,GAAJ,IAAI,CAAiB;QAErC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IACjC,CAAC;IASD,QAAQ;QACN,OAAO,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC;IACvC,CAAC;IAED,QAAQ;QACN,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,MAAM,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;IAChE,CAAC;CACF;AA/BD,8BA+BC;AAED,MAAa,WAAW;IAEtB,YAAqB,KAAiB;QAAjB,UAAK,GAAL,KAAK,CAAY;QADtC,SAAI,GAAG,OAAO,CAAC;IAC0B,CAAC;IAC1C,QAAQ;QACN,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IACjD,CAAC;CACF;AAND,kCAMC"}
1
+ {"version":3,"file":"base-route.js","sourceRoot":"","sources":["../../src/router/base-route.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;AAOhE;;GAEG;AACH,MAAsB,SAAS;IAG7B;;;;;OAKG;IACH,YACE,IAAY,EACI,IAAY,EACZ,IAAqB;QADrB,SAAI,GAAJ,IAAI,CAAQ;QACZ,SAAI,GAAJ,IAAI,CAAiB;QAErC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IACjC,CAAC;IASD,QAAQ;QACN,OAAO,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;IACrC,CAAC;IAED,QAAQ;QACN,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,MAAM,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;IACzD,CAAC;CACF;AA/BD,8BA+BC;AAED,MAAa,WAAW;IAEtB,YAAqB,KAAiB;QAAjB,UAAK,GAAL,KAAK,CAAY;QADtC,SAAI,GAAG,OAAO,CAAC;IAC0B,CAAC;IAC1C,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;IAC/B,CAAC;CACF;AAND,kCAMC"}
@@ -49,7 +49,7 @@ class ControllerRoute extends base_route_1.BaseRoute {
49
49
  this._methodName = methodName;
50
50
  }
51
51
  describe() {
52
- return `${this._controllerName}.${this._methodName}`;
52
+ return `${super.describe()} => ${this._controllerName}.${this._methodName}`;
53
53
  }
54
54
  updateBindings(requestContext) {
55
55
  /*
@@ -1 +1 @@
1
- {"version":3,"file":"controller-route.js","sourceRoot":"","sources":["../../src/router/controller-route.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"controller-route.js","sourceRoot":"","sources":["../../src/router/controller-route.ts"],"names":[],"mappings":"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"}
@@ -15,7 +15,7 @@ class Route extends base_route_1.BaseRoute {
15
15
  this._handler = _handler;
16
16
  }
17
17
  describe() {
18
- return this._handler.name || super.describe();
18
+ return `${super.describe()} => ${this._handler.name || this._handler.toString()}`;
19
19
  }
20
20
  updateBindings(requestContext) {
21
21
  requestContext.bind(keys_1.RestBindings.OPERATION_SPEC_CURRENT).to(this.spec);
@@ -1 +1 @@
1
- {"version":3,"file":"handler-route.js","sourceRoot":"","sources":["../../src/router/handler-route.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;AAEhE,yCAAqE;AAErE,kCAAqC;AAErC,6CAAoD;AAEpD,MAAa,KAAM,SAAQ,sBAAS;IAClC,YACE,IAAY,EACZ,IAAY,EACI,IAAqB,EAClB,QAAkB;QAErC,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAHR,SAAI,GAAJ,IAAI,CAAiB;QAClB,aAAQ,GAAR,QAAQ,CAAU;IAGvC,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;IAChD,CAAC;IAED,cAAc,CAAC,cAAuB;QACpC,cAAc,CAAC,IAAI,CAAC,mBAAY,CAAC,sBAAsB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,cAAuB,EACvB,IAAmB;QAEnB,uEAAuE;QACvE,uCAAuC;QACvC,OAAO,mCAA4B,CACjC,cAAc,EACd,IAAI,EACJ,UAAU,EACV,IAAI,EACJ,EAAC,MAAM,EAAE,IAAI,wBAAW,CAAC,IAAI,CAAC,EAAC,CAChC,CAAC;IACJ,CAAC;CACF;AAhCD,sBAgCC"}
1
+ {"version":3,"file":"handler-route.js","sourceRoot":"","sources":["../../src/router/handler-route.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;AAEhE,yCAAqE;AAErE,kCAAqC;AAErC,6CAAoD;AAEpD,MAAa,KAAM,SAAQ,sBAAS;IAClC,YACE,IAAY,EACZ,IAAY,EACI,IAAqB,EAClB,QAAkB;QAErC,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAHR,SAAI,GAAJ,IAAI,CAAiB;QAClB,aAAQ,GAAR,QAAQ,CAAU;IAGvC,CAAC;IAED,QAAQ;QACN,OAAO,GAAG,KAAK,CAAC,QAAQ,EAAE,OACxB,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAC9C,EAAE,CAAC;IACL,CAAC;IAED,cAAc,CAAC,cAAuB;QACpC,cAAc,CAAC,IAAI,CAAC,mBAAY,CAAC,sBAAsB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,cAAuB,EACvB,IAAmB;QAEnB,uEAAuE;QACvE,uCAAuC;QACvC,OAAO,mCAA4B,CACjC,cAAc,EACd,IAAI,EACJ,UAAU,EACV,IAAI,EACJ,EAAC,MAAM,EAAE,IAAI,wBAAW,CAAC,IAAI,CAAC,EAAC,CAChC,CAAC;IACJ,CAAC;CACF;AAlCD,sBAkCC"}
@@ -29,7 +29,7 @@ class RedirectRoute {
29
29
  // no-op
30
30
  }
31
31
  describe() {
32
- return `RedirectRoute from "${this.sourcePath}" to "${this.targetLocation}"`;
32
+ return `Redirect: "${this.sourcePath}" => "${this.targetLocation}"`;
33
33
  }
34
34
  /**
35
35
  * type guard type checker for this class
@@ -1 +1 @@
1
- {"version":3,"file":"redirect-route.js","sourceRoot":"","sources":["../../src/router/redirect-route.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;AAOhE,MAAa,aAAa;IAcxB,YACkB,UAAkB,EAClB,cAAsB,EACtB,aAAqB,GAAG;QAFxB,eAAU,GAAV,UAAU,CAAQ;QAClB,mBAAc,GAAd,cAAc,CAAQ;QACtB,eAAU,GAAV,UAAU,CAAc;QAhB1C,oBAAoB;QACX,eAAU,GAAwB,EAAE,CAAC;QACrC,YAAO,GAAkB,EAAE,CAAC;QAErC,4BAA4B;QACnB,SAAI,GAAW,KAAK,CAAC;QAErB,SAAI,GAAoB;YAC/B,WAAW,EAAE,yBAAyB;YACtC,cAAc,EAAE,cAAc;YAC9B,SAAS,EAAE,EAAE;SACd,CAAC;QAOA,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,EAAC,QAAQ,EAAiB,EAC1B,IAAmB;QAEnB,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IAC1D,CAAC;IAED,cAAc,CAAC,cAA8B;QAC3C,QAAQ;IACV,CAAC;IAED,QAAQ;QACN,OAAO,uBAAuB,IAAI,CAAC,UAAU,SAAS,IAAI,CAAC,cAAc,GAAG,CAAC;IAC/E,CAAC;IAED;;;OAGG;IACH,8DAA8D;IAC9D,MAAM,CAAC,eAAe,CAAC,GAAQ;;QAC7B,MAAM,eAAe,GAAG,GAAoB,CAAC;QAC7C,IACE,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,cAAc;YAC/B,OAAA,eAAe,CAAC,IAAI,0CAAE,WAAW,MAAK,yBAAyB,EAC/D;YACA,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AApDD,sCAoDC"}
1
+ {"version":3,"file":"redirect-route.js","sourceRoot":"","sources":["../../src/router/redirect-route.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;AAOhE,MAAa,aAAa;IAcxB,YACkB,UAAkB,EAClB,cAAsB,EACtB,aAAqB,GAAG;QAFxB,eAAU,GAAV,UAAU,CAAQ;QAClB,mBAAc,GAAd,cAAc,CAAQ;QACtB,eAAU,GAAV,UAAU,CAAc;QAhB1C,oBAAoB;QACX,eAAU,GAAwB,EAAE,CAAC;QACrC,YAAO,GAAkB,EAAE,CAAC;QAErC,4BAA4B;QACnB,SAAI,GAAW,KAAK,CAAC;QAErB,SAAI,GAAoB;YAC/B,WAAW,EAAE,yBAAyB;YACtC,cAAc,EAAE,cAAc;YAC9B,SAAS,EAAE,EAAE;SACd,CAAC;QAOA,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,EAAC,QAAQ,EAAiB,EAC1B,IAAmB;QAEnB,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IAC1D,CAAC;IAED,cAAc,CAAC,cAA8B;QAC3C,QAAQ;IACV,CAAC;IAED,QAAQ;QACN,OAAO,cAAc,IAAI,CAAC,UAAU,SAAS,IAAI,CAAC,cAAc,GAAG,CAAC;IACtE,CAAC;IAED;;;OAGG;IACH,8DAA8D;IAC9D,MAAM,CAAC,eAAe,CAAC,GAAQ;;QAC7B,MAAM,eAAe,GAAG,GAAoB,CAAC;QAC7C,IACE,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,cAAc;YAC/B,OAAA,eAAe,CAAC,IAAI,0CAAE,WAAW,MAAK,yBAAyB,EAC/D;YACA,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AApDD,sCAoDC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@loopback/rest",
3
- "version": "6.1.0",
3
+ "version": "6.2.0",
4
4
  "description": "Expose controllers as REST endpoints and route REST API requests to controller methods",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -24,10 +24,10 @@
24
24
  "access": "public"
25
25
  },
26
26
  "dependencies": {
27
- "@loopback/core": "^2.9.4",
28
- "@loopback/express": "^1.4.0",
29
- "@loopback/http-server": "^2.1.12",
30
- "@loopback/openapi-v3": "^3.4.8",
27
+ "@loopback/core": "^2.9.5",
28
+ "@loopback/express": "^1.4.1",
29
+ "@loopback/http-server": "^2.2.0",
30
+ "@loopback/openapi-v3": "^3.4.9",
31
31
  "@openapi-contrib/openapi-schema-to-json-schema": "^3.0.4",
32
32
  "@types/body-parser": "^1.19.0",
33
33
  "@types/cors": "^2.8.7",
@@ -57,15 +57,15 @@
57
57
  "validator": "^13.1.1"
58
58
  },
59
59
  "devDependencies": {
60
- "@loopback/build": "^6.2.1",
61
- "@loopback/eslint-config": "^9.0.1",
62
- "@loopback/openapi-spec-builder": "^2.1.12",
63
- "@loopback/repository": "^2.11.1",
64
- "@loopback/testlab": "^3.2.3",
60
+ "@loopback/build": "^6.2.2",
61
+ "@loopback/eslint-config": "^9.0.2",
62
+ "@loopback/openapi-spec-builder": "^2.1.13",
63
+ "@loopback/repository": "^2.11.2",
64
+ "@loopback/testlab": "^3.2.4",
65
65
  "@types/debug": "^4.1.5",
66
66
  "@types/js-yaml": "^3.12.5",
67
67
  "@types/json-schema-compare": "^0.2.0",
68
- "@types/lodash": "^4.14.159",
68
+ "@types/lodash": "^4.14.160",
69
69
  "@types/multer": "^1.4.4",
70
70
  "@types/node": "^10.17.28",
71
71
  "@types/on-finished": "^2.3.1",
@@ -83,5 +83,5 @@
83
83
  "url": "https://github.com/strongloop/loopback-next.git",
84
84
  "directory": "packages/rest"
85
85
  },
86
- "gitHead": "a056555744367da9caccb6be64095e27d2fe2e28"
86
+ "gitHead": "a3f54273814de63819e0d8bc86509f8a737800bb"
87
87
  }
@@ -61,15 +61,18 @@ export class RequestBodyParser {
61
61
  if (customParser) {
62
62
  // Invoke the custom parser
63
63
  const body = await this._invokeCustomParser(customParser, request);
64
+ debug('Parsed request body', body);
64
65
  return Object.assign(requestBody, body);
65
66
  } else {
66
67
  const parser = this._findParser(matchedMediaType);
67
68
  if (parser) {
68
69
  const body = await parser.parse(request);
70
+ debug('Parsed request body', body);
69
71
  return Object.assign(requestBody, body);
70
72
  }
71
73
  }
72
74
  } catch (err) {
75
+ debug('Request body parsing error', err);
73
76
  throw normalizeParsingError(err);
74
77
  }
75
78
 
@@ -5,12 +5,15 @@
5
5
 
6
6
  import {bind, Context, inject, Provider} from '@loopback/core';
7
7
  import {asMiddleware, Middleware} from '@loopback/express';
8
+ import debugFactory from 'debug';
8
9
  import {HttpHandler} from '../http-handler';
9
10
  import {RestBindings, RestTags} from '../keys';
10
11
  import {ResolvedRoute} from '../router';
11
12
  import {RestMiddlewareGroups} from '../sequence';
12
13
  import {FindRoute, Request} from '../types';
13
14
 
15
+ const debug = debugFactory('loopback:rest:find-route');
16
+
14
17
  export class FindRouteProvider implements Provider<FindRoute> {
15
18
  constructor(
16
19
  @inject(RestBindings.Http.CONTEXT) protected context: Context,
@@ -23,6 +26,7 @@ export class FindRouteProvider implements Provider<FindRoute> {
23
26
 
24
27
  action(request: Request): ResolvedRoute {
25
28
  const found = this.handler.findRoute(request);
29
+ debug('Route found for %s %s', request.method, request.originalUrl, found);
26
30
  found.updateBindings(this.context);
27
31
  return found;
28
32
  }
@@ -42,7 +46,13 @@ export class FindRouteMiddlewareProvider implements Provider<Middleware> {
42
46
 
43
47
  value(): Middleware {
44
48
  return async (ctx, next) => {
49
+ debug(
50
+ 'Finding route for %s %s',
51
+ ctx.request.method,
52
+ ctx.request.originalUrl,
53
+ );
45
54
  const route = this.findRoute(ctx.request);
55
+ debug('Route found', route);
46
56
  ctx.bind(RestBindings.Operation.ROUTE).to(route);
47
57
  return next();
48
58
  };
@@ -5,11 +5,14 @@
5
5
 
6
6
  import {bind, Context, inject, Provider} from '@loopback/core';
7
7
  import {asMiddleware, Middleware} from '@loopback/express';
8
+ import debugFactory from 'debug';
8
9
  import {RestBindings, RestTags} from '../keys';
9
10
  import {RouteEntry} from '../router';
10
11
  import {RestMiddlewareGroups} from '../sequence';
11
12
  import {InvokeMethod, OperationArgs, OperationRetval} from '../types';
12
13
 
14
+ const debug = debugFactory('loopback:rest:invoke-method');
15
+
13
16
  export class InvokeMethodProvider implements Provider<InvokeMethod> {
14
17
  constructor(@inject(RestBindings.Http.CONTEXT) protected context: Context) {}
15
18
 
@@ -41,9 +44,22 @@ export class InvokeMethodMiddlewareProvider implements Provider<Middleware> {
41
44
  const params: OperationArgs = await ctx.get(
42
45
  RestBindings.Operation.PARAMS,
43
46
  );
44
- const retVal = await this.invokeMethod(route, params);
45
- ctx.bind(RestBindings.Operation.RETURN_VALUE).to(retVal);
46
- return retVal;
47
+ if (debug.enabled) {
48
+ debug('Invoking method %s with', route.describe(), params);
49
+ }
50
+ try {
51
+ const retVal = await this.invokeMethod(route, params);
52
+ ctx.bind(RestBindings.Operation.RETURN_VALUE).to(retVal);
53
+ if (debug.enabled) {
54
+ debug('Return value from %s', route.describe(), retVal);
55
+ }
56
+ return retVal;
57
+ } catch (err) {
58
+ if (debug.enabled) {
59
+ debug('Error thrown from %s', route.describe(), err);
60
+ }
61
+ throw err;
62
+ }
47
63
  };
48
64
  }
49
65
  }
@@ -5,6 +5,7 @@
5
5
 
6
6
  import {bind, inject, Provider} from '@loopback/core';
7
7
  import {asMiddleware, Middleware} from '@loopback/express';
8
+ import debugFactory from 'debug';
8
9
  import {RequestBodyParser} from '../body-parsers';
9
10
  import {RestBindings, RestTags} from '../keys';
10
11
  import {parseOperationArgs} from '../parser';
@@ -12,6 +13,9 @@ import {ResolvedRoute} from '../router';
12
13
  import {RestMiddlewareGroups} from '../sequence';
13
14
  import {AjvFactory, ParseParams, Request, ValidationOptions} from '../types';
14
15
  import {DEFAULT_AJV_VALIDATION_OPTIONS} from '../validation/ajv-factory.provider';
16
+
17
+ const debug = debugFactory('loopback:rest:parse-param');
18
+
15
19
  /**
16
20
  * Provides the function for parsing args in requests at runtime.
17
21
  *
@@ -55,8 +59,10 @@ export class ParseParamsMiddlewareProvider implements Provider<Middleware> {
55
59
  value(): Middleware {
56
60
  return async (ctx, next) => {
57
61
  const route: ResolvedRoute = await ctx.get(RestBindings.Operation.ROUTE);
62
+ debug('Parsing parameters for %s %s', route.verb, route.path);
58
63
  const params = await this.parseParams(ctx.request, route);
59
64
  ctx.bind(RestBindings.Operation.PARAMS).to(params);
65
+ debug('Parameters', params);
60
66
  return next();
61
67
  };
62
68
  }
@@ -17,7 +17,8 @@ import {RestServerResolvedConfig} from './rest.server';
17
17
  * A per-request Context combining an IoC container with handler context
18
18
  * (request, response, etc.).
19
19
  */
20
- export class RequestContext extends MiddlewareContext
20
+ export class RequestContext
21
+ extends MiddlewareContext
21
22
  implements HandlerContext {
22
23
  /**
23
24
  * Get the protocol used by the client to make the request.
@@ -111,7 +111,8 @@ const SequenceActions = RestBindings.SequenceActions;
111
111
  * const server = await app.get('servers.foo');
112
112
  * ```
113
113
  */
114
- export class RestServer extends BaseMiddlewareRegistry
114
+ export class RestServer
115
+ extends BaseMiddlewareRegistry
115
116
  implements Server, HttpServerLike {
116
117
  /**
117
118
  * Handle incoming HTTP(S) request by invoking the corresponding
@@ -170,6 +171,10 @@ export class RestServer extends BaseMiddlewareRegistry
170
171
  return this._httpServer ? this._httpServer.listening : false;
171
172
  }
172
173
 
174
+ get httpServer(): HttpServer | undefined {
175
+ return this._httpServer;
176
+ }
177
+
173
178
  /**
174
179
  * The base url for the server, including the basePath if set. For example,
175
180
  * the value will be 'http://localhost:3000/api' if `basePath` is set to
@@ -978,10 +983,7 @@ export class RestServer extends BaseMiddlewareRegistry
978
983
  return;
979
984
  }
980
985
 
981
- const serverOptions = {};
982
- if (protocol === 'https') Object.assign(serverOptions, httpsOptions);
983
- Object.assign(serverOptions, {port, host, protocol, path});
984
-
986
+ const serverOptions = {...httpsOptions, port, host, protocol, path};
985
987
  this._httpServer = new HttpServer(this.requestHandler, serverOptions);
986
988
 
987
989
  await this._httpServer.start();
@@ -36,11 +36,11 @@ export abstract class BaseRoute implements RouteEntry {
36
36
  ): Promise<OperationRetval>;
37
37
 
38
38
  describe(): string {
39
- return `"${this.verb} ${this.path}"`;
39
+ return `${this.verb} ${this.path}`;
40
40
  }
41
41
 
42
42
  toString() {
43
- return `${this.constructor.name} - ${this.verb} ${this.path}`;
43
+ return `${this.constructor.name} - ${this.describe()}`;
44
44
  }
45
45
  }
46
46
 
@@ -48,6 +48,6 @@ export class RouteSource implements InvocationSource<RouteEntry> {
48
48
  type = 'route';
49
49
  constructor(readonly value: RouteEntry) {}
50
50
  toString() {
51
- return `${this.value.verb} ${this.value.path}`;
51
+ return this.value.toString();
52
52
  }
53
53
  }
@@ -101,7 +101,7 @@ export class ControllerRoute<T> extends BaseRoute {
101
101
  }
102
102
 
103
103
  describe(): string {
104
- return `${this._controllerName}.${this._methodName}`;
104
+ return `${super.describe()} => ${this._controllerName}.${this._methodName}`;
105
105
  }
106
106
 
107
107
  updateBindings(requestContext: Context) {
@@ -20,7 +20,9 @@ export class Route extends BaseRoute {
20
20
  }
21
21
 
22
22
  describe(): string {
23
- return this._handler.name || super.describe();
23
+ return `${super.describe()} => ${
24
+ this._handler.name || this._handler.toString()
25
+ }`;
24
26
  }
25
27
 
26
28
  updateBindings(requestContext: Context) {
@@ -42,7 +42,7 @@ export class RedirectRoute implements RouteEntry, ResolvedRoute {
42
42
  }
43
43
 
44
44
  describe(): string {
45
- return `RedirectRoute from "${this.sourcePath}" to "${this.targetLocation}"`;
45
+ return `Redirect: "${this.sourcePath}" => "${this.targetLocation}"`;
46
46
  }
47
47
 
48
48
  /**