@loke/logger 3.3.0 → 3.5.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/dist/index.d.ts +2 -1
- package/dist/index.js +4 -4
- package/dist/index.js.map +1 -1
- package/dist/lib/common.js +4 -4
- package/dist/lib/common.js.map +1 -1
- package/dist/lib/logger.d.ts +0 -1
- package/dist/lib/logger.js.map +1 -1
- package/dist/lib/metrics.js +6 -2
- package/dist/lib/metrics.js.map +1 -1
- package/dist/lib/streams/console.d.ts +3 -4
- package/dist/lib/streams/console.js +9 -4
- package/dist/lib/streams/console.js.map +1 -1
- package/dist/lib/streams/console.test.js +10 -4
- package/dist/lib/streams/console.test.js.map +1 -1
- package/dist/lib/streams/syslog.d.ts +3 -4
- package/dist/lib/streams/syslog.js +9 -6
- package/dist/lib/streams/syslog.js.map +1 -1
- package/dist/lib/streams/syslog.test.js +30 -30
- package/dist/lib/streams/syslog.test.js.map +1 -1
- package/package.json +17 -17
package/dist/index.d.ts
CHANGED
|
@@ -8,5 +8,6 @@ export interface CreateLoggerOptions {
|
|
|
8
8
|
metricsRegistry?: Registry;
|
|
9
9
|
showDebug?: boolean;
|
|
10
10
|
systemdPrefix?: boolean;
|
|
11
|
+
escapeNewlines?: boolean;
|
|
11
12
|
}
|
|
12
|
-
export declare function create({ syslog, metricsRegistry, showDebug, systemdPrefix, }?: CreateLoggerOptions): LokeLogger;
|
|
13
|
+
export declare function create({ syslog, metricsRegistry, showDebug, systemdPrefix, escapeNewlines, }?: CreateLoggerOptions): LokeLogger;
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.nullLogger = exports.LokeLogger = exports.ConsoleStream = exports.SyslogStream = void 0;
|
|
4
|
+
exports.create = create;
|
|
4
5
|
const streams_1 = require("./lib/streams");
|
|
5
6
|
const logger_1 = require("./lib/logger");
|
|
6
7
|
const metrics_1 = require("./lib/metrics");
|
|
@@ -12,9 +13,9 @@ Object.defineProperty(exports, "LokeLogger", { enumerable: true, get: function (
|
|
|
12
13
|
var null_1 = require("./lib/null");
|
|
13
14
|
Object.defineProperty(exports, "nullLogger", { enumerable: true, get: function () { return null_1.nullLogger; } });
|
|
14
15
|
const systemd = Boolean(process.env.JOURNAL_STREAM);
|
|
15
|
-
function create({ syslog = false, metricsRegistry, showDebug, systemdPrefix = systemd, } = {}) {
|
|
16
|
+
function create({ syslog = false, metricsRegistry, showDebug, systemdPrefix = systemd, escapeNewlines = systemd, } = {}) {
|
|
16
17
|
const streams = [
|
|
17
|
-
new streams_1.ConsoleStream(undefined, undefined, systemdPrefix),
|
|
18
|
+
new streams_1.ConsoleStream(undefined, undefined, systemdPrefix, escapeNewlines),
|
|
18
19
|
];
|
|
19
20
|
if (syslog) {
|
|
20
21
|
streams.push(new streams_1.SyslogStream());
|
|
@@ -25,5 +26,4 @@ function create({ syslog = false, metricsRegistry, showDebug, systemdPrefix = sy
|
|
|
25
26
|
}
|
|
26
27
|
return logger;
|
|
27
28
|
}
|
|
28
|
-
exports.create = create;
|
|
29
29
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;AAmBA,wBAsBC;AAzCD,2CAA4D;AAC5D,yCAA0C;AAC1C,2CAAkD;AAGlD,yCAA4D;AAAnD,uGAAA,YAAY,OAAA;AAAE,wGAAA,aAAa,OAAA;AACpC,uCAAkD;AAAzC,oGAAA,UAAU,OAAA;AACnB,mCAAwC;AAA/B,kGAAA,UAAU,OAAA;AAUnB,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;AAEpD,SAAgB,MAAM,CAAC,EACrB,MAAM,GAAG,KAAK,EACd,eAAe,EACf,SAAS,EACT,aAAa,GAAG,OAAO,EACvB,cAAc,GAAG,OAAO,MACD,EAAE;IACzB,MAAM,OAAO,GAA4B;QACvC,IAAI,uBAAa,CAAC,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,cAAc,CAAC;KACvE,CAAC;IAEF,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,CAAC,IAAI,CAAC,IAAI,sBAAY,EAAE,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,MAAM,GAAG,IAAI,mBAAU,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;IAEpD,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,GAAG,IAAA,2BAAiB,EAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
package/dist/lib/common.js
CHANGED
|
@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
7
|
-
|
|
6
|
+
exports.ERROR = exports.WARN = exports.INFO = exports.DEBUG = void 0;
|
|
7
|
+
exports.format = format;
|
|
8
|
+
const node_util_1 = __importDefault(require("node:util"));
|
|
8
9
|
const chalk_1 = require("chalk");
|
|
9
10
|
const formatPrefix = (prefix) => (prefix ? (0, chalk_1.yellow)(prefix) + ": " : "");
|
|
10
11
|
exports.DEBUG = (0, chalk_1.cyan)("DEBG");
|
|
@@ -14,7 +15,6 @@ exports.ERROR = (0, chalk_1.red)("ERRO");
|
|
|
14
15
|
function format(prefix, level,
|
|
15
16
|
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types,@typescript-eslint/no-explicit-any
|
|
16
17
|
args) {
|
|
17
|
-
return level + " " + formatPrefix(prefix) +
|
|
18
|
+
return level + " " + formatPrefix(prefix) + node_util_1.default.format.apply(null, args);
|
|
18
19
|
}
|
|
19
|
-
exports.format = format;
|
|
20
20
|
//# sourceMappingURL=common.js.map
|
package/dist/lib/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../lib/common.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../lib/common.ts"],"names":[],"mappings":";;;;;;AAeA,wBAOC;AAtBD,0DAA6B;AAC7B,iCAAgD;AAEhD,MAAM,YAAY,GAAG,CAAC,MAAe,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAA,cAAM,EAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAOnE,QAAA,KAAK,GAAG,IAAA,YAAI,EAAC,MAAM,CAAC,CAAC;AACrB,QAAA,IAAI,GAAG,IAAA,YAAI,EAAC,MAAM,CAAC,CAAC;AACpB,QAAA,IAAI,GAAG,IAAA,cAAM,EAAC,MAAM,CAAC,CAAC;AACtB,QAAA,KAAK,GAAG,IAAA,WAAG,EAAC,MAAM,CAAC,CAAC;AAEjC,SAAgB,MAAM,CACpB,MAA0B,EAC1B,KAAa;AACb,gHAAgH;AAChH,IAAS;IAET,OAAO,KAAK,GAAG,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC,GAAG,mBAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAC5E,CAAC"}
|
package/dist/lib/logger.d.ts
CHANGED
package/dist/lib/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AACvD,mCAAqC;AACrC,qCAA4D;AAE5D,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC;AAoBrD,6DAA6D;AAC7D;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AACvD,mCAAqC;AACrC,qCAA4D;AAE5D,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC;AAoBrD,6DAA6D;AAC7D,CAAC;IACC,6DAA6D;IAC7D,MAAM,CAAC,GAAW,OAAO,CAAC;AAC5B,CAAC;AAED,MAAa,UAAU;IAKrB,YAAY,EAAE,SAAS,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAiB;QACjE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,IAAI,oBAAW,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QAEpD,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IAEO,MAAM,CAAC,KAAa,EAAE,IAAW;QACvC,MAAM,OAAO,GAAG,IAAA,eAAM,EAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,GAAG,IAAW;QAClB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,cAAK,EAAE,IAAI,CAAC,CAAC;IAC3B,CAAC;IAED,GAAG,CAAC,GAAG,IAAW;QAChB,IAAI,CAAC,MAAM,CAAC,aAAI,EAAE,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,IAAI,CAAC,GAAG,IAAW;QACjB,IAAI,CAAC,MAAM,CAAC,aAAI,EAAE,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,IAAI,CAAC,GAAG,IAAW;QACjB,IAAI,CAAC,MAAM,CAAC,aAAI,EAAE,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,GAAG,IAAW;QAClB,IAAI,CAAC,MAAM,CAAC,cAAK,EAAE,IAAI,CAAC,CAAC;IAC3B,CAAC;IAED,UAAU,CAAC,MAAc;QACvB,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,wDAAwD;IACxD,WAAW,CAAC,GAAY;QACtB,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IACrD,CAAC;CACF;AAnDD,gCAmDC"}
|
package/dist/lib/metrics.js
CHANGED
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.metricsMiddleware =
|
|
6
|
+
exports.metricsMiddleware = metricsMiddleware;
|
|
4
7
|
const prom_client_1 = require("prom-client");
|
|
8
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
9
|
+
chalk_1.default.level = 0;
|
|
5
10
|
const wrap = (next, wrapper) => Object.assign(Object.create(next), wrapper);
|
|
6
11
|
const logCounter = new prom_client_1.Counter({
|
|
7
12
|
name: "log_messages_total",
|
|
@@ -36,5 +41,4 @@ function metricsMiddleware(registry) {
|
|
|
36
41
|
});
|
|
37
42
|
};
|
|
38
43
|
}
|
|
39
|
-
exports.metricsMiddleware = metricsMiddleware;
|
|
40
44
|
//# sourceMappingURL=metrics.js.map
|
package/dist/lib/metrics.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../lib/metrics.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../lib/metrics.ts"],"names":[],"mappings":";;;;;AAkBA,8CA2BC;AA7CD,6CAAgD;AAChD,kDAA0B;AAG1B,eAAK,CAAC,KAAK,GAAG,CAAC,CAAC;AAIhB,MAAM,IAAI,GAAG,CAAC,IAAgB,EAAE,OAA4B,EAAc,EAAE,CAC1E,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;AAE9C,MAAM,UAAU,GAAG,IAAI,qBAAO,CAAC;IAC7B,IAAI,EAAE,oBAAoB;IAC1B,IAAI,EAAE,6BAA6B;IACnC,UAAU,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC;IAClC,SAAS,EAAE,EAAE;CACd,CAAC,CAAC;AAEH,SAAgB,iBAAiB,CAAC,QAAkB;IAClD,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAEpC,OAAO,CAAC,IAAgB,EAAE,EAAE;QAC1B,OAAO,IAAI,CAAC,IAAI,EAAE;YAChB,KAAK,CAAC,GAAG,IAAI;gBACX,UAAU,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,QAAQ,EAAE,CAAC,CAAC;gBACvE,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACtC,CAAC;YACD,GAAG,CAAC,GAAG,IAAI;gBACT,UAAU,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,QAAQ,EAAE,CAAC,CAAC;gBACtE,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACpC,CAAC;YACD,IAAI,CAAC,GAAG,IAAI;gBACV,UAAU,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,QAAQ,EAAE,CAAC,CAAC;gBACtE,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACrC,CAAC;YACD,IAAI,CAAC,GAAG,IAAI;gBACV,UAAU,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,QAAQ,EAAE,CAAC,CAAC;gBACtE,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACrC,CAAC;YACD,KAAK,CAAC,GAAG,IAAI;gBACX,UAAU,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,QAAQ,EAAE,CAAC,CAAC;gBACvE,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACtC,CAAC;SACF,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
/// <reference types="node" />
|
|
3
|
-
import { Writable } from "stream";
|
|
1
|
+
import { Writable } from "node:stream";
|
|
4
2
|
import { Log } from "../common";
|
|
5
3
|
export declare class ConsoleStream extends Writable {
|
|
6
4
|
stdout: NodeJS.WritableStream;
|
|
7
5
|
stderr: NodeJS.WritableStream;
|
|
8
6
|
systemdPrefix: boolean;
|
|
9
|
-
|
|
7
|
+
escapeNewlines: boolean;
|
|
8
|
+
constructor(stdout?: NodeJS.WritableStream, stderr?: NodeJS.WritableStream, systemdPrefix?: boolean, escapeNewlines?: boolean);
|
|
10
9
|
_write(log: Log, _: string, callback: () => void): void;
|
|
11
10
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ConsoleStream = void 0;
|
|
4
|
-
const
|
|
4
|
+
const node_stream_1 = require("node:stream");
|
|
5
5
|
const common_1 = require("../common");
|
|
6
6
|
const SYSTEMD_PREFIX = {
|
|
7
7
|
[common_1.DEBUG]: "<7>",
|
|
@@ -9,19 +9,24 @@ const SYSTEMD_PREFIX = {
|
|
|
9
9
|
[common_1.WARN]: "<4>",
|
|
10
10
|
[common_1.ERROR]: "<3>",
|
|
11
11
|
};
|
|
12
|
-
class ConsoleStream extends
|
|
13
|
-
constructor(stdout = process.stdout, stderr = process.stderr, systemdPrefix = false) {
|
|
12
|
+
class ConsoleStream extends node_stream_1.Writable {
|
|
13
|
+
constructor(stdout = process.stdout, stderr = process.stderr, systemdPrefix = false, escapeNewlines = false) {
|
|
14
14
|
super({ objectMode: true });
|
|
15
15
|
this.stdout = stdout;
|
|
16
16
|
this.stderr = stderr;
|
|
17
17
|
this.systemdPrefix = systemdPrefix;
|
|
18
|
+
this.escapeNewlines = escapeNewlines;
|
|
18
19
|
}
|
|
19
20
|
_write(log, _, callback) {
|
|
20
|
-
const { level
|
|
21
|
+
const { level } = log;
|
|
22
|
+
let message = log.message;
|
|
21
23
|
let prefix = "";
|
|
22
24
|
if (this.systemdPrefix) {
|
|
23
25
|
prefix = SYSTEMD_PREFIX[level];
|
|
24
26
|
}
|
|
27
|
+
if (this.escapeNewlines) {
|
|
28
|
+
message = message.replace(/\n/g, "\\n");
|
|
29
|
+
}
|
|
25
30
|
switch (level) {
|
|
26
31
|
case common_1.ERROR:
|
|
27
32
|
case common_1.WARN:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../../lib/streams/console.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../../lib/streams/console.ts"],"names":[],"mappings":";;;AAAA,6CAAuC;AAEvC,sCAA0D;AAE1D,MAAM,cAAc,GAAG;IACrB,CAAC,cAAK,CAAC,EAAE,KAAK;IACd,CAAC,aAAI,CAAC,EAAE,KAAK;IACb,CAAC,aAAI,CAAC,EAAE,KAAK;IACb,CAAC,cAAK,CAAC,EAAE,KAAK;CACf,CAAC;AAEF,MAAa,aAAc,SAAQ,sBAAQ;IAMzC,YACE,SAAgC,OAAO,CAAC,MAAM,EAC9C,SAAgC,OAAO,CAAC,MAAM,EAC9C,aAAa,GAAG,KAAK,EACrB,cAAc,GAAG,KAAK;QAEtB,KAAK,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,GAAQ,EAAE,CAAS,EAAE,QAAoB;QAC9C,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC;QACtB,IAAI,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAE1B,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC1C,CAAC;QAED,QAAQ,KAAK,EAAE,CAAC;YACd,KAAK,cAAK,CAAC;YACX,KAAK,aAAI;gBACP,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC,CAAC;gBAC3C,MAAM;YACR;gBACE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC,CAAC;QAC/C,CAAC;QACD,QAAQ,EAAE,CAAC;IACb,CAAC;CACF;AA1CD,sCA0CC"}
|
|
@@ -3,15 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const node_stream_1 = require("node:stream");
|
|
6
7
|
const ava_1 = __importDefault(require("ava"));
|
|
7
|
-
const stream_1 = require("stream");
|
|
8
8
|
const chalk_1 = require("chalk");
|
|
9
9
|
const logger_1 = require("../logger");
|
|
10
10
|
const common_1 = require("../common");
|
|
11
11
|
const console_1 = require("./console");
|
|
12
12
|
function createTestWritable() {
|
|
13
13
|
const data = [];
|
|
14
|
-
const writable = new
|
|
14
|
+
const writable = new node_stream_1.Writable({
|
|
15
15
|
objectMode: false,
|
|
16
16
|
write(chunk, encoding, callback) {
|
|
17
17
|
data.push(chunk.toString("utf8"));
|
|
@@ -45,6 +45,9 @@ const stderr = createTestWritable();
|
|
|
45
45
|
logger.error("error message");
|
|
46
46
|
t.is(stderr.data[0], `${common_1.ERROR} error message\n`);
|
|
47
47
|
stderr.clear();
|
|
48
|
+
logger.log("multiline\nmessage");
|
|
49
|
+
t.is(stdout.data[0], `${common_1.INFO} multiline\nmessage\n`);
|
|
50
|
+
stdout.clear();
|
|
48
51
|
});
|
|
49
52
|
(0, ava_1.default)("logger with debug false", (t) => {
|
|
50
53
|
const logger = new logger_1.LokeLogger({
|
|
@@ -84,9 +87,9 @@ const stderr = createTestWritable();
|
|
|
84
87
|
t.is(stdout.data[0], `${common_1.INFO} ${PREFIX}: prefixed message\n`);
|
|
85
88
|
stdout.clear();
|
|
86
89
|
});
|
|
87
|
-
(0, ava_1.default)("logger systemd prefix", (t) => {
|
|
90
|
+
(0, ava_1.default)("logger systemd prefix and newline escaping", (t) => {
|
|
88
91
|
const logger = new logger_1.LokeLogger({
|
|
89
|
-
streams: [new console_1.ConsoleStream(stdout.writable, stderr.writable, true)],
|
|
92
|
+
streams: [new console_1.ConsoleStream(stdout.writable, stderr.writable, true, true)],
|
|
90
93
|
});
|
|
91
94
|
logger.debug("debug message");
|
|
92
95
|
t.is(stdout.data[0], `<7>${common_1.DEBUG} debug message\n`);
|
|
@@ -103,5 +106,8 @@ const stderr = createTestWritable();
|
|
|
103
106
|
logger.error("error message");
|
|
104
107
|
t.is(stderr.data[0], `<3>${common_1.ERROR} error message\n`);
|
|
105
108
|
stderr.clear();
|
|
109
|
+
logger.log("multiline\nmessage");
|
|
110
|
+
t.is(stdout.data[0], `<6>${common_1.INFO} multiline\\nmessage\n`);
|
|
111
|
+
stdout.clear();
|
|
106
112
|
});
|
|
107
113
|
//# sourceMappingURL=console.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console.test.js","sourceRoot":"","sources":["../../../lib/streams/console.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AACvB,
|
|
1
|
+
{"version":3,"file":"console.test.js","sourceRoot":"","sources":["../../../lib/streams/console.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
import dgram from "dgram";
|
|
4
|
-
import { Writable } from "stream";
|
|
1
|
+
import dgram from "node:dgram";
|
|
2
|
+
import { Writable } from "node:stream";
|
|
5
3
|
import { Log } from "../common";
|
|
6
4
|
export declare const mockable: {
|
|
7
5
|
Date: DateConstructor;
|
|
@@ -21,5 +19,6 @@ export declare class SyslogStream extends Writable {
|
|
|
21
19
|
private producer;
|
|
22
20
|
constructor({ host, port, socket, hostname, pid, appName, }?: SyslogStreamOptions);
|
|
23
21
|
_write(log: Log, _: string, callback: () => void): void;
|
|
22
|
+
close(): void;
|
|
24
23
|
}
|
|
25
24
|
export {};
|
|
@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.SyslogStream = exports.mockable = void 0;
|
|
7
|
-
const
|
|
8
|
-
const
|
|
9
|
-
const
|
|
7
|
+
const node_os_1 = __importDefault(require("node:os"));
|
|
8
|
+
const node_dgram_1 = __importDefault(require("node:dgram"));
|
|
9
|
+
const node_stream_1 = require("node:stream");
|
|
10
10
|
const glossy_1 = __importDefault(require("glossy"));
|
|
11
11
|
const common_1 = require("../common");
|
|
12
12
|
exports.mockable = { Date };
|
|
@@ -16,18 +16,18 @@ const SYSLOG_LEVELS = new Map([
|
|
|
16
16
|
[common_1.WARN, "warning"],
|
|
17
17
|
[common_1.ERROR, "error"],
|
|
18
18
|
]);
|
|
19
|
-
class SyslogStream extends
|
|
19
|
+
class SyslogStream extends node_stream_1.Writable {
|
|
20
20
|
constructor({ host, port, socket, hostname, pid, appName, } = {}) {
|
|
21
21
|
super({ objectMode: true });
|
|
22
22
|
this.host = host || "127.0.0.1";
|
|
23
23
|
this.port = port || 514;
|
|
24
|
-
this.socket = socket ||
|
|
24
|
+
this.socket = socket || node_dgram_1.default.createSocket("udp4");
|
|
25
25
|
this.producer = new glossy_1.default.Produce({
|
|
26
26
|
type: "RFC5424",
|
|
27
27
|
facility: "local0",
|
|
28
28
|
appName: appName || process.title,
|
|
29
29
|
pid: pid || process.pid,
|
|
30
|
-
host: hostname ||
|
|
30
|
+
host: hostname || node_os_1.default.hostname().split(".")[0],
|
|
31
31
|
});
|
|
32
32
|
}
|
|
33
33
|
_write(log, _, callback) {
|
|
@@ -40,6 +40,9 @@ class SyslogStream extends stream_1.Writable {
|
|
|
40
40
|
this.socket.send(syslogMsg, this.port, this.host);
|
|
41
41
|
callback();
|
|
42
42
|
}
|
|
43
|
+
close() {
|
|
44
|
+
this.socket.close();
|
|
45
|
+
}
|
|
43
46
|
}
|
|
44
47
|
exports.SyslogStream = SyslogStream;
|
|
45
48
|
//# sourceMappingURL=syslog.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syslog.js","sourceRoot":"","sources":["../../../lib/streams/syslog.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"syslog.js","sourceRoot":"","sources":["../../../lib/streams/syslog.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAyB;AACzB,4DAA+B;AAC/B,6CAAuC;AACvC,oDAA4B;AAE5B,sCAA0D;AAE7C,QAAA,QAAQ,GAAG,EAAE,IAAI,EAAE,CAAC;AAEjC,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC;IAC5B,CAAC,cAAK,EAAE,OAAO,CAAC;IAChB,CAAC,aAAI,EAAE,MAAM,CAAC;IACd,CAAC,aAAI,EAAE,SAAS,CAAC;IACjB,CAAC,cAAK,EAAE,OAAO,CAAC;CACjB,CAAC,CAAC;AAWH,MAAa,YAAa,SAAQ,sBAAQ;IAOxC,YAAY,EACV,IAAI,EACJ,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,GAAG,EACH,OAAO,MACgB,EAAE;QACzB,KAAK,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5B,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,WAAW,CAAC;QAChC,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,GAAG,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,oBAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAEnD,IAAI,CAAC,QAAQ,GAAG,IAAI,gBAAM,CAAC,OAAO,CAAC;YACjC,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,QAAQ;YAClB,OAAO,EAAE,OAAO,IAAI,OAAO,CAAC,KAAK;YACjC,GAAG,EAAE,GAAG,IAAI,OAAO,CAAC,GAAG;YACvB,IAAI,EAAE,QAAQ,IAAI,iBAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SAC9C,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,GAAQ,EAAE,CAAS,EAAE,QAAoB;QAC9C,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;QAE/B,MAAM,SAAS,GAAW,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC9C,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC;YAClC,IAAI,EAAE,IAAI,gBAAQ,CAAC,IAAI,EAAE;YACzB,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAElD,QAAQ,EAAE,CAAC;IACb,CAAC;IAED,KAAK;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;CACF;AA9CD,oCA8CC"}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const
|
|
6
|
+
const node_dgram_1 = __importDefault(require("node:dgram"));
|
|
7
7
|
const ava_1 = __importDefault(require("ava"));
|
|
8
8
|
const chalk_1 = require("chalk");
|
|
9
9
|
const logger_1 = require("../logger");
|
|
@@ -11,9 +11,9 @@ const common_1 = require("../common");
|
|
|
11
11
|
const syslog_1 = require("./syslog");
|
|
12
12
|
process.env.TZ = "utc";
|
|
13
13
|
async function createTestSocket() {
|
|
14
|
-
const socket =
|
|
14
|
+
const socket = node_dgram_1.default.createSocket("udp4");
|
|
15
15
|
const next = () => new Promise((resolve) => socket.once("message", (buf) => resolve(buf.toString("utf8"))));
|
|
16
|
-
const done = () => socket.close();
|
|
16
|
+
const done = () => new Promise((resolve) => socket.close(resolve));
|
|
17
17
|
await new Promise((resolve) => socket.bind(resolve));
|
|
18
18
|
return { next, done, port: socket.address().port };
|
|
19
19
|
}
|
|
@@ -26,16 +26,15 @@ class FakeDate extends Date {
|
|
|
26
26
|
syslog_1.mockable.Date = FakeDate;
|
|
27
27
|
(0, ava_1.default)("logger with debug true", async (t) => {
|
|
28
28
|
const { next, done, port } = await createTestSocket();
|
|
29
|
+
const syslog = new syslog_1.SyslogStream({
|
|
30
|
+
port,
|
|
31
|
+
pid: 2607,
|
|
32
|
+
hostname: "ip-10-0-0-115",
|
|
33
|
+
appName: "test",
|
|
34
|
+
});
|
|
29
35
|
const logger = new logger_1.LokeLogger({
|
|
30
36
|
showDebug: true,
|
|
31
|
-
streams: [
|
|
32
|
-
new syslog_1.SyslogStream({
|
|
33
|
-
port,
|
|
34
|
-
pid: 2607,
|
|
35
|
-
hostname: "ip-10-0-0-115",
|
|
36
|
-
appName: "test",
|
|
37
|
-
}),
|
|
38
|
-
],
|
|
37
|
+
streams: [syslog],
|
|
39
38
|
});
|
|
40
39
|
logger.debug("debug message");
|
|
41
40
|
t.is(await next(), `<135>1 2018-02-23T11:46:24.00Z ip-10-0-0-115 test 2607 - - ${common_1.DEBUG} debug message`);
|
|
@@ -47,41 +46,42 @@ syslog_1.mockable.Date = FakeDate;
|
|
|
47
46
|
t.is(await next(), `<132>1 2018-02-23T11:46:24.00Z ip-10-0-0-115 test 2607 - - ${common_1.WARN} warn message`);
|
|
48
47
|
logger.error("error message");
|
|
49
48
|
t.is(await next(), `<131>1 2018-02-23T11:46:24.00Z ip-10-0-0-115 test 2607 - - ${common_1.ERROR} error message`);
|
|
50
|
-
|
|
49
|
+
syslog.close();
|
|
50
|
+
await done();
|
|
51
51
|
});
|
|
52
52
|
(0, ava_1.default)("formatted messages", async (t) => {
|
|
53
53
|
const { next, done, port } = await createTestSocket();
|
|
54
|
+
const syslog = new syslog_1.SyslogStream({
|
|
55
|
+
port,
|
|
56
|
+
pid: 2607,
|
|
57
|
+
hostname: "ip-10-0-0-115",
|
|
58
|
+
appName: "test",
|
|
59
|
+
});
|
|
54
60
|
const logger = new logger_1.LokeLogger({
|
|
55
61
|
showDebug: true,
|
|
56
|
-
streams: [
|
|
57
|
-
new syslog_1.SyslogStream({
|
|
58
|
-
port,
|
|
59
|
-
pid: 2607,
|
|
60
|
-
hostname: "ip-10-0-0-115",
|
|
61
|
-
appName: "test",
|
|
62
|
-
}),
|
|
63
|
-
],
|
|
62
|
+
streams: [syslog],
|
|
64
63
|
});
|
|
65
64
|
logger.info("%s message", 1, "other");
|
|
66
65
|
t.is(await next(), `<134>1 2018-02-23T11:46:24.00Z ip-10-0-0-115 test 2607 - - ${common_1.INFO} 1 message other`);
|
|
67
|
-
|
|
66
|
+
syslog.close();
|
|
67
|
+
await done();
|
|
68
68
|
});
|
|
69
69
|
(0, ava_1.default)("with prefix", async (t) => {
|
|
70
70
|
const { next, done, port } = await createTestSocket();
|
|
71
|
+
const syslog = new syslog_1.SyslogStream({
|
|
72
|
+
port,
|
|
73
|
+
pid: 2607,
|
|
74
|
+
hostname: "ip-10-0-0-115",
|
|
75
|
+
appName: "test",
|
|
76
|
+
});
|
|
71
77
|
const logger = new logger_1.LokeLogger({
|
|
72
78
|
showDebug: true,
|
|
73
|
-
streams: [
|
|
74
|
-
new syslog_1.SyslogStream({
|
|
75
|
-
port,
|
|
76
|
-
pid: 2607,
|
|
77
|
-
hostname: "ip-10-0-0-115",
|
|
78
|
-
appName: "test",
|
|
79
|
-
}),
|
|
80
|
-
],
|
|
79
|
+
streams: [syslog],
|
|
81
80
|
});
|
|
82
81
|
logger.withPrefix("PREFIX").info("prefixed message");
|
|
83
82
|
const PREFIX = (0, chalk_1.yellow)("PREFIX");
|
|
84
83
|
t.is(await next(), `<134>1 2018-02-23T11:46:24.00Z ip-10-0-0-115 test 2607 - - ${common_1.INFO} ${PREFIX}: prefixed message`);
|
|
85
|
-
|
|
84
|
+
syslog.close();
|
|
85
|
+
await done();
|
|
86
86
|
});
|
|
87
87
|
//# sourceMappingURL=syslog.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syslog.test.js","sourceRoot":"","sources":["../../../lib/streams/syslog.test.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"syslog.test.js","sourceRoot":"","sources":["../../../lib/streams/syslog.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loke/logger",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.5.0",
|
|
4
4
|
"description": "Logger module for LOKE applications. Supports syslog and console output.",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -8,8 +8,9 @@
|
|
|
8
8
|
"dist"
|
|
9
9
|
],
|
|
10
10
|
"scripts": {
|
|
11
|
-
"test": "
|
|
12
|
-
"
|
|
11
|
+
"test": "ava -v --timeout=30s",
|
|
12
|
+
"posttest": "npm run lint",
|
|
13
|
+
"lint": "eslint . && prettier --check .",
|
|
13
14
|
"prepare": "npm run build",
|
|
14
15
|
"build": "rm -rf ./dist && tsc"
|
|
15
16
|
},
|
|
@@ -35,24 +36,23 @@
|
|
|
35
36
|
]
|
|
36
37
|
},
|
|
37
38
|
"dependencies": {
|
|
38
|
-
"chalk": "^4.1.
|
|
39
|
+
"chalk": "^4.1.2",
|
|
39
40
|
"glossy": "^0.1.7"
|
|
40
41
|
},
|
|
41
42
|
"peerDependencies": {
|
|
42
|
-
"prom-client": ">=12 <=
|
|
43
|
+
"prom-client": ">=12 <=15"
|
|
43
44
|
},
|
|
44
45
|
"devDependencies": {
|
|
45
|
-
"@types/node": "^
|
|
46
|
-
"@typescript-eslint/eslint-plugin": "^
|
|
47
|
-
"@typescript-eslint/parser": "^
|
|
48
|
-
"ava": "^
|
|
49
|
-
"eslint": "^
|
|
50
|
-
"eslint-config-prettier": "^
|
|
51
|
-
"eslint-plugin-ava": "^
|
|
52
|
-
"
|
|
53
|
-
"
|
|
54
|
-
"
|
|
55
|
-
"
|
|
56
|
-
"typescript": "^4.0.2"
|
|
46
|
+
"@types/node": "^20.16.5",
|
|
47
|
+
"@typescript-eslint/eslint-plugin": "^8.5.0",
|
|
48
|
+
"@typescript-eslint/parser": "^8.5.0",
|
|
49
|
+
"ava": "^6.1.3",
|
|
50
|
+
"eslint": "^8.57.0",
|
|
51
|
+
"eslint-config-prettier": "^9.1.0",
|
|
52
|
+
"eslint-plugin-ava": "^14.0.0",
|
|
53
|
+
"prettier": "^3.3.3",
|
|
54
|
+
"prom-client": "^15.1.3",
|
|
55
|
+
"ts-node": "^10.9.2",
|
|
56
|
+
"typescript": "^5.6.2"
|
|
57
57
|
}
|
|
58
58
|
}
|