aromancer 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ebbde2a81b320eab73f2035b03d5166c5bcec1c01eaef7e51e4a010a8ab8251
-  data.tar.gz: 044c185f6741090deb4e179c8716e35d23e1b6a775c42db683ee079db8cb1419
+  metadata.gz: 635ad1d6e0100e8311e7d9a2ed2d810e939684c02dc3572fbb6150cda376a90a
+  data.tar.gz: f3c3c71736c9c1ea4bf339ad6b3b804b302526f8b063de19d64138cdfa539792
 SHA512:
-  metadata.gz: d992314e5e012369313167b145991a687ec0cfaa2a4e6b8ef445f147333e64e287eb70e9208215fac91b6ef20b04e0b3f740ee20ffd7f3c1b60197ad536dd4ad
-  data.tar.gz: 9210fd3030350a65b7f56ee68be13296a2707514f9cb1cf378e792b95868ad08c0009ec7c6c7409d6060919ee28911b557b4b4e673b933f47790b50ea2a46b4f
+  metadata.gz: 1284816493145370d4f997a9e5e0ffd74791faa5c7ddd8ca9d131ed0e1ebd7189026d238cc7f3999714cf2235f198be2a1c64e9f2aae9f812a9463ff1672cb7e
+  data.tar.gz: 19d0046c8683d31847cd51b59b0228eff1cca91a15eb4af6160cbc526294c032ed3fcc21ad8c60d7de9154137af35260106b9c83a6e1af6f7adf0b254d89e1d2

data/CODE_OF_CONDUCT.md

@@ -7,4 +7,4 @@
 * When interpreting the words and actions of others, participants should always assume good intentions.
 * Behaviour which can be reasonably considered harassment will not be tolerated.
 
-If you have any concerns about behaviour within this project, please contact us at ["i2097i@hotmail.com"](mailto:"i2097i@hotmail.com").
+If you have any concerns about behavior within this project, please contact us at ["i2097i@hotmail.com"](mailto:"i2097i@hotmail.com").

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aromancer (0.0.5)
+    aromancer (0.0.9)
       activesupport (~> 8.1.4)
       faraday (~> 2.14.4)
       fileutils (~> 1.8.0)
@@ -171,7 +171,7 @@ DEPENDENCIES
 
 CHECKSUMS
   activesupport (8.1.4) sha256=891dd3fe43c4fc8391934b237b1189bb1f661c932a84a840043db9d46a4e80df
-  aromancer (0.0.5)
+  aromancer (0.0.9)
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   bigdecimal (4.1.3) sha256=61ebe1e5e559bdc3cc6f2c0ee7f427321fc838f59611c294356eb04d6e21cf66
   bundler (4.0.22) sha256=d8d5ec84c8555e0af71db63ed7aee4d1a8fb839ec46d84212d61979242a5d75a

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2026 i2097i
+Copyright (c) 2026 Scot Reichman
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -24,4 +24,4 @@ aromancer
 [license](http://opensource.org/licenses/MIT)
 [issues](https://github.com/i2097i/aromancer/issues)
 
-#### aromancer by i2097i is copyright (2026)
+#### aromancer by scot reichman is copyright (2026)

data/checksums/aromancer-0.0.8.gem.sha512

@@ -0,0 +1 @@
+ea42cb760ae909d4de2b750f3ca7f125d58b9e9147886927e8f5b7dd81a80913152d6052c1c517a99a0733e7d3b15de86d3083d1f82d5341e4c8f1e3364222a2

data/checksums/aromancer-0.0.9.gem.sha512

@@ -0,0 +1 @@
+c113cc095e8e8621b438078a7708295b681cbe4887e0c2fa537c90c777c8f1bf548becf77efb1ae3ec0abfacc1c9fa43ff730ed82ffb4acd0dc62377ad9925cc

data/lib/aromancer/api.rb

@@ -24,23 +24,14 @@ module Aromancer
         body: response.body.to_s
       }
       Aromancer::Storage.set_last_error(le)
-      Aromancer.print_last_error
-      signed_out = false
-      signed_out = response.status == 401
-      # error_body = nil
-      # begin
-      #   error_body = JSON.parse(response.body)
-      # rescue StandardError => e
-      # end
-
-      # signed_out = signed_out &&
-      #   !error_body.nil? &&
-      #   error_body.keys.include?(:error_message.to_s) &&
-      #   error_body["error_message"] == "not signed in"
-
-      if signed_out
-        Aromancer::Storage.instance.clear_cache!
-        Aromancer::Storage.set_signed_out_flag(signed_out)
+
+      if response.status == 401
+        Aromancer::Storage.set_signed_out_flag(true)
+        player = Aromancer::Storage.get_player
+        unless player.nil?
+          player["api_key"] = nil
+          Aromancer::Storage.set_player(player)
+        end
       end
     end
 
@@ -93,17 +84,9 @@ module Aromancer
 
     def self.sign_out
       result = Aromancer::Server.sign_out
-      # clear storage
-      Aromancer::Storage.instance.clear_cache!
-      Aromancer::Storage.set_signed_out_flag(false)
       Aromancer::Storage.set_player(nil)
-      Aromancer::Storage.set_legends(nil)
-      Aromancer::Storage.set_arena(nil)
-      Aromancer::Storage.set_stream(nil)
-      Aromancer::Storage.set_last_error(nil)
-
       Aromancer::Websocket.instance.disconnect
-
+      Aromancer::Storage.recreate!
       register_error(result) if result.status != 200
     end
 
@@ -149,7 +132,7 @@ module Aromancer
         player["active_legend_id"] = active_legend_id
         Aromancer::Storage.set_player(player)
       end
-      Aromancer::Storage.instance.clear_cache!
+      Aromancer::Cli.instance.should_clear_cache = true
       result = Aromancer::Server.update_player({player: {
         active_legend_id: active_legend_id,
         status: active_legend_id.nil? ? :lobby : :playing

data/lib/aromancer/cli.rb

@@ -0,0 +1,153 @@
+# frozen_string_literal: true
+
+=begin
+
+  cli.rb
+
+  aromancer cli
+
+  by i2097i
+
+=end
+
+module Aromancer
+  # instance runs on main thread
+  class Cli
+    include Singleton
+
+    attr_accessor :error_timeout, :last_render, :should_clear_cache, :storage_mutex, :ui_busy, :ui_thread, :ws_busy, :ws_thread
+
+    RENDER_DELAY = 0.1
+
+    def initialize
+      self.storage_mutex = Mutex.new
+      self.should_clear_cache = false
+      self.last_render = 0
+      self.error_timeout = Time.now.to_i
+
+      Thread.main[:route] = :authentication
+      Thread.main[:menu_runners] = {}
+      Thread.main[:menu_options] = {}
+    end
+
+    # user entry point
+    def self.run
+      Aromancer::Websocket.instance
+      Aromancer::Storage.instance.ensure_default_preferences_exist
+
+      # load player on-start
+      Aromancer::Api.set_active_legend_id(
+        ({} || Aromancer::Storage.get_player)[:active_legend_id.to_s]
+      ) unless Aromancer::Storage.get_player.nil?
+
+      Aromancer::Prompt.say(I18n.t("shared.welcome", version: Aromancer::VERSION))
+
+      self.instance.start_ui_thread
+      self.instance.start_ws_thread
+      loop do
+        begin
+
+          if self.instance.should_clear_cache
+            Aromancer::Storage.instance.clear_cache!
+            self.instance.should_clear_cache = false
+          end
+
+          self.instance.ui_thread.join
+
+        rescue NoMethodError => e
+          Aromancer::Storage.set_last_error({
+            status: -1,
+            headers: e.to_s,
+            body: e.inspect.to_s
+          })
+          if Aromancer::Storage.get_preference(:debug)
+            Aromancer::Prompt.say(I18n.t("shared.last_error"))
+            Aromancer::Prompt.say("sleeping 1 on main thread...")
+            sleep(1)
+          end
+          Aromancer::Storage.instance.clear_cache!
+          self.instance.start_ui_thread
+          self.instance.start_ws_thread
+          sleep(1)
+        rescue Interrupt => e
+          Aromancer::Prompt.say("interrupt on main thread...exiting immediately.")
+          exit
+        end
+      end
+    end
+
+    def start_ui_thread(force = false)
+      return if (@ui_busy || Time.now - @last_render < 2.0) && !force
+
+      @ui_busy = true
+      self.ui_thread&.exit
+      self.ui_thread&.kill
+      Thread.main[:menu_runners] = {}
+      Thread.main[:menu_options] = {}
+      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? ||
+            menu_options.empty? ||
+            menu_runners.empty?
+
+            Aromancer::Routes.resume
+            sleep(Aromancer::Cli::RENDER_DELAY)
+            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)
+            end
+
+          else
+            sleep(Aromancer::Cli::RENDER_DELAY)
+            Aromancer::Routes.resume
+            Aromancer.print_hud
+          end
+          Aromancer::Cli.instance.ui_busy = false
+          Aromancer::Cli.instance.last_render = Time.now
+          sleep(Aromancer::Cli::RENDER_DELAY)
+        end
+      end
+    end
+
+    def start_ws_thread
+      return if @ws_busy
+      @ws_busy = true
+      self.ws_thread&.exit
+      self.ws_thread&.kill
+      self.ws_thread = Thread.new do
+        Aromancer::Websocket.instance.disconnect
+        loop do
+          player = Aromancer::Storage.get_player
+          if player.nil? ||
+            player["active_legend_id"].nil?
+            @ws_busy = true
+            Aromancer::Websocket.instance.disconnect
+          elsif !player["api_key"].nil? &&
+            !player["active_legend_id"].nil? &&
+            (Aromancer::Websocket.instance.socket.nil? || Aromancer::Websocket.instance.socket.closed?)
+            # attempt websocket connection
+            @ws_busy = true
+            Aromancer::Websocket.instance.connect
+            if Aromancer::Storage.get_arena.nil?
+              Aromancer::Api.load_arena
+              sleep(Aromancer::Cli::RENDER_DELAY)
+              Aromancer::Cli.instance.start_ui_thread(true)
+            end
+          end
+          @ws_busy = false
+          sleep(Aromancer::Cli::RENDER_DELAY)
+        end
+      end
+    end
+  end
+end