rubypitaya 3.3.4 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e526e596bef23aa113c700a8e2ab6311241ebd9257d2f030026cf53ed3d49d5
-  data.tar.gz: 5f932845d7c382c26c4c948508fd1855fb4dfb3eecc533f0560c378ce6c87f92
+  metadata.gz: a3416fbf6a02d6e883d1f97b9f4c6ca36e246043ff2541ef690cc13170cdd727
+  data.tar.gz: 961e1d3f9a24f416e3a37ef422358dfc6a89677f369816999550c7d76215c571
 SHA512:
-  metadata.gz: 025faa43f9e73e44f79a6cad82815ba445fb14be623a99dcf560200b2d4002b5fdf2e3ab8429eefd5110aa30611ca5eb3965f01da65ed6c3ba06e386962294e4
-  data.tar.gz: 4d8f19ca632af76c3329a9d658522089d776baba03b6fc6c83e8e61e8607b26479738d5836feb08da52967d82ddf606bfc92fec026d1849d190018dffb45230e
+  metadata.gz: 3892526f8d71b6a11448309ac6c1176a698ca46cfcda9b2c49a5860a2ed5913ffa285cc736ad39a23d480d6aebbd4ad8ea3a7352f2cd5cf8a48f2956ec02339f
+  data.tar.gz: c57731543e86c6c161ead30fc84800f1c60c7895d18722ec47018da758736cd5d8cd1c5a6616a31307e910e838636587f701e1e37d76301e85fb44f1b2a6795a

data/lib/rubypitaya/app-template/Gemfile

@@ -1,12 +1,12 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '3.3.4'
+gem 'rubypitaya', '3.4.0'
 
 group :development do
   gem 'pry', '0.14.1'
-  gem 'rspec', '3.10.0'
-  gem 'listen', '3.7.0'
-  gem 'bundler', '2.2.22'
-  gem 'cucumber', '7.0.0'
+  gem 'rspec', '3.11.0'
+  gem 'listen', '3.7.1'
+  gem 'bundler', '2.2.32'
+  gem 'cucumber', '7.1.0'
   gem 'sinatra-contrib', '2.1.0'
 end

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

@@ -103,7 +103,7 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
     ruby2_keywords (0.0.5)
-    rubypitaya (3.3.4)
+    rubypitaya (3.4.0)
       activerecord (= 6.1.4.1)
       etcdv3 (= 0.11.4)
       google-protobuf (= 3.18.1)
@@ -143,7 +143,7 @@ DEPENDENCIES
   listen (= 3.7.0)
   pry (= 0.14.1)
   rspec (= 3.10.0)
-  rubypitaya (= 3.3.4)
+  rubypitaya (= 3.4.0)
   sinatra-contrib (= 2.1.0)
 
 BUNDLED WITH

data/lib/rubypitaya/app-template/Makefile

@@ -13,6 +13,8 @@ run:
 ## Build project
 build:
 	@docker-compose build
+	@echo "Copying vendor folder ..."
+	@sh -c "FOLDER=$(notdir $(shell pwd)); CONTAINER="\$${FOLDER}_rubypitaya"; docker cp \$$(docker create \$${CONTAINER}):/app/rubypitaya/vendor ."
 
 ## Run ruby irb console
 console:
@@ -41,7 +43,7 @@ test-cucumber:
 ## Update gems dependencies on Gemfile.lock
 update-dependencies:
 	@rm -f Gemfile.lock
-	@docker run --rm -v "$(PWD)":/usr/src/app -w /usr/src/app ruby:3.0.2 bundle install
+	@docker run --rm -v "$(PWD)":/usr/src/app -w /usr/src/app ruby:3.0.3 bundle install
 
 ## + Improve metagame
 

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

@@ -26,6 +26,7 @@ mongo:
   user: 'user'
   pass: 'password'
   database: admin
+  enabled: true
 
 http:
   auth:

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

@@ -1,4 +1,4 @@
-FROM ruby:3.0.2-slim
+FROM ruby:3.0.3-slim
 
 ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
@@ -18,6 +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 install
 
 COPY . .

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

@@ -1,4 +1,4 @@
-FROM ruby:3.0.2-slim as builder
+FROM ruby:3.0.3-slim as builder
 
 RUN apt update && \ 
     apt install -y --no-install-recommends \ 
@@ -29,7 +29,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.0.2-slim
+FROM ruby:3.0.3-slim
 
 ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8

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

@@ -79,8 +79,8 @@ services:
       dockerfile: 'docker/dev/Dockerfile'
     working_dir: '/app/rubypitaya'
     volumes:
-      - '.:/app/rubypitaya'
-      - '/var/run/docker.sock:/var/run/docker.sock'
+      - .:/app/rubypitaya
+      - /app/rubypitaya/vendor
     ports:
       - '80:4567'
     environment:

data/lib/rubypitaya/app-template/helm/templates/config-maps/nginx-config.yaml

@@ -6,4 +6,39 @@ data:
   nginx.conf: "events {\n    worker_connections  1024;\n}\n\nstream {\n    server
     {\n        listen  {{ .Values.gameserver.externalport.first }}-{{ .Values.gameserver.externalport.last }};\n        \n        resolver kube-dns.kube-system.svc.cluster.local
     valid=5s;\n\n        proxy_pass  gameserver-$server_port.gameserver.{{ .Values.namespace }}.svc.cluster.local:{{ .Values.gameserver.gameport }};\n
-    \   }\n}\n"
+    \   }\n}\n"
+
+# {{- $initialValue := int .Values.gameserver.externalport.first }}
+# {{- $finalValue := add .Values.gameserver.externalport.last 1 }}
+# {{- $finalValue = int $finalValue }}
+# apiVersion: v1
+# kind: ConfigMap
+# metadata:
+#   name: nginx-config
+# data:
+#   nginx.conf: |
+#     events {
+#         worker_connections  1024;
+#     }
+#     
+#     stream {
+#         map $server_port $server_number {
+#           {{- range untilStep $initialValue $finalValue 1 }}
+#             {{- $port := . }}
+#             {{- $number := sub $port $initialValue }}
+#             {{ $port }} {{ $number }};
+#           {{- end }}
+#         }
+# 
+#         server {
+#             listen  {{ .Values.gameserver.externalport.first }}-{{ .Values.gameserver.externalport.last }};
+#             
+#             resolver kube-dns.kube-system.svc.cluster.local valid=5s;
+#     
+#             proxy_pass  gameserver-$server_number.gameserver.{{ .Values.namespace }}.svc.cluster.local:{{ .Values.gameserver.gameport }};
+#         }
+#     }
+
+#    map $server_port $stack_number {
+#        ~\d\d(.+)$ $1;
+#    }

data/lib/rubypitaya/core/application_files_importer.rb

@@ -4,12 +4,15 @@ module RubyPitaya
 
   class ApplicationFilesImporter
 
-    def import
+    def import(is_cheats_enabled)
       app_folder_paths = Path::Plugins::APP_FOLDER_PATHS + [Path::Core::APP_FOLDER_PATH, Path::APP_FOLDER_PATH]
 
       app_folder_paths.each do |app_folder_path|
         app_files_path = "#{app_folder_path}/**/*.rb"
 
+        gem_files = Gem.find_files(app_files_path)
+        gem_files = gem_files.select { |a| !a[/.+_cheats.rb/] && !a[/.+_cheat.rb/] } unless is_cheats_enabled
+
         Gem.find_files(app_files_path).each do |path|
           require path unless path.include?('app/migrations')
         end

data/lib/rubypitaya/core/handler_router.rb

@@ -45,7 +45,10 @@ module RubyPitaya
 
     def import_handler_classes
       handler_classes = ObjectSpace.each_object(HandlerBase.singleton_class).select do |klass|
-        klass != HandlerBase
+        class_name = klass.to_s.downcase
+        is_cheat_class = class_name.end_with?('cheat') || class_name.end_with?('cheats')
+
+        klass != HandlerBase && (@is_cheats_enabled || !is_cheat_class)
       end
 
       @handlers = handler_classes.map { |handler_class| handler_class.new }

data/lib/rubypitaya/core/main.rb

@@ -32,6 +32,7 @@ module RubyPitaya
     def initialize
       @setup = Setup.new
       @environment_name = @setup.fetch('rubypitaya.server.environment', 'development')
+      @is_cheats_enabled = @setup.fetch('rubypitaya.server.cheats', false)
       @is_development_environment = @environment_name == 'development'
       @setup.auto_reload if @is_development_environment
 
@@ -42,7 +43,7 @@ module RubyPitaya
       end
 
       @application_files_importer = ApplicationFilesImporter.new
-      @application_files_importer.import
+      @application_files_importer.import(@is_cheats_enabled)
       @application_files_importer.auto_reload if @is_development_environment
 
       @server_name = @setup['rubypitaya.server.name']
@@ -71,13 +72,14 @@ module RubyPitaya
       @database_connector = DatabaseConnector.new(@database_config, @log)
       @database_connector.connect
 
+      @mongo_enabled = @setup['rubypitaya.mongo.enabled']
       @mongo_address = @setup['rubypitaya.mongo.url']
       @mongo_user = @setup['rubypitaya.mongo.user']
       @mongo_password = @setup['rubypitaya.mongo.pass']
       @mongo_database_name = @setup['rubypitaya.mongo.database']
       @mongo_connector = MongoConnector.new(@mongo_address, @mongo_user,
                                             @mongo_password, @mongo_database_name)
-      @mongo_connector.connect
+      @mongo_connector.connect if @mongo_enabled
 
       @session = Session.new
       @postman = Postman.new(@nats_connector)
@@ -94,7 +96,6 @@ module RubyPitaya
       @initializer_broadcast = InitializerBroadcast.new
       @initializer_broadcast.run(@initializer_content)
 
-      @is_cheats_enabled = @setup.fetch('rubypitaya.server.cheats', false)
       @handler_router = HandlerRouter.new(@is_cheats_enabled)
 
       run_http
@@ -147,6 +148,7 @@ module RubyPitaya
       @log.info "Server shutting down..."
 
       @etcd_connector.disconnect
+      @nats_connector.disconnect
       @database_connector.disconnect
 
       exit(0)
@@ -193,6 +195,12 @@ module RubyPitaya
             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
 
         delta_time_seconds = ((Time.now.to_f - start_time_seconds) * 1000).round(2)

data/lib/rubypitaya/core/nats_connector.rb

@@ -19,28 +19,41 @@ module RubyPitaya
       @server_uuid = server_uuid
       @server_name = server_name
       @nats_address = nats_address
+      @nats = nil
+      @subscribe = nil
     end
 
     def connect
-      NATS.start(:servers => [@nats_address]) do |nc|
+      self.disconnect
 
-        NATS.subscribe(subscribe_topic) do |message, reply, a, b|
-          request = NatsRequest.decode(message).to_h
+      @nats = NATS.connect(servers: [@nats_address])
+      @subscribe = @nats.subscribe(subscribe_topic)
 
-          Fiber.new do
-            response = yield request
+      loop do
+        message = @subscribe.pending_queue.pop
+        @subscribe.synchronize do
+          @subscribe.pending_size -= message.data.size
+        end
 
-            nats_response = NatsResponse.new(data: response.to_json)
+        request = NatsRequest.decode(message.data).to_h
 
-            response = NatsResponse.encode(nats_response)
+        response = yield request
 
-            NATS.publish(reply, response)
-          end.resume
-        end
+        nats_response = NatsResponse.new(data: response.to_json)
+        response = NatsResponse.encode(nats_response)
 
+        @nats.publish(message.reply, response)
       end
     end
 
+    def disconnect
+      @subscribe.unsubscribe unless @subscribe.nil?
+      @nats.close unless @nats.nil?
+
+      @nats = nil
+      @subscribe = nil
+    end
+
     def push_to_frontend(session, message_route, payload)
       frontend_topic = get_frontend_topic(session.frontend_id)
 
@@ -67,9 +80,9 @@ module RubyPitaya
 
       request = NatsRequest.encode(nats_request)
 
-      nats_response = NATS.request(frontend_topic, request)
+      nats_response = @nats.request(frontend_topic, request)
 
-      response = NatsResponse.decode(nats_response).to_h
+      response = NatsResponse.decode(nats_response.data).to_h
 
       response
     end
@@ -83,7 +96,7 @@ module RubyPitaya
         data: payload.to_json,
       )
 
-      NATS.publish(user_topic, nats_push)
+      @nats.publish(user_topic, nats_push)
 
       0
     end

data/lib/rubypitaya/core/spec-helpers/handler_spec_helper.rb

@@ -43,6 +43,11 @@ module RubyPitaya
                                          @@postman, @@redis_connector.redis,
                                          @@mongo_connector.mongo, @@setup,
                                          @@config, @@log, params)
+      rescue RouteError => error
+        @@response = {
+          code: error.code,
+          message: error.message
+        }
     end
 
     def response

data/lib/rubypitaya/core/status_codes.rb

@@ -11,6 +11,10 @@ module RubyPitaya
     CODE_ACTION_NOT_FOUND = 'RP-002'
     CODE_NOT_AUTHENTICATED = 'RP-003'
     CODE_AUTHENTICATION_ERROR = 'RP-004'
+    CODE_INTERNAL_ERROR = 'RP-005'
+
+    # Error messages
+    MESSAGE_INTERNAL_ERROR = 'Internal server error'
 
     class Connector
       CODE_UNKNOWN = 'PIT-000'

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '3.3.4'
+  VERSION = '3.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.4.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-27 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -39,131 +39,131 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 13.0.6
 - !ruby/object:Gem::Dependency
-  name: nats
+  name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 2.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 2.17.0
 - !ruby/object:Gem::Dependency
-  name: mongo
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 4.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 4.6.0
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: etcdv3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.5.1
+        version: 0.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.5.1
+        version: 0.11.5
 - !ruby/object:Gem::Dependency
-  name: etcdv3
+  name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
-  name: ostruct
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
-  name: webrick
+  name: nats-pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.1
+        version: 7.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.1
+        version: 7.0.2
 - !ruby/object:Gem::Dependency
   name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.18.1
+        version: 3.19.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.18.1
+        version: 3.19.4
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -184,56 +184,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.7.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.22
+        version: 2.2.32
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.22
+        version: 2.2.32
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -391,7 +391,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Create servers with pitaya