xlogin-apiclient 0.2.0 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18a35f6ba98b58373950e71f3c3a87683087981acc457099952fe85beb474957
-  data.tar.gz: 6501f3d09a773b2925e779d5c72a7905e9871a0e002bb99560bea537b8747cdd
+  metadata.gz: ba7acd60107439028cb9f8c6a77afd5dfaf6c1cf74c2232b529678b8888b6053
+  data.tar.gz: 32b07f46ca25f31ee09cadf2de19c5a0284bd1bb5c0a92b1d9a62b6af8a0b261
 SHA512:
-  metadata.gz: 84722296fb0c543e96fe23629845694c76a96dbac5f6d7812b3daf3022374163f4e389110b772931517e43fa895fe3baac23e03dbd8908fadaf020986d72d41e
-  data.tar.gz: 0ac161f727446451c8981e66e80c4c69be3821eab9cf7ad6998b95738cfba11cde028f9fa75e8d51e08f2fff16b73e5ae9c2327c762918ec7e4f66427530a800
+  metadata.gz: 6f985e16fe2d94d2daee92e2d060aab4007deb0cda7d7aa56338f6e0f57c86907e8ec2299860d3cf2495f1f1c92b2ab35f84b6e24ecf08a7a711ac6c6238f8b3
+  data.tar.gz: d8bf59fae7037c02f2488c7b2115a84a40349a5909a31b3e6ea6995fc981ec60ffba990e1575c8c206a6c938799fd6555b674eab3513d7a52a336366f134cdaa

data/bin/xloginapi

@@ -0,0 +1,6 @@
+#! /usr/bin/env ruby
+
+require 'xlogin/apiclient'
+require 'xlogin/apiclient/cli'
+
+Xlogin::APIClient::CLI.run

data/lib/xlogin/apiclient.rb

@@ -1,16 +1,24 @@
 require 'json'
 require 'net/http'
+require 'stringio'
 require 'addressable/uri'
+require 'em-eventsource'
 require "xlogin/apiclient/version"
 
+
 module Xlogin
   class APIClient
+    DEFAULT_TIMEOUT = 60
+
     class Error < StandardError; end
 
     class << self
       attr_accessor :base_url
+      attr_accessor :timeout
     end
 
+    attr_reader :type, :args
+
     def initialize(base_url: self.class.base_url, **args)
       raise Error.new('base_url not defined') unless base_url
 
@@ -19,26 +27,50 @@ module Xlogin
       @args = args
     end
 
-    def cmd(args)
+    def cmd(args, &block)
       params = {driver: @type, target: @args, command: args}
-      resp = request(**params.transform_keys(&:to_sym))
-      resp['payload'].join
+      request(:cmd, **params.transform_keys(&:to_sym), &block)
     end
 
     private
-    def request(**params)
+    def request(endpoint, **params, &block)
       uri = @uri.dup
+      uri.path  = File.join(uri.path, endpoint.to_s)
       uri.query = "q=#{URI.encode_www_form_component(JSON.generate(params))}"
 
-      req = Net::HTTP::Get.new(uri.request_uri)
-      req["Accept"] = "application/json"
+      if block
+        resp = StringIO.new
+        EM.run do
+          source = EventMachine::EventSource.new(uri.to_s)
+          source.message do |message|
+            data = JSON.parse(message) || {}
+            if chunk = data['chunk']
+              resp.print data['chunk']
+              block.call(data['chunk'])
+            end
+          end
+          source.error do |e|
+            EM.stop
+          end
+          source.start
+        end
+        return resp.string
+      else
+        req = Net::HTTP::Get.new(uri.request_uri)
+        req["Accept"] = "application/json"
+
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.open_timeout = self.class.timeout || DEFAULT_TIMEOUT
+        http.read_timeout = self.class.timeout || DEFAULT_TIMEOUT
+
+        resp = http.request(req)
+        raise Error.new(resp.message) unless resp.code =~ /^2[0-9]{2}$/
 
-      http = Net::HTTP.new(uri.host, uri.port)
-      body = http.request(req).body
-      resp = body ? JSON.parse(body) : {}
-      return resp if resp['success']
+        data = resp.body ? JSON.parse(resp.body) : {}
+        raise Error.new(data['error']) unless data['success']
 
-      raise Error.new(resp['error'])
+        return data['payload'].join
+      end
     end
   end
 end

data/lib/xlogin/apiclient/cli.rb

@@ -0,0 +1,75 @@
+require 'optparse'
+require 'singleton'
+require 'xlogin/apiclient'
+
+
+XLOGIN_API_URL = ENV.fetch('XLOGIN_API_URL', 'http://127.0.0.1:8080')
+
+module Xlogin
+  class APIClient
+
+    class Factory
+      include Singleton
+
+      def initialize
+        @inventory = Hash.new
+      end
+
+      def set_hostinfo(name, **opts)
+        @inventory[name] = (get_hostinfo(name) || {name: name}).merge(opts)
+      end
+
+      def get_hostinfo(name)
+        @inventory[name]
+      end
+
+      def method_missing(method_name, *args, **opts, &block)
+        super unless args.size == 2 && Addressable::URI::URIREGEX =~ args[1]
+
+        name = args[0]
+        uri  = args[1]
+        type = method_name.to_s.downcase
+        set_hostinfo(name.to_s, type: type, uri: uri, **opts)
+      end
+    end
+
+    class CLI
+
+      def self.run(args = ARGV)
+        Xlogin::APIClient::CLI.new.run(args)
+      end
+
+      def run(args)
+        config = {api: XLOGIN_API_URL}
+        parser = OptionParser.new
+        parser.banner = "#{File.basename($0)} HOST [Options]"
+        parser.version = Xlogin::APIClient::VERSION
+
+        parser.on('-a API',  '--api',       String, 'The Xlogin API URL.')        { |v| config[:api]  = v }
+        parser.on('-t TYPE', '--type',      String, 'The TYPE of the device.')    { |v| config[:type] = v }
+        parser.on('-i PATH', '--inventory', String, 'The PATH to the inventory file..') { |v| config[:inventory]  = v }
+        parser.on('-e COMMAND', '--exec',   String, 'Execute commands and quit.') { |v| config[:exec] = v }
+
+        args = parser.parse!(args)
+        host = args.shift
+        hostinfo = if config[:inventory]
+                     factory = Factory.instance
+                     factory.instance_eval(IO.read(config[:inventory]))
+                     factory.get_hostinfo(host) || {}
+                   else
+                     {type: config[:type], uri: host}
+                   end
+
+        raise "Argument error - type='#{hostinfo[:type]}' uri='#{hostinfo[:uri]}'" unless hostinfo[:type] && hostinfo[:uri]
+
+        APIClient.base_url = config[:api]
+        client = APIClient.new(**hostinfo)
+        client.cmd(config[:exec]) { |c| $stdout.print c }
+      rescue => e
+        $stderr.puts e, '', parser
+      end
+
+    end
+  end
+end
+

data/lib/xlogin/apiclient/version.rb

@@ -1,5 +1,5 @@
 module Xlogin
-  module Apiclient
-    VERSION = "0.2.0"
+  class APIClient
+    VERSION = "0.2.6"
   end
 end

data/xlogin-apiclient.gemspec

@@ -5,7 +5,7 @@ require "xlogin/apiclient/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "xlogin-apiclient"
-  spec.version       = Xlogin::Apiclient::VERSION
+  spec.version       = Xlogin::APIClient::VERSION
   spec.authors       = ["haccht"]
   spec.email         = ["haccht@users.noreply.github.com"]
 
@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
 
   spec.add_dependency 'addressable'
+  spec.add_dependency 'em-eventsource'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin-apiclient
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.6
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-eventsource
+  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: API client for xlogin-api.
 email:
 - haccht@users.noreply.github.com
@@ -67,7 +81,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- bin/xloginapi
 - lib/xlogin/apiclient.rb
+- lib/xlogin/apiclient/cli.rb
 - lib/xlogin/apiclient/version.rb
 - xlogin-apiclient.gemspec
 homepage: https://github.com/haccht/xlogin-apiclient.