vtacfriendly 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c46638a042bcc01490a05eb4b0b91d51b93e50a288bd35fe205fa723dff374be
-  data.tar.gz: 411b3df41a0db976bb19a39d4ccc0eb51257e2bae7e68b46718d3224e61eb0a7
+  metadata.gz: feb1ec849f39686daecf874719aa75f5f6e74adfe13a865962668c6cafc0bab6
+  data.tar.gz: 0bbd46b063bff1441110bb9496917a6fe0104b02371db0a79cfff3b47dcfdee2
 SHA512:
-  metadata.gz: c144c9f1bbfd8dd7c6be8ee7891ac7bf9744ea2c362d237049882ebe1f98237c56b1a7f932a0587b7d47173ff0c488d19a2babdb06e7c946634d488098ef2292
-  data.tar.gz: 6f0619deec5fc44ea5404c8d569f4acb0961617f9872b20917eaecd187963aeb5cec7a8dba01984b69e992ddf6f4b0f19146bcc47c942f31c79e53fdc15d86e2
+  metadata.gz: 29a2db0516d05387fd291844d3da62f9a94edad4de47119e18ecf9c5d2ac7a13959454556f8e850b2182a0a3d0b303a041a5d2f601370b4b77c6a935df835023
+  data.tar.gz: b4c61186e221ff215cbc695cfdca896a576bb2ac4b7ef0636b7bf39e2a7783b9337b43170e6fb61ba25252c8023ed10e35cbde8ac2e0de303cae96c46d61da9c

data/bin/vtac-ui

@@ -16,6 +16,8 @@ args = ArgsParser::Args.new(switches: switches, options: options)
 srv = VtacFriendly::Client.connect(args.data[0], args.switches[:p] ? args.switches[:p].to_i : 5582)
 server = srv[0]
 server_name = srv[1]
+server_version = srv[2]
+auth_required = srv[3]
 sock_domain, remote_port, remote_hostname, remote_ip = server.peeraddr
 
 bb = (R::C.color :blue) + (R::F.bold)
@@ -48,7 +50,7 @@ loop do
     print " "*(R::S.width-R::Cr.pos[0])
   elsif ctab == :system
     puts "_.cb:gray._AnalyticsConfig_.f:bold.__.cb:black._System".to_ftext
-    VtacFriendly::SystemTab.show remote_ip, server_name
+    VtacFriendly::SystemTab.show remote_ip, server_name, server_version, auth_required
 
     R::Cr.go_to_pos(0, R::S.height)
     R::C.color :gray, type: :bg, mode: :set

data/lib/vtac_friendly/system_tab.rb

@@ -1,9 +1,11 @@
 module VtacFriendly
   module SystemTab
-    def show(ip, name)
+    def show(ip, name, version, password)
       puts "
 #{R::C.color :blue}#{R::F.bold}IP#{R::F.reset} #{ip}
 #{R::C.color :blue}#{R::F.bold}Server name#{R::F.reset} #{name}
+#{R::C.color :blue}#{R::F.bold}Version#{R::F.reset} #{version}
+#{R::C.color :blue}#{R::F.bold}Authentication#{R::F.reset} #{password ? "enabled" : "disabled"}
 "
     end
 
@@ -22,6 +24,11 @@ module VtacFriendly
     end
 
     def update(server)
+      R::Cr.go_to_pos(0, R::S.height-1)
+      R::C.color :gray, type: :bg, mode: :set
+      print "Updating..."
+      R::C.color :reset, type: :bg, mode: :set
+
       server.puts VtacPacket.new(:command, "update")
       VtacPacket.new(from_packet: server.gets)[:contents]
     end

data/lib/vtac_friendly/vtac_client.rb

@@ -4,11 +4,27 @@ module VtacFriendly
       server = TCPSocket.open(host, port)
 
       init_pack = VtacPacket.new(from_packet: server.gets)
-      server_name = init_pack[:contents]
+      server_id = init_pack[:contents].split("~")
+
+      server_name = server_id[0]
+      server_version = server_id[1]
+      auth_required = server_id[2] ? true : false
 
       server.puts VtacPacket.new(:id_client, "vtac_client")
 
-      return [server, server_name]
+      if auth_required
+        print "Password: "
+        server.puts VtacPacket.new(:password, STDIN.gets.chomp)
+
+        response = VtacPacket.new(from_packet: server.gets)
+
+        if response[:type] == "error"
+          STDERR.puts "ERROR: " + response[:contents]
+          exit 1
+        end
+      end
+
+      return [server, server_name, server_version, auth_required]
     end
 
     module_function :connect

data/lib/vtac_friendly/vtac_packet.rb

@@ -1,6 +1,6 @@
 module VtacFriendly
   class VtacPacket
-    @@allowed_types = [:command, :response, :id_server, :id_client, :error, :disconnect]
+    @@allowed_types = [:command, :response, :id_server, :id_client, :error, :disconnect, :password]
 
     def initialize(type=:response, contents="", from_packet:nil)
       if !from_packet

data/lib/vtac_friendly.rb

@@ -10,7 +10,7 @@ require "json"
 module VtacFriendly
   @ver_1 = 0
   @ver_2 = 0
-  @ver_3 = 1
+  @ver_3 = 3
   @ver_4 = ""
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vtacfriendly
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Matthias Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-15 00:00:00.000000000 Z
+date: 2023-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: argparse