@aztec/foundation 0.0.1-commit.9b94fc1 → 0.0.1-commit.9d2bcf6d
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/index.d.ts +2 -1
- package/dest/array/index.d.ts.map +1 -1
- package/dest/array/index.js +1 -0
- package/dest/array/sorted_array.d.ts +10 -0
- package/dest/array/sorted_array.d.ts.map +1 -0
- package/dest/array/sorted_array.js +106 -0
- package/dest/branded-types/block_number.d.ts +56 -0
- package/dest/branded-types/block_number.d.ts.map +1 -0
- package/dest/branded-types/block_number.js +78 -0
- package/dest/branded-types/checkpoint_number.d.ts +54 -0
- package/dest/branded-types/checkpoint_number.d.ts.map +1 -0
- package/dest/branded-types/checkpoint_number.js +77 -0
- package/dest/branded-types/index.d.ts +4 -1
- package/dest/branded-types/index.d.ts.map +1 -1
- package/dest/branded-types/index.js +3 -0
- package/dest/branded-types/index_within_checkpoint.d.ts +42 -0
- package/dest/branded-types/index_within_checkpoint.d.ts.map +1 -0
- package/dest/branded-types/index_within_checkpoint.js +59 -0
- package/dest/buffer/buffer16.d.ts +5 -2
- package/dest/buffer/buffer16.d.ts.map +1 -1
- package/dest/buffer/buffer16.js +4 -2
- package/dest/buffer/buffer32.d.ts +5 -2
- package/dest/buffer/buffer32.d.ts.map +1 -1
- package/dest/buffer/buffer32.js +4 -2
- package/dest/collection/array.d.ts +12 -1
- package/dest/collection/array.d.ts.map +1 -1
- package/dest/collection/array.js +51 -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 +15 -4
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +32 -9
- package/dest/config/network_config.d.ts +13 -1
- package/dest/config/network_config.d.ts.map +1 -1
- package/dest/config/network_config.js +3 -1
- package/dest/config/parse-env.d.ts +3 -0
- package/dest/config/parse-env.d.ts.map +1 -0
- package/dest/config/parse-env.js +7 -0
- package/dest/config/secret_value.js +3 -1
- package/dest/crypto/bls/bn254_keystore.js +1 -1
- package/dest/crypto/bls/index.js +1 -1
- package/dest/crypto/bn254/index.d.ts +35 -51
- package/dest/crypto/bn254/index.d.ts.map +1 -1
- package/dest/crypto/bn254/index.js +51 -140
- package/dest/crypto/ecdsa/signature.d.ts +11 -2
- package/dest/crypto/ecdsa/signature.d.ts.map +1 -1
- package/dest/crypto/ecdsa/signature.js +2 -2
- package/dest/crypto/grumpkin/index.d.ts +4 -2
- package/dest/crypto/grumpkin/index.d.ts.map +1 -1
- package/dest/crypto/grumpkin/index.js +2 -1
- package/dest/crypto/keys/index.d.ts +2 -2
- package/dest/crypto/keys/index.d.ts.map +1 -1
- package/dest/crypto/keys/index.js +1 -1
- package/dest/crypto/pedersen/pedersen.wasm.d.ts +2 -2
- package/dest/crypto/pedersen/pedersen.wasm.d.ts.map +1 -1
- package/dest/crypto/pedersen/pedersen.wasm.js +1 -1
- package/dest/crypto/poseidon/index.d.ts +2 -3
- package/dest/crypto/poseidon/index.d.ts.map +1 -1
- package/dest/crypto/poseidon/index.js +1 -10
- 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 +5 -5
- package/dest/crypto/schnorr/index.d.ts +3 -2
- package/dest/crypto/schnorr/index.d.ts.map +1 -1
- package/dest/crypto/schnorr/index.js +1 -1
- package/dest/crypto/schnorr/signature.d.ts +2 -2
- package/dest/crypto/schnorr/signature.d.ts.map +1 -1
- package/dest/crypto/schnorr/signature.js +2 -2
- package/dest/crypto/sha256/index.d.ts +2 -2
- package/dest/crypto/sha256/index.d.ts.map +1 -1
- package/dest/crypto/sha256/index.js +1 -1
- package/dest/crypto/sha512/index.d.ts +2 -2
- package/dest/crypto/sha512/index.d.ts.map +1 -1
- package/dest/crypto/sha512/index.js +1 -1
- package/dest/crypto/signature/index.d.ts +2 -2
- package/dest/crypto/signature/index.d.ts.map +1 -1
- package/dest/crypto/sync/pedersen/index.d.ts +2 -2
- package/dest/crypto/sync/pedersen/index.d.ts.map +1 -1
- package/dest/crypto/sync/pedersen/index.js +1 -1
- package/dest/crypto/sync/poseidon/index.d.ts +2 -3
- package/dest/crypto/sync/poseidon/index.d.ts.map +1 -1
- package/dest/crypto/sync/poseidon/index.js +1 -9
- package/dest/{fields/bls12_fields.d.ts → curves/bls12/field.d.ts} +3 -3
- package/dest/curves/bls12/field.d.ts.map +1 -0
- package/dest/{fields/bls12_fields.js → curves/bls12/field.js} +12 -9
- package/dest/curves/bls12/index.d.ts +3 -0
- package/dest/curves/bls12/index.d.ts.map +1 -0
- package/dest/curves/bls12/index.js +2 -0
- package/dest/{fields/bls12_point.d.ts → curves/bls12/point.d.ts} +13 -4
- package/dest/curves/bls12/point.d.ts.map +1 -0
- package/dest/{fields/bls12_point.js → curves/bls12/point.js} +10 -8
- package/dest/{fields/fields.d.ts → curves/bn254/field.d.ts} +7 -15
- package/dest/curves/bn254/field.d.ts.map +1 -0
- package/dest/{fields/fields.js → curves/bn254/field.js} +35 -49
- package/dest/curves/bn254/index.d.ts +3 -0
- package/dest/curves/bn254/index.d.ts.map +1 -0
- package/dest/curves/bn254/index.js +2 -0
- package/dest/curves/bn254/point.d.ts +54 -0
- package/dest/curves/bn254/point.d.ts.map +1 -0
- package/dest/curves/bn254/point.js +143 -0
- package/dest/curves/grumpkin/index.d.ts +10 -0
- package/dest/curves/grumpkin/index.d.ts.map +1 -0
- package/dest/curves/grumpkin/index.js +3 -0
- package/dest/{fields → curves/grumpkin}/point.d.ts +13 -4
- package/dest/curves/grumpkin/point.d.ts.map +1 -0
- package/dest/{fields → curves/grumpkin}/point.js +7 -7
- package/dest/error/index.d.ts +4 -4
- package/dest/error/index.d.ts.map +1 -1
- 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 +10 -3
- package/dest/eth-signature/eth_signature.d.ts +4 -1
- package/dest/eth-signature/eth_signature.d.ts.map +1 -1
- package/dest/iterator/filter.d.ts +3 -0
- package/dest/iterator/filter.d.ts.map +1 -0
- package/dest/iterator/filter.js +7 -0
- package/dest/iterator/index.d.ts +2 -0
- package/dest/iterator/index.d.ts.map +1 -0
- package/dest/iterator/index.js +1 -0
- package/dest/jest/setup.js +4 -1
- 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 +21 -4
- package/dest/json-rpc/fixtures/class_a.d.ts +3 -3
- package/dest/json-rpc/fixtures/class_a.d.ts.map +1 -1
- package/dest/json-rpc/fixtures/class_b.d.ts +3 -3
- package/dest/json-rpc/fixtures/class_b.d.ts.map +1 -1
- package/dest/json-rpc/server/safe_json_rpc_server.js +1 -1
- 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/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 +116 -27
- package/dest/queue/semaphore.d.ts +5 -1
- package/dest/queue/semaphore.d.ts.map +1 -1
- package/dest/retry/index.d.ts +11 -1
- package/dest/retry/index.d.ts.map +1 -1
- package/dest/retry/index.js +11 -0
- package/dest/schemas/schemas.d.ts +7 -3
- package/dest/schemas/schemas.d.ts.map +1 -1
- package/dest/schemas/schemas.js +9 -3
- package/dest/schemas/types.d.ts +31 -1
- package/dest/schemas/types.d.ts.map +1 -1
- package/dest/schemas/types.js +25 -1
- package/dest/serialize/buffer_reader.d.ts +7 -4
- package/dest/serialize/buffer_reader.d.ts.map +1 -1
- package/dest/serialize/buffer_reader.js +13 -4
- package/dest/serialize/field_reader.d.ts +2 -2
- package/dest/serialize/field_reader.d.ts.map +1 -1
- package/dest/serialize/field_reader.js +1 -1
- package/dest/serialize/free_funcs.d.ts +2 -2
- package/dest/serialize/free_funcs.d.ts.map +1 -1
- package/dest/serialize/free_funcs.js +1 -1
- package/dest/serialize/serialize.d.ts +2 -2
- package/dest/serialize/serialize.d.ts.map +1 -1
- package/dest/serialize/serialize.js +1 -1
- package/dest/sleep/index.d.ts +3 -1
- package/dest/sleep/index.d.ts.map +1 -1
- package/dest/sleep/index.js +4 -0
- package/dest/timer/date.d.ts +2 -1
- package/dest/timer/date.d.ts.map +1 -1
- package/dest/timer/date.js +3 -0
- package/dest/trees/balanced_merkle_tree_root.d.ts +17 -0
- package/dest/trees/balanced_merkle_tree_root.d.ts.map +1 -0
- package/dest/trees/{balanced_merkle_tree.js → balanced_merkle_tree_root.js} +2 -15
- package/dest/trees/hasher.d.ts +3 -1
- package/dest/trees/hasher.d.ts.map +1 -1
- package/dest/trees/hasher.js +10 -5
- package/dest/trees/index.d.ts +4 -4
- package/dest/trees/index.d.ts.map +1 -1
- package/dest/trees/index.js +3 -3
- package/dest/trees/indexed_merkle_tree.js +1 -1
- package/dest/trees/membership_witness.d.ts +12 -2
- package/dest/trees/membership_witness.d.ts.map +1 -1
- package/dest/trees/membership_witness.js +10 -1
- package/dest/trees/merkle_tree_calculator.d.ts +1 -1
- package/dest/trees/merkle_tree_calculator.d.ts.map +1 -1
- package/dest/trees/merkle_tree_calculator.js +2 -2
- package/dest/trees/sibling_path.d.ts +3 -2
- package/dest/trees/sibling_path.d.ts.map +1 -1
- package/dest/trees/sibling_path.js +3 -3
- package/dest/trees/unbalanced_merkle_tree_calculator.d.ts +2 -3
- package/dest/trees/unbalanced_merkle_tree_calculator.d.ts.map +1 -1
- package/dest/trees/unbalanced_merkle_tree_calculator.js +1 -5
- package/dest/trees/{unbalanced_merkle_tree.d.ts → unbalanced_merkle_tree_root.d.ts} +3 -5
- package/dest/trees/unbalanced_merkle_tree_root.d.ts.map +1 -0
- package/dest/trees/{unbalanced_merkle_tree.js → unbalanced_merkle_tree_root.js} +11 -49
- package/dest/trees/unbalanced_tree_store.d.ts +5 -1
- package/dest/trees/unbalanced_tree_store.d.ts.map +1 -1
- package/dest/trees/unbalanced_tree_store.js +49 -1
- package/dest/types/index.d.ts +6 -2
- package/dest/types/index.d.ts.map +1 -1
- package/dest/types/index.js +6 -0
- package/package.json +28 -9
- package/src/array/index.ts +1 -0
- package/src/array/sorted_array.ts +133 -0
- package/src/branded-types/block_number.ts +117 -0
- package/src/branded-types/checkpoint_number.ts +115 -0
- package/src/branded-types/index.ts +3 -0
- package/src/branded-types/index_within_checkpoint.ts +88 -0
- package/src/buffer/buffer16.ts +2 -2
- package/src/buffer/buffer32.ts +2 -2
- package/src/collection/array.ts +52 -0
- package/src/config/env_var.ts +47 -12
- package/src/config/index.ts +39 -6
- package/src/config/network_config.ts +2 -0
- package/src/config/parse-env.ts +4 -0
- package/src/crypto/bls/bn254_keystore.ts +1 -1
- package/src/crypto/bls/index.ts +1 -1
- package/src/crypto/bn254/index.ts +50 -159
- package/src/crypto/ecdsa/signature.ts +2 -2
- package/src/crypto/grumpkin/index.ts +3 -1
- package/src/crypto/keys/index.ts +1 -1
- package/src/crypto/pedersen/pedersen.wasm.ts +1 -1
- package/src/crypto/poseidon/index.ts +1 -11
- package/src/crypto/random/randomness_singleton.ts +6 -4
- package/src/crypto/schnorr/index.ts +2 -1
- package/src/crypto/schnorr/signature.ts +2 -2
- package/src/crypto/sha256/index.ts +1 -1
- package/src/crypto/sha512/index.ts +1 -1
- package/src/crypto/signature/index.ts +1 -1
- package/src/crypto/sync/pedersen/index.ts +1 -1
- package/src/crypto/sync/poseidon/index.ts +1 -10
- package/src/{fields/bls12_fields.ts → curves/bls12/field.ts} +6 -6
- package/src/curves/bls12/index.ts +2 -0
- package/src/{fields/bls12_point.ts → curves/bls12/point.ts} +7 -7
- package/src/{fields/fields.ts → curves/bn254/field.ts} +33 -56
- package/src/curves/bn254/index.ts +2 -0
- package/src/curves/bn254/point.ts +170 -0
- package/src/curves/grumpkin/index.ts +11 -0
- package/src/{fields → curves/grumpkin}/point.ts +7 -7
- package/src/eth-address/index.ts +8 -2
- package/src/iterator/filter.ts +11 -0
- package/src/iterator/index.ts +1 -0
- package/src/jest/setup.mjs +4 -1
- package/src/json-rpc/client/undici.ts +21 -3
- package/src/json-rpc/server/safe_json_rpc_server.ts +1 -1
- package/src/log/libp2p_logger.ts +12 -5
- package/src/log/pino-logger-server.ts +25 -0
- package/src/log/pino-logger.ts +138 -37
- package/src/queue/semaphore.ts +5 -0
- package/src/retry/index.ts +18 -0
- package/src/schemas/schemas.ts +14 -3
- package/src/schemas/types.ts +33 -0
- package/src/serialize/buffer_reader.ts +21 -9
- package/src/serialize/field_reader.ts +1 -1
- package/src/serialize/free_funcs.ts +1 -1
- package/src/serialize/serialize.ts +1 -1
- package/src/sleep/index.ts +6 -0
- package/src/timer/date.ts +4 -0
- package/src/trees/{balanced_merkle_tree.ts → balanced_merkle_tree_root.ts} +2 -16
- package/src/trees/hasher.ts +9 -0
- package/src/trees/index.ts +3 -3
- package/src/trees/indexed_merkle_tree.ts +1 -1
- package/src/trees/membership_witness.ts +9 -1
- package/src/trees/merkle_tree_calculator.ts +2 -2
- package/src/trees/sibling_path.ts +3 -3
- package/src/trees/unbalanced_merkle_tree_calculator.ts +1 -12
- package/src/trees/{unbalanced_merkle_tree.ts → unbalanced_merkle_tree_root.ts} +17 -61
- package/src/trees/unbalanced_tree_store.ts +57 -2
- package/src/types/index.ts +11 -1
- package/dest/crypto/bn254/bn254_utils.d.ts +0 -39
- package/dest/crypto/bn254/bn254_utils.d.ts.map +0 -1
- package/dest/crypto/bn254/bn254_utils.js +0 -56
- package/dest/crypto/index.d.ts +0 -17
- package/dest/crypto/index.d.ts.map +0 -1
- package/dest/crypto/index.js +0 -16
- package/dest/fields/bls12_fields.d.ts.map +0 -1
- package/dest/fields/bls12_point.d.ts.map +0 -1
- package/dest/fields/coordinate.d.ts +0 -63
- package/dest/fields/coordinate.d.ts.map +0 -1
- package/dest/fields/coordinate.js +0 -96
- package/dest/fields/fields.d.ts.map +0 -1
- package/dest/fields/index.d.ts +0 -6
- package/dest/fields/index.d.ts.map +0 -1
- package/dest/fields/index.js +0 -5
- package/dest/fields/point.d.ts.map +0 -1
- package/dest/index.d.ts +0 -31
- package/dest/index.d.ts.map +0 -1
- package/dest/index.js +0 -31
- package/dest/json-rpc/server/telemetry.d.ts +0 -2
- package/dest/json-rpc/server/telemetry.d.ts.map +0 -1
- package/dest/json-rpc/server/telemetry.js +0 -0
- package/dest/trees/balanced_merkle_tree.d.ts +0 -22
- package/dest/trees/balanced_merkle_tree.d.ts.map +0 -1
- package/dest/trees/unbalanced_merkle_tree.d.ts.map +0 -1
- package/src/crypto/bn254/bn254_utils.ts +0 -64
- package/src/crypto/index.ts +0 -16
- package/src/fields/coordinate.ts +0 -104
- package/src/fields/index.ts +0 -5
- package/src/index.ts +0 -31
- package/src/json-rpc/server/telemetry.ts +0 -0
|
@@ -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
|
});
|
|
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGluby1sb2dnZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2cvcGluby1sb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssS0FBSyxFQUFrQyxNQUFNLFdBQVcsQ0FBQztBQUd2RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFRdkMsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDaEQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVsRCx3RUFBd0U7QUFDeEUsTUFBTSxNQUFNLGNBQWMsR0FBRztJQUMzQiwrREFBK0Q7SUFDL0QsS0FBSyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2YsdUZBQXVGO0lBQ3ZGLFVBQVUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNyQixDQUFDO0FBSUYsS0FBSyxrQkFBa0IsR0FBRyxNQUFNLGNBQWMsR0FBRyxTQUFTLENBQUM7QUFHM0Qsd0JBQWdCLHFCQUFxQixDQUFDLE9BQU8sRUFBRSxrQkFBa0IsR0FBRyxJQUFJLENBRXZFO0FBRUQsd0JBQWdCLHdCQUF3QixDQUFDLE9BQU8sRUFBRSxrQkFBa0IsUUFLbkU7QUFZRCx3QkFBZ0IsWUFBWSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsUUFBUSxDQUFDLEVBQUUsY0FBYyxHQUFHLE1BQU0sQ0E2QzlFO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQWdCLGFBQWEsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLGdCQUFnQixDQUFDLEVBQUUsTUFBTSxHQUFHLGNBQWMsR0FBRyxNQUFNLENBS2hHO0FBSUQsS0FBSyxjQUFjLEdBQUcsQ0FBQyxJQUFJLEVBQUUsT0FBTyxLQUFLLE9BQU8sQ0FBQztBQUdqRCx3QkFBZ0IsaUJBQWlCLENBQUMsT0FBTyxFQUFFLGNBQWMsR0FBRyxJQUFJLENBRS9EO0FBZUQsZUFBTyxNQUFPLFFBQVEsa0ZBQUUsVUFBVSx1Q0FBb0QsQ0FBQztBQTBDdkYsZUFBTyxNQUFNLE1BQU07Ozs7O0NBR2xCLENBQUM7QUFlRiwyRkFBMkY7QUFDM0Ysd0JBQWdCLGFBQWEsQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLEtBQUssQ0FRbEQ7QUFFRCw2REFBNkQ7QUFDN0Qsd0JBQWdCLGdCQUFnQixJQUFJLElBQUksQ0FHdkM7QUFNRCxLQUFLLFNBQVMsR0FBRztJQUFFLEtBQUssQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUFDLE1BQU0sQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUFDLFVBQVUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUFDLEdBQUcsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtDQUFFLENBQUM7QUFFeEYseUdBQXlHO0FBQ3pHLHdCQUFnQixnQkFBZ0IsQ0FBQyxHQUFHLEVBQUUsU0FBUyxFQUFFLFVBQVUsRUFBRSxNQUFNLEdBQUcsTUFBTSxDQWtCM0U7QUFjRDs7O0dBR0c7QUFDSCxlQUFPLE1BQU0sY0FBYzs7Ozs7Ozs7OztDQUcxQixDQUFDO0FBMERGLGVBQU8sTUFBTSxNQUFNLDJDQUFlLENBQUM7QUFhbkM7OztHQUdHO0FBQ0gsd0JBQWdCLHNCQUFzQixDQUFDLE1BQU0sRUFBRSxRQUFRLEdBQUcsSUFBSSxDQUU3RDtBQUVEOzs7R0FHRztBQUNILHdCQUFnQixxQkFBcUIsQ0FBQyxNQUFNLEVBQUUsUUFBUSxHQUFHLElBQUksQ0FlNUQ7QUFFRCxvREFBb0Q7QUFDcEQsS0FBSyxVQUFVLEdBQUcsQ0FBQyxHQUFHLEVBQUUsTUFBTSxFQUFFLEdBQUcsQ0FBQyxFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUMsRUFBRSxPQUFPLEtBQUssSUFBSSxDQUFDO0FBRXZFOztHQUVHO0FBQ0gsTUFBTSxNQUFNLE1BQU0sR0FBRztLQUFHLENBQUMsSUFBSSxRQUFRLEdBQUcsS0FBSztDQUFFLEdBQUc7SUFBNEIsS0FBSyxFQUFFLFVBQVUsQ0FBQTtDQUFFLEdBQUc7SUFDbEcsS0FBSyxFQUFFLFFBQVEsQ0FBQztJQUNoQixjQUFjLEVBQUUsQ0FBQyxLQUFLLEVBQUUsUUFBUSxLQUFLLE9BQU8sQ0FBQztJQUM3QyxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsV0FBVyxFQUFFLENBQUMsV0FBVyxFQUFFLE1BQU0sS0FBSyxNQUFNLENBQUM7SUFDN0MsZ0VBQWdFO0lBQ2hFLFdBQVcsRUFBRSxNQUFNLGNBQWMsQ0FBQztDQUNuQyxDQUFDIn0=
|
|
@@ -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;AAQvC,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,uCAAoD,CAAC;AA0CvF,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
|
@@ -3,13 +3,44 @@ import isNode from 'detect-node';
|
|
|
3
3
|
import { pino, symbols } from 'pino';
|
|
4
4
|
import { inspect } from 'util';
|
|
5
5
|
import { compactArray } from '../collection/array.js';
|
|
6
|
-
import { parseBooleanEnv } from '../config/
|
|
6
|
+
import { parseBooleanEnv } from '../config/parse-env.js';
|
|
7
7
|
import { GoogleCloudLoggerConfig } from './gcloud-logger-config.js';
|
|
8
8
|
import { getLogLevelFromFilters, parseEnv } from './log-filters.js';
|
|
9
|
-
|
|
10
|
-
|
|
9
|
+
const logBindingsHandlers = [];
|
|
10
|
+
export function addLogBindingsHandler(handler) {
|
|
11
|
+
logBindingsHandlers.push(handler);
|
|
12
|
+
}
|
|
13
|
+
export function removeLogBindingsHandler(handler) {
|
|
14
|
+
const index = logBindingsHandlers.indexOf(handler);
|
|
15
|
+
if (index !== -1) {
|
|
16
|
+
logBindingsHandlers.splice(index, 1);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
function getBindingsFromHandlers() {
|
|
20
|
+
for (const handler of logBindingsHandlers){
|
|
21
|
+
const bindings = handler();
|
|
22
|
+
if (bindings) {
|
|
23
|
+
return bindings;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
return undefined;
|
|
27
|
+
}
|
|
28
|
+
export function createLogger(module, bindings) {
|
|
29
|
+
module = module.replace(/^aztec:/, '');
|
|
30
|
+
const resolvedBindings = {
|
|
31
|
+
...getBindingsFromHandlers(),
|
|
32
|
+
...bindings
|
|
33
|
+
};
|
|
34
|
+
const actor = resolvedBindings?.actor;
|
|
35
|
+
const instanceId = resolvedBindings?.instanceId;
|
|
11
36
|
const pinoLogger = logger.child({
|
|
12
|
-
module
|
|
37
|
+
module,
|
|
38
|
+
...actor && {
|
|
39
|
+
actor
|
|
40
|
+
},
|
|
41
|
+
...instanceId && {
|
|
42
|
+
instanceId
|
|
43
|
+
}
|
|
13
44
|
}, {
|
|
14
45
|
level: getLogLevelFromFilters(logFilters, module)
|
|
15
46
|
});
|
|
@@ -29,9 +60,25 @@ export function createLogger(module) {
|
|
|
29
60
|
/** Level of the logger */ level: pinoLogger.level,
|
|
30
61
|
/** Whether the given level is enabled for this logger. */ isLevelEnabled: (level)=>isLevelEnabled(pinoLogger, level),
|
|
31
62
|
/** Module name for the logger. */ module,
|
|
32
|
-
/** Creates another logger by extending this logger module name. */ createChild: (childModule)=>createLogger(`${module}:${childModule}
|
|
63
|
+
/** Creates another logger by extending this logger module name and preserving bindings. */ createChild: (childModule)=>createLogger(`${module}:${childModule}`, {
|
|
64
|
+
actor,
|
|
65
|
+
instanceId
|
|
66
|
+
}),
|
|
67
|
+
/** Returns the bindings (actor, instanceId) for this logger. */ getBindings: ()=>({
|
|
68
|
+
actor,
|
|
69
|
+
instanceId
|
|
70
|
+
})
|
|
33
71
|
};
|
|
34
72
|
}
|
|
73
|
+
/**
|
|
74
|
+
* Returns a logger for the given module. If loggerOrBindings is already a Logger, returns it directly.
|
|
75
|
+
* Otherwise, creates a new logger with the given module name and bindings.
|
|
76
|
+
*/ export function resolveLogger(module, loggerOrBindings) {
|
|
77
|
+
if (loggerOrBindings && 'info' in loggerOrBindings) {
|
|
78
|
+
return loggerOrBindings;
|
|
79
|
+
}
|
|
80
|
+
return createLogger(module, loggerOrBindings);
|
|
81
|
+
}
|
|
35
82
|
const logDataHandlers = [];
|
|
36
83
|
export function addLogDataHandler(handler) {
|
|
37
84
|
logDataHandlers.push(handler);
|
|
@@ -39,23 +86,6 @@ export function addLogDataHandler(handler) {
|
|
|
39
86
|
function processLogData(data) {
|
|
40
87
|
return logDataHandlers.reduce((accum, handler)=>handler(accum), data);
|
|
41
88
|
}
|
|
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
89
|
// Patch isLevelEnabled missing from pino/browser.
|
|
60
90
|
function isLevelEnabled(logger, level) {
|
|
61
91
|
return typeof logger.isLevelEnabled === 'function' ? logger.isLevelEnabled(level) : logger.levels.values[level] >= logger.levels.values[logger.level];
|
|
@@ -114,23 +144,82 @@ export const levels = {
|
|
|
114
144
|
// Transport options for pretty logging to stderr via pino-pretty.
|
|
115
145
|
const colorEnv = process.env['FORCE_COLOR'];
|
|
116
146
|
const useColor = colorEnv === undefined ? isColorSupported : parseBooleanEnv(colorEnv);
|
|
117
|
-
const { bold, reset } = createColors({
|
|
147
|
+
const { bold, reset, cyan, magenta, yellow, blue, green, magentaBright, yellowBright, blueBright, greenBright } = createColors({
|
|
118
148
|
useColor
|
|
119
149
|
});
|
|
120
|
-
|
|
150
|
+
// Per-actor coloring: each unique actor gets a different color for easier visual distinction.
|
|
151
|
+
// Disabled when LOG_NO_COLOR_PER_ACTOR is set to a truthy value.
|
|
152
|
+
const useColorPerActor = useColor && !parseBooleanEnv(process.env['LOG_NO_COLOR_PER_ACTOR']);
|
|
153
|
+
const actorColors = [
|
|
154
|
+
yellow,
|
|
155
|
+
magenta,
|
|
156
|
+
blue,
|
|
157
|
+
green,
|
|
158
|
+
magentaBright,
|
|
159
|
+
yellowBright,
|
|
160
|
+
blueBright,
|
|
161
|
+
greenBright
|
|
162
|
+
];
|
|
163
|
+
const actorColorMap = new Map();
|
|
164
|
+
let nextColorIndex = 0;
|
|
165
|
+
/** Returns the color function assigned to a given actor, assigning a new one if needed. */ export function getActorColor(actor) {
|
|
166
|
+
let color = actorColorMap.get(actor);
|
|
167
|
+
if (!color) {
|
|
168
|
+
color = actorColors[nextColorIndex % actorColors.length];
|
|
169
|
+
actorColorMap.set(actor, color);
|
|
170
|
+
nextColorIndex++;
|
|
171
|
+
}
|
|
172
|
+
return color;
|
|
173
|
+
}
|
|
174
|
+
/** Resets the actor-to-color mapping. Useful for testing. */ export function resetActorColors() {
|
|
175
|
+
actorColorMap.clear();
|
|
176
|
+
nextColorIndex = 0;
|
|
177
|
+
}
|
|
178
|
+
// String template for messageFormat (used in worker threads and when per-actor coloring is disabled).
|
|
179
|
+
const messageFormatString = `${bold('{module}')}{if actor} ${cyan('{actor}')}{end}{if instanceId} ${reset(cyan('{instanceId}'))}{end} ${reset('{msg}')}`;
|
|
180
|
+
/** Formats a log message with per-actor coloring. Actor, module, and instanceId share the same color. */ export function formatLogMessage(log, messageKey) {
|
|
181
|
+
const actor = log.actor;
|
|
182
|
+
const module = log.module ?? '';
|
|
183
|
+
const instanceId = log.instanceId;
|
|
184
|
+
const msg = log[messageKey] ?? '';
|
|
185
|
+
// Use actor color for actor, module, and instanceId when actor is present
|
|
186
|
+
const color = actor ? getActorColor(actor) : cyan;
|
|
187
|
+
let result = bold(color(module));
|
|
188
|
+
if (actor) {
|
|
189
|
+
result += ' ' + color(actor);
|
|
190
|
+
}
|
|
191
|
+
if (instanceId) {
|
|
192
|
+
result += ' ' + reset(color(instanceId));
|
|
193
|
+
}
|
|
194
|
+
result += ' ' + reset(String(msg));
|
|
195
|
+
return result;
|
|
196
|
+
}
|
|
197
|
+
// Base options for pino-pretty (shared between transport and direct use).
|
|
198
|
+
const pinoPrettyBaseOpts = {
|
|
121
199
|
destination: 2,
|
|
122
200
|
sync: true,
|
|
123
201
|
colorize: useColor,
|
|
124
|
-
ignore: 'module,pid,hostname,trace_id,span_id,trace_flags,severity',
|
|
125
|
-
messageFormat: `${bold('{module}')} ${reset('{msg}')}`,
|
|
202
|
+
ignore: 'module,actor,instanceId,pid,hostname,trace_id,span_id,trace_flags,severity',
|
|
126
203
|
customLevels: 'fatal:60,error:50,warn:40,info:30,verbose:25,debug:20,trace:10',
|
|
127
204
|
customColors: 'fatal:bgRed,error:red,warn:yellow,info:green,verbose:magenta,debug:blue,trace:gray',
|
|
128
205
|
minimumLevel: 'trace',
|
|
129
206
|
singleLine: !parseBooleanEnv(process.env['LOG_MULTILINE'])
|
|
130
207
|
};
|
|
208
|
+
/**
|
|
209
|
+
* Pino-pretty options for direct use (e.g., jest/setup.mjs).
|
|
210
|
+
* Includes function-based messageFormat for per-actor coloring when enabled.
|
|
211
|
+
*/ export const pinoPrettyOpts = {
|
|
212
|
+
...pinoPrettyBaseOpts,
|
|
213
|
+
messageFormat: useColorPerActor ? formatLogMessage : messageFormatString
|
|
214
|
+
};
|
|
215
|
+
// Transport options use string template only (functions can't be serialized to worker threads).
|
|
216
|
+
const prettyTransportOpts = {
|
|
217
|
+
...pinoPrettyBaseOpts,
|
|
218
|
+
messageFormat: messageFormatString
|
|
219
|
+
};
|
|
131
220
|
const prettyTransport = {
|
|
132
221
|
target: 'pino-pretty',
|
|
133
|
-
options:
|
|
222
|
+
options: prettyTransportOpts,
|
|
134
223
|
level: 'trace'
|
|
135
224
|
};
|
|
136
225
|
// Transport for vanilla stdio logging as JSON.
|
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
export interface ISemaphore {
|
|
2
|
+
acquire(): Promise<void>;
|
|
3
|
+
release(): void;
|
|
4
|
+
}
|
|
1
5
|
/**
|
|
2
6
|
* Allows the acquiring of up to `size` tokens before calls to acquire block, waiting for a call to release().
|
|
3
7
|
*/
|
|
@@ -20,4 +24,4 @@ export declare class Semaphore {
|
|
|
20
24
|
*/
|
|
21
25
|
release(): void;
|
|
22
26
|
}
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VtYXBob3JlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcXVldWUvc2VtYXBob3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE1BQU0sV0FBVyxVQUFVO0lBQ3pCLE9BQU8sSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDekIsT0FBTyxJQUFJLElBQUksQ0FBQztDQUNqQjtBQUVEOztHQUVHO0FBQ0gscUJBQWEsU0FBUztJQUNwQixPQUFPLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBa0M7SUFFeEQsWUFBWSxJQUFJLEVBQUUsTUFBTSxFQUV2QjtJQUVEOzs7Ozs7T0FNRztJQUNVLE9BQU8sa0JBRW5CO0lBRUQ7Ozs7O09BS0c7SUFDSSxPQUFPLFNBRWI7Q0FDRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"semaphore.d.ts","sourceRoot":"","sources":["../../src/queue/semaphore.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAkC;IAExD,YAAY,IAAI,EAAE,MAAM,EAEvB;IAED;;;;;;OAMG;IACU,OAAO,kBAEnB;IAED;;;;;OAKG;IACI,OAAO,SAEb;CACF"}
|
|
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;;GAEG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAkC;IAExD,YAAY,IAAI,EAAE,MAAM,EAEvB;IAED;;;;;;OAMG;IACU,OAAO,kBAEnB;IAED;;;;;OAKG;IACI,OAAO,SAEb;CACF"}
|
package/dest/retry/index.d.ts
CHANGED
|
@@ -42,4 +42,14 @@ export declare function retry<Result>(fn: () => Promise<Result>, name?: string,
|
|
|
42
42
|
* @returns A Promise that resolves with the successful (truthy) result of the provided function, or rejects if timeout is exceeded.
|
|
43
43
|
*/
|
|
44
44
|
export declare function retryUntil<T>(fn: () => (T | undefined) | Promise<T | undefined>, name?: string, timeout?: number, interval?: number): Promise<NonNullable<Awaited<T>>>;
|
|
45
|
-
|
|
45
|
+
/**
|
|
46
|
+
* Convenience wrapper around retryUntil with fast polling for tests.
|
|
47
|
+
* Uses 10s timeout and 100ms polling interval by default.
|
|
48
|
+
*
|
|
49
|
+
* @param fn - The function to retry until it returns a truthy value.
|
|
50
|
+
* @param name - Description of what we're waiting for (for error messages).
|
|
51
|
+
* @param timeout - Optional timeout in seconds. Defaults to 10s.
|
|
52
|
+
* @param interval - Optional interval in seconds. Defaults to 0.1s (100ms).
|
|
53
|
+
*/
|
|
54
|
+
export declare function retryFastUntil<T>(fn: () => (T | undefined) | Promise<T | undefined>, name?: string, timeout?: number, interval?: number): Promise<NonNullable<Awaited<T>>>;
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9yZXRyeS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0saUJBQWlCLENBQUM7QUFJNUQsd0VBQXdFO0FBQ3hFLHFCQUFhLFlBQWEsU0FBUSxLQUFLO0NBQUc7QUFFMUM7Ozs7Ozs7R0FPRztBQUNILHdCQUFpQixnQkFBZ0IscUNBTWhDO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFpQixXQUFXLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxvQ0FJN0M7QUFFRDs7Ozs7Ozs7Ozs7R0FXRztBQUNILHdCQUFzQixLQUFLLENBQUMsTUFBTSxFQUNoQyxFQUFFLEVBQUUsTUFBTSxPQUFPLENBQUMsTUFBTSxDQUFDLEVBQ3pCLElBQUksU0FBYyxFQUNsQixPQUFPLG1DQUFxQixFQUM1QixHQUFHLEdBQUUsTUFBeUMsRUFDOUMsWUFBWSxVQUFRLG1CQW9CckI7QUFFRDs7Ozs7Ozs7OztHQVVHO0FBQ0gsd0JBQXNCLFVBQVUsQ0FBQyxDQUFDLEVBQ2hDLEVBQUUsRUFBRSxNQUFNLENBQUMsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxDQUFDLEdBQUcsU0FBUyxDQUFDLEVBQ2xELElBQUksU0FBSyxFQUNULE9BQU8sU0FBSSxFQUNYLFFBQVEsU0FBSSxvQ0FlYjtBQUVEOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQWdCLGNBQWMsQ0FBQyxDQUFDLEVBQzlCLEVBQUUsRUFBRSxNQUFNLENBQUMsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxDQUFDLEdBQUcsU0FBUyxDQUFDLEVBQ2xELElBQUksU0FBSyxFQUNULE9BQU8sU0FBSyxFQUNaLFFBQVEsU0FBTSxvQ0FHZiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/retry/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,iBAAiB,CAAC;AAI5D,wEAAwE;AACxE,qBAAa,YAAa,SAAQ,KAAK;CAAG;AAE1C;;;;;;;GAOG;AACH,wBAAiB,gBAAgB,qCAMhC;AAED;;;;GAIG;AACH,wBAAiB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,oCAI7C;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,KAAK,CAAC,MAAM,EAChC,EAAE,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EACzB,IAAI,SAAc,EAClB,OAAO,mCAAqB,EAC5B,GAAG,GAAE,MAAyC,EAC9C,YAAY,UAAQ,mBAoBrB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAAC,CAAC,EAChC,EAAE,EAAE,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,EAClD,IAAI,SAAK,EACT,OAAO,SAAI,EACX,QAAQ,SAAI,oCAeb"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/retry/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,iBAAiB,CAAC;AAI5D,wEAAwE;AACxE,qBAAa,YAAa,SAAQ,KAAK;CAAG;AAE1C;;;;;;;GAOG;AACH,wBAAiB,gBAAgB,qCAMhC;AAED;;;;GAIG;AACH,wBAAiB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,oCAI7C;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,KAAK,CAAC,MAAM,EAChC,EAAE,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EACzB,IAAI,SAAc,EAClB,OAAO,mCAAqB,EAC5B,GAAG,GAAE,MAAyC,EAC9C,YAAY,UAAQ,mBAoBrB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAAC,CAAC,EAChC,EAAE,EAAE,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,EAClD,IAAI,SAAK,EACT,OAAO,SAAI,EACX,QAAQ,SAAI,oCAeb;AAED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAC9B,EAAE,EAAE,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,EAClD,IAAI,SAAK,EACT,OAAO,SAAK,EACZ,QAAQ,SAAM,oCAGf"}
|
package/dest/retry/index.js
CHANGED
|
@@ -91,3 +91,14 @@ import { Timer } from '../timer/index.js';
|
|
|
91
91
|
}
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
|
+
/**
|
|
95
|
+
* Convenience wrapper around retryUntil with fast polling for tests.
|
|
96
|
+
* Uses 10s timeout and 100ms polling interval by default.
|
|
97
|
+
*
|
|
98
|
+
* @param fn - The function to retry until it returns a truthy value.
|
|
99
|
+
* @param name - Description of what we're waiting for (for error messages).
|
|
100
|
+
* @param timeout - Optional timeout in seconds. Defaults to 10s.
|
|
101
|
+
* @param interval - Optional interval in seconds. Defaults to 0.1s (100ms).
|
|
102
|
+
*/ export function retryFastUntil(fn, name = '', timeout = 10, interval = 0.1) {
|
|
103
|
+
return retryUntil(fn, name, timeout, interval);
|
|
104
|
+
}
|
|
@@ -3,9 +3,9 @@ import { EpochNumber } from '../branded-types/epoch.js';
|
|
|
3
3
|
import { SlotNumber } from '../branded-types/slot.js';
|
|
4
4
|
import { Buffer32 } from '../buffer/buffer32.js';
|
|
5
5
|
import { SecretValue } from '../config/secret_value.js';
|
|
6
|
+
import { Fq, Fr } from '../curves/bn254/field.js';
|
|
7
|
+
import { Point } from '../curves/grumpkin/point.js';
|
|
6
8
|
import { EthAddress } from '../eth-address/index.js';
|
|
7
|
-
import { Fq, Fr } from '../fields/fields.js';
|
|
8
|
-
import { Point } from '../fields/point.js';
|
|
9
9
|
export declare const schemas: {
|
|
10
10
|
/** Accepts a number, bigint, or string as an EpochNumber. */
|
|
11
11
|
EpochNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, EpochNumber, string | number | bigint>;
|
|
@@ -27,6 +27,8 @@ export declare const schemas: {
|
|
|
27
27
|
Integer: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
|
|
28
28
|
/** Coerces input to UInt32. */
|
|
29
29
|
UInt32: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
|
|
30
|
+
/** Coerces input to UInt64. */
|
|
31
|
+
UInt64: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
|
|
30
32
|
/** Accepts a hex string as a Buffer32 type. */
|
|
31
33
|
Buffer32: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, Buffer32, string>;
|
|
32
34
|
/** Accepts a base64 string or an object `{ type: 'Buffer', data: [byte, byte...] }` as a buffer. */
|
|
@@ -35,8 +37,10 @@ export declare const schemas: {
|
|
|
35
37
|
BufferHex: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>;
|
|
36
38
|
/** Hex string with an optional 0x prefix which gets removed as part of the parsing. */
|
|
37
39
|
HexString: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>;
|
|
40
|
+
/** Hex string with an optional 0x prefix which gets enforced as part of the parsing. */
|
|
41
|
+
HexStringWith0x: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, `0x${string}`, string>;
|
|
38
42
|
/** A secret config value */
|
|
39
43
|
SecretValue: typeof SecretValue.schema;
|
|
40
44
|
};
|
|
41
45
|
export type { EpochNumber, EthAddress, Fq, Fr, Point, SlotNumber };
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NoZW1hcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NjaGVtYXMvc2NoZW1hcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxXQUFXLEVBQXFCLE1BQU0sMkJBQTJCLENBQUM7QUFDM0UsT0FBTyxFQUFFLFVBQVUsRUFBb0IsTUFBTSwwQkFBMEIsQ0FBQztBQUN4RSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDakQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3hELE9BQU8sRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDbEQsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3BELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUlyRCxlQUFPLE1BQU0sT0FBTztJQUNsQiw2REFBNkQ7O0lBRzdELDJEQUEyRDs7SUFHM0QsNEJBQTRCOztJQUc1Qiw0QkFBNEI7O0lBRzVCLDRCQUE0Qjs7SUFHNUIseUNBQXlDOztJQUd6QyxvREFBb0Q7O0lBY3BELG1DQUFtQzs7SUFHbkMsMkNBQTJDOztJQUczQywrQkFBK0I7O0lBUy9CLCtCQUErQjs7SUFRL0IsK0NBQStDOztJQUcvQyxvR0FBb0c7O0lBR3BHLHdDQUF3Qzs7SUFPeEMsdUZBQXVGOztJQUd2Rix3RkFBd0Y7O0lBR3hGLDRCQUE0Qjs7Q0FFN0IsQ0FBQztBQUdGLFlBQVksRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsS0FBSyxFQUFFLFVBQVUsRUFBRSxDQUFDIn0=
|
|
@@ -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,
|
|
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"}
|
package/dest/schemas/schemas.js
CHANGED
|
@@ -3,10 +3,10 @@ import { EpochNumberSchema } from '../branded-types/epoch.js';
|
|
|
3
3
|
import { SlotNumberSchema } from '../branded-types/slot.js';
|
|
4
4
|
import { Buffer32 } from '../buffer/buffer32.js';
|
|
5
5
|
import { SecretValue } from '../config/secret_value.js';
|
|
6
|
+
import { Fq, Fr } from '../curves/bn254/field.js';
|
|
7
|
+
import { Point } from '../curves/grumpkin/point.js';
|
|
6
8
|
import { EthAddress } from '../eth-address/index.js';
|
|
7
|
-
import {
|
|
8
|
-
import { Point } from '../fields/point.js';
|
|
9
|
-
import { isHex, withoutHexPrefix } from '../string/index.js';
|
|
9
|
+
import { isHex, withHexPrefix, withoutHexPrefix } from '../string/index.js';
|
|
10
10
|
import { bufferSchema, hexSchema } from './utils.js';
|
|
11
11
|
export const schemas = {
|
|
12
12
|
/** Accepts a number, bigint, or string as an EpochNumber. */ EpochNumber: EpochNumberSchema,
|
|
@@ -42,9 +42,15 @@ export const schemas = {
|
|
|
42
42
|
z.number(),
|
|
43
43
|
z.string()
|
|
44
44
|
]).pipe(z.coerce.number().int().min(0).max(2 ** 32 - 1)),
|
|
45
|
+
/** Coerces input to UInt64. */ UInt64: z.union([
|
|
46
|
+
z.bigint(),
|
|
47
|
+
z.number(),
|
|
48
|
+
z.string()
|
|
49
|
+
]).pipe(z.coerce.bigint().min(0n).max(2n ** 64n - 1n)),
|
|
45
50
|
/** Accepts a hex string as a Buffer32 type. */ Buffer32: z.string().refine(isHex, 'Not a valid hex string').transform(Buffer32.fromString),
|
|
46
51
|
/** Accepts a base64 string or an object `{ type: 'Buffer', data: [byte, byte...] }` as a buffer. */ Buffer: bufferSchema,
|
|
47
52
|
/** Accepts a hex string as a buffer. */ BufferHex: z.string().refine(isHex, 'Not a valid hex string').transform(withoutHexPrefix).transform((data)=>Buffer.from(data, 'hex')),
|
|
48
53
|
/** Hex string with an optional 0x prefix which gets removed as part of the parsing. */ HexString: hexSchema,
|
|
54
|
+
/** Hex string with an optional 0x prefix which gets enforced as part of the parsing. */ HexStringWith0x: z.string().refine(isHex, 'Not a valid hex string').transform(withHexPrefix),
|
|
49
55
|
/** A secret config value */ SecretValue: SecretValue.schema
|
|
50
56
|
};
|
package/dest/schemas/types.d.ts
CHANGED
|
@@ -1,3 +1,33 @@
|
|
|
1
1
|
import type { ZodType } from 'zod';
|
|
2
2
|
export type ZodFor<T> = ZodType<T, any, any>;
|
|
3
|
-
|
|
3
|
+
/**
|
|
4
|
+
* Creates a schema validator that enforces all properties of type T are present in the schema.
|
|
5
|
+
* This provides compile-time safety to ensure schemas don't miss optional properties.
|
|
6
|
+
*
|
|
7
|
+
* @example
|
|
8
|
+
* ```ts
|
|
9
|
+
* interface MyConfig {
|
|
10
|
+
* foo: string;
|
|
11
|
+
* bar?: number;
|
|
12
|
+
* }
|
|
13
|
+
*
|
|
14
|
+
* // ✅ This will work - all keys present
|
|
15
|
+
* const schema1 = zodFor<MyConfig>()(z.object({
|
|
16
|
+
* foo: z.string(),
|
|
17
|
+
* bar: z.number().optional(),
|
|
18
|
+
* }));
|
|
19
|
+
*
|
|
20
|
+
* // ❌ This will error - 'bar' is missing
|
|
21
|
+
* const schema2 = zodFor<MyConfig>()(z.object({
|
|
22
|
+
* foo: z.string(),
|
|
23
|
+
* }));
|
|
24
|
+
* ```
|
|
25
|
+
*/
|
|
26
|
+
export declare function zodFor<T>(): <S extends ZodType<any, any, any>>(schema: keyof T extends keyof S["_output"] ? keyof S["_output"] extends keyof T ? S : S & {
|
|
27
|
+
__error__: "Schema has extra keys not in type";
|
|
28
|
+
__extra__: Exclude<keyof S["_output"], keyof T>;
|
|
29
|
+
} : S & {
|
|
30
|
+
__error__: "Schema is missing keys from type";
|
|
31
|
+
__missing__: Exclude<keyof T, keyof S["_output"]>;
|
|
32
|
+
}) => S;
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zY2hlbWFzL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLEtBQUssQ0FBQztBQUVuQyxNQUFNLE1BQU0sTUFBTSxDQUFDLENBQUMsSUFBSSxPQUFPLENBQUMsQ0FBQyxFQUFFLEdBQUcsRUFBRSxHQUFHLENBQUMsQ0FBQztBQUU3Qzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQXNCRztBQUNILHdCQUFnQixNQUFNLENBQUMsQ0FBQyxNQUNRLENBQUM7Ozs7OztRQU9oQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/schemas/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAEnC,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/schemas/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAEnC,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAE7C;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,MAAM,CAAC,CAAC,MACQ,CAAC;;;;;;QAOhC"}
|
package/dest/schemas/types.js
CHANGED
|
@@ -1 +1,25 @@
|
|
|
1
|
-
|
|
1
|
+
/**
|
|
2
|
+
* Creates a schema validator that enforces all properties of type T are present in the schema.
|
|
3
|
+
* This provides compile-time safety to ensure schemas don't miss optional properties.
|
|
4
|
+
*
|
|
5
|
+
* @example
|
|
6
|
+
* ```ts
|
|
7
|
+
* interface MyConfig {
|
|
8
|
+
* foo: string;
|
|
9
|
+
* bar?: number;
|
|
10
|
+
* }
|
|
11
|
+
*
|
|
12
|
+
* // ✅ This will work - all keys present
|
|
13
|
+
* const schema1 = zodFor<MyConfig>()(z.object({
|
|
14
|
+
* foo: z.string(),
|
|
15
|
+
* bar: z.number().optional(),
|
|
16
|
+
* }));
|
|
17
|
+
*
|
|
18
|
+
* // ❌ This will error - 'bar' is missing
|
|
19
|
+
* const schema2 = zodFor<MyConfig>()(z.object({
|
|
20
|
+
* foo: z.string(),
|
|
21
|
+
* }));
|
|
22
|
+
* ```
|
|
23
|
+
*/ export function zodFor() {
|
|
24
|
+
return (schema)=>schema;
|
|
25
|
+
}
|