rubypitaya 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 931cb18a2775c209f73bb7a6b3894e07345fbb5eba18850602a7756ca3fd20ae
-  data.tar.gz: 91f1e1bd1f5c6d7a7ce77a236092840d6cb7a8671b2834a40d517e313c5975be
+  metadata.gz: d50d6d5ffeeab38f9d623c33970eb87e4e89ad64e385f4fe57a8d414342e969a
+  data.tar.gz: 7fb8db293deae83dd0de428a825588b9ca6418eab26a220ab983ac6b1737ab69
 SHA512:
-  metadata.gz: c9e8ecc54cd14a666f5b4f500a702f78f6788756c6bb61b3ae6ea84d2b473f1bf0bb7443e5390a9ea5a2aaeda6cc9968dfdb179e3e3ed38f8b3f7fc235326657
-  data.tar.gz: 1ccb6fc931ecd72552496174d578344795066bcb56b5209ae2f11644a4bea6f1775ac9cbccbc5e72ff0df85be98a4c824eda43f296e092cd3f439b81e2a33ec9
+  metadata.gz: 88510c87137b193a0f4f1f2a12ad7fd7c2c9acb1be8d2aaeee7545b8f1832b380b4e57a4e9d072deef7e526cc87dfd86461584933fc4e9e0d5f466c520408831
+  data.tar.gz: 341555828f6ed7c3996210cf64bc21cc36e756940b1f506cf81f62aaecbc0aadb18fe07fb9cc6c525d3455c4d45ff22e82efa257e6eee63d41b59b502a85c2c9

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '3.0.0'
+gem 'rubypitaya', '3.0.1'
 
 group :development do
   gem 'pry', '0.14.1'

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

@@ -52,10 +52,10 @@ GEM
       grpc (~> 1.17)
     eventmachine (1.2.7)
     ffi (1.15.4)
-    google-protobuf (3.18.0)
+    google-protobuf (3.18.0-x86_64-linux)
     googleapis-common-protos-types (1.2.0)
       google-protobuf (~> 3.14)
-    grpc (1.40.0)
+    grpc (1.40.0-x86_64-linux)
       google-protobuf (~> 3.15)
       googleapis-common-protos-types (~> 1.0)
     i18n (1.8.10)
@@ -64,7 +64,6 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     method_source (1.0.0)
-    middleware (0.1.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0901)
@@ -79,11 +78,6 @@ GEM
       eventmachine (~> 1.2, >= 1.2)
     ostruct (0.4.0)
     pg (1.2.3)
-    protobuf (3.10.4)
-      activesupport (>= 3.2)
-      middleware
-      thor
-      thread_safe
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -109,14 +103,14 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
     ruby2_keywords (0.0.5)
-    rubypitaya (3.0.0)
+    rubypitaya (3.0.1)
       activerecord (= 6.1.4.1)
       etcdv3 (= 0.11.4)
+      google-protobuf (= 3.18.0)
       mongo (= 2.15.0)
       nats (= 0.11.0)
       ostruct (= 0.4.0)
       pg (= 1.2.3)
-      protobuf (= 3.10.4)
       rake (= 13.0.6)
       redis (= 4.4.0)
       sinatra (= 2.1.0)
@@ -135,8 +129,6 @@ GEM
       tilt (~> 2.0)
     sys-uname (1.2.2)
       ffi (~> 1.1)
-    thor (1.1.0)
-    thread_safe (0.3.6)
     tilt (2.0.10)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
@@ -144,7 +136,7 @@ GEM
     zeitwerk (2.4.2)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   bundler (= 2.2.22)
@@ -152,7 +144,7 @@ DEPENDENCIES
   listen (= 3.7.0)
   pry (= 0.14.1)
   rspec (= 3.10.0)
-  rubypitaya (= 3.0.0)
+  rubypitaya (= 3.0.1)
 
 BUNDLED WITH
    2.2.22

data/lib/rubypitaya/core/nats_connector.rb

@@ -1,5 +1,7 @@
-require 'protobuf'
 require 'nats/client'
+require 'google/protobuf'
+
+require 'rubypitaya/core/protos/nats_connector_pb'
 
 module RubyPitaya
 
@@ -23,14 +25,16 @@ module RubyPitaya
       NATS.start(:servers => [@nats_address]) do |nc|
 
         NATS.subscribe(subscribe_topic) do |message, reply, a, b|
-          request = NatsRequest.decode(message).to_hash
+          request = NatsRequest.decode(message).to_h
 
           Fiber.new do
             response = yield request
 
             nats_response = NatsResponse.new(data: response.to_json)
 
-            NATS.publish(reply, nats_response)
+            response = NatsResponse.encode(nats_response)
+
+            NATS.publish(reply, response)
           end.resume
         end
 
@@ -61,8 +65,11 @@ module RubyPitaya
         metadata: session.metadata.to_json,
       )
 
-      nats_response = NATS.request(frontend_topic, nats_request)
-      response = NatsResponse.decode(nats_response).to_hash
+      request = NatsRequest.encode(nats_request)
+
+      nats_response = NATS.request(frontend_topic, request)
+
+      response = NatsResponse.decode(nats_response).to_h
 
       response
     end
@@ -93,56 +100,4 @@ module RubyPitaya
       "pitaya/connector/user/#{uid}/push"
     end
   end
-
-  class NatsSession < ::Protobuf::Message; end
-  class NatsMessage < ::Protobuf::Message; end
-  class NatsRequest < ::Protobuf::Message; end
-  class NatsResponse < ::Protobuf::Message; end
-  class NatsError < ::Protobuf::Message; end
-  class NatsBindMsg < ::Protobuf::Message; end
-  class NatsPush < ::Protobuf::Message; end
-
-  class NatsSession
-    optional :int32, :id, 1
-    optional :bytes, :uid, 2
-    optional :bytes, :data, 3
-  end
-
-  class NatsMessage
-    optional :int32, :id, 1
-    optional :bytes, :route, 2
-    optional :bytes, :data, 3
-    optional :bytes, :reply, 4
-    optional :int32, :type,  5
-  end
-
-  class NatsRequest
-    optional :int32, :type, 1
-    optional NatsSession, :session, 2
-    optional NatsMessage, :msg, 3
-    optional :bytes, :frontendID, 4
-    optional :bytes, :metadata, 5
-  end
-
-  class NatsError
-    optional :bytes, :code, 1
-    optional :bytes, :message, 2
-    optional :bytes, :metadata, 3
-  end
-
-  class NatsResponse
-    optional :bytes, :data, 1
-    optional NatsError, :error, 2
-  end
-
-  class NatsBindMsg
-    optional :bytes, :uid, 1
-    optional :bytes, :fid, 2
-  end
-
-  class NatsPush
-    optional :bytes, :route, 1
-    optional :bytes, :uid, 2
-    optional :bytes, :data, 3
-  end
 end

data/lib/rubypitaya/core/postman.rb

@@ -19,7 +19,9 @@ module RubyPitaya
         data: session.data.to_json,
       )
 
-      response = @nats_connector.push_to_frontend(session, route, nats_session)
+      payload = NatsSession.encode(nats_session)
+
+      response = @nats_connector.push_to_frontend(session, route, payload)
 
       response
     end

data/lib/rubypitaya/core/protos/nats_connector.proto

@@ -0,0 +1,47 @@
+syntax = "proto3";
+
+package RubyPitaya;
+
+message NatsSession {
+	optional int32 id = 1;
+	optional bytes uid = 2;
+	optional bytes data = 3;
+}
+
+message NatsMessage {
+	optional int32 id = 1;
+	optional bytes route = 2;
+	optional bytes data = 3;
+	optional bytes reply = 4;
+	optional int32 type = 5;
+}
+
+message NatsRequest {
+	optional int32 type = 1;
+	optional NatsSession session = 2;
+	optional NatsMessage msg = 3;
+	optional bytes frontendID = 4;
+	optional bytes metadata = 5;
+}
+
+message NatsError {
+	optional bytes code = 1;
+	optional bytes message = 2;
+	optional bytes metadata = 3;
+}
+
+message NatsResponse {
+	optional bytes data = 1;
+	optional NatsError error = 2;
+}
+
+message NatsBindMsg {
+	optional bytes uid = 1;
+	optional bytes fid = 2;
+}
+
+message NatsPush {
+	optional bytes route = 1;
+	optional bytes uid = 2;
+	optional bytes data = 3;
+}

data/lib/rubypitaya/core/protos/nats_connector_pb.rb

@@ -0,0 +1,56 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: nats_connector.proto
+
+require 'google/protobuf'
+
+Google::Protobuf::DescriptorPool.generated_pool.build do
+  add_file("nats_connector.proto", :syntax => :proto3) do
+    add_message "RubyPitaya.NatsSession" do
+      proto3_optional :id, :int32, 1
+      proto3_optional :uid, :bytes, 2
+      proto3_optional :data, :bytes, 3
+    end
+    add_message "RubyPitaya.NatsMessage" do
+      proto3_optional :id, :int32, 1
+      proto3_optional :route, :bytes, 2
+      proto3_optional :data, :bytes, 3
+      proto3_optional :reply, :bytes, 4
+      proto3_optional :type, :int32, 5
+    end
+    add_message "RubyPitaya.NatsRequest" do
+      proto3_optional :type, :int32, 1
+      proto3_optional :session, :message, 2, "RubyPitaya.NatsSession"
+      proto3_optional :msg, :message, 3, "RubyPitaya.NatsMessage"
+      proto3_optional :frontendID, :bytes, 4
+      proto3_optional :metadata, :bytes, 5
+    end
+    add_message "RubyPitaya.NatsError" do
+      proto3_optional :code, :bytes, 1
+      proto3_optional :message, :bytes, 2
+      proto3_optional :metadata, :bytes, 3
+    end
+    add_message "RubyPitaya.NatsResponse" do
+      proto3_optional :data, :bytes, 1
+      proto3_optional :error, :message, 2, "RubyPitaya.NatsError"
+    end
+    add_message "RubyPitaya.NatsBindMsg" do
+      proto3_optional :uid, :bytes, 1
+      proto3_optional :fid, :bytes, 2
+    end
+    add_message "RubyPitaya.NatsPush" do
+      proto3_optional :route, :bytes, 1
+      proto3_optional :uid, :bytes, 2
+      proto3_optional :data, :bytes, 3
+    end
+  end
+end
+
+module RubyPitaya
+  NatsSession = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("RubyPitaya.NatsSession").msgclass
+  NatsMessage = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("RubyPitaya.NatsMessage").msgclass
+  NatsRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("RubyPitaya.NatsRequest").msgclass
+  NatsError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("RubyPitaya.NatsError").msgclass
+  NatsResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("RubyPitaya.NatsResponse").msgclass
+  NatsBindMsg = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("RubyPitaya.NatsBindMsg").msgclass
+  NatsPush = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("RubyPitaya.NatsPush").msgclass
+end

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -137,33 +137,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.7.0
 - !ruby/object:Gem::Dependency
-  name: protobuf
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.10.4
+        version: 6.1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.10.4
+        version: 6.1.4.1
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.1
+        version: 3.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.1
+        version: 3.18.0
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -353,6 +353,8 @@ files:
 - "./lib/rubypitaya/core/parameters.rb"
 - "./lib/rubypitaya/core/path.rb"
 - "./lib/rubypitaya/core/postman.rb"
+- "./lib/rubypitaya/core/protos/nats_connector.proto"
+- "./lib/rubypitaya/core/protos/nats_connector_pb.rb"
 - "./lib/rubypitaya/core/redis_connector.rb"
 - "./lib/rubypitaya/core/routes_base.rb"
 - "./lib/rubypitaya/core/session.rb"