@moostjs/event-http 0.2.23 → 0.2.24
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/index.cjs +21 -2
- package/dist/index.d.ts +2 -0
- package/dist/index.mjs +22 -3
- package/package.json +4 -4
package/dist/index.cjs
CHANGED
|
@@ -57,6 +57,9 @@ class MoostHttp {
|
|
|
57
57
|
getProvideRegistry() {
|
|
58
58
|
return infact.createProvideRegistry([eventHttp.WooksHttp, () => this.getHttpApp()], ['WooksHttp', () => this.getHttpApp()], [http.Server, () => this.getHttpApp().getServer()], [https.Server, () => this.getHttpApp().getServer()]);
|
|
59
59
|
}
|
|
60
|
+
getLogger() {
|
|
61
|
+
return this.getHttpApp().getLogger('moost-http');
|
|
62
|
+
}
|
|
60
63
|
bindHandler(opts) {
|
|
61
64
|
let fn;
|
|
62
65
|
for (const handler of opts.handlers) {
|
|
@@ -70,6 +73,7 @@ class MoostHttp {
|
|
|
70
73
|
const { restoreCtx } = eventHttp.useHttpContext();
|
|
71
74
|
const { reqId, rawRequest } = eventHttp.useRequest();
|
|
72
75
|
const scopeId = reqId();
|
|
76
|
+
const logger = eventCore.useEventLogger('moost-http');
|
|
73
77
|
rawRequest.on('end', opts.registerEventScope(scopeId));
|
|
74
78
|
const instance = yield opts.getInstance();
|
|
75
79
|
restoreCtx();
|
|
@@ -82,38 +86,53 @@ class MoostHttp {
|
|
|
82
86
|
const interceptorHandler = yield opts.getIterceptorHandler();
|
|
83
87
|
restoreCtx();
|
|
84
88
|
try {
|
|
89
|
+
logger.trace('initializing interceptors');
|
|
85
90
|
yield interceptorHandler.init();
|
|
86
91
|
}
|
|
87
92
|
catch (e) {
|
|
93
|
+
logger.error(e);
|
|
88
94
|
return e;
|
|
89
95
|
}
|
|
90
96
|
// params
|
|
91
97
|
let args = [];
|
|
98
|
+
restoreCtx();
|
|
92
99
|
try {
|
|
93
|
-
|
|
100
|
+
logger.trace(`resolving method args for "${opts.method}"`);
|
|
94
101
|
args = yield opts.resolveArgs();
|
|
102
|
+
logger.trace(`args for method "${opts.method}" resolved (count ${String(args.length)})`);
|
|
95
103
|
}
|
|
96
104
|
catch (e) {
|
|
105
|
+
logger.error(e);
|
|
97
106
|
response = e;
|
|
98
107
|
}
|
|
99
108
|
if (!response) {
|
|
100
109
|
restoreCtx();
|
|
101
110
|
// fire before interceptors
|
|
111
|
+
logger.trace('firing before interceptors');
|
|
102
112
|
response = yield interceptorHandler.fireBefore(response);
|
|
103
113
|
// fire request handler
|
|
104
114
|
if (!interceptorHandler.responseOverwritten) {
|
|
105
115
|
try {
|
|
106
116
|
restoreCtx();
|
|
117
|
+
logger.trace(`firing method "${opts.method}"`);
|
|
107
118
|
response = yield instance[opts.method](...args);
|
|
108
119
|
}
|
|
109
120
|
catch (e) {
|
|
121
|
+
logger.error(e);
|
|
110
122
|
response = e;
|
|
111
123
|
}
|
|
112
124
|
}
|
|
113
125
|
}
|
|
114
126
|
// fire after interceptors
|
|
115
127
|
restoreCtx();
|
|
116
|
-
|
|
128
|
+
try {
|
|
129
|
+
logger.trace('firing after interceptors');
|
|
130
|
+
response = yield interceptorHandler.fireAfter(response);
|
|
131
|
+
}
|
|
132
|
+
catch (e) {
|
|
133
|
+
logger.error(e);
|
|
134
|
+
throw e;
|
|
135
|
+
}
|
|
117
136
|
return response;
|
|
118
137
|
});
|
|
119
138
|
}
|
package/dist/index.d.ts
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
import { IncomingMessage } from 'http';
|
|
4
4
|
import { ServerResponse } from 'http';
|
|
5
|
+
import { TConsoleBase } from '@prostojs/logger';
|
|
5
6
|
import { TCookieAttributesInput } from '@wooksjs/event-http';
|
|
6
7
|
import { TInterceptorFn } from 'moost';
|
|
7
8
|
import { TMoostAdapter } from 'moost';
|
|
@@ -119,6 +120,7 @@ export declare class MoostHttp implements TMoostAdapter<THttpHandlerMeta> {
|
|
|
119
120
|
};
|
|
120
121
|
};
|
|
121
122
|
getProvideRegistry(): TProvideRegistry;
|
|
123
|
+
getLogger(): TConsoleBase;
|
|
122
124
|
bindHandler<T extends object = object>(opts: TMoostAdapterOptions<THttpHandlerMeta, T>): void | Promise<void>;
|
|
123
125
|
}
|
|
124
126
|
|
package/dist/index.mjs
CHANGED
|
@@ -3,7 +3,7 @@ import { getMoostMate, Resolve, Intercept, TInterceptorPriority, validatePipe }
|
|
|
3
3
|
import { createProvideRegistry } from '@prostojs/infact';
|
|
4
4
|
import { Server } from 'http';
|
|
5
5
|
import { Server as Server$1 } from 'https';
|
|
6
|
-
import { attachHook } from '@wooksjs/event-core';
|
|
6
|
+
import { useEventLogger, attachHook } from '@wooksjs/event-core';
|
|
7
7
|
|
|
8
8
|
/******************************************************************************
|
|
9
9
|
Copyright (c) Microsoft Corporation.
|
|
@@ -55,6 +55,9 @@ class MoostHttp {
|
|
|
55
55
|
getProvideRegistry() {
|
|
56
56
|
return createProvideRegistry([WooksHttp, () => this.getHttpApp()], ['WooksHttp', () => this.getHttpApp()], [Server, () => this.getHttpApp().getServer()], [Server$1, () => this.getHttpApp().getServer()]);
|
|
57
57
|
}
|
|
58
|
+
getLogger() {
|
|
59
|
+
return this.getHttpApp().getLogger('moost-http');
|
|
60
|
+
}
|
|
58
61
|
bindHandler(opts) {
|
|
59
62
|
let fn;
|
|
60
63
|
for (const handler of opts.handlers) {
|
|
@@ -68,6 +71,7 @@ class MoostHttp {
|
|
|
68
71
|
const { restoreCtx } = useHttpContext();
|
|
69
72
|
const { reqId, rawRequest } = useRequest();
|
|
70
73
|
const scopeId = reqId();
|
|
74
|
+
const logger = useEventLogger('moost-http');
|
|
71
75
|
rawRequest.on('end', opts.registerEventScope(scopeId));
|
|
72
76
|
const instance = yield opts.getInstance();
|
|
73
77
|
restoreCtx();
|
|
@@ -80,38 +84,53 @@ class MoostHttp {
|
|
|
80
84
|
const interceptorHandler = yield opts.getIterceptorHandler();
|
|
81
85
|
restoreCtx();
|
|
82
86
|
try {
|
|
87
|
+
logger.trace('initializing interceptors');
|
|
83
88
|
yield interceptorHandler.init();
|
|
84
89
|
}
|
|
85
90
|
catch (e) {
|
|
91
|
+
logger.error(e);
|
|
86
92
|
return e;
|
|
87
93
|
}
|
|
88
94
|
// params
|
|
89
95
|
let args = [];
|
|
96
|
+
restoreCtx();
|
|
90
97
|
try {
|
|
91
|
-
|
|
98
|
+
logger.trace(`resolving method args for "${opts.method}"`);
|
|
92
99
|
args = yield opts.resolveArgs();
|
|
100
|
+
logger.trace(`args for method "${opts.method}" resolved (count ${String(args.length)})`);
|
|
93
101
|
}
|
|
94
102
|
catch (e) {
|
|
103
|
+
logger.error(e);
|
|
95
104
|
response = e;
|
|
96
105
|
}
|
|
97
106
|
if (!response) {
|
|
98
107
|
restoreCtx();
|
|
99
108
|
// fire before interceptors
|
|
109
|
+
logger.trace('firing before interceptors');
|
|
100
110
|
response = yield interceptorHandler.fireBefore(response);
|
|
101
111
|
// fire request handler
|
|
102
112
|
if (!interceptorHandler.responseOverwritten) {
|
|
103
113
|
try {
|
|
104
114
|
restoreCtx();
|
|
115
|
+
logger.trace(`firing method "${opts.method}"`);
|
|
105
116
|
response = yield instance[opts.method](...args);
|
|
106
117
|
}
|
|
107
118
|
catch (e) {
|
|
119
|
+
logger.error(e);
|
|
108
120
|
response = e;
|
|
109
121
|
}
|
|
110
122
|
}
|
|
111
123
|
}
|
|
112
124
|
// fire after interceptors
|
|
113
125
|
restoreCtx();
|
|
114
|
-
|
|
126
|
+
try {
|
|
127
|
+
logger.trace('firing after interceptors');
|
|
128
|
+
response = yield interceptorHandler.fireAfter(response);
|
|
129
|
+
}
|
|
130
|
+
catch (e) {
|
|
131
|
+
logger.error(e);
|
|
132
|
+
throw e;
|
|
133
|
+
}
|
|
115
134
|
return response;
|
|
116
135
|
});
|
|
117
136
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@moostjs/event-http",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.24",
|
|
4
4
|
"description": "@moostjs/event-http",
|
|
5
5
|
"main": "dist/index.cjs",
|
|
6
6
|
"module": "dist/index.mjs",
|
|
@@ -29,9 +29,9 @@
|
|
|
29
29
|
"homepage": "https://github.com/moostjs/moostjs/tree/main/packages/event-http#readme",
|
|
30
30
|
"peerDependencies": {},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"moost": "0.2.
|
|
33
|
-
"@wooksjs/event-core": "^0.2.
|
|
34
|
-
"@wooksjs/event-http": "^0.2.
|
|
32
|
+
"moost": "0.2.24",
|
|
33
|
+
"@wooksjs/event-core": "^0.2.17",
|
|
34
|
+
"@wooksjs/event-http": "^0.2.17",
|
|
35
35
|
"@prostojs/infact": "^0.1.11",
|
|
36
36
|
"@prostojs/router": "^0.0.16"
|
|
37
37
|
}
|