inigorb 0.28.2 → 0.28.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fa6d93ec038b16c987dac7ef34b9a3f61efffb1818c11c24071d528285783b6
-  data.tar.gz: 6765b719877cfbf7c9f3c85000bed612d41254dcf4ae72c7defacc6826dd7f7a
+  metadata.gz: 1e8a004dcd749886d4a48645b606cccc589a9b32c3ea93e4bf2b677f1f8c7320
+  data.tar.gz: 83de71d1d30614bc1894f21b3527918e50dbd7422cc6849a4a379c5e0cfebe10
 SHA512:
-  metadata.gz: a88adfd31e5434df1681d8ad3add1cfc54e4ccbedde5e3f1a38e84e23a8eb511af9f1756a752ffb065bcd96442141cb4829ce4554d66ee666edae73aa7e6e025
-  data.tar.gz: b0af9e66767cba44f57012eef78fb46851964b44a0952d7f1fb16c9c5bbb474b7fe17f58f67745e0dd05d56dda463ec3cf08386d4dc48ba0e0c3d2e8e54dff7b
+  metadata.gz: 912b7eb024b8a6e2b7bfd4d08af08351e1074d8c7eda03189c5078b89d3594f5b39770327c088e238dd5aff3b2d02059b539938fbb2992544a961ba90de1f489
+  data.tar.gz: 7b1b3b1469079cb3482a6fb74df3d6d0834d42c51cb3be6789e638a767b88c336fd2e93e4580d469309e634b6da1abaf260942f7bfe492e902a352d7b22105ef

data/lib/inigorb/ffimod.rb

@@ -3,6 +3,18 @@ require 'ffi'
 module Inigo
     extend FFI::Library
 
+    class Config < FFI::Struct
+      layout :debug, :bool,
+              :name, :pointer,
+              :service, :pointer,
+              :token, :pointer,
+              :schema, :pointer,
+              :runtime, :pointer,
+              :egress_url, :pointer,
+              :gateway, :u_int64_t,
+              :disable_response_data, :bool
+    end
+
     def self.get_arch(system_name)
       machine = RbConfig::CONFIG['target_cpu'].downcase
       if system_name == 'darwin'
@@ -37,55 +49,45 @@ module Inigo
       '.so'
     end
 
-    system_name = RbConfig::CONFIG['host_os']
-    
-    supported_systems = /(linux|darwin|mingw|mswin|cygwin)/
-    
-    unless supported_systems.match?(system_name)
-      raise RuntimeError, "Only Windows, macOS (darwin), and Linux systems are supported. RUBY_PLATFORM: #{RUBY_PLATFORM}, RUBY_ENGINE: #{RUBY_ENGINE}, HOST_OS: #{system_name}"
-    end
-    
-    system_name = 'windows' if system_name =~ /(mingw|mswin|cygwin)/
-    system_name = 'darwin' if system_name =~ /darwin/i
-    system_name = 'linux' if system_name =~ /linux/i
-    
-    filename = "inigo-#{system_name}-#{get_arch(system_name)}#{get_ext(system_name)}"
-
-    begin
-      ffi_lib File.join(File.dirname(__FILE__), filename)
-
-      class Config < FFI::Struct
-          layout :debug, :bool,
-                  :name, :pointer,
-                  :service, :pointer,
-                  :token, :pointer,
-                  :schema, :pointer,
-                  :runtime, :pointer,
-                  :egress_url, :pointer,
-                  :gateway, :u_int64_t,
-                  :disable_response_data, :bool
+    def self.load
+      system_name = RbConfig::CONFIG['host_os']
+      
+      supported_systems = /(linux|darwin|mingw|mswin|cygwin)/
+      
+      unless supported_systems.match?(system_name)
+        raise RuntimeError, "Only Windows, macOS (darwin), and Linux systems are supported. RUBY_PLATFORM: #{RUBY_PLATFORM}, RUBY_ENGINE: #{RUBY_ENGINE}, HOST_OS: #{system_name}"
       end
+      
+      system_name = 'windows' if system_name =~ /(mingw|mswin|cygwin)/
+      system_name = 'darwin' if system_name =~ /darwin/i
+      system_name = 'linux' if system_name =~ /linux/i
+      
+      filename = "inigo-#{system_name}-#{get_arch(system_name)}#{get_ext(system_name)}"
 
-      attach_function :create, [:u_int64_t], :u_int64_t
-      attach_function :process_request, [
-          :u_int64_t,  # instance
-          :pointer, :int,  # header
-          :pointer, :int,  # input
-          :pointer, :pointer,  # output
-          :pointer, :pointer  # status
-      ], :u_int64_t
-      attach_function :process_response, [
-          :u_int64_t,  # instance
-          :u_int64_t,  # request handler
-          :pointer, :int,  # input
-          :pointer, :pointer  # output
-      ], :void
-      attach_function :get_version, [], :string
-      attach_function :disposeHandle, [:u_int64_t], :void
-      attach_function :disposeMemory, [:pointer], :void
-      attach_function :check_lasterror, [], :string
-      attach_function :copy_querydata, [:u_int64_t], :u_int64_t
-    rescue LoadError => e
-      raise ::RuntimeError, "Unable to open Inigo shared library.\n\nPlease get in touch with us for support:\nemail: support@inigo.io\nslack: https://slack.inigo.io\n\nPlease share the below info with us:\nerror:    #{e.to_s}\nuname:    #{RbConfig::CONFIG['host_os']}\narch:     #{RbConfig::CONFIG['host_cpu']}"
-    end  
+      begin
+        ffi_lib File.join(File.dirname(__FILE__), filename)
+
+        attach_function :create, [:u_int64_t], :u_int64_t
+        attach_function :process_request, [
+            :u_int64_t,  # instance
+            :pointer, :int,  # header
+            :pointer, :int,  # input
+            :pointer, :pointer,  # output
+            :pointer, :pointer  # status
+        ], :u_int64_t
+        attach_function :process_response, [
+            :u_int64_t,  # instance
+            :u_int64_t,  # request handler
+            :pointer, :int,  # input
+            :pointer, :pointer  # output
+        ], :void
+        attach_function :get_version, [], :string
+        attach_function :disposeHandle, [:u_int64_t], :void
+        attach_function :disposeMemory, [:pointer], :void
+        attach_function :check_lasterror, [], :string
+        attach_function :copy_querydata, [:u_int64_t], :u_int64_t
+      rescue LoadError => e
+        raise ::RuntimeError, "Unable to open Inigo shared library.\n\nPlease get in touch with us for support:\nemail: support@inigo.io\nslack: https://slack.inigo.io\n\nPlease share the below info with us:\nerror:    #{e.to_s}\nuname:    #{RbConfig::CONFIG['host_os']}\narch:     #{RbConfig::CONFIG['host_cpu']}"
+      end  
+    end
 end

data/lib/inigorb/tracer.rb

@@ -79,12 +79,14 @@ module Inigo
 
         q = Query.new(self.class.instance, JSON.dump(gReq))
 
-        incoming_request = query.context['request']
+        headers_obj = query.context[:headers] if query.context[:headers]
+        headers_obj = query.context['request'].headers if headers_obj == nil && query.context['request']
+        headers_obj = query.context[:request].headers if headers_obj == nil && query.context[:request]
         if is_subscription
-          incoming_request = ActionDispatch::Request.new(query.context[:channel].connection.env)
+          headers_obj = ActionDispatch::Http::Headers.from_hash(query.context[:channel].connection.env)
         end
 
-        resp, req = q.process_request(headers(incoming_request))
+        resp, req = q.process_request(headers(headers_obj))
 
         # Introspection or blocked query
         if resp.any?
@@ -201,11 +203,11 @@ module Inigo
       settings = ENV.select { |k, v| k.start_with?('INIGO') }
 
       if settings.fetch("INIGO_ENABLE", "").to_s.downcase == "false"
-        @@initialized = true #not to get to this method ever again
         puts 'Inigo is disabled. Skipping middleware.'
         return
       end
 
+      Inigo::load
       config = Inigo::Config.new
 
       config[:disable_response_data] = false
@@ -228,10 +230,10 @@ module Inigo
       end
     end
 
-    def headers(request)
+    def headers(headers_obj)
       headers = {}
 
-      request.env.each do |key, value|
+      headers_obj.env.each do |key, value|
         if key.start_with?('HTTP_')
           header_name = key[5..].split('_').map(&:capitalize).join('-')
           headers[header_name] = value.split(',').map(&:strip)

data/lib/inigorb.rb

@@ -211,6 +211,7 @@ module Inigo
         return
       end
 
+      Inigo::load
       config = Inigo::Config.new
       config[:disable_response_data] = false
       config[:name] = FFI::MemoryPointer.from_string("inigo-rb".to_s.encode('UTF-8'))

data/lib/puma/plugin/inigo.rb

@@ -0,0 +1,52 @@
+require 'puma'
+require 'puma/plugin'
+
+module Puma
+  class Plugin
+    module InigoPlugin
+      class Error < StandardError; end
+
+      class << self
+        attr_writer :config
+
+        def config
+          @config ||= Config.new
+        end
+
+        def configure
+          yield(config)
+        end
+      end
+
+      # Contents of actual Puma Plugin
+      #
+      module PluginInstanceMethods
+        def start(launcher)
+          launcher.events.on_booted do
+            if launcher.options[:workers] == 0
+              Inigo::Tracer.initialize_tracer(Puma::Plugin::InigoPlugin.config.schema_class.to_definition)
+            end
+          end
+        end
+    
+        def config(c)
+          c.on_worker_boot do
+            Inigo::Tracer.initialize_tracer(Puma::Plugin::InigoPlugin.config.schema_class.to_definition) 
+          end
+        end
+      end
+
+      class Config
+        attr_accessor :schema_class
+
+        def initialize
+          @schema_class = nil
+        end
+      end
+    end
+  end
+end
+
+Puma::Plugin.create do
+  include Puma::Plugin::InigoPlugin::PluginInstanceMethods
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inigorb
 version: !ruby/object:Gem::Version
-  version: 0.28.2
+  version: 0.28.5
 platform: ruby
 authors:
 - Inigo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-05 00:00:00.000000000 Z
+date: 2023-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -70,6 +70,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.24
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: 
 email: eitan@inigo.io
 executables: []
@@ -87,6 +107,7 @@ files:
 - lib/inigorb/inigo-windows-arm64.dll
 - lib/inigorb/query.rb
 - lib/inigorb/tracer.rb
+- lib/puma/plugin/inigo.rb
 homepage: https://inigo.io
 licenses:
 - MIT