neetodeploy 1.1.14 → 1.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 020db2b6b22c8e45dcac65ed549d4187e30d03942f923d59be882fd7345338be
-  data.tar.gz: e3dcb9d6c5fa358b21bcfdb75a3ad1a7fbe78a336cfb6b2dc78895388785dd88
+  metadata.gz: cec28c12e2d1a584c36b57acda22d17159c87707c1b19aff6135d38efe6e3e80
+  data.tar.gz: b29754747bea899d5c845b12015202db84c221cb42b72ba8aa5f00d43ecb7256
 SHA512:
-  metadata.gz: 317b8f63a814ec162729ef0e474e4ad53a6dbfbee04337366d77309513b42c9c6061d9d709472ece9dd6917c1fb8157fe658eb718ea6278aefe36d01b29352f8
-  data.tar.gz: bb89da2db4a27b82f566aef0e287b315701981076bc7c0ef5ebdaf0b2375b23265b0aace41bb4b6fbd5910af436960b61d1de080bd0e6be79ee1508cb1861c58
+  metadata.gz: f92c3d43cd11358105b2e095664c26b28b3cf490baf0add50ea834b049005315287c77bd920ee5f014c6d0c07ed032c82d1b3b7e0f7118714064ee7137d5170a
+  data.tar.gz: 1ff3d2d97733734157e57b137427e410170f689263b6b3b87ba16fb468781d4bbe491cb8caf80e2dbb9fe815a39dfa24b352729ae0a4661cfe7a0b2fd4367cd6

data/Gemfile

@@ -7,3 +7,7 @@ gemspec
 gem "byebug"
 
 gem "websocket-eventmachine-client"
+
+gem "aws-sdk-cloudwatchlogs"
+gem "aws-sdk-cognitoidentity"
+gem "rexml"

data/Gemfile.lock

@@ -1,11 +1,14 @@
 PATH
   remote: .
   specs:
-    neetodeploy (1.1.14)
+    neetodeploy (1.1.16)
+      aws-sdk-cloudwatchlogs
+      aws-sdk-cognitoidentity
       colorize
       dotenv (~> 2.8.1)
       httparty (~> 0.21.0)
       launchy (~> 2.5.0)
+      rexml
       terminal-table (~> 3.0.2)
       thor (~> 1.3.0)
       tty-spinner
@@ -16,6 +19,21 @@ GEM
   specs:
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.743.0)
+    aws-sdk-cloudwatchlogs (1.59.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cognitoidentity (1.41.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-core (3.171.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sigv4 (1.5.2)
+      aws-eventstream (~> 1, >= 1.0.2)
     byebug (11.1.3)
     colorize (1.1.0)
     dotenv (2.8.1)
@@ -23,11 +41,13 @@ GEM
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
+    jmespath (1.6.2)
     launchy (2.5.2)
       addressable (~> 2.8)
     mini_mime (1.1.2)
     multi_xml (0.6.0)
     public_suffix (5.0.1)
+    rexml (3.4.1)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     thor (1.3.0)
@@ -53,8 +73,11 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  aws-sdk-cloudwatchlogs
+  aws-sdk-cognitoidentity
   byebug
   neetodeploy!
+  rexml
   websocket-eventmachine-client
 
 BUNDLED WITH

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

@@ -2,8 +2,9 @@
 
 require "thor"
 require "colorize"
-require "websocket-eventmachine-client"
 
+require "aws-sdk-cloudwatchlogs"
+require "aws-sdk-cognitoidentity"
 require_relative "../session"
 require_relative "./constants"
 
@@ -20,56 +21,78 @@ module NeetoDeploy
           super()
           @app_slug = app_slug
           @process_type = process_type
+          @log_client = nil
         end
 
         def process!
-          stream_logs
+          start_spinner
+          response = authenticate_user
+          return unless response.success?
+
+          log_params = JSON[response.body]
+          @log_client = cloud_watch_client(log_params)
+          start_log_streaming(log_params)
         end
 
         private
 
-          def uri
-            "wss://connect.neetodeploy.com/cable"
+          def authenticate_user
+            response = send_post_request(authenticate_live_stream_url, { app_slug:, process_type: })
+            @spinner.stop && ui.error(response) unless response.success?
+            response
+          end
+
+          def cloud_watch_client(log_params)
+            cognito = Aws::CognitoIdentity::Client.new(region: log_params["region"])
+            identity_id = cognito.get_id(identity_pool_id: log_params["identity_pool_id"]).identity_id
+            credentials = cognito.get_credentials_for_identity(identity_id:).credentials
+
+            Aws::CloudWatchLogs::Client.new(
+              region: log_params["region"],
+              access_key_id: credentials.access_key_id,
+              secret_access_key: credentials.secret_key,
+              session_token: credentials.session_token
+            )
+          end
+
+          def start_spinner
+            @spinner = TTY::Spinner.new("Starting live stream session [:spinner]", format: :classic)
+            @spinner.auto_spin
           end
 
-          def stream_logs
-            EM.run do
-              session_token = common_body[:session_token]
-              pubsub_token = SecureRandom.hex(16)
-              ws_connection = WebSocket::EventMachine::Client.connect(uri:)
-
-              ws_connection.onopen do
-                payload = {
-                  command: "subscribe",
-                  identifier: {
-                    channel: "Cli::LogChannel", app_slug:, pubsub_token:, process_type:,
-                    session_token:
-                  }.to_json
+          def start_log_streaming(log_params)
+            next_token = nil
+            @spinner.stop
+            loop do
+              begin
+                params = {
+                  log_group_name: log_params["log_group_name"],
+                  log_stream_name: log_params["log_stream_name"],
+                  start_from_head: !next_token.nil?,
+                  limit: next_token.nil? ? 100 : 1000
                 }
-                ws_connection.send(payload.to_json)
-              end
 
-              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
-                  STDOUT.puts logs
-                end
+                params[:next_token] = next_token unless next_token.nil?
+                response = @log_client.get_log_events(params)
 
-                if parsed_message["type"] == "disconnect"
-                  puts parsed_message["error"].red
-                  ws_connection.close
-                  exit
+                response.events.each do |event|
+                  puts "#{Time.zone.at(event.timestamp / 1000)} #{event.message}"
                 end
-              end
 
-              ws_connection.onerror do |error|
-                puts "Error: #{error}"
+                if next_token == response.next_forward_token
+                  sleep 3
+                else
+                  next_token = response.next_forward_token
+                end
+              rescue Aws::CloudWatchLogs::Errors::ExpiredTokenException,
+Aws::CloudWatchLogs::Errors::UnrecognizedClientException => e
+                warn "Stream time limit has been reached"
+                exit 1
+              rescue => e
+                warn "Connection lost. Reconnecting..."
+                sleep 5
               end
+              sleep 2
             end
           end
       end

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

@@ -4,9 +4,9 @@ module NeetoDeploy
   class CLI
     module Logs
       module Constants
-        NEETO_DEPLOY_CLI_API_ENVIRONMENT_VARIABLES_URL = "#{NEETO_DEPLOY_CLI_API_BASE_URL}/apps/access".freeze
+        NEETO_DEPLOY_CLI_API_ENVIRONMENT_VARIABLES_URL = "#{NEETO_DEPLOY_CLI_API_BASE_URL}/logs".freeze
 
-        def app_verify_access_url
+        def authenticate_live_stream_url
           NEETO_DEPLOY_CLI_API_ENVIRONMENT_VARIABLES_URL
         end
       end

data/lib/neeto_deploy/cli.rb

@@ -57,5 +57,9 @@ module NeetoDeploy
 
     desc "certificates", "Manage certificates"
     subcommand "certificates", Certificates::Commands
+
+    desc "version, --version, -v", "Print the version of the gem"
+    map %w[--version -v] => :version
+    def version = puts(NeetoDeploy::VERSION)
   end
 end

data/lib/neeto_deploy/version.rb

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

data/neetodeploy.gemspec

@@ -38,6 +38,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "websocket-eventmachine-client"
   spec.add_dependency "colorize"
   spec.add_dependency "tty-spinner"
+  spec.add_dependency "aws-sdk-cloudwatchlogs"
+  spec.add_dependency "aws-sdk-cognitoidentity"
+  spec.add_dependency "rexml"
 
   # To add the files from submodules
   `git submodule --quiet foreach pwd`.split($\).each do |submodule_path|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neetodeploy
 version: !ruby/object:Gem::Version
-  version: 1.1.14
+  version: 1.1.16
 platform: ruby
 authors:
 - Subin Siby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-10 00:00:00.000000000 Z
+date: 2025-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -122,6 +122,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-cloudwatchlogs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-cognitoidentity
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Manage neetoDeploy apps with CLI
 email:
 - subin.siby@bigbinary.com