Added Headers in Request object

Author: IntegerAlex

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
 All notable changes to this project will be documented in this file.
+## [0.9.3] - 2025-03-04
+### Fixed
+- Fixed the issue of res.end() 
+
+## [0.9.3] - 2025-03-04
+### Fixed
+- Added Headers in response objects
+
 ## [0.9.0] - 2024-12-31
 ### Fixed
 - minor bug fixes

lib/httpParser.js

@@ -2,47 +2,72 @@ const { findFirstBrac, HTTPbody, JSONbodyParser, queryParser } = require('./util
 
 // Async function to parse the HTTP request
 async function httpParser (request) {
-  const req = {} // Create a new object to store the parsed request
-  const requestString = request.toString() // Convert buffer to string, if necessary
-
-  // Step 1: Split the request into headers and body by finding "\r\n\r\n"
-  const headerBodySplit = requestString.split('\r\n\r\n') // Headers and body are separated by double newline
-  const headersPart = headerBodySplit[0] // First part is the headers
-  const bodyPart = headerBodySplit[1] // Second part is the body
-
-  // Step 2: Extract the headers (the first line is the request line, e.g., "POST /path HTTP/1.1")
-  const headers = headersPart.split('\n')
-
-  // Parse the request line (first line of the headers)
-  const requestLine = headers[0].split(' ') // ["POST", "/path", "HTTP/1.1"]
-  req.method = requestLine[0] // e.g., "POST"
-  req.path = requestLine[1] // e.g., "/path"
-  req.version = requestLine[2] // e.g., "HTTP/1.1"
-
-  // Step 3: Handle GET requests (expect a query string)
-  req.query = queryParser(req.path) // Parse query string for GET requests
-  req.path = req.path.split('?')[0] // Remove query string from path
-
-  // Step 4: Handle POST requests (expect a body)
-  if (req.method === 'POST') {
-    // Now we need to parse the body, which is in `bodyPart`
-    const position = 0 // Start at position 0 of the bodyPart
-
-    // Await the body parsing (this is an async operation)
-    const bodyData = await HTTPbody(bodyPart, position)
-
-    // Step 5: Parse the body into JSON format
-    try {
-      req.body = JSONbodyParser(bodyData) // Convert the parsed body into JSON
-    } catch (error) {
-      console.error('Error parsing JSON body:', error)
+  try {
+    const req = {} // Create a new object to store the parsed request
+    const requestString = request.toString() // Convert buffer to string, if necessary
+
+    // Step 1: Split the request into headers and body by finding "\r\n\r\n"
+    const headerBodySplit = requestString.split('\r\n\r\n') // Headers and body are separated by double newline
+    if (headerBodySplit.length < 1) {
+      throw new Error('Invalid HTTP request format')
+    }
+    
+    const headersPart = headerBodySplit[0] // First part is the headers
+    const bodyPart = headerBodySplit[1] || '' // Second part is the body, default to empty string if no body
+
+    // Step 2: Extract the headers (the first line is the request line, e.g., "POST /path HTTP/1.1")
+    const headers = headersPart.split(/\r?\n/).filter(line => line.trim()) // Handle both \r\n and \n
+
+    // Parse the request line (first line of the headers)
+    const requestLine = headers[0].split(' ') // ["POST", "/path", "HTTP/1.1"]
+    if (requestLine.length !== 3) {
+      throw new Error('Invalid request line format')
+    }
+
+    req.method = requestLine[0].toUpperCase() // e.g., "POST"
+    req.path = requestLine[1] // e.g., "/path"
+    req.version = requestLine[2] // e.g., "HTTP/1.1"
+
+    // Add headers parsing
+    req.headers = {}
+    for (let i = 1; i < headers.length; i++) {
+      const line = headers[i].trim()
+      if (line) {
+        const colonIndex = line.indexOf(':')
+        if (colonIndex === -1) continue // Skip malformed headers
+        
+        const key = line.slice(0, colonIndex).trim().toLowerCase()
+        const value = line.slice(colonIndex + 1).trim()
+        req.headers[key] = value
+      }
+    }
+
+    // Step 3: Handle GET requests (expect a query string)
+    req.query = queryParser(req.path) // Parse query string for GET requests
+    req.path = req.path.split('?')[0] // Remove query string from path
+
+    // Step 4: Handle POST requests (expect a body)
+    if (req.method === 'POST') {
+      if (!bodyPart) {
+        req.body = {}
+      } else {
+        try {
+          // Await the body parsing (this is an async operation)
+          const bodyData = await HTTPbody(bodyPart, 0)
+          // Step 5: Parse the body into JSON format
+          req.body = JSONbodyParser(bodyData) // Convert the parsed body into JSON
+        } catch (error) {
+          console.error('Error parsing request body:', error)
+          req.body = {} // Set empty object as fallback
+        }
+      }
     }
 
     return req // Return the fully parsed request object
+  } catch (error) {
+    console.error('Error parsing HTTP request:', error)
+    throw error // Re-throw to let caller handle the error
   }
-
-  // Step 6: If it's another HTTP method, just return the parsed headers
-  return req
 }
 
 module.exports = { httpParser }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hasty-server",
-  "version": "0.9.0",
+  "version": "0.9.3",
   "main": "./server/index.js",
   "directories": {
     "lib": "lib",

server/response.js

@@ -243,6 +243,9 @@ class Response {
       })
     })
     return null
+  }
+	end () {
+    this.socket.end()
   }
 }