Bugfix/JSON5 Parsing (#5201)

use json5 for parsing input data

packages/components/nodes/tools/MCP/CustomMCP/CustomMCP.ts

@@ -4,6 +4,7 @@ import { MCPToolkit } from '../core'
 import { getVars, prepareSandboxVars } from '../../../../src/utils'
 import { DataSource } from 'typeorm'
 import hash from 'object-hash'
+import JSON5 from 'json5'
 
 const mcpServerConfig = `{
     "command": "npx",
@@ -261,7 +262,7 @@ function substituteVariablesInString(str: string, sandbox: any): string {
 
 function convertToValidJSONString(inputString: string) {
     try {
-        const jsObject = Function('return ' + inputString)()
+        const jsObject = JSON5.parse(inputString)
         return JSON.stringify(jsObject, null, 2)
     } catch (error) {
         console.error('Error converting to JSON:', error)

packages/components/nodes/tools/RequestsDelete/RequestsDelete.ts

@@ -1,6 +1,7 @@
 import { INode, INodeData, INodeParams } from '../../../src/Interface'
 import { getBaseClasses, stripHTMLFromToolInput } from '../../../src/utils'
 import { desc, RequestParameters, RequestsDeleteTool } from './core'
+import JSON5 from 'json5'
 
 const codeExample = `{
     "id": {
@@ -130,7 +131,7 @@ class RequestsDelete_Tools implements INode {
         if (queryParamsSchema) obj.queryParamsSchema = queryParamsSchema
         if (maxOutputLength) obj.maxOutputLength = parseInt(maxOutputLength, 10)
         if (headers) {
-            const parsedHeaders = typeof headers === 'object' ? headers : JSON.parse(stripHTMLFromToolInput(headers))
+            const parsedHeaders = typeof headers === 'object' ? headers : JSON5.parse(stripHTMLFromToolInput(headers))
             obj.headers = parsedHeaders
         }
 

packages/components/nodes/tools/RequestsDelete/core.ts

@@ -1,6 +1,7 @@
 import { z } from 'zod'
 import { DynamicStructuredTool } from '../OpenAPIToolkit/core'
 import { secureFetch } from '../../../src/httpSecurity'
+import JSON5 from 'json5'
 
 export const desc = `Use this when you need to execute a DELETE request to remove data from a website.`
 
@@ -22,7 +23,7 @@ const createRequestsDeleteSchema = (queryParamsSchema?: string) => {
     // If queryParamsSchema is provided, parse it and add dynamic query params
     if (queryParamsSchema) {
         try {
-            const parsedSchema = JSON.parse(queryParamsSchema)
+            const parsedSchema = JSON5.parse(queryParamsSchema)
             const queryParamsObject: Record<string, z.ZodTypeAny> = {}
 
             Object.entries(parsedSchema).forEach(([key, config]: [string, any]) => {
@@ -108,7 +109,7 @@ export class RequestsDeleteTool extends DynamicStructuredTool {
 
         if (this.queryParamsSchema && params.queryParams && Object.keys(params.queryParams).length > 0) {
             try {
-                const parsedSchema = JSON.parse(this.queryParamsSchema)
+                const parsedSchema = JSON5.parse(this.queryParamsSchema)
                 const pathParams: Array<{ key: string; value: string }> = []
 
                 Object.entries(params.queryParams).forEach(([key, value]) => {

packages/components/nodes/tools/RequestsGet/RequestsGet.ts

@@ -1,6 +1,7 @@
 import { INode, INodeData, INodeParams } from '../../../src/Interface'
 import { getBaseClasses, stripHTMLFromToolInput } from '../../../src/utils'
 import { desc, RequestParameters, RequestsGetTool } from './core'
+import JSON5 from 'json5'
 
 const codeExample = `{
     "id": {
@@ -130,7 +131,7 @@ class RequestsGet_Tools implements INode {
         if (queryParamsSchema) obj.queryParamsSchema = queryParamsSchema
         if (maxOutputLength) obj.maxOutputLength = parseInt(maxOutputLength, 10)
         if (headers) {
-            const parsedHeaders = typeof headers === 'object' ? headers : JSON.parse(stripHTMLFromToolInput(headers))
+            const parsedHeaders = typeof headers === 'object' ? headers : JSON5.parse(stripHTMLFromToolInput(headers))
             obj.headers = parsedHeaders
         }
 

packages/components/nodes/tools/RequestsGet/core.ts

@@ -1,6 +1,7 @@
 import { z } from 'zod'
 import { DynamicStructuredTool } from '../OpenAPIToolkit/core'
 import { secureFetch } from '../../../src/httpSecurity'
+import JSON5 from 'json5'
 
 export const desc = `Use this when you need to execute a GET request to get data from a website.`
 
@@ -22,7 +23,7 @@ const createRequestsGetSchema = (queryParamsSchema?: string) => {
     // If queryParamsSchema is provided, parse it and add dynamic query params
     if (queryParamsSchema) {
         try {
-            const parsedSchema = JSON.parse(queryParamsSchema)
+            const parsedSchema = JSON5.parse(queryParamsSchema)
             const queryParamsObject: Record<string, z.ZodTypeAny> = {}
 
             Object.entries(parsedSchema).forEach(([key, config]: [string, any]) => {
@@ -108,7 +109,7 @@ export class RequestsGetTool extends DynamicStructuredTool {
 
         if (this.queryParamsSchema && params.queryParams && Object.keys(params.queryParams).length > 0) {
             try {
-                const parsedSchema = JSON.parse(this.queryParamsSchema)
+                const parsedSchema = JSON5.parse(this.queryParamsSchema)
                 const pathParams: Array<{ key: string; value: string }> = []
 
                 Object.entries(params.queryParams).forEach(([key, value]) => {

packages/components/nodes/tools/RequestsPost/RequestsPost.ts

@@ -1,6 +1,7 @@
 import { INode, INodeData, INodeParams } from '../../../src/Interface'
 import { getBaseClasses, stripHTMLFromToolInput } from '../../../src/utils'
 import { RequestParameters, desc, RequestsPostTool } from './core'
+import JSON5 from 'json5'
 
 const codeExample = `{
     "name": {
@@ -140,11 +141,11 @@ class RequestsPost_Tools implements INode {
         if (bodySchema) obj.bodySchema = stripHTMLFromToolInput(bodySchema)
         if (maxOutputLength) obj.maxOutputLength = parseInt(maxOutputLength, 10)
         if (headers) {
-            const parsedHeaders = typeof headers === 'object' ? headers : JSON.parse(stripHTMLFromToolInput(headers))
+            const parsedHeaders = typeof headers === 'object' ? headers : JSON5.parse(stripHTMLFromToolInput(headers))
             obj.headers = parsedHeaders
         }
         if (body) {
-            const parsedBody = typeof body === 'object' ? body : JSON.parse(body)
+            const parsedBody = typeof body === 'object' ? body : JSON5.parse(body)
             obj.body = parsedBody
         }
 

packages/components/nodes/tools/RequestsPost/core.ts

@@ -1,6 +1,7 @@
 import { z } from 'zod'
 import { DynamicStructuredTool } from '../OpenAPIToolkit/core'
 import { secureFetch } from '../../../src/httpSecurity'
+import JSON5 from 'json5'
 
 export const desc = `Use this when you want to execute a POST request to create or update a resource.`
 
@@ -27,7 +28,7 @@ const createRequestsPostSchema = (bodySchema?: string) => {
     // If bodySchema is provided, parse it and add dynamic body params
     if (bodySchema) {
         try {
-            const parsedSchema = JSON.parse(bodySchema)
+            const parsedSchema = JSON5.parse(bodySchema)
             const bodyParamsObject: Record<string, z.ZodTypeAny> = {}
 
             Object.entries(parsedSchema).forEach(([key, config]: [string, any]) => {

packages/components/nodes/tools/RequestsPut/RequestsPut.ts

@@ -1,6 +1,7 @@
 import { INode, INodeData, INodeParams } from '../../../src/Interface'
 import { getBaseClasses, stripHTMLFromToolInput } from '../../../src/utils'
 import { RequestParameters, desc, RequestsPutTool } from './core'
+import JSON5 from 'json5'
 
 const codeExample = `{
     "name": {
@@ -140,11 +141,11 @@ class RequestsPut_Tools implements INode {
         if (bodySchema) obj.bodySchema = stripHTMLFromToolInput(bodySchema)
         if (maxOutputLength) obj.maxOutputLength = parseInt(maxOutputLength, 10)
         if (headers) {
-            const parsedHeaders = typeof headers === 'object' ? headers : JSON.parse(stripHTMLFromToolInput(headers))
+            const parsedHeaders = typeof headers === 'object' ? headers : JSON5.parse(stripHTMLFromToolInput(headers))
             obj.headers = parsedHeaders
         }
         if (body) {
-            const parsedBody = typeof body === 'object' ? body : JSON.parse(body)
+            const parsedBody = typeof body === 'object' ? body : JSON5.parse(body)
             obj.body = parsedBody
         }
 

packages/components/nodes/tools/RequestsPut/core.ts

@@ -1,6 +1,7 @@
 import { z } from 'zod'
 import { DynamicStructuredTool } from '../OpenAPIToolkit/core'
 import { secureFetch } from '../../../src/httpSecurity'
+import JSON5 from 'json5'
 
 export const desc = `Use this when you want to execute a PUT request to update or replace a resource.`
 
@@ -27,7 +28,7 @@ const createRequestsPutSchema = (bodySchema?: string) => {
     // If bodySchema is provided, parse it and add dynamic body params
     if (bodySchema) {
         try {
-            const parsedSchema = JSON.parse(bodySchema)
+            const parsedSchema = JSON5.parse(bodySchema)
             const bodyParamsObject: Record<string, z.ZodTypeAny> = {}
 
             Object.entries(parsedSchema).forEach(([key, config]: [string, any]) => {