brasa 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3618063ca02e720d10a6a270976219d508a078ff13917d3de2fc9f81d9ab8e73
-  data.tar.gz: 781b40094dfc2baef08fc091d266cb79acd984dfabed6d3f54b9f68e2616c6c7
+  metadata.gz: f58d1ef47800a723afab0a3b260562f7704a4b72e0ac364471a0dcc2b0445078
+  data.tar.gz: c1c9063b7c415605ab60e4bf2deb7274e6780c4bcf7ed7ad755b609c24d2c845
 SHA512:
-  metadata.gz: edbd4b233d795fd78006f054791743985f6a1513c90d37951313739d92a3e1c945cdf5254d7981941400575a23d26e891cb0c991554216419710001912214b22
-  data.tar.gz: c7db4110649d9378c0eb9d5351a15da213a716ca0037612c56632d00ea3cca2bb10e5188d43f1a709bb8dcec35cd2ff874d89f1b5bc0129e2371a08069a0cef0
+  metadata.gz: 60d66b1edd7299319e0ae56964e9b1595a18f7c49879aca09bdf02f5d023d256a31d3ce0d75719964fef60dfcbc55517497fb715ee2c778feacf3648b118742b
+  data.tar.gz: 10b6eed8ee2bf1236e28c83ab98d0d4151da0d3a59bb6efcfb01af585f92a24339a1a53bd7f7e01f5dfc24d7ef9a718e84b19211afda4e3425d5cd39c3ae7b9a

data/lib/brasa/commands/deploy.rb

@@ -50,7 +50,7 @@ module Brasa
         else
           error("\nDeploy falhou.")
         end
-      rescue Websocket::CableClient::ConnectionError => e
+      rescue Brasa::Websocket::CableClient::ConnectionError => e
         $stderr.puts "\n       [WebSocket indisponível: #{e.message}. Usando polling...]"
         wait_for_deploy_polling(slug, deploy_id)
       ensure
@@ -59,7 +59,7 @@ module Brasa
 
       def connect_websocket
         require "brasa/websocket/cable_client"
-        Websocket::CableClient.new.tap(&:connect!)
+        Brasa::Websocket::CableClient.new.tap(&:connect!)
       end
 
       def wait_for_deploy_polling(slug, deploy_id)

data/lib/brasa/commands/up.rb

@@ -100,8 +100,13 @@ module Brasa
           until_status: %w[active error],
           timeout: PROVISION_TIMEOUT)
 
-        status == "active"  ? true : (error("\nErro no provisionamento."); false)
-      rescue Websocket::CableClient::ConnectionError => e
+        if status == "active"
+          true
+        else
+          error("\nErro no provisionamento.")
+          false
+        end
+      rescue Brasa::Websocket::CableClient::ConnectionError => e
         warn_fallback(e)
         wait_for_provisioning_polling(slug)
       ensure
@@ -120,8 +125,13 @@ module Brasa
           until_status: %w[live failed],
           timeout: DEPLOY_TIMEOUT)
 
-        status == "live" ? true : (error("\nDeploy falhou."); false)
-      rescue Websocket::CableClient::ConnectionError => e
+        if status == "live"
+          true
+        else
+          error("\nDeploy falhou.")
+          false
+        end
+      rescue Brasa::Websocket::CableClient::ConnectionError => e
         warn_fallback(e)
         wait_for_deploy_polling(slug, deploy_id)
       ensure
@@ -130,7 +140,7 @@ module Brasa
 
       def connect_websocket
         require "brasa/websocket/cable_client"
-        Websocket::CableClient.new.tap(&:connect!)
+        Brasa::Websocket::CableClient.new.tap(&:connect!)
       end
 
       def warn_fallback(err)

data/lib/brasa/version.rb

@@ -1,3 +1,3 @@
 module Brasa
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/brasa/websocket/cable_client.rb

@@ -17,7 +17,7 @@ module Brasa
       end
 
       def connect!
-        raise ConnectionError, "No token. Run `brasa login`." unless @token
+        raise ConnectionError, "Token nao encontrado. Execute `brasa login`." unless @token
 
         ws_url = @api_url.sub(%r{^https?://}, "wss://").chomp("/") + "/cable"
         @ws = WebSocket::Client::Simple.connect(ws_url, headers: {
@@ -47,8 +47,14 @@ module Brasa
         deadline = Time.now + timeout
         loop do
           return result if result
-          raise ConnectionError, "Timeout (#{timeout}s)" if Time.now > deadline
-          raise ConnectionError, "Connection lost" unless @connected
+          raise ConnectionError, "Timeout aguardando status (#{timeout}s)" if Time.now > deadline
+
+          unless @connected
+            reconnect!
+            # Re-subscribe after reconnect
+            @subscriptions.each_key { |id| send_command("subscribe", id) }
+          end
+
           sleep 0.2
         end
       ensure
@@ -70,8 +76,12 @@ module Brasa
         client = self
 
         @ws.on :message do |msg|
-          data = JSON.parse(msg.data) rescue next
-          client.send(:handle_message, data)
+          begin
+            data = JSON.parse(msg.data)
+            client.send(:handle_message, data)
+          rescue JSON::ParserError
+            $stderr.puts "[WS] Mensagem malformada ignorada: #{msg.data.to_s.truncate(100)}" if ENV["BRASA_DEBUG"]
+          end
         end
 
         @ws.on :close do |_|
@@ -92,7 +102,7 @@ module Brasa
         when "confirm_subscription"
           # confirmed
         when "reject_subscription"
-          raise ConnectionError, "Subscription rejected"
+          @connected = false
         else
           identifier = data["identifier"]
           message = data["message"]
@@ -109,11 +119,24 @@ module Brasa
         deadline = Time.now + 10
         loop do
           return if @connected
-          raise ConnectionError, "WebSocket connection timeout" if Time.now > deadline
+          raise ConnectionError, "Timeout na conexao WebSocket" if Time.now > deadline
           sleep 0.1
         end
       end
 
+      def reconnect!
+        RECONNECT_DELAYS.each do |delay|
+          sleep delay
+          begin
+            connect!
+            return
+          rescue StandardError
+            next
+          end
+        end
+        raise ConnectionError, "Falha na reconexao apos #{RECONNECT_DELAYS.size} tentativas"
+      end
+
       def send_command(command, identifier)
         return unless @ws&.open?
         @ws.send({ command: command, identifier: identifier }.to_json)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brasa
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Brasa