@mojojs/core 0.30.0 → 0.31.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.
- package/README.md +4 -4
- package/lib/cli/create-plugin.js +1 -1
- package/lib/logger.d.ts +21 -0
- package/lib/logger.js +49 -6
- package/lib/logger.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
[](https://www.npmjs.com/package/@mojojs/core)
|
|
12
12
|
|
|
13
13
|
The [Mojolicious](https://mojolicious.org) real-time web framework for [Node.js](https://nodejs.org/). Written in
|
|
14
|
-
TypeScript. Meticulously designed for
|
|
14
|
+
TypeScript. Meticulously designed for hypermedia-driven backend web services using all the latest JavaScript features.
|
|
15
15
|
|
|
16
16
|
If you want to stay up to date on the latest developments join us on [Matrix](https://matrix.to/#/#mojo:matrix.org) or
|
|
17
17
|
[IRC](https://web.libera.chat/#mojo).
|
|
@@ -21,12 +21,12 @@ If you want to stay up to date on the latest developments join us on [Matrix](ht
|
|
|
21
21
|
* A real-time web framework, allowing you to easily grow single file prototypes into well-structured MVC web
|
|
22
22
|
applications.
|
|
23
23
|
* Powerful out of the box with RESTful routes, WebSockets, plugins, commands, logging, templates, content negotiation,
|
|
24
|
-
session management, form validation, testing framework, static file server, cluster mode, first class
|
|
25
|
-
support and much more for you to discover.
|
|
24
|
+
session management, form and JSON validation, testing framework, static file server, cluster mode, first class
|
|
25
|
+
Unicode support and much more for you to discover.
|
|
26
26
|
|
|
27
27
|
* A powerful web development toolkit, that you can use for all kinds of applications, independently of the web
|
|
28
28
|
framework.
|
|
29
|
-
*
|
|
29
|
+
* High performance HTTP and WebSocket client/server implementation with support for HTTPS/WSS, cookies, redirects,
|
|
30
30
|
urlencoded/multi-part forms, file uploads, JSON/YAML, HTML/XML, mocking, API testing, HTTP/SOCKS proxies, and gzip
|
|
31
31
|
compression.
|
|
32
32
|
* HTML/XML parser with CSS selector support.
|
package/lib/cli/create-plugin.js
CHANGED
package/lib/logger.d.ts
CHANGED
|
@@ -27,6 +27,7 @@ export declare class Logger {
|
|
|
27
27
|
* The last few logged messages.
|
|
28
28
|
*/
|
|
29
29
|
history: LogEvent[];
|
|
30
|
+
_capture: CapturedLogs | undefined;
|
|
30
31
|
_historySize: number;
|
|
31
32
|
_level: number;
|
|
32
33
|
constructor(options?: {
|
|
@@ -35,6 +36,10 @@ export declare class Logger {
|
|
|
35
36
|
historySize?: number;
|
|
36
37
|
level?: string;
|
|
37
38
|
});
|
|
39
|
+
/**
|
|
40
|
+
* Capture log messages for as long as the returned object has not been stopped, useful for testing log messages.
|
|
41
|
+
*/
|
|
42
|
+
capture(level?: string): CapturedLogs;
|
|
38
43
|
/**
|
|
39
44
|
* Create a child logger that will include context information with every log message.
|
|
40
45
|
*/
|
|
@@ -86,6 +91,22 @@ export declare class Logger {
|
|
|
86
91
|
warn(msg: string, context?: LogContext): void;
|
|
87
92
|
_log(level: string, msg: string, context?: LogContext): void;
|
|
88
93
|
}
|
|
94
|
+
/**
|
|
95
|
+
* Captured log message class.
|
|
96
|
+
*/
|
|
97
|
+
declare class CapturedLogs extends Array<string> {
|
|
98
|
+
_cb: () => void;
|
|
99
|
+
_stopped: boolean;
|
|
100
|
+
constructor(cb: () => void);
|
|
101
|
+
/**
|
|
102
|
+
* Stop capturing log messages.
|
|
103
|
+
*/
|
|
104
|
+
stop(): void;
|
|
105
|
+
/**
|
|
106
|
+
* Turn log messages into a string.
|
|
107
|
+
*/
|
|
108
|
+
toString(): string;
|
|
109
|
+
}
|
|
89
110
|
/**
|
|
90
111
|
* Child logger class.
|
|
91
112
|
*/
|
package/lib/logger.js
CHANGED
|
@@ -17,12 +17,27 @@ export class Logger {
|
|
|
17
17
|
* The last few logged messages.
|
|
18
18
|
*/
|
|
19
19
|
this.history = [];
|
|
20
|
+
this._capture = undefined;
|
|
20
21
|
this._level = 7;
|
|
21
22
|
this.destination = options.destination ?? process.stderr;
|
|
22
23
|
this.formatter = options.formatter ?? Logger.colorFormatter;
|
|
23
24
|
this.level = process.env.MOJO_LOG_LEVEL ?? options.level ?? 'trace';
|
|
24
25
|
this._historySize = options.historySize ?? 0;
|
|
25
26
|
}
|
|
27
|
+
/**
|
|
28
|
+
* Capture log messages for as long as the returned object has not been stopped, useful for testing log messages.
|
|
29
|
+
*/
|
|
30
|
+
capture(level = this.level) {
|
|
31
|
+
if (this._capture !== undefined)
|
|
32
|
+
throw new Error('Log messages are already being captured');
|
|
33
|
+
const original = this.level;
|
|
34
|
+
this.level = level;
|
|
35
|
+
this._capture = new CapturedLogs(() => {
|
|
36
|
+
this.level = original;
|
|
37
|
+
this._capture = undefined;
|
|
38
|
+
});
|
|
39
|
+
return this._capture;
|
|
40
|
+
}
|
|
26
41
|
/**
|
|
27
42
|
* Create a child logger that will include context information with every log message.
|
|
28
43
|
*/
|
|
@@ -116,18 +131,46 @@ export class Logger {
|
|
|
116
131
|
}
|
|
117
132
|
_log(level, msg, context) {
|
|
118
133
|
const data = { ...context, time: new Date().toISOString(), msg, level };
|
|
119
|
-
if (this._historySize
|
|
120
|
-
this.destination.write(this.formatter(data));
|
|
121
|
-
}
|
|
122
|
-
else {
|
|
134
|
+
if (this._historySize !== 0) {
|
|
123
135
|
const history = this.history;
|
|
124
|
-
const historySize = this._historySize;
|
|
125
136
|
history.push(data);
|
|
137
|
+
const historySize = this._historySize;
|
|
126
138
|
while (history.length > historySize) {
|
|
127
139
|
history.shift();
|
|
128
140
|
}
|
|
129
|
-
this.destination.write(this.formatter(data));
|
|
130
141
|
}
|
|
142
|
+
const formatted = this.formatter(data);
|
|
143
|
+
if (this._capture === undefined) {
|
|
144
|
+
this.destination.write(formatted);
|
|
145
|
+
}
|
|
146
|
+
else {
|
|
147
|
+
this._capture.push(formatted);
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
/**
|
|
152
|
+
* Captured log message class.
|
|
153
|
+
*/
|
|
154
|
+
class CapturedLogs extends Array {
|
|
155
|
+
constructor(cb) {
|
|
156
|
+
super();
|
|
157
|
+
this._stopped = false;
|
|
158
|
+
this._cb = cb;
|
|
159
|
+
}
|
|
160
|
+
/**
|
|
161
|
+
* Stop capturing log messages.
|
|
162
|
+
*/
|
|
163
|
+
stop() {
|
|
164
|
+
if (this._stopped === true)
|
|
165
|
+
return;
|
|
166
|
+
this._cb();
|
|
167
|
+
this._stopped = true;
|
|
168
|
+
}
|
|
169
|
+
/**
|
|
170
|
+
* Turn log messages into a string.
|
|
171
|
+
*/
|
|
172
|
+
toString() {
|
|
173
|
+
return this.join('');
|
|
131
174
|
}
|
|
132
175
|
}
|
|
133
176
|
/**
|
package/lib/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,MAAM,OAAO,CAAC;AAa1B,MAAM,KAAK,GAA2B;IACpC,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;CACT,CAAC;AAEF;;GAEG;AACH,MAAM,OAAO,MAAM;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"}
|