fix:throw an error for invaild json string

emqx · Dec 7, 2023 · 72f75ce · 72f75ce
1 parent 6f146f1
commit 72f75ce
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/cli/src/utils/jsonUtils.ts b/cli/src/utils/jsonUtils.ts
@@ -5,10 +5,15 @@ export const jsonParse: typeof JSON.parse = (...args: any[]) => {
   try {
     // When JSON only contains integers, use the native bigint type.
     return JSONBigInt.parse(...args)
-  } catch (_error) {
-    // When JSON contains floating-point numbers, use the bignumber library.
-    // The numbers in the parsed JSON Object will be represented as BigNumber Objects.
-    return JSONBigNumber.parse(...args)
+  } catch {
+    try {
+      // When JSON contains floating-point numbers, use the bignumber library.
+      // The numbers in the parsed JSON Object will be represented as BigNumber Objects.
+      return JSONBigNumber.parse(...args)
+    } catch {
+      // To verify the validity of the JSON string and throw an error if it's invalid.
+      return JSON.parse(args[0], args[1])
+    }
   }
 }
 

diff --git a/src/utils/jsonUtils.ts b/src/utils/jsonUtils.ts
@@ -5,10 +5,15 @@ export const jsonParse: typeof JSON.parse = (...args: any[]) => {
   try {
     // When JSON only contains integers, use the native bigint type.
     return JSONBigInt.parse(...args)
-  } catch (_error) {
-    // When JSON contains floating-point numbers, use the bignumber library.
-    // The numbers in the parsed JSON Object will be represented as BigNumber Objects.
-    return JSONBigNumber.parse(...args)
+  } catch {
+    try {
+      // When JSON contains floating-point numbers, use the bignumber library.
+      // The numbers in the parsed JSON Object will be represented as BigNumber Objects.
+      return JSONBigNumber.parse(...args)
+    } catch {
+      // To verify the validity of the JSON string and throw an error if it's invalid.
+      return JSON.parse(args[0], args[1])
+    }
   }
 }
 

diff --git a/web/src/utils/jsonUtils.ts b/web/src/utils/jsonUtils.ts
@@ -5,10 +5,15 @@ export const jsonParse: typeof JSON.parse = (...args: any[]) => {
   try {
     // When JSON only contains integers, use the native bigint type.
     return JSONBigInt.parse(...args)
-  } catch (_error) {
-    // When JSON contains floating-point numbers, use the bignumber library.
-    // The numbers in the parsed JSON Object will be represented as BigNumber Objects.
-    return JSONBigNumber.parse(...args)
+  } catch {
+    try {
+      // When JSON contains floating-point numbers, use the bignumber library.
+      // The numbers in the parsed JSON Object will be represented as BigNumber Objects.
+      return JSONBigNumber.parse(...args)
+    } catch {
+      // To verify the validity of the JSON string and throw an error if it's invalid.
+      return JSON.parse(args[0], args[1])
+    }
   }
 }