Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions packages/rest/src/providers/bind-element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,18 @@
// This file is licensed under the MIT License.
// License text available at https://opensource.org/licenses/MIT

import {Context, inject, Provider} from '@loopback/context';
import {Context, inject, Provider, Binding} from '@loopback/context';
import {BindElement} from '../internal-types';
import {RestBindings} from '../keys';

export class BindElementProvider implements Provider<BindElement> {
constructor(@inject(RestBindings.Http.CONTEXT) protected context: Context) {}

value(): BindElement {
return (key: string) => this.context.bind(key);
return key => this.action(key);
}

action(key: string): Binding {
return this.context.bind(key);
}
}
14 changes: 9 additions & 5 deletions packages/rest/src/providers/find-route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import {Context, inject, Provider} from '@loopback/context';
import {FindRoute} from '../internal-types';
import {HttpHandler} from '../http-handler';
import {RestBindings} from '../keys';
import {ParsedRequest} from '../internal-types';
import {ResolvedRoute} from '../router/routing-table';

export class FindRouteProvider implements Provider<FindRoute> {
constructor(
Expand All @@ -15,10 +17,12 @@ export class FindRouteProvider implements Provider<FindRoute> {
) {}

value(): FindRoute {
return request => {
const found = this.handler.findRoute(request);
found.updateBindings(this.context);
return found;
};
return request => this.action(request);
}

action(request: ParsedRequest): ResolvedRoute {
const found = this.handler.findRoute(request);
found.updateBindings(this.context);
return found;
}
}
10 changes: 7 additions & 3 deletions packages/rest/src/providers/get-from-context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,18 @@
// This file is licensed under the MIT License.
// License text available at https://opensource.org/licenses/MIT

import {Context, inject, Provider} from '@loopback/context';
import {Context, inject, Provider, BoundValue} from '@loopback/context';
import {GetFromContext} from '../internal-types';
import {RestBindings} from '../keys';

export class GetFromContextProvider implements Provider<GetFromContext> {
constructor(@inject(RestBindings.Http.CONTEXT) protected context: Context) {}

value() {
return (key: string) => this.context.get(key);
value(): GetFromContext {
return key => this.action(key);
}

action(key: string): Promise<BoundValue> {
return this.context.get(key);
}
}
11 changes: 7 additions & 4 deletions packages/rest/src/providers/invoke-method.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,18 @@
// License text available at https://opensource.org/licenses/MIT

import {Context, inject, Provider} from '@loopback/context';
import {InvokeMethod} from '../internal-types';
import {InvokeMethod, OperationArgs, OperationRetval} from '../internal-types';
import {RestBindings} from '../keys';
import {RouteEntry} from '../router/routing-table';

export class InvokeMethodProvider implements Provider<InvokeMethod> {
constructor(@inject(RestBindings.Http.CONTEXT) protected context: Context) {}

value(): InvokeMethod {
return async (route, args) => {
return await route.invokeHandler(this.context, args);
};
return (route, args) => this.action(route, args);
}

action(route: RouteEntry, args: OperationArgs): Promise<OperationRetval> {
return route.invokeHandler(this.context, args);
}
}
33 changes: 19 additions & 14 deletions packages/rest/src/providers/log-error-provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,26 @@
// This file is licensed under the MIT License.
// License text available at https://opensource.org/licenses/MIT

import {BoundValue, Provider} from '@loopback/context';
import {Provider} from '@loopback/context';
import {ServerRequest} from '../';
import {LogError} from '../internal-types';

export class LogErrorProvider implements Provider<BoundValue> {
value() {
return (err: Error, statusCode: number, req: ServerRequest) => {
if (statusCode >= 500) {
console.error(
'Unhandled error in %s %s: %s %s',
req.method,
req.url,
statusCode,
err.stack || err,
);
}
};
export class LogErrorProvider implements Provider<LogError> {
value(): LogError {
return (err, statusCode, req) => this.action(err, statusCode, req);
}

action(err: Error, statusCode: number, req: ServerRequest) {
if (statusCode < 500) {
return;
}

console.error(
'Unhandled error in %s %s: %s %s',
req.method,
req.url,
statusCode,
err.stack || err,
);
}
}
18 changes: 10 additions & 8 deletions packages/rest/src/providers/reject.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,26 @@
// License text available at https://opensource.org/licenses/MIT

import {LogError, Reject} from '../internal-types';
import {inject} from '@loopback/context';
import {inject, Provider} from '@loopback/context';
import {ServerResponse, ServerRequest} from 'http';
import {HttpError} from 'http-errors';
import {writeErrorToResponse} from '../writer';
import {RestBindings} from '../keys';

export class RejectProvider {
export class RejectProvider implements Provider<Reject> {
constructor(
@inject(RestBindings.SequenceActions.LOG_ERROR)
protected logError: LogError,
) {}

value(): Reject {
return (response: ServerResponse, request: ServerRequest, error: Error) => {
const err = <HttpError>error;
const statusCode = err.statusCode || err.status || 500;
writeErrorToResponse(response, err);
this.logError(error, statusCode, request);
};
return (response, request, error) => this.action(response, request, error);
}

action(response: ServerResponse, request: ServerRequest, error: Error) {
const err = <HttpError>error;
const statusCode = err.statusCode || err.status || 500;
writeErrorToResponse(response, err);
this.logError(error, statusCode, request);
}
}