aromancer 0.0.6 → 0.0.8

data/lib/aromancer/storage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 =begin
 
   storage.rb
@@ -12,18 +14,116 @@ module Aromancer
   class Storage
     include Singleton
 
-    DEFAULT_SERVER = "http://aromancer.com"
+    VALID_KEYS = [
+      :arena,
+      :last_error,
+      :legends,
+      :player,
+      :preference_debug,
+      :preference_force_ssl,
+      :preference_hide_sentences,
+      :preference_hide_stream,
+      :server_url_host,
+      :server_url_port,
+      :server_url_scheme,
+      :signed_out_flag,
+      :stream,
+      :websocket_path,
+      :websocket_scheme
+   ]
+
+   PERSISTED_KEYS = [
+      :last_error,
+      :player,
+      :preference_debug,
+      :preference_force_ssl,
+      :preference_hide_sentences,
+      :preference_hide_stream,
+      :server_url_host,
+      :server_url_port,
+      :server_url_scheme,
+      :websocket_path,
+      :websocket_scheme
+    ]
 
-    attr_accessor :storage_open, :cache
+    URI_KEYS = [
+      :scheme,
+      :host,
+      :port
+    ]
+
+    DEFAULT_SERVER = "http://127.0.0.1"
+
+    DEFAULT_PREFERENCES = {
+      preference_debug: false,
+      preference_force_ssl: false,
+      preference_hide_sentences: true,
+      preference_hide_stream: true,
+    }
+
+    attr_accessor :storage_open, :cache, :clear_flag, :parser_error
 
     def initialize
+      reload!
+      ensure_default_preferences_exist
+    end
+
+    def ensure_default_preferences_exist
+      DEFAULT_PREFERENCES.keys.each{|d_key|
+        current_value = get_key(d_key)
+        if current_value.nil? || ![TrueClass, FalseClass].include?(current_value.class)
+          set_key(d_key.to_s, DEFAULT_PREFERENCES[d_key])
+        end
+      }
+    end
+
+    def reload!
+      @storage_open = false
+      @clear_flag = false
+      @parser_error = nil
       clear_cache!
       FileUtils.mkdir_p(Aromancer.home_directory)
     end
 
     def clear_cache!
+      if @storage_open
+        @clear_flag = true
+        return
+      end
+      @clear_flag = false
       @storage_open = false
-      @cache = {}
+
+      @cache = {} # clear'd
+    end
+
+    def self.snapshot_config
+      current_config = {}
+
+      PERSISTED_KEYS.each{|p_key|
+        current_config[p_key] = Aromancer::Storage.instance.get_key(p_key)
+      }
+
+      current_config
+    end
+
+    def self.valid_config?(config)
+      return false unless config.kind_of?(Hash)
+
+      config.keys.all?{|k| PERSISTED_KEYS.include?(k.to_sym)}
+    end
+
+    def self.restore_config(config)
+      return nil unless valid_config?(config)
+      PERSISTED_KEYS.each{|p_key|
+        Aromancer::Storage.instance.set_key(p_key, config[p_key])
+      }
+    end
+
+    def self.recreate!
+      current_config = snapshot_config
+      FileUtils.rm_rf(storage_filepath)
+      Aromancer::Storage.instance.reload!
+      restore_config(current_config)
     end
 
     def self.storage_filepath
@@ -48,34 +148,35 @@ module Aromancer
       return Time.now.to_i
     end
 
-    def self.get_preference(preference, default: :default)
+    def self.get_preference(preference, default: nil)
       p_key = "preference_#{preference}"
-      p = instance.get_key(p_key)
-      if p.nil?
-        instance.set_key(p_key, default)
-        return instance.get_key(p_key)
+      pref = Aromancer::Storage.instance.get_key(p_key)
+      if pref.nil? && !default.nil?
+        Aromancer::Storage.instance.set_key(p_key, default)
+        pref = Aromancer::Storage.instance.get_key(p_key)
       end
-      p
+      pref
     end
 
     def self.set_preference(preference, value)
       p_key = "preference_#{preference}"
-      instance.set_key(p_key, value)
+      Aromancer::Storage.instance.set_key(p_key, value)
     end
 
     def self.toggle_preference(key)
-      set_preference(key, !get_preference(key))
+      v = get_preference(key, default: DEFAULT_PREFERENCES["preference_#{key}"])
+      set_preference(key, !v)
     end
 
     def self.toggle_force_ssl
       toggle_preference(:force_ssl)
       v = get_preference(:force_ssl)
-      self.instance.set_key(:server_url_scheme, "http#{v ? :s : ""}")
-      self.instance.set_key(:websocket_scheme, "ws#{v ? :s : ""}")
+      Aromancer::Storage.set_key(:server_url_scheme, "http#{v ? :s : ""}")
+      Aromancer::Storage.set_key(:websocket_scheme, "ws#{v ? :s : ""}")
     end
 
     def self.set_signed_out_flag(flag)
-      Aromancer::Storage.instance.set_key(:signed_out_flag, flag)
+      instance.set_key(:signed_out_flag, flag)
     end
 
     def self.get_signed_out_flag
@@ -83,7 +184,7 @@ module Aromancer
     end
 
     def self.set_player(player_hash)
-      Aromancer::Storage.instance.set_key(:player, player_hash)
+      instance.set_key(:player, player_hash)
     end
 
     def self.get_player
@@ -91,7 +192,7 @@ module Aromancer
     end
 
     def self.set_legends(legends_array)
-      Aromancer::Storage.instance.set_key(:legends, legends_array)
+      instance.set_key(:legends, legends_array)
     end
 
     def self.get_legends
@@ -99,7 +200,7 @@ module Aromancer
     end
 
     def self.set_arena(arena_hash)
-      Aromancer::Storage.instance.set_key(:arena, arena_hash)
+      instance.set_key(:arena, arena_hash)
     end
 
     def self.get_arena
@@ -107,7 +208,7 @@ module Aromancer
     end
 
     def self.set_stream(stream_array)
-      Aromancer::Storage.instance.set_key(:stream, stream_array)
+      instance.set_key(:stream, stream_array)
     end
 
     def self.get_stream
@@ -115,25 +216,18 @@ module Aromancer
     end
 
     def self.set_last_error(error_hash)
-      Aromancer::Storage.instance.set_key(:last_error, error_hash)
+      instance.set_key(:last_error, error_hash)
     end
 
     def self.get_last_error
       Aromancer::Storage.instance.get_key(:last_error)
     end
 
-    URI_KEYS = [
-      :scheme,
-      :host,
-      :port
-    ]
-
     def self.set_server_url(server_url)
       uri = URI.parse(server_url)
-      if uri.kind_of?(URI::HTTP) or uri.kind_of?(URI::HTTPS)
+      if uri.kind_of?(URI::HTTP) || uri.kind_of?(URI::HTTPS)
         URI_KEYS.each{|k|
-          uri.kind_of?(URI::HTTP) && get_preference(:force_ssl) ? toggle_force_ssl : nil
-          Aromancer::Storage.instance.set_key("server_url_#{k}", uri.select(k).first)
+          instance.set_key("server_url_#{k}", uri.select(k).first)
         }
       elsif get_server_url.nil?
         set_server_url(DEFAULT_SERVER)
@@ -158,12 +252,12 @@ module Aromancer
     def self.get_websocket_url
       # default scheme is ws
       w_scheme = Aromancer::Storage.instance.get_key(:websocket_scheme)
-      Aromancer::Storage.instance.set_key(:websocket_scheme, :ws) if w_scheme.nil?
+      instance.set_key(:websocket_scheme, :ws) if w_scheme.nil?
       w_scheme = Aromancer::Storage.instance.get_key(:websocket_scheme)
 
       # default path is broadcast
       w_path = Aromancer::Storage.instance.get_key(:websocket_path)
-      Aromancer::Storage.instance.set_key(:websocket_path, :broadcast) if w_path.nil?
+      instance.set_key(:websocket_path, :broadcast) if w_path.nil?
       w_path = Aromancer::Storage.instance.get_key(:websocket_path)
 
       # asserts host and port not nil
@@ -179,7 +273,9 @@ module Aromancer
 
       # ensure default for key exists
       @cache[key] = {value: nil, persisted: false} unless @cache.keys.include?(key)
-
+      if false && (@cache[:preference_debug.to_s] || {value: DEFAULT_PREFERENCES[:preference_debug]})[:value]
+        Aromancer::Prompt.say("#{__method__} > @cache[#{key}]=#{@cache[key]}")
+      end
       # return cache value if storage open or the cache value is persisted
       return @cache[key][:value] if @storage_open || @cache[key][:persisted]
 
@@ -187,12 +283,17 @@ module Aromancer
       @storage_open = true
       storage_contents = {}
       begin
+        @parser_error = nil
         # read storage
-        storage_contents = JSON.parse(File.read(Aromancer::Storage.storage_filepath))
+        storage_contents = JSON.parse(File.read(Aromancer::Storage.storage_filepath, encoding: "UTF-8"))
       rescue StandardError => e
         @storage_open = false
-        FileUtils.rm(Aromancer::Storage.storage_filepath)
-        return
+        if @parser_error.nil?
+          @parser_error = e
+          return get_key(key)
+        else
+          raise @parser_error
+        end
       end
 
       # only update the cache value if present in storage
@@ -202,20 +303,26 @@ module Aromancer
         @cache[key][:persisted] = false
       end
 
+      value = @cache[key][:value]
       @storage_open = false
-      @cache[key][:value]
+      clear_cache! if @clear_flag
+      return value
     end
 
     def set_key(key, value)
       key = key.to_s
 
       # ensure default for key exists
-      @cache[key] = {value: nil, persisted: false} unless @cache.keys.include?(key)
+      @cache[key] = {value: value, persisted: false} unless @cache.keys.include?(key)
 
       # assign new cache value and set persisted to false
       @cache[key][:value] = value
       @cache[key][:persisted] = false
 
+      if @storage_open && (@cache[:preference_debug.to_s] || {value: DEFAULT_PREFERENCES[:preference_debug]})[:value]
+        puts Thread.current.backtrace
+        Aromancer::Prompt.say("#{__method__} > @cache[#{key}]=#{@cache[key]}")
+      end
       # return if storage open
       # non-persisted cache values update next cycle
       return if @storage_open
@@ -224,12 +331,17 @@ module Aromancer
       @storage_open = true
       storage_contents = {}
       begin
+        @parser_error = nil
         # read storage
-        storage_contents = JSON.parse(File.read(Aromancer::Storage.storage_filepath))
+        storage_contents = JSON.parse(File.read(Aromancer::Storage.storage_filepath, encoding: "UTF-8"))
       rescue StandardError => e
         @storage_open = false
-        FileUtils.rm(Aromancer::Storage.storage_filepath)
-        return
+        if @parser_error.nil?
+          @parser_error = e
+          return get_key(key)
+        else
+          raise @parser_error
+        end
       end
 
       # update storage and cache
@@ -245,8 +357,13 @@ module Aromancer
         f.write(storage_contents.to_json)
       end
 
+      if (@cache[:preference_debug.to_s] || {value: DEFAULT_PREFERENCES[:preference_debug]})[:value]
+        Aromancer::Prompt.say("#{__method__} > @cache[#{key}]=#{@cache[key]}")
+      end
+
       # close storage
       @storage_open = false
+      clear_cache! if @clear_flag
     end
   end
 end

data/lib/aromancer/version.rb

@@ -11,5 +11,5 @@
 =end
 
 module Aromancer
-  VERSION = "0.0.6"
+  VERSION = "0.0.8"
 end

data/lib/aromancer/websocket.rb

@@ -22,9 +22,18 @@ module Aromancer
 
     attr_accessor :socket
 
+    def self.channel_identifier
+      {identifier: {channel: :PlayerChannel.to_s, id: Aromancer::Storage.get_player["id"]}.to_json}
+    end
+
     def connect
-      return unless self.socket.nil?
-      return if Aromancer::Storage.get_player["api_key"].nil?
+      if !self.socket.nil? && self.socket.closed?
+        disconnect
+      end
+
+      return if !self.socket.nil? ||
+        Aromancer::Storage.get_player["api_key"].nil? ||
+        Aromancer::Storage.get_player["active_legend_id"].nil?
 
       begin
         self.socket = WebSocket::Client::Simple.connect(Aromancer::Storage.get_websocket_url, {headers: Aromancer::Server.auth_header})
@@ -45,8 +54,10 @@ module Aromancer
             legend_id = payload["message"]["id"]
             lid = Aromancer::Storage.get_player&.symbolize_keys[:active_legend_id]
             if !lid.nil? && lid == legend_id.to_i
+              Aromancer::Storage.instance.clear_cache!
+              Aromancer::Api.get_legends
               Aromancer::Api.load_arena
-              sleep(0.5)
+              sleep(1)
               Aromancer::Cli.instance.start_ui_thread
             end
           when :legends
@@ -57,10 +68,7 @@ module Aromancer
       end
 
       self.socket.on :open do
-        r = {
-          command: "subscribe",
-          identifier: {channel: "PlayerChannel"}.to_json
-        }.to_json
+        r = {"command": :subscribe.to_s}.merge(Aromancer::Websocket.channel_identifier).to_json
         Aromancer::Websocket.instance.socket.send(r)
       end
 
@@ -69,7 +77,10 @@ module Aromancer
       end
 
       self.socket.on :error do |e|
-        puts e.inspect
+        if Aromancer::Storage.get_preference(:debug)
+          Aromancer::Prompt.say("#{self.class.name} socket.on :error")
+          Aromancer::Prompt.say(e.inspect)
+        end
         Aromancer::Websocket.instance.disconnect
       end
     end
@@ -78,5 +89,15 @@ module Aromancer
       self.socket&.close
       self.socket = nil
     end
+
+    # todo: websockets only in-game
+    # https://docs.anycable.io/misc/action_cable_protocol#perform-actions
+    # def self.set_active_legend_id(id)
+    #   return if self.instance.socket.nil?
+    #   r = {"command": :message.to_s}.merge(Aromancer::Websocket.channel_identifier).merge({
+    #     data: {action: :player.to_s, active_legend_id: id}.to_json
+    #   }).to_json
+    #   self.instance.socket.send(r)
+    # end
   end
 end

data/lib/aromancer.rb

@@ -14,126 +14,38 @@ require_relative :reiquire.to_s
 Reiquire::aromancer
 
 module Aromancer
-  THROTTLE_MS = 0.2
+  ERROR_EXPIRATION = 11.11.to_f
   FONT = TTY::Font.new(:standard)
+  DATE_FORMAT = "%A %d %b %Y %I:%M:%S %p"
+  TIME_FORMAT = "%I:%M:%S %p"
 
   UNICODE = {
     close: "\u2A2F",
     check: "\u2713"
   }
 
-  # instance runs on main thread
-  class Cli
-    include Singleton
-
-    attr_accessor :ui_thread, :ws_thread, :busy, :last_render
-
-    # user entry point
-    def self.run
-      # ensure preferences exist
-      Aromancer::Storage.get_preference(:debug, default: false)
-      Aromancer::Storage.get_preference(:force_ssl, default: true)
-      Aromancer::Storage.get_preference(:hide_sentences, default: true)
-
-      self.instance.last_render = 0
-
-      # load player on-start
-      Aromancer::Api.set_active_legend_id(nil) unless Aromancer::Storage.get_player.nil?
-
-      Thread.main[:route] = :authentication
-      Thread.main[:menu_options] = {}
-      Aromancer::Prompt.say(I18n.t("shared.welcome", version: Aromancer::VERSION))
-      Aromancer::Prompt.say(I18n.t("shared.server_url", url: Aromancer::Storage::get_server_url))
-      self.instance.start_ui_thread
-      self.instance.start_ws_thread
-      loop do
-        begin
-          self.instance.ui_thread.join
-        rescue NoMethodError => e
-          if Aromancer::Storage.get_preference(:debug)
-            Aromancer::Prompt.say(I18n.t("shared.last_error"))
-            Aromancer::Prompt.say(e.inspect)
-            sleep(5)
-          end
-          self.instance.start_ui_thread
-          self.instance.start_ws_thread
-          sleep(1)
-        rescue Interrupt => e
-          exit
-        end
-      end
-    end
-
-    def get_view(view_key)
-      Thread.main[:menu_options][view_key.to_sym]
-    end
-
-    def start_ui_thread(force = false)
-      return if (@busy || Time.now - @last_render < 2) && !force
-
-      @busy = true
-      self.ui_thread&.exit
-      self.ui_thread&.kill
-      Thread.main[:menu_runners] = {}
-      Aromancer::Prompt.instance.reload!
-      self.ui_thread = Thread.new do
-        loop do
-          menu_options = Thread.main[:menu_options][Thread.main[:route]]
-          menu_runners = Thread.main[:menu_runners][Thread.main[:route]]
-          unless menu_options.nil? || menu_runners.nil?
-            Aromancer::Routes.resume
-            sleep(THROTTLE_MS)
-            Aromancer.print_hud
-            v = Aromancer::Prompt.p.select("", menu_options, show_help: :always, cycle: true, per_page: 11)
-            runners = menu_runners.select{|r| r[:value] == v}
-            runners = menu_runners.select{|r| r[:value].nil?} if runners.empty?
-
-            if runners.any?
-              r = runners.first
-              r[:proc].call(v)
-            else
-              exit
-            end
-          else
-            Aromancer::Routes.resume
-          end
-          Aromancer::Cli.instance.busy = false
-          Aromancer::Cli.instance.last_render = Time.now
-          # sleep(THROTTLE_MS)
-        end
-      end
-    end
-
-    def start_ws_thread
-      self.ws_thread.kill unless self.ws_thread.nil?
-      self.ws_thread = Thread.new do
-        Aromancer::Websocket.instance.disconnect
-        loop do
-          player = Aromancer::Storage.get_player
-          if player.nil?
-            Aromancer::Websocket.instance.disconnect
-          elsif !player["api_key"].nil?
-            # attempt websocket connection
-            Aromancer::Websocket.instance.connect
-          end
-
-          sleep(4)
-        end
-      end
-    end
+  def self.print_large_text(text = Aromancer.to_s.downcase, letter_spacing = 1)
+    Aromancer::Prompt.say(Aromancer::FONT.write(text, letter_spacing: letter_spacing))
+  end
 
+  def self.home_directory
+    "#{`echo $HOME`.strip}/.aromancer"
   end
 
-  def self.get_font(text = :aromancer.to_s, letter_spacing = 1)
-    Aromancer::FONT.write(text, letter_spacing: letter_spacing).split("\n")
+  def self.date_display(raw)
+    DateTime.parse(raw)&.strftime(Aromancer::DATE_FORMAT).downcase.gsub(" ", "_")
   end
 
-  def self.home_directory
-    "#{`echo $HOME`.strip}/.aromancer"
+  def self.time_display(raw)
+    DateTime.parse(raw)&.strftime(Aromancer::TIME_FORMAT).downcase.gsub(" ", "_")
   end
 
   def self.print_hud
-    websocket_status = "#{Aromancer::Storage.instance.get_key(:websocket_scheme)}: #{Aromancer::Websocket.instance.socket.nil? ? UNICODE[:close] : UNICODE[:check] }"
+    print_last_error
+    ws_status_symbol = (
+      Aromancer::Websocket.instance.socket.nil? || Aromancer::Websocket.instance.socket.closed?
+    ) ? UNICODE[:close] : UNICODE[:check]
+    websocket_status = "#{Aromancer::Storage.instance.get_key(:websocket_scheme)}: #{ws_status_symbol}"
     player_status = if Aromancer::Storage.get_player.nil?
       I18n.t("routes.main_menu.not_signed_in")
     else
@@ -141,22 +53,36 @@ module Aromancer
     end
 
     Aromancer::Prompt.say(
-      [nil, player_status, websocket_status, nil].join(" | ")
+      [nil, :v.to_s + Aromancer::VERSION, player_status, websocket_status, nil,].join(" | ")
     )
   end
 
   def self.print_last_error(i18n_key = nil)
-    last_error = Aromancer::Storage.get_last_error
+    if Time.now.to_f - Aromancer::Cli.instance.error_timeout.to_f >= Aromancer::ERROR_EXPIRATION
+      Aromancer::Cli.instance.error_timeout = Time.now.to_i
+      Aromancer::Storage.set_last_error(nil)
+      return
+    end
+
+    last_error = Aromancer::Storage.get_last_error&.symbolize_keys
+
     return if last_error.nil?
-    last_error = last_error.symbolize_keys
     message = last_error[:body]
     begin
       message = JSON.parse(message).symbolize_keys
       message = message[:error_message] if message.keys.include?(:error_message)
+    rescue TypeError => e
+      message = last_error[:body]
     rescue JSON::ParserError => e
       message = last_error[:body]
     end
-    Aromancer::Prompt.say(I18n.t(i18n_key || "shared.last_error", status: last_error[:status], error: message))
-    Aromancer::Storage.set_last_error(nil)
+
+    if message.kind_of?(Hash)
+      message = JSON.pretty_generate(message)
+    elsif message.kind_of?(String)
+      message = message[0..777]
+    end
+
+    Aromancer::Prompt.say(I18n.t(i18n_key || "shared.last_error", status: last_error[:status], error: message), rjust: true)
   end
 end

data/lib/reiquire.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 =begin
 
   reiquire.rb

data/listen.rb

@@ -1,10 +1,6 @@
 require :listen.to_s
 
 listener = Listen.to(*[:lib.to_s, :bin.to_s, :spec.to_s, :locale.to_s], only: /[\.rb\.yml]/) {|modified, added, removed|
-  # puts modified
-  # puts added
-  # puts removed 
-  # system("exec rake make")
   system("exec rake install")
 }
 listener.start

data/locale/en.yml

@@ -13,6 +13,7 @@ en:
     update_confirm: "confirm update [%{new_value}] (enter y): "
     signed_in_as: "authenticated as %{as}"
     last_error: "error (%{status}). %{error}"
+    waiting: "waiting..."
     back: "back"
     exit: "exit"
   routes:
@@ -29,6 +30,7 @@ en:
       new_game: "new game"
       load_game: "load game"
       find_game: "find game"
+      rules: "rules"
       player_count: "enter player count (1-2): "
       sign_out: "sign out"
       not_signed_in: "signed out"
@@ -43,14 +45,15 @@ en:
       debug: "debug (%{stored})"
       debug_toggle: "debug preference toggled to %{value}"
     new_game:
-      player_count: "number of players"
-      story_count: "number of stories"
+      player_count: "players"
+      story_count: "stories"
       starting: "starting new game..."
       status: "status"
       cancelled: "cancelled. game not created."
     legend:
       title: "legend"
       subtitle: "%{subtitle}"
+      alchemy_for: "alchemy_for_%{name}:"
       arena_failed: "arena failed to load (%{status}). %{error}"
       scroll: "scroll"
       spoken_words: "scroll words"
@@ -66,6 +69,8 @@ en:
       place_on_scroll: "place %{word} on the scroll."
       options_for_word: "available options for the %{word} word."
       last_error: "last error"
+      returning_to_: "returning to %{route}..."
+      your_alchemy: "alchemy"
     legends:
       help: ""
     legend_menu:
@@ -74,5 +79,5 @@ en:
       help: ""
     stream:
       title: "stream"
-
-
+      end: "eos"
+      hide_title: "hide stream"

data/pre-commit.git.template

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo "pre-commit hook"
+echo "rake build:checksum && git add checksums/"
+rake build:checksum && git add checksums/

data/tasks/make.rake

@@ -1,4 +1,4 @@
-desc "bundle graph && rake install && rspec --backtrace"
+desc "rake install"
 task :make do
-  exec "bundle graph && rake install && rspec --backtrace"
+  exec "rake install"
 end