@moostjs/event-http 0.2.23 → 0.2.25

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 (4) hide show
  1. package/dist/index.cjs +29 -8
  2. package/dist/index.d.ts +2 -0
  3. package/dist/index.mjs +30 -9
  4. 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,55 @@ 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) {
88
- return e;
93
+ logger.error(e);
94
+ response = e;
89
95
  }
90
- // params
91
96
  let args = [];
92
- try {
97
+ if (!response) {
98
+ // params
93
99
  restoreCtx();
94
- args = yield opts.resolveArgs();
95
- }
96
- catch (e) {
97
- response = e;
100
+ try {
101
+ logger.trace(`resolving method args for "${opts.method}"`);
102
+ args = yield opts.resolveArgs();
103
+ logger.trace(`args for method "${opts.method}" resolved (count ${String(args.length)})`);
104
+ }
105
+ catch (e) {
106
+ logger.error(e);
107
+ response = e;
108
+ }
98
109
  }
99
110
  if (!response) {
100
111
  restoreCtx();
101
112
  // fire before interceptors
113
+ logger.trace('firing before interceptors');
102
114
  response = yield interceptorHandler.fireBefore(response);
103
115
  // fire request handler
104
116
  if (!interceptorHandler.responseOverwritten) {
105
117
  try {
106
118
  restoreCtx();
119
+ logger.trace(`firing method "${opts.method}"`);
107
120
  response = yield instance[opts.method](...args);
108
121
  }
109
122
  catch (e) {
123
+ logger.error(e);
110
124
  response = e;
111
125
  }
112
126
  }
113
127
  }
114
128
  // fire after interceptors
115
129
  restoreCtx();
116
- response = yield interceptorHandler.fireAfter(response);
130
+ try {
131
+ logger.trace('firing after interceptors');
132
+ response = yield interceptorHandler.fireAfter(response);
133
+ }
134
+ catch (e) {
135
+ logger.error(e);
136
+ throw e;
137
+ }
117
138
  return response;
118
139
  });
119
140
  }
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,55 @@ 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) {
86
- return e;
91
+ logger.error(e);
92
+ response = e;
87
93
  }
88
- // params
89
94
  let args = [];
90
- try {
95
+ if (!response) {
96
+ // params
91
97
  restoreCtx();
92
- args = yield opts.resolveArgs();
93
- }
94
- catch (e) {
95
- response = e;
98
+ try {
99
+ logger.trace(`resolving method args for "${opts.method}"`);
100
+ args = yield opts.resolveArgs();
101
+ logger.trace(`args for method "${opts.method}" resolved (count ${String(args.length)})`);
102
+ }
103
+ catch (e) {
104
+ logger.error(e);
105
+ response = e;
106
+ }
96
107
  }
97
108
  if (!response) {
98
109
  restoreCtx();
99
110
  // fire before interceptors
111
+ logger.trace('firing before interceptors');
100
112
  response = yield interceptorHandler.fireBefore(response);
101
113
  // fire request handler
102
114
  if (!interceptorHandler.responseOverwritten) {
103
115
  try {
104
116
  restoreCtx();
117
+ logger.trace(`firing method "${opts.method}"`);
105
118
  response = yield instance[opts.method](...args);
106
119
  }
107
120
  catch (e) {
121
+ logger.error(e);
108
122
  response = e;
109
123
  }
110
124
  }
111
125
  }
112
126
  // fire after interceptors
113
127
  restoreCtx();
114
- response = yield interceptorHandler.fireAfter(response);
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
+ }
115
136
  return response;
116
137
  });
117
138
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@moostjs/event-http",
3
- "version": "0.2.23",
3
+ "version": "0.2.25",
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.23",
33
- "@wooksjs/event-core": "^0.2.16",
34
- "@wooksjs/event-http": "^0.2.16",
32
+ "moost": "0.2.25",
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
  }