@aztec/foundation 0.0.1-commit.bf2612ae → 0.0.1-commit.c0b82b2
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/dest/array/sorted_array.d.ts +6 -1
- package/dest/array/sorted_array.d.ts.map +1 -1
- package/dest/array/sorted_array.js +18 -15
- package/dest/collection/array.d.ts +7 -1
- package/dest/collection/array.d.ts.map +1 -1
- package/dest/collection/array.js +24 -0
- package/dest/config/env_var.d.ts +2 -2
- package/dest/config/env_var.d.ts.map +1 -1
- package/dest/config/network_name.d.ts +2 -2
- package/dest/config/network_name.d.ts.map +1 -1
- package/dest/config/network_name.js +2 -0
- package/dest/crypto/poseidon/index.js +13 -13
- package/dest/crypto/random/randomness_singleton.d.ts +4 -3
- package/dest/crypto/random/randomness_singleton.d.ts.map +1 -1
- package/dest/crypto/random/randomness_singleton.js +4 -4
- package/dest/curves/bn254/field.d.ts +2 -1
- package/dest/curves/bn254/field.d.ts.map +1 -1
- package/dest/curves/bn254/field.js +5 -2
- package/dest/jest/setup.js +28 -1
- package/dest/json-rpc/client/safe_json_rpc_client.d.ts +2 -1
- package/dest/json-rpc/client/safe_json_rpc_client.d.ts.map +1 -1
- package/dest/json-rpc/client/safe_json_rpc_client.js +1 -1
- package/dest/json-rpc/server/api_key_auth.d.ts +19 -0
- package/dest/json-rpc/server/api_key_auth.d.ts.map +1 -0
- package/dest/json-rpc/server/api_key_auth.js +57 -0
- package/dest/json-rpc/server/index.d.ts +2 -1
- package/dest/json-rpc/server/index.d.ts.map +1 -1
- package/dest/json-rpc/server/index.js +1 -0
- package/dest/log/bigint-utils.d.ts +5 -0
- package/dest/log/bigint-utils.d.ts.map +1 -0
- package/dest/log/bigint-utils.js +18 -0
- package/dest/log/gcloud-logger-config.d.ts +1 -1
- package/dest/log/gcloud-logger-config.d.ts.map +1 -1
- package/dest/log/gcloud-logger-config.js +3 -0
- package/dest/log/libp2p_logger.d.ts +5 -2
- package/dest/log/libp2p_logger.d.ts.map +1 -1
- package/dest/log/libp2p_logger.js +14 -4
- package/dest/log/log-filters.d.ts +17 -4
- package/dest/log/log-filters.d.ts.map +1 -1
- package/dest/log/log-filters.js +26 -12
- package/dest/log/pino-logger-server.d.ts +9 -0
- package/dest/log/pino-logger-server.d.ts.map +1 -0
- package/dest/log/pino-logger-server.js +18 -0
- package/dest/log/pino-logger.d.ts +37 -8
- package/dest/log/pino-logger.d.ts.map +1 -1
- package/dest/log/pino-logger.js +121 -28
- package/dest/queue/base_memory_queue.d.ts +2 -2
- package/dest/queue/base_memory_queue.d.ts.map +1 -1
- package/dest/queue/semaphore.d.ts +5 -1
- package/dest/queue/semaphore.d.ts.map +1 -1
- package/dest/serialize/buffer_reader.d.ts +8 -1
- package/dest/serialize/buffer_reader.d.ts.map +1 -1
- package/dest/serialize/buffer_reader.js +13 -0
- package/dest/serialize/serialize.d.ts +19 -1
- package/dest/serialize/serialize.d.ts.map +1 -1
- package/dest/serialize/serialize.js +31 -0
- package/dest/sleep/index.d.ts +2 -1
- package/dest/sleep/index.d.ts.map +1 -1
- package/dest/sleep/index.js +10 -1
- package/dest/timer/date.d.ts +25 -1
- package/dest/timer/date.d.ts.map +1 -1
- package/dest/timer/date.js +33 -0
- package/dest/transport/transport_client.js +2 -2
- package/dest/types/index.d.ts +3 -1
- package/dest/types/index.d.ts.map +1 -1
- package/dest/types/index.js +3 -0
- package/package.json +23 -2
- package/src/array/sorted_array.ts +22 -17
- package/src/collection/array.ts +21 -0
- package/src/config/env_var.ts +38 -2
- package/src/config/network_name.ts +4 -1
- package/src/crypto/poseidon/index.ts +13 -13
- package/src/crypto/random/randomness_singleton.ts +9 -5
- package/src/curves/bn254/field.ts +6 -2
- package/src/jest/setup.mjs +31 -1
- package/src/json-rpc/client/safe_json_rpc_client.ts +2 -0
- package/src/json-rpc/server/api_key_auth.ts +63 -0
- package/src/json-rpc/server/index.ts +1 -0
- package/src/log/bigint-utils.ts +22 -0
- package/src/log/gcloud-logger-config.ts +5 -0
- package/src/log/libp2p_logger.ts +12 -5
- package/src/log/log-filters.ts +29 -11
- package/src/log/pino-logger-server.ts +25 -0
- package/src/log/pino-logger.ts +142 -38
- package/src/queue/base_memory_queue.ts +1 -1
- package/src/queue/semaphore.ts +5 -0
- package/src/serialize/buffer_reader.ts +15 -0
- package/src/serialize/serialize.ts +32 -0
- package/src/sleep/index.ts +10 -1
- package/src/timer/date.ts +48 -0
- package/src/transport/transport_client.ts +2 -2
- package/src/types/index.ts +5 -0
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { timingSafeEqual } from 'crypto';
|
|
2
|
+
import { sha256 } from '../../crypto/sha256/index.js';
|
|
3
|
+
import { createLogger } from '../../log/index.js';
|
|
4
|
+
const log = createLogger('json-rpc:api-key-auth');
|
|
5
|
+
/**
|
|
6
|
+
* Computes the SHA-256 hash of a string and returns it as a Buffer.
|
|
7
|
+
* @param input - The input string to hash.
|
|
8
|
+
* @returns The SHA-256 hash as a Buffer.
|
|
9
|
+
*/ export function sha256Hash(input) {
|
|
10
|
+
return sha256(Buffer.from(input));
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* Creates a Koa middleware that enforces API key authentication on all requests
|
|
14
|
+
* except the health check endpoint (GET /status).
|
|
15
|
+
*
|
|
16
|
+
* The API key can be provided via the `x-api-key` header or the `Authorization: Bearer <key>` header.
|
|
17
|
+
* Comparison is done by hashing the provided key with SHA-256 and comparing against the stored hash.
|
|
18
|
+
*
|
|
19
|
+
* @param apiKeyHash - The SHA-256 hash of the expected API key as a Buffer.
|
|
20
|
+
* @returns A Koa middleware that rejects requests without a valid API key.
|
|
21
|
+
*/ export function getApiKeyAuthMiddleware(apiKeyHash) {
|
|
22
|
+
return async (ctx, next)=>{
|
|
23
|
+
// Allow health check through without auth
|
|
24
|
+
if (ctx.path === '/status' && ctx.method === 'GET') {
|
|
25
|
+
return next();
|
|
26
|
+
}
|
|
27
|
+
const providedKey = ctx.get('x-api-key') || ctx.get('authorization')?.replace(/^Bearer\s+/i, '');
|
|
28
|
+
if (!providedKey) {
|
|
29
|
+
log.warn(`Rejected admin RPC request from ${ctx.ip}: missing API key`);
|
|
30
|
+
ctx.status = 401;
|
|
31
|
+
ctx.body = {
|
|
32
|
+
jsonrpc: '2.0',
|
|
33
|
+
id: null,
|
|
34
|
+
error: {
|
|
35
|
+
code: -32000,
|
|
36
|
+
message: 'Unauthorized: invalid or missing API key'
|
|
37
|
+
}
|
|
38
|
+
};
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
const providedHashBuf = sha256Hash(providedKey);
|
|
42
|
+
if (!timingSafeEqual(apiKeyHash, providedHashBuf)) {
|
|
43
|
+
log.warn(`Rejected admin RPC request from ${ctx.ip}: invalid API key`);
|
|
44
|
+
ctx.status = 401;
|
|
45
|
+
ctx.body = {
|
|
46
|
+
jsonrpc: '2.0',
|
|
47
|
+
id: null,
|
|
48
|
+
error: {
|
|
49
|
+
code: -32000,
|
|
50
|
+
message: 'Unauthorized: invalid or missing API key'
|
|
51
|
+
}
|
|
52
|
+
};
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
await next();
|
|
56
|
+
};
|
|
57
|
+
}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
|
+
export * from './api_key_auth.js';
|
|
1
2
|
export * from './safe_json_rpc_server.js';
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9qc29uLXJwYy9zZXJ2ZXIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLDJCQUEyQixDQUFDIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/json-rpc/server/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/json-rpc/server/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Converts bigint values to strings recursively in a log object to avoid serialization issues.
|
|
3
|
+
*/
|
|
4
|
+
export declare function convertBigintsToStrings(obj: unknown): unknown;
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmlnaW50LXV0aWxzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbG9nL2JpZ2ludC11dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILHdCQUFnQix1QkFBdUIsQ0FBQyxHQUFHLEVBQUUsT0FBTyxHQUFHLE9BQU8sQ0FrQjdEIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bigint-utils.d.ts","sourceRoot":"","sources":["../../src/log/bigint-utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAkB7D"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Converts bigint values to strings recursively in a log object to avoid serialization issues.
|
|
3
|
+
*/ export function convertBigintsToStrings(obj) {
|
|
4
|
+
if (typeof obj === 'bigint') {
|
|
5
|
+
return String(obj);
|
|
6
|
+
}
|
|
7
|
+
if (Array.isArray(obj)) {
|
|
8
|
+
return obj.map((item)=>convertBigintsToStrings(item));
|
|
9
|
+
}
|
|
10
|
+
if (obj !== null && typeof obj === 'object') {
|
|
11
|
+
const result = {};
|
|
12
|
+
for(const key in obj){
|
|
13
|
+
result[key] = convertBigintsToStrings(obj[key]);
|
|
14
|
+
}
|
|
15
|
+
return result;
|
|
16
|
+
}
|
|
17
|
+
return obj;
|
|
18
|
+
}
|
|
@@ -10,4 +10,4 @@ export declare const GoogleCloudLoggerConfig: {
|
|
|
10
10
|
level(label: string, level: number): object;
|
|
11
11
|
};
|
|
12
12
|
};
|
|
13
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2Nsb3VkLWxvZ2dlci1jb25maWcuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2cvZ2Nsb3VkLWxvZ2dlci1jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBVUE7Ozs7R0FJRztBQUNILGVBQU8sTUFBTSx1QkFBdUI7Ozs7OztDQXFETixDQUFDIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gcloud-logger-config.d.ts","sourceRoot":"","sources":["../../src/log/gcloud-logger-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gcloud-logger-config.d.ts","sourceRoot":"","sources":["../../src/log/gcloud-logger-config.ts"],"names":[],"mappings":"AAUA;;;;GAIG;AACH,eAAO,MAAM,uBAAuB;;;;;;CAqDN,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { convertBigintsToStrings } from './bigint-utils.js';
|
|
1
2
|
/* eslint-disable camelcase */ const GOOGLE_CLOUD_TRACE_ID = 'logging.googleapis.com/trace';
|
|
2
3
|
const GOOGLE_CLOUD_SPAN_ID = 'logging.googleapis.com/spanId';
|
|
3
4
|
const GOOGLE_CLOUD_TRACE_SAMPLED = 'logging.googleapis.com/trace_sampled';
|
|
@@ -9,6 +10,8 @@ const GOOGLE_CLOUD_TRACE_SAMPLED = 'logging.googleapis.com/trace_sampled';
|
|
|
9
10
|
messageKey: 'message',
|
|
10
11
|
formatters: {
|
|
11
12
|
log (object) {
|
|
13
|
+
// Convert bigints to strings recursively to avoid serialization issues
|
|
14
|
+
object = convertBigintsToStrings(object);
|
|
12
15
|
// Add trace context attributes following Cloud Logging structured log format described
|
|
13
16
|
// in https://cloud.google.com/logging/docs/structured-logging#special-payload-fields
|
|
14
17
|
const { trace_id, span_id, trace_flags, ...rest } = object;
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import type { ComponentLogger } from '@libp2p/interface';
|
|
2
|
+
import { type LoggerBindings } from './pino-logger.js';
|
|
2
3
|
/**
|
|
3
4
|
* Creates a libp2p compatible logger that wraps our pino logger.
|
|
4
5
|
* This adapter implements the ComponentLogger interface required by libp2p.
|
|
6
|
+
* @param namespace - Base namespace for the logger
|
|
7
|
+
* @param bindings - Optional bindings to pass to the logger (actor, instanceId)
|
|
5
8
|
*/
|
|
6
|
-
export declare function createLibp2pComponentLogger(namespace: string): ComponentLogger;
|
|
7
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
export declare function createLibp2pComponentLogger(namespace: string, bindings?: LoggerBindings): ComponentLogger;
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlicDJwX2xvZ2dlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZy9saWJwMnBfbG9nZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBVSxNQUFNLG1CQUFtQixDQUFDO0FBSWpFLE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBc0IsTUFBTSxrQkFBa0IsQ0FBQztBQUUzRTs7Ozs7R0FLRztBQUNILHdCQUFnQiwyQkFBMkIsQ0FBQyxTQUFTLEVBQUUsTUFBTSxFQUFFLFFBQVEsQ0FBQyxFQUFFLGNBQWMsR0FBRyxlQUFlLENBSXpHIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"libp2p_logger.d.ts","sourceRoot":"","sources":["../../src/log/libp2p_logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAU,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"libp2p_logger.d.ts","sourceRoot":"","sources":["../../src/log/libp2p_logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAU,MAAM,mBAAmB,CAAC;AAIjE,OAAO,EAAE,KAAK,cAAc,EAAsB,MAAM,kBAAkB,CAAC;AAE3E;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,eAAe,CAIzG"}
|
|
@@ -3,9 +3,11 @@ import { logFilters, logger } from './pino-logger.js';
|
|
|
3
3
|
/**
|
|
4
4
|
* Creates a libp2p compatible logger that wraps our pino logger.
|
|
5
5
|
* This adapter implements the ComponentLogger interface required by libp2p.
|
|
6
|
-
|
|
6
|
+
* @param namespace - Base namespace for the logger
|
|
7
|
+
* @param bindings - Optional bindings to pass to the logger (actor, instanceId)
|
|
8
|
+
*/ export function createLibp2pComponentLogger(namespace, bindings) {
|
|
7
9
|
return {
|
|
8
|
-
forComponent: (component)=>createLibp2pLogger(`${namespace}:${component}
|
|
10
|
+
forComponent: (component)=>createLibp2pLogger(`${namespace}:${component}`, bindings)
|
|
9
11
|
};
|
|
10
12
|
}
|
|
11
13
|
// Lipp2p libraries use arbitrary string substitutions, so we need to replace them with %s, this is slow so avoid doing it unless trace debugging
|
|
@@ -16,10 +18,18 @@ function replaceFormatting(message) {
|
|
|
16
18
|
}
|
|
17
19
|
return message.replace(/(%p|%a)/g, '%s');
|
|
18
20
|
}
|
|
19
|
-
function createLibp2pLogger(component) {
|
|
21
|
+
function createLibp2pLogger(component, bindings) {
|
|
20
22
|
// Create a direct pino logger instance for libp2p that supports string interpolation
|
|
23
|
+
const actor = bindings?.actor;
|
|
24
|
+
const instanceId = bindings?.instanceId;
|
|
21
25
|
const log = logger.child({
|
|
22
|
-
module: component
|
|
26
|
+
module: component,
|
|
27
|
+
...actor && {
|
|
28
|
+
actor
|
|
29
|
+
},
|
|
30
|
+
...instanceId && {
|
|
31
|
+
instanceId
|
|
32
|
+
}
|
|
23
33
|
}, {
|
|
24
34
|
level: getLogLevelFromFilters(logFilters, component)
|
|
25
35
|
});
|
|
@@ -1,7 +1,20 @@
|
|
|
1
1
|
import { type LogLevel } from './log-levels.js';
|
|
2
2
|
export type LogFilters = [string, LogLevel][];
|
|
3
3
|
export declare function getLogLevelFromFilters(filters: LogFilters, module: string): LogLevel | undefined;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
4
|
+
/**
|
|
5
|
+
* Parses the LOG_LEVEL env string into a default level and per-module filter overrides.
|
|
6
|
+
*
|
|
7
|
+
* Format: `<default_level>;<level>:<module1>,<module2>;<level>:<module3>;...`
|
|
8
|
+
* - First segment (before the first `;`) is the default log level for all modules.
|
|
9
|
+
* - Remaining segments are `level:module` pairs: apply the given level to the listed modules (comma-separated).
|
|
10
|
+
* - Later filters override earlier ones for overlapping module matches.
|
|
11
|
+
* - The `aztec:` prefix is stripped from module names; spaces are trimmed.
|
|
12
|
+
*
|
|
13
|
+
* @example
|
|
14
|
+
* ```ts
|
|
15
|
+
* parseLogLevel('debug;warn:module1,module2;error:module3', 'info')
|
|
16
|
+
* // => ['debug', [['module3', 'error'], ['module2', 'warn'], ['module1', 'warn']]]
|
|
17
|
+
* ```
|
|
18
|
+
*/
|
|
19
|
+
export declare function parseLogLevelEnvVar(logLevelEnvVar: string | undefined, defaultLevel: LogLevel): [LogLevel, LogFilters];
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nLWZpbHRlcnMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2cvbG9nLWZpbHRlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssUUFBUSxFQUFhLE1BQU0saUJBQWlCLENBQUM7QUFFM0QsTUFBTSxNQUFNLFVBQVUsR0FBRyxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsRUFBRSxDQUFDO0FBRTlDLHdCQUFnQixzQkFBc0IsQ0FBQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxNQUFNLEdBQUcsUUFBUSxHQUFHLFNBQVMsQ0FlaEc7QUFFRDs7Ozs7Ozs7Ozs7Ozs7R0FjRztBQUNILHdCQUFnQixtQkFBbUIsQ0FDakMsY0FBYyxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQ2xDLFlBQVksRUFBRSxRQUFRLEdBQ3JCLENBQUMsUUFBUSxFQUFFLFVBQVUsQ0FBQyxDQU94QiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log-filters.d.ts","sourceRoot":"","sources":["../../src/log/log-filters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,iBAAiB,CAAC;AAE3D,MAAM,MAAM,UAAU,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC;AAE9C,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAehG;AAED
|
|
1
|
+
{"version":3,"file":"log-filters.d.ts","sourceRoot":"","sources":["../../src/log/log-filters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,iBAAiB,CAAC;AAE3D,MAAM,MAAM,UAAU,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC;AAE9C,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAehG;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,mBAAmB,CACjC,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,YAAY,EAAE,QAAQ,GACrB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAOxB"}
|
package/dest/log/log-filters.js
CHANGED
|
@@ -15,26 +15,40 @@ export function getLogLevelFromFilters(filters, module) {
|
|
|
15
15
|
}
|
|
16
16
|
return undefined;
|
|
17
17
|
}
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
18
|
+
/**
|
|
19
|
+
* Parses the LOG_LEVEL env string into a default level and per-module filter overrides.
|
|
20
|
+
*
|
|
21
|
+
* Format: `<default_level>;<level>:<module1>,<module2>;<level>:<module3>;...`
|
|
22
|
+
* - First segment (before the first `;`) is the default log level for all modules.
|
|
23
|
+
* - Remaining segments are `level:module` pairs: apply the given level to the listed modules (comma-separated).
|
|
24
|
+
* - Later filters override earlier ones for overlapping module matches.
|
|
25
|
+
* - The `aztec:` prefix is stripped from module names; spaces are trimmed.
|
|
26
|
+
*
|
|
27
|
+
* @example
|
|
28
|
+
* ```ts
|
|
29
|
+
* parseLogLevel('debug;warn:module1,module2;error:module3', 'info')
|
|
30
|
+
* // => ['debug', [['module3', 'error'], ['module2', 'warn'], ['module1', 'warn']]]
|
|
31
|
+
* ```
|
|
32
|
+
*/ export function parseLogLevelEnvVar(logLevelEnvVar, defaultLevel) {
|
|
33
|
+
if (!logLevelEnvVar) {
|
|
25
34
|
return [
|
|
26
35
|
defaultLevel,
|
|
27
36
|
[]
|
|
28
37
|
];
|
|
29
38
|
}
|
|
30
|
-
const [level] =
|
|
31
|
-
|
|
39
|
+
const [level] = logLevelEnvVar.split(';', 1);
|
|
40
|
+
assertValidLogLevel(level);
|
|
32
41
|
return [
|
|
33
42
|
level,
|
|
34
|
-
parseFilters(
|
|
43
|
+
parseFilters(logLevelEnvVar.slice(level.length + 1))
|
|
35
44
|
];
|
|
36
45
|
}
|
|
37
|
-
|
|
46
|
+
function assertValidLogLevel(level) {
|
|
47
|
+
if (!LogLevels.includes(level)) {
|
|
48
|
+
throw new Error(`Invalid log level: ${level}`);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
function parseFilters(definition) {
|
|
38
52
|
if (!definition) {
|
|
39
53
|
return [];
|
|
40
54
|
}
|
|
@@ -47,7 +61,7 @@ export function parseFilters(definition) {
|
|
|
47
61
|
throw new Error(`Invalid log filter statement: ${statement}`);
|
|
48
62
|
}
|
|
49
63
|
const sanitizedLevel = level.trim().toLowerCase();
|
|
50
|
-
|
|
64
|
+
assertValidLogLevel(sanitizedLevel);
|
|
51
65
|
for (const module of modules.split(',')){
|
|
52
66
|
filters.push([
|
|
53
67
|
module.trim().toLowerCase().replace(/^aztec:/, ''),
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { type LoggerBindings } from './pino-logger.js';
|
|
2
|
+
/** Returns the current bindings from AsyncLocalStorage, if any. */
|
|
3
|
+
export declare function getBindings(): LoggerBindings | undefined;
|
|
4
|
+
/**
|
|
5
|
+
* Runs a callback within a bindings context. All loggers created within the callback
|
|
6
|
+
* will automatically inherit the bindings (actor, instanceId) via the log bindings handler.
|
|
7
|
+
*/
|
|
8
|
+
export declare function withLoggerBindings<T>(bindings: LoggerBindings, callback: () => Promise<T>): Promise<T>;
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGluby1sb2dnZXItc2VydmVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbG9nL3Bpbm8tbG9nZ2VyLXNlcnZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQW1ELE1BQU0sa0JBQWtCLENBQUM7QUFLeEcsbUVBQW1FO0FBQ25FLHdCQUFnQixXQUFXLElBQUksY0FBYyxHQUFHLFNBQVMsQ0FFeEQ7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0Isa0JBQWtCLENBQUMsQ0FBQyxFQUFFLFFBQVEsRUFBRSxjQUFjLEVBQUUsUUFBUSxFQUFFLE1BQU0sT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FRNUcifQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pino-logger-server.d.ts","sourceRoot":"","sources":["../../src/log/pino-logger-server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,cAAc,EAAmD,MAAM,kBAAkB,CAAC;AAKxG,mEAAmE;AACnE,wBAAgB,WAAW,IAAI,cAAc,GAAG,SAAS,CAExD;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAQ5G"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { AsyncLocalStorage } from 'node:async_hooks';
|
|
2
|
+
import { addLogBindingsHandler, removeLogBindingsHandler } from './pino-logger.js';
|
|
3
|
+
/** AsyncLocalStorage for logger bindings context propagation (Node.js only). */ const bindingsStorage = new AsyncLocalStorage();
|
|
4
|
+
/** Returns the current bindings from AsyncLocalStorage, if any. */ export function getBindings() {
|
|
5
|
+
return bindingsStorage.getStore();
|
|
6
|
+
}
|
|
7
|
+
/**
|
|
8
|
+
* Runs a callback within a bindings context. All loggers created within the callback
|
|
9
|
+
* will automatically inherit the bindings (actor, instanceId) via the log bindings handler.
|
|
10
|
+
*/ export async function withLoggerBindings(bindings, callback) {
|
|
11
|
+
const handler = ()=>bindingsStorage.getStore();
|
|
12
|
+
addLogBindingsHandler(handler);
|
|
13
|
+
try {
|
|
14
|
+
return await bindingsStorage.run(bindings, callback);
|
|
15
|
+
} finally{
|
|
16
|
+
removeLogBindingsHandler(handler);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
@@ -1,14 +1,25 @@
|
|
|
1
|
+
import { type Color } from 'colorette';
|
|
1
2
|
import type { Writable } from 'stream';
|
|
2
3
|
import type { LogLevel } from './log-levels.js';
|
|
3
4
|
import type { LogData, LogFn } from './log_fn.js';
|
|
4
|
-
|
|
5
|
+
/** Optional bindings to pass to createLogger for additional context. */
|
|
6
|
+
export type LoggerBindings = {
|
|
7
|
+
/** Actor label shown in logs (e.g., 'MAIN', 'prover-node'). */
|
|
8
|
+
actor?: string;
|
|
9
|
+
/** Instance identifier for distinguishing multiple instances of the same component. */
|
|
10
|
+
instanceId?: string;
|
|
11
|
+
};
|
|
12
|
+
type LogBindingsHandler = () => LoggerBindings | undefined;
|
|
13
|
+
export declare function addLogBindingsHandler(handler: LogBindingsHandler): void;
|
|
14
|
+
export declare function removeLogBindingsHandler(handler: LogBindingsHandler): void;
|
|
15
|
+
export declare function createLogger(module: string, bindings?: LoggerBindings): Logger;
|
|
16
|
+
/**
|
|
17
|
+
* Returns a logger for the given module. If loggerOrBindings is already a Logger, returns it directly.
|
|
18
|
+
* Otherwise, creates a new logger with the given module name and bindings.
|
|
19
|
+
*/
|
|
20
|
+
export declare function resolveLogger(module: string, loggerOrBindings?: Logger | LoggerBindings): Logger;
|
|
5
21
|
type LogDataHandler = (data: LogData) => LogData;
|
|
6
22
|
export declare function addLogDataHandler(handler: LogDataHandler): void;
|
|
7
|
-
type LogNameHandler = (module: string) => string;
|
|
8
|
-
export declare function addLogNameHandler(handler: LogNameHandler): void;
|
|
9
|
-
export declare function removeLogNameHandler(handler: LogNameHandler): void;
|
|
10
|
-
/** Creates all loggers within the given callback with the suffix appended to the module name. */
|
|
11
|
-
export declare function withLogNameSuffix<T>(suffix: string, callback: () => Promise<T>): Promise<T>;
|
|
12
23
|
export declare const logLevel: "debug" | "error" | "fatal" | "info" | "silent" | "trace" | "verbose" | "warn", logFilters: import("./log-filters.js").LogFilters;
|
|
13
24
|
export declare const levels: {
|
|
14
25
|
labels: any;
|
|
@@ -16,16 +27,32 @@ export declare const levels: {
|
|
|
16
27
|
verbose: number;
|
|
17
28
|
};
|
|
18
29
|
};
|
|
30
|
+
/** Returns the color function assigned to a given actor, assigning a new one if needed. */
|
|
31
|
+
export declare function getActorColor(actor: string): Color;
|
|
32
|
+
/** Resets the actor-to-color mapping. Useful for testing. */
|
|
33
|
+
export declare function resetActorColors(): void;
|
|
34
|
+
type LogObject = {
|
|
35
|
+
actor?: string;
|
|
36
|
+
module?: string;
|
|
37
|
+
instanceId?: string;
|
|
38
|
+
msg?: string;
|
|
39
|
+
};
|
|
40
|
+
/** Formats a log message with per-actor coloring. Actor, module, and instanceId share the same color. */
|
|
41
|
+
export declare function formatLogMessage(log: LogObject, messageKey: string): string;
|
|
42
|
+
/**
|
|
43
|
+
* Pino-pretty options for direct use (e.g., jest/setup.mjs).
|
|
44
|
+
* Includes function-based messageFormat for per-actor coloring when enabled.
|
|
45
|
+
*/
|
|
19
46
|
export declare const pinoPrettyOpts: {
|
|
20
47
|
destination: number;
|
|
21
48
|
sync: boolean;
|
|
22
49
|
colorize: boolean;
|
|
23
50
|
ignore: string;
|
|
24
|
-
messageFormat: string;
|
|
25
51
|
customLevels: string;
|
|
26
52
|
customColors: string;
|
|
27
53
|
minimumLevel: "trace";
|
|
28
54
|
singleLine: boolean;
|
|
55
|
+
messageFormat: string | typeof formatLogMessage;
|
|
29
56
|
};
|
|
30
57
|
export declare const logger: import("pino").Logger<"verbose", boolean>;
|
|
31
58
|
/**
|
|
@@ -52,6 +79,8 @@ export type Logger = {
|
|
|
52
79
|
isLevelEnabled: (level: LogLevel) => boolean;
|
|
53
80
|
module: string;
|
|
54
81
|
createChild: (childModule: string) => Logger;
|
|
82
|
+
/** Returns the bindings (actor, instanceId) for this logger. */
|
|
83
|
+
getBindings: () => LoggerBindings;
|
|
55
84
|
};
|
|
56
85
|
export {};
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
86
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGluby1sb2dnZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2cvcGluby1sb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssS0FBSyxFQUFrQyxNQUFNLFdBQVcsQ0FBQztBQUd2RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFTdkMsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDaEQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVsRCx3RUFBd0U7QUFDeEUsTUFBTSxNQUFNLGNBQWMsR0FBRztJQUMzQiwrREFBK0Q7SUFDL0QsS0FBSyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2YsdUZBQXVGO0lBQ3ZGLFVBQVUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNyQixDQUFDO0FBSUYsS0FBSyxrQkFBa0IsR0FBRyxNQUFNLGNBQWMsR0FBRyxTQUFTLENBQUM7QUFHM0Qsd0JBQWdCLHFCQUFxQixDQUFDLE9BQU8sRUFBRSxrQkFBa0IsR0FBRyxJQUFJLENBRXZFO0FBRUQsd0JBQWdCLHdCQUF3QixDQUFDLE9BQU8sRUFBRSxrQkFBa0IsUUFLbkU7QUFZRCx3QkFBZ0IsWUFBWSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsUUFBUSxDQUFDLEVBQUUsY0FBYyxHQUFHLE1BQU0sQ0E2QzlFO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQWdCLGFBQWEsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLGdCQUFnQixDQUFDLEVBQUUsTUFBTSxHQUFHLGNBQWMsR0FBRyxNQUFNLENBS2hHO0FBSUQsS0FBSyxjQUFjLEdBQUcsQ0FBQyxJQUFJLEVBQUUsT0FBTyxLQUFLLE9BQU8sQ0FBQztBQUdqRCx3QkFBZ0IsaUJBQWlCLENBQUMsT0FBTyxFQUFFLGNBQWMsR0FBRyxJQUFJLENBRS9EO0FBZUQsZUFBTyxNQUFPLFFBQVEsa0ZBQUUsVUFBVSx1Q0FBK0QsQ0FBQztBQTZDbEcsZUFBTyxNQUFNLE1BQU07Ozs7O0NBR2xCLENBQUM7QUFlRiwyRkFBMkY7QUFDM0Ysd0JBQWdCLGFBQWEsQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLEtBQUssQ0FRbEQ7QUFFRCw2REFBNkQ7QUFDN0Qsd0JBQWdCLGdCQUFnQixJQUFJLElBQUksQ0FHdkM7QUFNRCxLQUFLLFNBQVMsR0FBRztJQUFFLEtBQUssQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUFDLE1BQU0sQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUFDLFVBQVUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUFDLEdBQUcsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtDQUFFLENBQUM7QUFFeEYseUdBQXlHO0FBQ3pHLHdCQUFnQixnQkFBZ0IsQ0FBQyxHQUFHLEVBQUUsU0FBUyxFQUFFLFVBQVUsRUFBRSxNQUFNLEdBQUcsTUFBTSxDQWtCM0U7QUFjRDs7O0dBR0c7QUFDSCxlQUFPLE1BQU0sY0FBYzs7Ozs7Ozs7OztDQUcxQixDQUFDO0FBMERGLGVBQU8sTUFBTSxNQUFNLDJDQUFlLENBQUM7QUFhbkM7OztHQUdHO0FBQ0gsd0JBQWdCLHNCQUFzQixDQUFDLE1BQU0sRUFBRSxRQUFRLEdBQUcsSUFBSSxDQUU3RDtBQUVEOzs7R0FHRztBQUNILHdCQUFnQixxQkFBcUIsQ0FBQyxNQUFNLEVBQUUsUUFBUSxHQUFHLElBQUksQ0FlNUQ7QUFFRCxvREFBb0Q7QUFDcEQsS0FBSyxVQUFVLEdBQUcsQ0FBQyxHQUFHLEVBQUUsTUFBTSxFQUFFLEdBQUcsQ0FBQyxFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUMsRUFBRSxPQUFPLEtBQUssSUFBSSxDQUFDO0FBRXZFOztHQUVHO0FBQ0gsTUFBTSxNQUFNLE1BQU0sR0FBRztLQUFHLENBQUMsSUFBSSxRQUFRLEdBQUcsS0FBSztDQUFFLEdBQUc7SUFBNEIsS0FBSyxFQUFFLFVBQVUsQ0FBQTtDQUFFLEdBQUc7SUFDbEcsS0FBSyxFQUFFLFFBQVEsQ0FBQztJQUNoQixjQUFjLEVBQUUsQ0FBQyxLQUFLLEVBQUUsUUFBUSxLQUFLLE9BQU8sQ0FBQztJQUM3QyxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsV0FBVyxFQUFFLENBQUMsV0FBVyxFQUFFLE1BQU0sS0FBSyxNQUFNLENBQUM7SUFDN0MsZ0VBQWdFO0lBQ2hFLFdBQVcsRUFBRSxNQUFNLGNBQWMsQ0FBQztDQUNuQyxDQUFDIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pino-logger.d.ts","sourceRoot":"","sources":["../../src/log/pino-logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pino-logger.d.ts","sourceRoot":"","sources":["../../src/log/pino-logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAkC,MAAM,WAAW,CAAC;AAGvE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AASvC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAElD,wEAAwE;AACxE,MAAM,MAAM,cAAc,GAAG;IAC3B,+DAA+D;IAC/D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uFAAuF;IACvF,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAIF,KAAK,kBAAkB,GAAG,MAAM,cAAc,GAAG,SAAS,CAAC;AAG3D,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAEvE;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,kBAAkB,QAKnE;AAYD,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,MAAM,CA6C9E;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,cAAc,GAAG,MAAM,CAKhG;AAID,KAAK,cAAc,GAAG,CAAC,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC;AAGjD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,CAE/D;AAeD,eAAO,MAAO,QAAQ,kFAAE,UAAU,uCAA+D,CAAC;AA6ClG,eAAO,MAAM,MAAM;;;;;CAGlB,CAAC;AAeF,2FAA2F;AAC3F,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,CAQlD;AAED,6DAA6D;AAC7D,wBAAgB,gBAAgB,IAAI,IAAI,CAGvC;AAMD,KAAK,SAAS,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAExF,yGAAyG;AACzG,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAkB3E;AAcD;;;GAGG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;CAG1B,CAAC;AA0DF,eAAO,MAAM,MAAM,2CAAe,CAAC;AAanC;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,QAAQ,GAAG,IAAI,CAE7D;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,QAAQ,GAAG,IAAI,CAe5D;AAED,oDAAoD;AACpD,KAAK,UAAU,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;AAEvE;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG;KAAG,CAAC,IAAI,QAAQ,GAAG,KAAK;CAAE,GAAG;IAA4B,KAAK,EAAE,UAAU,CAAA;CAAE,GAAG;IAClG,KAAK,EAAE,QAAQ,CAAC;IAChB,cAAc,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,OAAO,CAAC;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,MAAM,CAAC;IAC7C,gEAAgE;IAChE,WAAW,EAAE,MAAM,cAAc,CAAC;CACnC,CAAC"}
|
package/dest/log/pino-logger.js
CHANGED
|
@@ -4,12 +4,44 @@ import { pino, symbols } from 'pino';
|
|
|
4
4
|
import { inspect } from 'util';
|
|
5
5
|
import { compactArray } from '../collection/array.js';
|
|
6
6
|
import { parseBooleanEnv } from '../config/parse-env.js';
|
|
7
|
+
import { convertBigintsToStrings } from './bigint-utils.js';
|
|
7
8
|
import { GoogleCloudLoggerConfig } from './gcloud-logger-config.js';
|
|
8
|
-
import { getLogLevelFromFilters,
|
|
9
|
-
|
|
10
|
-
|
|
9
|
+
import { getLogLevelFromFilters, parseLogLevelEnvVar } from './log-filters.js';
|
|
10
|
+
const logBindingsHandlers = [];
|
|
11
|
+
export function addLogBindingsHandler(handler) {
|
|
12
|
+
logBindingsHandlers.push(handler);
|
|
13
|
+
}
|
|
14
|
+
export function removeLogBindingsHandler(handler) {
|
|
15
|
+
const index = logBindingsHandlers.indexOf(handler);
|
|
16
|
+
if (index !== -1) {
|
|
17
|
+
logBindingsHandlers.splice(index, 1);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
function getBindingsFromHandlers() {
|
|
21
|
+
for (const handler of logBindingsHandlers){
|
|
22
|
+
const bindings = handler();
|
|
23
|
+
if (bindings) {
|
|
24
|
+
return bindings;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
return undefined;
|
|
28
|
+
}
|
|
29
|
+
export function createLogger(module, bindings) {
|
|
30
|
+
module = module.replace(/^aztec:/, '');
|
|
31
|
+
const resolvedBindings = {
|
|
32
|
+
...getBindingsFromHandlers(),
|
|
33
|
+
...bindings
|
|
34
|
+
};
|
|
35
|
+
const actor = resolvedBindings?.actor;
|
|
36
|
+
const instanceId = resolvedBindings?.instanceId;
|
|
11
37
|
const pinoLogger = logger.child({
|
|
12
|
-
module
|
|
38
|
+
module,
|
|
39
|
+
...actor && {
|
|
40
|
+
actor
|
|
41
|
+
},
|
|
42
|
+
...instanceId && {
|
|
43
|
+
instanceId
|
|
44
|
+
}
|
|
13
45
|
}, {
|
|
14
46
|
level: getLogLevelFromFilters(logFilters, module)
|
|
15
47
|
});
|
|
@@ -29,9 +61,25 @@ export function createLogger(module) {
|
|
|
29
61
|
/** Level of the logger */ level: pinoLogger.level,
|
|
30
62
|
/** Whether the given level is enabled for this logger. */ isLevelEnabled: (level)=>isLevelEnabled(pinoLogger, level),
|
|
31
63
|
/** Module name for the logger. */ module,
|
|
32
|
-
/** Creates another logger by extending this logger module name. */ createChild: (childModule)=>createLogger(`${module}:${childModule}
|
|
64
|
+
/** Creates another logger by extending this logger module name and preserving bindings. */ createChild: (childModule)=>createLogger(`${module}:${childModule}`, {
|
|
65
|
+
actor,
|
|
66
|
+
instanceId
|
|
67
|
+
}),
|
|
68
|
+
/** Returns the bindings (actor, instanceId) for this logger. */ getBindings: ()=>({
|
|
69
|
+
actor,
|
|
70
|
+
instanceId
|
|
71
|
+
})
|
|
33
72
|
};
|
|
34
73
|
}
|
|
74
|
+
/**
|
|
75
|
+
* Returns a logger for the given module. If loggerOrBindings is already a Logger, returns it directly.
|
|
76
|
+
* Otherwise, creates a new logger with the given module name and bindings.
|
|
77
|
+
*/ export function resolveLogger(module, loggerOrBindings) {
|
|
78
|
+
if (loggerOrBindings && 'info' in loggerOrBindings) {
|
|
79
|
+
return loggerOrBindings;
|
|
80
|
+
}
|
|
81
|
+
return createLogger(module, loggerOrBindings);
|
|
82
|
+
}
|
|
35
83
|
const logDataHandlers = [];
|
|
36
84
|
export function addLogDataHandler(handler) {
|
|
37
85
|
logDataHandlers.push(handler);
|
|
@@ -39,30 +87,13 @@ export function addLogDataHandler(handler) {
|
|
|
39
87
|
function processLogData(data) {
|
|
40
88
|
return logDataHandlers.reduce((accum, handler)=>handler(accum), data);
|
|
41
89
|
}
|
|
42
|
-
const logNameHandlers = [];
|
|
43
|
-
export function addLogNameHandler(handler) {
|
|
44
|
-
logNameHandlers.push(handler);
|
|
45
|
-
}
|
|
46
|
-
export function removeLogNameHandler(handler) {
|
|
47
|
-
const index = logNameHandlers.indexOf(handler);
|
|
48
|
-
if (index !== -1) {
|
|
49
|
-
logNameHandlers.splice(index, 1);
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
/** Creates all loggers within the given callback with the suffix appended to the module name. */ export async function withLogNameSuffix(suffix, callback) {
|
|
53
|
-
const logNameHandler = (module)=>`${module}:${suffix}`;
|
|
54
|
-
addLogNameHandler(logNameHandler);
|
|
55
|
-
const result = await callback();
|
|
56
|
-
removeLogNameHandler(logNameHandler);
|
|
57
|
-
return result;
|
|
58
|
-
}
|
|
59
90
|
// Patch isLevelEnabled missing from pino/browser.
|
|
60
91
|
function isLevelEnabled(logger, level) {
|
|
61
92
|
return typeof logger.isLevelEnabled === 'function' ? logger.isLevelEnabled(level) : logger.levels.values[level] >= logger.levels.values[logger.level];
|
|
62
93
|
}
|
|
63
94
|
// Load log levels from environment variables.
|
|
64
95
|
const defaultLogLevel = process.env.NODE_ENV === 'test' ? 'silent' : 'info';
|
|
65
|
-
export const [logLevel, logFilters] =
|
|
96
|
+
export const [logLevel, logFilters] = parseLogLevelEnvVar(process.env.LOG_LEVEL, defaultLogLevel);
|
|
66
97
|
// Define custom logging levels for pino.
|
|
67
98
|
const customLevels = {
|
|
68
99
|
verbose: 25
|
|
@@ -99,6 +130,9 @@ const pinoOpts = {
|
|
|
99
130
|
...redactedPaths.map((p)=>`opts.${p}`)
|
|
100
131
|
]
|
|
101
132
|
},
|
|
133
|
+
formatters: {
|
|
134
|
+
log: (obj)=>convertBigintsToStrings(obj)
|
|
135
|
+
},
|
|
102
136
|
...useGcloudLogging ? GoogleCloudLoggerConfig : {}
|
|
103
137
|
};
|
|
104
138
|
export const levels = {
|
|
@@ -114,23 +148,82 @@ export const levels = {
|
|
|
114
148
|
// Transport options for pretty logging to stderr via pino-pretty.
|
|
115
149
|
const colorEnv = process.env['FORCE_COLOR'];
|
|
116
150
|
const useColor = colorEnv === undefined ? isColorSupported : parseBooleanEnv(colorEnv);
|
|
117
|
-
const { bold, reset } = createColors({
|
|
151
|
+
const { bold, reset, cyan, magenta, yellow, blue, green, magentaBright, yellowBright, blueBright, greenBright } = createColors({
|
|
118
152
|
useColor
|
|
119
153
|
});
|
|
120
|
-
|
|
154
|
+
// Per-actor coloring: each unique actor gets a different color for easier visual distinction.
|
|
155
|
+
// Disabled when LOG_NO_COLOR_PER_ACTOR is set to a truthy value.
|
|
156
|
+
const useColorPerActor = useColor && !parseBooleanEnv(process.env['LOG_NO_COLOR_PER_ACTOR']);
|
|
157
|
+
const actorColors = [
|
|
158
|
+
yellow,
|
|
159
|
+
magenta,
|
|
160
|
+
blue,
|
|
161
|
+
green,
|
|
162
|
+
magentaBright,
|
|
163
|
+
yellowBright,
|
|
164
|
+
blueBright,
|
|
165
|
+
greenBright
|
|
166
|
+
];
|
|
167
|
+
const actorColorMap = new Map();
|
|
168
|
+
let nextColorIndex = 0;
|
|
169
|
+
/** Returns the color function assigned to a given actor, assigning a new one if needed. */ export function getActorColor(actor) {
|
|
170
|
+
let color = actorColorMap.get(actor);
|
|
171
|
+
if (!color) {
|
|
172
|
+
color = actorColors[nextColorIndex % actorColors.length];
|
|
173
|
+
actorColorMap.set(actor, color);
|
|
174
|
+
nextColorIndex++;
|
|
175
|
+
}
|
|
176
|
+
return color;
|
|
177
|
+
}
|
|
178
|
+
/** Resets the actor-to-color mapping. Useful for testing. */ export function resetActorColors() {
|
|
179
|
+
actorColorMap.clear();
|
|
180
|
+
nextColorIndex = 0;
|
|
181
|
+
}
|
|
182
|
+
// String template for messageFormat (used in worker threads and when per-actor coloring is disabled).
|
|
183
|
+
const messageFormatString = `${bold('{module}')}{if actor} ${cyan('{actor}')}{end}{if instanceId} ${reset(cyan('{instanceId}'))}{end} ${reset('{msg}')}`;
|
|
184
|
+
/** Formats a log message with per-actor coloring. Actor, module, and instanceId share the same color. */ export function formatLogMessage(log, messageKey) {
|
|
185
|
+
const actor = log.actor;
|
|
186
|
+
const module = log.module ?? '';
|
|
187
|
+
const instanceId = log.instanceId;
|
|
188
|
+
const msg = log[messageKey] ?? '';
|
|
189
|
+
// Use actor color for actor, module, and instanceId when actor is present
|
|
190
|
+
const color = actor ? getActorColor(actor) : cyan;
|
|
191
|
+
let result = bold(color(module));
|
|
192
|
+
if (actor) {
|
|
193
|
+
result += ' ' + color(actor);
|
|
194
|
+
}
|
|
195
|
+
if (instanceId) {
|
|
196
|
+
result += ' ' + reset(color(instanceId));
|
|
197
|
+
}
|
|
198
|
+
result += ' ' + reset(String(msg));
|
|
199
|
+
return result;
|
|
200
|
+
}
|
|
201
|
+
// Base options for pino-pretty (shared between transport and direct use).
|
|
202
|
+
const pinoPrettyBaseOpts = {
|
|
121
203
|
destination: 2,
|
|
122
204
|
sync: true,
|
|
123
205
|
colorize: useColor,
|
|
124
|
-
ignore: 'module,pid,hostname,trace_id,span_id,trace_flags,severity',
|
|
125
|
-
messageFormat: `${bold('{module}')} ${reset('{msg}')}`,
|
|
206
|
+
ignore: 'module,actor,instanceId,pid,hostname,trace_id,span_id,trace_flags,severity',
|
|
126
207
|
customLevels: 'fatal:60,error:50,warn:40,info:30,verbose:25,debug:20,trace:10',
|
|
127
208
|
customColors: 'fatal:bgRed,error:red,warn:yellow,info:green,verbose:magenta,debug:blue,trace:gray',
|
|
128
209
|
minimumLevel: 'trace',
|
|
129
210
|
singleLine: !parseBooleanEnv(process.env['LOG_MULTILINE'])
|
|
130
211
|
};
|
|
212
|
+
/**
|
|
213
|
+
* Pino-pretty options for direct use (e.g., jest/setup.mjs).
|
|
214
|
+
* Includes function-based messageFormat for per-actor coloring when enabled.
|
|
215
|
+
*/ export const pinoPrettyOpts = {
|
|
216
|
+
...pinoPrettyBaseOpts,
|
|
217
|
+
messageFormat: useColorPerActor ? formatLogMessage : messageFormatString
|
|
218
|
+
};
|
|
219
|
+
// Transport options use string template only (functions can't be serialized to worker threads).
|
|
220
|
+
const prettyTransportOpts = {
|
|
221
|
+
...pinoPrettyBaseOpts,
|
|
222
|
+
messageFormat: messageFormatString
|
|
223
|
+
};
|
|
131
224
|
const prettyTransport = {
|
|
132
225
|
target: 'pino-pretty',
|
|
133
|
-
options:
|
|
226
|
+
options: prettyTransportOpts,
|
|
134
227
|
level: 'trace'
|
|
135
228
|
};
|
|
136
229
|
// Transport for vanilla stdio logging as JSON.
|
|
@@ -60,6 +60,6 @@ export declare abstract class BaseMemoryQueue<T> {
|
|
|
60
60
|
* @param handler - A function that takes an item of type T and returns a Promise<void> after processing the item.
|
|
61
61
|
* @returns A Promise<void> that resolves when the queue is finished processing.
|
|
62
62
|
*/
|
|
63
|
-
process(handler: (item: T) => Promise<void>): Promise<void>;
|
|
63
|
+
process(handler: (item: T) => Promise<void> | void): Promise<void>;
|
|
64
64
|
}
|
|
65
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZV9tZW1vcnlfcXVldWUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9xdWV1ZS9iYXNlX21lbW9yeV9xdWV1ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSw4QkFBc0IsZUFBZSxDQUFDLENBQUM7SUFJekIsT0FBTyxDQUFDLEdBQUc7SUFIdkIsT0FBTyxDQUFDLE9BQU8sQ0FBb0M7SUFDbkQsT0FBTyxDQUFDLFFBQVEsQ0FBUztJQUV6QixZQUFvQixHQUFHLHlDQUF5QyxFQUFJO0lBRXBFLFNBQVMsQ0FBQyxRQUFRLEtBQUssS0FBSyxJQUFJO1FBQzlCLE1BQU0sRUFBRSxNQUFNLENBQUM7UUFDZixHQUFHLElBQUksQ0FBQyxHQUFHLFNBQVMsQ0FBQztRQUNyQixHQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsR0FBRyxJQUFJLENBQUM7UUFDbkIsS0FBSyxFQUFFLE1BQU0sSUFBSSxDQUFDO0tBQ25CLENBQUM7SUFFRjs7Ozs7T0FLRztJQUNJLE1BQU0sV0FFWjtJQUVEOzs7T0FHRztJQUNJLFlBQVksSUFBSSxDQUFDLEdBQUcsU0FBUyxDQUVuQztJQUVEOzs7Ozs7Ozs7O09BVUc7SUFDSSxHQUFHLENBQUMsVUFBVSxDQUFDLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDLENBNkJqRDtJQUVEOzs7O09BSUc7SUFDSSxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsR0FBRyxPQUFPLENBVzNCO0lBRUQ7Ozs7T0FJRztJQUNJLEdBQUcsU0FHVDtJQUVEOzs7O09BSUc7SUFDSSxNQUFNLFNBSVo7SUFFRDs7Ozs7Ozs7T0FRRztJQUNVLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxLQUFLLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxJQUFJLGlCQVk5RDtDQUNGIn0=
|