resty http client handles errors, is used by default in the nginx context

Author: leafo

lapis/http.lua

@@ -1,5 +1,9 @@
 if ngx then
-  return require("lapis.nginx.http")
+  if ngx.config and ngx.config.is_console then
+    return require("lapis.nginx.resty_http")
+  else
+    return require("lapis.nginx.http")
+  end
 elseif package.loaded["lapis.running_server"] == "cqueues" then
   return require("http.compat.socket")
 else

lapis/http.moon

@@ -1,5 +1,9 @@
 if ngx
-  require "lapis.nginx.http"
+  if ngx.config and ngx.config.is_console
+    -- the "location capture" client is not compatible with resty
+    require "lapis.nginx.resty_http"
+  else
+    require "lapis.nginx.http"
 elseif package.loaded["lapis.running_server"] == "cqueues"
   require "http.compat.socket"
 else

lapis/nginx/resty_http.lua

@@ -1,6 +1,17 @@
 local lapis_config = require("lapis.config")
 local increment_perf
 increment_perf = require("lapis.nginx.context").increment_perf
+local wrap_source
+wrap_source = function(source)
+  return function()
+    local chunk, err = source()
+    if err then
+      ngx.log(ngx.ERR, "source error: ", err)
+      return nil
+    end
+    return chunk
+  end
+end
 local request
 request = function(url, str_body)
   local http = require("resty.http")
@@ -30,7 +41,7 @@ request = function(url, str_body)
   local res, err = httpc:request_uri(req.url, {
     method = req.method,
     headers = req.headers,
-    body = req.source,
+    body = req.source and wrap_source(req.source),
     ssl_verify = true
   })
   if not (res) then

lapis/nginx/resty_http.moon

@@ -1,14 +1,29 @@
 
 -- This implements a basic LuaSocket's http.request interface using lua-resty-http.
+-- Dependencies:
+--   luarocks install lua-resty-http
+--   luarocks install lua-resty-openssl
 --
 -- Usage:
 --   http = require "lapis.nginx.resty_http"
 --   body, status, headers = http.request("http://example.com")
+--
+-- From resty:
+--   resty --http-conf "lua_ssl_trusted_certificate /etc/ssl/certs/ca-certificates.crt; lua_ssl_verify_depth 2;" -e 'print(require("lapis.http").request("https://leafo.net"))'
 
 lapis_config = require "lapis.config"
 
 import increment_perf from require "lapis.nginx.context"
 
+-- convert ltn12 source to a function that resty.http can use without swalling up any error messages
+wrap_source = (source) ->
+  ->
+    chunk, err = source!
+    if err
+      ngx.log ngx.ERR, "source error: ", err
+      return nil
+    chunk
+
 ---Make an HTTP request using lua-resty-http
 ---@param url string|table URL string or request table with url, method, source, sink, headers fields
 ---@param str_body string? Request body for simple POST requests
@@ -44,7 +59,7 @@ request = (url, str_body) ->
   res, err = httpc\request_uri req.url, {
     method: req.method
     headers: req.headers
-    body: req.source -- ltn12 source is compatible as body iterator; caller provides Content-Length header if needed
+    body: req.source and wrap_source req.source
     ssl_verify: true
   }