@subsquid/logger 0.0.2 → 0.2.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/lib/demo.js +1 -0
- package/lib/demo.js.map +1 -1
- package/lib/logger.d.ts +1 -1
- package/lib/logger.d.ts.map +1 -1
- package/lib/logger.js +4 -0
- package/lib/logger.js.map +1 -1
- package/lib/sinks/json.js +15 -1
- package/lib/sinks/json.js.map +1 -1
- package/lib/sinks/pretty.d.ts.map +1 -1
- package/lib/sinks/pretty.js +27 -3
- package/lib/sinks/pretty.js.map +1 -1
- package/package.json +2 -2
- package/src/demo.ts +2 -0
- package/src/logger.ts +4 -1
- package/src/sinks/json.ts +15 -1
- package/src/sinks/pretty.ts +23 -3
package/lib/demo.js
CHANGED
|
@@ -16,4 +16,5 @@ log.error({ err: new Error('Another error'), a: 1, b: 2 }, 'weird');
|
|
|
16
16
|
const sqlLog = log.child('sql', { req: 1 });
|
|
17
17
|
sqlLog.debug('connecting to database');
|
|
18
18
|
sqlLog.debug({ sql: 'SELECT max(id) FROM status' });
|
|
19
|
+
log.info(new Map([['a', 1], ['b', 2], ['c', 3]]));
|
|
19
20
|
//# sourceMappingURL=demo.js.map
|
package/lib/demo.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"demo.js","sourceRoot":"","sources":["../src/demo.ts"],"names":[],"mappings":";;AAAA,mCAAoC;AAEpC,MAAM,GAAG,GAAG,IAAA,oBAAY,EAAC,UAAU,CAAC,CAAA;AAEpC,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAA;AACtC,GAAG,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;AAExC,GAAG,CAAC,IAAI,CAAC,EAAC,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAC,EAAE,wCAAwC,CAAC,CAAA;AAEpE,6CAA6C;AAC7C,GAAG,CAAC,IAAI,CAAC,EAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAC,EAAC,EAAE,EAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAC,CAAC,EAAC,CAAC,CAAA;AAEpG,6CAA6C;AAC7C,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAA;AAEzC,wDAAwD;AACxD,GAAG,CAAC,KAAK,CAAC,EAAC,GAAG,EAAE,IAAI,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAC,EAAE,OAAO,CAAC,CAAA;AAEjE,+DAA+D;AAC/D,sDAAsD;AACtD,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,EAAC,GAAG,EAAE,CAAC,EAAC,CAAC,CAAA;AACzC,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAA;AACtC,MAAM,CAAC,KAAK,CAAC,EAAC,GAAG,EAAE,4BAA4B,EAAC,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"demo.js","sourceRoot":"","sources":["../src/demo.ts"],"names":[],"mappings":";;AAAA,mCAAoC;AAEpC,MAAM,GAAG,GAAG,IAAA,oBAAY,EAAC,UAAU,CAAC,CAAA;AAEpC,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAA;AACtC,GAAG,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;AAExC,GAAG,CAAC,IAAI,CAAC,EAAC,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAC,EAAE,wCAAwC,CAAC,CAAA;AAEpE,6CAA6C;AAC7C,GAAG,CAAC,IAAI,CAAC,EAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAC,EAAC,EAAE,EAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAC,CAAC,EAAC,CAAC,CAAA;AAEpG,6CAA6C;AAC7C,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAA;AAEzC,wDAAwD;AACxD,GAAG,CAAC,KAAK,CAAC,EAAC,GAAG,EAAE,IAAI,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAC,EAAE,OAAO,CAAC,CAAA;AAEjE,+DAA+D;AAC/D,sDAAsD;AACtD,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,EAAC,GAAG,EAAE,CAAC,EAAC,CAAC,CAAA;AACzC,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAA;AACtC,MAAM,CAAC,KAAK,CAAC,EAAC,GAAG,EAAE,4BAA4B,EAAC,CAAC,CAAA;AAEjD,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA"}
|
package/lib/logger.d.ts
CHANGED
package/lib/logger.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,QAAQ,EAAC,MAAM,SAAS,CAAA;AAGxC,MAAM,WAAW,SAAS;IACtB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,QAAQ,CAAA;IACf,EAAE,EAAE,MAAM,CAAA;IACV,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,KAAK,CAAA;CACd;AAGD,oBAAY,IAAI,GAAG,CAAC,GAAG,EAAE,SAAS,KAAK,IAAI,CAAA;AAG3C,qBAAa,MAAM;IAEX,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,UAAU,CAAC;gBAFX,IAAI,EAAE,IAAI,EACV,EAAE,EAAE,MAAM,EACV,UAAU,CAAC,oBAAQ;IAI/B,IAAI,KAAK,IAAI,QAAQ,CAEpB;IAED,KAAK,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IACjC,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM;IAkB9C,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IAC1C,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IAwB/D,KAAK,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IACzB,KAAK,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IAK9C,KAAK,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IACzB,KAAK,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IAK9C,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IACxB,IAAI,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IAK7C,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IACxB,IAAI,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IAK7C,KAAK,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IACzB,KAAK,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IAK9C,KAAK,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAChC,KAAK,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IAKrD,OAAO,IAAI,OAAO;IAIlB,OAAO,IAAI,OAAO;IAIlB,MAAM,IAAI,OAAO;IAIjB,MAAM,IAAI,OAAO;IAIjB,OAAO,IAAI,OAAO;IAIlB,OAAO,IAAI,OAAO;CAGrB"}
|
package/lib/logger.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Logger = void 0;
|
|
4
|
+
const util_internal_json_1 = require("@subsquid/util-internal-json");
|
|
4
5
|
const level_1 = require("./level");
|
|
5
6
|
class Logger {
|
|
6
7
|
constructor(sink, ns, attributes) {
|
|
@@ -41,6 +42,9 @@ class Logger {
|
|
|
41
42
|
if (attributes instanceof Error) {
|
|
42
43
|
attributes = { err: attributes };
|
|
43
44
|
}
|
|
45
|
+
else if (attributes instanceof Map || attributes instanceof Set) {
|
|
46
|
+
attributes = (0, util_internal_json_1.toJSON)(attributes);
|
|
47
|
+
}
|
|
44
48
|
let rec = {
|
|
45
49
|
level,
|
|
46
50
|
time: Date.now(),
|
package/lib/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"}
|
package/lib/sinks/json.js
CHANGED
|
@@ -9,7 +9,12 @@ function jsonLinesStderrSink(rec) {
|
|
|
9
9
|
exports.jsonLinesStderrSink = jsonLinesStderrSink;
|
|
10
10
|
function stringify(rec) {
|
|
11
11
|
try {
|
|
12
|
-
|
|
12
|
+
let json = (0, util_internal_json_1.toJSON)(rec);
|
|
13
|
+
let label = LABELS?.[json.level];
|
|
14
|
+
if (label) {
|
|
15
|
+
json.level = label;
|
|
16
|
+
}
|
|
17
|
+
return JSON.stringify(json);
|
|
13
18
|
}
|
|
14
19
|
catch (e) {
|
|
15
20
|
return stringify({
|
|
@@ -21,4 +26,13 @@ function stringify(rec) {
|
|
|
21
26
|
});
|
|
22
27
|
}
|
|
23
28
|
}
|
|
29
|
+
const LABELS = (() => {
|
|
30
|
+
let json = process.env.SQD_LOG_LABELS;
|
|
31
|
+
if (!json)
|
|
32
|
+
return undefined;
|
|
33
|
+
try {
|
|
34
|
+
return JSON.parse(json);
|
|
35
|
+
}
|
|
36
|
+
catch (e) { }
|
|
37
|
+
})();
|
|
24
38
|
//# sourceMappingURL=json.js.map
|
package/lib/sinks/json.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/sinks/json.ts"],"names":[],"mappings":";;;AAAA,qEAAmD;AACnD,oCAAiC;AAIjC,SAAgB,mBAAmB,CAAC,GAAc;IAC9C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAA;AAC/C,CAAC;AAFD,kDAEC;AAGD,SAAS,SAAS,CAAC,GAAc;IAC7B,IAAI;QACA,
|
|
1
|
+
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/sinks/json.ts"],"names":[],"mappings":";;;AAAA,qEAAmD;AACnD,oCAAiC;AAIjC,SAAgB,mBAAmB,CAAC,GAAc;IAC9C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAA;AAC/C,CAAC;AAFD,kDAEC;AAGD,SAAS,SAAS,CAAC,GAAc;IAC7B,IAAI;QACA,IAAI,IAAI,GAAG,IAAA,2BAAM,EAAC,GAAG,CAAC,CAAA;QACtB,IAAI,KAAK,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAChC,IAAI,KAAK,EAAE;YACP,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;SACrB;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;KAC9B;IAAC,OAAM,CAAM,EAAE;QACZ,OAAO,SAAS,CAAC;YACb,EAAE,EAAE,KAAK;YACT,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;YAChB,KAAK,EAAE,gBAAQ,CAAC,KAAK;YACrB,GAAG,EAAE,uCAAuC,GAAG,CAAC,EAAE,EAAE;YACpD,GAAG,EAAE,EAAC,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAU;SACjD,CAAC,CAAA;KACL;AACL,CAAC;AAGD,MAAM,MAAM,GAAuC,CAAC,GAAG,EAAE;IACrD,IAAI,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAA;IACrC,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAA;IAC3B,IAAI;QACA,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;KAC1B;IAAC,OAAM,CAAM,EAAE,GAAE;AACtB,CAAC,CAAC,EAAE,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pretty.d.ts","sourceRoot":"","sources":["../../src/sinks/pretty.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,SAAS,EAAC,MAAM,WAAW,CAAA;AAGnC,qBAAa,OAAO;IAMJ,OAAO,CAAC,GAAG;IAA0B,OAAO,CAAC,QAAQ;IALjE,OAAO,CAAC,MAAM,CAAC,CAAQ;IACvB,OAAO,CAAC,OAAO,CAAY;IAC3B,OAAO,CAAC,KAAK,CAAC,CAA+B;IAC7C,OAAO,CAAC,aAAa,CAAQ;gBAET,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAAU,QAAQ,EAAE,OAAO;IAE1E,OAAO,CAAC,IAAI;IAWZ,OAAO,CAAC,IAAI;IAMZ,OAAO,CAAC,KAAK;IAQb,OAAO,CAAC,GAAG;IAKX,OAAO,CAAC,QAAQ;
|
|
1
|
+
{"version":3,"file":"pretty.d.ts","sourceRoot":"","sources":["../../src/sinks/pretty.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,SAAS,EAAC,MAAM,WAAW,CAAA;AAGnC,qBAAa,OAAO;IAMJ,OAAO,CAAC,GAAG;IAA0B,OAAO,CAAC,QAAQ;IALjE,OAAO,CAAC,MAAM,CAAC,CAAQ;IACvB,OAAO,CAAC,OAAO,CAAY;IAC3B,OAAO,CAAC,KAAK,CAAC,CAA+B;IAC7C,OAAO,CAAC,aAAa,CAAQ;gBAET,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAAU,QAAQ,EAAE,OAAO;IAE1E,OAAO,CAAC,IAAI;IAWZ,OAAO,CAAC,IAAI;IAMZ,OAAO,CAAC,KAAK;IAQb,OAAO,CAAC,GAAG;IAKX,OAAO,CAAC,QAAQ;IAiFhB,KAAK,CAAC,GAAG,EAAE,SAAS;IAuCpB,KAAK,IAAI,IAAI;CAMhB;AAkFD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI,CAcrD"}
|
package/lib/sinks/pretty.js
CHANGED
|
@@ -65,6 +65,16 @@ class Printer {
|
|
|
65
65
|
else if (typeof val?.toJSON == 'function') {
|
|
66
66
|
this.property(prefix, val.toJSON());
|
|
67
67
|
}
|
|
68
|
+
else if (val instanceof Map) {
|
|
69
|
+
let entries = [];
|
|
70
|
+
for (let [k, v] of val.entries()) {
|
|
71
|
+
entries.push({ k, v });
|
|
72
|
+
}
|
|
73
|
+
this.property(prefix, { map: entries });
|
|
74
|
+
}
|
|
75
|
+
else if (val instanceof Set) {
|
|
76
|
+
this.property(prefix, { set: [...val] });
|
|
77
|
+
}
|
|
68
78
|
else if (Array.isArray(val)) {
|
|
69
79
|
if (val.length == 0) {
|
|
70
80
|
this.line(`${prefix} []`);
|
|
@@ -95,8 +105,15 @@ class Printer {
|
|
|
95
105
|
else {
|
|
96
106
|
this.visited.add(val);
|
|
97
107
|
}
|
|
108
|
+
let props;
|
|
109
|
+
if (val instanceof Error) {
|
|
110
|
+
props = { ...val, stack: val.stack || val.toString() };
|
|
111
|
+
}
|
|
112
|
+
else {
|
|
113
|
+
props = val;
|
|
114
|
+
}
|
|
98
115
|
let has = false;
|
|
99
|
-
for (let key in
|
|
116
|
+
for (let key in props) {
|
|
100
117
|
if (!has) {
|
|
101
118
|
if (prefix == ' -') {
|
|
102
119
|
this.begin(prefix);
|
|
@@ -107,7 +124,7 @@ class Printer {
|
|
|
107
124
|
}
|
|
108
125
|
}
|
|
109
126
|
has = true;
|
|
110
|
-
this.property(key + ':',
|
|
127
|
+
this.property(key + ':', props[key]);
|
|
111
128
|
}
|
|
112
129
|
if (has) {
|
|
113
130
|
this.end();
|
|
@@ -134,7 +151,14 @@ class Printer {
|
|
|
134
151
|
case 'msg':
|
|
135
152
|
break;
|
|
136
153
|
default:
|
|
137
|
-
|
|
154
|
+
if (key == 'err' && rec.err instanceof Error) {
|
|
155
|
+
// already printed the stack trace above
|
|
156
|
+
// print only the rest of props
|
|
157
|
+
this.property('err:', { ...rec.err });
|
|
158
|
+
}
|
|
159
|
+
else {
|
|
160
|
+
this.property(key + ':', rec[key]);
|
|
161
|
+
}
|
|
138
162
|
}
|
|
139
163
|
}
|
|
140
164
|
this.end();
|
package/lib/sinks/pretty.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pretty.js","sourceRoot":"","sources":["../../src/sinks/pretty.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pretty.js","sourceRoot":"","sources":["../../src/sinks/pretty.ts"],"names":[],"mappings":";;;;;;AAAA,mEAAiD;AACjD,oDAA2B;AAC3B,mDAAoD;AACpD,oCAAiC;AAIjC,MAAa,OAAO;IAMhB,YAAoB,GAA2B,EAAU,QAAiB;QAAtD,QAAG,GAAH,GAAG,CAAwB;QAAU,aAAQ,GAAR,QAAQ,CAAS;QAJlE,YAAO,GAAG,IAAI,GAAG,EAAE,CAAA;QAEnB,kBAAa,GAAG,KAAK,CAAA;IAEgD,CAAC;IAEtE,IAAI,CAAC,CAAS;QAClB,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,EAAE;YAClC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAA;SAC7C;QACD,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;SACnC;aAAM;YACH,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;SACd;IACL,CAAC;IAEO,IAAI,CAAC,IAAY;QACrB,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;YAClC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SAClB;IACL,CAAC;IAEO,KAAK,CAAC,MAAc,EAAE,KAAc;QACxC,KAAK,GAAG,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAA;QAC7C,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,EAAE;YAC7B,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAA;SACvD;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IACxD,CAAC;IAEO,GAAG;QACP,IAAA,gBAAM,EAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,CAAA;QAC3B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;IAClC,CAAC;IAEO,QAAQ,CAAC,MAAc,EAAE,GAAY;QACzC,QAAO,OAAO,GAAG,EAAE;YACf,KAAK,QAAQ,CAAC;YACd,KAAK,QAAQ;gBACT,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;gBAClB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAA;gBACzB,IAAI,CAAC,GAAG,EAAE,CAAA;gBACV,MAAK;YACT,KAAK,SAAS,CAAC;YACf,KAAK,QAAQ,CAAC;YACd,KAAK,QAAQ;gBACT,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,GAAG,EAAE,CAAC,CAAA;gBAC7B,MAAK;YACT,KAAK,QAAQ;gBACT,IAAI,GAAG,YAAY,UAAU,EAAE;oBAC3B,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,IAAA,yBAAK,EAAC,GAAG,CAAC,EAAE,CAAC,CAAA;iBACvC;qBAAM,IAAI,GAAG,YAAY,IAAI,EAAE;oBAC5B,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,GAAG,EAAE,CAAC,CAAA;iBAChC;qBAAM,IAAI,OAAQ,GAAW,EAAE,MAAM,IAAI,UAAU,EAAE;oBAClD,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAG,GAAW,CAAC,MAAM,EAAE,CAAC,CAAA;iBAC/C;qBAAM,IAAI,GAAG,YAAY,GAAG,EAAE;oBAC3B,IAAI,OAAO,GAA+B,EAAE,CAAA;oBAC5C,KAAK,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,EAAE;wBAC9B,OAAO,CAAC,IAAI,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAA;qBACvB;oBACD,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAC,GAAG,EAAE,OAAO,EAAC,CAAC,CAAA;iBACxC;qBAAM,IAAI,GAAG,YAAY,GAAG,EAAE;oBAC3B,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAC,GAAG,EAAE,CAAC,GAAG,GAAG,CAAC,EAAC,CAAC,CAAA;iBACzC;qBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;oBAC3B,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE;wBACjB,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,KAAK,CAAC,CAAA;qBAC5B;yBAAM;wBACH,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;4BACvB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAA;4BACzB,OAAM;yBACT;6BAAM;4BACH,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;yBACxB;wBACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;wBACjB,KAAK,IAAI,IAAI,IAAI,GAAG,EAAE;4BAClB,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;yBAC7B;wBACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;qBAC3B;iBACJ;qBAAM,IAAI,GAAG,IAAI,IAAI,EAAE;oBACpB,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,CAAA;iBAC9B;qBAAM;oBACH,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;wBACvB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAA;wBACzB,OAAM;qBACT;yBAAM;wBACH,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;qBACxB;oBACD,IAAI,KAAU,CAAA;oBACd,IAAI,GAAG,YAAY,KAAK,EAAE;wBACtB,KAAK,GAAG,EAAC,GAAG,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,QAAQ,EAAE,EAAC,CAAA;qBACvD;yBAAM;wBACH,KAAK,GAAG,GAAG,CAAA;qBACd;oBACD,IAAI,GAAG,GAAG,KAAK,CAAA;oBACf,KAAK,IAAI,GAAG,IAAI,KAAK,EAAE;wBACnB,IAAI,CAAC,GAAG,EAAE;4BACN,IAAI,MAAM,IAAI,KAAK,EAAE;gCACjB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;6BACrB;iCAAM;gCACH,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;gCACjB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;6BAClB;yBACJ;wBACD,GAAG,GAAG,IAAI,CAAA;wBACV,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;qBACvC;oBACD,IAAI,GAAG,EAAE;wBACL,IAAI,CAAC,GAAG,EAAE,CAAA;qBACb;oBACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;iBAC3B;gBACD,MAAK;SACZ;IACL,CAAC;IAED,KAAK,CAAC,GAAc;QAChB,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACjF,IAAI,GAAG,CAAC,GAAG,EAAE;YACT,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;SACrB;QACD,IAAI,CAAC,KAAK,GAAG,EAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,EAAC,CAAA,CAAC,MAAM;QAC5D,IAAI,GAAG,CAAC,GAAG,YAAY,KAAK,EAAE;YAC1B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAA;SACjD;QACD,KAAK,IAAI,GAAG,IAAI,GAAG,EAAE;YACjB,QAAO,GAAG,EAAE;gBACR,KAAK,MAAM,CAAC;gBACZ,KAAK,IAAI,CAAC;gBACV,KAAK,OAAO,CAAC;gBACb,KAAK,KAAK;oBACN,MAAK;gBACT;oBACI,IAAI,GAAG,IAAI,KAAK,IAAI,GAAG,CAAC,GAAG,YAAY,KAAK,EAAE;wBAC1C,wCAAwC;wBACxC,+BAA+B;wBAC/B,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAC,GAAG,GAAG,CAAC,GAAG,EAAC,CAAC,CAAA;qBACtC;yBAAM;wBACH,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,GAAG,EAAG,GAAW,CAAC,GAAG,CAAC,CAAC,CAAA;qBAC9C;aACR;SACJ;QACD,IAAI,CAAC,GAAG,EAAE,CAAA;QACV,IAAI,IAAI,CAAC,aAAa,EAAE;YACpB,IAAI,CAAC,KAAK,EAAE,CAAA;YACZ,IAAI,CAAC,KAAK,CAAC;gBACP,EAAE,EAAE,KAAK;gBACT,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;gBAChB,KAAK,EAAE,gBAAQ,CAAC,KAAK;gBACrB,GAAG,EAAE,6CAA6C;oBAC9C,+DAA+D;aACtE,CAAC,CAAA;SACL;IACL,CAAC;IAED,KAAK;QACD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAA;QACvB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAA;QACtB,IAAI,CAAC,aAAa,GAAG,KAAK,CAAA;IAC9B,CAAC;CACJ;AApKD,0BAoKC;AAGD,SAAS,UAAU,CAAC,GAAc,EAAE,SAAmB;IACnD,IAAI,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAC/B,IAAI,KAAK,GAAG,gBAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;IAC9C,IAAI,EAAE,GAAG,GAAG,CAAC,EAAE,CAAA;IACf,IAAI,SAAS,EAAE;QACX,KAAK,GAAG,mBAAmB,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,WAAW,CAAA;QACvE,EAAE,GAAG,sBAAsB,EAAE,WAAW,CAAA;KAC3C;IACD,IAAI,IAAI,GAAG,IAAI,GAAG,GAAG,GAAG,KAAK,CAAA;IAC7B,IAAI,GAAG,CAAC,EAAE,EAAE;QACR,IAAI,IAAI,GAAG,GAAG,EAAE,CAAA;KACnB;IACD,OAAO,IAAI,CAAA;AACf,CAAC;AAGD,SAAS,aAAa,CAAC,KAAe;IAClC,QAAO,KAAK,EAAE;QACV,KAAK,gBAAQ,CAAC,KAAK;YACf,OAAO,EAAE,CAAA;QACb,KAAK,gBAAQ,CAAC,KAAK;YACf,OAAO,EAAE,CAAA;QACb,KAAK,gBAAQ,CAAC,IAAI;YACd,OAAO,EAAE,CAAA;QACb,KAAK,gBAAQ,CAAC,IAAI;YACd,OAAO,EAAE,CAAA;QACb,KAAK,gBAAQ,CAAC,KAAK,CAAC;QACpB,KAAK,gBAAQ,CAAC,KAAK;YACf,OAAO,EAAE,CAAA;QACb;YACI,OAAO,CAAC,CAAA;KACf;AACL,CAAC;AAGD,SAAS,UAAU,CAAC,IAAY;IAC5B,IAAI,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAA;IACzB,IAAI,IAAI,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;IACtD,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;IAC3D,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;IAC3D,OAAO,GAAG,IAAI,IAAI,OAAO,IAAI,OAAO,EAAE,CAAA;AAC1C,CAAC;AAGD,MAAM,MAAM;IAIR,YACY,KAAa,EACrB,KAAa,EACJ,IAAa;QAFd,UAAK,GAAL,KAAK,CAAQ;QAEZ,SAAI,GAAJ,IAAI,CAAS;QANlB,WAAM,GAAG,EAAE,CAAA;QAQf,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,CAAA;IACtD,CAAC;IAED,OAAO,CAAC,CAAS;QACb,IAAI,IAAI,CAAC,KAAK,EAAE;YACZ,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,CAAA;YACpB,IAAI,IAAI,CAAC,IAAI,EAAE;gBACX,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;aAC/B;YACD,IAAI,CAAC,KAAK,GAAG,EAAE,CAAA;YACf,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;SACjC;aAAM,IAAI,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;YACxD,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,CAAA;SACzB;aAAM;YACH,OAAO,CAAC,CAAA;SACX;IACL,CAAC;CACJ;AAGD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE;IAC/B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,CAAA;AACrC,CAAC,EAAE,CAAC,CAAC,uBAAW,CAAC,CAAA;AAGjB,SAAgB,gBAAgB,CAAC,GAAc;IAC3C,IAAI;QACA,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;KACrB;IAAC,OAAM,CAAM,EAAE;QACZ,OAAO,CAAC,KAAK,EAAE,CAAA;QACf,OAAO,CAAC,KAAK,CAAC;YACV,EAAE,EAAE,KAAK;YACT,KAAK,EAAE,gBAAQ,CAAC,KAAK;YACrB,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;YAChB,GAAG,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,QAAQ,EAAE;SAC/B,CAAC,CAAA;KACL;YAAS;QACN,OAAO,CAAC,KAAK,EAAE,CAAA;KAClB;AACL,CAAC;AAdD,4CAcC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@subsquid/logger",
|
|
3
|
-
"version": "0.0
|
|
3
|
+
"version": "0.2.0",
|
|
4
4
|
"description": "Lightweight library for structured logging",
|
|
5
5
|
"license": "GPL-3.0-or-later",
|
|
6
6
|
"repository": "git@github.com:subsquid/squid.git",
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"main": "lib/index.js",
|
|
15
15
|
"dependencies": {
|
|
16
16
|
"@subsquid/util-internal-hex": "^0.0.1",
|
|
17
|
-
"@subsquid/util-internal-json": "^0.
|
|
17
|
+
"@subsquid/util-internal-json": "^0.2.0",
|
|
18
18
|
"supports-color": "^8.1.1"
|
|
19
19
|
},
|
|
20
20
|
"devDependencies": {
|
package/src/demo.ts
CHANGED
package/src/logger.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {toJSON} from '@subsquid/util-internal-json'
|
|
2
|
+
import {LEVELS, LogLevel} from './level'
|
|
2
3
|
|
|
3
4
|
|
|
4
5
|
export interface LogRecord {
|
|
@@ -55,6 +56,8 @@ export class Logger {
|
|
|
55
56
|
}
|
|
56
57
|
if (attributes instanceof Error) {
|
|
57
58
|
attributes = {err: attributes}
|
|
59
|
+
} else if (attributes instanceof Map || attributes instanceof Set) {
|
|
60
|
+
attributes = toJSON(attributes)
|
|
58
61
|
}
|
|
59
62
|
let rec: any = {
|
|
60
63
|
level,
|
package/src/sinks/json.ts
CHANGED
|
@@ -10,7 +10,12 @@ export function jsonLinesStderrSink(rec: LogRecord): void {
|
|
|
10
10
|
|
|
11
11
|
function stringify(rec: LogRecord): string {
|
|
12
12
|
try {
|
|
13
|
-
|
|
13
|
+
let json = toJSON(rec)
|
|
14
|
+
let label = LABELS?.[json.level]
|
|
15
|
+
if (label) {
|
|
16
|
+
json.level = label
|
|
17
|
+
}
|
|
18
|
+
return JSON.stringify(json)
|
|
14
19
|
} catch(e: any) {
|
|
15
20
|
return stringify({
|
|
16
21
|
ns: 'sys',
|
|
@@ -21,3 +26,12 @@ function stringify(rec: LogRecord): string {
|
|
|
21
26
|
})
|
|
22
27
|
}
|
|
23
28
|
}
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
const LABELS: Record<number, string> | undefined = (() => {
|
|
32
|
+
let json = process.env.SQD_LOG_LABELS
|
|
33
|
+
if (!json) return undefined
|
|
34
|
+
try {
|
|
35
|
+
return JSON.parse(json)
|
|
36
|
+
} catch(e: any) {}
|
|
37
|
+
})()
|
package/src/sinks/pretty.ts
CHANGED
|
@@ -63,6 +63,14 @@ export class Printer {
|
|
|
63
63
|
this.line(`${prefix} ${val}`)
|
|
64
64
|
} else if (typeof (val as any)?.toJSON == 'function') {
|
|
65
65
|
this.property(prefix, (val as any).toJSON())
|
|
66
|
+
} else if (val instanceof Map) {
|
|
67
|
+
let entries: {k: unknown, v: unknown}[] = []
|
|
68
|
+
for (let [k, v] of val.entries()) {
|
|
69
|
+
entries.push({k, v})
|
|
70
|
+
}
|
|
71
|
+
this.property(prefix, {map: entries})
|
|
72
|
+
} else if (val instanceof Set) {
|
|
73
|
+
this.property(prefix, {set: [...val]})
|
|
66
74
|
} else if (Array.isArray(val)) {
|
|
67
75
|
if (val.length == 0) {
|
|
68
76
|
this.line(`${prefix} []`)
|
|
@@ -88,8 +96,14 @@ export class Printer {
|
|
|
88
96
|
} else {
|
|
89
97
|
this.visited.add(val)
|
|
90
98
|
}
|
|
99
|
+
let props: any
|
|
100
|
+
if (val instanceof Error) {
|
|
101
|
+
props = {...val, stack: val.stack || val.toString()}
|
|
102
|
+
} else {
|
|
103
|
+
props = val
|
|
104
|
+
}
|
|
91
105
|
let has = false
|
|
92
|
-
for (let key in
|
|
106
|
+
for (let key in props) {
|
|
93
107
|
if (!has) {
|
|
94
108
|
if (prefix == ' -') {
|
|
95
109
|
this.begin(prefix)
|
|
@@ -99,7 +113,7 @@ export class Printer {
|
|
|
99
113
|
}
|
|
100
114
|
}
|
|
101
115
|
has = true
|
|
102
|
-
this.property(key + ':',
|
|
116
|
+
this.property(key + ':', props[key])
|
|
103
117
|
}
|
|
104
118
|
if (has) {
|
|
105
119
|
this.end()
|
|
@@ -127,7 +141,13 @@ export class Printer {
|
|
|
127
141
|
case 'msg':
|
|
128
142
|
break
|
|
129
143
|
default:
|
|
130
|
-
|
|
144
|
+
if (key == 'err' && rec.err instanceof Error) {
|
|
145
|
+
// already printed the stack trace above
|
|
146
|
+
// print only the rest of props
|
|
147
|
+
this.property('err:', {...rec.err})
|
|
148
|
+
} else {
|
|
149
|
+
this.property(key + ':', (rec as any)[key])
|
|
150
|
+
}
|
|
131
151
|
}
|
|
132
152
|
}
|
|
133
153
|
this.end()
|