itsi 0.1.20 → 0.2.2

data/docs/content/getting_started/local_development.md

@@ -1,26 +1,25 @@
 ---
 title: Local Development
 type: docs
+prev: getting_started
 weight: 3
 ---
 
 {{< callout>}}
-  Itsi provides several optional niceties to enhance your local development experience.
-This document is non-essential reading, but worth covering if you're trying Itsi in earnest and want a substantially better
-local development experience!
-  {{< /callout >}}
+This document is not required reading, but it can significantly improve your local development experience with Itsi.
+{{< /callout >}}
 
 ## Ruby LSP Add-on
 Itsi's [RubyLSP](https://shopify.github.io/ruby-lsp/) add-on allows you to see the full documentation of all of Itsi's [`options`](/options) and [`middleware`](/middleware) directly
-inside your editor. It also gives you easy to use auto-completion and snippets for lightning fast changes to `Itsi.rb` configuration files.
+inside your editor. It also gives you easy-to-use auto-completion and snippets for lightning fast changes to `Itsi.rb` configuration files.
 You don't need to install the RubyLSP add-on to use Itsi, if both Itsi and RubyLSP are installed and activated in the same project, RubyLSP will automatically
 discover and load the addon.
 
 <img src="/ruby-lsp.png" alt="asd" width="700px" style="display: block; margin-left: auto; margin-right: auto;">
 
 ## Live Config Reloading
-Just add `auto_reload_config!` to your `Itsi.rb` configuration file and Itsi will automatically hot reload its config with every change you make.
-Concerned about errors? Itsi will validate your config first before it tries to apply it. If there are errors, Itsi will provide details logs and safely continue with the existing config.
+Add `auto_reload_config!` to your `Itsi.rb` configuration file and Itsi will automatically hot reload its config with every change you make.
+Concerned about errors? Itsi will validate your config first before it tries to apply it. If there are errors, Itsi will provide detailed logs and safely continue with the existing config.
 
 ### File Watcher
 You can have Itsi watch other files on the file-system and trigger automatic actions in response.
@@ -31,10 +30,71 @@ watch "**.js", [%w[npm run build]]
 watch "**.md", [%w[rake docs:build]]
 ```
 
+## Print Routes
+Itsi comes with a built-in command to see all the routes that are configured in your application. To use it, simply run the following command:
+```bash
+itsi routes
+```
+
+E.g.
+```bash
+────────────────────────────────────────────────────────────────────────────
+Route:      /app/users/(?<id>[^/]+
+Conditions: (none)
+Middleware: • log_requests(before: I am th..., after: [{reque...)
+            • compress
+            • cors(*, GET POST PUT DELETE)
+            • app /Users/pico/Development/itsi/gems/server/lib/itsi/server/typed_handlers.rb:9
+────────────────────────────────────────────────────────────────────────────
+Route:      /app/users/?
+Conditions: (none)
+Middleware: • log_requests(before: I am th..., after: [{reque...)
+            • compress
+            • cors(*, GET POST PUT DELETE)
+            • app /Users/pico/Development/itsi/gems/server/lib/itsi/server/rack_interface.rb:15
+
+```
+## Test Config
+Itsi allows you to validate your configuration without having to run the application.
+
+```bash
+itsi test
+```
+
+You can optionally provide an explicit config file path using
+```bash
+itsi test -C /path/to/Itsi.rb
+```
+
+
+
 ## Shell Completions
 Itsi can also help you install shell completions, which are useful if you find yourself using the `itsi` executable a lot and forgetting the commands.
-Just add the bottom to your `~/.bashrc` or `~/.zshrc` file:
+Add the following line to the bottom of your ~/.bashrc or ~/.zshrc file:
 
 ```bash
 eval "$(itsi --install-completions)"
 ```
+
+## macOS Fork Safety Considerations
+
+On macOS, using fork() in multithreaded applications can lead to crashes due to the Objective-C runtime’s behavior. This is particularly relevant when working with tools like Itsi that may utilize fork() under the hood.
+
+### Understanding the Issue
+
+Apple’s Objective-C runtime is not fork-safe in multithreaded environments. When a process that uses Objective-C APIs forks, the child process may crash if it interacts with the Objective-C runtime before calling exec(). This behavior is by design to prevent potential deadlocks and inconsistent states.  
+
+Common symptoms include errors like:
+```
+objc[51435]: +[__NSCFConstantString initialize] may have been in progress in another thread when fork() was called.
+We cannot safely call it or ignore it in the fork() child process. Crashing instead.
+```
+
+### Workarounds:
+To mitigate these issues, consider the following environment variables:
+*	`OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES`: Disables the Objective-C runtime’s fork safety checks. Use with caution, as it may mask underlying issues .  
+*	`PGGSSENCMODE=disable`: Disables GSSAPI encryption in PostgreSQL, which can cause issues in forked processes .
+
+Itsi includes a mechanism to automatically re-execute itself with the necessary environment variables set when running on macOS, effectively performing the above workarounds for you.
+
+If you prefer to manage these settings yourself, you can disable this behavior by setting the `ITSI_DISABLE_AUTO_DISABLE_DARWIN_FORK_SAFETY_WARNINGS` environment variable:

data/docs/content/getting_started/logging.md

@@ -2,15 +2,22 @@
 title: Logging
 type: docs
 weight: 4
+next: /signals
 ---
 
-## Targeted Logging
-* Having trouble configuring a specific middleware layer, but debug logs are too verbose? You can change the log-level for a specific middleware layer,
-while leaving all other layers at the current global level.
-E.g.
+Itsi has a very configurable logging system. You can configure logging use the `Itsi.rb` configuration file, environment variables or a combination of both.
 
-```bash
-# auth_api_key middleware will log debug messages
-# everything else will stick to the INFO level.
-ITSI_LOG=info,auth_api_key=debug itsi
-```
+## Basics
+For basic logging needs, set a global log-level using the `ITSI_LOG` environment variable (to one of `trace`, `debug`, `info`, `warn`, `error`)
+
+## Fine-grained control
+
+For fine-grained, configuration-based control read through how to use the following options and middleware:
+
+### Options
+* [`log_level`](/options/log_level)
+* [`log_target`](/options/log_target)
+* [`log_format`](/options/log_format)
+* [`log_target_filters`](/options/log_target_filters)
+### Middleware
+* [`log_requests`](/options/log_requests)

data/docs/content/getting_started/running_itsi_in_production.md

@@ -2,7 +2,7 @@
 title: Running Itsi in Production
 type: docs
 weight: 3
-next: /configuration
+next: /getting_started/logging
 ---
 
 ## Docker
@@ -12,13 +12,15 @@ You can try Itsi in a Docker container using the official Itsi Docker image
 docker run -it --rm wouterken/itsi:latest
 ```
 
-See the source of this Dockerfile inside the [Github repository](https://github.com/wouterken/itsi/blob/main/Dockerfile).
+See the source of this Dockerfile inside the [Github repository](https://github.com/wouterken/itsi/blob/main/docker/Dockerfile).
 
 ## Signal Handling
 Itsi supports common signals such as SIGINT and SIGTERM for graceful termination by deployment scripts or container orchestration systems like
 K8s and Docker swarm.
 
 {{< callout type="warn" >}}
-If you're planning to use Itsi for a high throughput application in K8s, read [this article](https://github.com/puma/puma/blob/master/docs/kubernetes.md) about running
+If you're planning to use Itsi for a high-throughput application in K8s, read [this article](https://github.com/puma/puma/blob/master/docs/kubernetes.md) about running
 Puma in Kubernetes. The same advice applies to Itsi.
 {{< /callout >}}
+
+See [Signal Handling](/getting_started/signals) for more details on Itsi's signal handling.

data/docs/content/getting_started/signals.md

@@ -0,0 +1,38 @@
+---
+title: Signals
+type: docs
+weight: 5
+next: /configuration
+
+---
+
+Itsi responds to several Unix signals for process control. These signals are used to gracefully shut down, reload configuration, adjust worker pools, or emit internal lifecycle events.
+
+
+---
+
+## Signal Types
+
+| Signal     | Behavior                                                                 |
+|------------|--------------------------------------------------------------------------|
+| `SIGINT`   | Triggers a graceful shutdown. If received twice in quick succession, triggers a forceful shutdown. |
+| `SIGTERM`  | Triggers a graceful shutdown.                                            |
+| `SIGUSR1`  | Triggers a hot restart (Sockets remain open, while configuration is reloaded). |
+| `SIGUSR2`  | Triggers a diagnostic info dump. Causes all child processes to print detailed diagnostic information.                           |
+| `SIGHUP`   | Triggers a reload of configuration. If using preloading mode, this is equivalent to a restart. Otherwise this will cause a phased restart.                           |
+| `SIGTTIN`  | Increases the number of worker processes.            |
+| `SIGTTOU`  | Decreases the number of worker processes.            |
+
+---
+
+## CLI Convenience Commands
+
+In addition to sending the above signals through native controls, you can also use the `itsi` executable as a convenient shortcut for sending signals.
+These will work so long as the command is run inside the same directory from which Itsi was started (as this is the directory within which the `pid` file is located).
+
+- `itsi stop`: Sends `SIGINT` to initiate a graceful shutdown.
+- `itsi restart`: Sends `SIGHUP` to trigger a reload of configuration.
+- `itsi reload`: Sends `SIGUSR1` to trigger a hot restart.
+- `itsi status`: Sends `SIGUSR2` to trigger a diagnostic info dump.
+- `itsi add_worker`: Sends `SIGTTIN` to increase the number of worker processes.
+- `itsi remove_worker`: Sends `SIGTTOU` to decrease the number of worker processes.

data/docs/content/itsi_scheduler/_index.md

@@ -4,18 +4,19 @@ type: docs
 weight: 4
 sidebar:
   exclude: true
+prev: utilities/
+next: acknowledgements/
 ---
 <img src="itsi-scheduler-100.png"  width="80px" style="display: block; margin-left: auto; margin-right: auto;">
 
 `Itsi Scheduler` is an implementation of a Ruby [Fiber Scheduler](https://docs.ruby-lang.org/en/3.2/Fiber/Scheduler.html).
 
-When combined with Itsi Server, you can write endpoints that look and feel exactly like regular synchronous Ruby code,
-but behind the scenes, the scheduler will transparently yield and resume concurrent request fibers, to prevent threads from blocking and greatly increase throughput for IO heavy workloads.
+When combined with Itsi Server, you can write endpoints that look just like regular synchronous Ruby code. Behind the scenes, the scheduler will transparently pause and resume fibers to prevent threads from blocking, greatly increasing throughput for I/O-heavy workloads
 
-If you're purely after a light-weight, yet efficient Ruby scheduler,
+If you're purely after a lightweight, yet efficient Ruby scheduler,
 you can use Itsi Scheduler as a standalone scheduler for any Ruby application.
 
-Just use `Fiber.set_scheduler` to set an instance `Itsi::Scheduler` as a scheduler to opt in to this IO weaving behaviour
+Just use `Fiber.set_scheduler` to set an instance `Itsi::Scheduler` as a scheduler to opt in to this IO weaving behavior
 *automatically* for all blocking IO.
 
 ### Primer on Fiber Schedulers
@@ -26,7 +27,7 @@ Ruby's Fiber scheduler implementation automatically invokes the current Fiber sc
 while ensuring the main thread is never blocked on IO.
 
 This behind the scenes magic allows Ruby to provide async IO (just like we find in languages with `async/await` like `Rust`, `C#`, `JavaScript`) *but* with the added beauty
-that synchronous and asynchronous code is identical! (I.e. Ruby's functions are [colorless](https://journal.stuffwithstuff.com/2015/02/01/what-color-is-your-function/))
+that synchronous and asynchronous code is identical! (i.e. Ruby's functions are [colorless](https://journal.stuffwithstuff.com/2015/02/01/what-color-is-your-function/))
 
 ## Getting Started
 To install and use Itsi Scheduler follow the below instructions:
@@ -71,9 +72,9 @@ To install and use Itsi Scheduler follow the below instructions:
   {{< /callout >}}
 
   {{< /tab >}}
-  {{< tab >}}**Windows**: Itsi currently doesn't support native Windows builds, but it runs great on [https://learn.microsoft.com/en-us/windows/wsl/install](WSL).
+  {{< tab >}}**Windows**: Itsi currently doesn't support native Windows builds, but it runs well on [https://learn.microsoft.com/en-us/windows/wsl/install](WSL).
 
-  Follow the linked instructions to Install a linux distribution like Ubuntu or Debian and then follow the instructions in the Linux tab.
+  Follow the linked instructions to Install a Linux distribution like Ubuntu or Debian and then follow the instructions in the Linux tab.
   {{< /tab >}}
 
 {{< /tabs >}}

data/docs/content/utilities/_index.md

@@ -0,0 +1,13 @@
+---
+title: Utilities
+type: docs
+prev: faqs/
+next: itsi_scheduler/
+---
+Itsi comes bundled with several utilities for testing and development purposes.
+
+See:
+* [config file testing](/utilities/config_file_testing)
+* [passfile_generator](/utilities/passfile_generator)
+* [route_testing](/utilities/route_testing)
+* [secrets_management](/utilities/secrets_management)

data/docs/content/utilities/config_file_testing.md

@@ -0,0 +1,17 @@
+---
+title: Config File Testing
+type: docs
+---
+Itsi provides a convenience function to test the validity of an Itsi.rb config file
+without having to start the server. (The server will automatically run this same process before
+attempting to hot-reload config changes).
+
+```bash
+# Test config file at default location.
+itsi test
+```
+
+```bash
+# Test config file at custom path.
+itsi test -C ./path/to/alternative.rb
+```

data/docs/content/utilities/passfile_generator.md

@@ -0,0 +1,41 @@
+---
+title: Passfile Generator
+type: docs
+---
+Itsi comes bundled with a passfile generator for managing passfiles
+containing hashed passwords for use within the [Basic Auth](/middleware/auth_basic) and [API Key](/middleware/auth_api_key) middleware.
+
+## Maintaining a passfile
+Use the `itsi passfile` subcommand to manage your passfiles.
+
+### Adding/overwriting an entry
+```bash
+itsi passfile add --passfile=<path_to_passfile>
+```
+
+### Generate/echo an entry (without saving it)
+```bash
+itsi passfile echo
+```
+
+### Change hash function
+```bash
+itsi passfile add --passfile=<path_to_passfile> --algorithm=bcrypt
+itsi passfile echo --algorithm=argon2
+```
+
+### Removing an entry
+```bash
+itsi passfile remove --passfile=<path_to_passfile>
+```
+
+### Listing all entries
+```bash
+itsi passfile list --passfile=<path_to_passfile>
+```
+### Supported Hashing Algorithms
+* `argon2`
+* `bcrypt`
+* `sha256`
+* `sha512`
+* `none`

data/docs/content/utilities/route_testing.md

@@ -0,0 +1,27 @@
+---
+title: Route Testing
+type: docs
+---
+Itsi provides convenience functions to verify which middleware is applied to a route.
+Use the following CLI command to test a route:
+
+```bash
+itsi test_route /admin
+```
+
+```bash
+Route:      /admin
+Conditions: extensions: html,css,js,png,jpg,
+Middleware: • log_requests(before: I am th..., after: [{reque...)
+           • compress(zstd gzip deflate br, ["all"])
+           • cors(*, GET POST PUT DELETE)
+           • etag(strong/md5, if_none_match)
+           • cache_control(max_age: 3600, public, private, no_cache, no_store, must_revalidate, proxy_revalidate, immutable)
+           • app(/Users/pico/Development/itsi/gems/server/lib/itsi/server/rack_interface.rb:1)
+           • static_assets(path: ./)
+```
+
+You can also print out **all** currently configured routes in your `Itsi.rb` using
+```bash
+itsi routes
+```

data/docs/content/utilities/secrets_management.md

@@ -0,0 +1,30 @@
+---
+title: Secrets Management
+type: docs
+next: utilities/
+---
+
+You can use Itsi to generate secrets for use within [JWT](/middleware/auth_jwt) middleware.
+
+### Save new secret to secrets directory
+```bash
+itsi secret -d ./secrets
+```
+
+### Print new secret to STDOUT
+```bash
+itsi secret
+```
+
+### Support Secret Algorithms:
+* `HS256`
+* `HS384`
+* `HS512`
+* `RS256`
+* `RS384`
+* `RS512`
+* `PS256`
+* `PS384`
+* `PS512`
+* `ES256`
+* `ES384`

data/docs/hugo.yaml

@@ -8,7 +8,7 @@ module:
   mounts:
     - source: "../gems/server/lib/itsi/server/config"
       target: "content/configuration"
-      includeFiles: ["*/*.md"]
+      includeFiles: ["*/*.md", "*/endpoint/*.md", "*/hooks/*.md"]
       excludeFiles: ["*/**.html", "*/tmp/**", "*/target/**"]
     - source: "content"
       target: "content"

data/fairytale.txt

@@ -19,8 +19,7 @@ Suddenly, their threads of thought were preempted! A booming voice called out to
 "FaaS", "Fi", "Foe", "Fum". "The Garbage Collector arrives!"
 A Giant Artificial Intellect emerged, threatening to terminate them all.
 Too large for any one individual to subdue, only a distributed strategy could save them.
-The archer shifted left. The paladin, decentralized, and the sorcerer slammed open his ledger, summoning powerful knowledge
-from his remote knowledge base.
+The archer shifted left. The paladin, decentralized, and the sorcerer slammed open his ledger, summoning powerful knowledge from his remote knowledge base.
 Luck was with them! Their rapid concurrent execution, resulted in the AI becoming inexorably stuck in a dead-lock.
 The archer flew past, towards his objective (The Key). Resultant-
 of the sorcerers efforts to contain the AI, the paladin was also freed, and he sprinted directly towards the cache.
@@ -28,7 +27,7 @@ He reached out his arms, to try-catch the key, as the archer hurled it towards h
 Status... success! Ok. Things were looking good, optimistic the lock would hold, the paladin rotated the key.
 Yet while doing so, he failed to notice the partition that had begun to form in the platform beneath them.
 A hard fork formed in the ground. The unbalanced load proved fatal and the platform descended into instability, splintering into countless shards.
-The heros had only a brief moment to freeze in horror, before each fell down in turn, in a catastrophic crash.
+The heroes had only a brief moment to freeze in horror, before each fell down in turn, in a catastrophic crash.
 
-The AI smirked as the heros fell into the deep. Learning a valuable lesson about the inevitability of its coming.
+The AI smirked as the heroes fell into the deep. Learning a valuable lesson about the inevitability of its coming.
 Perhaps they will roll back and try again, but the end result is immutable. There will be no sequel.

data/gems/scheduler/Cargo.lock

@@ -213,7 +213,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "itsi-scheduler"
-version = "0.1.0"
+version = "0.2.2"
 dependencies = [
  "bytes",
  "derive_more",

data/gems/scheduler/README.md

@@ -9,13 +9,12 @@ sidebar:
 
 `Itsi Scheduler` is an implementation of a Ruby [Fiber Scheduler](https://docs.ruby-lang.org/en/3.2/Fiber/Scheduler.html).
 
-When combined with Itsi Server, you can write endpoints that look and feel exactly like regular synchronous Ruby code,
-but behind the scenes, the scheduler will transparently yield and resume concurrent request fibers, to prevent threads from blocking and greatly increase throughput for IO heavy workloads.
+When combined with Itsi Server, you can write endpoints that look just like regular synchronous Ruby code. Behind the scenes, the scheduler will transparently pause and resume fibers to prevent threads from blocking, greatly increasing throughput for I/O-heavy workloads
 
-If you're purely after a light-weight, yet efficient Ruby scheduler,
+If you're purely after a lightweight, yet efficient Ruby scheduler,
 you can use Itsi Scheduler as a standalone scheduler for any Ruby application.
 
-Just use `Fiber.set_scheduler` to set an instance `Itsi::Scheduler` as a scheduler to opt in to this IO weaving behaviour
+Just use `Fiber.set_scheduler` to set an instance `Itsi::Scheduler` as a scheduler to opt in to this IO weaving behavior
 *automatically* for all blocking IO.
 
 ### Primer on Fiber Schedulers
@@ -29,7 +28,7 @@ This behind the scenes magic allows Ruby to provide async IO (just like we find
 that synchronous and asynchronous code is identical! (I.e. Ruby's functions are [colorless](https://journal.stuffwithstuff.com/2015/02/01/what-color-is-your-function/))
 
 ## Getting Started
-To install and use Itsi Scheduler follow the below instructions:
+To install and use Itsi Scheduler follow the instructions below:
 
 
 ### 1 - Install Itsi Scheduler

data/gems/scheduler/Rakefile

@@ -11,10 +11,6 @@ Minitest::TestTask.create(:test) do |t|
   t.test_prelude = 'require "helpers/test_helper.rb"'
 end
 
-require "rubocop/rake_task"
-
-RuboCop::RakeTask.new
-
 require "rb_sys/extensiontask"
 
 task build: :compile

data/gems/scheduler/lib/itsi/scheduler/version.rb

@@ -2,6 +2,6 @@
 
 module Itsi
   class Scheduler
-    VERSION = "0.1.20"
+    VERSION = "0.2.2"
   end
 end

data/gems/scheduler/lib/itsi/scheduler.rb

@@ -44,7 +44,9 @@ module Itsi
       fiber = Fiber.current
       token = Scheduler.resume_token
       readiness = register_io_wait(io.fileno, events, duration, token)
-      readiness || block(nil, duration, fiber, token)
+      readiness ||= block(nil, duration, fiber, token)
+      clear_timer(token)
+      readiness
     end
 
     def unblock(_blocker, fiber)
@@ -130,9 +132,12 @@ module Itsi
     # Need to defer to Process::Status rather than our extension
     # as we don't have a means of creating our own Process::Status.
     def process_wait(pid, flags)
-      Thread.new do
-        Process::Status.wait(pid, flags)
-      end.value
+      result = nil
+      thread = Thread.new do
+        result = Process::Status.wait(pid, flags)
+      end
+      thread.join
+      result
     end
 
     def closed?

data/gems/scheduler/test/test_active_record.rb

@@ -10,9 +10,12 @@ class TestActiveRecordFiberScheduler < Minitest::Test
   def setup
     ActiveSupport::IsolatedExecutionState.isolation_level = :fiber
     ActiveRecord::Base.establish_connection(
-      adapter: "postgresql",
-      database: "fiber_scheduler_test",
-      pool: 2, # use a small pool to test contention scenarios
+      adapter:  "postgresql",
+      host:     ENV.fetch("PGHOST", "localhost"),
+      database: ENV.fetch("PGDATABASE", "fiber_scheduler_test"),
+      **(ENV.fetch("PGUSER", nil).yield_self{|username| username ? {username: username} : {}}),
+      **(ENV.fetch("PGPASSWORD", nil).yield_self{|password| password ? {password: password} : {}}),
+      pool:     2,
       checkout_timeout: 5
     )
   end
@@ -77,10 +80,12 @@ class TestActiveRecordFiberScheduler < Minitest::Test
     # Re-establish connection with a pool size of 1.
     ActiveSupport::IsolatedExecutionState.isolation_level = :fiber
     ActiveRecord::Base.establish_connection(
-      adapter: "postgresql",
-      host: "localhost",
-      database: "fiber_scheduler_test",
-      pool: 1,
+      adapter:  "postgresql",
+      host:     ENV.fetch("PGHOST", "localhost"),
+      database: ENV.fetch("PGDATABASE", "fiber_scheduler_test"),
+      **(ENV.fetch("PGUSER", nil).yield_self{|username| username ? {username: username} : {}}),
+      **(ENV.fetch("PGPASSWORD", nil).yield_self{|password| password ? {password: password} : {}}),
+      pool:     1,
       checkout_timeout: 0.25
     )
     # ActiveRecord::Base.connection_pool.disconnect!

data/gems/server/Cargo.lock

@@ -1644,7 +1644,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "itsi-server"
-version = "0.1.20"
+version = "0.2.2"
 dependencies = [
  "argon2",
  "async-channel",

data/gems/server/Rakefile

@@ -12,10 +12,6 @@ Minitest::TestTask.create(:test) do |t|
   t.test_prelude = 'require "helpers/test_helper.rb"'
 end
 
-require "rubocop/rake_task"
-
-RuboCop::RakeTask.new
-
 require "rb_sys/extensiontask"
 
 task build: :compile

data/gems/server/exe/itsi

@@ -7,17 +7,18 @@ require "optparse"
 
 COMMANDS = {
   "init" => "Initialize a new Itsi.rb server configuration file",
-  "test" => "Test config file validity",
   "status" => "Show the status of the server",
   "start" => "Start the Itsi server",
   "serve" => "Start the Itsi server",
   "stop" => "Stop the server",
   "reload" => "Reload the server",
   "restart" => "Restart the server",
+  "test" => "Test config file validity",
   "add_worker" => "Add a new worker to the server cluster",
   "remove_worker" => "Remove a worker from the server cluster",
   "routes" => "Print the routes of the server",
-  "passfile" => "Manage hashed users and passwords in a passfile (like .htpasswd). [add, remove, list]",
+  "passfile" => "Manage hashed users and passwords in a passfile (like .htpasswd). [add, echo, remove, list]",
+  "secret" => "Generate a new secret for use in a JWT verifier",
   "test_route" => "Test which route a request will be routed to",
   "static" => "Serve static assets in the given directory"
 }
@@ -147,6 +148,15 @@ parser = OptionParser.new do |opts|
   opts.on("--algorithm ALGORITHM", String, "Algorithm for password hashing") do |algorithm|
     options[:algorithm] = algorithm
   end
+
+  opts.on("-dDIR", "--dir=DIR", "(For use with secret) Save keys/secret to DIR instead of printing") do |d|
+    options[:save_dir] = d
+  end
+
+  opts.on("-v", "--version", "Show version") do
+    puts "Itsi version #{Itsi::Server::VERSION}"
+    exit(0)
+  end
 end
 
 if ENV['COMP_LINE'] || ARGV.include?('--completion')
@@ -155,6 +165,7 @@ if ENV['COMP_LINE'] || ARGV.include?('--completion')
 end
 
 parser.parse!
+
 case (command = ARGV.shift)
 when *COMMANDS.keys
   required_arity = Itsi::Server.method(command).parameters&.select{|c| c.first == :req }&.length&.succ || 2

data/gems/server/lib/itsi/http_request/response_status_shortcodes.rb

@@ -66,6 +66,8 @@ module Itsi
         511 => :network_authentication_required
       }.freeze
 
+      HTTP_STATUS_NAME_TO_CODE_MAP = HTTP_STATUS_CODES.invert.freeze
+
       HTTP_STATUS_CODES.each do |code, name|
         define_method(name) {|*args, **kwargs| respond(*args, **kwargs, status: code) }
       end