@psalomo/jsonrpc-client 1.0.1 → 1.0.3

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,
@@ -109,9 +112,10 @@ var JsonRpcClientError = class extends Error {
   }
 };
 var JsonRpcNetworkError = class extends Error {
-  constructor(message, originalError) {
+  constructor(message, originalError, responseBody) {
     super(message);
     this.originalError = originalError;
+    this.responseBody = responseBody;
     this.name = "JsonRpcNetworkError";
   }
 };
@@ -142,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 {
@@ -171,23 +181,21 @@ var NearRpcClient = class _NearRpcClient {
           signal: controller.signal
         });
         clearTimeout(timeoutId);
-        if (!response.ok) {
-          throw new JsonRpcNetworkError(
-            `HTTP error! status: ${response.status}`
-          );
-        }
         let jsonResponse;
         try {
           jsonResponse = await response.json();
         } catch (parseError) {
+          if (!response.ok) {
+            throw new JsonRpcNetworkError(
+              `HTTP error! status: ${response.status} - Failed to parse JSON response`,
+              parseError
+            );
+          }
           throw new JsonRpcNetworkError(
             "Failed to parse JSON response",
             parseError
           );
         }
-        if (this.validation) {
-          this.validation.validateResponse(jsonResponse);
-        }
         if (jsonResponse.error) {
           throw new JsonRpcClientError(
             jsonResponse.error.message,
@@ -195,6 +203,16 @@ var NearRpcClient = class _NearRpcClient {
             jsonResponse.error.data
           );
         }
+        if (!response.ok) {
+          throw new JsonRpcNetworkError(
+            `HTTP error! status: ${response.status}`,
+            void 0,
+            jsonResponse
+          );
+        }
+        if (this.validation) {
+          this.validation.validateResponse(jsonResponse);
+        }
         const camelCaseResult = jsonResponse.result ? convertKeysToCamelCase(jsonResponse.result) : jsonResponse.result;
         if (this.validation && "validateMethodResponse" in this.validation) {
           const camelCaseResponse = {
@@ -293,6 +311,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);
 }
@@ -311,12 +332,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);
 }
@@ -444,6 +471,7 @@ function enableValidation() {
   NearRpcError,
   RPC_METHODS,
   block,
+  blockEffects,
   broadcastTxAsync,
   broadcastTxCommit,
   changes,
@@ -464,8 +492,10 @@ function enableValidation() {
   experimentalTxStatus,
   experimentalValidatorsOrdered,
   gasPrice,
+  genesisConfig,
   health,
   lightClientProof,
+  maintenanceWindows,
   networkInfo,
   nextLightClientBlock,
   query,

package/dist/index.mjs

@@ -43,9 +43,10 @@ var JsonRpcClientError = class extends Error {
   }
 };
 var JsonRpcNetworkError = class extends Error {
-  constructor(message, originalError) {
+  constructor(message, originalError, responseBody) {
     super(message);
     this.originalError = originalError;
+    this.responseBody = responseBody;
     this.name = "JsonRpcNetworkError";
   }
 };
@@ -76,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 {
@@ -105,23 +112,21 @@ var NearRpcClient = class _NearRpcClient {
           signal: controller.signal
         });
         clearTimeout(timeoutId);
-        if (!response.ok) {
-          throw new JsonRpcNetworkError(
-            `HTTP error! status: ${response.status}`
-          );
-        }
         let jsonResponse;
         try {
           jsonResponse = await response.json();
         } catch (parseError) {
+          if (!response.ok) {
+            throw new JsonRpcNetworkError(
+              `HTTP error! status: ${response.status} - Failed to parse JSON response`,
+              parseError
+            );
+          }
           throw new JsonRpcNetworkError(
             "Failed to parse JSON response",
             parseError
           );
         }
-        if (this.validation) {
-          this.validation.validateResponse(jsonResponse);
-        }
         if (jsonResponse.error) {
           throw new JsonRpcClientError(
             jsonResponse.error.message,
@@ -129,6 +134,16 @@ var NearRpcClient = class _NearRpcClient {
             jsonResponse.error.data
           );
         }
+        if (!response.ok) {
+          throw new JsonRpcNetworkError(
+            `HTTP error! status: ${response.status}`,
+            void 0,
+            jsonResponse
+          );
+        }
+        if (this.validation) {
+          this.validation.validateResponse(jsonResponse);
+        }
         const camelCaseResult = jsonResponse.result ? convertKeysToCamelCase(jsonResponse.result) : jsonResponse.result;
         if (this.validation && "validateMethodResponse" in this.validation) {
           const camelCaseResponse = {
@@ -230,6 +245,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);
 }
@@ -248,12 +266,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);
 }
@@ -384,6 +408,7 @@ export {
   NearRpcError,
   RPC_METHODS,
   block,
+  blockEffects,
   broadcastTxAsync,
   broadcastTxCommit,
   changes,
@@ -405,8 +430,10 @@ export {
   experimentalTxStatus,
   experimentalValidatorsOrdered,
   gasPrice,
+  genesisConfig,
   health,
   lightClientProof,
+  maintenanceWindows,
   networkInfo,
   nextLightClientBlock,
   query,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@psalomo/jsonrpc-client",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "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.1"
+    "@psalomo/jsonrpc-types": "^1.0.3"
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^16.0.1",