@shrub/express 0.5.45 → 0.5.49
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.
- package/dist/controller-invoker.d.ts +18 -2
- package/dist/controller-invoker.js +43 -14
- package/dist/esm/controller-invoker.js +43 -14
- package/package.json +4 -4
|
@@ -1,18 +1,33 @@
|
|
|
1
|
-
import { RequestHandler } from "express";
|
|
1
|
+
import { NextFunction, Request, RequestHandler, Response } from "express";
|
|
2
2
|
import { PathParams } from "express-serve-static-core";
|
|
3
3
|
import { IExpressApplication } from "./app";
|
|
4
4
|
import { Constructor } from "./controller";
|
|
5
5
|
export declare type ControllerInvokerConstructor<T> = {
|
|
6
6
|
new (options: IControllerInvokerOptions): T;
|
|
7
7
|
};
|
|
8
|
+
export declare type ControllerErrorRequestHandler = (err: any, req: Request, res: Response, next: NextFunction, retry: Function, retryCount: number) => void;
|
|
8
9
|
/** Defines options for a controller invoker. */
|
|
9
10
|
export interface IControllerInvokerOptions {
|
|
10
11
|
readonly app: IExpressApplication;
|
|
11
12
|
readonly handler?: RequestHandler;
|
|
13
|
+
readonly prepare?: RequestHandler;
|
|
14
|
+
readonly error?: ControllerErrorRequestHandler;
|
|
15
|
+
}
|
|
16
|
+
/** Defines options when creating a new controller invoker. */
|
|
17
|
+
export interface ICreateControllerInvokerOptions {
|
|
18
|
+
/** A handler that gets invoked prior to invoking the action but after any pre-configured application middleware. */
|
|
19
|
+
readonly handler?: RequestHandler;
|
|
20
|
+
/** A handler that gets invoked prior to invoking any middleware and is useful for pre-handling a request/response. */
|
|
21
|
+
readonly prepare?: RequestHandler;
|
|
22
|
+
/**
|
|
23
|
+
* A callback that will get called when a request generates an error and allows the ability to retry a request.
|
|
24
|
+
* Note: when retrying a request there is no need to invoke 'next'; the retry attempt will rebuild the request/response and invoke the request pipeline again.
|
|
25
|
+
*/
|
|
26
|
+
readonly error?: ControllerErrorRequestHandler;
|
|
12
27
|
}
|
|
13
28
|
/** A service for creating controller invokers. */
|
|
14
29
|
export interface IControllerInvokerService {
|
|
15
|
-
createControllerInvoker<T>(ctor: ControllerInvokerConstructor<T>,
|
|
30
|
+
createControllerInvoker<T>(ctor: ControllerInvokerConstructor<T>, options?: ICreateControllerInvokerOptions): T;
|
|
16
31
|
}
|
|
17
32
|
/** Defines options for invoking a controller action. */
|
|
18
33
|
export interface IControllerRequestOptions<TController> {
|
|
@@ -31,6 +46,7 @@ export declare const IControllerInvokerService: import("@shrub/core").IService<I
|
|
|
31
46
|
export declare abstract class ControllerInvoker {
|
|
32
47
|
private readonly options;
|
|
33
48
|
private readonly handler;
|
|
49
|
+
private readonly prepare;
|
|
34
50
|
constructor(options: IControllerInvokerOptions);
|
|
35
51
|
/** Invokes an express request handler directly which represents a single controller action and returns a result. */
|
|
36
52
|
protected invokeAction<TController>(options: IControllerRequestOptions<TController>): Promise<IControllerResponse>;
|
|
@@ -19,29 +19,53 @@ class ControllerInvoker {
|
|
|
19
19
|
constructor(options) {
|
|
20
20
|
this.options = options;
|
|
21
21
|
this.handler = !options.handler ? (_, __, next) => next() : options.handler;
|
|
22
|
+
this.prepare = !options.prepare ? (_, __, next) => next() : options.prepare;
|
|
22
23
|
}
|
|
23
24
|
/** Invokes an express request handler directly which represents a single controller action and returns a result. */
|
|
24
25
|
invokeAction(options) {
|
|
25
26
|
const router = controller_1.controller(options.controller);
|
|
26
27
|
return new Promise((resolve, reject) => {
|
|
27
|
-
|
|
28
|
-
const req = this.createExpressRequest(options);
|
|
29
|
-
// create the express Response object that will resovle the Promise when the response has ended (i.e. when res.end is inovked)
|
|
30
|
-
const res = this.createExpressResponse(resolve);
|
|
28
|
+
let retryCount;
|
|
31
29
|
// if an error is returned at any point reject the promise
|
|
32
|
-
const nextOrReject = (err, next) => {
|
|
30
|
+
const nextOrReject = (err, req, res, next) => {
|
|
33
31
|
if (err) {
|
|
34
|
-
|
|
32
|
+
if (this.options.error) {
|
|
33
|
+
// 1) if the error handler invokes next reject using the provided error
|
|
34
|
+
// 2) there doesn't seem to be a good way to retry a request so call invokeAction to rebuild request/response and try again
|
|
35
|
+
const retry = () => {
|
|
36
|
+
retryCount = retryCount || 0;
|
|
37
|
+
retryCount++;
|
|
38
|
+
invokeAction();
|
|
39
|
+
};
|
|
40
|
+
this.options.error(err, req, res, (err2) => reject(err2), retry, retryCount || 0);
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
reject(err);
|
|
44
|
+
}
|
|
35
45
|
}
|
|
36
46
|
else {
|
|
37
47
|
next();
|
|
38
48
|
}
|
|
39
49
|
};
|
|
40
|
-
|
|
41
|
-
//
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
50
|
+
const invokeAction = () => {
|
|
51
|
+
// create the express Request object to pass down the request chain
|
|
52
|
+
const req = this.createExpressRequest(options);
|
|
53
|
+
// create the express Response object that will resovle the Promise when the response has ended (i.e. when res.end is inovked)
|
|
54
|
+
const res = this.createExpressResponse(resolve);
|
|
55
|
+
// first invoke prepare
|
|
56
|
+
this.prepare(req, res, (err) => nextOrReject(err, req, res, () => {
|
|
57
|
+
// if successful, invoke the application middleware pipeline
|
|
58
|
+
this.options.app(req, res, (err) => nextOrReject(err, req, res, () => {
|
|
59
|
+
// next, invoke the handler prior to invoking the route/controller
|
|
60
|
+
// the router handles invoking the controller and if next is invoked assume an error or a 404
|
|
61
|
+
this.handler(req, res, (err) => nextOrReject(err, req, res, () => router(req, res, (err) => {
|
|
62
|
+
err = err || new Error(`Path ${options.path} not found.`);
|
|
63
|
+
nextOrReject(err, req, res, () => reject(new Error("Failed to process request successfully.")));
|
|
64
|
+
})));
|
|
65
|
+
}));
|
|
66
|
+
}));
|
|
67
|
+
};
|
|
68
|
+
invokeAction();
|
|
45
69
|
});
|
|
46
70
|
}
|
|
47
71
|
createExpressRequest(options) {
|
|
@@ -102,8 +126,13 @@ let ControllerInvokerService = class ControllerInvokerService {
|
|
|
102
126
|
constructor(app) {
|
|
103
127
|
this.app = app;
|
|
104
128
|
}
|
|
105
|
-
createControllerInvoker(ctor,
|
|
106
|
-
return new ctor({
|
|
129
|
+
createControllerInvoker(ctor, options) {
|
|
130
|
+
return new ctor({
|
|
131
|
+
app: this.app,
|
|
132
|
+
handler: options && options.handler,
|
|
133
|
+
prepare: options && options.prepare,
|
|
134
|
+
error: options && options.error
|
|
135
|
+
});
|
|
107
136
|
}
|
|
108
137
|
};
|
|
109
138
|
ControllerInvokerService = __decorate([
|
|
@@ -111,4 +140,4 @@ ControllerInvokerService = __decorate([
|
|
|
111
140
|
__param(0, app_1.IExpressApplication)
|
|
112
141
|
], ControllerInvokerService);
|
|
113
142
|
exports.ControllerInvokerService = ControllerInvokerService;
|
|
114
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
143
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJvbGxlci1pbnZva2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbnRyb2xsZXItaW52b2tlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxzQ0FBdUQ7QUFHdkQsK0JBQTRDO0FBQzVDLDZDQUF1RDtBQTZDMUMsUUFBQSx5QkFBeUIsR0FBRyxvQkFBYSxDQUE0Qiw0QkFBNEIsQ0FBQyxDQUFDO0FBRWhILGdGQUFnRjtBQUNoRixNQUFzQixpQkFBaUI7SUFJbkMsWUFBNkIsT0FBa0M7UUFBbEMsWUFBTyxHQUFQLE9BQU8sQ0FBMkI7UUFDM0QsSUFBSSxDQUFDLE9BQU8sR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDO1FBQzVFLElBQUksQ0FBQyxPQUFPLEdBQUcsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQztJQUNoRixDQUFDO0lBRUQsb0hBQW9IO0lBQzFHLFlBQVksQ0FBYyxPQUErQztRQUMvRSxNQUFNLE1BQU0sR0FBRyx1QkFBVSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUM5QyxPQUFPLElBQUksT0FBTyxDQUFDLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFO1lBQ25DLElBQUksVUFBOEIsQ0FBQztZQUNuQywwREFBMEQ7WUFDMUQsTUFBTSxZQUFZLEdBQXdCLENBQUMsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFFLEVBQUU7Z0JBQzlELElBQUksR0FBRyxFQUFFO29CQUNM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
|
|
@@ -16,29 +16,53 @@ export class ControllerInvoker {
|
|
|
16
16
|
constructor(options) {
|
|
17
17
|
this.options = options;
|
|
18
18
|
this.handler = !options.handler ? (_, __, next) => next() : options.handler;
|
|
19
|
+
this.prepare = !options.prepare ? (_, __, next) => next() : options.prepare;
|
|
19
20
|
}
|
|
20
21
|
/** Invokes an express request handler directly which represents a single controller action and returns a result. */
|
|
21
22
|
invokeAction(options) {
|
|
22
23
|
const router = controller(options.controller);
|
|
23
24
|
return new Promise((resolve, reject) => {
|
|
24
|
-
|
|
25
|
-
const req = this.createExpressRequest(options);
|
|
26
|
-
// create the express Response object that will resovle the Promise when the response has ended (i.e. when res.end is inovked)
|
|
27
|
-
const res = this.createExpressResponse(resolve);
|
|
25
|
+
let retryCount;
|
|
28
26
|
// if an error is returned at any point reject the promise
|
|
29
|
-
const nextOrReject = (err, next) => {
|
|
27
|
+
const nextOrReject = (err, req, res, next) => {
|
|
30
28
|
if (err) {
|
|
31
|
-
|
|
29
|
+
if (this.options.error) {
|
|
30
|
+
// 1) if the error handler invokes next reject using the provided error
|
|
31
|
+
// 2) there doesn't seem to be a good way to retry a request so call invokeAction to rebuild request/response and try again
|
|
32
|
+
const retry = () => {
|
|
33
|
+
retryCount = retryCount || 0;
|
|
34
|
+
retryCount++;
|
|
35
|
+
invokeAction();
|
|
36
|
+
};
|
|
37
|
+
this.options.error(err, req, res, (err2) => reject(err2), retry, retryCount || 0);
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
reject(err);
|
|
41
|
+
}
|
|
32
42
|
}
|
|
33
43
|
else {
|
|
34
44
|
next();
|
|
35
45
|
}
|
|
36
46
|
};
|
|
37
|
-
|
|
38
|
-
//
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
47
|
+
const invokeAction = () => {
|
|
48
|
+
// create the express Request object to pass down the request chain
|
|
49
|
+
const req = this.createExpressRequest(options);
|
|
50
|
+
// create the express Response object that will resovle the Promise when the response has ended (i.e. when res.end is inovked)
|
|
51
|
+
const res = this.createExpressResponse(resolve);
|
|
52
|
+
// first invoke prepare
|
|
53
|
+
this.prepare(req, res, (err) => nextOrReject(err, req, res, () => {
|
|
54
|
+
// if successful, invoke the application middleware pipeline
|
|
55
|
+
this.options.app(req, res, (err) => nextOrReject(err, req, res, () => {
|
|
56
|
+
// next, invoke the handler prior to invoking the route/controller
|
|
57
|
+
// the router handles invoking the controller and if next is invoked assume an error or a 404
|
|
58
|
+
this.handler(req, res, (err) => nextOrReject(err, req, res, () => router(req, res, (err) => {
|
|
59
|
+
err = err || new Error(`Path ${options.path} not found.`);
|
|
60
|
+
nextOrReject(err, req, res, () => reject(new Error("Failed to process request successfully.")));
|
|
61
|
+
})));
|
|
62
|
+
}));
|
|
63
|
+
}));
|
|
64
|
+
};
|
|
65
|
+
invokeAction();
|
|
42
66
|
});
|
|
43
67
|
}
|
|
44
68
|
createExpressRequest(options) {
|
|
@@ -98,8 +122,13 @@ let ControllerInvokerService = class ControllerInvokerService {
|
|
|
98
122
|
constructor(app) {
|
|
99
123
|
this.app = app;
|
|
100
124
|
}
|
|
101
|
-
createControllerInvoker(ctor,
|
|
102
|
-
return new ctor({
|
|
125
|
+
createControllerInvoker(ctor, options) {
|
|
126
|
+
return new ctor({
|
|
127
|
+
app: this.app,
|
|
128
|
+
handler: options && options.handler,
|
|
129
|
+
prepare: options && options.prepare,
|
|
130
|
+
error: options && options.error
|
|
131
|
+
});
|
|
103
132
|
}
|
|
104
133
|
};
|
|
105
134
|
ControllerInvokerService = __decorate([
|
|
@@ -107,4 +136,4 @@ ControllerInvokerService = __decorate([
|
|
|
107
136
|
__param(0, IExpressApplication)
|
|
108
137
|
], ControllerInvokerService);
|
|
109
138
|
export { ControllerInvokerService };
|
|
110
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
139
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJvbGxlci1pbnZva2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyb2xsZXItaW52b2tlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsYUFBYSxFQUFFLFNBQVMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUd2RCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxPQUFPLENBQUM7QUFDNUMsT0FBTyxFQUFFLFVBQVUsRUFBZSxNQUFNLGNBQWMsQ0FBQztBQTZDdkQsTUFBTSxDQUFDLE1BQU0seUJBQXlCLEdBQUcsYUFBYSxDQUE0Qiw0QkFBNEIsQ0FBQyxDQUFDO0FBRWhILGdGQUFnRjtBQUNoRixNQUFNLE9BQWdCLGlCQUFpQjtJQUluQyxZQUE2QixPQUFrQztRQUFsQyxZQUFPLEdBQVAsT0FBTyxDQUEyQjtRQUMzRCxJQUFJLENBQUMsT0FBTyxHQUFHLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUM7UUFDNUUsSUFBSSxDQUFDLE9BQU8sR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDO0lBQ2hGLENBQUM7SUFFRCxvSEFBb0g7SUFDMUcsWUFBWSxDQUFjLE9BQStDO1FBQy9FLE1BQU0sTUFBTSxHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDOUMsT0FBTyxJQUFJLE9BQU8sQ0FBQyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRTtZQUNuQyxJQUFJLFVBQThCLENBQUM7WUFD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
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shrub/express",
|
|
3
3
|
"description": "A module that adds support for Express based apps.",
|
|
4
|
-
"version": "0.5.
|
|
4
|
+
"version": "0.5.49",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -25,12 +25,12 @@
|
|
|
25
25
|
"test": "jest"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@shrub/core": "0.5.
|
|
29
|
-
"@shrub/http": "0.5.
|
|
28
|
+
"@shrub/core": "0.5.49",
|
|
29
|
+
"@shrub/http": "0.5.49",
|
|
30
30
|
"express": "^4.17.1"
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
33
33
|
"@types/express": "4.17.9"
|
|
34
34
|
},
|
|
35
|
-
"gitHead": "
|
|
35
|
+
"gitHead": "1027e5200204b06f246c36a437de10c092976ad0"
|
|
36
36
|
}
|