@aztec/foundation 0.0.0-test.1 → 0.0.1-commit.023c3e5

package/dest/json-rpc/server/safe_json_rpc_server.js

@@ -11,9 +11,13 @@ import { promiseWithResolvers } from '../../promise/utils.js';
 import { parseWithOptionals, schemaHasMethod } from '../../schemas/index.js';
 import { jsonStringify } from '../convert.js';
 import { assert } from '../js_utils.js';
+const defaultServerConfig = {
+    http200OnError: false,
+    maxBatchSize: 100,
+    maxBodySizeBytes: '1mb'
+};
 export class SafeJsonRpcServer {
     proxy;
-    http200OnError;
     healthCheck;
     extraMiddlewares;
     log;
@@ -21,15 +25,20 @@ export class SafeJsonRpcServer {
    * The HTTP server accepting remote requests.
    * This member field is initialized when the server is started.
    */ httpServer;
-    constructor(/** The proxy object to delegate requests to. */ proxy, /**
-     *  Return an HTTP 200 status code on errors, but include an error object
-     *  as per the JSON RPC spec
-     */ http200OnError = false, /** Health check function */ healthCheck = ()=>true, /** Additional middlewares */ extraMiddlewares = [], /** Logger */ log = createLogger('json-rpc:server')){
+    config;
+    constructor(/** The proxy object to delegate requests to */ proxy, config = {}, /** Health check function */ healthCheck = ()=>true, /** Additional middlewares */ extraMiddlewares = [], /** Logger */ log = createLogger('json-rpc:server')){
         this.proxy = proxy;
-        this.http200OnError = http200OnError;
         this.healthCheck = healthCheck;
         this.extraMiddlewares = extraMiddlewares;
         this.log = log;
+        this.config = {
+            ...defaultServerConfig,
+            ...config
+        };
+        // handle empty string
+        if (!this.config.maxBodySizeBytes) {
+            this.config.maxBodySizeBytes = defaultServerConfig.maxBodySizeBytes;
+        }
     }
     isHealthy() {
         return this.healthCheck();
@@ -45,36 +54,25 @@ export class SafeJsonRpcServer {
                 await next();
             } catch (err) {
                 const method = ctx.request.body?.method ?? 'unknown';
-                this.log.warn(`Error in JSON RPC server call ${method}: ${inspect(err)}`);
-                if (err instanceof SyntaxError) {
+                this.log.warn(`Uncaught error in JSON RPC server call ${method}: ${inspect(err)}`);
+                if (err && 'name' in err && err.name === 'BadRequestError') {
                     ctx.status = 400;
                     ctx.body = {
                         jsonrpc: '2.0',
                         id: null,
                         error: {
-                            code: -32700,
-                            message: `Parse error: ${err.message}`
+                            code: -32000,
+                            message: `Bad request: ${err.message}`
                         }
                     };
-                } else if (err instanceof ZodError) {
-                    const message = err.issues.map((e)=>`${e.message} (${e.path.join('.')})`).join('. ') || 'Validation error';
+                } else if (err && err instanceof SyntaxError) {
                     ctx.status = 400;
                     ctx.body = {
                         jsonrpc: '2.0',
                         id: null,
                         error: {
-                            code: -32701,
-                            message
-                        }
-                    };
-                } else if (this.http200OnError) {
-                    ctx.body = {
-                        jsonrpc: '2.0',
-                        id: null,
-                        error: {
-                            code: err.code || -32600,
-                            data: err.data,
-                            message: err.message
+                            code: -32700,
+                            message: `Parse error: ${err.message}`
                         }
                     };
                 } else {
@@ -120,11 +118,10 @@ export class SafeJsonRpcServer {
         }
         app.use(exceptionHandler);
         app.use(bodyParser({
-            jsonLimit: '50mb',
+            jsonLimit: this.config.maxBodySizeBytes,
             enableTypes: [
                 'json'
-            ],
-            detectJSON: ()=>true
+            ]
         }));
         app.use(cors());
         app.use(router.routes());
@@ -141,31 +138,137 @@ export class SafeJsonRpcServer {
         });
         // "JSON RPC mode" where a single endpoint is used and the method is given in the request body
         router.post('/', async (ctx)=>{
-            const { params = [], jsonrpc, id, method } = ctx.request.body;
-            // Fail if not a registered function in the proxy
-            if (typeof method !== 'string' || method === 'constructor' || !this.proxy.hasMethod(method)) {
-                ctx.status = 400;
-                const code = -32601;
-                const message = `Method not found: ${method}`;
-                ctx.body = {
-                    jsonrpc,
-                    id,
-                    error: {
-                        code,
-                        message
-                    }
-                };
+            if (Array.isArray(ctx.request.body)) {
+                if (ctx.request.body.length > this.config.maxBatchSize) {
+                    ctx.status = this.config.http200OnError ? 200 : 400;
+                    ctx.body = {
+                        jsonrpc: '2.0',
+                        error: {
+                            code: -32600,
+                            message: `Batch request exceeds maximum allowed size of ${this.config.maxBatchSize}`
+                        },
+                        id: null
+                    };
+                    return;
+                }
+                const resp = await this.processBatch(ctx.request.body);
+                if (Array.isArray(resp)) {
+                    ctx.status = 200;
+                    ctx.body = resp;
+                } else {
+                    ctx.status = this.config.http200OnError ? 200 : 400;
+                    ctx.body = resp;
+                }
             } else {
-                ctx.status = 200;
+                const resp = await this.processRequest(ctx.request.body);
+                if ('error' in resp) {
+                    ctx.status = this.config.http200OnError ? 200 : 400;
+                }
+                ctx.body = resp;
+            }
+        });
+        return router;
+    }
+    async processBatch(requests) {
+        if (requests.length === 0) {
+            return {
+                jsonrpc: '2.0',
+                error: {
+                    code: -32600,
+                    message: 'Invalid Request'
+                },
+                id: null
+            };
+        }
+        const results = await Promise.allSettled(requests.map((req)=>this.processRequest(req)));
+        return results.map((res)=>{
+            if (res.status === 'fulfilled') {
+                return res.value;
+            }
+            this.log.warn(`Uncaught error executing request in batch: ${res.reason}.`);
+            return {
+                jsonrpc: '2.0',
+                error: {
+                    code: -32600,
+                    message: 'Invalid Request'
+                },
+                id: null
+            };
+        });
+    }
+    async processRequest(request) {
+        if (!request || typeof request !== 'object') {
+            return {
+                jsonrpc: '2.0',
+                error: {
+                    code: -32600,
+                    message: 'Invalid Request'
+                },
+                id: null
+            };
+        }
+        const { params = [], jsonrpc = '2.0', id, method } = request;
+        if (typeof method !== 'string' || !method) {
+            return {
+                jsonrpc: '2.0',
+                id,
+                error: {
+                    code: -32600,
+                    message: `Invalid request`
+                }
+            };
+        }
+        // Fail if not a registered function in the proxy
+        if (typeof method !== 'string' || method === 'constructor' || !this.proxy.hasMethod(method)) {
+            return {
+                jsonrpc,
+                id,
+                error: {
+                    code: -32601,
+                    message: `Method not found: ${method}`
+                }
+            };
+        } else {
+            try {
                 const result = await this.proxy.call(method, params);
-                ctx.body = {
+                return {
                     jsonrpc,
                     id,
                     result
                 };
+            } catch (err) {
+                if (err && err instanceof ZodError) {
+                    const message = err.issues.map((e)=>`${e.message} (${e.path.join('.')})`).join('. ') || 'Validation error';
+                    return {
+                        jsonrpc: '2.0',
+                        id,
+                        error: {
+                            code: -32701,
+                            message
+                        }
+                    };
+                } else if (err) {
+                    return {
+                        jsonrpc,
+                        id,
+                        error: {
+                            code: -32702,
+                            data: err.data,
+                            message: err.message
+                        }
+                    };
+                } else {
+                    return {
+                        jsonrpc,
+                        id,
+                        error: {
+                            code: -32702,
+                            message: 'Error executing request'
+                        }
+                    };
+                }
             }
-        });
-        return router;
+        }
     }
     /**
    * Start this server with koa.
@@ -265,9 +368,9 @@ export function makeHandler(handler, schema) {
 function makeAggregateHealthcheck(namedHandlers, log) {
     return async ()=>{
         try {
-            const results = await Promise.all(Object.entries(namedHandlers).map(([name, [, , healthCheck]])=>[
+            const results = await Promise.all(Object.entries(namedHandlers).map(async ([name, [, , healthCheck]])=>[
                     name,
-                    healthCheck ? healthCheck() : true
+                    healthCheck ? await healthCheck() : true
                 ]));
             const failed = results.filter(([_, result])=>!result);
             if (failed.length > 0) {
@@ -285,18 +388,16 @@ function makeAggregateHealthcheck(namedHandlers, log) {
  * Creates a single SafeJsonRpcServer from multiple handlers.
  * @param servers - List of handlers to be combined.
  * @returns A single JsonRpcServer with namespaced methods.
- */ export function createNamespacedSafeJsonRpcServer(handlers, options = {
-    log: createLogger('json-rpc:server')
-}) {
-    const { middlewares, http200OnError, log } = options;
+ */ export function createNamespacedSafeJsonRpcServer(handlers, options = {}) {
+    const { middlewares, log } = options;
     const proxy = new NamespacedSafeJsonProxy(handlers);
     const healthCheck = makeAggregateHealthcheck(handlers, log);
-    return new SafeJsonRpcServer(proxy, http200OnError, healthCheck, middlewares, log);
+    return new SafeJsonRpcServer(proxy, options, healthCheck, middlewares, log);
 }
 export function createSafeJsonRpcServer(handler, schema, options = {}) {
-    const { http200OnError, log, healthCheck, middlewares: extraMiddlewares } = options;
+    const { log, healthCheck, middlewares: extraMiddlewares } = options;
     const proxy = new SafeJsonProxy(handler, schema);
-    return new SafeJsonRpcServer(proxy, http200OnError, healthCheck, extraMiddlewares, log);
+    return new SafeJsonRpcServer(proxy, options, healthCheck, extraMiddlewares, log);
 }
 /**
  * Creates a router for handling a plain status request that will return 200 status when running.
@@ -311,7 +412,7 @@ export function createSafeJsonRpcServer(handler, schema, options = {}) {
         let ok;
         try {
             ok = await getCurrentStatus() === true;
-        } catch (err) {
+        } catch  {
             ok = false;
         }
         ctx.status = ok ? 200 : 500;
@@ -334,7 +435,11 @@ export function createSafeJsonRpcServer(handler, schema, options = {}) {
     }
     const { promise, resolve } = promiseWithResolvers();
     const listenPort = options.port ? typeof options.port === 'string' ? parseInt(options.port) : options.port : 0;
-    httpServer.listen(listenPort, options.host, ()=>resolve());
+    httpServer.listen({
+        host: options.host,
+        port: listenPort,
+        reuseAddress: true
+    }, ()=>resolve());
     // Wait until listen callback is called
     if (!options.noWait) {
         await promise;

package/dest/json-rpc/test/index.d.ts

@@ -1,2 +1,2 @@
 export { createJsonRpcTestSetup, type JsonRpcTestContext } from './integration.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9qc29uLXJwYy90ZXN0L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxLQUFLLGtCQUFrQixFQUFFLE1BQU0sa0JBQWtCLENBQUMifQ==

package/dest/json-rpc/test/integration.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type http from 'http';
 import type { ApiSchemaFor } from '../../schemas/api.js';
 import { type SafeJsonRpcClientOptions } from '../client/safe_json_rpc_client.js';
@@ -11,5 +10,5 @@ export type JsonRpcTestContext<T extends object> = {
     };
     url: string;
 };
-export declare function createJsonRpcTestSetup<T extends object>(handler: T, schema: ApiSchemaFor<T>, serverOptions?: Partial<SafeJsonRpcServerOptions>, clientOptions?: SafeJsonRpcClientOptions): Promise<JsonRpcTestContext<T>>;
-//# sourceMappingURL=integration.d.ts.map
+export declare function createJsonRpcTestSetup<T extends object>(handler: T, schema: ApiSchemaFor<T>, serverOptions?: SafeJsonRpcServerOptions, clientOptions?: SafeJsonRpcClientOptions): Promise<JsonRpcTestContext<T>>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZWdyYXRpb24uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9qc29uLXJwYy90ZXN0L2ludGVncmF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBRTdCLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRXpELE9BQU8sRUFBRSxLQUFLLHdCQUF3QixFQUEyQixNQUFNLG1DQUFtQyxDQUFDO0FBQzNHLE9BQU8sRUFDTCxLQUFLLGlCQUFpQixFQUN0QixLQUFLLHdCQUF3QixFQUc5QixNQUFNLG1DQUFtQyxDQUFDO0FBRTNDLE1BQU0sTUFBTSxrQkFBa0IsQ0FBQyxDQUFDLFNBQVMsTUFBTSxJQUFJO0lBQ2pELE1BQU0sRUFBRSxpQkFBaUIsQ0FBQztJQUMxQixNQUFNLEVBQUUsQ0FBQyxDQUFDO0lBQ1YsVUFBVSxFQUFFLElBQUksQ0FBQyxNQUFNLEdBQUc7UUFBRSxJQUFJLEVBQUUsTUFBTSxDQUFBO0tBQUUsQ0FBQztJQUMzQyxHQUFHLEVBQUUsTUFBTSxDQUFDO0NBQ2IsQ0FBQztBQUVGLHdCQUFzQixzQkFBc0IsQ0FBQyxDQUFDLFNBQVMsTUFBTSxFQUMzRCxPQUFPLEVBQUUsQ0FBQyxFQUNWLE1BQU0sRUFBRSxZQUFZLENBQUMsQ0FBQyxDQUFDLEVBQ3ZCLGFBQWEsR0FBRSx3QkFBNkIsRUFDNUMsYUFBYSxHQUFFLHdCQUE2QixHQUMzQyxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FVaEMifQ==

package/dest/json-rpc/test/integration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"integration.d.ts","sourceRoot":"","sources":["../../../src/json-rpc/test/integration.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAAE,KAAK,wBAAwB,EAA2B,MAAM,mCAAmC,CAAC;AAC3G,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,wBAAwB,EAG9B,MAAM,mCAAmC,CAAC;AAE3C,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,MAAM,IAAI;IACjD,MAAM,EAAE,iBAAiB,CAAC;IAC1B,MAAM,EAAE,CAAC,CAAC;IACV,UAAU,EAAE,IAAI,CAAC,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3C,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,wBAAsB,sBAAsB,CAAC,CAAC,SAAS,MAAM,EAC3D,OAAO,EAAE,CAAC,EACV,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EACvB,aAAa,GAAE,OAAO,CAAC,wBAAwB,CAAM,EACrD,aAAa,GAAE,wBAA6B,GAC3C,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAUhC"}
+{"version":3,"file":"integration.d.ts","sourceRoot":"","sources":["../../../src/json-rpc/test/integration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAAE,KAAK,wBAAwB,EAA2B,MAAM,mCAAmC,CAAC;AAC3G,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,wBAAwB,EAG9B,MAAM,mCAAmC,CAAC;AAE3C,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,MAAM,IAAI;IACjD,MAAM,EAAE,iBAAiB,CAAC;IAC1B,MAAM,EAAE,CAAC,CAAC;IACV,UAAU,EAAE,IAAI,CAAC,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3C,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,wBAAsB,sBAAsB,CAAC,CAAC,SAAS,MAAM,EAC3D,OAAO,EAAE,CAAC,EACV,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EACvB,aAAa,GAAE,wBAA6B,EAC5C,aAAa,GAAE,wBAA6B,GAC3C,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAUhC"}

package/dest/log/console.d.ts

@@ -8,4 +8,4 @@ import type { LogFn } from './log_fn.js';
  * @returns A Logger function that accepts any number of arguments and logs them with the specified prefix.
  */
 export declare function createConsoleLogger(prefix?: string): LogFn;
-//# sourceMappingURL=console.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc29sZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZy9jb25zb2xlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLGFBQWEsQ0FBQztBQTBCekM7Ozs7Ozs7R0FPRztBQUNILHdCQUFnQixtQkFBbUIsQ0FBQyxNQUFNLENBQUMsRUFBRSxNQUFNLEdBQUcsS0FBSyxDQU0xRCJ9

package/dest/log/console.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"console.d.ts","sourceRoot":"","sources":["../../src/log/console.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAuBzC;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAM1D"}
+{"version":3,"file":"console.d.ts","sourceRoot":"","sources":["../../src/log/console.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AA0BzC;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAM1D"}

package/dest/log/gcloud-logger-config.d.ts

@@ -5,10 +5,9 @@
  */
 export declare const GoogleCloudLoggerConfig: {
     messageKey: string;
-    timestamp(): string;
     formatters: {
         log(object: Record<string, unknown>): Record<string, unknown>;
         level(label: string, level: number): object;
     };
 };
-//# sourceMappingURL=gcloud-logger-config.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2Nsb3VkLWxvZ2dlci1jb25maWcuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2cvZ2Nsb3VkLWxvZ2dlci1jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBUUE7Ozs7R0FJRztBQUNILGVBQU8sTUFBTSx1QkFBdUI7Ozs7OztDQWtETixDQUFDIn0=

package/dest/log/gcloud-logger-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gcloud-logger-config.d.ts","sourceRoot":"","sources":["../../src/log/gcloud-logger-config.ts"],"names":[],"mappings":"AAQA;;;;GAIG;AACH,eAAO,MAAM,uBAAuB;;iBAGrB,MAAM;;oBAIL,OAAO,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,MAAM,EAAE,OAAO,CAAC;qBAgBhD,MAAM,SAAS,MAAM,GAAG,MAAM;;CA+BjB,CAAC"}
+{"version":3,"file":"gcloud-logger-config.d.ts","sourceRoot":"","sources":["../../src/log/gcloud-logger-config.ts"],"names":[],"mappings":"AAQA;;;;GAIG;AACH,eAAO,MAAM,uBAAuB;;;;;;CAkDN,CAAC"}

package/dest/log/gcloud-logger-config.js

@@ -7,10 +7,6 @@ const GOOGLE_CLOUD_TRACE_SAMPLED = 'logging.googleapis.com/trace_sampled';
  * Adapted from https://cloud.google.com/trace/docs/setup/nodejs-ot#config-structured-logging.
  */ export const GoogleCloudLoggerConfig = {
     messageKey: 'message',
-    // Same as pino.stdTimeFunctions.isoTime but uses "timestamp" key instead of "time"
-    timestamp () {
-        return `,"timestamp":"${new Date(Date.now()).toISOString()}"`;
-    },
     formatters: {
         log (object) {
             // Add trace context attributes following Cloud Logging structured log format described
@@ -34,9 +30,9 @@ const GOOGLE_CLOUD_TRACE_SAMPLED = 'logging.googleapis.com/trace_sampled';
             switch(label){
                 case 'trace':
                 case 'debug':
+                case 'verbose':
                     severity = 'DEBUG';
                     break;
-                case 'verbose':
                 case 'info':
                     severity = 'INFO';
                     break;
@@ -60,7 +56,3 @@ const GOOGLE_CLOUD_TRACE_SAMPLED = 'logging.googleapis.com/trace_sampled';
         }
     }
 };
-// Define custom logging levels for pino. Duplicate from pino-logger.ts.
-const customLevels = {
-    verbose: 25
-};

package/dest/log/index.d.ts

@@ -1,7 +1,7 @@
 export * from './console.js';
-export * from './debug.js';
-export * from './pino-logger.js';
-export * from './log_history.js';
-export * from './log_fn.js';
 export * from './libp2p_logger.js';
-//# sourceMappingURL=index.d.ts.map
+export * from './log_fn.js';
+export * from './noir_debug_log_util.js';
+export * from './pino-logger.js';
+export * from './log-levels.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2cvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsa0JBQWtCLENBQUM7QUFDakMsY0FBYyxpQkFBaUIsQ0FBQyJ9

package/dest/log/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/log/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/log/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,0BAA0B,CAAC;AACzC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC"}

package/dest/log/index.js

@@ -1,6 +1,6 @@
 export * from './console.js';
-export * from './debug.js';
-export * from './pino-logger.js';
-export * from './log_history.js';
-export * from './log_fn.js';
 export * from './libp2p_logger.js';
+export * from './log_fn.js';
+export * from './noir_debug_log_util.js';
+export * from './pino-logger.js';
+export * from './log-levels.js';

package/dest/log/libp2p_logger.d.ts

@@ -1,7 +1,10 @@
 import type { ComponentLogger } from '@libp2p/interface';
+import { type LoggerBindings } from './pino-logger.js';
 /**
  * Creates a libp2p compatible logger that wraps our pino logger.
  * This adapter implements the ComponentLogger interface required by libp2p.
+ * @param namespace - Base namespace for the logger
+ * @param bindings - Optional bindings to pass to the logger (actor, instanceId)
  */
-export declare function createLibp2pComponentLogger(namespace: string): ComponentLogger;
-//# sourceMappingURL=libp2p_logger.d.ts.map
+export declare function createLibp2pComponentLogger(namespace: string, bindings?: LoggerBindings): ComponentLogger;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlicDJwX2xvZ2dlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZy9saWJwMnBfbG9nZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBVSxNQUFNLG1CQUFtQixDQUFDO0FBSWpFLE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBc0IsTUFBTSxrQkFBa0IsQ0FBQztBQUUzRTs7Ozs7R0FLRztBQUNILHdCQUFnQiwyQkFBMkIsQ0FBQyxTQUFTLEVBQUUsTUFBTSxFQUFFLFFBQVEsQ0FBQyxFQUFFLGNBQWMsR0FBRyxlQUFlLENBSXpHIn0=

package/dest/log/libp2p_logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"libp2p_logger.d.ts","sourceRoot":"","sources":["../../src/log/libp2p_logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAU,MAAM,mBAAmB,CAAC;AAMjE;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,MAAM,GAAG,eAAe,CAI9E"}
+{"version":3,"file":"libp2p_logger.d.ts","sourceRoot":"","sources":["../../src/log/libp2p_logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAU,MAAM,mBAAmB,CAAC;AAIjE,OAAO,EAAE,KAAK,cAAc,EAAsB,MAAM,kBAAkB,CAAC;AAE3E;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,eAAe,CAIzG"}

package/dest/log/libp2p_logger.js

@@ -3,9 +3,11 @@ import { logFilters, logger } from './pino-logger.js';
 /**
  * Creates a libp2p compatible logger that wraps our pino logger.
  * This adapter implements the ComponentLogger interface required by libp2p.
- */ export function createLibp2pComponentLogger(namespace) {
+ * @param namespace - Base namespace for the logger
+ * @param bindings - Optional bindings to pass to the logger (actor, instanceId)
+ */ export function createLibp2pComponentLogger(namespace, bindings) {
     return {
-        forComponent: (component)=>createLibp2pLogger(`${namespace}:${component}`)
+        forComponent: (component)=>createLibp2pLogger(`${namespace}:${component}`, bindings)
     };
 }
 // Lipp2p libraries use arbitrary string substitutions, so we need to replace them with %s, this is slow so avoid doing it unless trace debugging
@@ -16,10 +18,18 @@ function replaceFormatting(message) {
     }
     return message.replace(/(%p|%a)/g, '%s');
 }
-function createLibp2pLogger(component) {
+function createLibp2pLogger(component, bindings) {
     // Create a direct pino logger instance for libp2p that supports string interpolation
+    const actor = bindings?.actor;
+    const instanceId = bindings?.instanceId;
     const log = logger.child({
-        module: component
+        module: component,
+        ...actor && {
+            actor
+        },
+        ...instanceId && {
+            instanceId
+        }
     }, {
         level: getLogLevelFromFilters(logFilters, component)
     });
@@ -27,7 +37,7 @@ function createLibp2pLogger(component) {
         if (!log.isLevelEnabled(level)) {
             return;
         }
-        log[level](replaceFormatting(message), ...args);
+        log[level](replaceFormatting(message), ...formatArgs(message, args));
     };
     // Default log level is trace as this is super super noisy
     const logFn = (message, ...args)=>{
@@ -37,7 +47,7 @@ function createLibp2pLogger(component) {
         enabled: log.isLevelEnabled('debug'),
         error (message, ...args) {
             // We write error outputs as debug as they are often expected, e.g. connection errors can happen in happy paths
-            logIfEnabled('debug', message, ...args);
+            logIfEnabled('debug', `error: ${message}`, ...args);
         },
         debug (message, ...args) {
             logIfEnabled('debug', message, ...args);
@@ -53,3 +63,14 @@ function createLibp2pLogger(component) {
         }
     });
 }
+function formatArgs(message, args) {
+    if (!args) {
+        return args;
+    }
+    return args.map((arg)=>{
+        if (typeof arg === 'object' && arg && 'err' in arg && arg.err instanceof Error && 'type' in arg.err && arg.err.type === 'AbortError') {
+            delete arg.err; // Remove the AbortError from the logs
+        }
+        return arg;
+    });
+}

package/dest/log/log-filters.d.ts

@@ -4,4 +4,4 @@ export declare function getLogLevelFromFilters(filters: LogFilters, module: stri
 export declare function assertLogLevel(level: string): asserts level is LogLevel;
 export declare function parseEnv(env: string | undefined, defaultLevel: LogLevel): [LogLevel, LogFilters];
 export declare function parseFilters(definition: string | undefined): LogFilters;
-//# sourceMappingURL=log-filters.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nLWZpbHRlcnMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2cvbG9nLWZpbHRlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssUUFBUSxFQUFhLE1BQU0saUJBQWlCLENBQUM7QUFFM0QsTUFBTSxNQUFNLFVBQVUsR0FBRyxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsRUFBRSxDQUFDO0FBRTlDLHdCQUFnQixzQkFBc0IsQ0FBQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxNQUFNLEdBQUcsUUFBUSxHQUFHLFNBQVMsQ0FlaEc7QUFFRCx3QkFBZ0IsY0FBYyxDQUFDLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLEtBQUssSUFBSSxRQUFRLENBSXZFO0FBRUQsd0JBQWdCLFFBQVEsQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFBRSxZQUFZLEVBQUUsUUFBUSxHQUFHLENBQUMsUUFBUSxFQUFFLFVBQVUsQ0FBQyxDQU9oRztBQUVELHdCQUFnQixZQUFZLENBQUMsVUFBVSxFQUFFLE1BQU0sR0FBRyxTQUFTLEdBQUcsVUFBVSxDQTBCdkUifQ==

package/dest/log/log-levels.d.ts

@@ -1,3 +1,3 @@
 export declare const LogLevels: readonly ["silent", "fatal", "error", "warn", "info", "verbose", "debug", "trace"];
 export type LogLevel = (typeof LogLevels)[number];
-//# sourceMappingURL=log-levels.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nLWxldmVscy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZy9sb2ctbGV2ZWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGVBQU8sTUFBTSxTQUFTLG9GQUFxRixDQUFDO0FBRTVHLE1BQU0sTUFBTSxRQUFRLEdBQUcsQ0FBQyxPQUFPLFNBQVMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDIn0=

package/dest/log/log_fn.d.ts

@@ -1,7 +1,7 @@
 /** Structured log data to include with the message. */
 export type LogData = Record<string, string | number | bigint | boolean | {
     toString(): string;
-} | undefined>;
+} | undefined | null>;
 /** A callable logger instance. */
 export type LogFn = (msg: string, data?: unknown) => void;
-//# sourceMappingURL=log_fn.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX2ZuLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbG9nL2xvZ19mbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxNQUFNLEdBQUcsTUFBTSxHQUFHLE9BQU8sR0FBRztJQUFFLFFBQVEsSUFBSSxNQUFNLENBQUE7Q0FBRSxHQUFHLFNBQVMsR0FBRyxJQUFJLENBQUMsQ0FBQztBQUVySCxrQ0FBa0M7QUFDbEMsTUFBTSxNQUFNLEtBQUssR0FBRyxDQUFDLEdBQUcsRUFBRSxNQUFNLEVBQUUsSUFBSSxDQUFDLEVBQUUsT0FBTyxLQUFLLElBQUksQ0FBQyJ9

package/dest/log/log_fn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log_fn.d.ts","sourceRoot":"","sources":["../../src/log/log_fn.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG;IAAE,QAAQ,IAAI,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,CAAC;AAE9G,kCAAkC;AAClC,MAAM,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC"}
+{"version":3,"file":"log_fn.d.ts","sourceRoot":"","sources":["../../src/log/log_fn.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG;IAAE,QAAQ,IAAI,MAAM,CAAA;CAAE,GAAG,SAAS,GAAG,IAAI,CAAC,CAAC;AAErH,kCAAkC;AAClC,MAAM,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC"}

package/dest/log/noir_debug_log_util.d.ts

@@ -0,0 +1,14 @@
+interface Printable {
+    toString(): string;
+}
+/**
+ * Format a debug string filling in `'{0}'` entries with their
+ * corresponding values from the args array, amd `'{}'` with the whole array.
+ *
+ * @param formatStr - str of form `'this is a string with some entries like {0} and {1}'`
+ * @param args - array of fields to fill in the string format entries with
+ * @returns formatted string
+ */
+export declare function applyStringFormatting(formatStr: string, args: Printable[]): string;
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9pcl9kZWJ1Z19sb2dfdXRpbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZy9ub2lyX2RlYnVnX2xvZ191dGlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLFVBQVUsU0FBUztJQUNqQixRQUFRLElBQUksTUFBTSxDQUFDO0NBQ3BCO0FBRUQ7Ozs7Ozs7R0FPRztBQUNILHdCQUFnQixxQkFBcUIsQ0FBQyxTQUFTLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsR0FBRyxNQUFNLENBUWxGIn0=

package/dest/log/noir_debug_log_util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"noir_debug_log_util.d.ts","sourceRoot":"","sources":["../../src/log/noir_debug_log_util.ts"],"names":[],"mappings":"AAAA,UAAU,SAAS;IACjB,QAAQ,IAAI,MAAM,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,CAQlF"}

package/dest/log/noir_debug_log_util.js

@@ -0,0 +1,14 @@
+/**
+ * Format a debug string filling in `'{0}'` entries with their
+ * corresponding values from the args array, amd `'{}'` with the whole array.
+ *
+ * @param formatStr - str of form `'this is a string with some entries like {0} and {1}'`
+ * @param args - array of fields to fill in the string format entries with
+ * @returns formatted string
+ */ export function applyStringFormatting(formatStr, args) {
+    return formatStr.replace(/{(\d+)}/g, (match, index)=>{
+        return typeof args[index] === 'undefined' ? match : args[index].toString();
+    }).replace(/{}/g, (_match, _index)=>{
+        return args.toString();
+    });
+}

package/dest/log/pino-logger-server.d.ts

@@ -0,0 +1,9 @@
+import { type LoggerBindings } from './pino-logger.js';
+/** Returns the current bindings from AsyncLocalStorage, if any. */
+export declare function getBindings(): LoggerBindings | undefined;
+/**
+ * Runs a callback within a bindings context. All loggers created within the callback
+ * will automatically inherit the bindings (actor, instanceId) via the log bindings handler.
+ */
+export declare function withLoggerBindings<T>(bindings: LoggerBindings, callback: () => Promise<T>): Promise<T>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGluby1sb2dnZXItc2VydmVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbG9nL3Bpbm8tbG9nZ2VyLXNlcnZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQW1ELE1BQU0sa0JBQWtCLENBQUM7QUFLeEcsbUVBQW1FO0FBQ25FLHdCQUFnQixXQUFXLElBQUksY0FBYyxHQUFHLFNBQVMsQ0FFeEQ7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0Isa0JBQWtCLENBQUMsQ0FBQyxFQUFFLFFBQVEsRUFBRSxjQUFjLEVBQUUsUUFBUSxFQUFFLE1BQU0sT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FRNUcifQ==

package/dest/log/pino-logger-server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pino-logger-server.d.ts","sourceRoot":"","sources":["../../src/log/pino-logger-server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,cAAc,EAAmD,MAAM,kBAAkB,CAAC;AAKxG,mEAAmE;AACnE,wBAAgB,WAAW,IAAI,cAAc,GAAG,SAAS,CAExD;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAQ5G"}

package/dest/log/pino-logger-server.js

@@ -0,0 +1,18 @@
+import { AsyncLocalStorage } from 'node:async_hooks';
+import { addLogBindingsHandler, removeLogBindingsHandler } from './pino-logger.js';
+/** AsyncLocalStorage for logger bindings context propagation (Node.js only). */ const bindingsStorage = new AsyncLocalStorage();
+/** Returns the current bindings from AsyncLocalStorage, if any. */ export function getBindings() {
+    return bindingsStorage.getStore();
+}
+/**
+ * Runs a callback within a bindings context. All loggers created within the callback
+ * will automatically inherit the bindings (actor, instanceId) via the log bindings handler.
+ */ export async function withLoggerBindings(bindings, callback) {
+    const handler = ()=>bindingsStorage.getStore();
+    addLogBindingsHandler(handler);
+    try {
+        return await bindingsStorage.run(bindings, callback);
+    } finally{
+        removeLogBindingsHandler(handler);
+    }
+}