feat(lua-resty-maxminddb): update version and enhance functionality

- Update version to 1.3.6
- Add support for string input in `geo.init()`
- Extract city name from filename for profile creation
- Update nginx configuration in Docker
- Improve error handling and logging

Author: anjia0532

.editorconfig

@@ -0,0 +1,20 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+
+# We recommend you to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+# Change these settings to your own preference
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false

docker/nginx.conf

@@ -5,11 +5,14 @@ events {
   worker_connections  10240;  ## Default: 1024
 }
 
+error_log /dev/stderr warn;
+
 http {
 
   sendfile     on;
   tcp_nopush   on;
   server_names_hash_bucket_size 128; # this seems to be required for some vhosts
+  access_log  /dev/stdout;
 
   server {
     listen 80;
@@ -31,6 +34,25 @@ http {
                 if ngx.var.arg_node then
                     ngx.say("node name:",ngx.var.arg_node," ,value:", cjson.encode(res[ngx.var.arg_node] or {}))
                 end
+                ngx.say("<br/>get_profiles :",cjson.encode(geo.get_profiles()))
+            }
+        }
+
+    location /old/ {
+            content_by_lua_block{
+                local cjson = require 'cjson'
+                local geo = require 'resty.maxminddb'
+                if not geo.initted() then
+                  geo.init("/opt/geoipupdate_data/GeoLite2-City.mmdb")
+                end
+                local res,err = geo.lookup(ngx.var.arg_ip or ngx.var.remote_addr,nil,ngx.var.arg_type or 'city') --support ipv6 e.g. 2001:4860:0:1001::3004:ef68
+
+                ngx.say("full :",cjson.encode(res))
+                if ngx.var.arg_node then
+                    ngx.say("node name:",ngx.var.arg_node," ,value:", cjson.encode(res[ngx.var.arg_node] or {}))
+                end
+
+                ngx.say("<br/>get_profiles :",cjson.encode(geo.get_profiles()))
             }
         }
     }

lib/resty/maxminddb.lua

@@ -26,7 +26,7 @@ local tab_nkeys     = require ('table.nkeys')
 
 local _D    ={}
 local _M    ={}
-_M._VERSION = '1.3.5'
+_M._VERSION = '1.3.6'
 local mt = { __index = _M }
 
 -- copy from https://github.com/lilien1010/lua-resty-maxminddb/blob/f96633e2428f8f7bcc1e2a7a28b747b33233a8db/resty/maxminddb.lua#L36-L126
@@ -175,7 +175,13 @@ local function gai_strerror(rc)
 end
 
 function _M.init(profiles)
-
+  if type(profiles) == 'string' then
+    local filename = profiles:match("([^/]+)%.mmdb$")
+    local city = filename:match("-(.+)$"):lower()
+    profiles = {
+      [city] = profiles
+    }
+  end
   for profile, location in pairs(profiles) do
 
     _D[profile] = {}

rockspec/lua-resty-maxminddb-1.3.6-1.rockspec

@@ -0,0 +1,44 @@
+package = "lua-resty-maxminddb"
+version = "1.3.6-1"
+supported_platforms = {"linux", "macosx"}
+
+source = {
+   url = "git://github.com/anjia0532/lua-resty-maxminddb",
+   tag = "v1.3.6"
+}
+
+description = {
+   summary = "About A Lua library for reading MaxMind's Geolocation database",
+   detailed = [[
+      lua-resty-maxminddb - A Lua library for reading MaxMind's Geolocation database format (aka mmdb or geoip2).
+   ]],
+   homepage = "https://github.com/anjia0532/lua-resty-maxminddb",
+   license = "Apache License 2.0"
+}
+dependencies = {
+   "lua >= 5.1, < 5.2"
+   -- If you depend on other rocks, add them here
+}
+build = {
+    type = "command",
+    build_command = [[
+        wget -O libmaxminddb-1.12.2.tar.gz \
+          https://github.com/maxmind/libmaxminddb/releases/download/1.12.2/libmaxminddb-1.12.2.tar.gz && \
+        tar zxf libmaxminddb-1.12.2.tar.gz && \
+          cd libmaxminddb-1.12.2 && \
+          ./configure && \
+          $(MAKE) -j && \
+          $(MAKE) check
+    ]],
+    install = {
+       lua = {
+           ["resty.maxminddb"] = "lib/resty/maxminddb.lua",
+       },
+       lib = {
+           ["libmaxminddb.so"] = "libmaxminddb-1.12.2/src/.libs/libmaxminddb.so.0.0.7",
+           ["libmaxminddb.so.0 "] = "libmaxminddb-1.12.2/src/.libs/libmaxminddb.so.0.0.7",
+           ["libmaxminddb.so.0.0.7"] = "libmaxminddb-1.12.2/src/.libs/libmaxminddb.so.0.0.7",
+       },
+    },
+    install_command = "cd libmaxminddb-1.12.2 && $(MAKE) install"
+}