neetodeploy 1.1.8 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c76a4214357b2c2da95a83e581ed24e1ea67079487be44ec46f36642fcc6b54c
-  data.tar.gz: 7d76010751d2ea5f58884ad597cd52d0e09713ee2ce93c156b7a9c1182e6300d
+  metadata.gz: 8a3d1d307a336febc75e845090520f3b9682fccb51d37f1d916b7e687f60552f
+  data.tar.gz: 29f7510011934930720d507581cfffa69ea51eeca7c338da3cab3bd496b7a981
 SHA512:
-  metadata.gz: 92fd39525159fe65d6ed7faee0824c870face78481b68918031f3b2c374c4bde81b0b9c83d7a7c5d689397d5142a32dae12bdc9b11d110d76910e6e138f82220
-  data.tar.gz: 940ae23e945b2dfda9c2d02f7d50dd4d7fb8bbcf73b136e8d068c9bc75966e4051bf4b5f10a123e8478489e75e6fc165b6242e12c098c042f8bd1862328ab0ea
+  metadata.gz: e1afa2622a80ca5398335fbc166e2ad018be68e679d2d62ab837dca25e2a33a5358de3f1ce3a185d0641b6edf814acc13238a8258f193d3de1e78d73163ba9e2
+  data.tar.gz: 2f5c3ada11bf0ade6600c2e3af217e4b2203ea53e13d7cca543872042e95b334b8698d1b328971c24988cdc57c3b239702db9e6a33faae9e6478be0f4fb659a7

data/Gemfile

@@ -5,3 +5,5 @@ source "https://rubygems.org"
 gemspec
 
 gem "byebug"
+
+gem "websocket-eventmachine-client"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    neetodeploy (1.1.8)
+    neetodeploy (1.1.10)
       colorize
       dotenv (~> 2.8.1)
       httparty (~> 0.21.0)
@@ -9,7 +9,7 @@ PATH
       terminal-table (~> 3.0.2)
       thor (~> 1.3.0)
       tty-spinner
-      websocket-client-simple
+      websocket-eventmachine-client
 
 GEM
   remote: https://rubygems.org/
@@ -19,7 +19,7 @@ GEM
     byebug (11.1.3)
     colorize (1.1.0)
     dotenv (2.8.1)
-    event_emitter (0.2.6)
+    eventmachine (1.2.7)
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
@@ -36,9 +36,13 @@ GEM
       tty-cursor (~> 0.7)
     unicode-display_width (2.4.2)
     websocket (1.2.9)
-    websocket-client-simple (0.6.1)
-      event_emitter
-      websocket
+    websocket-eventmachine-base (1.2.0)
+      eventmachine (~> 1.0)
+      websocket (~> 1.0)
+      websocket-native (~> 1.0)
+    websocket-eventmachine-client (1.3.0)
+      websocket-eventmachine-base (~> 1.0)
+    websocket-native (1.0.0)
 
 PLATFORMS
   arm64-darwin-20
@@ -48,6 +52,7 @@ PLATFORMS
 DEPENDENCIES
   byebug
   neetodeploy!
+  websocket-eventmachine-client
 
 BUNDLED WITH
    2.4.8

data/lib/neeto_deploy/cli/exec/base.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "websocket-client-simple"
 require "thor"
 require "readline"
 
@@ -26,9 +25,6 @@ module NeetoDeploy
           start_spinner
           send_console_session_request
           ui.error("\n#{@response.body}") and return unless @response.success?
-
-
-          buffer_wait_block
           start_console
           connection_cleanup_callback
         end
@@ -50,6 +46,7 @@ module NeetoDeploy
 
           def send_console_session_request
             @response = send_post_request(console_session_base_url, { app_slug: @app_name })
+            @spinner.stop
           end
 
           def connection_cleanup_callback
@@ -58,14 +55,9 @@ module NeetoDeploy
           end
 
           def start_spinner
-            @spinner = TTY::Spinner.new("[:spinner] Connecting to #{app_name}", format: :classic)
+            @spinner = TTY::Spinner.new("Setting up dyno [:spinner]", format: :classic)
             @spinner.auto_spin
           end
-
-          def buffer_wait_block
-            sleep 5
-            @spinner.stop
-          end
       end
     end
   end

data/lib/neeto_deploy/cli/logs/base.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "websocket-client-simple"
 require "thor"
 require "colorize"
+require "websocket-eventmachine-client"
 
 require_relative "../session"
 require_relative "./constants"
@@ -14,11 +14,11 @@ module NeetoDeploy
         include Constants
         include Session
 
-        attr_reader :app_name, :process_type
+        attr_reader :app_slug, :process_type
 
-        def initialize(app_name, process_type = nil)
+        def initialize(app_slug, process_type = nil)
           super()
-          @app_name = app_name
+          @app_slug = app_slug
           @process_type = process_type
         end
 
@@ -32,57 +32,45 @@ module NeetoDeploy
             "wss://connect.neetodeploy.com/cable"
           end
 
-          def ensure_app_access?
-            response = send_get_request(app_verify_access_url, { app_slug: app_name })
-            @ui.error(JSON[response.body]["error"]) unless response.success?
-            response.success?
-          end
-
           def stream_logs
-            ws_connection = WebSocket::Client::Simple.connect(uri)
-            session_token = common_body[:session_token]
-            app_slug = @app_name
-            process_type = @process_type
-            pubsub_token = SecureRandom.hex(16)
+            EM.run do
+              session_token = common_body[:session_token]
+              pubsub_token = SecureRandom.hex(16)
+              ws_connection = WebSocket::EventMachine::Client.connect(uri:)
 
-            ws_connection.on :open do
-              payload = {
-                command: "subscribe",
-                identifier: {
-                  channel: "Cli::LogChannel", app_slug:, pubsub_token:, process_type:,
-                  session_token:
-                }.to_json
-              }
-              ws_connection.send(payload.to_json)
-            end
+              ws_connection.onopen do
+                payload = {
+                  command: "subscribe",
+                  identifier: {
+                    channel: "Cli::LogChannel", app_slug:, pubsub_token:, process_type:,
+                    session_token:
+                  }.to_json
+                }
+                ws_connection.send(payload.to_json)
+              end
 
-            ws_connection.on :message do |msg|
-              unless msg.data.empty?
-                parsed_msg = JSON.parse(msg.data)
-                if parsed_msg["type"].nil?
-                  parsed_msg["message"]&.each do |log|
-                    STDOUT.write "#{Time.at(log[0].to_i / 1e9).to_s.light_magenta} #{log[1]}\n"
+              ws_connection.onmessage do |msg, type|
+                parsed_message = JSON[msg]
+                if parsed_message["message"] && parsed_message["type"] != "ping"
+                  logs = JSON[parsed_message["message"]]["streams"].flat_map do |stream|
+                    stream["values"].map do |array|
+                      "#{Time.at(array[0].to_i / 1e9).to_s.light_magenta} #{array[1]}"
+                    end
                   end
-                elsif parsed_msg["type"] == "disconnect"
-                  puts parsed_msg["error"].red
+                  STDOUT.puts logs
+                end
+
+                if parsed_message["type"] == "disconnect"
+                  puts parsed_message["error"].red
+                  ws_connection.close
                   exit
                 end
               end
-            end
-
-            ws_connection.on :close do |e|
-              p e unless e.nil?
-              exit 1
-            end
 
-            ws_connection.on :error do |e|
-              p e
-              puts "MyserverBackend>> Close entered. Last error:#{$!.class}:#{$!.to_s};Module:#{$0};"
-              $@.each { |backtrace| puts backtrace }
-              exit 1
+              ws_connection.onerror do |error|
+                puts "Error: #{error}"
+              end
             end
-
-            loop do end
           end
       end
     end

data/lib/neeto_deploy/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module NeetoDeploy
-  VERSION = "1.1.8"
+  VERSION = "1.1.10"
   CLI_API_VERSION = "v1"
 end

data/neetodeploy.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "launchy", "~> 2.5.0" # for opening in browser
   spec.add_dependency "terminal-table", "~> 3.0.2" # for building cli table
   spec.add_dependency "thor", "~> 1.3.0" # for cli
-  spec.add_dependency "websocket-client-simple"
+  spec.add_dependency "websocket-eventmachine-client"
   spec.add_dependency "colorize"
   spec.add_dependency "tty-spinner"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neetodeploy
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.10
 platform: ruby
 authors:
 - Subin Siby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-01 00:00:00.000000000 Z
+date: 2024-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: websocket-client-simple
+  name: websocket-eventmachine-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="