stack-service-base 0.0.39 → 0.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d22d00118442e44ed250a91b55b8412f4c4965ef4f7985680119f2597cd5940
-  data.tar.gz: 20ab50c9da1988b54af6417eb1c98fd4ff23598620655213164d1675f88cbb32
+  metadata.gz: 57f6986e2b0af7274d88d02271380e15e4b36023eba82a12a365089df93ae282
+  data.tar.gz: 11a89bb1fd1a2c8ec4ff862ab737f5f9040a4861e46ea68b871b255738071a93
 SHA512:
-  metadata.gz: 90c1a6cce5bbbf701f4dc475e650a4437a363efc3fb062d52a75c11b07331cabd4c61c404dcd27d1b1763eac34a363200581de366d78df31e4db954e47ef8f29
-  data.tar.gz: f33f6a5e90190f2d018bdfb6cb6e18c4d897d8d4c48772b791902269af0a189fde7b37dcc4c4081774a45a0699ba4655175b76c066e2d574ef5d919a424dca26
+  metadata.gz: 00c30180960fa2df2be60564508524d7958d99933014555a920af23c53367b92951038cbbc429a2ed6d12f8bf9bd51bb09c83447638fba32b3b47f265f9ca05b
+  data.tar.gz: 86118fcf28ab9a9edb5791558a78a00671f670e901b1fadecd5c3a07a9c264682d8b68c386b3543f7bccedb66da757c09aa47cd0bf7801c9969438de0bf87a23

data/lib/stack-service-base/nats_patch_1.rb

@@ -0,0 +1,56 @@
+require 'nats'
+require 'nats/io/websocket'
+
+# TODO PATCH https://github.com/nats-io/nats-pure.rb/issues/171
+module NATS
+  module IO
+    class WebSocket
+      def initialize(options = {})
+        super
+        @options = options
+      end
+
+      def connect
+        super
+
+        setup_tls! if @uri.scheme == "wss" # WebSocket connection must be made over TLS from the beginning
+
+        @handshake = ::WebSocket::Handshake::Client.new url: @uri.to_s, **@options
+        @frame = ::WebSocket::Frame::Incoming::Client.new
+        @handshaked = false
+
+        @socket.write @handshake.to_s
+
+        until @handshaked
+          @handshake << method(:read).super_method.call(MAX_SOCKET_READ_BYTES)
+          if @handshake.finished?
+            @handshaked = true
+          end
+        end
+      end
+    end
+  end
+
+  class Client
+    def create_socket
+      socket_class = case @uri.scheme
+                     when "nats", "tls"
+                       NATS::IO::Socket
+                     when "ws", "wss"
+                       # require_relative "websocket"
+                       # TODO Local patch
+                       require 'nats/io/websocket'
+                       NATS::IO::WebSocket
+                     else
+                       raise NotImplementedError, "#{@uri.scheme} protocol is not supported, check NATS cluster URL spelling"
+                     end
+
+      socket_class.new(
+        uri: @uri,
+        tls: {context: tls_context, hostname: @hostname},
+        connect_timeout: NATS::IO::DEFAULT_CONNECT_TIMEOUT,
+        **@initial_options # TODO PATCH https://github.com/nats-io/nats-pure.rb/issues/171
+      )
+    end
+  end
+end

data/lib/stack-service-base/nats_service.rb

@@ -1,13 +1,14 @@
 require "nats"
+require_relative 'nats_patch_1'
 
-NATS_ENABLED = ENV['NATS_URL'].to_s != ''
+NATS_ENABLED = ENV['SWARM_NATS_URL'].to_s != ''
 
-NATS_URL = ENV['NATS_URL']# || 'nats://nats_single:4222'
+SWARM_NATS_URL = ENV['SWARM_NATS_URL']# || 'nats://nats_single:4222'
 NATS_STACK_NAME = ENV['STACK_NAME'] || 'undefined_stack'
 NATS_SERVICE_NAME = ENV['STACK_SERVICE_NAME'] || 'undefined_service'
 
 ENV['NATS_RECONNECT'] ||= 'true'
-ENV['NATS_RECONNECT_TIME_WAIT'] ||= '1000'
+ENV['NATS_RECONNECT_TIME_WAIT'] ||= '30'
 ENV['NATS_MAX_RECONNECT_ATTEMPTS'] ||= '-1'
 
 module NATS
@@ -19,7 +20,7 @@ $nats_client = nil
 def initialize_nats_service
   LOGGER.info "Initializing NATS service"
 
-  $nats_client = NATS.connect NATS_URL
+  $nats_client = NATS.connect SWARM_NATS_URL
 
   service = $nats_client.services.add(
     name: "#{NATS_SERVICE_NAME}_#{NATS_STACK_NAME}",

data/lib/stack-service-base/sinatra_ext.rb

@@ -1,4 +1,8 @@
 if Bundler.definition.specs.any? { |spec| spec.name == 'sinatra' }
+  unless Bundler.definition.specs.any? { |spec| spec.name == 'slim' }
+    raise 'When using with Sinatra, gem slim is required'
+  end
+
   require 'sinatra/base'
 
   module Sinatra

data/lib/stack-service-base/version.rb

@@ -1,3 +1,3 @@
 module StackServiceBase
-  VERSION = '0.0.39'
+  VERSION = '0.0.41'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack-service-base
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.41
 platform: ruby
 authors:
 - Artyom B
@@ -220,6 +220,7 @@ files:
 - lib/stack-service-base/database.rb
 - lib/stack-service-base/fiber_pool.rb
 - lib/stack-service-base/logging.rb
+- lib/stack-service-base/nats_patch_1.rb
 - lib/stack-service-base/nats_service.rb
 - lib/stack-service-base/open_telemetry.rb
 - lib/stack-service-base/project_template/github/.github/workflows/main.yml