@aztec/foundation 0.0.1-commit.c2eed6949 → 0.0.1-commit.c52d6e7

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.
Files changed (259) hide show
  1. package/dest/bigint-buffer/index.d.ts +1 -1
  2. package/dest/bigint-buffer/index.d.ts.map +1 -1
  3. package/dest/bigint-buffer/index.js +6 -1
  4. package/dest/branded-types/block_number.d.ts +3 -3
  5. package/dest/branded-types/block_number.d.ts.map +1 -1
  6. package/dest/branded-types/block_number.js +15 -4
  7. package/dest/branded-types/buffer32_hash.d.ts +27 -0
  8. package/dest/branded-types/buffer32_hash.d.ts.map +1 -0
  9. package/dest/branded-types/buffer32_hash.js +12 -0
  10. package/dest/branded-types/checkpoint_number.d.ts +9 -3
  11. package/dest/branded-types/checkpoint_number.d.ts.map +1 -1
  12. package/dest/branded-types/checkpoint_number.js +11 -0
  13. package/dest/branded-types/epoch.d.ts +2 -2
  14. package/dest/branded-types/epoch.d.ts.map +1 -1
  15. package/dest/branded-types/index.d.ts +2 -1
  16. package/dest/branded-types/index.d.ts.map +1 -1
  17. package/dest/branded-types/index.js +1 -0
  18. package/dest/branded-types/index_within_checkpoint.d.ts +2 -2
  19. package/dest/branded-types/index_within_checkpoint.d.ts.map +1 -1
  20. package/dest/branded-types/slot.d.ts +2 -2
  21. package/dest/branded-types/slot.d.ts.map +1 -1
  22. package/dest/buffer/buffer16.d.ts +3 -1
  23. package/dest/buffer/buffer16.d.ts.map +1 -1
  24. package/dest/buffer/buffer32.d.ts +28 -61
  25. package/dest/buffer/buffer32.d.ts.map +1 -1
  26. package/dest/buffer/buffer32.js +29 -63
  27. package/dest/collection/array.d.ts +11 -1
  28. package/dest/collection/array.d.ts.map +1 -1
  29. package/dest/collection/array.js +33 -0
  30. package/dest/collection/index.d.ts +3 -1
  31. package/dest/collection/index.d.ts.map +1 -1
  32. package/dest/collection/index.js +2 -0
  33. package/dest/collection/lru_map.d.ts +41 -0
  34. package/dest/collection/lru_map.d.ts.map +1 -0
  35. package/dest/collection/lru_map.js +119 -0
  36. package/dest/collection/lru_set.d.ts +35 -0
  37. package/dest/collection/lru_set.d.ts.map +1 -0
  38. package/dest/collection/lru_set.js +95 -0
  39. package/dest/committable/committable.js +1 -1
  40. package/dest/config/env_var.d.ts +2 -2
  41. package/dest/config/env_var.d.ts.map +1 -1
  42. package/dest/config/index.d.ts +67 -37
  43. package/dest/config/index.d.ts.map +1 -1
  44. package/dest/config/index.js +72 -71
  45. package/dest/config/network_config.d.ts +11 -55
  46. package/dest/config/network_config.d.ts.map +1 -1
  47. package/dest/config/network_name.d.ts +2 -2
  48. package/dest/config/network_name.d.ts.map +1 -1
  49. package/dest/config/network_name.js +1 -3
  50. package/dest/config/secret_value.d.ts +2 -2
  51. package/dest/config/secret_value.d.ts.map +1 -1
  52. package/dest/crypto/aes128/index.d.ts +2 -1
  53. package/dest/crypto/aes128/index.d.ts.map +1 -1
  54. package/dest/crypto/aes128/index.js +11 -2
  55. package/dest/crypto/bls/bn254_keystore.d.ts +10 -177
  56. package/dest/crypto/bls/bn254_keystore.d.ts.map +1 -1
  57. package/dest/crypto/bls/bn254_keystore.js +22 -34
  58. package/dest/crypto/keys/index.d.ts +3 -2
  59. package/dest/crypto/keys/index.d.ts.map +1 -1
  60. package/dest/crypto/keys/index.js +30 -6
  61. package/dest/crypto/schnorr/index.d.ts +8 -7
  62. package/dest/crypto/schnorr/index.d.ts.map +1 -1
  63. package/dest/crypto/schnorr/index.js +6 -6
  64. package/dest/crypto/schnorr/signature.d.ts +9 -29
  65. package/dest/crypto/schnorr/signature.d.ts.map +1 -1
  66. package/dest/crypto/schnorr/signature.js +20 -36
  67. package/dest/curves/bls12/field.d.ts +3 -3
  68. package/dest/curves/bls12/field.d.ts.map +1 -1
  69. package/dest/curves/bls12/field.js +0 -5
  70. package/dest/curves/bls12/point.d.ts +2 -2
  71. package/dest/curves/bls12/point.d.ts.map +1 -1
  72. package/dest/curves/bn254/field.d.ts +23 -19
  73. package/dest/curves/bn254/field.d.ts.map +1 -1
  74. package/dest/curves/bn254/field.js +23 -17
  75. package/dest/curves/grumpkin/point.d.ts +14 -28
  76. package/dest/curves/grumpkin/point.d.ts.map +1 -1
  77. package/dest/curves/grumpkin/point.js +29 -43
  78. package/dest/eth-address/index.d.ts +2 -2
  79. package/dest/eth-address/index.d.ts.map +1 -1
  80. package/dest/eth-address/index.js +0 -3
  81. package/dest/eth-signature/eth_signature.d.ts +2 -2
  82. package/dest/eth-signature/eth_signature.d.ts.map +1 -1
  83. package/dest/fifo/fifo_frame_reader.d.ts +2 -2
  84. package/dest/fifo/fifo_frame_reader.d.ts.map +1 -1
  85. package/dest/fifo/fifo_frame_reader.js +21 -4
  86. package/dest/fifo_set/fifo_set.d.ts +15 -0
  87. package/dest/fifo_set/fifo_set.d.ts.map +1 -0
  88. package/dest/fifo_set/fifo_set.js +39 -0
  89. package/dest/fifo_set/index.d.ts +2 -0
  90. package/dest/fifo_set/index.d.ts.map +1 -0
  91. package/dest/fifo_set/index.js +1 -0
  92. package/dest/json-rpc/client/fetch.d.ts +1 -1
  93. package/dest/json-rpc/client/fetch.d.ts.map +1 -1
  94. package/dest/json-rpc/client/fetch.js +4 -3
  95. package/dest/json-rpc/client/safe_json_rpc_client.d.ts +1 -1
  96. package/dest/json-rpc/client/safe_json_rpc_client.d.ts.map +1 -1
  97. package/dest/json-rpc/client/safe_json_rpc_client.js +5 -4
  98. package/dest/json-rpc/client/undici.d.ts +1 -1
  99. package/dest/json-rpc/client/undici.d.ts.map +1 -1
  100. package/dest/json-rpc/client/undici.js +5 -3
  101. package/dest/json-rpc/fixtures/test_state.d.ts +4 -8
  102. package/dest/json-rpc/fixtures/test_state.d.ts.map +1 -1
  103. package/dest/json-rpc/fixtures/test_state.js +57 -17
  104. package/dest/json-rpc/server/safe_json_rpc_server.d.ts +8 -3
  105. package/dest/json-rpc/server/safe_json_rpc_server.d.ts.map +1 -1
  106. package/dest/json-rpc/server/safe_json_rpc_server.js +32 -14
  107. package/dest/log/aws-logger-config.d.ts +8 -0
  108. package/dest/log/aws-logger-config.d.ts.map +1 -0
  109. package/dest/log/aws-logger-config.js +55 -0
  110. package/dest/log/pino-logger.d.ts +1 -1
  111. package/dest/log/pino-logger.d.ts.map +1 -1
  112. package/dest/log/pino-logger.js +29 -8
  113. package/dest/noir/noir_package_config.d.ts +19 -104
  114. package/dest/noir/noir_package_config.d.ts.map +1 -1
  115. package/dest/noir/noir_package_config.js +1 -1
  116. package/dest/promise/running-promise.d.ts +5 -4
  117. package/dest/promise/running-promise.d.ts.map +1 -1
  118. package/dest/promise/running-promise.js +7 -3
  119. package/dest/queue/batch_queue.d.ts +1 -1
  120. package/dest/queue/batch_queue.d.ts.map +1 -1
  121. package/dest/queue/batch_queue.js +1 -0
  122. package/dest/retry/index.d.ts +31 -3
  123. package/dest/retry/index.d.ts.map +1 -1
  124. package/dest/retry/index.js +44 -2
  125. package/dest/schemas/api.d.ts +12 -10
  126. package/dest/schemas/api.d.ts.map +1 -1
  127. package/dest/schemas/api.js +7 -1
  128. package/dest/schemas/parse.d.ts +4 -4
  129. package/dest/schemas/parse.d.ts.map +1 -1
  130. package/dest/schemas/parse.js +6 -5
  131. package/dest/schemas/schemas.d.ts +15 -15
  132. package/dest/schemas/types.d.ts +3 -3
  133. package/dest/schemas/types.d.ts.map +1 -1
  134. package/dest/schemas/utils.d.ts +7 -11
  135. package/dest/schemas/utils.d.ts.map +1 -1
  136. package/dest/schemas/utils.js +2 -18
  137. package/dest/serialize/buffer_reader.d.ts +1 -1
  138. package/dest/serialize/buffer_reader.d.ts.map +1 -1
  139. package/dest/serialize/buffer_reader.js +5 -0
  140. package/dest/serialize/buffer_sink.d.ts +134 -0
  141. package/dest/serialize/buffer_sink.d.ts.map +1 -0
  142. package/dest/serialize/buffer_sink.js +297 -0
  143. package/dest/serialize/index.d.ts +2 -1
  144. package/dest/serialize/index.d.ts.map +1 -1
  145. package/dest/serialize/index.js +1 -0
  146. package/dest/serialize/serialize.d.ts +1 -32
  147. package/dest/serialize/serialize.d.ts.map +1 -1
  148. package/dest/serialize/serialize.js +0 -21
  149. package/dest/string/index.d.ts +3 -1
  150. package/dest/string/index.d.ts.map +1 -1
  151. package/dest/string/index.js +13 -1
  152. package/dest/testing/files/index.d.ts +3 -4
  153. package/dest/testing/files/index.d.ts.map +1 -1
  154. package/dest/testing/files/index.js +3 -4
  155. package/dest/timer/index.d.ts +2 -2
  156. package/dest/timer/index.d.ts.map +1 -1
  157. package/dest/timer/index.js +1 -1
  158. package/dest/timer/timeout.d.ts +3 -1
  159. package/dest/timer/timeout.d.ts.map +1 -1
  160. package/dest/timer/timeout.js +26 -0
  161. package/dest/transport/dispatch/create_dispatch_proxy.d.ts +11 -2
  162. package/dest/transport/dispatch/create_dispatch_proxy.d.ts.map +1 -1
  163. package/dest/transport/index.d.ts +1 -2
  164. package/dest/transport/index.d.ts.map +1 -1
  165. package/dest/transport/index.js +0 -1
  166. package/dest/trees/balanced_merkle_tree_root.d.ts +2 -3
  167. package/dest/trees/balanced_merkle_tree_root.d.ts.map +1 -1
  168. package/dest/trees/balanced_merkle_tree_root.js +2 -3
  169. package/dest/trees/hasher.d.ts +3 -2
  170. package/dest/trees/hasher.d.ts.map +1 -1
  171. package/dest/trees/hasher.js +5 -5
  172. package/dest/trees/membership_witness.d.ts +2 -6
  173. package/dest/trees/membership_witness.d.ts.map +1 -1
  174. package/dest/trees/membership_witness.js +0 -9
  175. package/dest/trees/merkle_tree_calculator.d.ts +4 -2
  176. package/dest/trees/merkle_tree_calculator.d.ts.map +1 -1
  177. package/dest/trees/merkle_tree_calculator.js +1 -5
  178. package/dest/trees/sibling_path.d.ts +13 -14
  179. package/dest/trees/sibling_path.d.ts.map +1 -1
  180. package/dest/trees/sibling_path.js +23 -28
  181. package/dest/trees/unbalanced_merkle_tree_root.d.ts +2 -3
  182. package/dest/trees/unbalanced_merkle_tree_root.d.ts.map +1 -1
  183. package/dest/trees/unbalanced_merkle_tree_root.js +2 -3
  184. package/dest/types/index.d.ts +23 -1
  185. package/dest/types/index.d.ts.map +1 -1
  186. package/dest/types/index.js +15 -0
  187. package/package.json +5 -4
  188. package/src/bigint-buffer/index.ts +6 -1
  189. package/src/branded-types/block_number.ts +20 -2
  190. package/src/branded-types/buffer32_hash.ts +38 -0
  191. package/src/branded-types/checkpoint_number.ts +16 -1
  192. package/src/branded-types/epoch.ts +1 -1
  193. package/src/branded-types/index.ts +1 -0
  194. package/src/branded-types/index_within_checkpoint.ts +1 -1
  195. package/src/branded-types/slot.ts +1 -1
  196. package/src/buffer/buffer16.ts +3 -0
  197. package/src/buffer/buffer32.ts +39 -68
  198. package/src/collection/array.ts +34 -0
  199. package/src/collection/index.ts +2 -0
  200. package/src/collection/lru_map.ts +143 -0
  201. package/src/collection/lru_set.ts +115 -0
  202. package/src/committable/committable.ts +1 -1
  203. package/src/config/env_var.ts +47 -24
  204. package/src/config/index.ts +143 -122
  205. package/src/config/network_name.ts +2 -5
  206. package/src/config/secret_value.ts +1 -1
  207. package/src/crypto/aes128/index.ts +11 -2
  208. package/src/crypto/bls/bn254_keystore.ts +33 -43
  209. package/src/crypto/keys/index.ts +20 -4
  210. package/src/crypto/schnorr/index.ts +9 -8
  211. package/src/crypto/schnorr/signature.ts +17 -46
  212. package/src/curves/bls12/field.ts +0 -7
  213. package/src/curves/bn254/field.ts +35 -34
  214. package/src/curves/grumpkin/point.ts +23 -40
  215. package/src/eth-address/index.ts +0 -4
  216. package/src/fifo/fifo_frame_reader.ts +17 -2
  217. package/src/fifo_set/fifo_set.ts +52 -0
  218. package/src/fifo_set/index.ts +1 -0
  219. package/src/json-rpc/client/fetch.ts +4 -3
  220. package/src/json-rpc/client/safe_json_rpc_client.ts +5 -4
  221. package/src/json-rpc/client/undici.ts +5 -3
  222. package/src/json-rpc/fixtures/test_state.ts +10 -10
  223. package/src/json-rpc/server/safe_json_rpc_server.ts +36 -14
  224. package/src/log/aws-logger-config.ts +32 -0
  225. package/src/log/pino-logger.ts +33 -6
  226. package/src/noir/noir_package_config.ts +32 -20
  227. package/src/promise/running-promise.ts +8 -5
  228. package/src/queue/batch_queue.ts +1 -0
  229. package/src/retry/index.ts +66 -4
  230. package/src/schemas/api.ts +25 -25
  231. package/src/schemas/parse.ts +9 -6
  232. package/src/schemas/schemas.ts +4 -4
  233. package/src/schemas/types.ts +2 -2
  234. package/src/schemas/utils.ts +4 -38
  235. package/src/serialize/buffer_reader.ts +5 -0
  236. package/src/serialize/buffer_sink.ts +350 -0
  237. package/src/serialize/index.ts +1 -0
  238. package/src/serialize/serialize.ts +0 -50
  239. package/src/string/index.ts +15 -1
  240. package/src/testing/files/index.ts +3 -4
  241. package/src/timer/index.ts +1 -1
  242. package/src/timer/timeout.ts +31 -0
  243. package/src/transport/dispatch/create_dispatch_proxy.ts +11 -1
  244. package/src/transport/index.ts +0 -1
  245. package/src/trees/balanced_merkle_tree_root.ts +2 -5
  246. package/src/trees/hasher.ts +6 -3
  247. package/src/trees/membership_witness.ts +0 -8
  248. package/src/trees/merkle_tree_calculator.ts +4 -10
  249. package/src/trees/sibling_path.ts +24 -30
  250. package/src/trees/unbalanced_merkle_tree_root.ts +2 -5
  251. package/src/types/index.ts +47 -0
  252. package/dest/crypto/serialize.d.ts +0 -51
  253. package/dest/crypto/serialize.d.ts.map +0 -1
  254. package/dest/crypto/serialize.js +0 -68
  255. package/dest/transport/dispatch/create_dispatch_fn.d.ts +0 -25
  256. package/dest/transport/dispatch/create_dispatch_fn.d.ts.map +0 -1
  257. package/dest/transport/dispatch/create_dispatch_fn.js +0 -17
  258. package/src/crypto/serialize.ts +0 -85
  259. package/src/transport/dispatch/create_dispatch_fn.ts +0 -35
@@ -8,7 +8,7 @@ import { format, inspect } from 'util';
8
8
  import { ZodError } from 'zod';
9
9
  import { createLogger } from '../../log/index.js';
10
10
  import { promiseWithResolvers } from '../../promise/utils.js';
11
- import { parseWithOptionals, schemaHasMethod } from '../../schemas/index.js';
11
+ import { getSchemaParameters, parseWithOptionals, schemaHasMethod } from '../../schemas/index.js';
12
12
  import { jsonStringify } from '../convert.js';
13
13
  import { assert } from '../js_utils.js';
14
14
  const defaultServerConfig = {
@@ -20,16 +20,18 @@ export class SafeJsonRpcServer {
20
20
  proxy;
21
21
  healthCheck;
22
22
  extraMiddlewares;
23
+ diagnosticsMiddleware;
23
24
  log;
24
25
  /**
25
26
  * The HTTP server accepting remote requests.
26
27
  * This member field is initialized when the server is started.
27
28
  */ httpServer;
28
29
  config;
29
- constructor(/** The proxy object to delegate requests to */ proxy, config = {}, /** Health check function */ healthCheck = ()=>true, /** Additional middlewares */ extraMiddlewares = [], /** Logger */ log = createLogger('json-rpc:server')){
30
+ constructor(/** The proxy object to delegate requests to */ proxy, config = {}, /** Health check function */ healthCheck = ()=>true, /** Additional Koa middlewares */ extraMiddlewares = [], /** Additional per-request diagnostics middlewares */ diagnosticsMiddleware, /** Logger */ log = createLogger('json-rpc:server')){
30
31
  this.proxy = proxy;
31
32
  this.healthCheck = healthCheck;
32
33
  this.extraMiddlewares = extraMiddlewares;
34
+ this.diagnosticsMiddleware = diagnosticsMiddleware;
33
35
  this.log = log;
34
36
  this.config = {
35
37
  ...defaultServerConfig,
@@ -151,7 +153,7 @@ export class SafeJsonRpcServer {
151
153
  };
152
154
  return;
153
155
  }
154
- const resp = await this.processBatch(ctx.request.body);
156
+ const resp = await this.processBatch(ctx.request.body, ctx.request.headers);
155
157
  if (Array.isArray(resp)) {
156
158
  ctx.status = 200;
157
159
  ctx.body = resp;
@@ -160,7 +162,7 @@ export class SafeJsonRpcServer {
160
162
  ctx.body = resp;
161
163
  }
162
164
  } else {
163
- const resp = await this.processRequest(ctx.request.body);
165
+ const resp = await this.processRequest(ctx.request.body, ctx.request.headers);
164
166
  if ('error' in resp) {
165
167
  ctx.status = this.config.http200OnError ? 200 : 400;
166
168
  }
@@ -169,7 +171,7 @@ export class SafeJsonRpcServer {
169
171
  });
170
172
  return router;
171
173
  }
172
- async processBatch(requests) {
174
+ async processBatch(requests, headers = {}) {
173
175
  if (requests.length === 0) {
174
176
  return {
175
177
  jsonrpc: '2.0',
@@ -180,7 +182,7 @@ export class SafeJsonRpcServer {
180
182
  id: null
181
183
  };
182
184
  }
183
- const results = await Promise.allSettled(requests.map((req)=>this.processRequest(req)));
185
+ const results = await Promise.allSettled(requests.map((req)=>this.processRequest(req, headers)));
184
186
  return results.map((res)=>{
185
187
  if (res.status === 'fulfilled') {
186
188
  return res.value;
@@ -196,7 +198,7 @@ export class SafeJsonRpcServer {
196
198
  };
197
199
  });
198
200
  }
199
- async processRequest(request) {
201
+ async processRequest(request, headers = {}) {
200
202
  if (!request || typeof request !== 'object') {
201
203
  return {
202
204
  jsonrpc: '2.0',
@@ -230,11 +232,27 @@ export class SafeJsonRpcServer {
230
232
  };
231
233
  } else {
232
234
  try {
233
- const result = await this.proxy.call(method, params);
235
+ let result;
236
+ if (this.diagnosticsMiddleware) {
237
+ await this.diagnosticsMiddleware({
238
+ id: id ?? null,
239
+ method,
240
+ params,
241
+ headers
242
+ }, async ()=>{
243
+ result = await this.proxy.call(method, params);
244
+ });
245
+ } else {
246
+ result = await this.proxy.call(method, params);
247
+ }
248
+ // Coerce an undefined return value to null so the response always carries a `result` key.
249
+ // JSON.stringify drops undefined-valued keys, which would otherwise produce a JSON-RPC
250
+ // response with neither `result` nor `error` — a spec violation that leaves callers unable
251
+ // to distinguish "not found" from a malformed response.
234
252
  return {
235
253
  jsonrpc,
236
254
  id,
237
- result
255
+ result: result ?? null
238
256
  };
239
257
  } catch (err) {
240
258
  if (err && err instanceof ZodError) {
@@ -330,7 +348,7 @@ export class SafeJsonRpcServer {
330
348
  assert(schemaHasMethod(this.schema, methodName), `Method ${methodName} not found in schema`);
331
349
  const method = this.handler[methodName];
332
350
  assert(typeof method === 'function', `Method ${methodName} is not a function`);
333
- const args = await parseWithOptionals(jsonParams, this.schema[methodName].parameters());
351
+ const args = await parseWithOptionals(jsonParams, getSchemaParameters(this.schema[methodName]));
334
352
  const ret = await method.apply(this.handler, args);
335
353
  this.log.debug(format('response', methodName, ret));
336
354
  return ret;
@@ -389,15 +407,15 @@ function makeAggregateHealthcheck(namedHandlers, log) {
389
407
  * @param servers - List of handlers to be combined.
390
408
  * @returns A single JsonRpcServer with namespaced methods.
391
409
  */ export function createNamespacedSafeJsonRpcServer(handlers, options = {}) {
392
- const { middlewares, log } = options;
410
+ const { diagnostic, middlewares, log } = options;
393
411
  const proxy = new NamespacedSafeJsonProxy(handlers);
394
412
  const healthCheck = makeAggregateHealthcheck(handlers, log);
395
- return new SafeJsonRpcServer(proxy, options, healthCheck, middlewares, log);
413
+ return new SafeJsonRpcServer(proxy, options, healthCheck, middlewares, diagnostic, log);
396
414
  }
397
415
  export function createSafeJsonRpcServer(handler, schema, options = {}) {
398
- const { log, healthCheck, middlewares: extraMiddlewares } = options;
416
+ const { diagnostic, log, healthCheck, middlewares: extraMiddlewares } = options;
399
417
  const proxy = new SafeJsonProxy(handler, schema);
400
- return new SafeJsonRpcServer(proxy, options, healthCheck, extraMiddlewares, log);
418
+ return new SafeJsonRpcServer(proxy, options, healthCheck, extraMiddlewares, diagnostic, log);
401
419
  }
402
420
  /**
403
421
  * Creates a router for handling a plain status request that will return 200 status when running.
@@ -0,0 +1,8 @@
1
+ /** Pino configuration that adds OpenTelemetry severity fields understood by CloudWatch Logs. */
2
+ export declare const AWSCloudLoggerConfig: {
3
+ messageKey: string;
4
+ formatters: {
5
+ level(label: string, level: number): object;
6
+ };
7
+ };
8
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXdzLWxvZ2dlci1jb25maWcuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2cvYXdzLWxvZ2dlci1jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBdUJBLGdHQUFnRztBQUNoRyxlQUFPLE1BQU0sb0JBQW9COzs7OztDQU9ILENBQUMifQ==
@@ -0,0 +1 @@
1
+ {"version":3,"file":"aws-logger-config.d.ts","sourceRoot":"","sources":["../../src/log/aws-logger-config.ts"],"names":[],"mappings":"AAuBA,gGAAgG;AAChG,eAAO,MAAM,oBAAoB;;;;;CAOH,CAAC"}
@@ -0,0 +1,55 @@
1
+ function getSeverity(label) {
2
+ switch(label){
3
+ case 'trace':
4
+ return {
5
+ severityText: 'TRACE',
6
+ severityNumber: 1
7
+ };
8
+ case 'debug':
9
+ return {
10
+ severityText: 'DEBUG',
11
+ severityNumber: 5
12
+ };
13
+ case 'verbose':
14
+ return {
15
+ severityText: 'VERBOSE',
16
+ severityNumber: 7
17
+ };
18
+ case 'info':
19
+ return {
20
+ severityText: 'INFO',
21
+ severityNumber: 9
22
+ };
23
+ case 'warn':
24
+ return {
25
+ severityText: 'WARN',
26
+ severityNumber: 13
27
+ };
28
+ case 'error':
29
+ return {
30
+ severityText: 'ERROR',
31
+ severityNumber: 17
32
+ };
33
+ case 'fatal':
34
+ return {
35
+ severityText: 'FATAL',
36
+ severityNumber: 21
37
+ };
38
+ default:
39
+ return {
40
+ severityText: 'UNSPECIFIED',
41
+ severityNumber: 0
42
+ };
43
+ }
44
+ }
45
+ /** Pino configuration that adds OpenTelemetry severity fields understood by CloudWatch Logs. */ export const AWSCloudLoggerConfig = {
46
+ messageKey: 'msg',
47
+ formatters: {
48
+ level (label, level) {
49
+ return {
50
+ level,
51
+ ...getSeverity(label)
52
+ };
53
+ }
54
+ }
55
+ };
@@ -83,4 +83,4 @@ export type Logger = {
83
83
  getBindings: () => LoggerBindings;
84
84
  };
85
85
  export {};
86
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGluby1sb2dnZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2cvcGluby1sb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssS0FBSyxFQUFrQyxNQUFNLFdBQVcsQ0FBQztBQUd2RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFTdkMsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDaEQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVsRCx3RUFBd0U7QUFDeEUsTUFBTSxNQUFNLGNBQWMsR0FBRztJQUMzQiwrREFBK0Q7SUFDL0QsS0FBSyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2YsdUZBQXVGO0lBQ3ZGLFVBQVUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNyQixDQUFDO0FBSUYsS0FBSyxrQkFBa0IsR0FBRyxNQUFNLGNBQWMsR0FBRyxTQUFTLENBQUM7QUFHM0Qsd0JBQWdCLHFCQUFxQixDQUFDLE9BQU8sRUFBRSxrQkFBa0IsR0FBRyxJQUFJLENBRXZFO0FBRUQsd0JBQWdCLHdCQUF3QixDQUFDLE9BQU8sRUFBRSxrQkFBa0IsUUFLbkU7QUFZRCx3QkFBZ0IsWUFBWSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsUUFBUSxDQUFDLEVBQUUsY0FBYyxHQUFHLE1BQU0sQ0E2QzlFO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQWdCLGFBQWEsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLGdCQUFnQixDQUFDLEVBQUUsTUFBTSxHQUFHLGNBQWMsR0FBRyxNQUFNLENBS2hHO0FBSUQsS0FBSyxjQUFjLEdBQUcsQ0FBQyxJQUFJLEVBQUUsT0FBTyxLQUFLLE9BQU8sQ0FBQztBQUdqRCx3QkFBZ0IsaUJBQWlCLENBQUMsT0FBTyxFQUFFLGNBQWMsR0FBRyxJQUFJLENBRS9EO0FBZUQsZUFBTyxNQUFPLFFBQVEsa0ZBQUUsVUFBVSx1Q0FBK0QsQ0FBQztBQTZDbEcsZUFBTyxNQUFNLE1BQU07Ozs7O0NBR2xCLENBQUM7QUFlRiwyRkFBMkY7QUFDM0Ysd0JBQWdCLGFBQWEsQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLEtBQUssQ0FRbEQ7QUFFRCw2REFBNkQ7QUFDN0Qsd0JBQWdCLGdCQUFnQixJQUFJLElBQUksQ0FHdkM7QUFNRCxLQUFLLFNBQVMsR0FBRztJQUFFLEtBQUssQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUFDLE1BQU0sQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUFDLFVBQVUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUFDLEdBQUcsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtDQUFFLENBQUM7QUFFeEYseUdBQXlHO0FBQ3pHLHdCQUFnQixnQkFBZ0IsQ0FBQyxHQUFHLEVBQUUsU0FBUyxFQUFFLFVBQVUsRUFBRSxNQUFNLEdBQUcsTUFBTSxDQWtCM0U7QUFjRDs7O0dBR0c7QUFDSCxlQUFPLE1BQU0sY0FBYzs7Ozs7Ozs7OztDQUcxQixDQUFDO0FBMERGLGVBQU8sTUFBTSxNQUFNLDJDQUFlLENBQUM7QUFhbkM7OztHQUdHO0FBQ0gsd0JBQWdCLHNCQUFzQixDQUFDLE1BQU0sRUFBRSxRQUFRLEdBQUcsSUFBSSxDQUU3RDtBQUVEOzs7R0FHRztBQUNILHdCQUFnQixxQkFBcUIsQ0FBQyxNQUFNLEVBQUUsUUFBUSxHQUFHLElBQUksQ0FlNUQ7QUFFRCxvREFBb0Q7QUFDcEQsS0FBSyxVQUFVLEdBQUcsQ0FBQyxHQUFHLEVBQUUsTUFBTSxFQUFFLEdBQUcsQ0FBQyxFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUMsRUFBRSxPQUFPLEtBQUssSUFBSSxDQUFDO0FBRXZFOztHQUVHO0FBQ0gsTUFBTSxNQUFNLE1BQU0sR0FBRztLQUFHLENBQUMsSUFBSSxRQUFRLEdBQUcsS0FBSztDQUFFLEdBQUc7SUFBNEIsS0FBSyxFQUFFLFVBQVUsQ0FBQTtDQUFFLEdBQUc7SUFDbEcsS0FBSyxFQUFFLFFBQVEsQ0FBQztJQUNoQixjQUFjLEVBQUUsQ0FBQyxLQUFLLEVBQUUsUUFBUSxLQUFLLE9BQU8sQ0FBQztJQUM3QyxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsV0FBVyxFQUFFLENBQUMsV0FBVyxFQUFFLE1BQU0sS0FBSyxNQUFNLENBQUM7SUFDN0MsZ0VBQWdFO0lBQ2hFLFdBQVcsRUFBRSxNQUFNLGNBQWMsQ0FBQztDQUNuQyxDQUFDIn0=
86
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGluby1sb2dnZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2cvcGluby1sb2dnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssS0FBSyxFQUFrQyxNQUFNLFdBQVcsQ0FBQztBQUd2RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFVdkMsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDaEQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVsRCx3RUFBd0U7QUFDeEUsTUFBTSxNQUFNLGNBQWMsR0FBRztJQUMzQiwrREFBK0Q7SUFDL0QsS0FBSyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2YsdUZBQXVGO0lBQ3ZGLFVBQVUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNyQixDQUFDO0FBTUYsS0FBSyxrQkFBa0IsR0FBRyxNQUFNLGNBQWMsR0FBRyxTQUFTLENBQUM7QUFHM0Qsd0JBQWdCLHFCQUFxQixDQUFDLE9BQU8sRUFBRSxrQkFBa0IsR0FBRyxJQUFJLENBRXZFO0FBRUQsd0JBQWdCLHdCQUF3QixDQUFDLE9BQU8sRUFBRSxrQkFBa0IsUUFLbkU7QUFZRCx3QkFBZ0IsWUFBWSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsUUFBUSxDQUFDLEVBQUUsY0FBYyxHQUFHLE1BQU0sQ0E2QzlFO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQWdCLGFBQWEsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLGdCQUFnQixDQUFDLEVBQUUsTUFBTSxHQUFHLGNBQWMsR0FBRyxNQUFNLENBS2hHO0FBSUQsS0FBSyxjQUFjLEdBQUcsQ0FBQyxJQUFJLEVBQUUsT0FBTyxLQUFLLE9BQU8sQ0FBQztBQUdqRCx3QkFBZ0IsaUJBQWlCLENBQUMsT0FBTyxFQUFFLGNBQWMsR0FBRyxJQUFJLENBRS9EO0FBZUQsZUFBTyxNQUFPLFFBQVEsa0ZBQUUsVUFBVSx1Q0FBK0QsQ0FBQztBQXNEbEcsZUFBTyxNQUFNLE1BQU07Ozs7O0NBR2xCLENBQUM7QUFlRiwyRkFBMkY7QUFDM0Ysd0JBQWdCLGFBQWEsQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLEtBQUssQ0FRbEQ7QUFFRCw2REFBNkQ7QUFDN0Qsd0JBQWdCLGdCQUFnQixJQUFJLElBQUksQ0FHdkM7QUFNRCxLQUFLLFNBQVMsR0FBRztJQUFFLEtBQUssQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUFDLE1BQU0sQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUFDLFVBQVUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUFDLEdBQUcsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtDQUFFLENBQUM7QUFFeEYseUdBQXlHO0FBQ3pHLHdCQUFnQixnQkFBZ0IsQ0FBQyxHQUFHLEVBQUUsU0FBUyxFQUFFLFVBQVUsRUFBRSxNQUFNLEdBQUcsTUFBTSxDQWtCM0U7QUFjRDs7O0dBR0c7QUFDSCxlQUFPLE1BQU0sY0FBYzs7Ozs7Ozs7OztDQUcxQixDQUFDO0FBMERGLGVBQU8sTUFBTSxNQUFNLDJDQUFlLENBQUM7QUFhbkM7OztHQUdHO0FBQ0gsd0JBQWdCLHNCQUFzQixDQUFDLE1BQU0sRUFBRSxRQUFRLEdBQUcsSUFBSSxDQUU3RDtBQUVEOzs7R0FHRztBQUNILHdCQUFnQixxQkFBcUIsQ0FBQyxNQUFNLEVBQUUsUUFBUSxHQUFHLElBQUksQ0FlNUQ7QUFFRCxvREFBb0Q7QUFDcEQsS0FBSyxVQUFVLEdBQUcsQ0FBQyxHQUFHLEVBQUUsTUFBTSxFQUFFLEdBQUcsQ0FBQyxFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUMsRUFBRSxPQUFPLEtBQUssSUFBSSxDQUFDO0FBRXZFOztHQUVHO0FBQ0gsTUFBTSxNQUFNLE1BQU0sR0FBRztLQUFHLENBQUMsSUFBSSxRQUFRLEdBQUcsS0FBSztDQUFFLEdBQUc7SUFBNEIsS0FBSyxFQUFFLFVBQVUsQ0FBQTtDQUFFLEdBQUc7SUFDbEcsS0FBSyxFQUFFLFFBQVEsQ0FBQztJQUNoQixjQUFjLEVBQUUsQ0FBQyxLQUFLLEVBQUUsUUFBUSxLQUFLLE9BQU8sQ0FBQztJQUM3QyxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsV0FBVyxFQUFFLENBQUMsV0FBVyxFQUFFLE1BQU0sS0FBSyxNQUFNLENBQUM7SUFDN0MsZ0VBQWdFO0lBQ2hFLFdBQVcsRUFBRSxNQUFNLGNBQWMsQ0FBQztDQUNuQyxDQUFDIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"pino-logger.d.ts","sourceRoot":"","sources":["../../src/log/pino-logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAkC,MAAM,WAAW,CAAC;AAGvE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AASvC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAElD,wEAAwE;AACxE,MAAM,MAAM,cAAc,GAAG;IAC3B,+DAA+D;IAC/D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uFAAuF;IACvF,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAIF,KAAK,kBAAkB,GAAG,MAAM,cAAc,GAAG,SAAS,CAAC;AAG3D,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAEvE;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,kBAAkB,QAKnE;AAYD,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,MAAM,CA6C9E;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,cAAc,GAAG,MAAM,CAKhG;AAID,KAAK,cAAc,GAAG,CAAC,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC;AAGjD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,CAE/D;AAeD,eAAO,MAAO,QAAQ,kFAAE,UAAU,uCAA+D,CAAC;AA6ClG,eAAO,MAAM,MAAM;;;;;CAGlB,CAAC;AAeF,2FAA2F;AAC3F,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,CAQlD;AAED,6DAA6D;AAC7D,wBAAgB,gBAAgB,IAAI,IAAI,CAGvC;AAMD,KAAK,SAAS,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAExF,yGAAyG;AACzG,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAkB3E;AAcD;;;GAGG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;CAG1B,CAAC;AA0DF,eAAO,MAAM,MAAM,2CAAe,CAAC;AAanC;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,QAAQ,GAAG,IAAI,CAE7D;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,QAAQ,GAAG,IAAI,CAe5D;AAED,oDAAoD;AACpD,KAAK,UAAU,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;AAEvE;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG;KAAG,CAAC,IAAI,QAAQ,GAAG,KAAK;CAAE,GAAG;IAA4B,KAAK,EAAE,UAAU,CAAA;CAAE,GAAG;IAClG,KAAK,EAAE,QAAQ,CAAC;IAChB,cAAc,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,OAAO,CAAC;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,MAAM,CAAC;IAC7C,gEAAgE;IAChE,WAAW,EAAE,MAAM,cAAc,CAAC;CACnC,CAAC"}
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;AAUvC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAElD,wEAAwE;AACxE,MAAM,MAAM,cAAc,GAAG;IAC3B,+DAA+D;IAC/D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uFAAuF;IACvF,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAMF,KAAK,kBAAkB,GAAG,MAAM,cAAc,GAAG,SAAS,CAAC;AAG3D,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAEvE;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,kBAAkB,QAKnE;AAYD,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,MAAM,CA6C9E;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,cAAc,GAAG,MAAM,CAKhG;AAID,KAAK,cAAc,GAAG,CAAC,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC;AAGjD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,CAE/D;AAeD,eAAO,MAAO,QAAQ,kFAAE,UAAU,uCAA+D,CAAC;AAsDlG,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"}
@@ -4,9 +4,11 @@ import { pino, symbols } from 'pino';
4
4
  import { inspect } from 'util';
5
5
  import { compactArray } from '../collection/array.js';
6
6
  import { parseBooleanEnv } from '../config/parse-env.js';
7
+ import { AWSCloudLoggerConfig } from './aws-logger-config.js';
7
8
  import { convertBigintsToStrings } from './bigint-utils.js';
8
9
  import { GoogleCloudLoggerConfig } from './gcloud-logger-config.js';
9
10
  import { getLogLevelFromFilters, parseLogLevelEnvVar } from './log-filters.js';
11
+ const MAX_MODULE_NAME_LENGTH = 256;
10
12
  const logBindingsHandlers = [];
11
13
  export function addLogBindingsHandler(handler) {
12
14
  logBindingsHandlers.push(handler);
@@ -27,7 +29,7 @@ function getBindingsFromHandlers() {
27
29
  return undefined;
28
30
  }
29
31
  export function createLogger(module, bindings) {
30
- module = module.replace(/^aztec:/, '');
32
+ module = module.slice(0, MAX_MODULE_NAME_LENGTH).replace(/^aztec:/, '');
31
33
  const resolvedBindings = {
32
34
  ...getBindingsFromHandlers(),
33
35
  ...bindings
@@ -98,8 +100,13 @@ export const [logLevel, logFilters] = parseLogLevelEnvVar(process.env.LOG_LEVEL,
98
100
  const customLevels = {
99
101
  verbose: 25
100
102
  };
101
- // Global pino options, tweaked for google cloud if running there.
103
+ // Global pino options, tweaked for the active cloud logging backend.
102
104
  const useGcloudLogging = parseBooleanEnv(process.env['USE_GCLOUD_LOGGING']);
105
+ const useAwsLogging = parseBooleanEnv(process.env['USE_AWS_LOGGING']);
106
+ const loggingConfig = useGcloudLogging ? GoogleCloudLoggerConfig : useAwsLogging ? AWSCloudLoggerConfig : {
107
+ formatters: {},
108
+ messageKey: 'msg'
109
+ };
103
110
  const redactedPaths = [
104
111
  'validatorPrivateKeys',
105
112
  // for both the validator and the prover
@@ -118,7 +125,7 @@ const redactedPaths = [
118
125
  ];
119
126
  const pinoOpts = {
120
127
  customLevels,
121
- messageKey: 'msg',
128
+ messageKey: loggingConfig.messageKey,
122
129
  useOnlyCustomLevels: false,
123
130
  level: logLevel,
124
131
  redact: {
@@ -131,9 +138,9 @@ const pinoOpts = {
131
138
  ]
132
139
  },
133
140
  formatters: {
134
- log: (obj)=>convertBigintsToStrings(obj)
135
- },
136
- ...useGcloudLogging ? GoogleCloudLoggerConfig : {}
141
+ log: (obj)=>convertBigintsToStrings(obj),
142
+ ...loggingConfig.formatters
143
+ }
137
144
  };
138
145
  export const levels = {
139
146
  labels: {
@@ -203,7 +210,7 @@ const pinoPrettyBaseOpts = {
203
210
  destination: 2,
204
211
  sync: true,
205
212
  colorize: useColor,
206
- ignore: 'module,actor,instanceId,pid,hostname,trace_id,span_id,trace_flags,severity',
213
+ ignore: 'module,actor,instanceId,pid,hostname,trace_id,span_id,trace_flags,severity,severityText,severityNumber',
207
214
  customLevels: 'fatal:60,error:50,warn:40,info:30,verbose:25,debug:20,trace:10',
208
215
  customColors: 'fatal:bgRed,error:red,warn:yellow,info:green,verbose:magenta,debug:blue,trace:gray',
209
216
  minimumLevel: 'trace',
@@ -322,5 +329,19 @@ logger.verbose({
322
329
  * @param err - Error to log
323
330
  * @returns A string with both the log message and the error message.
324
331
  */ function formatErr(msg, err) {
325
- return err ? `${msg}: ${inspect(err)}` : msg;
332
+ if (!err) {
333
+ return msg;
334
+ }
335
+ try {
336
+ return `${msg}: ${inspect(err)}`;
337
+ } catch {
338
+ // inspect can crash on error objects with broken property descriptors
339
+ try {
340
+ // eslint-disable-next-line @typescript-eslint/no-base-to-string
341
+ return `${msg}: ${err instanceof Error ? `${err.name}: ${err.message}` : String(err)}`;
342
+ } catch {
343
+ // if even String(err) fails, return the original message with a note about the error
344
+ return `${msg}: [unserializable error]`;
345
+ }
346
+ }
326
347
  }
@@ -3,111 +3,10 @@ declare const noirGitDependencySchema: z.ZodObject<{
3
3
  git: z.ZodString;
4
4
  tag: z.ZodString;
5
5
  directory: z.ZodOptional<z.ZodString>;
6
- }, "strip", z.ZodTypeAny, {
7
- git: string;
8
- tag: string;
9
- directory?: string | undefined;
10
- }, {
11
- git: string;
12
- tag: string;
13
- directory?: string | undefined;
14
- }>;
6
+ }, z.core.$strip>;
15
7
  declare const noirLocalDependencySchema: z.ZodObject<{
16
8
  path: z.ZodString;
17
- }, "strip", z.ZodTypeAny, {
18
- path: string;
19
- }, {
20
- path: string;
21
- }>;
22
- declare const noirPackageConfigSchema: z.ZodObject<{
23
- package: z.ZodObject<{
24
- name: z.ZodDefault<z.ZodString>;
25
- type: z.ZodDefault<z.ZodEnum<["lib", "contract", "bin"]>>;
26
- entry: z.ZodOptional<z.ZodString>;
27
- description: z.ZodOptional<z.ZodString>;
28
- authors: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
29
- compiler_version: z.ZodOptional<z.ZodString>;
30
- backend: z.ZodOptional<z.ZodString>;
31
- license: z.ZodOptional<z.ZodString>;
32
- }, "strip", z.ZodTypeAny, {
33
- name: string;
34
- type: "bin" | "contract" | "lib";
35
- entry?: string | undefined;
36
- description?: string | undefined;
37
- authors?: string[] | undefined;
38
- compiler_version?: string | undefined;
39
- backend?: string | undefined;
40
- license?: string | undefined;
41
- }, {
42
- name?: string | undefined;
43
- type?: "bin" | "contract" | "lib" | undefined;
44
- entry?: string | undefined;
45
- description?: string | undefined;
46
- authors?: string[] | undefined;
47
- compiler_version?: string | undefined;
48
- backend?: string | undefined;
49
- license?: string | undefined;
50
- }>;
51
- dependencies: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
52
- git: z.ZodString;
53
- tag: z.ZodString;
54
- directory: z.ZodOptional<z.ZodString>;
55
- }, "strip", z.ZodTypeAny, {
56
- git: string;
57
- tag: string;
58
- directory?: string | undefined;
59
- }, {
60
- git: string;
61
- tag: string;
62
- directory?: string | undefined;
63
- }>, z.ZodObject<{
64
- path: z.ZodString;
65
- }, "strip", z.ZodTypeAny, {
66
- path: string;
67
- }, {
68
- path: string;
69
- }>]>>>;
70
- }, "strip", z.ZodTypeAny, {
71
- package: {
72
- name: string;
73
- type: "bin" | "contract" | "lib";
74
- entry?: string | undefined;
75
- description?: string | undefined;
76
- authors?: string[] | undefined;
77
- compiler_version?: string | undefined;
78
- backend?: string | undefined;
79
- license?: string | undefined;
80
- };
81
- dependencies: Record<string, {
82
- git: string;
83
- tag: string;
84
- directory?: string | undefined;
85
- } | {
86
- path: string;
87
- }>;
88
- }, {
89
- package: {
90
- name?: string | undefined;
91
- type?: "bin" | "contract" | "lib" | undefined;
92
- entry?: string | undefined;
93
- description?: string | undefined;
94
- authors?: string[] | undefined;
95
- compiler_version?: string | undefined;
96
- backend?: string | undefined;
97
- license?: string | undefined;
98
- };
99
- dependencies?: Record<string, {
100
- git: string;
101
- tag: string;
102
- directory?: string | undefined;
103
- } | {
104
- path: string;
105
- }> | undefined;
106
- }>;
107
- /**
108
- * Noir package configuration.
109
- */
110
- export type NoirPackageConfig = z.infer<typeof noirPackageConfigSchema>;
9
+ }, z.core.$strip>;
111
10
  /**
112
11
  * A remote package dependency.
113
12
  */
@@ -120,10 +19,26 @@ export type NoirLocalDependencyConfig = z.infer<typeof noirLocalDependencySchema
120
19
  * A package dependency.
121
20
  */
122
21
  export type NoirDependencyConfig = NoirGitDependencyConfig | NoirLocalDependencyConfig;
22
+ /**
23
+ * Noir package configuration.
24
+ */
25
+ export type NoirPackageConfig = {
26
+ package: {
27
+ name: string;
28
+ type: 'lib' | 'contract' | 'bin';
29
+ entry?: string | undefined;
30
+ description?: string | undefined;
31
+ authors?: string[] | undefined;
32
+ compiler_version?: string | undefined;
33
+ backend?: string | undefined;
34
+ license?: string | undefined;
35
+ };
36
+ dependencies: Record<string, NoirDependencyConfig>;
37
+ };
123
38
  /**
124
39
  * Checks that an object is a package configuration.
125
40
  * @param config - Config to check
126
41
  */
127
42
  export declare function parseNoirPackageConfig(config: any): NoirPackageConfig;
128
43
  export {};
129
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9pcl9wYWNrYWdlX2NvbmZpZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL25vaXIvbm9pcl9wYWNrYWdlX2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLFFBQUEsTUFBTSx1QkFBdUI7Ozs7Ozs7Ozs7OztFQUkzQixDQUFDO0FBRUgsUUFBQSxNQUFNLHlCQUF5Qjs7Ozs7O0VBRTdCLENBQUM7QUFFSCxRQUFBLE1BQU0sdUJBQXVCOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7RUFhM0IsQ0FBQztBQUVIOztHQUVHO0FBQ0gsTUFBTSxNQUFNLGlCQUFpQixHQUFHLENBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyx1QkFBdUIsQ0FBQyxDQUFDO0FBRXhFOztHQUVHO0FBQ0gsTUFBTSxNQUFNLHVCQUF1QixHQUFHLENBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyx1QkFBdUIsQ0FBQyxDQUFDO0FBRTlFOztHQUVHO0FBQ0gsTUFBTSxNQUFNLHlCQUF5QixHQUFHLENBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyx5QkFBeUIsQ0FBQyxDQUFDO0FBRWxGOztHQUVHO0FBQ0gsTUFBTSxNQUFNLG9CQUFvQixHQUFHLHVCQUF1QixHQUFHLHlCQUF5QixDQUFDO0FBRXZGOzs7R0FHRztBQUNILHdCQUFnQixzQkFBc0IsQ0FBQyxNQUFNLEVBQUUsR0FBRyxHQUFHLGlCQUFpQixDQUVyRSJ9
44
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9pcl9wYWNrYWdlX2NvbmZpZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL25vaXIvbm9pcl9wYWNrYWdlX2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLFFBQUEsTUFBTSx1QkFBdUI7Ozs7aUJBSTNCLENBQUM7QUFFSCxRQUFBLE1BQU0seUJBQXlCOztpQkFFN0IsQ0FBQztBQUVIOztHQUVHO0FBQ0gsTUFBTSxNQUFNLHVCQUF1QixHQUFHLENBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyx1QkFBdUIsQ0FBQyxDQUFDO0FBRTlFOztHQUVHO0FBQ0gsTUFBTSxNQUFNLHlCQUF5QixHQUFHLENBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyx5QkFBeUIsQ0FBQyxDQUFDO0FBRWxGOztHQUVHO0FBQ0gsTUFBTSxNQUFNLG9CQUFvQixHQUFHLHVCQUF1QixHQUFHLHlCQUF5QixDQUFDO0FBRXZGOztHQUVHO0FBQ0gsTUFBTSxNQUFNLGlCQUFpQixHQUFHO0lBQzlCLE9BQU8sRUFBRTtRQUNQLElBQUksRUFBRSxNQUFNLENBQUM7UUFDYixJQUFJLEVBQUUsS0FBSyxHQUFHLFVBQVUsR0FBRyxLQUFLLENBQUM7UUFDakMsS0FBSyxDQUFDLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztRQUMzQixXQUFXLENBQUMsRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDO1FBQ2pDLE9BQU8sQ0FBQyxFQUFFLE1BQU0sRUFBRSxHQUFHLFNBQVMsQ0FBQztRQUMvQixnQkFBZ0IsQ0FBQyxFQUFFLE1BQU0sR0FBRyxTQUFTLENBQUM7UUFDdEMsT0FBTyxDQUFDLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztRQUM3QixPQUFPLENBQUMsRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDO0tBQzlCLENBQUM7SUFDRixZQUFZLEVBQUUsTUFBTSxDQUFDLE1BQU0sRUFBRSxvQkFBb0IsQ0FBQyxDQUFDO0NBQ3BELENBQUM7QUFpQkY7OztHQUdHO0FBQ0gsd0JBQWdCLHNCQUFzQixDQUFDLE1BQU0sRUFBRSxHQUFHLEdBQUcsaUJBQWlCLENBRXJFIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"noir_package_config.d.ts","sourceRoot":"","sources":["../../src/noir/noir_package_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,QAAA,MAAM,uBAAuB;;;;;;;;;;;;EAI3B,CAAC;AAEH,QAAA,MAAM,yBAAyB;;;;;;EAE7B,CAAC;AAEH,QAAA,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAa3B,CAAC;AAEH;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAExE;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAE9E;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAElF;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,GAAG,yBAAyB,CAAC;AAEvF;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,GAAG,GAAG,iBAAiB,CAErE"}
1
+ {"version":3,"file":"noir_package_config.d.ts","sourceRoot":"","sources":["../../src/noir/noir_package_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,QAAA,MAAM,uBAAuB;;;;iBAI3B,CAAC;AAEH,QAAA,MAAM,yBAAyB;;iBAE7B,CAAC;AAEH;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAE9E;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAElF;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,GAAG,yBAAyB,CAAC;AAEvF;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,KAAK,GAAG,UAAU,GAAG,KAAK,CAAC;QACjC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC3B,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QACjC,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;QAC/B,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QACtC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC7B,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;KAC9B,CAAC;IACF,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;CACpD,CAAC;AAiBF;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,GAAG,GAAG,iBAAiB,CAErE"}
@@ -23,7 +23,7 @@ const noirPackageConfigSchema = z.object({
23
23
  backend: z.string().optional(),
24
24
  license: z.string().optional()
25
25
  }),
26
- dependencies: z.record(z.union([
26
+ dependencies: z.record(z.string(), z.union([
27
27
  noirGitDependencySchema,
28
28
  noirLocalDependencySchema
29
29
  ])).default({})
@@ -7,7 +7,7 @@ export declare function makeLoggingErrorHandler(logger: Logger, ...ignoredErrors
7
7
  * at a specified polling interval. It allows starting, stopping, and checking the status of the
8
8
  * internally managed promise. The class also supports interrupting the polling process when stopped.
9
9
  */
10
- export declare class RunningPromise {
10
+ export declare class RunningPromise<T = void> {
11
11
  private fn;
12
12
  private logger;
13
13
  private pollingIntervalMS;
@@ -16,8 +16,9 @@ export declare class RunningPromise {
16
16
  private runningPromise;
17
17
  private interruptibleSleep;
18
18
  private requested;
19
+ private requestedArg;
19
20
  static readonly EXIT: typeof EXIT;
20
- constructor(fn: () => void | Promise<void>, logger?: Logger, pollingIntervalMS?: number, handleError?: ErrorHandler);
21
+ constructor(fn: (arg?: T) => void | Promise<void>, logger?: Logger, pollingIntervalMS?: number, handleError?: ErrorHandler);
21
22
  /**
22
23
  * Starts the running promise.
23
24
  */
@@ -36,7 +37,7 @@ export declare class RunningPromise {
36
37
  * Triggers an immediate run of the function, bypassing the polling interval.
37
38
  * If the function is currently running, it will be allowed to continue and then called again immediately.
38
39
  */
39
- trigger(): Promise<void>;
40
+ trigger(arg?: T): Promise<void>;
40
41
  /**
41
42
  * Updates the polling interval. The new interval will take effect after the next poll.
42
43
  * @param pollingIntervalMS The polling interval in milliseconds.
@@ -44,4 +45,4 @@ export declare class RunningPromise {
44
45
  setPollingIntervalMS(pollingIntervalMS: number): void;
45
46
  }
46
47
  export {};
47
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVubmluZy1wcm9taXNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHJvbWlzZS9ydW5uaW5nLXByb21pc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBSWxFLFFBQUEsTUFBTSxJQUFJLGVBQW9DLENBQUM7QUFFL0MsTUFBTSxNQUFNLFlBQVksR0FBRyxDQUFDLEdBQUcsRUFBRSxPQUFPLEtBQUssT0FBTyxJQUFJLEdBQUcsSUFBSSxHQUFHLE9BQU8sQ0FBQyxPQUFPLElBQUksR0FBRyxJQUFJLENBQUMsQ0FBQztBQUU5Rix3QkFBZ0IsdUJBQXVCLENBQ3JDLE1BQU0sRUFBRSxNQUFNLEVBQ2QsR0FBRyxhQUFhLEVBQUUsQ0FBQyxLQUFLLEdBQUcsSUFBSSxFQUFFLEdBQUcsRUFBRSxLQUFLLEtBQUssQ0FBQyxFQUFFLEdBQ2xELFlBQVksQ0FNZDtBQUVEOzs7O0dBSUc7QUFDSCxxQkFBYSxjQUFjO0lBU3ZCLE9BQU8sQ0FBQyxFQUFFO0lBQ1YsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsaUJBQWlCO0lBQ3pCLE9BQU8sQ0FBQyxXQUFXO0lBWHJCLE9BQU8sQ0FBQyxPQUFPLENBQVM7SUFDeEIsT0FBTyxDQUFDLGNBQWMsQ0FBcUI7SUFDM0MsT0FBTyxDQUFDLGtCQUFrQixDQUE0QjtJQUN0RCxPQUFPLENBQUMsU0FBUyxDQUFxRDtJQUV0RSxnQkFBdUIsSUFBSSxFQUFFLE9BQU8sSUFBSSxDQUFRO0lBRWhELFlBQ1UsRUFBRSxFQUFFLE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFDOUIsTUFBTSxTQUFrQyxFQUN4QyxpQkFBaUIsU0FBUSxFQUN6QixXQUFXLEdBQUUsWUFBOEMsRUFDakU7SUFFSjs7T0FFRztJQUNJLEtBQUssU0FrQ1g7SUFFRDs7O09BR0c7SUFDRyxJQUFJLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQU8xQjtJQUVEOzs7T0FHRztJQUNJLFNBQVMsWUFFZjtJQUVEOzs7T0FHRztJQUNVLE9BQU8sa0JBWW5CO0lBRUQ7OztPQUdHO0lBQ0gsb0JBQW9CLENBQUMsaUJBQWlCLEVBQUUsTUFBTSxRQUU3QztDQUNGIn0=
48
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVubmluZy1wcm9taXNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHJvbWlzZS9ydW5uaW5nLXByb21pc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBSWxFLFFBQUEsTUFBTSxJQUFJLGVBQW9DLENBQUM7QUFFL0MsTUFBTSxNQUFNLFlBQVksR0FBRyxDQUFDLEdBQUcsRUFBRSxPQUFPLEtBQUssT0FBTyxJQUFJLEdBQUcsSUFBSSxHQUFHLE9BQU8sQ0FBQyxPQUFPLElBQUksR0FBRyxJQUFJLENBQUMsQ0FBQztBQUU5Rix3QkFBZ0IsdUJBQXVCLENBQ3JDLE1BQU0sRUFBRSxNQUFNLEVBQ2QsR0FBRyxhQUFhLEVBQUUsQ0FBQyxLQUFLLEdBQUcsSUFBSSxFQUFFLEdBQUcsRUFBRSxLQUFLLEtBQUssQ0FBQyxFQUFFLEdBQ2xELFlBQVksQ0FNZDtBQUVEOzs7O0dBSUc7QUFDSCxxQkFBYSxjQUFjLENBQUMsQ0FBQyxHQUFHLElBQUk7SUFVaEMsT0FBTyxDQUFDLEVBQUU7SUFDVixPQUFPLENBQUMsTUFBTTtJQUNkLE9BQU8sQ0FBQyxpQkFBaUI7SUFDekIsT0FBTyxDQUFDLFdBQVc7SUFackIsT0FBTyxDQUFDLE9BQU8sQ0FBUztJQUN4QixPQUFPLENBQUMsY0FBYyxDQUFxQjtJQUMzQyxPQUFPLENBQUMsa0JBQWtCLENBQTRCO0lBQ3RELE9BQU8sQ0FBQyxTQUFTLENBQXFEO0lBQ3RFLE9BQU8sQ0FBQyxZQUFZLENBQTRCO0lBRWhELGdCQUF1QixJQUFJLEVBQUUsT0FBTyxJQUFJLENBQVE7SUFFaEQsWUFDVSxFQUFFLEVBQUUsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEtBQUssSUFBSSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFDckMsTUFBTSxTQUFrQyxFQUN4QyxpQkFBaUIsU0FBUSxFQUN6QixXQUFXLEdBQUUsWUFBOEMsRUFDakU7SUFFSjs7T0FFRztJQUNJLEtBQUssU0FtQ1g7SUFFRDs7O09BR0c7SUFDRyxJQUFJLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQU8xQjtJQUVEOzs7T0FHRztJQUNJLFNBQVMsWUFFZjtJQUVEOzs7T0FHRztJQUNVLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQWEzQztJQUVEOzs7T0FHRztJQUNILG9CQUFvQixDQUFDLGlCQUFpQixFQUFFLE1BQU0sUUFFN0M7Q0FDRiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"running-promise.d.ts","sourceRoot":"","sources":["../../src/promise/running-promise.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAIlE,QAAA,MAAM,IAAI,eAAoC,CAAC;AAE/C,MAAM,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,IAAI,GAAG,IAAI,GAAG,OAAO,CAAC,OAAO,IAAI,GAAG,IAAI,CAAC,CAAC;AAE9F,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,GAAG,aAAa,EAAE,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,EAAE,GAClD,YAAY,CAMd;AAED;;;;GAIG;AACH,qBAAa,cAAc;IASvB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,WAAW;IAXrB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,kBAAkB,CAA4B;IACtD,OAAO,CAAC,SAAS,CAAqD;IAEtE,gBAAuB,IAAI,EAAE,OAAO,IAAI,CAAQ;IAEhD,YACU,EAAE,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAC9B,MAAM,SAAkC,EACxC,iBAAiB,SAAQ,EACzB,WAAW,GAAE,YAA8C,EACjE;IAEJ;;OAEG;IACI,KAAK,SAkCX;IAED;;;OAGG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAO1B;IAED;;;OAGG;IACI,SAAS,YAEf;IAED;;;OAGG;IACU,OAAO,kBAYnB;IAED;;;OAGG;IACH,oBAAoB,CAAC,iBAAiB,EAAE,MAAM,QAE7C;CACF"}
1
+ {"version":3,"file":"running-promise.d.ts","sourceRoot":"","sources":["../../src/promise/running-promise.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAIlE,QAAA,MAAM,IAAI,eAAoC,CAAC;AAE/C,MAAM,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,IAAI,GAAG,IAAI,GAAG,OAAO,CAAC,OAAO,IAAI,GAAG,IAAI,CAAC,CAAC;AAE9F,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,GAAG,aAAa,EAAE,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,EAAE,GAClD,YAAY,CAMd;AAED;;;;GAIG;AACH,qBAAa,cAAc,CAAC,CAAC,GAAG,IAAI;IAUhC,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,WAAW;IAZrB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,kBAAkB,CAA4B;IACtD,OAAO,CAAC,SAAS,CAAqD;IACtE,OAAO,CAAC,YAAY,CAA4B;IAEhD,gBAAuB,IAAI,EAAE,OAAO,IAAI,CAAQ;IAEhD,YACU,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EACrC,MAAM,SAAkC,EACxC,iBAAiB,SAAQ,EACzB,WAAW,GAAE,YAA8C,EACjE;IAEJ;;OAEG;IACI,KAAK,SAmCX;IAED;;;OAGG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAO1B;IAED;;;OAGG;IACI,SAAS,YAEf;IAED;;;OAGG;IACU,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAa3C;IAED;;;OAGG;IACH,oBAAoB,CAAC,iBAAiB,EAAE,MAAM,QAE7C;CACF"}
@@ -22,6 +22,7 @@ export function makeLoggingErrorHandler(logger, ...ignoredErrors) {
22
22
  runningPromise;
23
23
  interruptibleSleep;
24
24
  requested;
25
+ requestedArg;
25
26
  static EXIT = EXIT;
26
27
  constructor(fn, logger = createLogger('running-promise'), pollingIntervalMS = 10000, handleError = makeLoggingErrorHandler(logger)){
27
28
  this.fn = fn;
@@ -32,6 +33,7 @@ export function makeLoggingErrorHandler(logger, ...ignoredErrors) {
32
33
  this.runningPromise = Promise.resolve();
33
34
  this.interruptibleSleep = new InterruptibleSleep();
34
35
  this.requested = undefined;
36
+ this.requestedArg = undefined;
35
37
  }
36
38
  /**
37
39
  * Starts the running promise.
@@ -45,7 +47,7 @@ export function makeLoggingErrorHandler(logger, ...ignoredErrors) {
45
47
  while(this.running){
46
48
  const hasRequested = this.requested !== undefined;
47
49
  try {
48
- await this.fn();
50
+ await this.fn(this.requestedArg);
49
51
  } catch (err) {
50
52
  const code = await this.handleError(err);
51
53
  if (code === RunningPromise.EXIT) {
@@ -59,6 +61,7 @@ export function makeLoggingErrorHandler(logger, ...ignoredErrors) {
59
61
  if (hasRequested) {
60
62
  this.requested.resolve();
61
63
  this.requested = undefined;
64
+ this.requestedArg = undefined;
62
65
  }
63
66
  // If no immediate run was requested, sleep for the polling interval.
64
67
  if (this.requested === undefined && this.running) {
@@ -89,14 +92,15 @@ export function makeLoggingErrorHandler(logger, ...ignoredErrors) {
89
92
  /**
90
93
  * Triggers an immediate run of the function, bypassing the polling interval.
91
94
  * If the function is currently running, it will be allowed to continue and then called again immediately.
92
- */ async trigger() {
95
+ */ async trigger(arg) {
93
96
  if (!this.running) {
94
- return this.fn();
97
+ return this.fn(arg);
95
98
  }
96
99
  let requested = this.requested;
97
100
  if (!requested) {
98
101
  requested = promiseWithResolvers();
99
102
  this.requested = requested;
103
+ this.requestedArg = arg;
100
104
  this.interruptibleSleep.interrupt();
101
105
  }
102
106
  await requested.promise;
@@ -44,4 +44,4 @@ export declare class BatchQueue<T, K extends string | number> {
44
44
  stop(): Promise<void>;
45
45
  private execProcessor;
46
46
  }
47
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmF0Y2hfcXVldWUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9xdWV1ZS9iYXRjaF9xdWV1ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFXQTs7Ozs7Ozs7Ozs7Ozs7R0FjRztBQUNILHFCQUFhLFVBQVUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxTQUFTLE1BQU0sR0FBRyxNQUFNO0lBTWhELE9BQU8sQ0FBQyxZQUFZO0lBQ3BCLE9BQU8sQ0FBQyxZQUFZO0lBQ3BCLE9BQU8sQ0FBQyxnQkFBZ0I7SUFDeEIsT0FBTyxDQUFDLEdBQUc7SUFSYixPQUFPLENBQUMsU0FBUyxDQUFzQztJQUN2RCxPQUFPLENBQUMsWUFBWSxDQUFDLENBQWM7SUFDbkMsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQUFnQjtJQUV2QyxZQUNVLFlBQVksRUFBRSxDQUFDLEtBQUssRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsR0FBRyxFQUFFLENBQUMsS0FBSyxJQUFJLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUMvRCxZQUFZLEVBQUUsTUFBTSxFQUNwQixnQkFBZ0IsRUFBRSxNQUFNLEVBQ3hCLEdBQUcseUNBQXlDLEVBQ2xEO0lBRUo7Ozs7O09BS0c7SUFDSSxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsRUFBRSxHQUFHLEVBQUUsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0EwQnpDO0lBRUQ7O09BRUc7SUFDSSxpQkFBaUIsYUFPdEI7SUFFRjs7T0FFRztJQUNJLEtBQUssU0FNWDtJQUVEOzs7T0FHRztJQUNJLElBQUksSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBVTNCO0lBRUQsT0FBTyxDQUFDLGFBQWEsQ0FPbkI7Q0FDSCJ9
47
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmF0Y2hfcXVldWUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9xdWV1ZS9iYXRjaF9xdWV1ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFXQTs7Ozs7Ozs7Ozs7Ozs7R0FjRztBQUNILHFCQUFhLFVBQVUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxTQUFTLE1BQU0sR0FBRyxNQUFNO0lBTWhELE9BQU8sQ0FBQyxZQUFZO0lBQ3BCLE9BQU8sQ0FBQyxZQUFZO0lBQ3BCLE9BQU8sQ0FBQyxnQkFBZ0I7SUFDeEIsT0FBTyxDQUFDLEdBQUc7SUFSYixPQUFPLENBQUMsU0FBUyxDQUFzQztJQUN2RCxPQUFPLENBQUMsWUFBWSxDQUFDLENBQWM7SUFDbkMsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQUFnQjtJQUV2QyxZQUNVLFlBQVksRUFBRSxDQUFDLEtBQUssRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsR0FBRyxFQUFFLENBQUMsS0FBSyxJQUFJLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUMvRCxZQUFZLEVBQUUsTUFBTSxFQUNwQixnQkFBZ0IsRUFBRSxNQUFNLEVBQ3hCLEdBQUcseUNBQXlDLEVBQ2xEO0lBRUo7Ozs7O09BS0c7SUFDSSxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsRUFBRSxHQUFHLEVBQUUsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0EwQnpDO0lBRUQ7O09BRUc7SUFDSSxpQkFBaUIsYUFPdEI7SUFFRjs7T0FFRztJQUNJLEtBQUssU0FNWDtJQUVEOzs7T0FHRztJQUNJLElBQUksSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBVzNCO0lBRUQsT0FBTyxDQUFDLGFBQWEsQ0FPbkI7Q0FDSCJ9
@@ -1 +1 @@
1
- {"version":3,"file":"batch_queue.d.ts","sourceRoot":"","sources":["../../src/queue/batch_queue.ts"],"names":[],"mappings":"AAWA;;;;;;;;;;;;;;GAcG;AACH,qBAAa,UAAU,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,MAAM;IAMhD,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,GAAG;IARb,OAAO,CAAC,SAAS,CAAsC;IACvD,OAAO,CAAC,YAAY,CAAC,CAAc;IACnC,OAAO,CAAC,cAAc,CAAC,CAAgB;IAEvC,YACU,YAAY,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAC/D,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,MAAM,EACxB,GAAG,yCAAyC,EAClD;IAEJ;;;;;OAKG;IACI,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CA0BzC;IAED;;OAEG;IACI,iBAAiB,aAOtB;IAEF;;OAEG;IACI,KAAK,SAMX;IAED;;;OAGG;IACI,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAU3B;IAED,OAAO,CAAC,aAAa,CAOnB;CACH"}
1
+ {"version":3,"file":"batch_queue.d.ts","sourceRoot":"","sources":["../../src/queue/batch_queue.ts"],"names":[],"mappings":"AAWA;;;;;;;;;;;;;;GAcG;AACH,qBAAa,UAAU,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,MAAM;IAMhD,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,GAAG;IARb,OAAO,CAAC,SAAS,CAAsC;IACvD,OAAO,CAAC,YAAY,CAAC,CAAc;IACnC,OAAO,CAAC,cAAc,CAAC,CAAgB;IAEvC,YACU,YAAY,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAC/D,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,MAAM,EACxB,GAAG,yCAAyC,EAClD;IAEJ;;;;;OAKG;IACI,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CA0BzC;IAED;;OAEG;IACI,iBAAiB,aAOtB;IAEF;;OAEG;IACI,KAAK,SAMX;IAED;;;OAGG;IACI,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAW3B;IAED,OAAO,CAAC,aAAa,CAOnB;CACH"}
@@ -98,6 +98,7 @@ import { FifoMemoryQueue } from './fifo_memory_queue.js';
98
98
  if (!runningPromise) {
99
99
  return Promise.resolve();
100
100
  }
101
+ this.flushCurrentBatch();
101
102
  this.container.end();
102
103
  return runningPromise;
103
104
  }