sapos-print 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa9dbe51b563ee70ee2027c134a1bd153f324320b3de2fe8edeaf746cacf0074
-  data.tar.gz: dbd27b3c96dbd8f3f16a1127380e863e7e39abd2281f9fbd0e661257e6f34628
+  metadata.gz: 6c6213f40144b180efcab3601be965bd4eb27538e24ce1061d5645294c7771d3
+  data.tar.gz: b6ebb3d3b2faa32eaff6c7f65b488582a79c6ca7e3006dc574baa0eea9d3a80c
 SHA512:
-  metadata.gz: 1ede8347459232583ccdef4f6b7f9750272c566b79f4c019fdc7043e30c9e685759527b3c2a5d692130abf53c81d012c2cd694d1feb423fc4cf089077e437fa8
-  data.tar.gz: d10655107cdad90e67da0e0a4ec2c97af27087e85b91e3859eb6edc23d1beb9c2381bc5a6311b1dd80960d4c103a4d3efedb9b8b72690c379e720f7bedc4d3fd
+  metadata.gz: f5c29e07f820962d25be97d733a566397ce59de91f6b0f9ab14b2735bcc392b9da026f887612db38e8a7e3e9325266814f4b22f2789d2f07efdc7572083cf49e
+  data.tar.gz: da79df111441d3512408add3a69fab610a07573ae7104a7ee16a84da4644684fcf5386971aa9a6367e47529a043cfe7316c72706f48723ad975a6470c8455ae5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sapos-print (1.0.6)
+    sapos-print (1.0.7)
       activesupport
       awesome_print
       json
@@ -12,29 +12,29 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.2)
+    activesupport (7.0.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     awesome_print (1.9.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     concurrent-ruby-edge (0.5.0)
       concurrent-ruby (~> 1.1.5)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dry-configurable (0.14.0)
-      concurrent-ruby (~> 1.0)
+    dry-configurable (0.16.1)
       dry-core (~> 0.6)
-    dry-container (0.9.0)
+      zeitwerk (~> 2.6)
+    dry-container (0.11.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.13, >= 0.13.0)
-    dry-core (0.7.1)
+    dry-core (0.9.1)
       concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
     dry-inflector (0.2.1)
-    dry-initializer (3.1.1)
+    dry-initializer (3.0.4)
     dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
@@ -58,18 +58,18 @@ GEM
       dry-initializer (~> 3.0)
       dry-schema (~> 1.8, >= 1.8.0)
     http-accept (1.7.0)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.9.1)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.6.1)
+    json (2.6.2)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
-    minitest (5.15.0)
+    minitest (5.17.0)
     netrc (0.11.0)
-    public_suffix (4.0.6)
+    public_suffix (5.0.1)
     pubnub (4.8.0)
       addressable (>= 2.0.0)
       concurrent-ruby (~> 1.1.5)
@@ -85,11 +85,12 @@ GEM
       netrc (~> 0.8)
     thor (1.2.1)
     timers (4.3.3)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.2)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   arm64-darwin-21

data/lib/sapos/print/cli.rb

@@ -10,14 +10,31 @@ module Sapos
         config = {}
         
         url = ask("Configuration URL")
-        response = RestClient.get(url)
-        data = JSON.parse(response)
+        if url.eql?('manual')
+          data = {}
+          data["channel"] = ask("Channel:")
+          data["key"] = ask("Queue Key")
+        else
+          response = RestClient.get(url)
+          data = JSON.parse(response)
+        end
+        
+        config_file = "#{Sapos::Print.app_directory}/config.yml"
+        user_id = nil
+        if File.exist?(config_file)
+          template = ERB.new(File.read(config_file))
+          result = YAML.load(template.result(binding))
+          user_id = result[:user_id]
+        end
+        
+        user_id = SecureRandom.uuid if user_id.nil?
 
         config[:q] = data["channel"]
         config[:key] = data["key"]
         config[:printer] = ask("Printer Name: ")
         config[:adapter] = ask("Printer Adapter: ", limited_to: ["console", "cups", "windows"])
         config[:interface] = ask("Interface", limited_to: ["text", "escp"])
+        config[:user_id] = user_id
         
         if yes?("Are you sure that you want to write the configuration file?")
           Sapos::Print::Configuration.write(config)
@@ -27,16 +44,19 @@ module Sapos
       end
       
       desc "start", "run service"
+      option :verbose, type: :boolean
       def start
         info
         config = Sapos::Print.config
-        puts ["Q=#{config.q.to_s}", "Printer=#{config.printer.to_s}", "Adapter=#{config.adapter.to_s}", "Interface=#{config.interface}"].join("\n")
+        puts ["Q=#{config.q.to_s}", "Printer=#{config.printer.to_s}", "Adapter=#{config.adapter.to_s}", "Interface=#{config.interface}"].join(";")
         
         print_dir = File.join(Sapos::Print.app_directory, 'print')
         if File.exists?(print_dir)
-          FileUtils.rm_rf Dir.glob("#{print_dir}/*")
+          Dir.glob("#{print_dir}/*.print").each do |x|
+            FileUtils.rm_rf(x) if File.ctime(x) < Time.now - 3600
+          end
         end
-        
+        config.verbose = options[:verbose]
         Sapos::Print::QReader.printer_config = config
         Sapos::Print::QReader.verbose = options[:verbose]
         Sapos::Print::QReader.run!
@@ -50,6 +70,7 @@ module Sapos
         printer.print(document: "This is a test\nprint page\nwithno special commands", document_number: "test", print_control: true)
       end
       
+      desc "windows_test_print", "test printer"
       def windows_test_print
         info
         

data/lib/sapos/print/configuration.rb

@@ -6,7 +6,7 @@ module Sapos
   module Print
     class Configuration
     
-      attr_accessor :printer, :adapter, :interface, :q, :key, :emv_path, :emv_terminal
+      attr_accessor :printer, :adapter, :interface, :q, :key, :emv_path, :emv_terminal, :user_id, :verbose
     
       def self.write(args = {})
         config_file = "#{Sapos::Print.app_directory}/config.yml"
@@ -18,7 +18,6 @@ module Sapos
         if File.exist?(config_file)
           template = ERB.new(File.read(config_file))
           result = YAML.load(template.result(binding))
-          ap result
           @printer = result[:printer]
           @adapter = result[:adapter]
           @interface = result[:interface]
@@ -26,6 +25,7 @@ module Sapos
           @key = result[:key]
           @emv_path = result[:emv_path]
           @emv_terminal = result[:emv_terminal]
+          @user_id = result[:user_id]
         else
           raise Sapos::Print::Error, "Configuration is missing. Make sure to create this file: #{config_file}"
         end
@@ -44,7 +44,7 @@ module Sapos
       end
     
       def to_h
-        {printer: @printer, adapter: @adapter, interface: @interface, q: @q, key: @key, emv_path: @emv_path, emv_terminal: @emv_terminal }
+        {printer: @printer, adapter: @adapter, interface: @interface, q: @q, key: @key, emv_path: @emv_path, emv_terminal: @emv_terminal, user_id: @user_id }
       end
     end
   end

data/lib/sapos/print/printer.rb

@@ -10,7 +10,7 @@ module Sapos
       def print(args = {})
         raw_message = args[:document]
       
-        log_text = "Print #{args[:document_number]},#{args[:print_control]}"
+        log_text = "id=#{args[:id]},doc=#{args[:document_number]},control=#{args[:print_control] ? "SI" : "NO"}\t"
         filename = "#{args[:document_number]}.print" if args[:document_number]
         filename = SecureRandom.hex if filename.nil?
         result = false
@@ -27,6 +27,9 @@ module Sapos
               result  = send_to_printer({file: filename})
               #puts "Result: #{result}"
               log_text += " => OK"
+            else
+              result = true
+              log_text += " => DUPLICADO"
             end
           else
             printable = data(raw_message)
@@ -49,7 +52,6 @@ module Sapos
       end
       
       def data(raw_message)
-        puts "data: #{@config.interface}"
         case @config.interface
         when 'text'
           return raw_message
@@ -71,9 +73,9 @@ module Sapos
       def send_to_printer(opts = {})
         case @config.adapter
         when 'console'
-          puts "=> CONSOLE: file: #{opts[:file]}<="
+          puts "=> CONSOLE: file: #{opts[:file]}<=\n\n"
           puts File.read(opts[:file])
-          puts "=> END CONSOLE =<"
+          puts "\n=> END CONSOLE =<"
           return true
         when 'cups'
           file = opts.delete(:file)
@@ -81,7 +83,7 @@ module Sapos
           command_options << "-d #{@printer_name}"
           command_options << "-o raw" if opts[:raw].present?
           command = "lp #{command_options.join(" ")} #{file}"
-          puts "CMD => #{command}"
+          puts "CMD => #{command}" if @config.verbose
           if !system(command)
             puts "Not executed"
             return false

data/lib/sapos/print/q_reader.rb

@@ -13,21 +13,35 @@ module Sapos
         reader = QReader.new
         callback = Pubnub::SubscribeCallback.new(
           message: -> (envelope){
-            document = Base64.decode64(envelope.result[:data][:message]['document'])
-            print_control = envelope.result[:data][:message]['print_control']
-            document_number = envelope.result[:data][:message]['document_number']
+            begin
+              
+              msg = envelope.result[:data][:message]
+              msgid = envelope.result.dig(:data, :publish_time_object, :timetoken)
+              print_control = nil
+              document_number = nil
+              
+              puts msg.inspect if reader.config.verbose
+              
+              if msg.is_a?(Hash)
+                print_control = msg['print_control']
+                document_number = msg['document_number']
+                msg = msg['document']
+              end
             
-            if reader.printer.print(document: document, print_control: print_control, document_number: document_number)
-              puts "OK"
-            else
-              puts "Printer Error".red
+              document = Base64.decode64(msg)
+            
+              if !reader.printer.print(document: document, print_control: print_control, document_number: document_number, id: msgid)
+                puts "Printer Error"
+              end
+            rescue => e
+              puts "Error: #{e.message}"
             end
           },
           presence: ->(envelope){},
           status: ->(envelope){}
         )
         reader.pubnub.add_listener(callback: callback)
-        reader.pubnub.subscribe(channels: reader.config.q)
+        reader.pubnub.subscribe(channels: [reader.config.q])
         ARGV.clear
         while line = gets do
            #Wait forever ;-)
@@ -37,7 +51,7 @@ module Sapos
       def initialize
         @config = QReader.printer_config
         @printer = Printer.new(@config)
-        @pubnub = Pubnub.new(subscribe_key: @config.key)
+        @pubnub = Pubnub.new(subscribe_key: @config.key, user_id: @config.user_id)
       end        
     end
   end

data/lib/sapos/print/version.rb

@@ -2,6 +2,6 @@
 
 module Sapos
   module Print
-    VERSION = "1.0.6"
+    VERSION = "1.0.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sapos-print
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors:
 - Josef Sauter
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2023-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor