itsi 0.1.14 → 0.1.19

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

@@ -3,45 +3,62 @@
 require_relative "server/version"
 require_relative "server/itsi_server"
 require_relative "server/rack_interface"
-require_relative "server/grpc_interface"
+require_relative "server/grpc/grpc_interface"
+require_relative "server/grpc/grpc_call"
 require_relative "server/scheduler_interface"
 require_relative "server/signal_trap"
+require_relative "server/route_tester"
 require_relative "server/rack/handler/itsi"
 require_relative "server/config"
+require_relative "server/typed_handlers"
 require_relative "standard_headers"
 require_relative "http_request"
 require_relative "http_response"
+require_relative "passfile"
+require_relative "../shell_completions/completions"
 
 module Itsi
   class Server
     extend RackInterface
     extend SchedulerInterface
+    extend RouteTester
 
     class << self
+
       def running?
         !!@running
       end
 
-      def start_in_background_thread(cli_params={}, itsi_file = Itsi::Server::Config.config_file_path, &blk)
-        @background_thread = start(cli_params, itsi_file, background: true, &blk)
+      def start_in_background_thread(cli_params = {}, &blk)
+        @background_thread = start(cli_params, background: true, &blk)
       end
 
-      def start(cli_params, itsi_file = Itsi::Server::Config.config_file_path, background: false, &blk)
+      def start(cli_params, background: false, &blk)
+        itsi_file = Itsi::Server::Config.config_file_path(cli_params[:config_file])
         server = new(cli_params, itsi_file, blk)
         previous_handler = Signal.trap(:INT, :DEFAULT)
         run = lambda do
           write_pid
           @running = server
           server.start
+          @running = false
           Signal.trap(:INT, previous_handler)
           server
         end
         background ? Thread.new(&run) : run[]
       end
 
+      def static(cli_params)
+        start(cli_params.merge(static: true))
+      end
+
+      def stop
+        return unless pid = get_pid
+        Process.kill(:INT, pid)
+      end
+
       def stop_background_thread
         @running&.stop
-        @running = nil
         @background_thread&.join
       end
 
@@ -54,16 +71,22 @@ module Itsi
         if Process.kill(0, pid)
           pid
         else
+          puts "No server running"
           nil
         end
       rescue StandardError
+        puts "No server running"
         nil
       end
 
+      def init
+        Config.write_default
+      end
+
       def reload
         return unless pid = get_pid
 
-        Process.kill(:USR2, pid)
+        Process.kill(:HUP, pid)
       end
 
       def restart
@@ -72,12 +95,29 @@ module Itsi
         Process.kill(:USR1, pid)
       end
 
-      def down
-        puts :down
-      end
+      def passfile(options, subcmd)
+        filename = options[:passfile]
+        unless filename
+          puts "Error: passfile not set. Use --passfile option to provide a path to a file containing hashed credentials."
+          puts "This file contains hashed credentials and should not be included in source control without additional protection."
+          exit(1)
+        end
+        algorithm = options.fetch(:algorithm, 'sha256')
 
-      def up
-        puts :up
+        unless %w[sha256 sha512 bcrypt argon2 none].include?(algorithm)
+          puts "Invalid algorithm"
+          exit(1)
+        end
+
+        case subcmd
+        when 'add', 'echo'
+          Passfile.send(subcmd, filename, algorithm)
+        when 'remove', 'list'
+          Passfile.send(subcmd, filename)
+        else
+          puts "Valid subcommands are: add | remove | list"
+          exit(0)
+        end
       end
 
       def add_worker
@@ -95,8 +135,38 @@ module Itsi
       def status
         return unless pid = get_pid
 
-        Process.kill(:INFO, pid)
+        Process.kill(:USR2, pid)
+      end
+
+      def load_route_middleware_stack(cli_params)
+        Config.build_config(cli_params, Itsi::Server::Config.config_file_path(cli_params[:config_file_path]))[
+          "middleware_loader"
+          ][]
+      end
+
+      def test_route(cli_params = {}, route_str)
+        matched_route = load_route_middleware_stack(cli_params).find do |route|
+          route["route"] =~ route_str
+        end
+        if matched_route
+          print_route(route_str, matched_route)
+        else
+          puts "No matching route found"
+        end
+      end
+
+      def routes(cli_params = {})
+        load_route_middleware_stack(cli_params).each do |stack|
+          routes = explode_route_pattern(stack["route"].source)
+          routes.each do |route|
+            print_route(route, stack)
+          end
+        end
+        puts "─" * 76
       end
+
+      alias serve start
+
     end
   end
 end

data/gems/server/lib/ruby_lsp/itsi/addon.rb

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+require "ruby_lsp/addon"
+puts "Here we go"
+module RubyLsp
+  module Itsi
+    class Addon < ::RubyLsp::Addon
+
+      def name
+        "Ruby LSP Itsi"
+      end
+
+      def version
+        "0.1.0"
+      end
+
+      def create_completion_listener(response_builder, node_context, dispatcher, uri)
+        return unless uri.to_s.end_with?("Itsi.rb")
+        @in_itsi_file = true
+        CompletionListener.new(response_builder, node_context, dispatcher, uri)
+      end
+
+      def create_hover_listener(response_builder, node_context, dispatcher)
+        hl =  dispatcher.listeners[:on_call_node_enter].find{|c| c.kind_of?(RubyLsp::Listeners::Hover)}
+
+        return unless hl.instance_variable_get("@path").to_s.end_with?("Itsi.rb")
+        HoverListener.new(response_builder, node_context, dispatcher)
+      end
+    end
+
+    class HoverListener
+      def initialize(response_builder, node_context, dispatcher)
+        @response_builder = response_builder
+        @node_context = node_context
+        @dispatcher = dispatcher
+
+        # Register for call nodes (you could also use other events if more appropriate)
+        dispatcher.register(self, :on_call_node_enter)
+      end
+
+      def on_call_node_enter(node)
+        # Check if this is the call for foo_bar; you might add additional logic if needed.
+        case node.message
+        when "log_level"
+          # Push a simple hover response.
+          @response_builder.push(
+            "Method **log_level**: A method that takes a single parameter `a`.",
+            category: :documentation
+          )
+        when "shutdown_timeout"
+          # Push a simple hover response.
+          @response_builder.push(
+            "Method **shutdown_timeout**: Number of seconds to wait for a graceful shutdown before forcefully shutting down.",
+            category: :documentation
+          )
+        when "log"
+          # Push a simple hover response.
+          @response_builder.push(
+            "Method **log**: A method that takes a single parameter `a`.",
+            category: :documentation
+          )
+        end
+      end
+    end
+
+    class CompletionListener
+      def initialize(response_builder, node_context, dispatcher, uri)
+        @response_builder = response_builder
+        @node_context = node_context
+        @uri = uri
+        @dispatcher = dispatcher
+
+        # Register for call nodes to handle method completions
+        dispatcher.register(self, :on_call_node_enter)
+      end
+
+      def on_call_node_enter(node)
+        # Only handle method calls that are being typed (no arguments yet)
+        return unless node.arguments.nil?
+        puts "Adding log level completion"
+        # Add our completion item
+        @response_builder << Interface::CompletionItem.new(
+          label: "log_level",
+          kind: Constant::CompletionItemKind::METHOD,
+          detail: "log_level a ",
+          documentation: "A method that takes a single parameter 'a'",
+          insert_text: "log_level ${1|:info,:debug,:warn,:error|}",
+          insert_text_format: Constant::InsertTextFormat::SNIPPET,
+        )
+
+        @response_builder << Interface::CompletionItem.new(
+          label: "bind",
+          kind: Constant::CompletionItemKind::METHOD,
+          detail: "Bind to an interface",
+          documentation: "A method that takes a single parameter 'a'",
+          insert_text: "bind ${1|'https://0.0.0.0','http://0.0.0.0','http://0.0.0.0:3000','https://0.0.0.0:3000','http://127.0.0.1','https://127.0.0.1'|}",
+          insert_text_format: Constant::InsertTextFormat::SNIPPET,
+        )
+
+        @response_builder << Interface::CompletionItem.new(
+          label: "log_format",
+          kind: Constant::CompletionItemKind::METHOD,
+          detail: "log_format",
+          documentation: "A method that takes a single parameter 'a'",
+          insert_text: "log_format ${1|:plain,:json,:auto|}",
+          insert_text_format: Constant::InsertTextFormat::SNIPPET,
+        )
+      end
+    end
+  end
+end

data/gems/server/lib/shell_completions/completions.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+if ARGV.include?('--install-completions')
+  # Try to get the next argument as the shell name.
+  shell = ARGV[ARGV.index('--install-completions') + 1] rescue nil
+  # Fallback: use the basename of the SHELL environment variable
+  shell ||= File.basename(ENV['SHELL'] || '')
+
+  case shell.downcase
+  when 'bash'
+    # Bash completion script
+    puts 'complete -W "$(itsi --completion)" itsi'
+  when 'zsh'
+    puts <<~ZSH
+      _itsi() {
+        local completions
+        completions=("${(@f)$(itsi --completion)}")
+        compadd -- $completions
+      }
+      compdef _itsi itsi
+    ZSH
+  else
+    warn "Unsupported shell: #{shell}. Please specify 'bash' or 'zsh'."
+  end
+  exit
+end

data/gems/server/test/helpers/test_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+ENV["ITSI_LOG"] = "off"
 
 require "minitest/reporters"
 require "itsi/server"
@@ -20,7 +21,7 @@ def run_app(app, protocol: "http", bind: free_bind(protocol), scheduler_class: n
     workers 1
     threads 1
     fiber_scheduler scheduler_class
-    log_level :error
+    log_level :warn
     run app
   end
 

data/lib/itsi/version.rb

@@ -1,3 +1,3 @@
 module Itsi
-  VERSION = '0.1.14'
+  VERSION = "0.1.19"
 end

data/sandbox/README.md

@@ -0,0 +1,5 @@
+# Sandbox
+
+This directory contains a sandbox of loose files and dummy projects for testing and experimenting with Itsi.
+
+Everything within is potentially subject to change or removal without notice.

data/sandbox/itsi_file/Gemfile

@@ -4,8 +4,10 @@ source 'https://rubygems.org'
 
 # gem "rails"
 
+# gem 'debug'
+gem 'grpc'
 gem 'itsi-scheduler', path: '../../gems/scheduler'
 gem 'itsi-server', path: '../../gems/server'
-
+gem 'rubocop'
+gem 'ruby-lsp'
 gem 'debug'
-gem 'grpc'

data/sandbox/itsi_file/Gemfile.lock

@@ -1,19 +1,21 @@
 PATH
   remote: ../../gems/scheduler
   specs:
-    itsi-scheduler (0.1.11)
+    itsi-scheduler (0.1.18)
       rb_sys (~> 0.9.91)
 
 PATH
   remote: ../../gems/server
   specs:
-    itsi-server (0.1.11)
+    itsi-server (0.1.18)
+      json (~> 2)
       rack (>= 1.6)
       rb_sys (~> 0.9.91)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.3)
     bigdecimal (3.1.9)
     date (3.4.1)
     debug (1.10.0)
@@ -34,26 +36,64 @@ GEM
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
     io-console (0.8.0)
-    irb (1.15.1)
+    irb (1.15.2)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
+    json (2.10.2)
+    language_server-protocol (3.17.0.4)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    parallel (1.26.3)
+    parser (3.3.7.4)
+      ast (~> 2.4.1)
+      racc
     pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
+    prism (1.4.0)
     psych (5.2.3)
       date
       stringio
+    racc (1.8.1)
     rack (3.1.12)
+    rainbow (3.1.1)
     rake (13.2.1)
     rake-compiler-dock (1.9.1)
     rb_sys (0.9.111)
       rake-compiler-dock (= 1.9.1)
-    rdoc (6.12.0)
+    rbs (3.9.2)
+      logger
+    rdoc (6.13.1)
       psych (>= 4.0.0)
-    reline (0.6.0)
+    regexp_parser (2.10.0)
+    reline (0.6.1)
       io-console (~> 0.5)
-    stringio (3.1.5)
+    rubocop (1.75.1)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.43.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.43.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    ruby-lsp (0.23.13)
+      language_server-protocol (~> 3.17.0)
+      prism (>= 1.2, < 2.0)
+      rbs (>= 3, < 4)
+      sorbet-runtime (>= 0.5.10782)
+    ruby-progressbar (1.13.0)
+    sorbet-runtime (0.5.11971)
+    stringio (3.1.6)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
 
 PLATFORMS
   arm64-darwin-23
@@ -64,6 +104,8 @@ DEPENDENCIES
   grpc
   itsi-scheduler!
   itsi-server!
+  rubocop
+  ruby-lsp
 
 BUNDLED WITH
    2.6.3