bdoap 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fabb7eadd3b5446aa42832f5ce1164777c8ed9669c1679a16d61138e9be9de7
-  data.tar.gz: 20232aec55bb79082273f1dcdadcc04347d83948b9f3cd2977143672a247d19e
+  metadata.gz: a4336121be8b520924050e57400f46e24661e9c9dc4156def8b08802e6eec2e2
+  data.tar.gz: 5011af8aa6f7f7a044786ca134ca8d4cce0bb3ae076409de70cc69a1adf8d6f9
 SHA512:
-  metadata.gz: d7ce743bbc6e663ae0967e4a4a1117611ed87d83c3a6b793a76b5c635aafc8270652e4fc489644f87bb70cc0d5b5a73865314c56a6d0a4150a42baa08e2ccdfd
-  data.tar.gz: 1af804e8da23ec52a1551e1e0db2da5fc2b975a7da9ada2ef1ef0b51ed2df46f4fbf4251226aa0002e4e25c1d198e2ac8e78d873332c7238eb6fb072b567e979
+  metadata.gz: 0b055768a4bad1ebc9b244574d546dd859c4db6f7475d72afd7352d24b3aa9db5a311f6c74b6ce160ae86756ebbbc249df87c8d17b2294bba1a575bec8b6e96d
+  data.tar.gz: f5537518eebae1c5f62d63d9daaa0b2ee29d1570940a165e0c7dcee1b033ed728909f6f7f3940edc51d5dc00672363f8639adb8f8a64780ecc3ed9706716ffa5

data/lib/bdo_alchemy_profits.rb

@@ -24,6 +24,7 @@
 # SOFTWARE.
 
 require 'optparse'
+require 'httparty'
 
 require_relative './utils/user_cli'
 require_relative './central_market/market_searcher'
@@ -35,8 +36,102 @@ module BDOAP
   class BDOAlchemyProfits
     include Utils
 
+    def start_enhance(search_string, enhance_starting_level, region, cli)
+      items_at_level = []
+      root_url = ENVData.get_root_url region
+      search_url = "#{root_url}#{ENVData::MARKET_SEARCH_LIST}"
+      sub_url = "#{root_url}#{ENVData::MARKET_SUB_LIST}"
+      category_opts = {
+        url: search_url,
+        query_string: "#{ENVData::RVT}&searchText=#{URI.encode_www_form_component search_string}",
+        update: ->(data) { data['list'] }
+      }
+
+      data = HTTParty.post(
+        URI(category_opts[:url].to_s),
+        headers: ENVData.get_central_market_headers(ENVData.get_incap_cookie(@region_subdomain)),
+        body: category_opts[:query_string],
+        content_type: 'application/x-www-form-urlencoded'
+      )
+
+      resolved = category_opts[:update].call(data) if data
+
+      return unless resolved
+
+      resolved.each do |item|
+        subdata = HTTParty.post(
+          URI(sub_url),
+          headers: ENVData.get_central_market_headers(ENVData.get_incap_cookie(@region_subdomain)),
+          body: "#{ENVData::RVT}&mainKey=#{item['mainKey']}&usingCleint=0",
+          content_type: 'application/x-www-form-urlencoded'
+        )
+
+        sleep rand
+
+        if subdata&.dig('detailList')
+          level_map = {
+            0 => 0,
+            1 => 1,
+            2 => 2,
+            3 => 3,
+            4 => 4,
+            5 => 5,
+            6 => 6,
+            7 => 7,
+            8 => 8,
+            9 => 9,
+            10 => 10,
+            11 => 11,
+            12 => 12,
+            13 => 13,
+            14 => 14,
+            15 => 15,
+            16 => 16,
+            17 => 17,
+            18 => 18,
+            19 => 19,
+            20 => 20,
+          }
+
+          level_map_to_bdo = {
+            0 => 0,
+            1 => 1,
+            2 => 2,
+            3 => 3,
+            4 => 4,
+            5 => 5,
+            6 => 6,
+            7 => 7,
+            8 => 8,
+            9 => 9,
+            10 => 10,
+            11 => 11,
+            12 => 12,
+            13 => 13,
+            14 => 14,
+            15 => 15,
+            16 => 'PRI',
+            17 => 'DUO',
+            18 => 'TRI',
+            19 => 'TET',
+            20 => 'PEN',
+          }
+
+          result = subdata['detailList'] .find { |e| e['subKey'].to_s == level_map[enhance_starting_level.to_i].to_s }
+          if result
+            constructed = "    #{result['count']} #{cli.yellow result['name'].downcase} @ #{level_map_to_bdo[result['subKey']]}"
+            items_at_level.push constructed unless result['count'].to_i == 0
+          end
+        end
+      end
+
+      puts "\nthe results are in!\n"
+      items_at_level.each { |item| puts item }
+      puts
+    end
+
     # begin the configuration and search process
-    def start_cli
+    def start_cli(search_string = nil, enhance_starting_level = nil, enhancing = false)
       begin
         options = {}
 
@@ -47,10 +142,20 @@ module BDOAP
         # option setup
         cli = UserCLI.new options
 
-        category = cli.choose_category
-        cli.end_cli if category == 'exit'
+        unless enhancing
+          category = cli.choose_category
+          cli.end_cli if category == 'exit'
+        end
+
         region = cli.choose_region
         cli.end_cli if region == 'exit'
+
+        # start enhancing
+        if enhancing && search_string && enhance_starting_level
+          start_enhance(search_string, enhance_starting_level, region, cli)
+          return
+        end
+
         lang = cli.choose_lang
         cli.end_cli if lang == 'exit'
         aggression = cli.choose_aggression

data/lib/central_market/category_search_options.rb

@@ -10,6 +10,7 @@ module MarketSearchTools
     offensive: 1,
     defensive: 2,
     functional: 3,
+    food: 4,
     potion: 5,
     other: 8,
     all: [1, 2, 3, 5, 8]
@@ -87,6 +88,13 @@ module MarketSearchTools
           "#{ENVData::RVT}&mainCategory=#{CONSUMABLE_CATEGORY}&subCategory=#{CONSUMABLE_SUBCATEGORIES[:offensive]}",
         update: ->(data) { data['marketList'] }
       },
+      {
+        name: 'food',
+        url: url,
+        query_string:
+          "#{ENVData::RVT}&mainCategory=#{CONSUMABLE_CATEGORY}&subCategory=#{CONSUMABLE_SUBCATEGORIES[:food]}",
+        update: ->(data) { data['marketList'] }
+      },
       {
         name: 'defensive',
         url: url,
@@ -132,7 +140,14 @@ module MarketSearchTools
         query_string: "#{ENVData::RVT}&searchText=purified+lightstone+of",
         # update: ->(data) { { otherResponse: data['marketList'] } },
         update: ->(data) { data['list'] }
-      }
+      },
+      # {
+      #   name: 'stuffed animals',
+      #   url: search_url,
+      #   query_string: "#{ENVData::RVT}&searchText=stuffed",
+      #   # update: ->(data) { { otherResponse: data['marketList'] } },
+      #   update: ->(data) { data['list'] }
+      # }
     ]
   end
 end

data/lib/central_market/market_searcher.rb

@@ -24,6 +24,7 @@ class MarketSearcher
     @market_sub_url = "#{@root_url}#{ENVData::MARKET_SUB_LIST}"
     @market_sell_buy_url = "#{@root_url}#{ENVData::MARKET_SELL_BUY_INFO}"
     @cli = cli
+    # cache used to store all ingredients for which the price has already been checked
     @ingredient_cache = {}
     @free_ingredients = free_ingredients
     @out_of_stock_items = []
@@ -320,7 +321,7 @@ class MarketSearcher
     average_procs = 1
 
     if [25, 35].include? item[:main_category]
-      unless /oil of|draught|\[mix\]|\[party\]|immortal:|perfume|indignation|flame of|essence of dawn/im.match item[:name].downcase
+      unless /oil of|draught|\[mix\]|\[party\]|immortal:|perfume|indignation|flame of|essence of dawn|mystical cleaning oil|whale tendon|leather glaze/im.match item[:name].downcase
         average_procs = 2.5
       end
 

data/lib/utils/constants.rb

@@ -2,7 +2,20 @@
 
 require 'date'
 
-$request_verification_token = '__RequestVerificationToken=aVYGQPovG8EI6bRIagh8tbHJUhZlM-nH3UKVQaV9R9N0vODzmWcB747BHEsHaphwANvzsaNi5TCPlB-72-e1LadqAlL-bdkDkTqVh4gMnu81' # rubocop:disable Layout/LineLength
+require_relative '../../environment'
+
+if ENV['rvt_dom'].length == 0
+  puts "empty DOM environment variable! set ENV['rvt_dom'] in environment.rb."
+end
+
+if ENV['rvt_cookie'].length == 0
+  puts "empty cookie environment variable! set ENV['rvt_cookie'] in environment.rb."
+end
+
+if ENV['rvt_dom'].length == 0 || ENV['rvt_cookie'].length == 0
+  puts ''
+  exit
+end
 
 module Utils
   # constants to use when user is configuring the tool
@@ -19,12 +32,14 @@ module Utils
       'alchemy stone': "searches 'imperfect alchemy stone of'",
       reagent: "searches 'reagent'",
       'black stone': 'category 30, subcategory 1',
+      'food': 'category 35, subcategory 4',
       'misc': 'category 25, subcategory 8',
       'other tools': 'category 40, subcategory 10',
       'manos': "searches 'manos'",
       'purified lightstone': "searches 'purified lightstone of' (requires guru 1 alchemy)",
       'combined crystals': 'category 50, subcategory 4',
       'essences of dawn': "searches 'essence of dawn'",
+      # 'stuffed animals': "searches 'stuffed'",
       # 'magic crystal': "searches 'magic crystal'",
       exit: 'stops the search',
     }.freeze
@@ -42,7 +57,7 @@ module Utils
       jp: 'trade.jp.playblackdesert.com',
       th: 'trade.th.playblackdesert.com',
       tw: 'trade.tw.playblackdesert.com',
-      sa: 'blackdesert-tradeweb.playredfox.com',
+      sa: 'trade.sa.playblackdesert.com',
       exit: 'stops the search',
     }.freeze
 
@@ -76,10 +91,6 @@ module Utils
       no: false,
       yes: true,
     }.freeze
-
-    def self.set_rvt(rvt)
-      $request_verification_token = rvt
-    end
   end
 
   # constants that will be used in by search / scraping scripts
@@ -89,8 +100,8 @@ module Utils
     ERROR_LOG = './error.log'
     # note that the following two tokens are different!! the first one is from a request cookie
     # the second is from the dom of the actual BDO central market interface
-    COOKIE = '__RequestVerificationToken=aVYGQPovG8EI6bRIagh8tbHJUhZlM-nH3UKVQaV9R9N0vODzmWcB747BHEsHaphwANvzsaNi5TCPlB-72-e1LadqAlL-bdkDkTqVh4gMnu81' # rubocop:disable Layout/LineLength
-    RVT = '__RequestVerificationToken=yWbqJmiU4wcp2IRQGkbDfqMFs2fjCYx4UqVxg4umK8CvdbLhweMLZ1es-4SFWD8J1UfoqwbaQyo_YuzAkSzHWY8Wjyx4ttwZBvtu_pd--9U1' # rubocop:disable Layout/LineLength
+    COOKIE = ENV['rvt_cookie']
+    RVT = ENV['rvt_dom']
     WORLD_MARKET_LIST = '/GetWorldMarketList'
     MARKET_SUB_LIST = '/GetWorldMarketSubList'
     MARKET_SEARCH_LIST = '/GetWorldMarketSearchList'

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BDOAP
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bdoap
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - jpegzilla