@psalomo/jsonrpc-client 1.0.2 → 1.1.0

package/dist/index.js

@@ -28,6 +28,7 @@ __export(index_exports, {
   NearRpcError: () => NearRpcError,
   RPC_METHODS: () => import_jsonrpc_types3.RPC_METHODS,
   block: () => block,
+  blockEffects: () => blockEffects,
   broadcastTxAsync: () => broadcastTxAsync,
   broadcastTxCommit: () => broadcastTxCommit,
   changes: () => changes,
@@ -49,8 +50,10 @@ __export(index_exports, {
   experimentalTxStatus: () => experimentalTxStatus,
   experimentalValidatorsOrdered: () => experimentalValidatorsOrdered,
   gasPrice: () => gasPrice,
+  genesisConfig: () => genesisConfig,
   health: () => health,
   lightClientProof: () => lightClientProof,
+  maintenanceWindows: () => maintenanceWindows,
   networkInfo: () => networkInfo,
   nextLightClientBlock: () => nextLightClientBlock,
   query: () => query,
@@ -143,20 +146,26 @@ var NearRpcClient = class _NearRpcClient {
    * This is used internally by the standalone RPC functions
    */
   async makeRequest(method, params) {
-    const snakeCaseParams = params ? convertKeysToSnakeCase(params) : params;
-    const request = {
+    const requestForValidation = {
       jsonrpc: "2.0",
       id: REQUEST_ID,
       method,
-      params: snakeCaseParams
+      params: params !== void 0 ? params : null
     };
     if (this.validation) {
       if ("validateMethodRequest" in this.validation) {
-        this.validation.validateMethodRequest(method, request);
+        this.validation.validateMethodRequest(method, requestForValidation);
       } else {
-        this.validation.validateRequest(request);
+        this.validation.validateRequest(requestForValidation);
       }
     }
+    const snakeCaseParams = params !== void 0 ? convertKeysToSnakeCase(params) : null;
+    const request = {
+      jsonrpc: "2.0",
+      id: REQUEST_ID,
+      method,
+      params: snakeCaseParams
+    };
     let lastError = null;
     for (let attempt = 0; attempt <= this.retries; attempt++) {
       try {
@@ -205,6 +214,15 @@ var NearRpcClient = class _NearRpcClient {
           this.validation.validateResponse(jsonResponse);
         }
         const camelCaseResult = jsonResponse.result ? convertKeysToCamelCase(jsonResponse.result) : jsonResponse.result;
+        if (camelCaseResult && typeof camelCaseResult === "object" && "error" in camelCaseResult) {
+          const errorMessage = camelCaseResult.error;
+          throw new JsonRpcClientError(
+            `RPC Error: ${errorMessage}`,
+            -32e3,
+            // Generic RPC error code
+            camelCaseResult
+          );
+        }
         if (this.validation && "validateMethodResponse" in this.validation) {
           const camelCaseResponse = {
             ...jsonResponse,
@@ -302,6 +320,9 @@ async function experimentalValidatorsOrdered(client, params) {
 async function block(client, params) {
   return client.makeRequest("block", params);
 }
+async function blockEffects(client, params) {
+  return client.makeRequest("block_effects", params);
+}
 async function broadcastTxAsync(client, params) {
   return client.makeRequest("broadcast_tx_async", params);
 }
@@ -320,12 +341,18 @@ async function clientConfig(client, params) {
 async function gasPrice(client, params) {
   return client.makeRequest("gas_price", params);
 }
+async function genesisConfig(client, params) {
+  return client.makeRequest("genesis_config", params);
+}
 async function health(client, params) {
   return client.makeRequest("health", params);
 }
 async function lightClientProof(client, params) {
   return client.makeRequest("light_client_proof", params);
 }
+async function maintenanceWindows(client, params) {
+  return client.makeRequest("maintenance_windows", params);
+}
 async function networkInfo(client, params) {
   return client.makeRequest("network_info", params);
 }
@@ -430,12 +457,23 @@ function enableValidation() {
     validateMethodResponse: (method, response) => {
       try {
         responseSchema.parse(response);
+        if (response.result && typeof response.result === "object" && "error" in response.result) {
+          const serverError = response.result.error;
+          throw new JsonRpcClientError(
+            `Server error: ${serverError}`,
+            -32e3,
+            response.result
+          );
+        }
         const methodSchemas = import_jsonrpc_types.VALIDATION_SCHEMA_MAP[method];
         if (methodSchemas?.responseSchema) {
           const methodResponseSchema = methodSchemas.responseSchema();
           methodResponseSchema.parse(response);
         }
       } catch (error) {
+        if (error instanceof JsonRpcClientError) {
+          throw error;
+        }
         throw new JsonRpcClientError(
           `Invalid ${method} response: ${error instanceof Error ? error.message : "Unknown error"}`
         );
@@ -453,6 +491,7 @@ function enableValidation() {
   NearRpcError,
   RPC_METHODS,
   block,
+  blockEffects,
   broadcastTxAsync,
   broadcastTxCommit,
   changes,
@@ -473,8 +512,10 @@ function enableValidation() {
   experimentalTxStatus,
   experimentalValidatorsOrdered,
   gasPrice,
+  genesisConfig,
   health,
   lightClientProof,
+  maintenanceWindows,
   networkInfo,
   nextLightClientBlock,
   query,

package/dist/index.mjs

@@ -77,20 +77,26 @@ var NearRpcClient = class _NearRpcClient {
    * This is used internally by the standalone RPC functions
    */
   async makeRequest(method, params) {
-    const snakeCaseParams = params ? convertKeysToSnakeCase(params) : params;
-    const request = {
+    const requestForValidation = {
       jsonrpc: "2.0",
       id: REQUEST_ID,
       method,
-      params: snakeCaseParams
+      params: params !== void 0 ? params : null
     };
     if (this.validation) {
       if ("validateMethodRequest" in this.validation) {
-        this.validation.validateMethodRequest(method, request);
+        this.validation.validateMethodRequest(method, requestForValidation);
       } else {
-        this.validation.validateRequest(request);
+        this.validation.validateRequest(requestForValidation);
       }
     }
+    const snakeCaseParams = params !== void 0 ? convertKeysToSnakeCase(params) : null;
+    const request = {
+      jsonrpc: "2.0",
+      id: REQUEST_ID,
+      method,
+      params: snakeCaseParams
+    };
     let lastError = null;
     for (let attempt = 0; attempt <= this.retries; attempt++) {
       try {
@@ -139,6 +145,15 @@ var NearRpcClient = class _NearRpcClient {
           this.validation.validateResponse(jsonResponse);
         }
         const camelCaseResult = jsonResponse.result ? convertKeysToCamelCase(jsonResponse.result) : jsonResponse.result;
+        if (camelCaseResult && typeof camelCaseResult === "object" && "error" in camelCaseResult) {
+          const errorMessage = camelCaseResult.error;
+          throw new JsonRpcClientError(
+            `RPC Error: ${errorMessage}`,
+            -32e3,
+            // Generic RPC error code
+            camelCaseResult
+          );
+        }
         if (this.validation && "validateMethodResponse" in this.validation) {
           const camelCaseResponse = {
             ...jsonResponse,
@@ -239,6 +254,9 @@ async function experimentalValidatorsOrdered(client, params) {
 async function block(client, params) {
   return client.makeRequest("block", params);
 }
+async function blockEffects(client, params) {
+  return client.makeRequest("block_effects", params);
+}
 async function broadcastTxAsync(client, params) {
   return client.makeRequest("broadcast_tx_async", params);
 }
@@ -257,12 +275,18 @@ async function clientConfig(client, params) {
 async function gasPrice(client, params) {
   return client.makeRequest("gas_price", params);
 }
+async function genesisConfig(client, params) {
+  return client.makeRequest("genesis_config", params);
+}
 async function health(client, params) {
   return client.makeRequest("health", params);
 }
 async function lightClientProof(client, params) {
   return client.makeRequest("light_client_proof", params);
 }
+async function maintenanceWindows(client, params) {
+  return client.makeRequest("maintenance_windows", params);
+}
 async function networkInfo(client, params) {
   return client.makeRequest("network_info", params);
 }
@@ -371,12 +395,23 @@ function enableValidation() {
     validateMethodResponse: (method, response) => {
       try {
         responseSchema.parse(response);
+        if (response.result && typeof response.result === "object" && "error" in response.result) {
+          const serverError = response.result.error;
+          throw new JsonRpcClientError(
+            `Server error: ${serverError}`,
+            -32e3,
+            response.result
+          );
+        }
         const methodSchemas = VALIDATION_SCHEMA_MAP[method];
         if (methodSchemas?.responseSchema) {
           const methodResponseSchema = methodSchemas.responseSchema();
           methodResponseSchema.parse(response);
         }
       } catch (error) {
+        if (error instanceof JsonRpcClientError) {
+          throw error;
+        }
         throw new JsonRpcClientError(
           `Invalid ${method} response: ${error instanceof Error ? error.message : "Unknown error"}`
         );
@@ -393,6 +428,7 @@ export {
   NearRpcError,
   RPC_METHODS,
   block,
+  blockEffects,
   broadcastTxAsync,
   broadcastTxCommit,
   changes,
@@ -414,8 +450,10 @@ export {
   experimentalTxStatus,
   experimentalValidatorsOrdered,
   gasPrice,
+  genesisConfig,
   health,
   lightClientProof,
+  maintenanceWindows,
   networkInfo,
   nextLightClientBlock,
   query,

package/dist/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,cAAc,EACd,eAAe,EAGhB,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,gBAAgB;IAC/B,eAAe,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC;IACnD,gBAAgB,EAAE,CAAC,QAAQ,EAAE,eAAe,KAAK,IAAI,CAAC;IACtD,qBAAqB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC;IAC1E,sBAAsB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,KAAK,IAAI,CAAC;CAC9E;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,gBAAgB,CA+DnD"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,cAAc,EACd,eAAe,EAGhB,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,gBAAgB;IAC/B,eAAe,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC;IACnD,gBAAgB,EAAE,CAAC,QAAQ,EAAE,eAAe,KAAK,IAAI,CAAC;IACtD,qBAAqB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC;IAC1E,sBAAsB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,KAAK,IAAI,CAAC;CAC9E;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,gBAAgB,CAoFnD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@psalomo/jsonrpc-client",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "TypeScript client for NEAR Protocol JSON-RPC API",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -30,7 +30,7 @@
     "test:coverage": "vitest run --coverage"
   },
   "dependencies": {
-    "@psalomo/jsonrpc-types": "^1.0.2"
+    "@psalomo/jsonrpc-types": "^1.1.0"
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^16.0.1",