fix: set host in the context of port

Author: boltlessengineer

lua/rest-nvim/parser/init.lua

@@ -152,17 +152,17 @@ function parser.get_cursor_request_node()
   return node
 end
 
+---@param source Source
 ---@return TSNode[]
-function parser.get_all_request_node()
-  local source = 0
+function parser.get_all_request_nodes(source)
   local _, tree = utils.ts_parse_source(source)
-  local reqs = {}
+  local result = {}
   for node, _ in tree:root():iter_children() do
-    if node:type() == "request" then
-      table.insert(reqs, node)
+    if node:type() == "section" then
+      table.insert(result, node)
     end
   end
-  return reqs
+  return result
 end
 
 ---@return TSNode?
@@ -321,9 +321,17 @@ function parser.parse(node, source, ctx)
   end
 
   local headers = parse_headers(req_node, source, ctx)
-  -- HACK: check if url doesn't have host
   if headers["host"] and vim.startswith(url, "/") then
-    url = "http://" ..headers["host"][1]..url
+    local host = headers["host"][1]
+    if not host:match("^https?://") then
+      local port = host:match(":(%d%d+)$")
+      local protocol = "http://"
+      if not port or port == "443" then
+        protocol = "https://"
+      end
+      host = protocol .. host
+    end
+    url = host..url
     table.remove(headers["host"], 1)
   end
   ---@type rest.Request

lua/rest-nvim/request.lua

@@ -153,7 +153,7 @@ end
 
 ---run all requests in current file with same context
 function M.run_all()
-  local reqs = parser.get_all_request_node()
+  local reqs = parser.get_all_request_nodes()
   local ctx = parser.create_context(0)
   for _, req_node in ipairs(reqs) do
     local req = parser.parse(req_node, 0, ctx)

spec/examples/url_without_host.http

@@ -0,0 +1,15 @@
+### host with non-secure port
+GET /api
+HOST: example.com:8080
+
+### host with secure port
+GET /api
+HOST: example.com:443
+
+### host with protocol
+GET /api
+HOST: http://example.com
+
+### host without protocol
+GET /api
+HOST: example.com

spec/examples_spec.lua

@@ -17,7 +17,38 @@ describe("multi-line-url", function ()
     local _, tree = utils.ts_parse_source(source)
     local req_node = assert(tree:root():child(0))
     local req = parser.parse(req_node, source)
-    assert(req)
+    assert.not_nil(req)
+    ---@cast req rest.Request
     assert.same("http://example.com:8080/api/html/get?id=123&value=content", req.url)
   end)
 end)
+
+describe("url without host", function ()
+  local source = open("spec/examples/url_without_host.http")
+  local req_nodes = parser.get_all_request_nodes(source)
+  assert.same(4, #req_nodes)
+  it("host with non-secure port", function ()
+    local req = parser.parse(req_nodes[1], source)
+    assert.not_nil(req)
+    ---@cast req rest.Request
+    assert.same("http://example.com:8080/api", req.url)
+  end)
+  it("host with secure port", function ()
+    local req = parser.parse(req_nodes[2], source)
+    assert.not_nil(req)
+    ---@cast req rest.Request
+    assert.same("https://example.com:443/api", req.url)
+  end)
+  it("host with protocol", function ()
+    local req = parser.parse(req_nodes[3], source)
+    assert.not_nil(req)
+    ---@cast req rest.Request
+    assert.same("http://example.com/api", req.url)
+  end)
+  it("host without protocol", function ()
+    local req = parser.parse(req_nodes[4], source)
+    assert.not_nil(req)
+    ---@cast req rest.Request
+    assert.same("https://example.com/api", req.url)
+  end)
+end)