aromancer 0.0.3 → 0.0.5

data/lib/aromancer/server.rb

@@ -13,8 +13,9 @@
 module Aromancer
   class Server
     include Singleton
-    SERVER_HOST_FILE = ".aromancer_server_host"
-    SERVER_URL = File.exist?(SERVER_HOST_FILE) ? File.read(SERVER_HOST_FILE) : "http://localhost:3000"
+
+    DEVELOP_SERVER_URL = "http://localhost:3000"
+
     HEADERS = { "Content-Type": "application/json" }
 
     class InternalError
@@ -23,12 +24,13 @@ module Aromancer
       def initialize(status: -1, body: {})
         @status = status
         @body = body
+        Aromancer::Storage.instance.clear_cache!
       end
 
       def self.build(e)
         InternalError.new(
           status: -1,
-          body: {error_message: e.message[0..78]}.to_json
+          body: {error_message: e.inspect.to_s}.to_json
         )
       end
     end
@@ -42,7 +44,7 @@ module Aromancer
     def self.sign_in(email_address, password)
       begin
         Faraday.new(
-          url: SERVER_URL,
+          url: Aromancer::Storage.get_server_url,
           headers: HEADERS,
           params: {
             email_address: email_address,
@@ -57,7 +59,7 @@ module Aromancer
     def self.sign_up(email_address, password, password_confirmation)
       begin
         Faraday.new(
-          url: SERVER_URL,
+          url: Aromancer::Storage.get_server_url,
           headers: HEADERS,
           params: {
             user: {
@@ -75,7 +77,7 @@ module Aromancer
     def self.sign_out
       begin
         Faraday.new(
-          url: SERVER_URL,
+          url: Aromancer::Storage.get_server_url,
           headers: HEADERS,
           params: api_key_param
         ).delete("/session")
@@ -87,7 +89,7 @@ module Aromancer
     def self.create_legend(params)
       begin
         Faraday.new(
-          url: SERVER_URL,
+          url: Aromancer::Storage.get_server_url,
           headers: HEADERS,
           params: params.merge(api_key_param)
         ).post("/legends")
@@ -99,7 +101,7 @@ module Aromancer
     def self.get_legends
       begin
         Faraday.new(
-          url: SERVER_URL,
+          url: Aromancer::Storage.get_server_url,
           headers: HEADERS,
           params: api_key_param
         ).get("/legends")
@@ -111,7 +113,7 @@ module Aromancer
     def self.update_player(params)
       begin
         Faraday.new(
-          url: SERVER_URL,
+          url: Aromancer::Storage.get_server_url,
           headers: HEADERS,
           params: params.merge(api_key_param)
         ).put("/players/#{Aromancer::Storage.get_player["id"]}")
@@ -125,7 +127,7 @@ module Aromancer
 
       begin
         Faraday.new(
-          url: SERVER_URL,
+          url: Aromancer::Storage.get_server_url,
           headers: HEADERS,
           params: api_key_param
         ).get("/legends/#{legend_id}/arena")
@@ -139,7 +141,7 @@ module Aromancer
 
       begin
         Faraday.new(
-          url: SERVER_URL,
+          url: Aromancer::Storage.get_server_url,
           headers: HEADERS,
           params: api_key_param
         ).get("/legends/#{legend_id}/stream")
@@ -152,7 +154,7 @@ module Aromancer
       legend_id = Aromancer::Storage.get_player["active_legend_id"]
       begin
         Faraday.new(
-          url: SERVER_URL,
+          url: Aromancer::Storage.get_server_url,
           headers: HEADERS,
           params: api_key_param
         ).get("/legends/#{legend_id}/words/#{selected_word_id}/possibilities")
@@ -165,7 +167,7 @@ module Aromancer
       legend_id = Aromancer::Storage.get_player["active_legend_id"]
       begin
         Faraday.new(
-          url: SERVER_URL,
+          url: Aromancer::Storage.get_server_url,
           headers: HEADERS,
           params: params.merge(api_key_param)
         ).post("/legends/#{legend_id}/arena")
@@ -178,7 +180,7 @@ module Aromancer
       legend_id = Aromancer::Storage.get_player["active_legend_id"]
       begin
         Faraday.new(
-          url: SERVER_URL,
+          url: Aromancer::Storage.get_server_url,
           headers: HEADERS,
           params: params.merge(api_key_param)
         ).put("/legends/#{legend_id}/arena")

data/lib/aromancer/storage.rb

@@ -12,10 +12,18 @@ module Aromancer
   class Storage
     include Singleton
 
+    attr_accessor :storage_open, :cache
+
     def initialize
+      clear_cache!
       FileUtils.mkdir_p(Aromancer.home_directory)
     end
 
+    def clear_cache!
+      @storage_open = false
+      @cache = {}
+    end
+
     def self.storage_filepath
       filepath = File.join(Aromancer.home_directory, "storage.json")
 
@@ -53,6 +61,13 @@ module Aromancer
       instance.set_key(p_key, value)
     end
 
+    def self.toggle_force_ssl
+      set_preference(:force_ssl, !get_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 : ""}")
+    end
+
     def self.set_signed_out_flag(flag)
       Aromancer::Storage.instance.set_key(:signed_out_flag, flag)
     end
@@ -101,20 +116,131 @@ module Aromancer
       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)
+        URI_KEYS.each{|k|
+          Aromancer::Storage.instance.set_key("server_url_#{k}", uri.select(k).first)
+        }
+      else
+        set_server_url(Aromancer::Server::DEVELOP_SERVER_URL)
+      end
+    end
+
+    def self.get_server_url
+      set_server_url(Aromancer::Server::DEVELOP_SERVER_URL) if URI_KEYS.all?{|k| Aromancer::Storage.instance.get_key("server_url_#{k}").nil?}
+      URI.parse(URI_KEYS.map{|k|
+        c = Aromancer::Storage.instance.get_key("server_url_#{k}")
+        case k
+        when :scheme
+          "#{c}://"
+        when :host
+          c
+        when :port
+          ":#{c}"
+        end
+      }.join("")).to_s
+    end
+
+    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?
+      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?
+      w_path = Aromancer::Storage.instance.get_key(:websocket_path)
+
+      # asserts host and port not nil
+      # assumes same-as-server host and port for now
+      host = Aromancer::Storage.instance.get_key(:server_url_host)
+      port = Aromancer::Storage.instance.get_key(:server_url_port)
+
+      URI.parse("#{w_scheme}://#{host}:#{port}/#{w_path}").to_s
+    end
+
     def get_key(key)
-      storage_contents = JSON.parse(File.read(Aromancer::Storage.storage_filepath))
-      if storage_contents.keys.include?(key.to_s)
-        return storage_contents[key.to_s]
+      key = key.to_s
+
+      # ensure default for key exists
+      @cache[key] = {value: nil, persisted: false} unless @cache.keys.include?(key)
+
+      # return cache value if storage open or the cache value is persisted
+      return @cache[key][:value] if @storage_open || @cache[key][:persisted]
+
+      # open storage
+      @storage_open = true
+      storage_contents = {}
+      begin
+        # read storage
+        storage_contents = JSON.parse(File.read(Aromancer::Storage.storage_filepath))
+      rescue StandardError => e
+        @storage_open = false
+        FileUtils.rm(Aromancer::Storage.storage_filepath)
+        return
       end
+      @storage_open = false
+
+      # only update the cache value if present in storage
+      if storage_contents.keys.include?(key)
+        @cache[key][:value] = storage_contents[key]
+        @cache[key][:persisted] = true
+      else
+        @cache[key][:persisted] = false
+      end
+
+      @cache[key][:value]
     end
 
     def set_key(key, value)
-      storage_contents = JSON.parse(File.read(Aromancer::Storage.storage_filepath))
-      storage_contents[key.to_s] = value
+      key = key.to_s
+
+      # ensure default for key exists
+      @cache[key] = {value: nil, persisted: false} unless @cache.keys.include?(key)
+
+      # assign new cache value and set persisted to false
+      @cache[key][:value] = value
+      @cache[key][:persisted] = false
+
+      # return if storage open
+      # non-persisted cache values update next cycle
+      return if @storage_open
+
+      # open storage
+      @storage_open = true
+      storage_contents = {}
+      begin
+        # read storage
+        storage_contents = JSON.parse(File.read(Aromancer::Storage.storage_filepath))
+      rescue StandardError => e
+        @storage_open = false
+        FileUtils.rm(Aromancer::Storage.storage_filepath)
+        return
+      end
 
+      # update storage and cache
+      ([key] + @cache.keys.select{|k|
+        !@cache[k][:persisted]
+      }).each{|k|
+        storage_contents[k] = @cache[k][:value]
+        @cache[k][:persisted] = true
+      }
+
+      # write storage
       File.open(Aromancer::Storage.storage_filepath, "w+") do |f|
         f.write(storage_contents.to_json)
       end
+
+      # close storage
+      @storage_open = false
     end
   end
 end

data/lib/aromancer/version.rb

@@ -11,5 +11,5 @@
 =end
 
 module Aromancer
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/lib/aromancer/websocket.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+=begin
+
+  websocket.rb
+
+  websocket client.
+
+  by i2097i
+
+=end
+
+module Aromancer
+  class Websocket
+    include Singleton
+
+    TYPES = [
+      :arena,
+      :player
+    ]
+
+    attr_accessor :socket
+
+    def connect(api_key)
+      return unless self.socket.nil?
+      self.socket = WebSocket::Client::Simple.connect("#{Aromancer::Storage.get_websocket_url}?api_key=#{api_key}")
+      self.socket.on :message do |msg|
+        payload = JSON.parse(msg.data) rescue msg.data
+        if !payload.nil? &&
+          !payload["identifier"].nil? &&
+          !payload["message"].nil? &&
+          !payload["message"]["type"].nil? &&
+          TYPES.include?(payload["message"]["type"].to_sym)
+
+          legend_id = payload["message"]["id"]
+          lid = Aromancer::Storage.get_player&.symbolize_keys[:active_legend_id]
+          if !lid.nil? && lid == legend_id.to_i
+            Aromancer::Cli.instance.start_ui_thread
+          end
+        end
+      end
+
+      self.socket.on :open do
+        r = {
+          command: "subscribe",
+          identifier: {channel: "PlayerChannel", api_key: api_key}.to_json
+        }.to_json
+        Aromancer::Websocket.instance.socket.send(r)
+      end
+
+      self.socket.on :close do |e|
+        Aromancer::Websocket.instance.disconnect
+      end
+
+      self.socket.on :error do |e|
+        puts e.inspect
+        Aromancer::Websocket.instance.disconnect
+      end
+    end
+
+    def disconnect
+      self.socket = nil unless self.socket.nil?
+    end
+  end
+end

data/lib/aromancer.rb

@@ -14,8 +14,98 @@ require_relative :reiquire.to_s
 Reiquire::aromancer
 
 module Aromancer
+  THROTTLE_MS = 0.4
   FONT = TTY::Font.new(:standard)
 
+  # instance runs on main thread
+  class Cli
+    include Singleton
+
+    attr_accessor :ui_thread, :ws_thread, :busy, :last_render
+
+    # user entry point
+    def self.run
+      Thread.main[:route] = :authentication
+      self.instance.last_render = Time.now
+      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
+          self.instance.start_ui_thread
+          sleep(1)
+        rescue Interrupt => e
+          exit
+        end
+      end
+    end
+
+    def start_ui_thread
+      if @busy || Time.now - @last_render < 2
+        # Thread.new{
+        #   while Aromancer::Cli.instance.busy do
+        #     if Time.now - Aromancer::Cli.instance.last_render > 5
+        #       sleep(2)
+        #       Aromancer::Cli.instance.start_ui_thread
+        #     end
+        #   end
+        # }.join
+        return
+      end
+      @busy = true
+      self.ui_thread&.exit
+      self.ui_thread&.kill
+      Thread.main[:input_controls] = nil
+      Aromancer::Prompt.instance.reload!
+      self.ui_thread = Thread.new do
+        loop do
+          ic = Thread.main[:input_controls]
+          unless ic.nil?
+            Aromancer::Routes.resume
+            sleep(THROTTLE_MS)
+            v = Aromancer::Prompt.p.select("", ic[:choices], show_help: :always, cycle: true, per_page: 11)
+            runners = ic[:runners].select{|r| r[:value] == v}
+            runners = ic[: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
+        loop do
+          player = Aromancer::Storage.get_player
+          if player.nil?
+            Aromancer::Websocket.instance.disconnect
+          elsif !player["api_key"].nil?
+            # attempt websocket connection
+            # puts :ws_thread
+            Aromancer::Websocket.instance.connect(player["api_key"])
+          end
+
+          sleep(4)
+        end
+      end
+    end
+
+  end
+
   def self.get_font(text = :aromancer.to_s, letter_spacing = 1)
     Aromancer::FONT.write(text, letter_spacing: letter_spacing).split("\n")
   end

data/lib/reiquire.rb

@@ -13,7 +13,7 @@ require :"active_support/all".to_s
 require :i18n.to_s
 require :faraday.to_s
 require :fileutils.to_s
-# require :"websocket-client-simple".to_s
+require :"websocket-client-simple".to_s
 
 # require :"tty-box".to_s # draw box shapes
 # require :"tty-color".to_s # detect color support

data/locale/en.yml

@@ -7,7 +7,11 @@ en:
     inturrupt: "exiting due to user inturrupt..."
     reader_initialized: "input reader initialized."
     welcome: "welcome to aromancer. loading v%{version}..."
+    server_url: "current server: %{url}"
     navigate: "navigate to %{route}."
+    update_cancel: "update cancelled."
+    update_confirm: "confirm update [%{new_value}] (enter y): "
+    back: "back"
     exit: "exit"
   routes:
     authentication:
@@ -17,17 +21,28 @@ en:
       title: "authenticate"
       subtitle: ""
     main_menu:
+      configure: "configure"
       title: "main menu"
       subtitle: ""
       new_game: "new game"
       load_game: "load game"
+      player_count: "enter player count (1-2): "
       sign_out: "sign out"
       not_signed_in: "not signed in. invalid session. redirecting to authentication."
+    configure:
+      title: "configure %{name}"
+      new_host: "enter new server host: "
+      new_port: "enter new server port: "
+      force_ssl_toggle: "force ssl preference toggled to %{value}"
+      server_host: "host (%{stored})"
+      server_port: "port (%{stored})"
+      force_ssl: "force ssl (%{stored})"
     new_game:
       player_count: "number of players"
       story_count: "number of stories"
       starting: "starting new game..."
       status: "status"
+      cancelled: "cancelled. game not created."
     legend:
       title: "legend"
       subtitle: "%{subtitle}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aromancer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - i2097i
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.21
+        version: 4.0.22
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.21
+        version: 4.0.22
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +135,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: websocket-client-simple
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: tty-cursor
   requirement: !ruby/object:Gem::Requirement
@@ -229,6 +243,8 @@ files:
 - checksums/aromancer-0.0.1.gem.sha512
 - checksums/aromancer-0.0.2.gem.sha512
 - checksums/aromancer-0.0.3.gem.sha512
+- checksums/aromancer-0.0.4.gem.sha512
+- checksums/aromancer-0.0.5.gem.sha512
 - gem_graph.png
 - lib/aromancer.rb
 - lib/aromancer/.DS_Store
@@ -238,6 +254,7 @@ files:
 - lib/aromancer/server.rb
 - lib/aromancer/storage.rb
 - lib/aromancer/version.rb
+- lib/aromancer/websocket.rb
 - lib/reiquire.rb
 - listen.rb
 - locale/en.yml