rubypitaya 3.3.6 → 3.4.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/rubypitaya/app-template/Gemfile +5 -5
- data/lib/rubypitaya/app-template/Gemfile.lock +69 -74
- data/lib/rubypitaya/app-template/Makefile +3 -1
- data/lib/rubypitaya/app-template/app/migrations/1606736477_create_player_migration.rb +2 -2
- data/lib/rubypitaya/app-template/app/setup/rubypitaya.yml +1 -0
- data/lib/rubypitaya/app-template/docker/dev/Dockerfile +2 -1
- data/lib/rubypitaya/app-template/docker/prod/Dockerfile +2 -3
- data/lib/rubypitaya/app-template/docker-compose.yml +2 -2
- data/lib/rubypitaya/app-template/helm/templates/config-maps/nginx-config.yaml +36 -1
- data/lib/rubypitaya/core/main.rb +9 -1
- data/lib/rubypitaya/core/nats_connector.rb +26 -13
- data/lib/rubypitaya/core/spec-helpers/handler_spec_helper.rb +5 -0
- data/lib/rubypitaya/core/status_codes.rb +4 -0
- data/lib/rubypitaya/core/templates/template_migration.rb.erb +1 -1
- data/lib/rubypitaya/version.rb +1 -1
- metadata +38 -38
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 782f0fbd940b77a8ec951dec8df3f63cf673feddc6a68219829c5a7a1d9883d4
|
4
|
+
data.tar.gz: 9d107b921e8dabe4d410eae3025d6bd187c61718bf3ee3bc69a7cf449edd0516
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: '055149df21395547a80b581a6d31ef9aa2e7f3edce05a797e0d4e48152bfb22c3133ad0d30430bb2ee062f33f06e608611a5b3e51f8d3535ebc64e546a202535'
|
7
|
+
data.tar.gz: '0292348893de9daa8a9e2590de75755459da6a26517ff77e20842bbb37d48729e5908d6edd46aa9ac4ab0b13c35ac16dd16de624f034528adec3482e88c9a999'
|
@@ -1,12 +1,12 @@
|
|
1
1
|
source "https://rubygems.org"
|
2
2
|
|
3
|
-
gem 'rubypitaya', '3.
|
3
|
+
gem 'rubypitaya', '3.4.2'
|
4
4
|
|
5
5
|
group :development do
|
6
6
|
gem 'pry', '0.14.1'
|
7
|
-
gem 'rspec', '3.
|
8
|
-
gem 'listen', '3.7.
|
9
|
-
gem 'bundler', '2.2.
|
10
|
-
gem 'cucumber', '7.
|
7
|
+
gem 'rspec', '3.11.0'
|
8
|
+
gem 'listen', '3.7.1'
|
9
|
+
gem 'bundler', '2.2.32'
|
10
|
+
gem 'cucumber', '7.1.0'
|
11
11
|
gem 'sinatra-contrib', '2.1.0'
|
12
12
|
end
|
@@ -1,83 +1,79 @@
|
|
1
1
|
GEM
|
2
2
|
remote: https://rubygems.org/
|
3
3
|
specs:
|
4
|
-
activemodel (
|
5
|
-
activesupport (=
|
6
|
-
activerecord (
|
7
|
-
activemodel (=
|
8
|
-
activesupport (=
|
9
|
-
activesupport (
|
4
|
+
activemodel (7.0.2)
|
5
|
+
activesupport (= 7.0.2)
|
6
|
+
activerecord (7.0.2)
|
7
|
+
activemodel (= 7.0.2)
|
8
|
+
activesupport (= 7.0.2)
|
9
|
+
activesupport (7.0.2)
|
10
10
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
11
11
|
i18n (>= 1.6, < 2)
|
12
12
|
minitest (>= 5.1)
|
13
13
|
tzinfo (~> 2.0)
|
14
|
-
|
15
|
-
bson (4.12.1)
|
14
|
+
bson (4.14.1)
|
16
15
|
builder (3.2.4)
|
17
16
|
coderay (1.1.3)
|
18
17
|
concurrent-ruby (1.1.9)
|
19
|
-
cucumber (7.
|
18
|
+
cucumber (7.1.0)
|
20
19
|
builder (~> 3.2, >= 3.2.4)
|
21
|
-
cucumber-core (~> 10.
|
20
|
+
cucumber-core (~> 10.1, >= 10.1.0)
|
22
21
|
cucumber-create-meta (~> 6.0, >= 6.0.1)
|
23
|
-
cucumber-cucumber-expressions (~>
|
24
|
-
cucumber-gherkin (~>
|
25
|
-
cucumber-html-formatter (~>
|
26
|
-
cucumber-messages (~> 17.
|
27
|
-
cucumber-wire (~> 6.
|
22
|
+
cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
|
23
|
+
cucumber-gherkin (~> 22.0, >= 22.0.0)
|
24
|
+
cucumber-html-formatter (~> 17.0, >= 17.0.0)
|
25
|
+
cucumber-messages (~> 17.1, >= 17.1.1)
|
26
|
+
cucumber-wire (~> 6.2, >= 6.2.0)
|
28
27
|
diff-lcs (~> 1.4, >= 1.4.4)
|
29
28
|
mime-types (~> 3.3, >= 3.3.1)
|
30
29
|
multi_test (~> 0.1, >= 0.1.2)
|
31
30
|
sys-uname (~> 1.2, >= 1.2.2)
|
32
|
-
cucumber-core (10.
|
33
|
-
cucumber-gherkin (~>
|
34
|
-
cucumber-messages (~> 17.
|
35
|
-
cucumber-tag-expressions (~>
|
31
|
+
cucumber-core (10.1.1)
|
32
|
+
cucumber-gherkin (~> 22.0, >= 22.0.0)
|
33
|
+
cucumber-messages (~> 17.1, >= 17.1.1)
|
34
|
+
cucumber-tag-expressions (~> 4.1, >= 4.1.0)
|
36
35
|
cucumber-create-meta (6.0.4)
|
37
36
|
cucumber-messages (~> 17.1, >= 17.1.1)
|
38
37
|
sys-uname (~> 1.2, >= 1.2.2)
|
39
|
-
cucumber-cucumber-expressions (
|
40
|
-
cucumber-gherkin (
|
41
|
-
cucumber-messages (~> 17.
|
42
|
-
cucumber-html-formatter (
|
43
|
-
cucumber-messages (~> 17.
|
38
|
+
cucumber-cucumber-expressions (14.0.0)
|
39
|
+
cucumber-gherkin (22.0.0)
|
40
|
+
cucumber-messages (~> 17.1, >= 17.1.1)
|
41
|
+
cucumber-html-formatter (17.0.0)
|
42
|
+
cucumber-messages (~> 17.1, >= 17.1.0)
|
44
43
|
cucumber-messages (17.1.1)
|
45
|
-
cucumber-tag-expressions (
|
46
|
-
cucumber-wire (6.
|
47
|
-
cucumber-core (~> 10.
|
48
|
-
cucumber-cucumber-expressions (~>
|
49
|
-
|
50
|
-
|
51
|
-
etcdv3 (0.11.4)
|
44
|
+
cucumber-tag-expressions (4.1.0)
|
45
|
+
cucumber-wire (6.2.1)
|
46
|
+
cucumber-core (~> 10.1, >= 10.1.0)
|
47
|
+
cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
|
48
|
+
diff-lcs (1.5.0)
|
49
|
+
etcdv3 (0.11.5)
|
52
50
|
grpc (~> 1.17)
|
53
|
-
|
54
|
-
|
55
|
-
google-protobuf (3.18.1-x86_64-linux)
|
51
|
+
ffi (1.15.5)
|
52
|
+
google-protobuf (3.19.4-x86_64-linux)
|
56
53
|
googleapis-common-protos-types (1.3.0)
|
57
54
|
google-protobuf (~> 3.14)
|
58
|
-
grpc (1.
|
59
|
-
google-protobuf (~> 3.
|
55
|
+
grpc (1.43.1-x86_64-linux)
|
56
|
+
google-protobuf (~> 3.18)
|
60
57
|
googleapis-common-protos-types (~> 1.0)
|
61
|
-
i18n (1.
|
58
|
+
i18n (1.9.1)
|
62
59
|
concurrent-ruby (~> 1.0)
|
63
|
-
listen (3.7.
|
60
|
+
listen (3.7.1)
|
64
61
|
rb-fsevent (~> 0.10, >= 0.10.3)
|
65
62
|
rb-inotify (~> 0.9, >= 0.9.10)
|
66
63
|
method_source (1.0.0)
|
67
64
|
mime-types (3.4.1)
|
68
65
|
mime-types-data (~> 3.2015)
|
69
|
-
mime-types-data (3.
|
70
|
-
minitest (5.
|
71
|
-
mongo (2.
|
66
|
+
mime-types-data (3.2022.0105)
|
67
|
+
minitest (5.15.0)
|
68
|
+
mongo (2.17.0)
|
72
69
|
bson (>= 4.8.2, < 5.0.0)
|
73
70
|
multi_json (1.15.0)
|
74
71
|
multi_test (0.1.2)
|
75
72
|
mustermann (1.1.1)
|
76
73
|
ruby2_keywords (~> 0.0.1)
|
77
|
-
nats (0.
|
78
|
-
|
79
|
-
|
80
|
-
pg (1.2.3)
|
74
|
+
nats-pure (2.0.0)
|
75
|
+
ostruct (0.5.3)
|
76
|
+
pg (1.3.1)
|
81
77
|
pry (0.14.1)
|
82
78
|
coderay (~> 1.1)
|
83
79
|
method_source (~> 1.0)
|
@@ -85,34 +81,34 @@ GEM
|
|
85
81
|
rack-protection (2.1.0)
|
86
82
|
rack
|
87
83
|
rake (13.0.6)
|
88
|
-
rb-fsevent (0.11.
|
84
|
+
rb-fsevent (0.11.1)
|
89
85
|
rb-inotify (0.10.1)
|
90
86
|
ffi (~> 1.0)
|
91
|
-
redis (4.
|
92
|
-
rspec (3.
|
93
|
-
rspec-core (~> 3.
|
94
|
-
rspec-expectations (~> 3.
|
95
|
-
rspec-mocks (~> 3.
|
96
|
-
rspec-core (3.
|
97
|
-
rspec-support (~> 3.
|
98
|
-
rspec-expectations (3.
|
87
|
+
redis (4.6.0)
|
88
|
+
rspec (3.11.0)
|
89
|
+
rspec-core (~> 3.11.0)
|
90
|
+
rspec-expectations (~> 3.11.0)
|
91
|
+
rspec-mocks (~> 3.11.0)
|
92
|
+
rspec-core (3.11.0)
|
93
|
+
rspec-support (~> 3.11.0)
|
94
|
+
rspec-expectations (3.11.0)
|
99
95
|
diff-lcs (>= 1.2.0, < 2.0)
|
100
|
-
rspec-support (~> 3.
|
101
|
-
rspec-mocks (3.
|
96
|
+
rspec-support (~> 3.11.0)
|
97
|
+
rspec-mocks (3.11.0)
|
102
98
|
diff-lcs (>= 1.2.0, < 2.0)
|
103
|
-
rspec-support (~> 3.
|
104
|
-
rspec-support (3.
|
99
|
+
rspec-support (~> 3.11.0)
|
100
|
+
rspec-support (3.11.0)
|
105
101
|
ruby2_keywords (0.0.5)
|
106
|
-
rubypitaya (3.
|
107
|
-
activerecord (=
|
108
|
-
etcdv3 (= 0.11.
|
109
|
-
google-protobuf (= 3.
|
110
|
-
mongo (= 2.
|
111
|
-
nats (= 0.
|
112
|
-
ostruct (= 0.
|
113
|
-
pg (= 1.
|
102
|
+
rubypitaya (3.4.2)
|
103
|
+
activerecord (= 7.0.2)
|
104
|
+
etcdv3 (= 0.11.5)
|
105
|
+
google-protobuf (= 3.19.4)
|
106
|
+
mongo (= 2.17.0)
|
107
|
+
nats-pure (= 2.0.0)
|
108
|
+
ostruct (= 0.5.3)
|
109
|
+
pg (= 1.3.1)
|
114
110
|
rake (= 13.0.6)
|
115
|
-
redis (= 4.
|
111
|
+
redis (= 4.6.0)
|
116
112
|
sinatra (= 2.1.0)
|
117
113
|
webrick (= 1.7.0)
|
118
114
|
sinatra (2.1.0)
|
@@ -132,19 +128,18 @@ GEM
|
|
132
128
|
tzinfo (2.0.4)
|
133
129
|
concurrent-ruby (~> 1.0)
|
134
130
|
webrick (1.7.0)
|
135
|
-
zeitwerk (2.5.1)
|
136
131
|
|
137
132
|
PLATFORMS
|
138
133
|
x86_64-linux
|
139
134
|
|
140
135
|
DEPENDENCIES
|
141
|
-
bundler (= 2.2.
|
142
|
-
cucumber (= 7.
|
143
|
-
listen (= 3.7.
|
136
|
+
bundler (= 2.2.32)
|
137
|
+
cucumber (= 7.1.0)
|
138
|
+
listen (= 3.7.1)
|
144
139
|
pry (= 0.14.1)
|
145
|
-
rspec (= 3.
|
146
|
-
rubypitaya (= 3.
|
140
|
+
rspec (= 3.11.0)
|
141
|
+
rubypitaya (= 3.4.2)
|
147
142
|
sinatra-contrib (= 2.1.0)
|
148
143
|
|
149
144
|
BUNDLED WITH
|
150
|
-
2.2.
|
145
|
+
2.2.32
|
@@ -13,6 +13,8 @@ run:
|
|
13
13
|
## Build project
|
14
14
|
build:
|
15
15
|
@docker-compose build
|
16
|
+
@echo "Copying vendor folder ..."
|
17
|
+
@sh -c "FOLDER=$(notdir $(shell pwd)); CONTAINER="\$${FOLDER}_rubypitaya"; docker cp \$$(docker create \$${CONTAINER}):/app/rubypitaya/vendor ."
|
16
18
|
|
17
19
|
## Run ruby irb console
|
18
20
|
console:
|
@@ -41,7 +43,7 @@ test-cucumber:
|
|
41
43
|
## Update gems dependencies on Gemfile.lock
|
42
44
|
update-dependencies:
|
43
45
|
@rm -f Gemfile.lock
|
44
|
-
@docker run --rm -v "$(PWD)":/usr/src/app -w /usr/src/app ruby:3.0.
|
46
|
+
@docker run --rm -v "$(PWD)":/usr/src/app -w /usr/src/app ruby:3.0.3 bundle install
|
45
47
|
|
46
48
|
## + Improve metagame
|
47
49
|
|
@@ -1,12 +1,12 @@
|
|
1
1
|
require 'active_record'
|
2
2
|
|
3
|
-
class CreatePlayerMigration < ActiveRecord::Migration[
|
3
|
+
class CreatePlayerMigration < ActiveRecord::Migration[7.0]
|
4
4
|
|
5
5
|
enable_extension 'pgcrypto'
|
6
6
|
|
7
7
|
def change
|
8
8
|
create_table :players, id: :uuid do |t|
|
9
|
-
t.belongs_to :user, type: :uuid
|
9
|
+
t.belongs_to :user, type: :uuid, foreing_key: true, index: { unique: true }
|
10
10
|
t.string :name, null: false
|
11
11
|
t.integer :gold, null: false
|
12
12
|
t.timestamps null: false
|
@@ -1,4 +1,4 @@
|
|
1
|
-
FROM ruby:3.0.
|
1
|
+
FROM ruby:3.0.3-slim
|
2
2
|
|
3
3
|
ENV LANG=C.UTF-8
|
4
4
|
ENV LC_ALL=C.UTF-8
|
@@ -18,6 +18,7 @@ COPY Gemfile Gemfile.lock ./
|
|
18
18
|
RUN bundle config --global jobs 4 && \
|
19
19
|
bundle config --global set clean 'true' \
|
20
20
|
bundle config --global git.allow_insecure true && \
|
21
|
+
bundle config set path './vendor/bundle' && \
|
21
22
|
bundle install
|
22
23
|
|
23
24
|
COPY . .
|
@@ -1,4 +1,4 @@
|
|
1
|
-
FROM ruby:3.0.
|
1
|
+
FROM ruby:3.0.3-slim as builder
|
2
2
|
|
3
3
|
RUN apt update && \
|
4
4
|
apt install -y --no-install-recommends \
|
@@ -19,7 +19,6 @@ RUN rm -rf /usr/local/bundle/cache && \
|
|
19
19
|
rm -rf /usr/local/bundle/build_info && \
|
20
20
|
rm -rf /usr/local/bundle/doc && \
|
21
21
|
rm -rf /usr/local/bundle/doc && \
|
22
|
-
find /usr/local/bundle/gems/grpc-*/src/ruby/lib/grpc/2.4/ -name "*.so" -delete && \
|
23
22
|
find /usr/local/bundle/gems/grpc-*/src/ruby/lib/grpc/2.5/ -name "*.so" -delete && \
|
24
23
|
find /usr/local/bundle/gems/grpc-*/src/ruby/lib/grpc/2.6/ -name "*.so" -delete && \
|
25
24
|
find /usr/local/bundle/gems/grpc-*/src/ruby/lib/grpc/2.7/ -name "*.so" -delete && \
|
@@ -29,7 +28,7 @@ RUN rm -rf /usr/local/bundle/cache && \
|
|
29
28
|
|
30
29
|
# 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
|
31
30
|
|
32
|
-
FROM ruby:3.0.
|
31
|
+
FROM ruby:3.0.3-slim
|
33
32
|
|
34
33
|
ENV LANG=C.UTF-8
|
35
34
|
ENV LC_ALL=C.UTF-8
|
@@ -79,8 +79,8 @@ services:
|
|
79
79
|
dockerfile: 'docker/dev/Dockerfile'
|
80
80
|
working_dir: '/app/rubypitaya'
|
81
81
|
volumes:
|
82
|
-
-
|
83
|
-
-
|
82
|
+
- .:/app/rubypitaya
|
83
|
+
- /app/rubypitaya/vendor
|
84
84
|
ports:
|
85
85
|
- '80:4567'
|
86
86
|
environment:
|
@@ -6,4 +6,39 @@ data:
|
|
6
6
|
nginx.conf: "events {\n worker_connections 1024;\n}\n\nstream {\n server
|
7
7
|
{\n listen {{ .Values.gameserver.externalport.first }}-{{ .Values.gameserver.externalport.last }};\n \n resolver kube-dns.kube-system.svc.cluster.local
|
8
8
|
valid=5s;\n\n proxy_pass gameserver-$server_port.gameserver.{{ .Values.namespace }}.svc.cluster.local:{{ .Values.gameserver.gameport }};\n
|
9
|
-
\ }\n}\n"
|
9
|
+
\ }\n}\n"
|
10
|
+
|
11
|
+
# {{- $initialValue := int .Values.gameserver.externalport.first }}
|
12
|
+
# {{- $finalValue := add .Values.gameserver.externalport.last 1 }}
|
13
|
+
# {{- $finalValue = int $finalValue }}
|
14
|
+
# apiVersion: v1
|
15
|
+
# kind: ConfigMap
|
16
|
+
# metadata:
|
17
|
+
# name: nginx-config
|
18
|
+
# data:
|
19
|
+
# nginx.conf: |
|
20
|
+
# events {
|
21
|
+
# worker_connections 1024;
|
22
|
+
# }
|
23
|
+
#
|
24
|
+
# stream {
|
25
|
+
# map $server_port $server_number {
|
26
|
+
# {{- range untilStep $initialValue $finalValue 1 }}
|
27
|
+
# {{- $port := . }}
|
28
|
+
# {{- $number := sub $port $initialValue }}
|
29
|
+
# {{ $port }} {{ $number }};
|
30
|
+
# {{- end }}
|
31
|
+
# }
|
32
|
+
#
|
33
|
+
# server {
|
34
|
+
# listen {{ .Values.gameserver.externalport.first }}-{{ .Values.gameserver.externalport.last }};
|
35
|
+
#
|
36
|
+
# resolver kube-dns.kube-system.svc.cluster.local valid=5s;
|
37
|
+
#
|
38
|
+
# proxy_pass gameserver-$server_number.gameserver.{{ .Values.namespace }}.svc.cluster.local:{{ .Values.gameserver.gameport }};
|
39
|
+
# }
|
40
|
+
# }
|
41
|
+
|
42
|
+
# map $server_port $stack_number {
|
43
|
+
# ~\d\d(.+)$ $1;
|
44
|
+
# }
|
data/lib/rubypitaya/core/main.rb
CHANGED
@@ -72,13 +72,14 @@ module RubyPitaya
|
|
72
72
|
@database_connector = DatabaseConnector.new(@database_config, @log)
|
73
73
|
@database_connector.connect
|
74
74
|
|
75
|
+
@mongo_enabled = @setup['rubypitaya.mongo.enabled']
|
75
76
|
@mongo_address = @setup['rubypitaya.mongo.url']
|
76
77
|
@mongo_user = @setup['rubypitaya.mongo.user']
|
77
78
|
@mongo_password = @setup['rubypitaya.mongo.pass']
|
78
79
|
@mongo_database_name = @setup['rubypitaya.mongo.database']
|
79
80
|
@mongo_connector = MongoConnector.new(@mongo_address, @mongo_user,
|
80
81
|
@mongo_password, @mongo_database_name)
|
81
|
-
@mongo_connector.connect
|
82
|
+
@mongo_connector.connect if @mongo_enabled
|
82
83
|
|
83
84
|
@session = Session.new
|
84
85
|
@postman = Postman.new(@nats_connector)
|
@@ -147,6 +148,7 @@ module RubyPitaya
|
|
147
148
|
@log.info "Server shutting down..."
|
148
149
|
|
149
150
|
@etcd_connector.disconnect
|
151
|
+
@nats_connector.disconnect
|
150
152
|
@database_connector.disconnect
|
151
153
|
|
152
154
|
exit(0)
|
@@ -193,6 +195,12 @@ module RubyPitaya
|
|
193
195
|
code: error.code,
|
194
196
|
message: error.message
|
195
197
|
}
|
198
|
+
rescue Exception => error
|
199
|
+
@log.error "INTERNAL ERROR: #{error.class} | #{error.message}} \n #{error.backtrace.join("\n")}"
|
200
|
+
response = {
|
201
|
+
code: StatusCodes::CODE_INTERNAL_ERROR,
|
202
|
+
message: StatusCodes::MESSAGE_INTERNAL_ERROR,
|
203
|
+
}
|
196
204
|
end
|
197
205
|
|
198
206
|
delta_time_seconds = ((Time.now.to_f - start_time_seconds) * 1000).round(2)
|
@@ -19,28 +19,41 @@ module RubyPitaya
|
|
19
19
|
@server_uuid = server_uuid
|
20
20
|
@server_name = server_name
|
21
21
|
@nats_address = nats_address
|
22
|
+
@nats = nil
|
23
|
+
@subscribe = nil
|
22
24
|
end
|
23
25
|
|
24
26
|
def connect
|
25
|
-
|
27
|
+
self.disconnect
|
26
28
|
|
27
|
-
|
28
|
-
|
29
|
+
@nats = NATS.connect(servers: [@nats_address])
|
30
|
+
@subscribe = @nats.subscribe(subscribe_topic)
|
29
31
|
|
30
|
-
|
31
|
-
|
32
|
+
loop do
|
33
|
+
message = @subscribe.pending_queue.pop
|
34
|
+
@subscribe.synchronize do
|
35
|
+
@subscribe.pending_size -= message.data.size
|
36
|
+
end
|
32
37
|
|
33
|
-
|
38
|
+
request = NatsRequest.decode(message.data).to_h
|
34
39
|
|
35
|
-
|
40
|
+
response = yield request
|
36
41
|
|
37
|
-
|
38
|
-
|
39
|
-
end
|
42
|
+
nats_response = NatsResponse.new(data: response.to_json)
|
43
|
+
response = NatsResponse.encode(nats_response)
|
40
44
|
|
45
|
+
@nats.publish(message.reply, response)
|
41
46
|
end
|
42
47
|
end
|
43
48
|
|
49
|
+
def disconnect
|
50
|
+
@subscribe.unsubscribe unless @subscribe.nil?
|
51
|
+
@nats.close unless @nats.nil?
|
52
|
+
|
53
|
+
@nats = nil
|
54
|
+
@subscribe = nil
|
55
|
+
end
|
56
|
+
|
44
57
|
def push_to_frontend(session, message_route, payload)
|
45
58
|
frontend_topic = get_frontend_topic(session.frontend_id)
|
46
59
|
|
@@ -67,9 +80,9 @@ module RubyPitaya
|
|
67
80
|
|
68
81
|
request = NatsRequest.encode(nats_request)
|
69
82
|
|
70
|
-
nats_response =
|
83
|
+
nats_response = @nats.request(frontend_topic, request)
|
71
84
|
|
72
|
-
response = NatsResponse.decode(nats_response).to_h
|
85
|
+
response = NatsResponse.decode(nats_response.data).to_h
|
73
86
|
|
74
87
|
response
|
75
88
|
end
|
@@ -83,7 +96,7 @@ module RubyPitaya
|
|
83
96
|
data: payload.to_json,
|
84
97
|
)
|
85
98
|
|
86
|
-
|
99
|
+
@nats.publish(user_topic, nats_push)
|
87
100
|
|
88
101
|
0
|
89
102
|
end
|
@@ -11,6 +11,10 @@ module RubyPitaya
|
|
11
11
|
CODE_ACTION_NOT_FOUND = 'RP-002'
|
12
12
|
CODE_NOT_AUTHENTICATED = 'RP-003'
|
13
13
|
CODE_AUTHENTICATION_ERROR = 'RP-004'
|
14
|
+
CODE_INTERNAL_ERROR = 'RP-005'
|
15
|
+
|
16
|
+
# Error messages
|
17
|
+
MESSAGE_INTERNAL_ERROR = 'Internal server error'
|
14
18
|
|
15
19
|
class Connector
|
16
20
|
CODE_UNKNOWN = 'PIT-000'
|
data/lib/rubypitaya/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rubypitaya
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.
|
4
|
+
version: 3.4.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Luciano Prestes Cavalcanti
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2022-02-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: pg
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 1.
|
19
|
+
version: 1.3.1
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - '='
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 1.
|
26
|
+
version: 1.3.1
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: rake
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -39,131 +39,131 @@ dependencies:
|
|
39
39
|
- !ruby/object:Gem::Version
|
40
40
|
version: 13.0.6
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
|
-
name:
|
42
|
+
name: mongo
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
45
|
- - '='
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version:
|
47
|
+
version: 2.17.0
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - '='
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version:
|
54
|
+
version: 2.17.0
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
|
-
name:
|
56
|
+
name: redis
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
59
|
- - '='
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version:
|
61
|
+
version: 4.6.0
|
62
62
|
type: :runtime
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
66
|
- - '='
|
67
67
|
- !ruby/object:Gem::Version
|
68
|
-
version:
|
68
|
+
version: 4.6.0
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
|
-
name:
|
70
|
+
name: etcdv3
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
73
|
- - '='
|
74
74
|
- !ruby/object:Gem::Version
|
75
|
-
version:
|
75
|
+
version: 0.11.5
|
76
76
|
type: :runtime
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
80
|
- - '='
|
81
81
|
- !ruby/object:Gem::Version
|
82
|
-
version:
|
82
|
+
version: 0.11.5
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
|
-
name:
|
84
|
+
name: ostruct
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
86
86
|
requirements:
|
87
87
|
- - '='
|
88
88
|
- !ruby/object:Gem::Version
|
89
|
-
version: 0.
|
89
|
+
version: 0.5.3
|
90
90
|
type: :runtime
|
91
91
|
prerelease: false
|
92
92
|
version_requirements: !ruby/object:Gem::Requirement
|
93
93
|
requirements:
|
94
94
|
- - '='
|
95
95
|
- !ruby/object:Gem::Version
|
96
|
-
version: 0.
|
96
|
+
version: 0.5.3
|
97
97
|
- !ruby/object:Gem::Dependency
|
98
|
-
name:
|
98
|
+
name: sinatra
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
101
|
- - '='
|
102
102
|
- !ruby/object:Gem::Version
|
103
|
-
version:
|
103
|
+
version: 2.1.0
|
104
104
|
type: :runtime
|
105
105
|
prerelease: false
|
106
106
|
version_requirements: !ruby/object:Gem::Requirement
|
107
107
|
requirements:
|
108
108
|
- - '='
|
109
109
|
- !ruby/object:Gem::Version
|
110
|
-
version:
|
110
|
+
version: 2.1.0
|
111
111
|
- !ruby/object:Gem::Dependency
|
112
|
-
name:
|
112
|
+
name: webrick
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
114
114
|
requirements:
|
115
115
|
- - '='
|
116
116
|
- !ruby/object:Gem::Version
|
117
|
-
version:
|
117
|
+
version: 1.7.0
|
118
118
|
type: :runtime
|
119
119
|
prerelease: false
|
120
120
|
version_requirements: !ruby/object:Gem::Requirement
|
121
121
|
requirements:
|
122
122
|
- - '='
|
123
123
|
- !ruby/object:Gem::Version
|
124
|
-
version:
|
124
|
+
version: 1.7.0
|
125
125
|
- !ruby/object:Gem::Dependency
|
126
|
-
name:
|
126
|
+
name: nats-pure
|
127
127
|
requirement: !ruby/object:Gem::Requirement
|
128
128
|
requirements:
|
129
129
|
- - '='
|
130
130
|
- !ruby/object:Gem::Version
|
131
|
-
version:
|
131
|
+
version: 2.0.0
|
132
132
|
type: :runtime
|
133
133
|
prerelease: false
|
134
134
|
version_requirements: !ruby/object:Gem::Requirement
|
135
135
|
requirements:
|
136
136
|
- - '='
|
137
137
|
- !ruby/object:Gem::Version
|
138
|
-
version:
|
138
|
+
version: 2.0.0
|
139
139
|
- !ruby/object:Gem::Dependency
|
140
140
|
name: activerecord
|
141
141
|
requirement: !ruby/object:Gem::Requirement
|
142
142
|
requirements:
|
143
143
|
- - '='
|
144
144
|
- !ruby/object:Gem::Version
|
145
|
-
version:
|
145
|
+
version: 7.0.2
|
146
146
|
type: :runtime
|
147
147
|
prerelease: false
|
148
148
|
version_requirements: !ruby/object:Gem::Requirement
|
149
149
|
requirements:
|
150
150
|
- - '='
|
151
151
|
- !ruby/object:Gem::Version
|
152
|
-
version:
|
152
|
+
version: 7.0.2
|
153
153
|
- !ruby/object:Gem::Dependency
|
154
154
|
name: google-protobuf
|
155
155
|
requirement: !ruby/object:Gem::Requirement
|
156
156
|
requirements:
|
157
157
|
- - '='
|
158
158
|
- !ruby/object:Gem::Version
|
159
|
-
version: 3.
|
159
|
+
version: 3.19.4
|
160
160
|
type: :runtime
|
161
161
|
prerelease: false
|
162
162
|
version_requirements: !ruby/object:Gem::Requirement
|
163
163
|
requirements:
|
164
164
|
- - '='
|
165
165
|
- !ruby/object:Gem::Version
|
166
|
-
version: 3.
|
166
|
+
version: 3.19.4
|
167
167
|
- !ruby/object:Gem::Dependency
|
168
168
|
name: pry
|
169
169
|
requirement: !ruby/object:Gem::Requirement
|
@@ -184,56 +184,56 @@ dependencies:
|
|
184
184
|
requirements:
|
185
185
|
- - '='
|
186
186
|
- !ruby/object:Gem::Version
|
187
|
-
version: 3.
|
187
|
+
version: 3.11.0
|
188
188
|
type: :development
|
189
189
|
prerelease: false
|
190
190
|
version_requirements: !ruby/object:Gem::Requirement
|
191
191
|
requirements:
|
192
192
|
- - '='
|
193
193
|
- !ruby/object:Gem::Version
|
194
|
-
version: 3.
|
194
|
+
version: 3.11.0
|
195
195
|
- !ruby/object:Gem::Dependency
|
196
196
|
name: listen
|
197
197
|
requirement: !ruby/object:Gem::Requirement
|
198
198
|
requirements:
|
199
199
|
- - '='
|
200
200
|
- !ruby/object:Gem::Version
|
201
|
-
version: 3.7.
|
201
|
+
version: 3.7.1
|
202
202
|
type: :development
|
203
203
|
prerelease: false
|
204
204
|
version_requirements: !ruby/object:Gem::Requirement
|
205
205
|
requirements:
|
206
206
|
- - '='
|
207
207
|
- !ruby/object:Gem::Version
|
208
|
-
version: 3.7.
|
208
|
+
version: 3.7.1
|
209
209
|
- !ruby/object:Gem::Dependency
|
210
210
|
name: bundler
|
211
211
|
requirement: !ruby/object:Gem::Requirement
|
212
212
|
requirements:
|
213
213
|
- - '='
|
214
214
|
- !ruby/object:Gem::Version
|
215
|
-
version: 2.2.
|
215
|
+
version: 2.2.32
|
216
216
|
type: :development
|
217
217
|
prerelease: false
|
218
218
|
version_requirements: !ruby/object:Gem::Requirement
|
219
219
|
requirements:
|
220
220
|
- - '='
|
221
221
|
- !ruby/object:Gem::Version
|
222
|
-
version: 2.2.
|
222
|
+
version: 2.2.32
|
223
223
|
- !ruby/object:Gem::Dependency
|
224
224
|
name: cucumber
|
225
225
|
requirement: !ruby/object:Gem::Requirement
|
226
226
|
requirements:
|
227
227
|
- - '='
|
228
228
|
- !ruby/object:Gem::Version
|
229
|
-
version: 7.
|
229
|
+
version: 7.1.0
|
230
230
|
type: :development
|
231
231
|
prerelease: false
|
232
232
|
version_requirements: !ruby/object:Gem::Requirement
|
233
233
|
requirements:
|
234
234
|
- - '='
|
235
235
|
- !ruby/object:Gem::Version
|
236
|
-
version: 7.
|
236
|
+
version: 7.1.0
|
237
237
|
- !ruby/object:Gem::Dependency
|
238
238
|
name: sinatra-contrib
|
239
239
|
requirement: !ruby/object:Gem::Requirement
|
@@ -391,7 +391,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
391
391
|
- !ruby/object:Gem::Version
|
392
392
|
version: '0'
|
393
393
|
requirements: []
|
394
|
-
rubygems_version: 3.2.
|
394
|
+
rubygems_version: 3.2.32
|
395
395
|
signing_key:
|
396
396
|
specification_version: 4
|
397
397
|
summary: Create servers with pitaya
|