@acala-network/chopsticks 0.8.4 → 0.8.5-0

package/lib/server.js

@@ -29,12 +29,14 @@ const zod_1 = require("zod");
 const ws_1 = __importStar(require("ws"));
 const logger_1 = require("./logger");
 const logger = logger_1.defaultLogger.child({ name: 'ws' });
-const requestSchema = zod_1.z.object({
+const singleRequest = zod_1.z.object({
     id: zod_1.z.number(),
     jsonrpc: zod_1.z.literal('2.0'),
     method: zod_1.z.string(),
     params: zod_1.z.array(zod_1.z.any()).default([]),
 });
+const batchRequest = zod_1.z.array(singleRequest);
+const requestSchema = zod_1.z.union([singleRequest, batchRequest]);
 const parseRequest = (request) => {
     try {
         return JSON.parse(request);
@@ -103,6 +105,33 @@ const createServer = async (handler, port) => {
                 }
             },
         };
+        const processRequest = async (req) => {
+            logger.trace({
+                id: req.id,
+                method: req.method,
+            }, 'Received message');
+            try {
+                const resp = await handler(req, subscriptionManager);
+                logger.trace({
+                    id: req.id,
+                    method: req.method,
+                    result: (0, logger_1.truncate)(resp),
+                }, 'Response for request');
+                return {
+                    id: req.id,
+                    jsonrpc: '2.0',
+                    result: resp ?? null,
+                };
+            }
+            catch (e) {
+                logger.info('Error handling request: %s %o', e, e.stack);
+                return {
+                    id: req.id,
+                    jsonrpc: '2.0',
+                    error: e instanceof chopsticks_core_1.ResponseError ? e : { code: -32603, message: `Internal ${e}` },
+                };
+            }
+        };
         ws.on('close', () => {
             logger.debug('Connection closed');
             for (const [subid, onCancel] of Object.entries(subscriptions)) {
@@ -132,30 +161,15 @@ const createServer = async (handler, port) => {
                 return;
             }
             const { data: req } = parsed;
-            logger.trace({
-                id: req.id,
-                method: req.method,
-            }, 'Received message');
-            try {
-                const resp = await handler(req, subscriptionManager);
-                logger.trace({
-                    id: req.id,
-                    method: req.method,
-                    result: (0, logger_1.truncate)(resp),
-                }, 'Sending response for request');
-                send({
-                    id: req.id,
-                    jsonrpc: '2.0',
-                    result: resp ?? null,
-                });
+            if (Array.isArray(req)) {
+                logger.trace({ req }, 'Received batch request');
+                const resp = await Promise.all(req.map(processRequest));
+                send(resp);
             }
-            catch (e) {
-                logger.info('Error handling request: %s %o', e, e.stack);
-                send({
-                    id: req.id,
-                    jsonrpc: '2.0',
-                    error: e instanceof chopsticks_core_1.ResponseError ? e : { code: -32603, message: `Internal ${e}` },
-                });
+            else {
+                logger.trace({ req }, 'Received single request');
+                const resp = await processRequest(req);
+                send(resp);
             }
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks",
-  "version": "0.8.4",
+  "version": "0.8.5-0",
   "author": "Acala Developers <hello@acala.network>",
   "license": "Apache-2.0",
   "bin": "./chopsticks.js",
@@ -17,7 +17,7 @@
     "docs:prep": "typedoc"
   },
   "dependencies": {
-    "@acala-network/chopsticks-core": "0.8.4",
+    "@acala-network/chopsticks-core": "0.8.5-0",
     "@pnpm/npm-conf": "^2.2.2",
     "@polkadot/api": "^10.9.1",
     "axios": "^1.5.1",