neetodeploy 1.1.9 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3077cc8ea8b0ba167b73c2cfd196ba988203fe0b5e00eda98bff96f187f0afe9
-  data.tar.gz: afbb0390b774d70b50f0d3d39df09d0ddb386897585e8d40000ae7a4b1571156
+  metadata.gz: 991f65ca44d321dc7580b71263b9436176095769a7f069f55c2edadb6f5f2532
+  data.tar.gz: d614216531a9ef2a3c500a3a4e54cb9a72b34144607e4ea5f0ce8c6e1afabd22
 SHA512:
-  metadata.gz: cc1a2b72805e0814f874be024dda38900395c775430a2291e5545e1943a02747b6d58e33e1105c77ffd47ed281388789c8f6a57809ed7c7a38fd18393f36ef42
-  data.tar.gz: c9b9dad7f5d16ee636e4eb973b0f42b46f5676b5170a96b4b47165e31a134a123c7cb53d87a2ac17c0392d88f95cbcf2514f316cb1c5f52eab3b5b9dec69bd71
+  metadata.gz: 21eea9fe929b0bb2176b83ef0f547912bd2824aa3fbc28a4757a9e01cbb19ad56d7b9f658482318ee65f7c57d587d98c47abc74eae87127bd33375af46973763
+  data.tar.gz: 503ce18f29dc4a0bd9f4263cbd09b7f314aaf2bc3a5e95fba63b5ff1c2ec0c9193c90d59ab3625c9e77b03d659da3dd67bceabb7ed56d740491475361807f535

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.9)
+    neetodeploy (1.1.11)
       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/addon/commands.rb

@@ -9,13 +9,13 @@ module NeetoDeploy
     module Addon
       class Commands < Thor
         desc "info", "Get addon informations"
-        option :addon_name, type: :string, aliases: "-n", required: true, desc: "Addon name"
+        option :addon, type: :string, aliases: "-n", required: true, desc: "Addon name"
         def info
           Info.new(options).run
         end
 
         desc "scheduled_exports_enabled", "Check whether scheduled exports is enabled for an app"
-        option :app_name, type: :string, aliases: "-a", required: true, desc: "App name"
+        option :app, type: :string, aliases: "-a", required: true, desc: "App name"
         def scheduled_exports_enabled
           ScheduledExportsSettings.new(options).run
         end

data/lib/neeto_deploy/cli/addon/info.rb

@@ -16,7 +16,7 @@ module NeetoDeploy
 
         def initialize(options)
           super()
-          @addon_name = options[:addon_name]
+          @addon_name = options[:addon]
         end
 
         def run

data/lib/neeto_deploy/cli/addon/scheduled_exports_settings.rb

@@ -16,7 +16,7 @@ module NeetoDeploy
 
         def initialize(options)
           super()
-          @app_name = options[:app_name]
+          @app_name = options[:app]
         end
 
         def run

data/lib/neeto_deploy/cli/dyno_console_manager.rb

@@ -5,80 +5,56 @@ require "thor"
 module NeetoDeploy
   class CLI
     class DynoConsoleManager < Base
-      DYNO_CONSOLE_MANAGER_URL = "wss://neeto-deploy-lc.neetodeployapp.com"
+      attr_reader :addon_name, :kind
 
-      def initialize
+      def initialize(addon_name)
         super()
-        @prompt = ""
+        @addon_name = addon_name
       end
 
-      def run_console
+      def process!
         start_spinner
         send_console_session_request
-        ui.error(response) and return unless @response.success?
+        ui.error("\n#{@response.body}") and return unless @response.success?
 
-        send_websocket_request
-        define_websocket_blocks
+        start_console
+        connection_cleanup_callback
       end
 
       private
 
-        def start_spinner
-          @spinner = TTY::Spinner.new("[:spinner] Connecting to #{@instance_name}", format: :classic)
-          @spinner.auto_spin
+        def console_executable_path
+          gem_spec = Gem::Specification.find_by_name("neetodeploy")
+          gem_dir = gem_spec.gem_dir
+          executable_path = File.join(gem_dir, "exe", "console")
         end
 
-        def define_websocket_blocks
-          stop_spinner = lambda do
-            @spinner.stop unless @connection_established
-          end
-
-          cleanup = lambda do
-            connection_cleanup
-          end
-
-          @ws.on :message do |msg|
-            message = msg.data
-            if message.to_s.eql?("{\"exitCode\":0,\"signal\":0}")
-              cleanup.call
-              exit 0
-            end
-            cmd = message[0]
-            if cmd == "1"
-              extracted_message = message.delete_prefix("1")
-              stop_spinner.call && @connection_established = true unless extracted_message == ""
-              @prompt = "\u001b[2K\u001b[0G#{extracted_message.split("\r\n").last}"
-              print extracted_message
-            end
-          end
-
-          @ws.on :open do
-          end
+        def start_console
+          console_access_token = @response.parsed_response["console_access_token"]
+          pod_name = @response.parsed_response["pod_name"]
+          database_url = @response.parsed_response["database_url"]
+          container_name = @response.parsed_response["container_name"]
 
-          @ws.on :close do |e|
-            puts e
-            exit 1
-          end
+          execute_console(pod_name, console_access_token, container_name, kind, database_url)
+        end
 
-          @ws.on :error do |e|
-            puts e
-            puts "MyserverBackend>> Close entered. Last error:#{$!.class}:#{$!.to_s};Module:#{$0};"
-            $@.each { |backtrace| puts backtrace }
-            exit 1
-          end
+        def execute_console(pod_name, console_access_token, container_name, kind, database_url)
+          system("#{console_executable_path} -podname #{pod_name} -token #{console_access_token} -kind #{kind} -container #{container_name} -url #{database_url}")
+        end
 
-          trap("SIGINT") do
-            Thread.new { @ws.send "4" }
-          end
+        def send_console_session_request
+          @response = send_post_request(console_session_base_url, { addon_name:, kind: })
+          @spinner.stop
+        end
 
-          loop do
-            sleep 0.1
-            input = Readline.readline(@prompt, true)
-            @ws.send "1" + input
-          end
+        def connection_cleanup_callback
+          url = "#{console_session_base_url}/#{addon_name}"
+          send_delete_request(url, { pubsub_token: @pubsub_token })
         end
 
-        def connection_cleanup
+        def start_spinner
+          @spinner = TTY::Spinner.new("Setting up dyno [:spinner]", format: :classic)
+          @spinner.auto_spin
         end
     end
   end

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "websocket-client-simple"
 require "thor"
 require "readline"
 
@@ -42,7 +41,8 @@ module NeetoDeploy
             @pubsub_token = @response.parsed_response["console_pubsub_token"]
             console_access_token = @response.parsed_response["console_access_token"]
             pod_name = "#{app_name}-#{@pubsub_token}-console-deployment"
-            system("#{console_executable_path} #{pod_name} #{console_access_token}")
+            container_name = "#{app_name}-#{@pubsub_token}-console"
+            system("#{console_executable_path} -podname #{pod_name} -token #{console_access_token} -container #{container_name}")
           end
 
           def send_console_session_request

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/cli/pg/commands.rb

@@ -6,12 +6,11 @@ module NeetoDeploy
   class CLI
     module Pg
       class Commands < Thor
-        # desc "cli", "Connect to postgresql console"
-        # option :addon_name, type: :string, aliases: "-n", required: true, desc: "Addon name"
-
-        # def cli
-        #   Console.new(options).run
-        # end
+        desc "cli", "Connect to postgresql console"
+        option :addon, type: :string, aliases: "-n", required: true, desc: "Addon name"
+        def cli
+          Console.new(options[:addon]).process!
+        end
       end
     end
   end

data/lib/neeto_deploy/cli/pg/console.rb

@@ -12,33 +12,10 @@ module NeetoDeploy
         include Constants
         include Session
 
-        attr_reader :addon_name
-
-        def initialize(options)
-          super()
-          @addon_name = options[:addon_name]
-          @instance_name = options[:addon_name]
-          @connection_established = false
-        end
-
-        def run
-          run_console
+        def initialize(addon_name)
+          super(addon_name)
+          @kind = "neetodeploy-postgresql"
         end
-
-        private
-
-          def send_console_session_request
-            @response = send_post_request(console_session_base_url(addon_name), {})
-          end
-
-          def send_websocket_request
-            console_token = @response.parsed_response["console_token"]
-            database_url = @response.parsed_response["url"]
-            deployment_name = @response.parsed_response["internal_name"]
-            app_name = @response.parsed_response["app_name"]
-
-            @ws = WebSocket::Client::Simple.connect "#{DYNO_CONSOLE_MANAGER_URL}/cli_console?app_name=#{app_name}&deployment_name=#{deployment_name}&console_token=#{console_token}&database_url=#{database_url}&kind=postgres"
-          end
       end
     end
   end

data/lib/neeto_deploy/cli/pg/constants.rb

@@ -4,8 +4,8 @@ module NeetoDeploy
   class CLI
     module Pg
       module Constants
-        def console_session_base_url(addon_name)
-          "#{NEETO_DEPLOY_CLI_API_BASE_URL}/addons/#{addon_name}/console_session"
+        def console_session_base_url
+          "#{NEETO_DEPLOY_CLI_API_BASE_URL}/addons/console_sessions"
         end
       end
     end

data/lib/neeto_deploy/cli/redis/commands.rb

@@ -4,13 +4,14 @@ require "thor"
 require_relative "./set"
 require_relative "./get"
 require_relative "./reset_stats"
+require_relative "./console"
 
 module NeetoDeploy
   class CLI
     module Redis
       class Commands < Thor
         desc "set", "Set redis config"
-        option :addon_name, type: :string, aliases: "-n", required: true, desc: "Addon name"
+        option :addon, type: :string, aliases: "-n", required: true, desc: "Addon name"
         option :key, type: :string, aliases: "-k", required: true, desc: "CONFIG name"
         option :value, type: :string, aliases: "-v", required: true, desc: "New value for the CONFIG"
 
@@ -19,18 +20,24 @@ module NeetoDeploy
         end
 
         desc "get", "Get redis config"
-        option :addon_name, type: :string, aliases: "-n", required: true, desc: "Addon name"
+        option :addon, type: :string, aliases: "-n", required: true, desc: "Addon name"
         option :key, type: :string, aliases: "-k", required: true, desc: "CONFIG name"
         def get
           Get.new(options).run
         end
 
         desc "reset-stats", "Resets the statistics of the Redis instance"
-        option :addon_name, type: :string, aliases: "-n", required: true, desc: "Addon name"
+        option :addon, type: :string, aliases: "-n", required: true, desc: "Addon name"
         def reset_stats
           ResetStats.new(options).run
         end
 
+        desc "cli", "Connect to redis console"
+        option :addon, type: :string, aliases: "-n", required: true, desc: "Addon name"
+        def cli
+          Console.new(options[:addon]).process!
+        end
+
       end
     end
   end

data/lib/neeto_deploy/cli/redis/console.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "thor"
+require_relative "../session"
+require_relative "./constants"
+require_relative "../dyno_console_manager"
+
+module NeetoDeploy
+  class CLI
+    module Redis
+      class Console < CLI::DynoConsoleManager
+        include Constants
+        include Session
+
+        def initialize(addon_name)
+          super(addon_name)
+          @kind = "neetodeploy-redis"
+        end
+      end
+    end
+  end
+end

data/lib/neeto_deploy/cli/redis/constants.rb

@@ -14,6 +14,10 @@ module NeetoDeploy
         def available_configs_to_edit
           AVAILABLE_REDIS_CONFIGS_TO_EDIT
         end
+
+        def console_session_base_url
+          "#{NEETO_DEPLOY_CLI_API_BASE_URL}/addons/console_sessions"
+        end
       end
     end
   end

data/lib/neeto_deploy/cli/redis/get.rb

@@ -15,7 +15,7 @@ module NeetoDeploy
 
         def initialize(options)
           super()
-          @addon_name = options[:addon_name]
+          @addon_name = options[:addon]
           @key = options[:key]
         end
 

data/lib/neeto_deploy/cli/redis/reset_stats.rb

@@ -15,7 +15,7 @@ module NeetoDeploy
 
         def initialize(options)
           super()
-          @addon_name = options[:addon_name]
+          @addon_name = options[:addon]
         end
 
         def run

data/lib/neeto_deploy/cli/redis/set.rb

@@ -16,7 +16,7 @@ module NeetoDeploy
 
         def initialize(options)
           super()
-          @addon_name = options[:addon_name]
+          @addon_name = options[:addon]
           @key = options[:key]
           @value = options[:value]
         end

data/lib/neeto_deploy/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module NeetoDeploy
-  VERSION = "1.1.9"
+  VERSION = "1.1.11"
   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.9
+  version: 1.1.11
 platform: ruby
 authors:
 - Subin Siby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-01 00:00:00.000000000 Z
+date: 2024-08-14 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:
     - - ">="
@@ -161,6 +161,7 @@ files:
 - lib/neeto_deploy/cli/pg/console.rb
 - lib/neeto_deploy/cli/pg/constants.rb
 - lib/neeto_deploy/cli/redis/commands.rb
+- lib/neeto_deploy/cli/redis/console.rb
 - lib/neeto_deploy/cli/redis/constants.rb
 - lib/neeto_deploy/cli/redis/get.rb
 - lib/neeto_deploy/cli/redis/reset_stats.rb