@aztec/foundation 0.33.0 → 0.34.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/crypto/random/randomness_singleton.js +3 -3
- package/dest/fifo/bounded_serial_queue.d.ts +1 -1
- package/dest/fifo/bounded_serial_queue.d.ts.map +1 -1
- package/dest/fifo/memory_fifo.d.ts +1 -1
- package/dest/fifo/memory_fifo.d.ts.map +1 -1
- package/dest/json-rpc/client/json_rpc_client.d.ts +1 -1
- package/dest/json-rpc/client/json_rpc_client.js +8 -8
- package/dest/json-rpc/server/json_proxy.js +5 -5
- package/dest/json-rpc/server/json_rpc_server.d.ts +2 -2
- package/dest/json-rpc/server/json_rpc_server.d.ts.map +1 -1
- package/dest/log/logger.d.ts +2 -2
- package/dest/log/logger.d.ts.map +1 -1
- package/dest/log/logger.js +4 -5
- package/dest/retry/index.d.ts +1 -1
- package/dest/retry/index.d.ts.map +1 -1
- package/dest/retry/index.js +2 -2
- package/dest/transport/dispatch/create_dispatch_fn.d.ts +2 -2
- package/dest/transport/dispatch/create_dispatch_fn.d.ts.map +1 -1
- package/dest/transport/dispatch/create_dispatch_fn.js +4 -4
- package/dest/transport/transport_client.js +4 -4
- package/dest/worker/worker_pool.js +4 -4
- package/package.json +2 -2
- package/src/crypto/random/randomness_singleton.ts +2 -2
- package/src/json-rpc/client/json_rpc_client.ts +7 -7
- package/src/json-rpc/server/json_proxy.ts +4 -4
- package/src/log/logger.ts +4 -5
- package/src/retry/index.ts +1 -1
- package/src/transport/dispatch/create_dispatch_fn.ts +3 -3
- package/src/transport/transport_client.ts +3 -3
- package/src/worker/worker_pool.ts +3 -3
|
@@ -13,11 +13,11 @@ export class RandomnessSingleton {
|
|
|
13
13
|
this.log = log;
|
|
14
14
|
this.counter = 0;
|
|
15
15
|
if (seed !== undefined) {
|
|
16
|
-
this.log(`Using pseudo-randomness with seed: ${seed}`);
|
|
16
|
+
this.log.info(`Using pseudo-randomness with seed: ${seed}`);
|
|
17
17
|
this.counter = seed;
|
|
18
18
|
}
|
|
19
19
|
else {
|
|
20
|
-
this.log('Using true randomness');
|
|
20
|
+
this.log.info('Using true randomness');
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
static getInstance() {
|
|
@@ -52,4 +52,4 @@ export class RandomnessSingleton {
|
|
|
52
52
|
return result;
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmFuZG9tbmVzc19zaW5nbGV0b24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY3J5cHRvL3JhbmRvbS9yYW5kb21uZXNzX3NpbmdsZXRvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUV4RDs7Ozs7OztHQU9HO0FBQ0gsTUFBTSxPQUFPLG1CQUFtQjtJQUs5QixZQUNtQixJQUFhLEVBQ2IsTUFBTSxpQkFBaUIsQ0FBQyw0QkFBNEIsQ0FBQztRQURyRCxTQUFJLEdBQUosSUFBSSxDQUFTO1FBQ2IsUUFBRyxHQUFILEdBQUcsQ0FBa0Q7UUFKaEUsWUFBTyxHQUFHLENBQUMsQ0FBQztRQU1sQixJQUFJLElBQUksS0FBSyxTQUFTLEVBQUUsQ0FBQztZQUN2QixJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxzQ0FBc0MsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUM1RCxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQztRQUN0QixDQUFDO2FBQU0sQ0FBQztZQUNOLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLHVCQUF1QixDQUFDLENBQUM7UUFDekMsQ0FBQztJQUNILENBQUM7SUFFTSxNQUFNLENBQUMsV0FBVztRQUN2QixJQUFJLENBQUMsbUJBQW1CLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDbEMsTUFBTSxJQUFJLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7WUFDckUsbUJBQW1CLENBQUMsUUFBUSxHQUFHLElBQUksbUJBQW1CLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDL0QsQ0FBQztRQUVELE9BQU8sbUJBQW1CLENBQUMsUUFBUSxDQUFDO0lBQ3RDLENBQUM7SUFFRDs7O09BR0c7SUFDSSxlQUFlO1FBQ3BCLE9BQU8sSUFBSSxDQUFDLElBQUksS0FBSyxTQUFTLENBQUM7SUFDakMsQ0FBQztJQUVNLFFBQVEsQ0FBQyxNQUFjO1FBQzVCLElBQUksSUFBSSxDQUFDLElBQUksS0FBSyxTQUFTLEVBQUUsQ0FBQztZQUM1Qiw2RkFBNkY7WUFDN0YsNEZBQTRGO1lBQzVGLDhGQUE4RjtZQUM5RixpREFBaUQ7WUFDakQsTUFBTSxJQUFJLEtBQUssQ0FBQyxtRUFBbUUsQ0FBQyxDQUFDO1FBQ3ZGLENBQUM7UUFDRCxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3BDLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxNQUFNLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztZQUNoQyw4R0FBOEc7WUFDOUcsd0RBQXdEO1lBQ3hELE1BQU0sQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxPQUFPLElBQUksQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUM7UUFDL0MsQ0FBQztRQUNELElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNmLE9BQU8sTUFBTSxDQUFDO0lBQ2hCLENBQUM7Q0FDRiJ9
|
|
@@ -6,7 +6,7 @@ export declare class BoundedSerialQueue {
|
|
|
6
6
|
private log;
|
|
7
7
|
private readonly queue;
|
|
8
8
|
private semaphore;
|
|
9
|
-
constructor(maxQueueSize: number, log?: import("../log/logger.js").
|
|
9
|
+
constructor(maxQueueSize: number, log?: import("../log/logger.js").Logger);
|
|
10
10
|
/**
|
|
11
11
|
* Initializes the underlying SerialQueue instance, allowing items to be processed from the queue.
|
|
12
12
|
* The start method should be called before using the BoundedSerialQueue to ensure proper functionality.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bounded_serial_queue.d.ts","sourceRoot":"","sources":["../../src/fifo/bounded_serial_queue.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,qBAAa,kBAAkB;IAIK,OAAO,CAAC,GAAG;IAH7C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAC3C,OAAO,CAAC,SAAS,CAAY;gBAEjB,YAAY,EAAE,MAAM,EAAU,GAAG,
|
|
1
|
+
{"version":3,"file":"bounded_serial_queue.d.ts","sourceRoot":"","sources":["../../src/fifo/bounded_serial_queue.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,qBAAa,kBAAkB;IAIK,OAAO,CAAC,GAAG;IAH7C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAC3C,OAAO,CAAC,SAAS,CAAY;gBAEjB,YAAY,EAAE,MAAM,EAAU,GAAG,oCAA6D;IAI1G;;;OAGG;IACI,KAAK;IAIZ;;;;;OAKG;IACI,MAAM;IAIb;;;;;OAKG;IACI,MAAM;IAIb;;;;;;;OAOG;IACI,GAAG;IAIV;;;;;OAKG;IACU,GAAG,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAexD;;;;OAIG;IACU,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAWtD;;OAEG;IACU,SAAS;CAGvB"}
|
|
@@ -8,7 +8,7 @@ export declare class MemoryFifo<T> {
|
|
|
8
8
|
private waiting;
|
|
9
9
|
private items;
|
|
10
10
|
private flushing;
|
|
11
|
-
constructor(log?: import("../log/logger.js").
|
|
11
|
+
constructor(log?: import("../log/logger.js").Logger);
|
|
12
12
|
/**
|
|
13
13
|
* Returns the current number of items in the queue.
|
|
14
14
|
* The length represents the size of the queue at the time of invocation and may change as new items are added or consumed.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory_fifo.d.ts","sourceRoot":"","sources":["../../src/fifo/memory_fifo.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,qBAAa,UAAU,CAAC,CAAC;IAKX,OAAO,CAAC,GAAG;IAJvB,OAAO,CAAC,OAAO,CAAoC;IACnD,OAAO,CAAC,KAAK,CAAW;IACxB,OAAO,CAAC,QAAQ,CAAS;gBAEL,GAAG,
|
|
1
|
+
{"version":3,"file":"memory_fifo.d.ts","sourceRoot":"","sources":["../../src/fifo/memory_fifo.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,qBAAa,UAAU,CAAC,CAAC;IAKX,OAAO,CAAC,GAAG;IAJvB,OAAO,CAAC,OAAO,CAAoC;IACnD,OAAO,CAAC,KAAK,CAAW;IACxB,OAAO,CAAC,QAAQ,CAAS;gBAEL,GAAG,oCAAoD;IAE3E;;;;;OAKG;IACI,MAAM;IAIb;;;;;;OAMG;IACI,GAAG,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAyB/C;;;;OAIG;IACI,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO;IAa5B;;;;OAIG;IACI,GAAG;IAKV;;;;OAIG;IACI,MAAM;IAMb;;;;;;;;OAQG;IACU,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;CAazD"}
|
|
@@ -8,7 +8,7 @@ export { JsonStringify } from '../convert.js';
|
|
|
8
8
|
* @param host - The host URL.
|
|
9
9
|
* @param method - The RPC method name.
|
|
10
10
|
* @param body - The RPC payload.
|
|
11
|
-
* @param noRetry - Whether to throw a `NoRetryError` in case the response is
|
|
11
|
+
* @param noRetry - Whether to throw a `NoRetryError` in case the response is a 5xx error and the body contains an error
|
|
12
12
|
* message (see `retry` function for more details).
|
|
13
13
|
* @returns The parsed JSON response, or throws an error.
|
|
14
14
|
*/
|
|
@@ -4,19 +4,19 @@ import { NoRetryError, makeBackoff, retry } from '../../retry/index.js';
|
|
|
4
4
|
import { ClassConverter } from '../class_converter.js';
|
|
5
5
|
import { JsonStringify, convertFromJsonObj, convertToJsonObj } from '../convert.js';
|
|
6
6
|
export { JsonStringify } from '../convert.js';
|
|
7
|
-
const
|
|
7
|
+
const log = createDebugLogger('json-rpc:json_rpc_client');
|
|
8
8
|
/**
|
|
9
9
|
* A normal fetch function that does not retry.
|
|
10
10
|
* Alternatives are a fetch function with retries, or a mocked fetch.
|
|
11
11
|
* @param host - The host URL.
|
|
12
12
|
* @param method - The RPC method name.
|
|
13
13
|
* @param body - The RPC payload.
|
|
14
|
-
* @param noRetry - Whether to throw a `NoRetryError` in case the response is
|
|
14
|
+
* @param noRetry - Whether to throw a `NoRetryError` in case the response is a 5xx error and the body contains an error
|
|
15
15
|
* message (see `retry` function for more details).
|
|
16
16
|
* @returns The parsed JSON response, or throws an error.
|
|
17
17
|
*/
|
|
18
18
|
export async function defaultFetch(host, rpcMethod, body, useApiEndpoints, noRetry = false) {
|
|
19
|
-
debug(format(`JsonRpcClient.fetch`, host, rpcMethod, '->', body));
|
|
19
|
+
log.debug(format(`JsonRpcClient.fetch`, host, rpcMethod, '->', body));
|
|
20
20
|
let resp;
|
|
21
21
|
if (useApiEndpoints) {
|
|
22
22
|
resp = await fetch(`${host}/${rpcMethod}`, {
|
|
@@ -43,7 +43,7 @@ export async function defaultFetch(host, rpcMethod, body, useApiEndpoints, noRet
|
|
|
43
43
|
throw new Error(`Failed to parse body as JSON: ${resp.text()}`);
|
|
44
44
|
}
|
|
45
45
|
if (!resp.ok) {
|
|
46
|
-
if (noRetry) {
|
|
46
|
+
if (noRetry || (resp.status >= 400 && resp.status < 500)) {
|
|
47
47
|
throw new NoRetryError('(JSON-RPC PROPAGATED) ' + responseJson.error.message);
|
|
48
48
|
}
|
|
49
49
|
else {
|
|
@@ -84,9 +84,9 @@ export function createJsonRpcClient(host, stringClassMap, objectClassMap, useApi
|
|
|
84
84
|
method,
|
|
85
85
|
params: params.map(param => convertToJsonObj(classConverter, param)),
|
|
86
86
|
};
|
|
87
|
-
debug(format(`JsonRpcClient.request`, method, '<-', params));
|
|
87
|
+
log.debug(format(`JsonRpcClient.request`, method, '<-', params));
|
|
88
88
|
const res = await fetch(host, method, body, useApiEndpoints);
|
|
89
|
-
debug(format(`JsonRpcClient.result`, method, '->', res));
|
|
89
|
+
log.debug(format(`JsonRpcClient.result`, method, '->', res));
|
|
90
90
|
if (res.error) {
|
|
91
91
|
throw res.error;
|
|
92
92
|
}
|
|
@@ -107,10 +107,10 @@ export function createJsonRpcClient(host, stringClassMap, objectClassMap, useApi
|
|
|
107
107
|
return Reflect.get(target, method);
|
|
108
108
|
}
|
|
109
109
|
return (...params) => {
|
|
110
|
-
debug(format(`JsonRpcClient.constructor`, 'proxy', rpcMethod, '<-', params));
|
|
110
|
+
log.debug(format(`JsonRpcClient.constructor`, 'proxy', rpcMethod, '<-', params));
|
|
111
111
|
return request(rpcMethod, params);
|
|
112
112
|
};
|
|
113
113
|
},
|
|
114
114
|
});
|
|
115
115
|
}
|
|
116
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
116
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoianNvbl9ycGNfY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2pzb24tcnBjL2NsaWVudC9qc29uX3JwY19jbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBS0EsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUU5QixPQUFPLEVBQW9CLGlCQUFpQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDekUsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQUUsS0FBSyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDeEUsT0FBTyxFQUFFLGNBQWMsRUFBZ0UsTUFBTSx1QkFBdUIsQ0FBQztBQUNySCxPQUFPLEVBQUUsYUFBYSxFQUFFLGtCQUFrQixFQUFFLGdCQUFnQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRXBGLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFOUMsTUFBTSxHQUFHLEdBQUcsaUJBQWlCLENBQUMsMEJBQTBCLENBQUMsQ0FBQztBQUMxRDs7Ozs7Ozs7O0dBU0c7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLFlBQVksQ0FDaEMsSUFBWSxFQUNaLFNBQWlCLEVBQ2pCLElBQVMsRUFDVCxlQUF3QixFQUN4QixPQUFPLEdBQUcsS0FBSztJQUVmLEdBQUcsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLHFCQUFxQixFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUM7SUFDdEUsSUFBSSxJQUFjLENBQUM7SUFDbkIsSUFBSSxlQUFlLEVBQUUsQ0FBQztRQUNwQixJQUFJLEdBQUcsTUFBTSxLQUFLLENBQUMsR0FBRyxJQUFJLElBQUksU0FBUyxFQUFFLEVBQUU7WUFDekMsTUFBTSxFQUFFLE1BQU07WUFDZCxJQUFJLEVBQUUsYUFBYSxDQUFDLElBQUksQ0FBQztZQUN6QixPQUFPLEVBQUUsRUFBRSxjQUFjLEVBQUUsa0JB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
|
|
@@ -3,7 +3,7 @@ import { createDebugLogger } from '../../log/index.js';
|
|
|
3
3
|
import { ClassConverter } from '../class_converter.js';
|
|
4
4
|
import { convertFromJsonObj, convertToJsonObj } from '../convert.js';
|
|
5
5
|
import { assert, hasOwnProperty } from '../js_utils.js';
|
|
6
|
-
const
|
|
6
|
+
const log = createDebugLogger('json-rpc:json_proxy');
|
|
7
7
|
/**
|
|
8
8
|
* Handles conversion of objects over the write.
|
|
9
9
|
* Delegates to a ClassConverter object.
|
|
@@ -23,7 +23,7 @@ export class JsonProxy {
|
|
|
23
23
|
* @returns The remote result.
|
|
24
24
|
*/
|
|
25
25
|
async call(methodName, jsonParams = [], skipConversion = false) {
|
|
26
|
-
debug(format(`JsonProxy:call`, methodName, jsonParams));
|
|
26
|
+
log.debug(format(`JsonProxy:call`, methodName, jsonParams));
|
|
27
27
|
// Get access to our class members
|
|
28
28
|
const proto = Object.getPrototypeOf(this.handler);
|
|
29
29
|
assert(hasOwnProperty(proto, methodName), `JsonProxy: Method ${methodName} not found!`);
|
|
@@ -33,14 +33,14 @@ export class JsonProxy {
|
|
|
33
33
|
if (!skipConversion) {
|
|
34
34
|
convertedParams = jsonParams.map(param => convertFromJsonObj(this.classConverter, param));
|
|
35
35
|
}
|
|
36
|
-
debug(format('JsonProxy:call', methodName, '<-', convertedParams));
|
|
36
|
+
log.debug(format('JsonProxy:call', methodName, '<-', convertedParams));
|
|
37
37
|
const rawRet = await this.handler[methodName](...convertedParams);
|
|
38
38
|
let ret = rawRet;
|
|
39
39
|
if (!skipConversion) {
|
|
40
40
|
ret = convertToJsonObj(this.classConverter, rawRet);
|
|
41
41
|
}
|
|
42
|
-
debug(format('JsonProxy:call', methodName, '->', ret));
|
|
42
|
+
log.debug(format('JsonProxy:call', methodName, '->', ret));
|
|
43
43
|
return ret;
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoianNvbl9wcm94eS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9qc29uLXJwYy9zZXJ2ZXIvanNvbl9wcm94eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRTlCLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxjQUFjLEVBQWdFLE1BQU0sdUJBQXVCLENBQUM7QUFDckgsT0FBTyxFQUFFLGtCQUFrQixFQUFFLGdCQUFnQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3JFLE9BQU8sRUFBRSxNQUFNLEVBQUUsY0FBYyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFeEQsTUFBTSxHQUFHLEdBQUcsaUJBQWlCLENBQUMscUJBQXFCLENBQUMsQ0FBQztBQVlyRDs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sU0FBUztJQUVwQixZQUNVLE9BQWUsRUFDZixjQUF5QyxFQUN6QyxjQUF1QztRQUZ2QyxZQUFPLEdBQVAsT0FBTyxDQUFRO1FBQ2YsbUJBQWMsR0FBZCxjQUFjLENBQTJCO1FBQ3pDLG1CQUFjLEdBQWQsY0FBYyxDQUF5QjtRQUUvQyxJQUFJLENBQUMsY0FBYyxHQUFHLElBQUksY0FBYyxDQUFDLGNBQWMsRUFBRSxjQUFjLENBQUMsQ0FBQztJQUMzRSxDQUFDO0lBQ0Q7Ozs7OztPQU1HO0lBQ0ksS0FBSyxDQUFDLElBQUksQ0FBQyxVQUFrQixFQUFFLGFBQW9CLEVBQUUsRUFBRSxjQUFjLEdBQUcsS0FBSztRQUNsRixHQUFHLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxnQkFBZ0IsRUFBRSxVQUFVLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUM1RCxrQ0FBa0M7UUFDbEMsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDbEQsTUFBTSxDQUFDLGNBQWMsQ0FBQyxLQUFLLEVBQUUsVUFBVSxDQUFDLEVBQUUscUJBQXFCLFVBQVUsYUFBYSxDQUFDLENBQUM7UUFDeEYsTUFBTSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLEVBQUUsY0FBYyxVQUFVLHlCQUF5QixVQUFVLEVBQUUsQ0FBQyxDQUFDO1FBQ2pHLHlEQUF5RDtRQUN6RCxJQUFJLGVBQWUsR0FBRyxVQUFVLENBQUM7UUFDakMsSUFBSSxDQUFDLGNBQWMsRUFBRSxDQUFDO1lBQ3BCLGVBQWUsR0FBRyxVQUFVLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsa0JBQWtCLENBQUMsSUFBSSxDQUFDLGNBQWMsRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBQzVGLENBQUM7UUFDRCxHQUFHLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxnQkFBZ0IsRUFBRSxVQUFVLEVBQUUsSUFBSSxFQUFFLGVBQWUsQ0FBQyxDQUFDLENBQUM7UUFDdkUsTUFBTSxNQUFNLEdBQUcsTUFBTyxJQUFJLENBQUMsT0FBZSxDQUFDLFVBQVUsQ0FBQyxDQUFDLEdBQUcsZUFBZSxDQUFDLENBQUM7UUFDM0UsSUFBSSxHQUFHLEdBQUcsTUFBTSxDQUFDO1FBQ2pCLElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQztZQUNwQixHQUFHLEdBQUcsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLGNBQWMsRUFBRSxNQUFNLENBQUMsQ0FBQztRQUN0RCxDQUFDO1FBQ0QsR0FBRyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsZ0JBQWdCLEVBQUUsVUFBVSxFQUFFLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQzNELE9BQU8sR0FBRyxDQUFDO0lBQ2IsQ0FBQztDQUNGIn0=
|
|
@@ -21,7 +21,7 @@ export declare class JsonRpcServer {
|
|
|
21
21
|
proxy: JsonProxy;
|
|
22
22
|
constructor(handler: object, stringClassMap: StringClassConverterInput, objectClassMap: JsonClassConverterInput,
|
|
23
23
|
/** List of methods to disallow from calling remotely */
|
|
24
|
-
disallowedMethods?: string[], log?: import("../../log/logger.js").
|
|
24
|
+
disallowedMethods?: string[], log?: import("../../log/logger.js").Logger);
|
|
25
25
|
/**
|
|
26
26
|
* Get an express app object.
|
|
27
27
|
* @param prefix - Our server prefix.
|
|
@@ -85,5 +85,5 @@ export type ServerList = {
|
|
|
85
85
|
* @param servers - List of servers to be combined into a single server, passed as ServerList.
|
|
86
86
|
* @returns A single JsonRpcServer with namespaced methods.
|
|
87
87
|
*/
|
|
88
|
-
export declare function createNamespacedJsonRpcServer(servers: ServerList, log?: import("../../log/logger.js").
|
|
88
|
+
export declare function createNamespacedJsonRpcServer(servers: ServerList, log?: import("../../log/logger.js").Logger): JsonRpcServer;
|
|
89
89
|
//# sourceMappingURL=json_rpc_server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json_rpc_server.d.ts","sourceRoot":"","sources":["../../../src/json-rpc/server/json_rpc_server.ts"],"names":[],"mappings":";AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,GAAG,MAAM,KAAK,CAAC;AAGtB,OAAO,MAAM,MAAM,YAAY,CAAC;AAGhC,OAAO,EAAE,KAAK,uBAAuB,EAAE,KAAK,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAErG,OAAO,EAAE,KAAK,SAAS,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5D;;;GAGG;AACH,qBAAa,aAAa;IAMtB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,cAAc;IACtB,wDAAwD;aACxC,iBAAiB,EAAE,MAAM,EAAE;IAC3C,OAAO,CAAC,GAAG;IAVb;;OAEG;IACI,KAAK,EAAE,SAAS,CAAC;gBAEd,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,yBAAyB,EACzC,cAAc,EAAE,uBAAuB;IAC/C,wDAAwD;IACxC,iBAAiB,GAAE,MAAM,EAAO,EACxC,GAAG,
|
|
1
|
+
{"version":3,"file":"json_rpc_server.d.ts","sourceRoot":"","sources":["../../../src/json-rpc/server/json_rpc_server.ts"],"names":[],"mappings":";AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,GAAG,MAAM,KAAK,CAAC;AAGtB,OAAO,MAAM,MAAM,YAAY,CAAC;AAGhC,OAAO,EAAE,KAAK,uBAAuB,EAAE,KAAK,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAErG,OAAO,EAAE,KAAK,SAAS,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5D;;;GAGG;AACH,qBAAa,aAAa;IAMtB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,cAAc;IACtB,wDAAwD;aACxC,iBAAiB,EAAE,MAAM,EAAE;IAC3C,OAAO,CAAC,GAAG;IAVb;;OAEG;IACI,KAAK,EAAE,SAAS,CAAC;gBAEd,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,yBAAyB,EACzC,cAAc,EAAE,uBAAuB;IAC/C,wDAAwD;IACxC,iBAAiB,GAAE,MAAM,EAAO,EACxC,GAAG,uCAAwD;IAKrE;;;;OAIG;IACI,MAAM,CAAC,MAAM,SAAK;IAkDzB;;;;OAIG;IACH,OAAO,CAAC,SAAS;IA8CjB;;;;OAIG;IACI,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,SAAK;IAKtC;;;OAGG;IACI,UAAU,IAAI,MAAM,EAAE;IAI7B;;;OAGG;IACI,YAAY,IAAI,SAAS;IAIhC;;;;;;OAMG;IACU,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,mBAAY,EAAE,cAAc,EAAE,OAAO;CAGtF;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,SAAK,mBAMhD;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAClC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,CAAC,EACX,kBAAkB,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,aAAa,EAClD,IAAI,EAAE,MAAM,GAAG,MAAM,GACpB,IAAI,CAAC,MAAM,CAWb;AACD;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,qDAAqD;IACrD,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAAC;CAC/B,EAAE,CAAC;AAEJ;;;;GAIG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,UAAU,EACnB,GAAG,uCAA8D,GAChE,aAAa,CAuCf"}
|
package/dest/log/logger.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type LogData, type LogFn } from './log_fn.js';
|
|
2
|
-
declare const LogLevels: readonly ["silent", "error", "warn", "info", "verbose", "debug"
|
|
2
|
+
declare const LogLevels: readonly ["silent", "error", "warn", "info", "verbose", "debug"];
|
|
3
3
|
/**
|
|
4
4
|
* A valid log severity level.
|
|
5
5
|
*/
|
|
@@ -18,7 +18,7 @@ export type Logger = {
|
|
|
18
18
|
* Logger that supports multiple severity levels and can be called directly to issue a debug statement.
|
|
19
19
|
* Intended as a drop-in replacement for the debug module.
|
|
20
20
|
*/
|
|
21
|
-
export type DebugLogger =
|
|
21
|
+
export type DebugLogger = Logger;
|
|
22
22
|
/**
|
|
23
23
|
* Creates a new DebugLogger for the current module, defaulting to the LOG_LEVEL env var.
|
|
24
24
|
* If DEBUG="[module]" env is set, will enable debug logging if the module matches.
|
package/dest/log/logger.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/log/logger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/log/logger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AAEvD,QAAA,MAAM,SAAS,kEAAmE,CAAC;AAGnF;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;AAKlD,oDAAoD;AACpD,KAAK,UAAU,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,GAAG,OAAO,EAAE,IAAI,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;AAE/E;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG;KAAG,CAAC,IAAI,QAAQ,GAAG,KAAK;CAAE,GAAG;IAA4B,KAAK,EAAE,UAAU,CAAA;CAAE,CAAC;AAElG;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC;AAEjC;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAe3D;AAED,sCAAsC;AACtC,MAAM,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;AAInG;;;GAGG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,UAAU,QAExC"}
|
package/dest/log/logger.js
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import debug from 'debug';
|
|
2
2
|
import isNode from 'detect-node';
|
|
3
3
|
import { isatty } from 'tty';
|
|
4
|
-
|
|
5
|
-
const LogLevels = ['silent', 'error', 'warn', 'info', 'verbose', 'debug', 'trace'];
|
|
4
|
+
const LogLevels = ['silent', 'error', 'warn', 'info', 'verbose', 'debug'];
|
|
6
5
|
const DefaultLogLevel = process.env.NODE_ENV === 'test' ? 'silent' : 'info';
|
|
7
6
|
const envLogLevel = process.env.LOG_LEVEL?.toLowerCase();
|
|
8
7
|
const currentLevel = LogLevels.includes(envLogLevel) ? envLogLevel : DefaultLogLevel;
|
|
@@ -25,7 +24,6 @@ export function createDebugLogger(name) {
|
|
|
25
24
|
info: (msg, data) => logWithDebug(debugLogger, 'info', msg, data),
|
|
26
25
|
verbose: (msg, data) => logWithDebug(debugLogger, 'verbose', msg, data),
|
|
27
26
|
debug: (msg, data) => logWithDebug(debugLogger, 'debug', msg, data),
|
|
28
|
-
trace: (msg, data) => logWithDebug(debugLogger, 'trace', msg, data),
|
|
29
27
|
};
|
|
30
28
|
return Object.assign((msg, data) => logWithDebug(debugLogger, 'debug', msg, data), logger);
|
|
31
29
|
}
|
|
@@ -79,7 +77,8 @@ function getPrefix(debugLogger, level) {
|
|
|
79
77
|
* @param msg - What to log.
|
|
80
78
|
*/
|
|
81
79
|
function printLog(msg) {
|
|
82
|
-
|
|
80
|
+
// eslint-disable-next-line no-console
|
|
81
|
+
isNode ? process.stderr.write(msg + '\n') : console.error(msg);
|
|
83
82
|
}
|
|
84
83
|
/**
|
|
85
84
|
* Concatenates a log message and an exception.
|
|
@@ -100,4 +99,4 @@ function fmtLogData(data) {
|
|
|
100
99
|
.map(([key, value]) => `${key}=${typeof value === 'object' && 'toString' in value ? value.toString() : value}`)
|
|
101
100
|
.join(' ');
|
|
102
101
|
}
|
|
103
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZy9sb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE1BQU0sT0FBTyxDQUFDO0FBQzFCLE9BQU8sTUFBTSxNQUFNLGFBQWEsQ0FBQztBQUNqQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBSTdCLE1BQU0sU0FBUyxHQUFHLENBQUMsUUFBUSxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxPQUFPLENBQVUsQ0FBQztBQUNuRixNQUFNLGVBQWUsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsS0FBSyxNQUFNLENBQUMsQ0FBQyxDQUFFLFFBQWtCLENBQUMsQ0FBQyxDQUFFLE1BQWdCLENBQUM7QUFPbEcsTUFBTSxXQUFXLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLEVBQUUsV0FBVyxFQUFjLENBQUM7QUFDckUsTUFBTSxZQUFZLEdBQUcsU0FBUyxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxlQUFlLENBQUM7QUFnQnJGOzs7Ozs7R0FNRztBQUNILE1BQU0sVUFBVSxpQkFBaUIsQ0FBQyxJQUFZO0lBQzVDLE1BQU0sV0FBVyxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNoQyxJQUFJLFlBQVksS0FBSyxPQUFPLEVBQUUsQ0FBQztRQUM3QixXQUFXLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQztJQUM3QixDQUFDO0lBRUQsTUFBTSxNQUFNLEdBQUc7UUFDYixNQUFNLEVBQUUsR0FBRyxFQUFFLEdBQUUsQ0FBQztRQUNoQixLQUFLLEVBQUUsQ0FBQyxHQUFXLEVBQUUsR0FBYSxFQUFFLElBQWMsRUFBRSxFQUFFLENBQUMsWUFBWSxDQUFDLFdBQVcsRUFBRSxPQUFPLEVBQUUsTUFBTSxDQUFD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
|
package/dest/retry/index.d.ts
CHANGED
|
@@ -28,7 +28,7 @@ export declare function makeBackoff(retries: number[]): Generator<number, void,
|
|
|
28
28
|
* @returns A Promise that resolves with the successful result of the provided function, or rejects if backoff generator ends.
|
|
29
29
|
* @throws If `NoRetryError` is thrown by the `fn`, it is rethrown.
|
|
30
30
|
*/
|
|
31
|
-
export declare function retry<Result>(fn: () => Promise<Result>, name?: string, backoff?: Generator<number, void, unknown>, log?: import("../log/logger.js").
|
|
31
|
+
export declare function retry<Result>(fn: () => Promise<Result>, name?: string, backoff?: Generator<number, void, unknown>, log?: import("../log/logger.js").Logger, failSilently?: boolean): Promise<Result>;
|
|
32
32
|
/**
|
|
33
33
|
* Retry an asynchronous function until it returns a truthy value or the specified timeout is exceeded.
|
|
34
34
|
* The function is retried periodically with a fixed interval between attempts. The operation can be named for better error messages.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/retry/index.ts"],"names":[],"mappings":"AAIA,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,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/retry/index.ts"],"names":[],"mappings":"AAIA,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,oCAA8C,EACjD,YAAY,UAAQ,mBAoBrB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,EAAE,IAAI,SAAK,EAAE,OAAO,SAAI,EAAE,QAAQ,SAAI,oCAczG"}
|
package/dest/retry/index.js
CHANGED
|
@@ -55,7 +55,7 @@ export async function retry(fn, name = 'Operation', backoff = backoffGenerator()
|
|
|
55
55
|
if (s === undefined) {
|
|
56
56
|
throw err;
|
|
57
57
|
}
|
|
58
|
-
log(`${name} failed. Will retry in ${s}s...`);
|
|
58
|
+
log.verbose(`${name} failed. Will retry in ${s}s...`);
|
|
59
59
|
!failSilently && log.error(err);
|
|
60
60
|
await sleep(s * 1000);
|
|
61
61
|
continue;
|
|
@@ -86,4 +86,4 @@ export async function retryUntil(fn, name = '', timeout = 0, interval = 1) {
|
|
|
86
86
|
}
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcmV0cnkvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDcEQsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzFDLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUUxQyx3RUFBd0U7QUFDeEUsTUFBTSxPQUFPLFlBQWEsU0FBUSxLQUFLO0NBQUc7QUFFMUM7Ozs7Ozs7R0FPRztBQUNILE1BQU0sU0FBUyxDQUFDLENBQUMsZ0JBQWdCO0lBQy9CLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUN6QyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDVixPQUFPLElBQUksRUFBRSxDQUFDO1FBQ1osTUFBTSxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDdkMsQ0FBQztBQUNILENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxTQUFTLENBQUMsQ0FBQyxXQUFXLENBQUMsT0FBaUI7SUFDNUMsS0FBSyxNQUFNLEtBQUssSUFBSSxPQUFPLEVBQUUsQ0FBQztRQUM1QixNQUFNLEtBQUssQ0FBQztJQUNkLENBQUM7QUFDSCxDQUFDO0FBRUQ7Ozs7Ozs7Ozs7O0dBV0c7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLEtBQUssQ0FDekIsRUFBeUIsRUFDekIsSUFBSSxHQUFHLFdBQVcsRUFDbEIsT0FBTyxHQUFHLGdCQUFnQixFQUFFLEVBQzVCLEdBQUcsR0FBRyxpQkFBaUIsQ0FBQyx3QkFBd0IsQ0FBQyxFQUNqRCxZQUFZLEdBQUcsS0FBSztJQUVwQixPQUFPLElBQUksRUFBRSxDQUFDO1FBQ1osSUFBSSxDQUFDO1lBQ0gsT0FBTyxNQUFNLEVBQUUsRUFBRSxDQUFDO1FBQ3BCLENBQUM7UUFBQyxPQUFPLEdBQVEsRUFBRSxDQUFDO1lBQ2xCLElBQUksR0FBRyxZQUFZLFlBQVksRUFBRSxDQUFDO2dCQUNoQyx1RkFBdUY7Z0JBQ3ZGLE1BQU0sR0FBRyxDQUFDO1lBQ1osQ0FBQztZQUNELE1BQU0sQ0FBQyxHQUFHLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUM7WUFDL0IsSUFBSSxDQUFDLEtBQUssU0FBUyxFQUFFLENBQUM7Z0JBQ3BCLE1BQU0sR0FBRyxDQUFDO1lBQ1osQ0FBQztZQUNELEdBQUcsQ0FBQyxPQUFPLENBQUMsR0FBRyxJQUFJLDBCQUEwQixDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQ3RELENBQUMsWUFBWSxJQUFJLEdBQUcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDaEMsTUFBTSxLQUFLLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxDQUFDO1lBQ3RCLFNBQVM7UUFDWCxDQUFDO0lBQ0gsQ0FBQztBQUNILENBQUM7QUFFRDs7Ozs7Ozs7OztHQVVHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxVQUFVLENBQUksRUFBZ0MsRUFBRSxJQUFJLEdBQUcsRUFBRSxFQUFFLE9BQU8sR0FBRyxDQUFDLEVBQUUsUUFBUSxHQUFHLENBQUM7SUFDeEcsTUFBTSxLQUFLLEdBQUcsSUFBSSxLQUFLLEVBQUUsQ0FBQztJQUMxQixPQUFPLElBQUksRUFBRSxDQUFDO1FBQ1osTUFBTSxNQUFNLEdBQUcsTUFBTSxFQUFFLEVBQUUsQ0FBQztRQUMxQixJQUFJLE1BQU0sRUFBRSxDQUFDO1lBQ1gsT0FBTyxNQUFNLENBQUM7UUFDaEIsQ0FBQztRQUVELE1BQU0sS0FBSyxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUMsQ0FBQztRQUU3QixJQUFJLE9BQU8sSUFBSSxLQUFLLENBQUMsQ0FBQyxFQUFFLEdBQUcsT0FBTyxFQUFFLENBQUM7WUFDbkMsTUFBTSxJQUFJLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLG9CQUFvQixJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDakUsQ0FBQztJQUNILENBQUM7QUFDSCxDQUFDIn0=
|
|
@@ -18,8 +18,8 @@ export interface DispatchMsg {
|
|
|
18
18
|
* the method to be called ('fn') and an array of arguments to be passed to the method ('args').
|
|
19
19
|
*
|
|
20
20
|
* @param targetFn - A function that returns the target object containing the methods to be dispatched.
|
|
21
|
-
* @param
|
|
21
|
+
* @param log - Optional logging function for debugging purposes.
|
|
22
22
|
* @returns A dispatch function that accepts a DispatchMsg object and calls the target's method with provided arguments.
|
|
23
23
|
*/
|
|
24
|
-
export declare function createDispatchFn(targetFn: () => any,
|
|
24
|
+
export declare function createDispatchFn(targetFn: () => any, log?: import("../../log/logger.js").Logger): ({ fn, args }: DispatchMsg) => Promise<any>;
|
|
25
25
|
//# sourceMappingURL=create_dispatch_fn.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create_dispatch_fn.d.ts","sourceRoot":"","sources":["../../../src/transport/dispatch/create_dispatch_fn.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,IAAI,EAAE,GAAG,EAAE,CAAC;CACb;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"create_dispatch_fn.d.ts","sourceRoot":"","sources":["../../../src/transport/dispatch/create_dispatch_fn.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,IAAI,EAAE,GAAG,EAAE,CAAC;CACb;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,EAAE,GAAG,uCAAiD,kBAC5E,WAAW,kBAKxC"}
|
|
@@ -6,14 +6,14 @@ import { createDebugLogger } from '../../log/index.js';
|
|
|
6
6
|
* the method to be called ('fn') and an array of arguments to be passed to the method ('args').
|
|
7
7
|
*
|
|
8
8
|
* @param targetFn - A function that returns the target object containing the methods to be dispatched.
|
|
9
|
-
* @param
|
|
9
|
+
* @param log - Optional logging function for debugging purposes.
|
|
10
10
|
* @returns A dispatch function that accepts a DispatchMsg object and calls the target's method with provided arguments.
|
|
11
11
|
*/
|
|
12
|
-
export function createDispatchFn(targetFn,
|
|
12
|
+
export function createDispatchFn(targetFn, log = createDebugLogger('aztec:foundation:dispatch')) {
|
|
13
13
|
return async ({ fn, args }) => {
|
|
14
14
|
const target = targetFn();
|
|
15
|
-
debug(format(`dispatching to ${target}: ${fn}`, args));
|
|
15
|
+
log.debug(format(`dispatching to ${target}: ${fn}`, args));
|
|
16
16
|
return await target[fn](...args);
|
|
17
17
|
};
|
|
18
18
|
}
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlX2Rpc3BhdGNoX2ZuLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3RyYW5zcG9ydC9kaXNwYXRjaC9jcmVhdGVfZGlzcGF0Y2hfZm4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUU5QixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQWlCdkQ7Ozs7Ozs7O0dBUUc7QUFDSCxNQUFNLFVBQVUsZ0JBQWdCLENBQUMsUUFBbUIsRUFBRSxHQUFHLEdBQUcsaUJBQWlCLENBQUMsMkJBQTJCLENBQUM7SUFDeEcsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFlLEVBQUUsRUFBRTtRQUN6QyxNQUFNLE1BQU0sR0FBRyxRQUFRLEVBQUUsQ0FBQztRQUMxQixHQUFHLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxrQkFBa0IsTUFBTSxLQUFLLEVBQUUsRUFBRSxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUM7UUFDM0QsT0FBTyxNQUFNLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxDQUFDO0lBQ25DLENBQUMsQ0FBQztBQUNKLENBQUMifQ==
|
|
@@ -2,7 +2,7 @@ import EventEmitter from 'events';
|
|
|
2
2
|
import { format } from 'util';
|
|
3
3
|
import { createDebugLogger } from '../log/index.js';
|
|
4
4
|
import { isEventMessage } from './dispatch/messages.js';
|
|
5
|
-
const
|
|
5
|
+
const log = createDebugLogger('aztec:transport_client');
|
|
6
6
|
/**
|
|
7
7
|
* A TransportClient provides a request/response and event api to a corresponding TransportServer.
|
|
8
8
|
* If `broadcast` is called on TransportServer, TransportClients will emit an `event_msg`.
|
|
@@ -55,7 +55,7 @@ export class TransportClient extends EventEmitter {
|
|
|
55
55
|
}
|
|
56
56
|
const msgId = this.msgId++;
|
|
57
57
|
const msg = { msgId, payload };
|
|
58
|
-
debug(format(`->`, msg));
|
|
58
|
+
log.debug(format(`->`, msg));
|
|
59
59
|
return new Promise((resolve, reject) => {
|
|
60
60
|
this.pendingRequests.push({ resolve, reject, msgId });
|
|
61
61
|
this.socket.send(msg, transfer).catch(reject);
|
|
@@ -74,7 +74,7 @@ export class TransportClient extends EventEmitter {
|
|
|
74
74
|
this.close();
|
|
75
75
|
return;
|
|
76
76
|
}
|
|
77
|
-
debug(format(`<-`, msg));
|
|
77
|
+
log.debug(format(`<-`, msg));
|
|
78
78
|
if (isEventMessage(msg)) {
|
|
79
79
|
this.emit('event_msg', msg.payload);
|
|
80
80
|
return;
|
|
@@ -92,4 +92,4 @@ export class TransportClient extends EventEmitter {
|
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNwb3J0X2NsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90cmFuc3BvcnQvdHJhbnNwb3J0X2NsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLFlBQVksTUFBTSxRQUFRLENBQUM7QUFDbEMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUU5QixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUNwRCxPQUFPLEVBQTJDLGNBQWMsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBSWpHLE1BQU0sR0FBRyxHQUFHLGlCQUFpQixDQUFDLHdCQUF3QixDQUFDLENBQUM7QUE4QnhEOzs7OztHQUtHO0FBQ0gsTUFBTSxPQUFPLGVBQXlCLFNBQVEsWUFBWTtJQUt4RCxZQUFvQixnQkFBMkI7UUFDN0MsS0FBSyxFQUFFLENBQUM7UUFEVSxxQkFBZ0IsR0FBaEIsZ0JBQWdCLENBQVc7UUFKdkMsVUFBSyxHQUFHLENBQUMsQ0FBQztRQUNWLG9CQUFlLEdBQXFCLEVBQUUsQ0FBQztJQUsvQyxDQUFDO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDSCxLQUFLLENBQUMsSUFBSTtRQUNSLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsWUFBWSxFQUFFLENBQUM7UUFDekQsSUFBSSxDQUFDLE1BQU0sQ0FBQyxlQUFlLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsbUJBQW1CLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztJQUNwRSxDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSCxLQUFLO1FBQ0gsSUFBSSxDQUFDLE1BQU0sRUFBRSxLQUFLLEVBQUUsQ0FBQztRQUNyQixJQUFJLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQztRQUN4QixJQUFJLENBQUMsa0JBQWtCLEVBQUUsQ0FBQztJQUM1QixDQUFDO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDSCxPQUFPLENBQUMsT0FBZ0IsRUFBRSxRQUF5QjtRQUNqRCxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ2pCLE1BQU0sSUFBSSxLQUFLLENBQUMsa0JBQWtCLENBQUMsQ0FBQztRQUN0QyxDQUFDO1FBQ0QsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzNCLE1BQU0sR0FBRyxHQUFHLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSxDQUFDO1FBQy9CLEdBQUcsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQzdCLE9BQU8sSUFBSSxPQUFPLENBQU0sQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7WUFDMUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7WUFDdEQsSUFBSSxDQUFDLE1BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLFFBQVEsQ0FBQyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNqRCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRDs7Ozs7O09BTUc7SUFDSyxtQkFBbUIsQ0FBQyxHQUFpRTtRQUMzRixJQUFJLEdBQUcsS0FBSyxTQUFTLEVBQUUsQ0FBQztZQUN0Qiw0QkFBNEI7WUFDNUIsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ2IsT0FBTztRQUNULENBQUM7UUFDRCxHQUFHLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQztRQUM3QixJQUFJLGNBQWMsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO1lBQ3hCLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUNwQyxPQUFPO1FBQ1QsQ0FBQztRQUNELE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxlQUFlLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssS0FBSyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDNUUsSUFBSSxRQUFRLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQztZQUNwQixPQUFPO1FBQ1QsQ0FBQztRQUNELE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDM0QsSUFBSSxHQUFHLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDZCxPQUFPLENBQUMsTUFBTSxDQUFDLElBQUksS0FBSyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBQ3ZDLENBQUM7YUFBTSxDQUFDO1lBQ04sT0FBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDL0IsQ0FBQztJQUNILENBQUM7Q0FDRiJ9
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createDebugLogger } from '../log/index.js';
|
|
2
|
-
const
|
|
2
|
+
const log = createDebugLogger('bb:worker_pool');
|
|
3
3
|
/**
|
|
4
4
|
* Allocates a pool of WasmWorker's.
|
|
5
5
|
* Worker 0 is allocated MAX_PAGES memory pages. This is because worker 0 will need to hold the proving key
|
|
@@ -30,12 +30,12 @@ export class WorkerPool {
|
|
|
30
30
|
* @param maxMem - Max memory pages.
|
|
31
31
|
*/
|
|
32
32
|
async init(createWorker, poolSize, maxMem = WorkerPool.MAX_PAGES) {
|
|
33
|
-
debug(`creating ${poolSize} workers...`);
|
|
33
|
+
log.debug(`creating ${poolSize} workers...`);
|
|
34
34
|
const start = new Date().getTime();
|
|
35
35
|
this.workers = await Promise.all(Array(poolSize)
|
|
36
36
|
.fill(0)
|
|
37
37
|
.map((_, i) => createWorker(`${i}`, i === 0 ? Math.min(WorkerPool.MAX_PAGES, maxMem) : 768, maxMem)));
|
|
38
|
-
debug(`created workers: ${new Date().getTime() - start}ms`);
|
|
38
|
+
log.debug(`created workers: ${new Date().getTime() - start}ms`);
|
|
39
39
|
}
|
|
40
40
|
/**
|
|
41
41
|
* Tell all workers in the pool to stop processing.
|
|
@@ -59,4 +59,4 @@ export class WorkerPool {
|
|
|
59
59
|
* The maximum number of memory pages to be used by the webassembly.
|
|
60
60
|
*/
|
|
61
61
|
WorkerPool.MAX_PAGES = 8192;
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29ya2VyX3Bvb2wuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd29ya2VyL3dvcmtlcl9wb29sLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBR3BELE1BQU0sR0FBRyxHQUFHLGlCQUFpQixDQUFDLGdCQUFnQixDQUFDLENBQUM7QUFPaEQ7Ozs7R0FJRztBQUNILE1BQU0sT0FBTyxVQUFVO0lBQXZCO1FBZ0JFOztXQUVHO1FBQ0ssWUFBTyxHQUFpQixFQUFFLENBQUM7SUFzQ3JDLENBQUM7SUFwQ0M7Ozs7O09BS0c7SUFDSCxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxZQUEwQixFQUFFLFFBQWdCO1FBQzNELE1BQU0sSUFBSSxHQUFHLElBQUksVUFBVSxFQUFFLENBQUM7UUFDOUIsTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxRQUFRLENBQUMsQ0FBQztRQUN4QyxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRDs7Ozs7T0FLRztJQUNJLEtBQUssQ0FBQyxJQUFJLENBQUMsWUFBMEIsRUFBRSxRQUFnQixFQUFFLE1BQU0sR0FBRyxVQUFVLENBQUMsU0FBUztRQUMzRixHQUFHLENBQUMsS0FBSyxDQUFDLFlBQVksUUFBUSxhQUFhLENBQUMsQ0FBQztRQUM3QyxNQUFNLEtBQUssR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ25DLElBQUksQ0FBQyxPQUFPLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUM5QixLQUFLLENBQUMsUUFBUSxDQUFDO2FBQ1osSUFBSSxDQUFDLENBQUMsQ0FBQzthQUNQLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsRUFBRSxFQUFFLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQ3ZHLENBQUM7UUFFRixHQUFHLENBQUMsS0FBSyxDQUFDLG9CQUFvQixJQUFJLElBQUksRUFBRSxDQUFDLE9BQU8sRUFBRSxHQUFHLEtBQUssSUFBSSxDQUFDLENBQUM7SUFDbEUsQ0FBQztJQUVEOztPQUVHO0lBQ0ksS0FBSyxDQUFDLE9BQU87UUFDbEIsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLGFBQWEsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUM5RCxDQUFDOztBQXZERCx1REFBdUQ7QUFDdkQsS0FBSztBQUNMLHNIQUFzSDtBQUN0SCxnSEFBZ0g7QUFDaEgsaUhBQWlIO0FBQ2pILHFHQUFxRztBQUNyRyw0REFBNEQ7QUFDNUQsa0dBQWtHO0FBQ2xHLDBGQUEwRjtBQUMxRiw2R0FBNkc7QUFDN0csa0NBQWtDO0FBQ2xDOztHQUVHO0FBQ1csb0JBQVMsR0FBRyxJQUFJLEFBQVAsQ0FBUSJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/foundation",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.34.0",
|
|
4
4
|
"packageManager": "yarn@3.4.1",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dest/index.js",
|
|
@@ -69,7 +69,7 @@
|
|
|
69
69
|
]
|
|
70
70
|
},
|
|
71
71
|
"dependencies": {
|
|
72
|
-
"@aztec/bb.js": "0.
|
|
72
|
+
"@aztec/bb.js": "0.34.0",
|
|
73
73
|
"@koa/cors": "^5.0.0",
|
|
74
74
|
"@noble/curves": "^1.2.0",
|
|
75
75
|
"bn.js": "^5.2.1",
|
|
@@ -18,10 +18,10 @@ export class RandomnessSingleton {
|
|
|
18
18
|
private readonly log = createDebugLogger('aztec:randomness_singleton'),
|
|
19
19
|
) {
|
|
20
20
|
if (seed !== undefined) {
|
|
21
|
-
this.log(`Using pseudo-randomness with seed: ${seed}`);
|
|
21
|
+
this.log.info(`Using pseudo-randomness with seed: ${seed}`);
|
|
22
22
|
this.counter = seed;
|
|
23
23
|
} else {
|
|
24
|
-
this.log('Using true randomness');
|
|
24
|
+
this.log.info('Using true randomness');
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
27
|
|
|
@@ -12,14 +12,14 @@ import { JsonStringify, convertFromJsonObj, convertToJsonObj } from '../convert.
|
|
|
12
12
|
|
|
13
13
|
export { JsonStringify } from '../convert.js';
|
|
14
14
|
|
|
15
|
-
const
|
|
15
|
+
const log = createDebugLogger('json-rpc:json_rpc_client');
|
|
16
16
|
/**
|
|
17
17
|
* A normal fetch function that does not retry.
|
|
18
18
|
* Alternatives are a fetch function with retries, or a mocked fetch.
|
|
19
19
|
* @param host - The host URL.
|
|
20
20
|
* @param method - The RPC method name.
|
|
21
21
|
* @param body - The RPC payload.
|
|
22
|
-
* @param noRetry - Whether to throw a `NoRetryError` in case the response is
|
|
22
|
+
* @param noRetry - Whether to throw a `NoRetryError` in case the response is a 5xx error and the body contains an error
|
|
23
23
|
* message (see `retry` function for more details).
|
|
24
24
|
* @returns The parsed JSON response, or throws an error.
|
|
25
25
|
*/
|
|
@@ -30,7 +30,7 @@ export async function defaultFetch(
|
|
|
30
30
|
useApiEndpoints: boolean,
|
|
31
31
|
noRetry = false,
|
|
32
32
|
) {
|
|
33
|
-
debug(format(`JsonRpcClient.fetch`, host, rpcMethod, '->', body));
|
|
33
|
+
log.debug(format(`JsonRpcClient.fetch`, host, rpcMethod, '->', body));
|
|
34
34
|
let resp: Response;
|
|
35
35
|
if (useApiEndpoints) {
|
|
36
36
|
resp = await fetch(`${host}/${rpcMethod}`, {
|
|
@@ -56,7 +56,7 @@ export async function defaultFetch(
|
|
|
56
56
|
throw new Error(`Failed to parse body as JSON: ${resp.text()}`);
|
|
57
57
|
}
|
|
58
58
|
if (!resp.ok) {
|
|
59
|
-
if (noRetry) {
|
|
59
|
+
if (noRetry || (resp.status >= 400 && resp.status < 500)) {
|
|
60
60
|
throw new NoRetryError('(JSON-RPC PROPAGATED) ' + responseJson.error.message);
|
|
61
61
|
} else {
|
|
62
62
|
throw new Error('(JSON-RPC PROPAGATED) ' + responseJson.error.message);
|
|
@@ -112,9 +112,9 @@ export function createJsonRpcClient<T extends object>(
|
|
|
112
112
|
method,
|
|
113
113
|
params: params.map(param => convertToJsonObj(classConverter, param)),
|
|
114
114
|
};
|
|
115
|
-
debug(format(`JsonRpcClient.request`, method, '<-', params));
|
|
115
|
+
log.debug(format(`JsonRpcClient.request`, method, '<-', params));
|
|
116
116
|
const res = await fetch(host, method, body, useApiEndpoints);
|
|
117
|
-
debug(format(`JsonRpcClient.result`, method, '->', res));
|
|
117
|
+
log.debug(format(`JsonRpcClient.result`, method, '->', res));
|
|
118
118
|
if (res.error) {
|
|
119
119
|
throw res.error;
|
|
120
120
|
}
|
|
@@ -138,7 +138,7 @@ export function createJsonRpcClient<T extends object>(
|
|
|
138
138
|
return Reflect.get(target, method);
|
|
139
139
|
}
|
|
140
140
|
return (...params: any[]) => {
|
|
141
|
-
debug(format(`JsonRpcClient.constructor`, 'proxy', rpcMethod, '<-', params));
|
|
141
|
+
log.debug(format(`JsonRpcClient.constructor`, 'proxy', rpcMethod, '<-', params));
|
|
142
142
|
return request(rpcMethod, params);
|
|
143
143
|
};
|
|
144
144
|
},
|
|
@@ -5,7 +5,7 @@ import { ClassConverter, type JsonClassConverterInput, type StringClassConverter
|
|
|
5
5
|
import { convertFromJsonObj, convertToJsonObj } from '../convert.js';
|
|
6
6
|
import { assert, hasOwnProperty } from '../js_utils.js';
|
|
7
7
|
|
|
8
|
-
const
|
|
8
|
+
const log = createDebugLogger('json-rpc:json_proxy');
|
|
9
9
|
|
|
10
10
|
/**
|
|
11
11
|
* A map of class names to class constructors.
|
|
@@ -38,7 +38,7 @@ export class JsonProxy {
|
|
|
38
38
|
* @returns The remote result.
|
|
39
39
|
*/
|
|
40
40
|
public async call(methodName: string, jsonParams: any[] = [], skipConversion = false) {
|
|
41
|
-
debug(format(`JsonProxy:call`, methodName, jsonParams));
|
|
41
|
+
log.debug(format(`JsonProxy:call`, methodName, jsonParams));
|
|
42
42
|
// Get access to our class members
|
|
43
43
|
const proto = Object.getPrototypeOf(this.handler);
|
|
44
44
|
assert(hasOwnProperty(proto, methodName), `JsonProxy: Method ${methodName} not found!`);
|
|
@@ -48,13 +48,13 @@ export class JsonProxy {
|
|
|
48
48
|
if (!skipConversion) {
|
|
49
49
|
convertedParams = jsonParams.map(param => convertFromJsonObj(this.classConverter, param));
|
|
50
50
|
}
|
|
51
|
-
debug(format('JsonProxy:call', methodName, '<-', convertedParams));
|
|
51
|
+
log.debug(format('JsonProxy:call', methodName, '<-', convertedParams));
|
|
52
52
|
const rawRet = await (this.handler as any)[methodName](...convertedParams);
|
|
53
53
|
let ret = rawRet;
|
|
54
54
|
if (!skipConversion) {
|
|
55
55
|
ret = convertToJsonObj(this.classConverter, rawRet);
|
|
56
56
|
}
|
|
57
|
-
debug(format('JsonProxy:call', methodName, '->', ret));
|
|
57
|
+
log.debug(format('JsonProxy:call', methodName, '->', ret));
|
|
58
58
|
return ret;
|
|
59
59
|
}
|
|
60
60
|
}
|
package/src/log/logger.ts
CHANGED
|
@@ -4,8 +4,7 @@ import { isatty } from 'tty';
|
|
|
4
4
|
|
|
5
5
|
import { type LogData, type LogFn } from './log_fn.js';
|
|
6
6
|
|
|
7
|
-
|
|
8
|
-
const LogLevels = ['silent', 'error', 'warn', 'info', 'verbose', 'debug', 'trace'] as const;
|
|
7
|
+
const LogLevels = ['silent', 'error', 'warn', 'info', 'verbose', 'debug'] as const;
|
|
9
8
|
const DefaultLogLevel = process.env.NODE_ENV === 'test' ? ('silent' as const) : ('info' as const);
|
|
10
9
|
|
|
11
10
|
/**
|
|
@@ -28,7 +27,7 @@ export type Logger = { [K in LogLevel]: LogFn } & { /** Error log function */ er
|
|
|
28
27
|
* Logger that supports multiple severity levels and can be called directly to issue a debug statement.
|
|
29
28
|
* Intended as a drop-in replacement for the debug module.
|
|
30
29
|
*/
|
|
31
|
-
export type DebugLogger =
|
|
30
|
+
export type DebugLogger = Logger;
|
|
32
31
|
|
|
33
32
|
/**
|
|
34
33
|
* Creates a new DebugLogger for the current module, defaulting to the LOG_LEVEL env var.
|
|
@@ -50,7 +49,6 @@ export function createDebugLogger(name: string): DebugLogger {
|
|
|
50
49
|
info: (msg: string, data?: LogData) => logWithDebug(debugLogger, 'info', msg, data),
|
|
51
50
|
verbose: (msg: string, data?: LogData) => logWithDebug(debugLogger, 'verbose', msg, data),
|
|
52
51
|
debug: (msg: string, data?: LogData) => logWithDebug(debugLogger, 'debug', msg, data),
|
|
53
|
-
trace: (msg: string, data?: LogData) => logWithDebug(debugLogger, 'trace', msg, data),
|
|
54
52
|
};
|
|
55
53
|
return Object.assign((msg: string, data?: LogData) => logWithDebug(debugLogger, 'debug', msg, data), logger);
|
|
56
54
|
}
|
|
@@ -112,7 +110,8 @@ function getPrefix(debugLogger: debug.Debugger, level: LogLevel) {
|
|
|
112
110
|
* @param msg - What to log.
|
|
113
111
|
*/
|
|
114
112
|
function printLog(msg: string) {
|
|
115
|
-
|
|
113
|
+
// eslint-disable-next-line no-console
|
|
114
|
+
isNode ? process.stderr.write(msg + '\n') : console.error(msg);
|
|
116
115
|
}
|
|
117
116
|
|
|
118
117
|
/**
|
package/src/retry/index.ts
CHANGED
|
@@ -63,7 +63,7 @@ export async function retry<Result>(
|
|
|
63
63
|
if (s === undefined) {
|
|
64
64
|
throw err;
|
|
65
65
|
}
|
|
66
|
-
log(`${name} failed. Will retry in ${s}s...`);
|
|
66
|
+
log.verbose(`${name} failed. Will retry in ${s}s...`);
|
|
67
67
|
!failSilently && log.error(err);
|
|
68
68
|
await sleep(s * 1000);
|
|
69
69
|
continue;
|
|
@@ -23,13 +23,13 @@ export interface DispatchMsg {
|
|
|
23
23
|
* the method to be called ('fn') and an array of arguments to be passed to the method ('args').
|
|
24
24
|
*
|
|
25
25
|
* @param targetFn - A function that returns the target object containing the methods to be dispatched.
|
|
26
|
-
* @param
|
|
26
|
+
* @param log - Optional logging function for debugging purposes.
|
|
27
27
|
* @returns A dispatch function that accepts a DispatchMsg object and calls the target's method with provided arguments.
|
|
28
28
|
*/
|
|
29
|
-
export function createDispatchFn(targetFn: () => any,
|
|
29
|
+
export function createDispatchFn(targetFn: () => any, log = createDebugLogger('aztec:foundation:dispatch')) {
|
|
30
30
|
return async ({ fn, args }: DispatchMsg) => {
|
|
31
31
|
const target = targetFn();
|
|
32
|
-
debug(format(`dispatching to ${target}: ${fn}`, args));
|
|
32
|
+
log.debug(format(`dispatching to ${target}: ${fn}`, args));
|
|
33
33
|
return await target[fn](...args);
|
|
34
34
|
};
|
|
35
35
|
}
|
|
@@ -6,7 +6,7 @@ import { type EventMessage, type ResponseMessage, isEventMessage } from './dispa
|
|
|
6
6
|
import { type Connector } from './interface/connector.js';
|
|
7
7
|
import { type Socket } from './interface/socket.js';
|
|
8
8
|
|
|
9
|
-
const
|
|
9
|
+
const log = createDebugLogger('aztec:transport_client');
|
|
10
10
|
|
|
11
11
|
/**
|
|
12
12
|
* Represents a pending request in the TransportClient.
|
|
@@ -92,7 +92,7 @@ export class TransportClient<Payload> extends EventEmitter {
|
|
|
92
92
|
}
|
|
93
93
|
const msgId = this.msgId++;
|
|
94
94
|
const msg = { msgId, payload };
|
|
95
|
-
debug(format(`->`, msg));
|
|
95
|
+
log.debug(format(`->`, msg));
|
|
96
96
|
return new Promise<any>((resolve, reject) => {
|
|
97
97
|
this.pendingRequests.push({ resolve, reject, msgId });
|
|
98
98
|
this.socket!.send(msg, transfer).catch(reject);
|
|
@@ -112,7 +112,7 @@ export class TransportClient<Payload> extends EventEmitter {
|
|
|
112
112
|
this.close();
|
|
113
113
|
return;
|
|
114
114
|
}
|
|
115
|
-
debug(format(`<-`, msg));
|
|
115
|
+
log.debug(format(`<-`, msg));
|
|
116
116
|
if (isEventMessage(msg)) {
|
|
117
117
|
this.emit('event_msg', msg.payload);
|
|
118
118
|
return;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createDebugLogger } from '../log/index.js';
|
|
2
2
|
import { type WasmWorker } from './wasm_worker.js';
|
|
3
3
|
|
|
4
|
-
const
|
|
4
|
+
const log = createDebugLogger('bb:worker_pool');
|
|
5
5
|
|
|
6
6
|
/**
|
|
7
7
|
* Type of a worker factory.
|
|
@@ -53,7 +53,7 @@ export class WorkerPool {
|
|
|
53
53
|
* @param maxMem - Max memory pages.
|
|
54
54
|
*/
|
|
55
55
|
public async init(createWorker: CreateWorker, poolSize: number, maxMem = WorkerPool.MAX_PAGES) {
|
|
56
|
-
debug(`creating ${poolSize} workers...`);
|
|
56
|
+
log.debug(`creating ${poolSize} workers...`);
|
|
57
57
|
const start = new Date().getTime();
|
|
58
58
|
this.workers = await Promise.all(
|
|
59
59
|
Array(poolSize)
|
|
@@ -61,7 +61,7 @@ export class WorkerPool {
|
|
|
61
61
|
.map((_, i) => createWorker(`${i}`, i === 0 ? Math.min(WorkerPool.MAX_PAGES, maxMem) : 768, maxMem)),
|
|
62
62
|
);
|
|
63
63
|
|
|
64
|
-
debug(`created workers: ${new Date().getTime() - start}ms`);
|
|
64
|
+
log.debug(`created workers: ${new Date().getTime() - start}ms`);
|
|
65
65
|
}
|
|
66
66
|
|
|
67
67
|
/**
|