rubypitaya 3.17.1 → 3.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3c8fb40d9e4a0f24d40d3399d23e1c739685147b49c17f5fdaf06b62d4f6f98
-  data.tar.gz: 4b8e8fc959fec09eaf1a9c2cda02f9e8ed8512a184a86258e174c7f4417f0b68
+  metadata.gz: 83ca819c25297eb060cbe0e0f1b4e8bb8f69b981a5a9e9cc9f7026774bb90fec
+  data.tar.gz: cfc9294385aebc33497ea547ace19a6085cdf7b611f133ff8a8e97e444c21aa6
 SHA512:
-  metadata.gz: ad42027f76cc415eb5c5956f6beda45660baed6f38c0e0b830d94bb60960e87a521194b598ba9576eed373ca72764f394f0da2d1b476241adacf8d13c4c6c9c2
-  data.tar.gz: 6831faa8d987cb9bd6f467e061c8f72ab6db75227b92f76633a3df7778f6ae9c45ce96873ab8fa194f0a35273008d1fdc0a854066a3bfc7df21850e4d5329844
+  metadata.gz: 15b9c24c2a57d2d08f578e569d59ccdd9b1b72a358ba2b89821eac03e0b0005073ccc1badc60f54360cf5b7c00b3d7d86ecb7f70eb8a62be56cc3c9f19981a26
+  data.tar.gz: ee05134dd53af44e3e6d00bcf1ce26951692270e842966d4d58640ce6ca4bb9695485d1e99663d7bc5cc4210485b8b31ffad1ad105dfa8c8641a61d954701cee

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '3.17.1'
+gem 'rubypitaya', '3.17.2'
 
 group :development do
   gem 'pry', '0.14.2'

data/lib/rubypitaya/app-template/Gemfile.lock

@@ -105,7 +105,7 @@ GEM
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
     ruby2_keywords (0.0.5)
-    rubypitaya (3.17.1)
+    rubypitaya (3.17.2)
       activerecord (= 7.1.2)
       etcdv3 (= 0.11.6)
       google-protobuf (= 3.25.2)
@@ -144,7 +144,7 @@ DEPENDENCIES
   listen (= 3.8.0)
   pry (= 0.14.2)
   rspec (= 3.12.0)
-  rubypitaya (= 3.17.1)
+  rubypitaya (= 3.17.2)
   sinatra-contrib (= 3.2.0)
 
 BUNDLED WITH

data/lib/rubypitaya/app-template/app/setup/rubypitaya.yml

@@ -2,6 +2,7 @@ server:
   name: 'rubypitaya'
   environment: development
   cheats: true
+  threads: 5
 
 nats:
   url: 'nats://nats:4222'
@@ -22,7 +23,8 @@ database:
   name: 'ruby_pitaya'
 
 http:
+  enabled: true
   auth:
     user: 'user'
     pass: 'pass'
-    enabled: 'false'
+    enabled: false

data/lib/rubypitaya/app-template/docker/dev/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.2.2-slim
+FROM ruby:3.2.3-slim
 
 ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8

data/lib/rubypitaya/app-template/docker/prod/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.2.2-slim as builder
+FROM ruby:3.2.3-slim as builder
 
 RUN apt update && \
     apt install -y --no-install-recommends \
@@ -26,7 +26,7 @@ RUN rm -rf /usr/local/bundle/cache && \
 
 # RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
 
-FROM ruby:3.2.2-slim
+FROM ruby:3.2.3-slim
 
 ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8

data/lib/rubypitaya/core/etcd_connector.rb

@@ -79,6 +79,7 @@ module RubyPitaya
 
     def stop_renew_connection
       @renew_connection_thread.exit.join unless @renew_connection_thread.nil?
+      @renew_connection_thread = nil
     end
 
     def get_server_data

data/lib/rubypitaya/core/http_routes.rb

@@ -61,7 +61,7 @@ module RubyPitaya
     end
 
     def http_auth_enabled?
-      return @setup.fetch('rubypitaya.http.auth.enabled') { 'false' } == 'true'
+      return @setup.fetch('rubypitaya.http.auth.enabled', false)
     end
 
     def get_http_auth

data/lib/rubypitaya/core/main.rb

@@ -59,8 +59,9 @@ module RubyPitaya
       @etcd_connector.connect
 
       @nats_address = @setup['rubypitaya.nats.url']
+      @nats_n_threads = @setup['rubypitaya.server.threads']
       @nats_connector = NatsConnector.new(@nats_address, @service_uuid,
-                                          @server_name)
+                                          @server_name, @nats_n_threads, @log)
 
       @database_connector = DatabaseConnector.new(@setup, @log)
       @database_connector.connect
@@ -99,6 +100,9 @@ module RubyPitaya
     end
 
     def run_http
+      is_http_enabled = @setup.fetch('rubypitaya.http.enabled', false)
+      return unless is_http_enabled
+
       HttpRoutes.set :log, @log
       HttpRoutes.set :services, @services
       HttpRoutes.set :setup, @setup
@@ -161,8 +165,7 @@ module RubyPitaya
 
           session_id = request[:session][:id]
           session_uid = request[:session].fetch(:uid, '')
-          session_data = request[:session][:data]
-          session_data = JSON.parse(session_data, symbolize_names: true)
+          session_data = JSON.parse(request[:session][:data], symbolize_names: true)
           frontend_id = request[:frontendID]
           metadata = request[:metadata]
           metadata = JSON.parse(metadata, symbolize_names: true)

data/lib/rubypitaya/core/nats_connector.rb

@@ -15,10 +15,12 @@ module RubyPitaya
     MESSAGE_TYPE_RESPONSE = 2
     MESSAGE_TYPE_PUSH     = 3
 
-    def initialize(nats_address, server_uuid, server_name)
+    def initialize(nats_address, server_uuid, server_name, n_threads, log)
+      @nats_address = nats_address
       @server_uuid = server_uuid
       @server_name = server_name
-      @nats_address = nats_address
+      @n_threads = n_threads
+      @log = log
       @nats = nil
       @subscribe = nil
     end
@@ -29,29 +31,49 @@ module RubyPitaya
       @nats = NATS.connect(servers: [@nats_address])
       @subscribe = @nats.subscribe(subscribe_topic)
 
+      @queue = Thread::Queue.new
+      @threads = []
+
+      @n_threads.times do |i|
+        @threads << Thread.new do
+          loop do
+            data, reply = @queue.pop
+
+            request = NatsRequest.decode(data).to_h
+
+            response = yield request
+
+            nats_response = NatsResponse.new(data: response.force_encoding('ascii-8bit'))
+            nats_response_encoded = NatsResponse.encode(nats_response)
+
+            @nats.publish(reply, nats_response_encoded)
+
+          rescue Exception => error
+            @log.error "NATS ERROR: #{error.message}} \n #{error.backtrace.join("\n")}"
+          end
+        end
+      end
+
       loop do
         message = @subscribe.pending_queue.pop
         @subscribe.synchronize do
           @subscribe.pending_size -= message.data.size
         end
 
-        request = NatsRequest.decode(message.data).to_h
-
-        response = yield request
-
-        nats_response = NatsResponse.new(data: response.force_encoding('ascii-8bit'))
-        nats_response_encoded = NatsResponse.encode(nats_response)
-
-        @nats.publish(message.reply, nats_response_encoded)
+        @queue << [message.data, message.reply]
       end
     end
 
     def disconnect
       @subscribe.unsubscribe unless @subscribe.nil?
       @nats.close unless @nats.nil?
+      @threads.map(&:kill) unless @threads.nil?
+      @queue.close unless @queue.nil?
 
-      @nats = nil
       @subscribe = nil
+      @nats = nil
+      @queue = nil
+      @threads = nil
     end
 
     def push_to_frontend(session, message_route, payload)

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '3.17.1'
+  VERSION = '3.17.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 3.17.1
+  version: 3.17.2
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-17 00:00:00.000000000 Z
+date: 2024-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 1.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 1.5.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.1.0
+        version: 13.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.1.0
+        version: 13.2.1
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.8
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.8
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: etcdv3
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.2
+        version: 7.1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.2
+        version: 7.1.3.2
 - !ruby/object:Gem::Dependency
   name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -170,56 +170,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 3.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 3.13.0
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.10
+        version: 2.4.19
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.10
+        version: 2.4.19
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.1.1
+        version: 9.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.1.1
+        version: 9.2.0
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -387,7 +387,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Create servers with pitaya