zashoku 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0db9aff8e20d948bbfeedb2ee251d30d586b9d6
-  data.tar.gz: d0af382c8c4f81b56d75ef9a91ac3c56abc797be
+  metadata.gz: 75e3775fdccdd11934891cf0ecb6dc26970861c2
+  data.tar.gz: 2bb3b8ec31b215d353b0fd89a22609a9eac5f952
 SHA512:
-  metadata.gz: c6014610f36f4840174e2de7417a3020dd4905219fc0e6de60170227ac5fb1482115175a61db0a0c2523936aa091fd06a450c7f541abcd2487ff2a68c7c30c3a
-  data.tar.gz: f6c68b7a354a964f85834e33a76c9ef8134c9f30aff28b0ad8c9d27e2752e3d5d757b540595e23748b8b3dc2b1a2798ddeacd4b8e680a0f1fa0b8ef66d415120
+  metadata.gz: 553deb8cd3b0b929aa9eb43f776150e8df4e8ac80f06b51d56ff17710e4b6845cf73f956c947a16485b44ab1da6cbbc7b261155a773b215b13d6e36963f3c588
+  data.tar.gz: 5995692a530495950f408e6b2aba395e3211b0c50c03a110209efce88e5fb568b2b20c416f14396fdbb7930b63fb143f385908a7e9b9200aa90eb01af769fc54

data/lib/constants.rb

@@ -3,7 +3,7 @@
 require_relative 'core/util/util'
 
 module Zashoku
-  Version = [1, 6, 0].freeze
+  Version = [1, 7, 0].freeze
 
   Root    = File.expand_path('../', __dir__)
 
@@ -26,6 +26,9 @@ module Zashoku
       net: {
         host: 'localhost',
         port: 26_119
+      },
+      msg: {
+        quit: 'Type :quit<enter> to quit'
       }
     },
     core: {

data/lib/core/module.rb

@@ -11,7 +11,8 @@ module Zashoku
         next unless File.exist?(mod_path)
         begin
           require mod_path
-        rescue LoadError
+        rescue LoadError => e
+          Zashoku.logger.error("error: #{e} while loading #{mod}")
           false
         end
       end.any?

data/lib/core/net/client.rb

@@ -25,9 +25,18 @@ module Zashoku
         @result_queue = Queue.new
         @event_queue = Queue.new
 
+        @semaphore = Mutex.new
+
         start_threads
+        say_helo
+      end
 
-        @semaphore = Mutex.new
+      def say_helo
+        r = command(
+          'helo',
+          {zv: Zashoku::Version, app: Zashoku::CConf[:app][:name]}
+        )
+        Zashoku.logger.warn('Everything is not okay') unless r['response'] == 'ok'
       end
 
       def start_threads
@@ -123,14 +132,22 @@ module Zashoku
           payload = { 'msg' => msg, 'raw' => true }.merge(args)
           @socket.puts(JSON.generate(payload))
           f = File.open(file, 'w')
+          Zashoku::Util.alert("opened file #{file}")
           f.sync = true
+          Zashoku::Util.alert('waiting for server...')
+          l = @socket.gets(Zashoku::EOF).split(Zashoku::EOF).first.to_i
+          Zashoku::Util.alert("got length #{l}")
+          r = 0
           loop do
             d = @socket.gets(Zashoku::EOF, BSIZE)
+            dl = d.length
             f.print(d)
-            break if d.length < BSIZE
+            Zashoku::Util.alert( "file #{((r += dl) / Float(l) * 100).round}% buffered" )
+            break if dl < BSIZE
           end
           f.close
         }
+        Zashoku::Util.alert('file buffered')
         Zashoku.logger.info('re-starting client threads from command_to_file')
         start_threads
       end

data/lib/core/net/client_san.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require_relative 'client_san'
+
+module Zashoku
+  module Net
+    class ClientSan
+      KANA=[ 'a',  'i',  'u',  'e',  'o', 'ka', 'ki', 'ku', 'ke', 'ko', 'sa',
+             'shi', 'su', 'se', 'so', 'ta', 'chi', 'tsu', 'te', 'to', 'na',
+             'ni', 'nu', 'ne', 'no', 'ha', 'hi', 'fu', 'he', 'ho', 'ma', 'mi',
+             'mu', 'me', 'mo', 'ya', 'yu','yo', 'ra', 'ri', 'ru', 're', 'ro',
+             'wa', 'n' ]
+
+      attr_reader :c
+
+      def initialize(client)
+        @c = client
+      end
+
+      def to_s
+        "#{@name || @name = generate_name(@c.hash)}@#{@c.addr[2]}:#{@c.addr[1]}"
+      end
+
+      def generate_name(hash)
+        coll = ''
+        hash.abs.to_s[0..5].chars.map do |c|
+          coll += c
+          if coll.to_i >= KANA.length
+            KANA[coll.to_i % KANA.length]
+          end
+        end.compact.join + '-san'
+      end
+    end
+  end
+end

data/lib/core/net/server.rb

@@ -4,6 +4,8 @@ require 'socket'
 require 'json'
 require 'thread'
 
+require_relative 'client_san'
+
 module Zashoku
   module Net
     class Server
@@ -21,6 +23,7 @@ module Zashoku
             raise "error, port #{port} is busy"
           end
         @server_thread = Thread.new { serve_clients! }
+        Zashoku.logger.info("serving customers on localhost:#{port}")
       end
 
       def exit
@@ -29,23 +32,29 @@ module Zashoku
 
       def event(e)
         clients.each do |client|
-          client.puts JSON.generate(e)
+          client.c.puts JSON.generate(e)
         end
       end
 
       def handle(client)
+        expecting_helo = true
         loop do
           message =
             begin
-              JSON.parse(client.readline.chomp)
+              JSON.parse(client.c.readline.chomp)
             rescue EOFError
               { 'msg' => 'disconnect' }
             end
+          if expecting_helo and message['msg'] != 'helo'
+            Zashoku.logger.warn("#{client} did not say helo, rude!")
+          end
+          expecting_helo = false
           begin
             response = @handler.call(message)
-            client.puts(
+            Zashoku.logger.debug("sending message to #{client}")
+            client.c.puts(
               if message['raw']
-                response + Zashoku::EOF
+                response.length.to_s + Zashoku::EOF + response + Zashoku::EOF
               else
                 JSON.generate(response: response)
               end
@@ -56,20 +65,21 @@ module Zashoku
             break unless response
           end
         end
-        Zashoku.logger.info("client #{client.hash} disconnected")
+        Zashoku.logger.info("bye bye #{client}")
         @clients.delete(client)
         @client_queue.delete(client)
-        client.close
+        client.c.close
       end
 
       def serve_clients!
         Thread.abort_on_exception = true
         loop do
           Thread.start(@server.accept) do |client|
-            Zashoku.logger.info("got client (hash: #{client.hash})")
-            @clients << client
-            @client_queue[client] = Queue.new
-            handle(client)
+            csan = ClientSan.new(client)
+            Zashoku.logger.info("#{csan} connected")
+            @clients << csan
+            @client_queue[csan] = Queue.new
+            handle(csan)
           end
         end
       end

data/lib/core/util/readline.rb

@@ -61,7 +61,7 @@ module Zashoku
             @x = string.length + prompt.length
           when 10, ?\n, ?\r
             break
-          when 127 #backspace
+          when 127, 8, ?\b #backspace
             print "\e[#{y};#{x}H "
             @x -= 1
             break if @x < prompt.length

data/lib/core/view.rb

@@ -26,6 +26,8 @@ module Zashoku
       refresh
     end
 
+    def cleanup; end
+
     def dirty_all_lines
       @dirty_lines = 0.step(get_len).to_a
     end

data/lib/daemon.rb

@@ -43,6 +43,7 @@ module Zashoku
 
       Zashoku.logger = Logger.new(STDOUT)
       Zashoku.logger.level = Zashoku::CConf[:app][:log_level][:daemon]
+      Zashoku.logger.info("server using zashoku v#{Version.join('.')}")
       # Load conf
       Zashoku.conf = DaemonConfig.new
       # Load modules
@@ -78,6 +79,13 @@ module Zashoku
         Zashoku.command(mod: message[:mod], meth: :items)
       when 'fwd'
         Zashoku.command(message)
+      when 'helo'
+        Zashoku.logger.info("Client saying helo #{message}")
+        if message['zv'] == Zashoku::Version && message['app'] == Zashoku::CConf[:app][:name]
+          'ok'
+        else
+          'rejected'
+        end
       when 'disconnect'
         nil
       when 'stop'

data/lib/viewer.rb

@@ -143,13 +143,17 @@ module Zashoku
       end
       Signal.trap('INT') do
         Thread.new do
-          @semaphore.synchronize { Util.alert('Type :quit<enter> to exit.') }
+          @semaphore.synchronize { Util.alert(Zashoku::CConf[:app][:msg][:quit]) }
         end
       end
     end
 
     def cleanup
       Zashoku.client.disconnect
+      @views.each do |m, v|
+        Zashoku.logger.debug("sending cleanup to #{m} #{v}")
+        v&.send(:cleanup)
+      end
       @key_thread&.exit
       Curses.close_screen
 
@@ -191,9 +195,9 @@ module Zashoku
       return builtin_command(*cmd.split) if COMMANDS.key?(cmd.split.first)
       raise "no such command" if cmd.split.length == 1
       command(*cmd.split) unless cmd.empty?
-    #rescue StandardError => e
-    #  Zashoku.logger.error("#{cmd.split} raised an error '#{e}'")
-   #   Util.alert("Error: #{e}")
+    rescue StandardError => e
+      Zashoku.logger.error("#{cmd.split} raised an error '#{e}'")
+      Util.alert("Error: #{e}")
     end
 
     def search(*)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zashoku
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - annacrombie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -122,6 +122,7 @@ files:
 - "./lib/core/modules/conf/lib/conf.rb"
 - "./lib/core/modules/conf/lib/conf/config_view.rb"
 - "./lib/core/net/client.rb"
+- "./lib/core/net/client_san.rb"
 - "./lib/core/net/server.rb"
 - "./lib/core/options.rb"
 - "./lib/core/statusline/statusline.rb"