Fixed RPC serialization, updated names for RPC response / request, fi…

…xed parsers for Tranform class
casper-ecosystem · Nov 15, 2024 · a3fe0a1 · a3fe0a1
1 parent f395932
commit a3fe0a1
Show file tree

Hide file tree

Showing 31 changed files with 1,411 additions and 919 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/rpc/http_handler.ts b/src/rpc/http_handler.ts
@@ -1,15 +1,23 @@
+import { TypedJSON } from 'typedjson';
 import axios, { AxiosInstance, AxiosRequestConfig } from 'axios';
-import { HttpError } from "./error";
-import { RpcRequest } from "./request";
-import { RpcResponse } from "./response";
-import { IHandler } from "./client";
 
-export const ErrParamsJsonStringifyHandler = new Error("failed to stringify json rpc request's params");
-export const ErrProcessHttpRequest = new Error("failed to send http request");
-export const ErrReadHttpResponseBody = new Error("failed to read http response body");
-export const ErrRpcResponseUnmarshal = new Error("failed to unmarshal rpc response");
+import { HttpError } from './error';
+import { RpcRequest } from './request';
+import { RpcResponse } from './response';
+import { IHandler } from './client';
 
-export class HttpHandler implements IHandler{
+export const ErrParamsJsonStringifyHandler = new Error(
+  "failed to stringify json rpc request's params"
+);
+export const ErrProcessHttpRequest = new Error('failed to send http request');
+export const ErrReadHttpResponseBody = new Error(
+  'failed to read http response body'
+);
+export const ErrRpcResponseUnmarshal = new Error(
+  'failed to unmarshal rpc response'
+);
+
+export class HttpHandler implements IHandler {
   private httpClient: AxiosInstance;
   private endpoint: string;
   private customHeaders: Record<string, string>;
@@ -26,22 +34,25 @@ export class HttpHandler implements IHandler{
 
   /** @throws {HttpError, Error} */
   async processCall(params: RpcRequest): Promise<RpcResponse> {
+    const serializer = new TypedJSON(RpcRequest);
     let body: string;
 
     try {
-      body = JSON.stringify(params);
+      body = serializer.stringify(params);
     } catch (err) {
-      throw new Error(`${ErrParamsJsonStringifyHandler.message}, details: ${err.message}`);
+      throw new Error(
+        `${ErrParamsJsonStringifyHandler.message}, details: ${err.message}`
+      );
     }
 
     const config: AxiosRequestConfig = {
       method: 'POST',
       url: this.endpoint,
       headers: {
         'Content-Type': 'application/json',
-        ...this.customHeaders,
+        ...this.customHeaders
       },
-      data: body,
+      data: body
     };
 
     try {
@@ -54,17 +65,26 @@ export class HttpHandler implements IHandler{
       try {
         return response.data;
       } catch (err) {
-        throw new Error(`${ErrRpcResponseUnmarshal.message}, details: ${err.message}`);
+        throw new Error(
+          `${ErrRpcResponseUnmarshal.message}, details: ${err.message}`
+        );
       }
     } catch (err) {
       if (axios.isAxiosError(err)) {
         if (err.response) {
-          throw new HttpError(err.response.status, new Error(err.response.statusText));
+          throw new HttpError(
+            err.response.status,
+            new Error(err.response.statusText)
+          );
         } else {
-          throw new Error(`${ErrProcessHttpRequest.message}, details: ${err.message}`);
+          throw new Error(
+            `${ErrProcessHttpRequest.message}, details: ${err.message}`
+          );
         }
       } else {
-        throw new Error(`${ErrReadHttpResponseBody.message}, details: ${err.message}`);
+        throw new Error(
+          `${ErrReadHttpResponseBody.message}, details: ${err.message}`
+        );
       }
     }
   }

diff --git a/src/rpc/id_value.ts b/src/rpc/id_value.ts
@@ -1,7 +1,15 @@
+import { jsonMember, jsonObject } from 'typedjson';
+
+@jsonObject
 export class IDValue {
-  private intValue: number | null = null;
-  private strValue: string | null = null;
-  private isIntValue: boolean;
+  @jsonMember({ constructor: Number, isRequired: false, preserveNull: true })
+  intValue: number | null = null;
+
+  @jsonMember({ constructor: String, isRequired: false, preserveNull: true })
+  strValue: string | null = null;
+
+  @jsonMember({ constructor: Boolean })
+  isIntValue: boolean;
 
   constructor(value: string | number) {
     if (typeof value === 'number') {
@@ -41,25 +49,12 @@ export class IDValue {
     return this.toString();
   }
 
-  static fromJSON(data: string): IDValue {
-    try {
-      const parsedInt = JSON.parse(data) as number;
-      if (typeof parsedInt === 'number') {
-        return IDValue.fromInt(parsedInt);
-      }
-    } catch (e) {
-      // Not a number, continue to try parsing as a string
+  static fromJSON(data: string | number): IDValue {
+    if (typeof data === 'number') {
+      return IDValue.fromInt(data);
+    } else if (typeof data === 'string') {
+      return IDValue.fromString(data);
     }
-
-    try {
-      const parsedStr = JSON.parse(data) as string;
-      if (typeof parsedStr === 'string') {
-        return IDValue.fromString(parsedStr);
-      }
-    } catch (e) {
-      throw new Error('IDValue should be an int or string');
-    }
-
     throw new Error('IDValue should be an int or string');
   }
 }