neo4j-ruby-driver 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d120aee905184fbdec88e8492508aaf5ca5ab442e584d80d7047370b8d9b38f8
-  data.tar.gz: f029e5705dbdc89b2ed0f27e224f4711a6ddbdf5c9968925a0a7fe0e8cd164e1
+  metadata.gz: 9da1a1a99dc073fdc74afd9078432f53d6d574eecf5fecc436c9207f9096687b
+  data.tar.gz: 0765c112017827121324658b302e4c7bd809fa7c390944aa21e912f16e371b9a
 SHA512:
-  metadata.gz: cb2ee849c0c8952ae992ba23b4068a750454772a49b8d891c81abf184c5f6440f4295a38b266e51fc466521c8dfcd1a722f84db16f50e29bd28a6c2fd0e411a0
-  data.tar.gz: 5efbeb6d55973470fa765bb6b46417f02c63713c4a2637847ff99bda193483b8751b6b7ca378b40a550cf25a0ea2cd0c39a4e459effc886a11d0fb746e3654c0
+  metadata.gz: bf3e072bf5b7a189de7cb6f176c64f7d502e9e30f93590dcd4b35a1af0ac9c8d3e01f4e5d087269a9257f7e9995686e1d5cb4e258f46637e01ae53526cbec3ca
+  data.tar.gz: b3c9e897e362d1e93db0a82d554d8b1cb1dcc5f625b0fc3223214fd55295291eb41f40f1858aad32e0e61ab7a711dbbfcb1f3296e832ee5c33a81a551d44ce97

data/ffi/bolt/address_resolver.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Bolt
+  module AddressResolver
+    extend Bolt::Library
+
+    callback :address_resolver_func, %i[pointer pointer pointer], :void
+
+    attach_function :create, :BoltAddressResolver_create, %i[pointer address_resolver_func], :auto_pointer
+    attach_function :destroy, :BoltLog_destroy, %i[pointer], :void
+  end
+end

data/ffi/bolt/address_set.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Bolt
+  module AddressSet
+    extend Bolt::Library
+
+    attach_function :add,  :BoltAddressSet_add, %i[pointer pointer], :int32_t
+  end
+end

data/ffi/bolt/config.rb

@@ -8,6 +8,10 @@ module Bolt
     BOLT_SCHEME_NEO4J = 1
 
     typedef :int32_t, :bolt_scheme
+
+    BOLT_TRANSPORT_PLAINTEXT = 0
+    BOLT_TRANSPORT_ENCRYPTED = 1
+
     typedef :int32_t, :bolt_transport
 
     attach_function :create, :BoltConfig_create, [], :auto_pointer

data/ffi/bolt/log.rb

@@ -7,8 +7,8 @@ module Bolt
     callback :log_func, %i[pointer string], :void
 
     attach_function :create, :BoltLog_create, %i[pointer], :auto_pointer
-    attach_function :destroy, :BoltLog_create, %i[pointer], :void
-    attach_function :set_error_func, :BoltLog_create, %i[pointer log_func], :void
+    attach_function :destroy, :BoltLog_destroy, %i[pointer], :void
+    attach_function :set_error_func, :BoltLog_set_error_func, %i[pointer log_func], :void
     attach_function :set_warning_func, :BoltLog_set_warning_func, %i[pointer log_func], :void
     attach_function :set_info_func, :BoltLog_set_info_func, %i[pointer log_func], :void
     attach_function :set_debug_func, :BoltLog_set_debug_func, %i[pointer log_func], :void

data/ffi/neo4j/driver/config.rb

@@ -11,7 +11,21 @@ module Neo4j
 
       class << self
         def default_config
-          new
+          {
+             logger: ActiveSupport::Logger.new(STDOUT, level: ::Logger::ERROR), # :set_log
+             leaked_session_logging: false,
+             #connection_liveness_check_timeout: -1, # Not configured
+             max_connection_lifetime: 1.hour, # :set_max_connection_life_time
+             max_connection_pool_size: 100, #:set_max_pool_size
+             connection_acquisition_timeout: 1.minute, #:set_max_connection_acquisition_time
+             encryption: true, # :set_transport
+             trust_strategy: :trust_all_certificates,
+             connection_timeout: 30.seconds, # BoltSocketOptions_set_connect_timeout
+             max_transaction_retry_time: Internal::Retry::ExponentialBackoffRetryLogic::DEFAULT_MAX_RETRY_TIME,
+             #resolver: nil # :set_address_resolver
+             # ?????? BoltSocketOptions_set_keep_alive
+             # ???? BoltConfig_set_user_agent
+          }
         end
       end
     end

data/ffi/neo4j/driver/graph_database.rb

@@ -21,7 +21,7 @@ module Neo4j
           unless auth_token.is_a? FFI::Pointer
             raise Exceptions::AuthenticationException, 'Unsupported authentication token'
           end
-          config ||= Config.default_config
+          config = Config.default_config.merge(config || {})
 
           Internal::DriverFactory.new.new_instance(uri, auth_token, config)
         end

data/ffi/neo4j/driver/internal/bolt_server_address.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Neo4j
+  module Driver
+    module Internal
+      class BoltServerAddress
+        include Net::ServerAddress
+
+        attr_reader :host, :port
+
+        def initialize(host, port)
+          @host = host
+          @port = port
+        end
+      end
+    end
+  end
+end

data/ffi/neo4j/driver/internal/driver_factory.rb

@@ -13,9 +13,9 @@ module Neo4j
         def new_instance(uri, auth_token, config)
           uri = URI(uri)
           routing_context = routing_context(uri)
-          connector, logger = create_connector(uri, auth_token, routing_context, config)
+          connector, logger, resolver = create_connector(uri, auth_token, routing_context, config)
           retry_logic = Retry::ExponentialBackoffRetryLogic.new(config[:max_transaction_retry_time], config[:logger])
-          create_driver(connector, logger, retry_logic, config).tap(&:verify_connectivity)
+          create_driver(connector, logger, resolver, retry_logic, config).tap(&:verify_connectivity)
         end
 
         private
@@ -27,7 +27,8 @@ module Neo4j
           set_socket_options(bolt_config, config)
           set_routing_context(bolt_config, routing_context)
           set_scheme(bolt_config, uri, routing_context)
-          [Bolt::Connector.create(address, auth_token, bolt_config), logger]
+          resolver = InternalResolver.register(bolt_config, config[:resolver])
+          [Bolt::Connector.create(address, auth_token, bolt_config), logger, resolver]
         end
 
         def bolt_config(config)
@@ -41,6 +42,11 @@ module Neo4j
             when :connection_acquisition_timeout
               check_error Bolt::Config.set_max_connection_acquisition_time(bolt_config,
                                                                            DurationNormalizer.milliseconds(value))
+            when :encryption
+              check_error Bolt::Config.set_transport(
+                bolt_config,
+                value ? Bolt::Config::BOLT_TRANSPORT_ENCRYPTED : Bolt::Config::BOLT_TRANSPORT_PLAINTEXT
+              )
             end
           end
           check_error Bolt::Config.set_user_agent(bolt_config, 'seabolt-cmake/1.7')
@@ -102,10 +108,10 @@ module Neo4j
           end
         end
 
-        def create_driver(connector, logger, retry_logic, config)
+        def create_driver(connector, logger, resolver, retry_logic, config)
           connection_provider = DirectConnectionProvider.new(connector, config)
           session_factory = create_session_factory(connection_provider, retry_logic, config)
-          InternalDriver.new(session_factory, logger)
+          InternalDriver.new(session_factory, logger, resolver)
         end
 
         def create_session_factory(connection_provider, retry_logic = nil, config = nil)

data/ffi/neo4j/driver/internal/internal_driver.rb

@@ -11,10 +11,13 @@ module Neo4j
         delegate :verify_connectivity, to: :session_factory
         auto_closable :session
 
-        def initialize(session_factory, logger)
+        def initialize(session_factory, logger, resolver)
           @session_factory = session_factory
-          @logger = logger # just a weak reference to prevent garbage collection
           @closed = Concurrent::AtomicBoolean.new(false)
+          # The below hold references to callbacks called from c,
+          # this prevents garbage collection before driver is garbage collected
+          @logger = logger
+          @resolver = resolver
         end
 
         def session(*args)

data/ffi/neo4j/driver/internal/internal_resolver.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Neo4j
+  module Driver
+    module Internal
+      class InternalResolver
+        include ErrorHandling
+
+        class << self
+          def register(bolt_config, resolver)
+            return unless resolver
+            new(bolt_config, resolver)
+          end
+        end
+
+        def initialize(bolt_config, resolver)
+          @address_resolver_func = ->(_ptr, address, set) {
+            resolver.call(BoltServerAddress.new(Bolt::Address.host(address).first,
+                                                Bolt::Address.port(address).first.to_i)).each do |server_address|
+              bolt_address = Bolt::Address.create(server_address.host, server_address.port.to_s)
+              check_error Bolt::AddressSet.add(set, bolt_address)
+            end
+          }
+
+          address_resolver = Bolt::AddressResolver.create(nil, @address_resolver_func)
+          check_error Bolt::Config.set_address_resolver(bolt_config, address_resolver)
+        end
+      end
+    end
+  end
+end

data/ffi/neo4j/driver/net/server_address.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Neo4j
+  module Driver
+    module Net
+      module ServerAddress
+        def self.of(host, port)
+          Internal::BoltServerAddress.new(host, port)
+        end
+      end
+    end
+  end
+end

data/ffi/neo4j/driver.rb

@@ -28,6 +28,8 @@ if RUBY_PLATFORM.match?(/java/)
         module Value
         end
       end
+      module Net
+      end
       module Summary
       end
       module Types

data/lib/neo4j/driver/version.rb

@@ -2,6 +2,6 @@
 
 module Neo4j
   module Driver
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-ruby-driver
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-09 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -224,6 +224,8 @@ files:
 - LICENSE.txt
 - README.md
 - ffi/bolt/address.rb
+- ffi/bolt/address_resolver.rb
+- ffi/bolt/address_set.rb
 - ffi/bolt/auth.rb
 - ffi/bolt/auto_releasable.rb
 - ffi/bolt/boolean.rb
@@ -251,6 +253,7 @@ files:
 - ffi/neo4j/driver/graph_database.rb
 - ffi/neo4j/driver/internal/async/access_mode_connection.rb
 - ffi/neo4j/driver/internal/async/direct_connection.rb
+- ffi/neo4j/driver/internal/bolt_server_address.rb
 - ffi/neo4j/driver/internal/bookmarks_holder.rb
 - ffi/neo4j/driver/internal/direct_connection_provider.rb
 - ffi/neo4j/driver/internal/driver_factory.rb
@@ -264,6 +267,7 @@ files:
 - ffi/neo4j/driver/internal/internal_driver.rb
 - ffi/neo4j/driver/internal/internal_logger.rb
 - ffi/neo4j/driver/internal/internal_record.rb
+- ffi/neo4j/driver/internal/internal_resolver.rb
 - ffi/neo4j/driver/internal/internal_statement_result.rb
 - ffi/neo4j/driver/internal/messaging/bolt_protocol.rb
 - ffi/neo4j/driver/internal/messaging/v1/bolt_protocol_v1.rb
@@ -292,6 +296,7 @@ files:
 - ffi/neo4j/driver/internal/value/time_with_zone_offset_value.rb
 - ffi/neo4j/driver/internal/value/unbound_relationship_value.rb
 - ffi/neo4j/driver/internal/value/value_adapter.rb
+- ffi/neo4j/driver/net/server_address.rb
 - ffi/neo4j/driver/statement.rb
 - ffi/neo4j/driver/summary/statement_type.rb
 - ffi/neo4j/driver/types/entity.rb