rubypitaya 3.15.2 → 3.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 515d2b2bbf22dbf2090c4db926918d4c579255f5223baf55850e08d31b0f2954
-  data.tar.gz: fad8a9bb65f7160344f855efd8ba9cdfd8ec71814f1c052730348c3660f2c1f4
+  metadata.gz: 233f98eb7f7752ede2d0ce8caea9cba724b287f2fb537cab13b24f30bdad2be8
+  data.tar.gz: 685e591d3cf68cf0e094bcea484e7afed01c45e11cadd3f9639f7d00689bcbf9
 SHA512:
-  metadata.gz: f0f103d1d8492e5d21a8183501ecb35f0432e7b460b22e0a17a5aec8990ec09417676e75c857c722c731bfbdc5b13218e0c37d7bf67d2bea204f44c88030ef67
-  data.tar.gz: c9ba2c77aa89d21f443ad6ac4d6772bf2efc2117f1bce9eb8b195fda90dc8c628bc0c913807599dce0e759c54a3489885d1a62e6f6da4629719ceab2da6f132b
+  metadata.gz: 92052de17be30fd1cd49ab3890caf7490a8cda3dafa7d2b9333efc3101d50532401e17700a98b637202478621170e0874f7c8e47e8b39f852417b30d87214a65
+  data.tar.gz: 8f27d2bce28666eeae9da9b0e08fdec7e8b85f175293be92dcffccb1af32fe45a7a60ecd089f6f8e3819111af7bfe31538d709c07791e69e82d1a64527f64f54

data/lib/rubypitaya/app-template/Gemfile

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

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

@@ -94,7 +94,7 @@ GEM
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
     ruby2_keywords (0.0.5)
-    rubypitaya (3.15.2)
+    rubypitaya (3.16.0)
       activerecord (= 7.0.4)
       etcdv3 (= 0.11.5)
       google-protobuf (= 3.21.12)
@@ -132,7 +132,7 @@ DEPENDENCIES
   listen (= 3.8.0)
   pry (= 0.14.2)
   rspec (= 3.12.0)
-  rubypitaya (= 3.15.2)
+  rubypitaya (= 3.16.0)
   sinatra-contrib (= 3.0.5)
 
 BUNDLED WITH

data/lib/rubypitaya/app-template/Makefile

@@ -14,10 +14,10 @@ run:
 build:
 	@docker-compose build
 	@docker-compose pull
-	# @echo "Copying vendor folder ..."
-	# @rm -rf ./vendor
-	# @sh -c "FOLDER=$(notdir $(shell pwd)); docker-compose run --no-deps --detach --name=rubypitaya rubypitaya; docker cp rubypitaya:/app/rubypitaya/vendor ."
-	# @docker rm -f rubypitaya
+#	@echo "Copying vendor folder ..."
+#	@rm -rf ./vendor
+#	@sh -c "FOLDER=$(notdir $(shell pwd)); docker-compose run --no-deps --detach --name=rubypitaya rubypitaya; docker cp rubypitaya:/app/rubypitaya/vendor ."
+#	@docker rm -f rubypitaya
 
 ## Setup project dependencies
 setup: clear

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

@@ -9,7 +9,7 @@ nats:
 etcd:
   url: 'http://etcd:2379'
   prefix: 'rubypitaya/'
-  leaseSeconds: '60'
+  leaseSeconds: 60
 
 redis:
   url: 'redis://redis:6379'

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

@@ -18,7 +18,7 @@ COPY Gemfile Gemfile.lock ./
 RUN bundle config --global jobs 4 && \
     bundle config --global set clean 'true' \
     bundle config --global git.allow_insecure true && \
-    bundle config set path './vendor/bundle' && \
+    # bundle config set path './vendor/bundle' && \
     bundle install
 
 COPY . .

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

@@ -9,19 +9,20 @@ RUN apt update && \
 
 COPY Gemfile Gemfile.lock ./
 
-RUN bundle config --global jobs 4 && \
+RUN bundle config set --global without "development" \
+    bundle config --global jobs 4 && \
     bundle config --global set clean 'true' \
     bundle config --global git.allow_insecure true && \
-    bundle config --global without "development test" && \
     bundle install
 
 RUN rm -rf /usr/local/bundle/cache && \
     rm -rf /usr/local/bundle/build_info && \
     rm -rf /usr/local/bundle/doc && \
     rm -rf /usr/local/bundle/doc && \
-    find /usr/local/bundle/gems/grpc-*/src/ruby/lib/grpc/2.5/ -name "*.so" -delete && \
     find /usr/local/bundle/gems/grpc-*/src/ruby/lib/grpc/2.6/ -name "*.so" -delete && \
     find /usr/local/bundle/gems/grpc-*/src/ruby/lib/grpc/2.7/ -name "*.so" -delete && \
+    find /usr/local/bundle/gems/grpc-*/src/ruby/lib/grpc/3.0/ -name "*.so" -delete && \
+    find /usr/local/bundle/gems/grpc-*/src/ruby/lib/grpc/3.2/ -name "*.so" -delete && \
     find /usr/local/bundle/gems/ -name "*.c" -delete && \
     find /usr/local/bundle/gems/ -name "*.o" -delete && \
     find /usr/local/bundle/gems/ -name "spec" -exec rm -rv {} +
@@ -46,6 +47,8 @@ COPY --from=builder /usr/local/bundle /usr/local/bundle
 
 WORKDIR /app/rubypitaya/
 
+RUN bundle config set --global without "development"
+
 COPY . .
 
 ENTRYPOINT ["./docker/entrypoint.sh"]

data/lib/rubypitaya/app-template/docker/stag/docker-compose.stag.yaml

@@ -0,0 +1,67 @@
+version: '3'
+services:
+  nats:
+    image: 'nats:2.6.2-alpine'
+    restart: always
+    ports:
+      - '4222:4222'
+
+  etcd:
+    image: 'quay.io/coreos/etcd:v3.5.5'
+    restart: always
+    environment:
+       ETCD_ADVERTISE_CLIENT_URLS: 'http://localhost:2379'
+       ETCD_LISTEN_CLIENT_URLS: 'http://0.0.0.0:2379'
+    ports:
+      - '2379:2379'
+
+  redis:
+    image: 'redis:6.0.5-alpine'
+    restart: always
+    ports:
+      - '9001:6379'
+
+  db:
+    image: 'postgres:14.0-alpine'
+    restart: always
+    volumes:
+      - 'postgres:/var/lib/postgresql/data'
+    environment:
+      POSTGRES_USER: 'postgres'
+      POSTGRES_PASSWORD: 'postgres'
+    ports:
+      - '9100:5432'
+
+  connector:
+    image: 'registry.gitlab.com/lucianopc/pitaya-connector:0.1.0'
+    restart: always
+    depends_on:
+      - 'db'
+      - 'nats'
+      - 'etcd'
+      - 'redis'
+    ports:
+      - '3250:3250'
+    environment:
+      PITAYA_CLUSTER_RPC_SERVER_NATS_CONNECT: 'nats://nats:4222'
+      PITAYA_CLUSTER_RPC_CLIENT_NATS_CONNECT: 'nats://nats:4222'
+      PITAYA_CLUSTER_RPC_CLIENT_NATS_REQUESTTIMEOUT: '10s'
+      PITAYA_CLUSTER_SD_ETCD_ENDPOINTS: 'etcd:2379'
+      PITAYA_CLUSTER_SD_ETCD_PREFIX: 'rubypitaya/'
+      SERVER_ROUTES: 'rubypitaya'
+
+  rubypitaya:
+    image: 'registry.gitlab.com/dungeonrpg/dungeonrpg/backend:${RUBYPITAYA_IMAGE_TAG}'
+    restart: always
+    depends_on:
+      - 'db'
+      - 'nats'
+      - 'etcd'
+      - 'redis'
+      - 'connector'
+    working_dir: '/app/rubypitaya'
+    environment:
+      RUBYPITAYA_SERVER_ENVIRONMENT: 'production'
+
+volumes:
+  postgres:

data/lib/rubypitaya/app-template/docker/stag/update_image

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+IMAGE_ENV=$1
+IMAGE_TAG=$2
+
+sed -i "s/$IMAGE_ENV=.*/$IMAGE_ENV=$IMAGE_TAG/" .env

data/lib/rubypitaya/app-template/docker-compose.yml

@@ -6,10 +6,12 @@ services:
       - '4222:4222'
 
   etcd:
-    image: 'appcelerator/etcd:3.3.3'
+    image: 'quay.io/coreos/etcd:v3.5.5'
+    environment:
+       ETCD_ADVERTISE_CLIENT_URLS: 'http://localhost:2379'
+       ETCD_LISTEN_CLIENT_URLS: 'http://0.0.0.0:2379'
     ports:
       - '2379:2379'
-      - '2380:2380'
 
   redis:
     image: 'redis:6.0.5-alpine'
@@ -56,7 +58,8 @@ services:
     working_dir: '/app/rubypitaya'
     volumes:
       - .:/app/rubypitaya
-      - /app/rubypitaya/vendor
+      # - /app/rubypitaya/vendor
+      # - ./vendor/bundle/ruby/3.1.0/gems/rubypitaya-3.13.0/lib/rubypitaya/core:/app/rubypitaya/vendor/bundle/ruby/3.1.0/gems/rubypitaya-3.13.0/lib/rubypitaya/core
     ports:
       - '80:4567'
     environment:
@@ -65,12 +68,14 @@ services:
   rubypitaya-console:
     <<: *rubypitaya
     ports: []
-  
+    command: 'exit'
+
   rubypitaya-commands:
     <<: *rubypitaya
     depends_on:
       - 'db'
     ports: []
+    command: 'exit'
 
 volumes:
   postgres:

data/lib/rubypitaya/core/config_core.rb

@@ -46,7 +46,7 @@ module RubyPitaya
     def load_config_file(configs_folder_path, file_path)
       config_text = File.open(file_path, &:read)
       config_hash = JSON.parse(config_text, symbolize_names: true)
-      config_hash.extend(ConfigHashExtension)
+      config_hash.extend(ConfigHashExtension) if config_hash.is_a?(Hash)
 
       file_name = file_path.sub(/^#{configs_folder_path}/, '')[0..-6]
 

data/lib/rubypitaya/core/etcd_connector.rb

@@ -6,7 +6,7 @@ module RubyPitaya
   class EtcdConnector
 
     def initialize(server_uuid, desktop_name, server_name, etcd_prefix,
-                   etcd_address, allow_reconnect, lease_seconds)
+                   etcd_address, allow_reconnect, lease_seconds, log)
       @server_uuid = server_uuid
       @server_name = server_name
       @desktop_name = desktop_name
@@ -14,6 +14,7 @@ module RubyPitaya
       @etcd_address = etcd_address
       @allow_reconnect = allow_reconnect
       @lease_seconds = lease_seconds
+      @log = log
 
       @renew_connection_seconds = lease_seconds / 2.0
 
@@ -27,7 +28,7 @@ module RubyPitaya
       connection_value = get_connection_value
 
       @connection = Etcdv3.new(endpoints: @etcd_address,
-                              allow_reconnect: @allow_reconnect)
+                               allow_reconnect: @allow_reconnect)
 
       @lease = @connection.lease_grant(@lease_seconds)
 
@@ -40,6 +41,7 @@ module RubyPitaya
     end
 
     def disconnect
+      stop_renew_connection
       @connection.del(get_connection_key)
     end
 
@@ -60,15 +62,23 @@ module RubyPitaya
         loop do
           sleep(@renew_connection_seconds)
 
-          @lease = @connection.lease_grant(@lease_seconds)
-          @connection.put(@renew_connection_key, @renew_connection_value,
-                          lease: @lease.ID)
+          begin
+            @lease = @connection.lease_keep_alive_once(@lease.ID)
+
+            if @lease.TTL == 0
+              @lease = @connection.lease_grant(@lease_seconds)
+              @connection.put(@renew_connection_key, @renew_connection_value, lease: @lease.ID)
+            end
+
+          rescue Exception => error
+            @log.error "ETCD RENEW ERROR: #{error.class} | #{error.message}} \n #{error.backtrace.join("\n")}"
+          end
         end
       end
     end
 
     def stop_renew_connection
-      @renew_connection_thread.exit unless @renew_connection_thread.nil?
+      @renew_connection_thread.exit.join unless @renew_connection_thread.nil?
     end
 
     def get_server_data

data/lib/rubypitaya/core/main.rb

@@ -50,12 +50,12 @@ module RubyPitaya
 
       @etcd_prefix = @setup['rubypitaya.etcd.prefix']
       @etcd_address = @setup['rubypitaya.etcd.url']
-      @etcd_lease_seconds = @setup['rubypitaya.etcd.leaseSeconds'].to_i
+      @etcd_lease_seconds = @setup['rubypitaya.etcd.leaseSeconds']
       @allow_reconnect = false
       @etcd_connector = EtcdConnector.new(@service_uuid, @desktop_name,
                                           @server_name, @etcd_prefix,
                                           @etcd_address, @allow_reconnect,
-                                          @etcd_lease_seconds)
+                                          @etcd_lease_seconds, @log)
       @etcd_connector.connect
 
       @nats_address = @setup['rubypitaya.nats.url']
@@ -148,63 +148,64 @@ module RubyPitaya
     end
 
     def run_nats_connection
-      @nats_connector.connect do |request|
-        start_time_seconds = Time.now.to_f
-
-        message_route = request[:msg][:route]
-        message_data = request[:msg][:data]
-        message_json = JSON.parse(message_data) if !message_data.nil? && !message_data.empty?
-
-        params = Parameters.new(message_json || {})
-
-        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)
-        frontend_id = request[:frontendID]
-        metadata = request[:metadata]
-        metadata = JSON.parse(metadata, symbolize_names: true)
-
-        @session.update(session_id, session_uid, session_data, metadata,
-                        frontend_id)
-
-        handler_name, action_name = message_route.scan(/\A\w+\.(\w+)\.(\w+)\z/)[0]
-
-        @log.info "request  -> route: #{message_route}"
-        @log.info "         -> data:  #{message_data}"
-
-        @config.clear_cache
-
-        response = {}
-
-        begin
-          response = @handler_router.call(handler_name, action_name, @session,
-                                          @postman, @services, @setup, @config,
-                                          @log, params)
-        rescue RouteError => error
-          @log.error "ROUTE ERROR: #{error.code} | #{error.class} | #{error.message} \n #{error.backtrace.join("\n")}"
-          response = {
-            code: error.code,
-            message: error.message
-          }
-        rescue Exception => error
-          @log.error "INTERNAL ERROR: #{error.class} | #{error.message} \n #{error.backtrace.join("\n")}"
-          response = {
-            code: StatusCodes::CODE_INTERNAL_ERROR,
-            message: StatusCodes::MESSAGE_INTERNAL_ERROR,
-          }
+      loop do
+        @nats_connector.connect do |request|
+          start_time_seconds = Time.now.to_f
+
+          message_route = request[:msg][:route]
+          message_data = request[:msg][:data]
+          message_json = JSON.parse(message_data) if !message_data.nil? && !message_data.empty?
+
+          params = Parameters.new(message_json || {})
+
+          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)
+          frontend_id = request[:frontendID]
+          metadata = request[:metadata]
+          metadata = JSON.parse(metadata, symbolize_names: true)
+
+          @session.update(session_id, session_uid, session_data, metadata,
+                          frontend_id)
+
+          handler_name, action_name = message_route.scan(/\A\w+\.(\w+)\.(\w+)\z/)[0]
+
+          @log.info "request  -> route: #{message_route}"
+          @log.info "         -> data:  #{message_data}"
+
+          @config.clear_cache
+
+          response = {}
+
+          begin
+            response = @handler_router.call(handler_name, action_name, @session,
+                                            @postman, @services, @setup, @config,
+                                            @log, params)
+          rescue RouteError => error
+            @log.error "ROUTE ERROR: #{error.code} | #{error.class} | #{error.message} \n #{error.backtrace.join("\n")}"
+            response = {
+              code: error.code,
+              message: error.message
+            }
+          rescue Exception => error
+            @log.error "INTERNAL ERROR: #{error.class} | #{error.message} \n #{error.backtrace.join("\n")}"
+            response = {
+              code: StatusCodes::CODE_INTERNAL_ERROR,
+              message: StatusCodes::MESSAGE_INTERNAL_ERROR,
+            }
+          end
+
+          response_json = JSON.generate(response)
+          delta_time_seconds = ((Time.now.to_f - start_time_seconds) * 1000).round(2)
+
+          @log.info "response [#{delta_time_seconds}ms] -> #{response_json}"
+
+          response_json
         end
-
-        response_json = JSON.generate(response)
-        delta_time_seconds = ((Time.now.to_f - start_time_seconds) * 1000).round(2)
-
-        @log.info "response [#{delta_time_seconds}ms] -> #{response_json}"
-
-        response_json
+        rescue Exception => error
+          @log.error "INTERNAL ERROR: #{error.class} | #{error.message}} \n #{error.backtrace.join("\n")}"
       end
-      rescue Exception => error
-        @log.error "INTERNAL ERROR: #{error.class} | #{error.message}} \n #{error.backtrace.join("\n")}"
-        run_nats_connection
     end
   end
 end

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '3.15.2'
+  VERSION = '3.16.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 3.15.2
+  version: 3.16.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-22 00:00:00.000000000 Z
+date: 2023-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -269,6 +269,8 @@ files:
 - "./lib/rubypitaya/app-template/docker/dev/Dockerfile"
 - "./lib/rubypitaya/app-template/docker/entrypoint.sh"
 - "./lib/rubypitaya/app-template/docker/prod/Dockerfile"
+- "./lib/rubypitaya/app-template/docker/stag/docker-compose.stag.yaml"
+- "./lib/rubypitaya/app-template/docker/stag/update_image"
 - "./lib/rubypitaya/app-template/docker/wait_for.sh"
 - "./lib/rubypitaya/app-template/features/hello_world.feature"
 - "./lib/rubypitaya/app-template/features/player.feature"