Rework command runner

Author: un-def

.gitignore

@@ -8,4 +8,4 @@ nginx.pid
 
 *.sh
 !/tinysta.sh
-!/scripts/resty-runner.sh
+!/commands/command-runner.sh

.luacheckrc

@@ -1,6 +1,11 @@
-return {
-  std = 'ngx_lua',
-  exclude_files = {
-    'resty_modules/**',
-  },
+std = 'ngx_lua'
+exclude_files = {
+  'resty_modules/**',
+}
+files['commands'] = {
+    read_globals = {
+      'OPENRESTY_PREFIX',
+      'TINYSTASH_DIR',
+      'run_command',
+    },
 }

Dockerfile

@@ -6,7 +6,7 @@ RUN while read dep; do opm --cwd get "$dep"; done < /tmp/requirements.opm
 COPY app/ app/
 COPY static/ static/
 COPY templates/ templates/
-COPY scripts/ scripts/
+COPY commands/ commands/
 COPY tinysta.sh tinysta.sh
 COPY nginx.conf.tpl nginx.conf.tpl
 

commands/command-runner.sh

@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# inspired by resty-cli -- https://github.com/openresty/resty-cli
+
+die() {
+  test ${#} -ne 0 && echo "${@}"
+  exit 1
+}
+
+check_is_set() {
+  test -n "${2}" && return
+  die "${1} is not set"
+}
+
+check_is_set OPENRESTY_PREFIX "${OPENRESTY_PREFIX}"
+check_is_set TINYSTASH_DIR "${TINYSTASH_DIR}"
+test ${#} -ge 1 || die "usage: ${0} COMMAND [ARGS]"
+
+COMMANDS_DIR="${COMMANDS_DIR:-"${TINYSTASH_DIR}/commands"}"
+command_name=${1}
+shift
+
+nginx_root=$(mktemp -d)
+
+cleanup() {
+  rm -rf "${nginx_root}"
+  trap - EXIT
+}
+
+trap cleanup EXIT INT QUIT TERM HUP
+
+mkdir "${nginx_root}/logs"
+nginx_conf="${nginx_root}/nginx.conf"
+
+make_argv() {
+  echo "local argv = {"
+  while [ ${#} -ne 0 ]
+  do
+    echo "      [===[${1}]===],"
+    shift
+  done
+  echo "    }"
+}
+
+cat > "${nginx_conf}" << __EOF__
+daemon off;
+master_process off;
+worker_processes 1;
+pid logs/nginx.pid;
+env TINYSTASH_CONFIG_PATH;
+error_log stderr warn;
+events {
+  worker_connections 64;
+}
+http {
+  access_log off;
+  resolver 8.8.8.8 ipv6=off;
+  lua_package_path "${TINYSTASH_DIR}/?.lua;${TINYSTASH_DIR}/resty_modules/lualib/?.lua;;";
+  lua_package_cpath "${TINYSTASH_DIR}/resty_modules/lualib/?.so;;";
+  init_worker_by_lua_block {
+    _G.OPENRESTY_PREFIX = [===[${OPENRESTY_PREFIX}]===]
+    local TINYSTASH_DIR = [===[${TINYSTASH_DIR}]===]
+    _G.TINYSTASH_DIR = TINYSTASH_DIR
+    _G.print = function(...)
+      io.stdout:write(table.concat({...}))
+      io.stdout:write('\n')
+      io.stdout:flush()
+    end
+    local orig_error = error
+    _G.error = function(msg, lvl)
+      orig_error(msg, lvl or 0)
+    end
+    _G.run_command = function(command_name, argv)
+      local chunk, err = loadfile([===[${COMMANDS_DIR}]===] .. '/' .. command_name .. '.lua')
+      if not chunk then
+        return false, err
+      end
+      local ok, err = pcall(chunk, argv)
+      if not ok then
+        return false, err
+      end
+      return true
+    end
+    require('ngx.process').signal_graceful_exit()
+    ngx.timer.at(0, function()
+      local command_name = [===[${command_name}]===]
+      $(make_argv "${@}")
+      local ok, err = run_command(command_name, argv)
+      if not ok then
+        print(err)
+        os.exit(1)
+      end
+    end)
+  }
+}
+__EOF__
+
+"${OPENRESTY_PREFIX}/nginx/sbin/nginx" -c "${nginx_conf}" -p "${nginx_root}"

scripts/conf.lua renamed to commands/conf.lua

@@ -2,6 +2,9 @@ local compile_template = require('resty.template').compile
 
 local config = require('app.config').nginx_conf
 
+
+assert(OPENRESTY_PREFIX and OPENRESTY_PREFIX ~= '', 'OPENRESTY_PREFIX is not set')
+
 local NUMBER = type(1)
 local STRING = type('')
 local BOOLEAN = type(true)
@@ -26,7 +29,7 @@ local option = function(params)
   return value
 end
 
-local fd = assert(io.open(_G.TINYSTASH_DIR .. '/nginx.conf.tpl', 'r'))
+local fd = assert(io.open(TINYSTASH_DIR .. '/nginx.conf.tpl', 'r'))
 local template = assert(fd:read('*a'))
 fd:close()
 

scripts/webhook.lua renamed to commands/webhook.lua

@@ -9,13 +9,8 @@ local secret = config._processed.tg_webhook_secret
 local assume_yes = false
 local verbose = false
 
-local die = function(...)
-  print(...)
-  os.exit(1)
-end
-
 if not token then
-  die('Bad config: set tg.token')
+  error('Bad config: set tg.token')
 end
 
 local verbose_print = function(...)
@@ -41,20 +36,21 @@ Options:
                         - 'webhook_secret' (if any)
                         - 'token' if 'webhook_secret' not set
 ]])
-  os.exit(0)
 end
 
+local argv = ...
 local arguments = {}
-for _, argument in ipairs(arg) do
+for _, argument in ipairs(argv) do
   if argument:sub(1, 1) == '-' then
     if argument == '-h' then
       show_help()
+      return
     elseif argument == '-y' then
       assume_yes = true
     elseif argument == '-v' then
       verbose = true
     else
-      die('Invalid option: ', argument)
+      error('Invalid option: ', argument)
     end
   else
     table.insert(arguments, argument)
@@ -68,15 +64,15 @@ local ask = function()
   io.stdout:write('Are you sure (yes/no)? ')
   io.stdout:flush()
   if io.stdin:read() ~= 'yes' then
-    die('Abort')
+    error('Abort')
   end
 end
 
 local api_call = function(method, params)
   local httpc, res, err
   httpc, err = http.new()
   if not httpc then
-    die('TG API request error: ', err)
+    error('TG API request error: ', err)
   end
   httpc:set_timeout(10000)
   local uri = ('https://api.telegram.org/bot%s/%s'):format(token, method)
@@ -85,16 +81,16 @@ local api_call = function(method, params)
     ssl_verify = false,
   })
   if not res then
-    die('TG API request error: ', err)
+    error('TG API request error: ', err)
   end
   verbose_print('TG API response status: ', res.status)
   verbose_print('TG API response body: ', res.body)
   res, err = json.decode(res.body)
   if not res then
-    die('TG API response json decode error: ', err)
+    error('TG API response json decode error: ', err)
   end
   if not res.ok then
-    die('TG API response error: ', res.description)
+    error('TG API response error: ', res.description)
   end
   print('OK')
   if res.description then

nginx.conf.tpl

@@ -41,7 +41,7 @@ http {
     location /static/ {
       alias ./static/;
       try_files $uri =404;
-      include /usr/local/openresty/nginx/conf/mime.types;
+      include {* OPENRESTY_PREFIX *}/nginx/conf/mime.types;
     }
 
     location = /favicon.ico {

scripts/resty-runner.sh

@@ -1,16 +1,18 @@
 #!/bin/sh
 
-tinystash_dir=$(dirname "$(readlink -f "${0}")")
-nginx_conf="${tinystash_dir}/nginx.conf"
-scripts_dir="${tinystash_dir}/scripts"
-resty_runner="${scripts_dir}/resty-runner.sh"
-
-TINYSTASH_CONFIG_PATH=$(readlink -f "${TINYSTASH_CONFIG_PATH:-"${tinystash_dir}/config.lua"}")
+OPENRESTY_PREFIX=${OPENRESTY_PREFIX:-/usr/local/openresty}
+export OPENRESTY_PREFIX
+TINYSTASH_DIR=$(dirname "$(readlink -f "${0}")")
+export TINYSTASH_DIR
+TINYSTASH_CONFIG_PATH=$(readlink -f "${TINYSTASH_CONFIG_PATH:-"${TINYSTASH_DIR}/config.lua"}")
 export TINYSTASH_CONFIG_PATH
 
+command_runner="${TINYSTASH_DIR}/commands/command-runner.sh"
+nginx_conf="${TINYSTASH_DIR}/nginx.conf"
+
 usage() {
   echo "
-usage: ${0} COMMAND [COMMAND_ARGS ...]
+usage: ${0} COMMAND [ARGS]
 
 commands:
   run
@@ -31,17 +33,18 @@ case "${command}" in
   conf|webhook)
     echo "using config: ${TINYSTASH_CONFIG_PATH}"
     echo
-    exec "${resty_runner}" "${command}" "${@}"
+    exec "${command_runner}" "${command}" "${@}"
     ;;
   run)
     echo "using config: ${TINYSTASH_CONFIG_PATH}"
-    if ! nginx_conf_content=$("${resty_runner}" conf); then
+    echo
+    if ! nginx_conf_content=$("${command_runner}" conf); then
       echo "error while generating nginx.conf:"
       echo "${nginx_conf_content}"
       exit 2
     fi
     echo "${nginx_conf_content}" > "${nginx_conf}"
-    exec /usr/local/openresty/nginx/sbin/nginx -c "${nginx_conf}" -p "${tinystash_dir}"
+    exec "${OPENRESTY_PREFIX}/nginx/sbin/nginx" -c "${nginx_conf}" -p "${TINYSTASH_DIR}"
     ;;
   *)
     usage