neetodeploy 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 852a444976eabbc736b6ab65c2e93c980fa32281f80d0b99f870ca3c7300ffbb
-  data.tar.gz: 5cb3f42d7f20af3186a77aef7d2c8d8bf4f0e80cebda965180dbeab17b2a7139
+  metadata.gz: 19af255afa80f69e3d6e3587f8917788e866cef5b296525c641415e9285d8720
+  data.tar.gz: d851f2610614e2f0f7d3054e72d70b770bb8deb3896fe3c70eafd9ebe70efe22
 SHA512:
-  metadata.gz: 651e70c339bb1d36aa29d967357e13e34e1511e6af1b60e50ca6761c988bccbb31b2093589e980cd5bad3837ec842e7da61dbba5d403cf962135e4bdfef05ed4
-  data.tar.gz: 2c2864829f60f732e64a59fcc406cb6f6a9cbef01866c7af2a101f2f1747526a126a042034054f7099bd53a0cfc6e2740b9970e5746e6a391bdf4f5757a844dc
+  metadata.gz: 40566c170d6f756b33446a237a670532188b5f32eac9cd8ee738b531793e9218e187efe091ec677b8730c68cc2e1ee27511e453cd5503dee7ee2f76f172fb554
+  data.tar.gz: efe2823e4c1aa55006f7284f69547e6292e378886bce2fd0ef214fbca559d185240dfd36ff498267c98698bd78fa055965359d05d26553187620c0c7d38c61b9

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    neetodeploy (1.1.3)
+    neetodeploy (1.1.4)
+      colorize
       dotenv (~> 2.8.1)
       httparty (~> 0.21.0)
       launchy (~> 2.5.0)
@@ -15,6 +16,7 @@ GEM
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     byebug (11.1.3)
+    colorize (1.1.0)
     dotenv (2.8.1)
     event_emitter (0.2.6)
     httparty (0.21.0)

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

@@ -1,45 +1,89 @@
 # frozen_string_literal: true
+
 require "websocket-client-simple"
 require "thor"
+require "colorize"
+
+require_relative "../session"
+require_relative "./constants"
 
 module NeetoDeploy
   class CLI
     module Logs
       class Base < CLI::Base
+        include Constants
+        include Session
+
         attr_reader :app_name, :process_type
 
         def initialize(app_name, process_type = nil)
+          super()
           @app_name = app_name
           @process_type = process_type
         end
 
         def process!
-          ws = WebSocket::Client::Simple.connect "wss://loki-gateway.neetodeployapp.com/loki/api/v1/tail?query={container=~\".*#{app_name}.*\"}&start=#{(Time.now - 300).to_i}"
+          stream_logs
+        end
 
-          ws.on :message do |msg|
-            begin
-              data = JSON.parse(msg.data)
-              puts data["streams"].map { |stream| stream["values"][0][1] }
-            rescue JSON::ParserError => e
-            end
-          end
+        private
 
-          ws.on :open do
+          def uri
+            "wss://connect.neetodeploy.com/cable"
           end
 
-          ws.on :close do |e|
-            p e
-            exit 1
+          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
 
-          ws.on :error do |e|
-            p e
-            exit 1
-          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)
+
+            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.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"
+                  end
+                elsif parsed_msg["type"] == "disconnect"
+                  puts parsed_msg["error"].red
+                  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
+            end
 
-          loop do
+            loop do end
           end
-        end
       end
     end
   end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module NeetoDeploy
+  class CLI
+    module Logs
+      module Constants
+        NEETO_DEPLOY_CLI_API_ENVIRONMENT_VARIABLES_URL = "#{NEETO_DEPLOY_CLI_API_BASE_URL}/apps/access".freeze
+
+        def app_verify_access_url
+          NEETO_DEPLOY_CLI_API_ENVIRONMENT_VARIABLES_URL
+        end
+      end
+    end
+  end
+end

data/lib/neeto_deploy/cli.rb

@@ -33,7 +33,7 @@ module NeetoDeploy
 
     desc "logs", "Show logs"
     option :app, type: :string, aliases: "-a", required: true, desc: "App slug"
-    option :process_type, type: :string, aliases: "-p", desc: "Process type"
+    option :process_type, type: :string, aliases: "-p", required: true, desc: "Process type"
     def logs
       CLI::Logs::Base.new(options[:app], options[:process_type]).process!
     end

data/lib/neeto_deploy/version.rb

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

data/neetodeploy.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   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 "colorize"
 
   # 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.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Subin Siby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-29 00:00:00.000000000 Z
+date: 2024-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  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
@@ -119,6 +133,7 @@ files:
 - lib/neeto_deploy/cli/login/base.rb
 - lib/neeto_deploy/cli/login/constants.rb
 - lib/neeto_deploy/cli/logs/base.rb
+- lib/neeto_deploy/cli/logs/constants.rb
 - lib/neeto_deploy/cli/redis/commands.rb
 - lib/neeto_deploy/cli/redis/constants.rb
 - lib/neeto_deploy/cli/redis/get.rb