rpc-express-toolkit 4.3.2 → 4.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name":  "rpc-express-toolkit",
-    "version":  "4.3.2",
+    "version":  "4.3.3",
     "description":  "Enterprise-ready JSON-RPC 2.0 toolkit for Express.js with simplified APIs, structured logging, middleware system, schema validation, comprehensive BigInt/Date support. JSON middleware validation and explicit configuration.",
     "main":  "src/index.js",
     "types":  "src/index.d.ts",

package/src/batch.js

@@ -9,6 +9,14 @@ class BatchHandler {
     this.endpoint = endpoint;
   }
 
+  serializeErrorData(error, batchIndex) {
+    const errorWithBatchIndex = addBatchIndex(error, batchIndex);
+    if (!hasOwn(errorWithBatchIndex, 'data')) {
+      return undefined;
+    }
+    return this.endpoint.serializeBigIntsAndDates(errorWithBatchIndex.data);
+  }
+
   /**
    * Check if request is a batch request
    * @param {any} body
@@ -70,13 +78,14 @@ class BatchHandler {
       try {
         return await this.processSingleRequest(request, req, context, index);
       } catch (error) {
+        const errorData = this.serializeErrorData(error, index);
         return {
           jsonrpc: '2.0',
           id: request && hasOwn(request, 'id') ? request.id : null,
           error: {
             code: error.code || -32603,
             message: error.message || 'Internal error',
-            data: addBatchIndex(error, index).data,
+            ...(errorData !== undefined && { data: errorData }),
           },
         };
       }
@@ -269,13 +278,15 @@ class BatchHandler {
         return null;
       }
 
+      const errorData = this.serializeErrorData(error, batchIndex);
+
       return {
         jsonrpc: '2.0',
         id,
         error: {
           code: error.code || -32603,
           message: error.message || 'Internal error',
-          data: addBatchIndex(error, batchIndex).data,
+          ...(errorData !== undefined && { data: errorData }),
         },
       };
     }

package/src/index.js

@@ -675,12 +675,17 @@ class RpcEndpoint {
         return null;
       }
 
+      const errorData =
+        hasOwn(err, 'data') && err.data !== undefined
+          ? this.serializeBigIntsAndDates(err.data)
+          : undefined;
+
       this.reply(res, {
         id,
         error: {
           code: err.code || -32603,
           message: err.message || `Internal error`,
-          ...(err.data && { data: err.data }),
+          ...(errorData !== undefined && { data: errorData }),
           error: serializeError(err, true),
         },
       });