@aztec-labs/foundation 6.0.0-rc.3 → 6.0.0-rc.4
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/bigint-buffer/index.d.ts +2 -1
- package/dest/bigint-buffer/index.d.ts.map +1 -1
- package/dest/bigint-buffer/index.js +1 -0
- package/dest/buffer/buffer16.d.ts +3 -2
- package/dest/buffer/buffer16.d.ts.map +1 -1
- package/dest/buffer/buffer16.js +2 -1
- package/dest/buffer/buffer32.d.ts +3 -2
- package/dest/buffer/buffer32.d.ts.map +1 -1
- package/dest/buffer/buffer32.js +2 -1
- package/dest/config/env.d.ts +8 -0
- package/dest/config/env.d.ts.map +1 -0
- package/dest/config/env.js +15 -0
- package/dest/config/env_var.d.ts +2 -2
- package/dest/config/env_var.d.ts.map +1 -1
- package/dest/config/index.d.ts +5 -2
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +18 -19
- package/dest/config/network_name.d.ts +1 -1
- package/dest/config/network_name.d.ts.map +1 -1
- package/dest/config/network_name.js +2 -1
- package/dest/config/secret_value.d.ts +2 -2
- package/dest/config/secret_value.d.ts.map +1 -1
- package/dest/config/secret_value.js +1 -1
- package/dest/crypto/bls/bn254_keystore.d.ts +1 -1
- package/dest/crypto/bls/bn254_keystore.d.ts.map +1 -1
- package/dest/crypto/bls/bn254_keystore.js +1 -0
- package/dest/crypto/bls/index.d.ts +1 -1
- package/dest/crypto/bls/index.d.ts.map +1 -1
- package/dest/crypto/bls/index.js +1 -0
- package/dest/crypto/ecdsa/index.d.ts +2 -1
- package/dest/crypto/ecdsa/index.d.ts.map +1 -1
- package/dest/crypto/ecdsa/index.js +1 -0
- package/dest/crypto/ecdsa/signature.d.ts +2 -1
- package/dest/crypto/ecdsa/signature.d.ts.map +1 -1
- package/dest/crypto/ecdsa/signature.js +1 -0
- package/dest/crypto/grumpkin/index.d.ts +2 -1
- package/dest/crypto/grumpkin/index.d.ts.map +1 -1
- package/dest/crypto/grumpkin/index.js +1 -0
- package/dest/crypto/keys/index.d.ts +2 -1
- package/dest/crypto/keys/index.d.ts.map +1 -1
- package/dest/crypto/keys/index.js +1 -0
- package/dest/crypto/pedersen/pedersen.wasm.d.ts +2 -1
- package/dest/crypto/pedersen/pedersen.wasm.d.ts.map +1 -1
- package/dest/crypto/pedersen/pedersen.wasm.js +1 -0
- package/dest/crypto/poseidon/index.d.ts +2 -1
- package/dest/crypto/poseidon/index.d.ts.map +1 -1
- package/dest/crypto/poseidon/index.js +1 -0
- package/dest/crypto/random/index.d.ts +2 -1
- package/dest/crypto/random/index.d.ts.map +1 -1
- package/dest/crypto/random/index.js +1 -0
- package/dest/crypto/random/randomness_singleton.d.ts +2 -1
- package/dest/crypto/random/randomness_singleton.d.ts.map +1 -1
- package/dest/crypto/random/randomness_singleton.js +4 -1
- package/dest/crypto/schnorr/index.d.ts +1 -1
- package/dest/crypto/schnorr/index.d.ts.map +1 -1
- package/dest/crypto/schnorr/index.js +1 -0
- package/dest/crypto/schnorr/signature.d.ts +2 -1
- package/dest/crypto/schnorr/signature.d.ts.map +1 -1
- package/dest/crypto/schnorr/signature.js +1 -0
- package/dest/crypto/secp256k1/index.d.ts +2 -1
- package/dest/crypto/secp256k1/index.d.ts.map +1 -1
- package/dest/crypto/secp256k1/index.js +1 -0
- package/dest/crypto/secp256k1-signer/utils.d.ts +2 -1
- package/dest/crypto/secp256k1-signer/utils.d.ts.map +1 -1
- package/dest/crypto/secp256k1-signer/utils.js +1 -0
- package/dest/crypto/sha256/index.d.ts +2 -1
- package/dest/crypto/sha256/index.d.ts.map +1 -1
- package/dest/crypto/sha256/index.js +2 -1
- package/dest/crypto/sha512/index.d.ts +2 -1
- package/dest/crypto/sha512/index.d.ts.map +1 -1
- package/dest/crypto/sha512/index.js +1 -0
- package/dest/crypto/sync/pedersen/index.d.ts +2 -1
- package/dest/crypto/sync/pedersen/index.d.ts.map +1 -1
- package/dest/crypto/sync/pedersen/index.js +1 -0
- package/dest/crypto/sync/poseidon/index.d.ts +2 -1
- package/dest/crypto/sync/poseidon/index.d.ts.map +1 -1
- package/dest/crypto/sync/poseidon/index.js +1 -0
- package/dest/curves/bls12/field.d.ts +3 -2
- package/dest/curves/bls12/field.d.ts.map +1 -1
- package/dest/curves/bls12/field.js +2 -1
- package/dest/curves/bls12/point.d.ts +3 -2
- package/dest/curves/bls12/point.d.ts.map +1 -1
- package/dest/curves/bls12/point.js +2 -1
- package/dest/curves/bn254/field.d.ts +3 -2
- package/dest/curves/bn254/field.d.ts.map +1 -1
- package/dest/curves/bn254/field.js +4 -2
- package/dest/curves/bn254/point.d.ts +2 -1
- package/dest/curves/bn254/point.d.ts.map +1 -1
- package/dest/curves/bn254/point.js +1 -0
- package/dest/curves/grumpkin/point.d.ts +2 -1
- package/dest/curves/grumpkin/point.d.ts.map +1 -1
- package/dest/curves/grumpkin/point.js +1 -0
- package/dest/eth-address/index.d.ts +3 -2
- package/dest/eth-address/index.d.ts.map +1 -1
- package/dest/eth-address/index.js +2 -1
- package/dest/fifo/fifo_frame_reader.d.ts +2 -1
- package/dest/fifo/fifo_frame_reader.d.ts.map +1 -1
- package/dest/fifo/fifo_frame_reader.js +1 -0
- package/dest/inspect/index.d.ts +11 -0
- package/dest/inspect/index.d.ts.map +1 -0
- package/dest/inspect/index.js +11 -0
- package/dest/inspect/inspect_without_node.d.ts +10 -0
- package/dest/inspect/inspect_without_node.d.ts.map +1 -0
- package/dest/inspect/inspect_without_node.js +39 -0
- package/dest/json-rpc/client/fetch.d.ts +1 -1
- package/dest/json-rpc/client/fetch.d.ts.map +1 -1
- package/dest/json-rpc/client/fetch.js +5 -2
- package/dest/json-rpc/client/safe_json_rpc_client.d.ts +1 -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 +8 -3
- package/dest/json-rpc/client/undici.d.ts +1 -1
- package/dest/json-rpc/client/undici.d.ts.map +1 -1
- package/dest/json-rpc/client/undici.js +1 -0
- package/dest/json-rpc/server/api_key_auth.d.ts +2 -1
- package/dest/json-rpc/server/api_key_auth.d.ts.map +1 -1
- package/dest/json-rpc/server/api_key_auth.js +1 -0
- package/dest/json-rpc/server/safe_json_rpc_server.d.ts +1 -1
- package/dest/json-rpc/server/safe_json_rpc_server.d.ts.map +1 -1
- package/dest/json-rpc/server/safe_json_rpc_server.js +2 -1
- package/dest/log/index.d.ts +2 -1
- package/dest/log/index.d.ts.map +1 -1
- package/dest/log/index.js +1 -0
- package/dest/log/libp2p_logger.d.ts +1 -1
- package/dest/log/libp2p_logger.d.ts.map +1 -1
- package/dest/log/libp2p_logger.js +11 -17
- package/dest/log/log-filters.d.ts +8 -1
- package/dest/log/log-filters.d.ts.map +1 -1
- package/dest/log/log-filters.js +28 -4
- package/dest/log/pino-logger.d.ts +23 -2
- package/dest/log/pino-logger.d.ts.map +1 -1
- package/dest/log/pino-logger.js +78 -26
- package/dest/queue/index.d.ts +2 -1
- package/dest/queue/index.d.ts.map +1 -1
- package/dest/queue/index.js +1 -0
- package/dest/queue/read_write_lock.d.ts +21 -0
- package/dest/queue/read_write_lock.d.ts.map +1 -0
- package/dest/queue/read_write_lock.js +44 -0
- package/dest/queue/semaphore.d.ts +17 -2
- package/dest/queue/semaphore.d.ts.map +1 -1
- package/dest/queue/semaphore.js +22 -2
- package/dest/schemas/schemas.d.ts +2 -1
- package/dest/schemas/schemas.d.ts.map +1 -1
- package/dest/schemas/schemas.js +1 -0
- package/dest/schemas/utils.d.ts +2 -1
- package/dest/schemas/utils.d.ts.map +1 -1
- package/dest/schemas/utils.js +1 -0
- package/dest/serialize/buffer_reader.d.ts +2 -1
- package/dest/serialize/buffer_reader.d.ts.map +1 -1
- package/dest/serialize/buffer_reader.js +1 -0
- package/dest/serialize/buffer_sink.d.ts +2 -1
- package/dest/serialize/buffer_sink.d.ts.map +1 -1
- package/dest/serialize/buffer_sink.js +2 -4
- package/dest/serialize/free_funcs.d.ts +2 -1
- package/dest/serialize/free_funcs.d.ts.map +1 -1
- package/dest/serialize/free_funcs.js +1 -0
- package/dest/serialize/serialize.d.ts +2 -1
- package/dest/serialize/serialize.d.ts.map +1 -1
- package/dest/serialize/serialize.js +1 -0
- package/dest/serialize/type_registry.d.ts +1 -1
- package/dest/serialize/type_registry.d.ts.map +1 -1
- package/dest/serialize/type_registry.js +1 -0
- package/dest/string/index.d.ts +2 -1
- package/dest/string/index.d.ts.map +1 -1
- package/dest/string/index.js +2 -1
- package/dest/testing/files/index.d.ts +1 -1
- package/dest/testing/files/index.d.ts.map +1 -1
- package/dest/testing/files/index.js +2 -1
- package/dest/testing/snapshot_serializer.d.ts +1 -1
- package/dest/testing/snapshot_serializer.d.ts.map +1 -1
- package/dest/testing/snapshot_serializer.js +2 -1
- package/dest/testing/test_data.d.ts +1 -1
- package/dest/testing/test_data.d.ts.map +1 -1
- package/dest/testing/test_data.js +2 -1
- package/dest/trees/hasher.d.ts +2 -1
- package/dest/trees/hasher.d.ts.map +1 -1
- package/dest/trees/hasher.js +1 -0
- package/dest/trees/indexed_merkle_tree.d.ts +2 -1
- package/dest/trees/indexed_merkle_tree.d.ts.map +1 -1
- package/dest/trees/indexed_merkle_tree.js +1 -0
- package/dest/trees/indexed_merkle_tree_calculator.d.ts +2 -1
- package/dest/trees/indexed_merkle_tree_calculator.d.ts.map +1 -1
- package/dest/trees/indexed_merkle_tree_calculator.js +1 -0
- package/dest/trees/merkle_tree.d.ts +2 -1
- package/dest/trees/merkle_tree.d.ts.map +1 -1
- package/dest/trees/merkle_tree.js +1 -0
- package/dest/trees/merkle_tree_calculator.d.ts +2 -1
- package/dest/trees/merkle_tree_calculator.d.ts.map +1 -1
- package/dest/trees/merkle_tree_calculator.js +1 -0
- package/dest/trees/unbalanced_merkle_tree_calculator.d.ts +2 -1
- package/dest/trees/unbalanced_merkle_tree_calculator.d.ts.map +1 -1
- package/dest/trees/unbalanced_merkle_tree_calculator.js +1 -0
- package/dest/trees/unbalanced_merkle_tree_root.d.ts +2 -1
- package/dest/trees/unbalanced_merkle_tree_root.d.ts.map +1 -1
- package/dest/trees/unbalanced_merkle_tree_root.js +1 -0
- package/package.json +8 -5
- package/src/bigint-buffer/index.ts +2 -0
- package/src/buffer/buffer16.ts +2 -1
- package/src/buffer/buffer32.ts +2 -1
- package/src/config/env.ts +16 -0
- package/src/config/env_var.ts +3 -1
- package/src/config/index.ts +25 -18
- package/src/config/network_name.ts +3 -1
- package/src/config/secret_value.ts +2 -1
- package/src/crypto/bls/bn254_keystore.ts +1 -0
- package/src/crypto/bls/index.ts +1 -0
- package/src/crypto/ecdsa/index.ts +2 -0
- package/src/crypto/ecdsa/signature.ts +1 -0
- package/src/crypto/grumpkin/index.ts +1 -0
- package/src/crypto/keys/index.ts +2 -0
- package/src/crypto/pedersen/pedersen.wasm.ts +2 -0
- package/src/crypto/poseidon/index.ts +2 -0
- package/src/crypto/random/index.ts +2 -0
- package/src/crypto/random/randomness_singleton.ts +5 -1
- package/src/crypto/schnorr/index.ts +1 -0
- package/src/crypto/schnorr/signature.ts +1 -0
- package/src/crypto/secp256k1/index.ts +2 -0
- package/src/crypto/secp256k1-signer/utils.ts +1 -0
- package/src/crypto/sha256/index.ts +1 -0
- package/src/crypto/sha512/index.ts +1 -0
- package/src/crypto/sync/pedersen/index.ts +2 -0
- package/src/crypto/sync/poseidon/index.ts +2 -0
- package/src/curves/bls12/field.ts +2 -1
- package/src/curves/bls12/point.ts +2 -1
- package/src/curves/bn254/field.ts +4 -2
- package/src/curves/bn254/point.ts +2 -0
- package/src/curves/grumpkin/point.ts +2 -0
- package/src/eth-address/index.ts +2 -1
- package/src/fifo/fifo_frame_reader.ts +1 -0
- package/src/inspect/index.ts +14 -0
- package/src/inspect/inspect_without_node.ts +45 -0
- package/src/json-rpc/client/fetch.ts +5 -3
- package/src/json-rpc/client/safe_json_rpc_client.ts +8 -4
- package/src/json-rpc/client/undici.ts +1 -0
- package/src/json-rpc/server/api_key_auth.ts +1 -0
- package/src/json-rpc/server/safe_json_rpc_server.ts +2 -1
- package/src/log/index.ts +1 -0
- package/src/log/libp2p_logger.ts +8 -10
- package/src/log/log-filters.ts +27 -7
- package/src/log/pino-logger.ts +81 -22
- package/src/queue/index.ts +1 -0
- package/src/queue/read_write_lock.ts +53 -0
- package/src/queue/semaphore.ts +26 -2
- package/src/schemas/schemas.ts +1 -0
- package/src/schemas/utils.ts +1 -0
- package/src/serialize/buffer_reader.ts +2 -0
- package/src/serialize/buffer_sink.ts +2 -0
- package/src/serialize/free_funcs.ts +2 -0
- package/src/serialize/serialize.ts +2 -0
- package/src/serialize/type_registry.ts +2 -0
- package/src/string/index.ts +2 -0
- package/src/testing/files/index.ts +2 -1
- package/src/testing/snapshot_serializer.ts +3 -1
- package/src/testing/test_data.ts +3 -1
- package/src/trees/hasher.ts +2 -0
- package/src/trees/indexed_merkle_tree.ts +2 -0
- package/src/trees/indexed_merkle_tree_calculator.ts +1 -0
- package/src/trees/merkle_tree.ts +2 -0
- package/src/trees/merkle_tree_calculator.ts +2 -0
- package/src/trees/unbalanced_merkle_tree_calculator.ts +2 -0
- package/src/trees/unbalanced_merkle_tree_root.ts +2 -0
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { logFilters, logger } from './pino-logger.js';
|
|
1
|
+
import { createPinoChild } from './pino-logger.js';
|
|
3
2
|
/**
|
|
4
3
|
* Creates a libp2p compatible logger that wraps our pino logger.
|
|
5
4
|
* This adapter implements the ComponentLogger interface required by libp2p.
|
|
@@ -20,20 +19,9 @@ function replaceFormatting(message) {
|
|
|
20
19
|
}
|
|
21
20
|
function createLibp2pLogger(component, bindings) {
|
|
22
21
|
// Create a direct pino logger instance for libp2p that supports string interpolation
|
|
23
|
-
const
|
|
24
|
-
const instanceId = bindings?.instanceId;
|
|
25
|
-
const log = logger.child({
|
|
26
|
-
module: component,
|
|
27
|
-
...actor && {
|
|
28
|
-
actor
|
|
29
|
-
},
|
|
30
|
-
...instanceId && {
|
|
31
|
-
instanceId
|
|
32
|
-
}
|
|
33
|
-
}, {
|
|
34
|
-
level: getLogLevelFromFilters(logFilters, component)
|
|
35
|
-
});
|
|
22
|
+
const getLog = createPinoChild(component, bindings);
|
|
36
23
|
const logIfEnabled = (level, message, ...args)=>{
|
|
24
|
+
const log = getLog();
|
|
37
25
|
if (!log.isLevelEnabled(level)) {
|
|
38
26
|
return;
|
|
39
27
|
}
|
|
@@ -43,8 +31,8 @@ function createLibp2pLogger(component, bindings) {
|
|
|
43
31
|
const logFn = (message, ...args)=>{
|
|
44
32
|
logIfEnabled('trace', message, ...args);
|
|
45
33
|
};
|
|
46
|
-
|
|
47
|
-
enabled:
|
|
34
|
+
const libp2pLogger = Object.assign(logFn, {
|
|
35
|
+
enabled: getLog().isLevelEnabled('debug'),
|
|
48
36
|
error (message, ...args) {
|
|
49
37
|
// We write error outputs as debug as they are often expected, e.g. connection errors can happen in happy paths
|
|
50
38
|
logIfEnabled('debug', `error: ${message}`, ...args);
|
|
@@ -62,6 +50,12 @@ function createLibp2pLogger(component, bindings) {
|
|
|
62
50
|
logIfEnabled('trace', message, ...args);
|
|
63
51
|
}
|
|
64
52
|
});
|
|
53
|
+
// Redefine as a getter so the flag tracks live level changes made via setLogLevel.
|
|
54
|
+
Object.defineProperty(libp2pLogger, 'enabled', {
|
|
55
|
+
get: ()=>getLog().isLevelEnabled('debug'),
|
|
56
|
+
enumerable: true
|
|
57
|
+
});
|
|
58
|
+
return libp2pLogger;
|
|
65
59
|
}
|
|
66
60
|
function formatArgs(message, args) {
|
|
67
61
|
if (!args) {
|
|
@@ -17,4 +17,11 @@ export declare function getLogLevelFromFilters(filters: LogFilters, module: stri
|
|
|
17
17
|
* ```
|
|
18
18
|
*/
|
|
19
19
|
export declare function parseLogLevelEnvVar(logLevelEnvVar: string | undefined, defaultLevel: LogLevel): [LogLevel, LogFilters];
|
|
20
|
-
|
|
20
|
+
/**
|
|
21
|
+
* Renders a default level and per-module filters into the `LOG_LEVEL` env var format.
|
|
22
|
+
* Inverse of {@link parseLogLevelEnvVar}: parsing the returned string yields the same level and filters.
|
|
23
|
+
*/
|
|
24
|
+
export declare function formatLogLevelSpec(defaultLevel: LogLevel, filters: LogFilters): string;
|
|
25
|
+
/** Returns whether the given string is a valid log level spec in the `LOG_LEVEL` env var format. */
|
|
26
|
+
export declare function isValidLogLevelSpec(spec: string): boolean;
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nLWZpbHRlcnMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2cvbG9nLWZpbHRlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssUUFBUSxFQUFhLE1BQU0saUJBQWlCLENBQUM7QUFFM0QsTUFBTSxNQUFNLFVBQVUsR0FBRyxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsRUFBRSxDQUFDO0FBRTlDLHdCQUFnQixzQkFBc0IsQ0FBQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxNQUFNLEdBQUcsUUFBUSxHQUFHLFNBQVMsQ0FlaEc7QUFFRDs7Ozs7Ozs7Ozs7Ozs7R0FjRztBQUNILHdCQUFnQixtQkFBbUIsQ0FDakMsY0FBYyxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQ2xDLFlBQVksRUFBRSxRQUFRLEdBQ3JCLENBQUMsUUFBUSxFQUFFLFVBQVUsQ0FBQyxDQU94QjtBQUVEOzs7R0FHRztBQUNILHdCQUFnQixrQkFBa0IsQ0FBQyxZQUFZLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxVQUFVLEdBQUcsTUFBTSxDQUd0RjtBQUVELG9HQUFvRztBQUNwRyx3QkFBZ0IsbUJBQW1CLENBQUMsSUFBSSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBT3pEIn0=
|
|
@@ -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;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,mBAAmB,CACjC,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,YAAY,EAAE,QAAQ,GACrB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAOxB"}
|
|
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;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,GAAG,MAAM,CAGtF;AAED,oGAAoG;AACpG,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAOzD"}
|
package/dest/log/log-filters.js
CHANGED
|
@@ -43,6 +43,26 @@ export function getLogLevelFromFilters(filters, module) {
|
|
|
43
43
|
parseFilters(logLevelEnvVar.slice(level.length + 1))
|
|
44
44
|
];
|
|
45
45
|
}
|
|
46
|
+
/**
|
|
47
|
+
* Renders a default level and per-module filters into the `LOG_LEVEL` env var format.
|
|
48
|
+
* Inverse of {@link parseLogLevelEnvVar}: parsing the returned string yields the same level and filters.
|
|
49
|
+
*/ export function formatLogLevelSpec(defaultLevel, filters) {
|
|
50
|
+
const statements = [
|
|
51
|
+
...filters
|
|
52
|
+
].reverse().map(([module, level])=>`${level}:${module}`);
|
|
53
|
+
return [
|
|
54
|
+
defaultLevel,
|
|
55
|
+
...statements
|
|
56
|
+
].join(';');
|
|
57
|
+
}
|
|
58
|
+
/** Returns whether the given string is a valid log level spec in the `LOG_LEVEL` env var format. */ export function isValidLogLevelSpec(spec) {
|
|
59
|
+
try {
|
|
60
|
+
parseLogLevelEnvVar(spec, 'info');
|
|
61
|
+
return true;
|
|
62
|
+
} catch {
|
|
63
|
+
return false;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
46
66
|
function assertValidLogLevel(level) {
|
|
47
67
|
if (!LogLevels.includes(level)) {
|
|
48
68
|
throw new Error(`Invalid log level: ${level}`);
|
|
@@ -63,10 +83,14 @@ function parseFilters(definition) {
|
|
|
63
83
|
const sanitizedLevel = level.trim().toLowerCase();
|
|
64
84
|
assertValidLogLevel(sanitizedLevel);
|
|
65
85
|
for (const module of modules.split(',')){
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
86
|
+
const sanitizedModule = module.trim().toLowerCase().replace(/^aztec:/, '');
|
|
87
|
+
// An empty module would compile to a regex matching every module, and could not be formatted back into a spec.
|
|
88
|
+
if (sanitizedModule) {
|
|
89
|
+
filters.push([
|
|
90
|
+
sanitizedModule,
|
|
91
|
+
sanitizedLevel
|
|
92
|
+
]);
|
|
93
|
+
}
|
|
70
94
|
}
|
|
71
95
|
}
|
|
72
96
|
return filters.reverse();
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { type Color } from 'colorette';
|
|
2
|
+
import { pino } from 'pino';
|
|
2
3
|
import type { Writable } from 'stream';
|
|
4
|
+
import { type LogFilters } from './log-filters.js';
|
|
3
5
|
import type { LogLevel } from './log-levels.js';
|
|
4
6
|
import type { LogData, LogFn } from './log_fn.js';
|
|
5
7
|
/** Optional bindings to pass to createLogger for additional context. */
|
|
@@ -20,7 +22,23 @@ export declare function createLogger(module: string, bindings?: LoggerBindings):
|
|
|
20
22
|
export declare function resolveLogger(module: string, loggerOrBindings?: Logger | LoggerBindings): Logger;
|
|
21
23
|
type LogDataHandler = (data: LogData) => LogData;
|
|
22
24
|
export declare function addLogDataHandler(handler: LogDataHandler): void;
|
|
23
|
-
export declare const logLevel: "debug" | "error" | "fatal" | "info" | "silent" | "trace" | "verbose" | "warn", logFilters:
|
|
25
|
+
export declare const logLevel: "debug" | "error" | "fatal" | "info" | "silent" | "trace" | "verbose" | "warn", logFilters: LogFilters;
|
|
26
|
+
/**
|
|
27
|
+
* Creates a pino child logger with the current per-module filter level applied. Returns an accessor rather than the
|
|
28
|
+
* logger itself: every use must go through it so the child picks up levels changed via setLogLevel.
|
|
29
|
+
* Internal to the logging module: use createLogger unless a raw pino instance is required.
|
|
30
|
+
*/
|
|
31
|
+
export declare function createPinoChild(module: string, bindings?: LoggerBindings): () => pino.Logger<'verbose'>;
|
|
32
|
+
/**
|
|
33
|
+
* Updates the log level and per-module filters of all loggers created via createLogger, and of loggers created
|
|
34
|
+
* afterwards. Accepts the same format as the `LOG_LEVEL` env var (e.g. `info` or `debug;trace:sequencer,p2p`).
|
|
35
|
+
* Only affects the current thread: worker threads and spawned processes such as prover agents keep their own
|
|
36
|
+
* configuration.
|
|
37
|
+
* @param spec - Log level spec in `LOG_LEVEL` env var format. Throws if invalid, leaving current levels untouched.
|
|
38
|
+
*/
|
|
39
|
+
export declare function setLogLevel(spec: string): void;
|
|
40
|
+
/** Returns the current log level and per-module filters in the `LOG_LEVEL` env var format. */
|
|
41
|
+
export declare function getLogLevel(): string;
|
|
24
42
|
export declare const levels: {
|
|
25
43
|
labels: any;
|
|
26
44
|
values: {
|
|
@@ -73,6 +91,9 @@ type ErrorLogFn = (msg: string, err?: unknown, data?: LogData) => void;
|
|
|
73
91
|
export type Logger = {
|
|
74
92
|
[K in LogLevel]: LogFn;
|
|
75
93
|
} & {
|
|
94
|
+
/** Fatal log function */
|
|
95
|
+
fatal: ErrorLogFn;
|
|
96
|
+
/** Error log function */
|
|
76
97
|
error: ErrorLogFn;
|
|
77
98
|
} & {
|
|
78
99
|
level: LogLevel;
|
|
@@ -83,4 +104,4 @@ export type Logger = {
|
|
|
83
104
|
getBindings: () => LoggerBindings;
|
|
84
105
|
};
|
|
85
106
|
export {};
|
|
86
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
107
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGluby1sb2dnZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2cvcGluby1sb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssS0FBSyxFQUFrQyxNQUFNLFdBQVcsQ0FBQztBQUV2RSxPQUFPLEVBQUUsSUFBSSxFQUFXLE1BQU0sTUFBTSxDQUFDO0FBQ3JDLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLFFBQVEsQ0FBQztBQVV2QyxPQUFPLEVBQUUsS0FBSyxVQUFVLEVBQW1FLE1BQU0sa0JBQWtCLENBQUM7QUFDcEgsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDaEQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVsRCx3RUFBd0U7QUFDeEUsTUFBTSxNQUFNLGNBQWMsR0FBRztJQUMzQiwrREFBK0Q7SUFDL0QsS0FBSyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2YsdUZBQXVGO0lBQ3ZGLFVBQVUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNyQixDQUFDO0FBTUYsS0FBSyxrQkFBa0IsR0FBRyxNQUFNLGNBQWMsR0FBRyxTQUFTLENBQUM7QUFHM0Qsd0JBQWdCLHFCQUFxQixDQUFDLE9BQU8sRUFBRSxrQkFBa0IsR0FBRyxJQUFJLENBRXZFO0FBRUQsd0JBQWdCLHdCQUF3QixDQUFDLE9BQU8sRUFBRSxrQkFBa0IsUUFLbkU7QUFZRCx3QkFBZ0IsWUFBWSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsUUFBUSxDQUFDLEVBQUUsY0FBYyxHQUFHLE1BQU0sQ0E4QzlFO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQWdCLGFBQWEsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLGdCQUFnQixDQUFDLEVBQUUsTUFBTSxHQUFHLGNBQWMsR0FBRyxNQUFNLENBS2hHO0FBSUQsS0FBSyxjQUFjLEdBQUcsQ0FBQyxJQUFJLEVBQUUsT0FBTyxLQUFLLE9BQU8sQ0FBQztBQUdqRCx3QkFBZ0IsaUJBQWlCLENBQUMsT0FBTyxFQUFFLGNBQWMsR0FBRyxJQUFJLENBRS9EO0FBZ0JELGVBQU8sTUFBTyxRQUFRLGtGQUFFLFVBQVUsWUFBNEQsQ0FBQztBQVUvRjs7OztHQUlHO0FBQ0gsd0JBQWdCLGVBQWUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLFFBQVEsR0FBRSxjQUFtQixHQUFHLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FjM0c7QUFFRDs7Ozs7O0dBTUc7QUFDSCx3QkFBZ0IsV0FBVyxDQUFDLElBQUksRUFBRSxNQUFNLEdBQUcsSUFBSSxDQVE5QztBQUVELDhGQUE4RjtBQUM5Rix3QkFBZ0IsV0FBVyxJQUFJLE1BQU0sQ0FFcEM7QUFzREQsZUFBTyxNQUFNLE1BQU07Ozs7O0NBR2xCLENBQUM7QUFlRiwyRkFBMkY7QUFDM0Ysd0JBQWdCLGFBQWEsQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLEtBQUssQ0FRbEQ7QUFFRCw2REFBNkQ7QUFDN0Qsd0JBQWdCLGdCQUFnQixJQUFJLElBQUksQ0FHdkM7QUFNRCxLQUFLLFNBQVMsR0FBRztJQUFFLEtBQUssQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUFDLE1BQU0sQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUFDLFVBQVUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUFDLEdBQUcsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtDQUFFLENBQUM7QUFFeEYseUdBQXlHO0FBQ3pHLHdCQUFnQixnQkFBZ0IsQ0FBQyxHQUFHLEVBQUUsU0FBUyxFQUFFLFVBQVUsRUFBRSxNQUFNLEdBQUcsTUFBTSxDQWtCM0U7QUFjRDs7O0dBR0c7QUFDSCxlQUFPLE1BQU0sY0FBYzs7Ozs7Ozs7OztDQUcxQixDQUFDO0FBMERGLGVBQU8sTUFBTSxNQUFNLDJDQUFlLENBQUM7QUFhbkM7OztHQUdHO0FBQ0gsd0JBQWdCLHNCQUFzQixDQUFDLE1BQU0sRUFBRSxRQUFRLEdBQUcsSUFBSSxDQUU3RDtBQUVEOzs7R0FHRztBQUNILHdCQUFnQixxQkFBcUIsQ0FBQyxNQUFNLEVBQUUsUUFBUSxHQUFHLElBQUksQ0FlNUQ7QUFFRCxvREFBb0Q7QUFDcEQsS0FBSyxVQUFVLEdBQUcsQ0FBQyxHQUFHLEVBQUUsTUFBTSxFQUFFLEdBQUcsQ0FBQyxFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUMsRUFBRSxPQUFPLEtBQUssSUFBSSxDQUFDO0FBRXZFOztHQUVHO0FBQ0gsTUFBTSxNQUFNLE1BQU0sR0FBRztLQUFHLENBQUMsSUFBSSxRQUFRLEdBQUcsS0FBSztDQUFFLEdBQUc7SUFDaEQseUJBQXlCO0lBQ3pCLEtBQUssRUFBRSxVQUFVLENBQUM7SUFDbEIseUJBQXlCO0lBQ3pCLEtBQUssRUFBRSxVQUFVLENBQUM7Q0FDbkIsR0FBRztJQUNGLEtBQUssRUFBRSxRQUFRLENBQUM7SUFDaEIsY0FBYyxFQUFFLENBQUMsS0FBSyxFQUFFLFFBQVEsS0FBSyxPQUFPLENBQUM7SUFDN0MsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxNQUFNLEtBQUssTUFBTSxDQUFDO0lBQzdDLGdFQUFnRTtJQUNoRSxXQUFXLEVBQUUsTUFBTSxjQUFjLENBQUM7Q0FDbkMsQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;AAEvE,OAAO,EAAE,IAAI,EAAW,MAAM,MAAM,CAAC;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAUvC,OAAO,EAAE,KAAK,UAAU,EAAmE,MAAM,kBAAkB,CAAC;AACpH,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;AAMF,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,CA8C9E;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;AAgBD,eAAO,MAAO,QAAQ,kFAAE,UAAU,YAA4D,CAAC;AAU/F;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,GAAE,cAAmB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAc3G;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAQ9C;AAED,8FAA8F;AAC9F,wBAAgB,WAAW,IAAI,MAAM,CAEpC;AAsDD,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;IAChD,yBAAyB;IACzB,KAAK,EAAE,UAAU,CAAC;IAClB,yBAAyB;IACzB,KAAK,EAAE,UAAU,CAAC;CACnB,GAAG;IACF,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
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { createColors, isColorSupported } from 'colorette';
|
|
2
2
|
import isNode from 'detect-node';
|
|
3
3
|
import { pino, symbols } from 'pino';
|
|
4
|
-
import { inspect } from 'util';
|
|
5
4
|
import { compactArray } from '../collection/array.js';
|
|
5
|
+
import { getEnv } from '../config/env.js';
|
|
6
6
|
import { parseBooleanEnv } from '../config/parse-env.js';
|
|
7
|
+
import { inspect } from '../inspect/index.js';
|
|
7
8
|
import { AWSCloudLoggerConfig } from './aws-logger-config.js';
|
|
8
9
|
import { convertBigintsToStrings } from './bigint-utils.js';
|
|
9
10
|
import { GoogleCloudLoggerConfig } from './gcloud-logger-config.js';
|
|
10
|
-
import { getLogLevelFromFilters, parseLogLevelEnvVar } from './log-filters.js';
|
|
11
|
+
import { formatLogLevelSpec, getLogLevelFromFilters, parseLogLevelEnvVar } from './log-filters.js';
|
|
11
12
|
const MAX_MODULE_NAME_LENGTH = 256;
|
|
12
13
|
const logBindingsHandlers = [];
|
|
13
14
|
export function addLogBindingsHandler(handler) {
|
|
@@ -36,20 +37,16 @@ export function createLogger(module, bindings) {
|
|
|
36
37
|
};
|
|
37
38
|
const actor = resolvedBindings?.actor;
|
|
38
39
|
const instanceId = resolvedBindings?.instanceId;
|
|
39
|
-
const
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
actor
|
|
43
|
-
},
|
|
44
|
-
...instanceId && {
|
|
45
|
-
instanceId
|
|
46
|
-
}
|
|
47
|
-
}, {
|
|
48
|
-
level: getLogLevelFromFilters(logFilters, module)
|
|
40
|
+
const getPinoLogger = createPinoChild(module, {
|
|
41
|
+
actor,
|
|
42
|
+
instanceId
|
|
49
43
|
});
|
|
50
44
|
// We check manually for isLevelEnabled to avoid calling processLogData unnecessarily.
|
|
51
45
|
// Note that isLevelEnabled is missing from the browser version of pino.
|
|
52
|
-
const logFn = (level, msg, data)=>
|
|
46
|
+
const logFn = (level, msg, data)=>{
|
|
47
|
+
const pinoLogger = getPinoLogger();
|
|
48
|
+
return isLevelEnabled(pinoLogger, level) && pinoLogger[level](processLogData(data ?? {}), msg);
|
|
49
|
+
};
|
|
53
50
|
return {
|
|
54
51
|
silent: ()=>{},
|
|
55
52
|
// TODO(palla/log): Should we move err to data instead of the text message?
|
|
@@ -60,8 +57,10 @@ export function createLogger(module, bindings) {
|
|
|
60
57
|
/** Log as verbose. Use for when we need additional insight on what a subsystem is doing. */ verbose: (msg, data)=>logFn('verbose', msg, data),
|
|
61
58
|
/** Log as debug. Use for when we need debugging info to troubleshoot an issue on a specific component. */ debug: (msg, data)=>logFn('debug', msg, data),
|
|
62
59
|
/** Log as trace. Use for when we want to denial-of-service any recipient of the logs. */ trace: (msg, data)=>logFn('trace', msg, data),
|
|
63
|
-
/** Level of the logger */ level
|
|
64
|
-
|
|
60
|
+
/** Level of the logger */ get level () {
|
|
61
|
+
return getPinoLogger().level;
|
|
62
|
+
},
|
|
63
|
+
/** Whether the given level is enabled for this logger. */ isLevelEnabled: (level)=>isLevelEnabled(getPinoLogger(), level),
|
|
65
64
|
/** Module name for the logger. */ module,
|
|
66
65
|
/** Creates another logger by extending this logger module name and preserving bindings. */ createChild: (childModule)=>createLogger(`${module}:${childModule}`, {
|
|
67
66
|
actor,
|
|
@@ -93,16 +92,69 @@ function processLogData(data) {
|
|
|
93
92
|
function isLevelEnabled(logger, level) {
|
|
94
93
|
return typeof logger.isLevelEnabled === 'function' ? logger.isLevelEnabled(level) : logger.levels.values[level] >= logger.levels.values[logger.level];
|
|
95
94
|
}
|
|
96
|
-
// Load log levels from environment variables.
|
|
97
|
-
|
|
98
|
-
|
|
95
|
+
// Load log levels from environment variables. These exports reflect the startup configuration;
|
|
96
|
+
// the current values (mutable via setLogLevel) are tracked separately below.
|
|
97
|
+
const defaultLogLevel = getEnv().NODE_ENV === 'test' ? 'silent' : 'info';
|
|
98
|
+
export const [logLevel, logFilters] = parseLogLevelEnvVar(getEnv().LOG_LEVEL, defaultLogLevel);
|
|
99
|
+
let currentLogLevel = logLevel;
|
|
100
|
+
let currentLogFilters = logFilters;
|
|
101
|
+
// Bumped on every setLogLevel. Pino children fix their level at creation and do not follow later changes to the
|
|
102
|
+
// parent, so each child compares this against the generation it last synced to and recomputes its level lazily on
|
|
103
|
+
// its next use. This avoids keeping a registry of every live logger, since some code paths create short-lived ones.
|
|
104
|
+
let logLevelGeneration = 0;
|
|
105
|
+
/**
|
|
106
|
+
* Creates a pino child logger with the current per-module filter level applied. Returns an accessor rather than the
|
|
107
|
+
* logger itself: every use must go through it so the child picks up levels changed via setLogLevel.
|
|
108
|
+
* Internal to the logging module: use createLogger unless a raw pino instance is required.
|
|
109
|
+
*/ export function createPinoChild(module, bindings = {}) {
|
|
110
|
+
const { actor, instanceId } = bindings;
|
|
111
|
+
const child = logger.child({
|
|
112
|
+
module,
|
|
113
|
+
...actor && {
|
|
114
|
+
actor
|
|
115
|
+
},
|
|
116
|
+
...instanceId && {
|
|
117
|
+
instanceId
|
|
118
|
+
}
|
|
119
|
+
}, {
|
|
120
|
+
level: getLogLevelFromFilters(currentLogFilters, module)
|
|
121
|
+
});
|
|
122
|
+
let syncedGeneration = logLevelGeneration;
|
|
123
|
+
return ()=>{
|
|
124
|
+
if (syncedGeneration !== logLevelGeneration) {
|
|
125
|
+
child.level = getLogLevelFromFilters(currentLogFilters, module) ?? currentLogLevel;
|
|
126
|
+
syncedGeneration = logLevelGeneration;
|
|
127
|
+
}
|
|
128
|
+
return child;
|
|
129
|
+
};
|
|
130
|
+
}
|
|
131
|
+
/**
|
|
132
|
+
* Updates the log level and per-module filters of all loggers created via createLogger, and of loggers created
|
|
133
|
+
* afterwards. Accepts the same format as the `LOG_LEVEL` env var (e.g. `info` or `debug;trace:sequencer,p2p`).
|
|
134
|
+
* Only affects the current thread: worker threads and spawned processes such as prover agents keep their own
|
|
135
|
+
* configuration.
|
|
136
|
+
* @param spec - Log level spec in `LOG_LEVEL` env var format. Throws if invalid, leaving current levels untouched.
|
|
137
|
+
*/ export function setLogLevel(spec) {
|
|
138
|
+
const [newLevel, newFilters] = parseLogLevelEnvVar(spec, defaultLogLevel);
|
|
139
|
+
const previous = getLogLevel();
|
|
140
|
+
currentLogLevel = newLevel;
|
|
141
|
+
currentLogFilters = newFilters;
|
|
142
|
+
logger.level = newLevel;
|
|
143
|
+
logLevelGeneration++;
|
|
144
|
+
logger.info({
|
|
145
|
+
module: 'logger'
|
|
146
|
+
}, `Updated log level from ${previous} to ${getLogLevel()}`);
|
|
147
|
+
}
|
|
148
|
+
/** Returns the current log level and per-module filters in the `LOG_LEVEL` env var format. */ export function getLogLevel() {
|
|
149
|
+
return formatLogLevelSpec(currentLogLevel, currentLogFilters);
|
|
150
|
+
}
|
|
99
151
|
// Define custom logging levels for pino.
|
|
100
152
|
const customLevels = {
|
|
101
153
|
verbose: 25
|
|
102
154
|
};
|
|
103
155
|
// Global pino options, tweaked for the active cloud logging backend.
|
|
104
|
-
const useGcloudLogging = parseBooleanEnv(
|
|
105
|
-
const useAwsLogging = parseBooleanEnv(
|
|
156
|
+
const useGcloudLogging = parseBooleanEnv(getEnv()['USE_GCLOUD_LOGGING']);
|
|
157
|
+
const useAwsLogging = parseBooleanEnv(getEnv()['USE_AWS_LOGGING']);
|
|
106
158
|
const loggingConfig = useGcloudLogging ? GoogleCloudLoggerConfig : useAwsLogging ? AWSCloudLoggerConfig : {
|
|
107
159
|
formatters: {},
|
|
108
160
|
messageKey: 'msg'
|
|
@@ -153,14 +205,14 @@ export const levels = {
|
|
|
153
205
|
}
|
|
154
206
|
};
|
|
155
207
|
// Transport options for pretty logging to stderr via pino-pretty.
|
|
156
|
-
const colorEnv =
|
|
208
|
+
const colorEnv = getEnv()['FORCE_COLOR'];
|
|
157
209
|
const useColor = colorEnv === undefined ? isColorSupported : parseBooleanEnv(colorEnv);
|
|
158
210
|
const { bold, reset, cyan, magenta, yellow, blue, green, magentaBright, yellowBright, blueBright, greenBright } = createColors({
|
|
159
211
|
useColor
|
|
160
212
|
});
|
|
161
213
|
// Per-actor coloring: each unique actor gets a different color for easier visual distinction.
|
|
162
214
|
// Disabled when LOG_NO_COLOR_PER_ACTOR is set to a truthy value.
|
|
163
|
-
const useColorPerActor = useColor && !parseBooleanEnv(
|
|
215
|
+
const useColorPerActor = useColor && !parseBooleanEnv(getEnv()['LOG_NO_COLOR_PER_ACTOR']);
|
|
164
216
|
const actorColors = [
|
|
165
217
|
yellow,
|
|
166
218
|
magenta,
|
|
@@ -214,7 +266,7 @@ const pinoPrettyBaseOpts = {
|
|
|
214
266
|
customLevels: 'fatal:60,error:50,warn:40,info:30,verbose:25,debug:20,trace:10',
|
|
215
267
|
customColors: 'fatal:bgRed,error:red,warn:yellow,info:green,verbose:magenta,debug:blue,trace:gray',
|
|
216
268
|
minimumLevel: 'trace',
|
|
217
|
-
singleLine: !parseBooleanEnv(
|
|
269
|
+
singleLine: !parseBooleanEnv(getEnv()['LOG_MULTILINE'])
|
|
218
270
|
};
|
|
219
271
|
/**
|
|
220
272
|
* Pino-pretty options for direct use (e.g., jest/setup.mjs).
|
|
@@ -247,7 +299,7 @@ const stdioTransport = {
|
|
|
247
299
|
// would mean that all child loggers created before the telemetry-client is initialized would not have
|
|
248
300
|
// this transport configured. Note that the target is defined as the export in the telemetry-client,
|
|
249
301
|
// since pino will load this transport separately on a worker thread, to minimize disruption to the main loop.
|
|
250
|
-
const otlpEndpoint =
|
|
302
|
+
const otlpEndpoint = getEnv()['OTEL_EXPORTER_OTLP_LOGS_ENDPOINT'];
|
|
251
303
|
const otlpEnabled = !!otlpEndpoint && !useGcloudLogging;
|
|
252
304
|
const otelOpts = {
|
|
253
305
|
levels
|
|
@@ -266,7 +318,7 @@ function makeLogger() {
|
|
|
266
318
|
asObject: false
|
|
267
319
|
}
|
|
268
320
|
});
|
|
269
|
-
} else if (
|
|
321
|
+
} else if (getEnv().JEST_WORKER_ID) {
|
|
270
322
|
// We are on jest, so we need sync logging and stream to stderr.
|
|
271
323
|
// We expect jest/setup.mjs to kick in later and replace set up a pretty logger,
|
|
272
324
|
// but if for some reason it doesn't, at least we're covered with a default logger.
|
|
@@ -275,7 +327,7 @@ function makeLogger() {
|
|
|
275
327
|
// Regular nodejs with transports on worker thread, using pino-pretty for console logging if LOG_JSON
|
|
276
328
|
// is not set, and an optional OTLP transport if the OTLP endpoint is set.
|
|
277
329
|
const targets = compactArray([
|
|
278
|
-
parseBooleanEnv(
|
|
330
|
+
parseBooleanEnv(getEnv().LOG_JSON) ? stdioTransport : prettyTransport,
|
|
279
331
|
otlpEnabled ? otelTransport : undefined
|
|
280
332
|
]);
|
|
281
333
|
return pino(pinoOpts, pino.transport({
|
package/dest/queue/index.d.ts
CHANGED
|
@@ -3,5 +3,6 @@ export * from './priority_memory_queue.js';
|
|
|
3
3
|
export * from './serial_queue.js';
|
|
4
4
|
export * from './bounded_serial_queue.js';
|
|
5
5
|
export * from './semaphore.js';
|
|
6
|
+
export * from './read_write_lock.js';
|
|
6
7
|
export * from './batch_queue.js';
|
|
7
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9xdWV1ZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLDJCQUEyQixDQUFDO0FBQzFDLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLGtCQUFrQixDQUFDIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/queue/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/queue/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC"}
|
package/dest/queue/index.js
CHANGED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A readers-writer lock: any number of shared holders at once, or one exclusive holder with no shared holder alongside.
|
|
3
|
+
*
|
|
4
|
+
* Exclusive holders take turns in the order they asked. Only the exclusive holder whose turn it is holds back new
|
|
5
|
+
* shared holders, not those still waiting for theirs, so shared holders that asked during a turn get in between it and
|
|
6
|
+
* the next one.
|
|
7
|
+
*/
|
|
8
|
+
export declare class ReadWriteLock {
|
|
9
|
+
/** Gives exclusive holders their turns, one at a time, in the order they asked. */
|
|
10
|
+
private readonly exclusiveTurns;
|
|
11
|
+
/** Set while an exclusive holder has its turn, holding back new shared holders; settles when the turn ends. */
|
|
12
|
+
private exclusiveTurn;
|
|
13
|
+
private sharedHolders;
|
|
14
|
+
/** Resolved when the last shared holder finishes, for an exclusive holder waiting to start its turn. */
|
|
15
|
+
private sharedDrained;
|
|
16
|
+
/** Runs `fn` alongside any other shared holders, once no exclusive holder has its turn. */
|
|
17
|
+
runShared<T>(fn: () => Promise<T>): Promise<T>;
|
|
18
|
+
/** Runs `fn` with no other holder: after the exclusive holders that asked before it and the shared ones running. */
|
|
19
|
+
runExclusive<T>(fn: () => Promise<T>): Promise<T>;
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVhZF93cml0ZV9sb2NrLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcXVldWUvcmVhZF93cml0ZV9sb2NrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBOzs7Ozs7R0FNRztBQUNILHFCQUFhLGFBQWE7SUFDeEIsbUZBQW1GO0lBQ25GLE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFvQjtJQUNuRCwrR0FBK0c7SUFDL0csT0FBTyxDQUFDLGFBQWEsQ0FBNEI7SUFDakQsT0FBTyxDQUFDLGFBQWEsQ0FBSztJQUMxQix3R0FBd0c7SUFDeEcsT0FBTyxDQUFDLGFBQWEsQ0FBeUM7SUFFOUQsMkZBQTJGO0lBQzlFLFNBQVMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLE1BQU0sT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FZMUQ7SUFFRCxvSEFBb0g7SUFDdkcsWUFBWSxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsTUFBTSxPQUFPLENBQUMsQ0FBQyxDQUFDLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQWdCN0Q7Q0FDRiJ9
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"read_write_lock.d.ts","sourceRoot":"","sources":["../../src/queue/read_write_lock.ts"],"names":[],"mappings":"AAGA;;;;;;GAMG;AACH,qBAAa,aAAa;IACxB,mFAAmF;IACnF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoB;IACnD,+GAA+G;IAC/G,OAAO,CAAC,aAAa,CAA4B;IACjD,OAAO,CAAC,aAAa,CAAK;IAC1B,wGAAwG;IACxG,OAAO,CAAC,aAAa,CAAyC;IAE9D,2FAA2F;IAC9E,SAAS,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAY1D;IAED,oHAAoH;IACvG,YAAY,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAgB7D;CACF"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { promiseWithResolvers } from '../promise/index.js';
|
|
2
|
+
import { Semaphore } from './semaphore.js';
|
|
3
|
+
/**
|
|
4
|
+
* A readers-writer lock: any number of shared holders at once, or one exclusive holder with no shared holder alongside.
|
|
5
|
+
*
|
|
6
|
+
* Exclusive holders take turns in the order they asked. Only the exclusive holder whose turn it is holds back new
|
|
7
|
+
* shared holders, not those still waiting for theirs, so shared holders that asked during a turn get in between it and
|
|
8
|
+
* the next one.
|
|
9
|
+
*/ export class ReadWriteLock {
|
|
10
|
+
/** Gives exclusive holders their turns, one at a time, in the order they asked. */ exclusiveTurns = new Semaphore(1);
|
|
11
|
+
/** Set while an exclusive holder has its turn, holding back new shared holders; settles when the turn ends. */ exclusiveTurn;
|
|
12
|
+
sharedHolders = 0;
|
|
13
|
+
/** Resolved when the last shared holder finishes, for an exclusive holder waiting to start its turn. */ sharedDrained;
|
|
14
|
+
/** Runs `fn` alongside any other shared holders, once no exclusive holder has its turn. */ async runShared(fn) {
|
|
15
|
+
while(this.exclusiveTurn){
|
|
16
|
+
await this.exclusiveTurn;
|
|
17
|
+
}
|
|
18
|
+
this.sharedHolders++;
|
|
19
|
+
try {
|
|
20
|
+
return await fn();
|
|
21
|
+
} finally{
|
|
22
|
+
if (--this.sharedHolders === 0) {
|
|
23
|
+
this.sharedDrained?.resolve();
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
/** Runs `fn` with no other holder: after the exclusive holders that asked before it and the shared ones running. */ async runExclusive(fn) {
|
|
28
|
+
await this.exclusiveTurns.acquire();
|
|
29
|
+
const turn = promiseWithResolvers();
|
|
30
|
+
this.exclusiveTurn = turn.promise;
|
|
31
|
+
try {
|
|
32
|
+
if (this.sharedHolders > 0) {
|
|
33
|
+
this.sharedDrained = promiseWithResolvers();
|
|
34
|
+
await this.sharedDrained.promise;
|
|
35
|
+
this.sharedDrained = undefined;
|
|
36
|
+
}
|
|
37
|
+
return await fn();
|
|
38
|
+
} finally{
|
|
39
|
+
this.exclusiveTurn = undefined;
|
|
40
|
+
turn.resolve();
|
|
41
|
+
this.exclusiveTurns.release();
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
@@ -4,9 +4,12 @@ export interface ISemaphore {
|
|
|
4
4
|
}
|
|
5
5
|
/**
|
|
6
6
|
* Allows the acquiring of up to `size` tokens before calls to acquire block, waiting for a call to release().
|
|
7
|
+
* Blocked calls acquire in the order they were made: a released token goes to the one waiting longest, never to a
|
|
8
|
+
* later call.
|
|
7
9
|
*/
|
|
8
10
|
export declare class Semaphore {
|
|
9
11
|
private readonly queue;
|
|
12
|
+
private cancelled;
|
|
10
13
|
constructor(size: number);
|
|
11
14
|
/**
|
|
12
15
|
* Acquires a token from the Semaphore, allowing access to a limited resource.
|
|
@@ -16,12 +19,24 @@ export declare class Semaphore {
|
|
|
16
19
|
* @returns A Promise that resolves when a token is acquired.
|
|
17
20
|
*/
|
|
18
21
|
acquire(): Promise<void>;
|
|
22
|
+
/**
|
|
23
|
+
* Takes a token if one is free, without waiting. A token is never free while acquire() calls are waiting for one, so
|
|
24
|
+
* this never takes one ahead of them.
|
|
25
|
+
* @returns Whether the caller may proceed: a token was taken, or the semaphore is cancelled.
|
|
26
|
+
*/
|
|
27
|
+
tryAcquire(): boolean;
|
|
19
28
|
/**
|
|
20
29
|
* Releases a token back into the semaphore, allowing another acquire call to proceed.
|
|
21
|
-
* If there are any pending calls to acquire(), one
|
|
30
|
+
* If there are any pending calls to acquire(), the one waiting longest is unblocked and allowed to proceed.
|
|
22
31
|
* This method should only be called by the holder of the acquired token to ensure proper functionality
|
|
23
32
|
* and avoid unexpected behavior.
|
|
24
33
|
*/
|
|
25
34
|
release(): void;
|
|
35
|
+
/**
|
|
36
|
+
* Stops limiting access: every pending acquire() call proceeds, as does every later one (and tryAcquire() succeeds),
|
|
37
|
+
* and release() does nothing.
|
|
38
|
+
* Lets callers waiting for a token stop waiting once the resource is gone, so they must check for that themselves.
|
|
39
|
+
*/
|
|
40
|
+
cancel(): void;
|
|
26
41
|
}
|
|
27
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VtYXBob3JlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcXVldWUvc2VtYXBob3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE1BQU0sV0FBVyxVQUFVO0lBQ3pCLE9BQU8sSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDekIsT0FBTyxJQUFJLElBQUksQ0FBQztDQUNqQjtBQUVEOzs7O0dBSUc7QUFDSCxxQkFBYSxTQUFTO0lBQ3BCLE9BQU8sQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFrQztJQUN4RCxPQUFPLENBQUMsU0FBUyxDQUFTO0lBRTFCLFlBQVksSUFBSSxFQUFFLE1BQU0sRUFFdkI7SUFFRDs7Ozs7O09BTUc7SUFDVSxPQUFPLGtCQUVuQjtJQUVEOzs7O09BSUc7SUFDSSxVQUFVLElBQUksT0FBTyxDQUUzQjtJQUVEOzs7OztPQUtHO0lBQ0ksT0FBTyxTQUliO0lBRUQ7Ozs7T0FJRztJQUNJLE1BQU0sU0FHWjtDQUNGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"semaphore.d.ts","sourceRoot":"","sources":["../../src/queue/semaphore.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,UAAU;IACzB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,OAAO,IAAI,IAAI,CAAC;CACjB;AAED
|
|
1
|
+
{"version":3,"file":"semaphore.d.ts","sourceRoot":"","sources":["../../src/queue/semaphore.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,UAAU;IACzB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,OAAO,IAAI,IAAI,CAAC;CACjB;AAED;;;;GAIG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAkC;IACxD,OAAO,CAAC,SAAS,CAAS;IAE1B,YAAY,IAAI,EAAE,MAAM,EAEvB;IAED;;;;;;OAMG;IACU,OAAO,kBAEnB;IAED;;;;OAIG;IACI,UAAU,IAAI,OAAO,CAE3B;IAED;;;;;OAKG;IACI,OAAO,SAIb;IAED;;;;OAIG;IACI,MAAM,SAGZ;CACF"}
|
package/dest/queue/semaphore.js
CHANGED
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import { FifoMemoryQueue } from './fifo_memory_queue.js';
|
|
2
2
|
/**
|
|
3
3
|
* Allows the acquiring of up to `size` tokens before calls to acquire block, waiting for a call to release().
|
|
4
|
+
* Blocked calls acquire in the order they were made: a released token goes to the one waiting longest, never to a
|
|
5
|
+
* later call.
|
|
4
6
|
*/ export class Semaphore {
|
|
5
7
|
queue = new FifoMemoryQueue();
|
|
8
|
+
cancelled = false;
|
|
6
9
|
constructor(size){
|
|
7
10
|
new Array(size).fill(true).map(()=>this.queue.put(true));
|
|
8
11
|
}
|
|
@@ -16,11 +19,28 @@ import { FifoMemoryQueue } from './fifo_memory_queue.js';
|
|
|
16
19
|
await this.queue.get();
|
|
17
20
|
}
|
|
18
21
|
/**
|
|
22
|
+
* Takes a token if one is free, without waiting. A token is never free while acquire() calls are waiting for one, so
|
|
23
|
+
* this never takes one ahead of them.
|
|
24
|
+
* @returns Whether the caller may proceed: a token was taken, or the semaphore is cancelled.
|
|
25
|
+
*/ tryAcquire() {
|
|
26
|
+
return this.cancelled || this.queue.getImmediate() !== undefined;
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
19
29
|
* Releases a token back into the semaphore, allowing another acquire call to proceed.
|
|
20
|
-
* If there are any pending calls to acquire(), one
|
|
30
|
+
* If there are any pending calls to acquire(), the one waiting longest is unblocked and allowed to proceed.
|
|
21
31
|
* This method should only be called by the holder of the acquired token to ensure proper functionality
|
|
22
32
|
* and avoid unexpected behavior.
|
|
23
33
|
*/ release() {
|
|
24
|
-
this.
|
|
34
|
+
if (!this.cancelled) {
|
|
35
|
+
this.queue.put(true);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Stops limiting access: every pending acquire() call proceeds, as does every later one (and tryAcquire() succeeds),
|
|
40
|
+
* and release() does nothing.
|
|
41
|
+
* Lets callers waiting for a token stop waiting once the resource is gone, so they must check for that themselves.
|
|
42
|
+
*/ cancel() {
|
|
43
|
+
this.cancelled = true;
|
|
44
|
+
this.queue.cancel();
|
|
25
45
|
}
|
|
26
46
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Buffer } from 'buffer';
|
|
1
2
|
import { z } from 'zod';
|
|
2
3
|
import { EpochNumber } from '../branded-types/epoch.js';
|
|
3
4
|
import { SlotNumber } from '../branded-types/slot.js';
|
|
@@ -43,4 +44,4 @@ export declare const schemas: {
|
|
|
43
44
|
SecretValue: typeof SecretValue.schema;
|
|
44
45
|
};
|
|
45
46
|
export type { EpochNumber, EthAddress, Fq, Fr, Point, SlotNumber };
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NoZW1hcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NjaGVtYXMvc2NoZW1hcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFBUSxDQUFDO0FBQ2hDLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLFdBQVcsRUFBcUIsTUFBTSwyQkFBMkIsQ0FBQztBQUMzRSxPQUFPLEVBQUUsVUFBVSxFQUFvQixNQUFNLDBCQUEwQixDQUFDO0FBQ3hFLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNqRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDeEQsT0FBTyxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNsRCxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDcEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBSXJELGVBQU8sTUFBTSxPQUFPO0lBQ2xCLDZEQUE2RDs7SUFHN0QsMkRBQTJEOztJQUczRCw0QkFBNEI7O0lBRzVCLDRCQUE0Qjs7SUFHNUIsNEJBQTRCOztJQUc1Qix5Q0FBeUM7O0lBR3pDLG9EQUFvRDs7SUFjcEQsbUNBQW1DOztJQUduQywyQ0FBMkM7O0lBRzNDLCtCQUErQjs7SUFTL0IsK0JBQStCOztJQVEvQiwrQ0FBK0M7O0lBRy9DLG9HQUFvRzs7SUFHcEcsd0NBQXdDOztJQU94Qyx1RkFBdUY7O0lBR3ZGLHdGQUF3Rjs7SUFHeEYsNEJBQTRCOztDQUU3QixDQUFDO0FBR0YsWUFBWSxFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQUUsVUFBVSxFQUFFLENBQUMifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/schemas/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,WAAW,EAAqB,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAoB,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAIrD,eAAO,MAAM,OAAO;IAClB,6DAA6D;;IAG7D,2DAA2D;;IAG3D,4BAA4B;;IAG5B,4BAA4B;;IAG5B,4BAA4B;;IAG5B,yCAAyC;;IAGzC,oDAAoD;;IAcpD,mCAAmC;;IAGnC,2CAA2C;;IAG3C,+BAA+B;;IAS/B,+BAA+B;;IAQ/B,+CAA+C;;IAG/C,oGAAoG;;IAGpG,wCAAwC;;IAOxC,uFAAuF;;IAGvF,wFAAwF;;IAGxF,4BAA4B;;CAE7B,CAAC;AAGF,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC"}
|
|
1
|
+
{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/schemas/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,WAAW,EAAqB,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAoB,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAIrD,eAAO,MAAM,OAAO;IAClB,6DAA6D;;IAG7D,2DAA2D;;IAG3D,4BAA4B;;IAG5B,4BAA4B;;IAG5B,4BAA4B;;IAG5B,yCAAyC;;IAGzC,oDAAoD;;IAcpD,mCAAmC;;IAGnC,2CAA2C;;IAG3C,+BAA+B;;IAS/B,+BAA+B;;IAQ/B,+CAA+C;;IAG/C,oGAAoG;;IAGpG,wCAAwC;;IAOxC,uFAAuF;;IAGvF,wFAAwF;;IAGxF,4BAA4B;;CAE7B,CAAC;AAGF,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC"}
|
package/dest/schemas/schemas.js
CHANGED
package/dest/schemas/utils.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Buffer } from 'buffer';
|
|
1
2
|
import { type ZodObject, type ZodRawShape, type ZodType, type ZodTypeAny, z } from 'zod';
|
|
2
3
|
import type { ZodFor } from './types.js';
|
|
3
4
|
export declare const hexSchema: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
|
|
@@ -49,4 +50,4 @@ export declare function setSchema<T>(value: ZodFor<T>): ZodFor<Set<T>>;
|
|
|
49
50
|
/** Given an already parsed and validated object, extracts the keys defined in the given schema. Does not validate again. */
|
|
50
51
|
export declare function pickFromSchema<T extends object, S extends ZodObject<ZodRawShape>>(obj: T, schema: S): Partial<T>;
|
|
51
52
|
export {};
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zY2hlbWFzL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFDaEMsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFFLEtBQUssV0FBVyxFQUFFLEtBQUssT0FBTyxFQUFFLEtBQUssVUFBVSxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUl6RixPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFFekMsZUFBTyxNQUFNLFNBQVMsd0RBQWlGLENBQUM7QUFLeEcsNkVBQTZFO0FBQzdFLGVBQU8sTUFBTSxZQUFZLEVBQUUsTUFBTSxDQUFDLE1BQU0sQ0FpQnRDLENBQUM7QUFFSCxNQUFNLE1BQU0sbUJBQW1CLENBQUMsQ0FBQyxTQUFTLFVBQVUsSUFBSSxPQUFPLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsR0FBRyxTQUFTLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsR0FBRyxJQUFJLEdBQUcsU0FBUyxDQUFDLENBQUM7QUFFeEg7Ozs7Ozs7OztHQVNHO0FBQ0gsd0JBQWdCLFFBQVEsQ0FBQyxDQUFDLFNBQVMsVUFBVSxFQUFFLE1BQU0sRUFBRSxDQUFDLDZJQVV2RDtBQUVELEtBQUssUUFBUSxDQUFDLENBQUMsRUFBRSxJQUFJLElBQUksQ0FBQyxTQUFTO0lBQUUsTUFBTSxJQUFJLElBQUksQ0FBQTtDQUFFLEdBQUcsQ0FBQyxHQUFHLEtBQUssQ0FBQztBQUVsRTs7OztHQUlHO0FBQ0gsd0JBQWdCLFlBQVksQ0FBQyxNQUFNLFNBQVM7SUFBRSxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxHQUFHLENBQUE7Q0FBRSxHQUFHO0lBQUUsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsR0FBRyxDQUFBO0NBQUUsRUFDN0csS0FBSyxFQUFFLE1BQU0sRUFDYixVQUFVLENBQUMsRUFBRSxDQUFDLEtBQUssRUFBRSxNQUFNLEtBQUssT0FBTyxHQUN0QyxPQUFPLENBQ1IsTUFBTSxTQUFTO0lBQUUsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsTUFBTSxTQUFTLENBQUE7Q0FBRSxHQUFHO0lBQUUsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsTUFBTSxTQUFTLENBQUE7Q0FBRSxHQUN0RyxRQUFRLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQyxHQUMzQixLQUFLLEVBQ1QsTUFBTSxDQUNQLENBTUE7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQWdCLGVBQWUsQ0FBQyxNQUFNLFNBQVM7SUFBRSxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxHQUFHLENBQUE7Q0FBRSxFQUM3RSxLQUFLLEVBQUUsTUFBTSxFQUNiLFVBQVUsQ0FBQyxFQUFFLENBQUMsR0FBRyxFQUFFLE1BQU0sS0FBSyxPQUFPLEdBQ3BDLE9BQU8sQ0FBQyxNQUFNLFNBQVM7SUFBRSxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxNQUFNLFNBQVMsQ0FBQTtDQUFFLEdBQUcsUUFBUSxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsR0FBRyxLQUFLLEVBQUUsTUFBTSxDQUFDLENBRXBIO0FBRUQsK0ZBQStGO0FBQy9GLHdCQUFnQixTQUFTLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQyxFQUFFLEtBQUssRUFBRSxNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FFM0c7QUFFRCwrRkFBK0Y7QUFDL0Ysd0JBQWdCLFNBQVMsQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUMsR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBRTdEO0FBRUQsNEhBQTRIO0FBQzVILHdCQUFnQixjQUFjLENBQUMsQ0FBQyxTQUFTLE1BQU0sRUFBRSxDQUFDLFNBQVMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUMsY0FFbkcifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/schemas/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,WAAW,EAAE,KAAK,OAAO,EAAE,KAAK,UAAU,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIzF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,eAAO,MAAM,SAAS,wDAAiF,CAAC;AAKxG,6EAA6E;AAC7E,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,CAiBtC,CAAC;AAEH,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,UAAU,IAAI,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;AAExH;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CAAC,CAAC,SAAS,UAAU,EAAE,MAAM,EAAE,CAAC,6IAUvD;AAED,KAAK,QAAQ,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,SAAS;IAAE,MAAM,IAAI,IAAI,CAAA;CAAE,GAAG,CAAC,GAAG,KAAK,CAAC;AAElE;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,MAAM,SAAS;IAAE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG;IAAE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7G,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,GACtC,OAAO,CACR,MAAM,SAAS;IAAE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,SAAS,CAAA;CAAE,GAAG;IAAE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,SAAS,CAAA;CAAE,GACtG,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,GAC3B,KAAK,EACT,MAAM,CACP,CAMA;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,MAAM,SAAS;IAAE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7E,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,GACpC,OAAO,CAAC,MAAM,SAAS;IAAE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,SAAS,CAAA;CAAE,GAAG,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,KAAK,EAAE,MAAM,CAAC,CAEpH;AAED,+FAA+F;AAC/F,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAE3G;AAED,+FAA+F;AAC/F,wBAAgB,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAE7D;AAED,4HAA4H;AAC5H,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,SAAS,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,cAEnG"}
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/schemas/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,WAAW,EAAE,KAAK,OAAO,EAAE,KAAK,UAAU,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIzF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,eAAO,MAAM,SAAS,wDAAiF,CAAC;AAKxG,6EAA6E;AAC7E,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,CAiBtC,CAAC;AAEH,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,UAAU,IAAI,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;AAExH;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CAAC,CAAC,SAAS,UAAU,EAAE,MAAM,EAAE,CAAC,6IAUvD;AAED,KAAK,QAAQ,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,SAAS;IAAE,MAAM,IAAI,IAAI,CAAA;CAAE,GAAG,CAAC,GAAG,KAAK,CAAC;AAElE;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,MAAM,SAAS;IAAE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG;IAAE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7G,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,GACtC,OAAO,CACR,MAAM,SAAS;IAAE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,SAAS,CAAA;CAAE,GAAG;IAAE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,SAAS,CAAA;CAAE,GACtG,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,GAC3B,KAAK,EACT,MAAM,CACP,CAMA;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,MAAM,SAAS;IAAE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7E,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,GACpC,OAAO,CAAC,MAAM,SAAS;IAAE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,SAAS,CAAA;CAAE,GAAG,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,KAAK,EAAE,MAAM,CAAC,CAEpH;AAED,+FAA+F;AAC/F,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAE3G;AAED,+FAA+F;AAC/F,wBAAgB,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAE7D;AAED,4HAA4H;AAC5H,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,SAAS,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,cAEnG"}
|