Fix: Monika sends null request body as string null (#1293)

* fix: request body send 'null' instead of null

Author: haricnugraha

src/components/config/__tests__/expected.textfile.yml

@@ -5,7 +5,6 @@ probes:
       - url: https://monika.hyperjump.tech
         method: GET
         timeout: 10000
-        body: {}
         followRedirects: 21
     interval: 900
     alerts:
@@ -19,7 +18,6 @@ probes:
       - url: https://github.com
         method: GET
         timeout: 10000
-        body: {}
         followRedirects: 21
     interval: 900
     alerts:

src/components/config/parser/text.ts

@@ -67,7 +67,6 @@ export const parseConfigFromText = (configString: string): Config => {
               url,
               method: 'GET',
               timeout: 10_000,
-              body: {} as JSON,
               followRedirects: getContext().flags['follow-redirects'],
             },
           ],

src/components/probe/prober/http/request.test.ts

@@ -537,6 +537,34 @@ describe('probingHTTP', () => {
       // assert
       expect(res.status).to.eq(302)
     })
+
+    it('should send no body', async () => {
+      // arrange
+      let body
+      server.use(
+        http.get('https://example.com', async ({ request }) => {
+          body = request.body
+
+          return new HttpResponse(null, {
+            status: 200,
+          })
+        })
+      )
+      const request = {
+        url: 'https://example.com',
+        body: null,
+      } as RequestConfig
+
+      // act
+      const res = await httpRequest({
+        requestConfig: request,
+        responses: [],
+      })
+
+      // assert
+      expect(res.status).to.eq(200)
+      expect(body).to.eq(null)
+    })
   })
 
   describe('Unit test', () => {

src/components/probe/prober/http/request.ts

@@ -27,7 +27,7 @@ import FormData from 'form-data'
 import Joi from 'joi'
 // eslint-disable-next-line no-restricted-imports
 import * as qs from 'querystring'
-import { errors as undiciErrors } from 'undici'
+import { type BodyInit, errors as undiciErrors } from 'undici'
 import YAML from 'yaml'
 import {
   type ProbeRequestResponse,
@@ -73,17 +73,17 @@ export async function httpRequest({
     ping,
     allowUnauthorized,
     followRedirects,
+    signal,
   } = requestConfig
-  const newReq = { method, headers, timeout, body, ping }
+  const newReq = { method, headers, timeout, body, ping, signal }
   const renderURL = Handlebars.compile(url)
   const renderedURL = renderURL({ responses })
-  newReq.headers = compileHeaders(headers, body, responses as never)
   // compile body needs to modify headers if necessary
-  const { headers: newHeaders, body: newBody } = compileBody(
-    newReq.headers,
+  const { headers: newHeaders, body: newBody } = compileBody({
+    responses,
     body,
-    responses
-  )
+    headers: compileHeaders({ headers, responses, body }),
+  })
   newReq.headers = newHeaders
   newReq.body = newBody
 
@@ -149,11 +149,13 @@ export async function httpRequest({
   }
 }
 
-function compileHeaders(
-  headers: object | undefined,
-  body: string | object,
-  responses: never
-) {
+type ChainingRequest = {
+  responses: Array<ProbeRequestResponse>
+  body?: BodyInit
+  headers?: object
+}
+
+function compileHeaders({ headers, responses, body }: ChainingRequest) {
   // return as-is if falsy
   if (!headers) return headers
   // Compile headers using handlebars to render URLs that uses previous responses data.
@@ -193,18 +195,18 @@ function compileHeaders(
   return newHeaders
 }
 
-function compileBody(
-  headers: object | undefined,
-  body: object | string,
-  responses: ProbeRequestResponse[]
-): {
-  headers: object | undefined
-  body: object | string
-} {
+function compileBody({
+  responses,
+  body,
+  headers,
+}: ChainingRequest): Pick<ChainingRequest, 'body' | 'headers'> {
   // return as-is if falsy
   if (!body) return { headers, body }
   let newHeaders = headers
-  let newBody = generateRequestChainingBody(body, responses)
+  let newBody: BodyInit | undefined = generateRequestChainingBody(
+    body,
+    responses
+  )
 
   if (newHeaders) {
     const contentTypeKey = Object.keys(newHeaders || {}).find(
@@ -247,7 +249,7 @@ async function probeHttpFetch({
     method: string | undefined
     headers: Headers | undefined
     timeout: number
-    body: string | object
+    body?: BodyInit
     ping: boolean | undefined
   }
 }): Promise<ProbeRequestResponse> {
@@ -302,7 +304,7 @@ type ProbeHTTPAxiosParams = {
     method: string | undefined
     headers: Headers | undefined
     timeout: number
-    body: string | object
+    body?: BodyInit
     ping: boolean | undefined
   }
 }
@@ -320,10 +322,6 @@ async function probeHttpAxios({
     keepalive: true,
     url: renderedURL,
     maxRedirects,
-    body:
-      typeof requestParams.body === 'string'
-        ? requestParams.body
-        : JSON.stringify(requestParams.body),
   })
 
   const responseTime = Date.now() - startTime
@@ -343,7 +341,7 @@ async function probeHttpAxios({
 export function generateRequestChainingBody(
   body: object | string,
   responses: ProbeRequestResponse[]
-): object | string {
+): BodyInit {
   const isString = typeof body === 'string'
   const template = Handlebars.compile(isString ? body : JSON.stringify(body))
   const renderedBody = template({ responses })
@@ -352,9 +350,13 @@ export function generateRequestChainingBody(
 }
 
 function transformContentByType(
-  content: object | string,
+  content?: BodyInit,
   contentType?: string | number | boolean
 ) {
+  if (!content) {
+    return { content, contentType }
+  }
+
   switch (contentType) {
     case 'application/json': {
       return { content: JSON.stringify(content), contentType }
@@ -369,9 +371,8 @@ function transformContentByType(
 
     case 'multipart/form-data': {
       const form = new FormData()
-
       for (const contentKey of Object.keys(content)) {
-        form.append(contentKey, (content as Record<string, never>)[contentKey])
+        form.append(contentKey, (content as any)[contentKey])
       }
 
       return { content: form, contentType: form.getHeaders()['content-type'] }

src/interfaces/request.ts

@@ -56,11 +56,10 @@ export interface ProbeRequestResponse<T = unknown> {
 }
 
 // ProbeRequest is used to define the requests that is being made.
-export interface RequestConfig extends Omit<RequestInit, 'headers' | 'body'> {
+export interface RequestConfig extends Omit<RequestInit, 'headers'> {
   id?: string
   saveBody?: boolean // save response body to db?
   url: string
-  body: object | string
   followRedirects: number
   timeout: number // request timeout
   alerts?: ProbeAlert[]

src/symon/index.test.ts

@@ -206,7 +206,7 @@ describe('Symon initiate', () => {
         })
       ),
       http.get('http://localhost:4000/api/v1/monika/1234/probes', () => {
-        throw new Error('Failed')
+        throw new Error('Failed to get probes from Symon')
       })
     )