maimai_net 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9649c531c49ff62f1391875bcce1cf77c46b93e563c673afe188a688066f2d7
-  data.tar.gz: 60436b79e63a417b1a11dd636d988c4c48a5ce7fd7ccf6b469754399ac2a322f
+  metadata.gz: e6a043bf61fd5bd226b1f0772ee5a31014fdea73a61f66aac3f016b2f7fa3a74
+  data.tar.gz: 835c2b17b0fce9fe35dc83517193e135cd1bf99d052ad9618116dc311b2fa592
 SHA512:
-  metadata.gz: d084e5b1969ee15a674c717415faa9eb358ac929e14d4e2c29e59bac212d81d0882382a436a5adf46384dcc2294bc31e0ac18fcf7c603169e8df8f97658c1c44
-  data.tar.gz: 2043fa38bacd2f093e0ba60bbe2d45c036c1bfc50c1d9aac2f7aa385dbd219ca4ea7ee0dd77f3e14fa89c3d3d2c5af970044539d38970a14331563ad6c4f5684
+  metadata.gz: c7afa65b670dfb11d8f1827381c8b3264580784871581b6238f3de84040040607e6bd728b0aac6ad50abcb45707e28a398cd45d2c8a7798b9be98b61363b5584
+  data.tar.gz: ea17dd808b4c8030426715535325aed6eb5d12d152e7b888726cba95d63e12d9e79d3078e46e6332f43622662ad82a23719d088e329eb18a99521ed90c77bac0

data/lib/maimai_net/client.rb

@@ -25,6 +25,12 @@ module MaimaiNet
       versions:   :version,
     }.freeze
 
+    module ErrorCodes
+      LOGIN_ERROR     = 100_101
+      SESSION_REFRESH = 200_002
+      SESSION_INVALID = 200_004
+    end
+
     class Base
       include ModuleExt
 
@@ -61,12 +67,16 @@ module MaimaiNet
     end
 
     class Connection
+      extend Forwardable
+
       # @param client [Base] client data
       def initialize(client)
         @client = client
         @conn   = nil
       end
 
+      def_delegator :@client, :cookies
+
       # automatically private hook methods
       # @return [void]
       def self.method_added(meth)
@@ -189,10 +199,14 @@ module MaimaiNet
                fail TypeError, 'expected a valid index ID format'
              end
 
+        actual_time = Time.at(/^(\d+),(\d+)$/.match(id).captures[1].to_i).localtime(32400).freeze
+
         send_request(
           'get', '/maimai-mobile/record/playlogDetail', {idx: id},
           response_page: Page::TrackResult,
-        )
+        ).tap do |track_result|
+          track_result.track.time = actual_time
+        end
       end
 
       # access recent session gameplay detailed info
@@ -278,7 +292,16 @@ module MaimaiNet
       # @return [void]
       # @raise [Error::LoginError]
       def on_login_error
-        fail Error::LoginError, 100101
+        fail Error::LoginError, ErrorCodes::LOGIN_ERROR
+      end
+
+      # hook upon receiving login expired page,
+      # triggering this hook causes client cookies wiped out.
+      # @return [void]
+      # @raise [Error::SessionExpiredError]
+      def on_login_expired_error
+        @client.cookies.clear
+        fail Error::SessionExpiredError, ErrorCodes::SESSION_INVALID
       end
 
       # hook upon receiving generic error page
@@ -294,12 +317,12 @@ module MaimaiNet
         error_code = error_note.match(/\d+/).to_s.to_i
 
         case error_code
-        when 100101
-          fail Error::LoginError, error_code
-        when 200002
+        when ErrorCodes::LOGIN_ERROR
+          on_login_error
+        when ErrorCodes::SESSION_REFRESH
           fail Error::SessionRefreshError, error_code
-        when 200004
-          fail Error::SessionExpiredError, error_code
+        when ErrorCodes::SESSION_INVALID
+          on_login_expired_error
         else
           fail Error::GeneralError, error_code
         end
@@ -314,7 +337,7 @@ module MaimaiNet
       # @param opts   [Hash{Symbol => Object}]
       # @option response_page [Class<Page::Base>] response parser class
       # @option response      [#call]             response method, takes one argument, response body raw.
-      # @return [Model::Base::Struct] returns page data based from provided response_page field
+      # @return [Model::Base] returns page data based from provided response_page field
       # @return [void]
       def send_request(method, url, data, **opts)
         fail NotImplementedError, 'abstract method called' if Connection == method(__method__).owner
@@ -358,7 +381,7 @@ module MaimaiNet
       # @!api private
       # @param url  [URI] response url
       # @param body [String] response body
-      # @return [Model::Base::Struct, Array<Model::Base::Struct>] response page handled result
+      # @return [Model::Base, Array<Model::Base>] response page handled result
       # @return [nil] no response page defined to handle the response
       def process_response(url:, body:, request_options:)
         info = @client.class.region_info
@@ -998,7 +1021,7 @@ module MaimaiNet
 
         @conn = Faraday.new(url: info[:base_host]) do |builder|
           builder.request  :url_encoded
-          builder.response :follow_redirects
+          builder.response :follow_redirects, limit: 5
           builder.use      :cookie_jar, jar: client.cookies
         end
       end

data/lib/maimai_net/core_ext.rb

@@ -1,11 +1,30 @@
 module MaimaiNet
   module CoreExt
-    module KernelAutoConstantInclusion
+    # contains every {Constants AutoConstant} classes turned into a function.
+    # used for include or prepend in a scope.
+    #
+    # also used in `refine` {IncludeAutoConstant}.
+    module AutoConstantInclusion
       MaimaiNet.constants.each do |k|
         cls = MaimaiNet.const_get(k)
         next unless Class === cls && cls < MaimaiNet::Constant
 
         define_method k do |key| cls.new(key) end
+        private k
+      end
+    end
+
+    # adds JSON conversion support through `#to_h` conversion.
+    module JSONSupport
+      def as_json(options = nil)
+        to_h.transform_values do |val|
+          val.respond_to?(:as_json) ?
+            val.as_json(options) : val
+        end
+      end
+
+      def to_json(options = nil)
+        as_json.to_json(options)
       end
     end
   end

data/lib/maimai_net/model.rb

@@ -3,31 +3,32 @@ module MaimaiNet
   module Model
     require 'maimai_net/model-typing'
 
-    module Base
-      class Struct < ::Struct
-        using GenericComparison
-        # @param kwargs [Hash] options are strong-typed based on class definition
-        def initialize(**kwargs)
-          props = self.class.instance_variable_get(:@_properties)
-          keys = props.keys
-          optional_keys = props.select do |k, pr|
-            Either === pr[:class] &&
-            pr[:class].variants.include?(NilClass)
-          end.keys
-
-          missing_keys = keys - (kwargs.keys | optional_keys)
-          fail KeyError, "#{missing_keys.join(', ')} is not defined for #{self.class}" unless missing_keys.empty?
-          kwargs.each do |key, value|
-            fail KeyError, "#{key} is not defined as struct member" unless keys.include?(key)
-            class_str = value.respond_to?(:map_class) ? value.map_class : value.class
-            fail TypeError, "#{key} type mismatch, given #{class_str}, expected #{props[key][:class]}" unless props[key][:class] === value
-          end
-
-          args = kwargs.values_at(*keys)
-          super(*args)
+    class Base < ::Struct
+      using GenericComparison
+      # @param kwargs [Hash] options are strong-typed based on class definition
+      def initialize(**kwargs)
+        props = self.class.instance_variable_get(:@_properties)
+        keys = props.keys
+        optional_keys = props.select do |k, pr|
+          Either === pr[:class] &&
+          pr[:class].variants.include?(NilClass)
+        end.keys
+
+        missing_keys = keys - (kwargs.keys | optional_keys)
+        fail KeyError, "#{missing_keys.join(', ')} is not defined for #{self.class}" unless missing_keys.empty?
+        kwargs.each do |key, value|
+          fail KeyError, "#{key} is not defined as struct member" unless keys.include?(key)
+          class_str = value.respond_to?(:map_class) ? value.map_class : value.class
+          fail TypeError, "#{key} type mismatch, given #{class_str}, expected #{props[key][:class]}" unless props[key][:class] === value
         end
+
+        args = kwargs.values_at(*keys)
+        super(*args)
       end
-      class << Struct
+
+      include CoreExt::JSONSupport
+
+      class << self
         # creates a strong-typed struct data
         # @param  opts [Hash{Symbol => Module}]
         #   list of struct members along with respective type definition
@@ -52,7 +53,7 @@ module MaimaiNet
       end
     end
 
-    SongCount = Base::Struct.new(achieved: Integer, total: Integer) do
+    SongCount = Base.new(achieved: Integer, total: Integer) do
       def to_s
         "#{achieved}/#{total}"
       end
@@ -60,7 +61,7 @@ module MaimaiNet
     end
 
     module PlayerCommon
-      Info = Base::Struct.new(
+      Info = Base.new(
         name: String,
         title: String,
         grade: String,
@@ -68,16 +69,16 @@ module MaimaiNet
     end
 
     module PlayerData
-      Decoration = Base::Struct.new(
+      Decoration = Base.new(
         icon: URI::Generic,
       )
-      ExtendedInfo = Base::Struct.new(
+      ExtendedInfo = Base.new(
         rating: Integer,
         class_grade: String,
         partner_star_total: Integer,
       )
 
-      DifficultyStatistic = Base::Struct.new(
+      DifficultyStatistic = Base.new(
         clears: SongCount,
         ranks: Generic[Hash, Symbol, SongCount],
         dx_ranks: Generic[Hash, Integer, SongCount],
@@ -85,22 +86,22 @@ module MaimaiNet
         sync_flags: Generic[Hash, Symbol, SongCount],
       )
 
-      InfoPlate = Base::Struct.new(
+      InfoPlate = Base.new(
         info: PlayerCommon::Info,
         decoration: Decoration,
         extended: ExtendedInfo,
       )
-      Lite = Base::Struct.new(
+      Lite = Base.new(
         name: String,
         rating: Integer,
       )
-      Data = Base::Struct.new(
+      Data = Base.new(
         plate: InfoPlate,
         statistics: Generic[Hash, Symbol, DifficultyStatistic],
       )
     end
 
-    WebID = Base::Struct.new(
+    WebID = Base.new(
       item_hash: String,
       item_key: String,
     ) do
@@ -131,9 +132,11 @@ module MaimaiNet
         title: String,
         type: String,
         difficulty: Integer,
+        variant: Optional[String],
+        flags: Optional[Integer],
       }
 
-      InfoLite = Base::Struct.new(**info_base) do
+      InfoLite = Base.new(**info_base) do
         def to_info(level_text: '?')
           Info.new(
             web_id: WebID::DUMMY,
@@ -145,7 +148,7 @@ module MaimaiNet
         end
       end
 
-      Info = Base::Struct.new(
+      Info = Base.new(
         web_id: WebID,
         **info_base,
         level_text: String,
@@ -155,7 +158,7 @@ module MaimaiNet
         end
       end
 
-      Song = Base::Struct.new(
+      Song = Base.new(
         title: String,
         artist: String,
         genre: String,
@@ -163,18 +166,18 @@ module MaimaiNet
       )
     end
 
-    SongEntry = Base::Struct.new(
+    SongEntry = Base.new(
       web_id: WebID,
       title: String,
       genre: String,
     )
 
-    SongFavoriteInfo = Base::Struct.new(
+    SongFavoriteInfo = Base.new(
       song: SongEntry,
       flag: Boolean,
     )
 
-    PhotoUpload = Base::Struct.new(
+    PhotoUpload = Base.new(
       info: Chart::InfoLite,
       url: URI::Generic,
       location: String,
@@ -182,7 +185,7 @@ module MaimaiNet
     )
 
     module Result
-      Progress = Base::Struct.new(
+      Progress = Base.new(
         value: Integer,
         max: Integer,
       ) do
@@ -191,18 +194,23 @@ module MaimaiNet
         alias inspect to_s
       end
 
-      RivalInfo = Base::Struct.new(
+      RivalInfo = Base.new(
         player: PlayerData::Lite,
         score:  Float,
       )
 
-      TourMember = Base::Struct.new(
+      PlayerInfo = Base.new(
+        player_name: String,
+        difficulty:  Integer,
+      )
+
+      TourMember = Base.new(
         icon: URI::Generic,
         grade: Integer,
         level: Integer,
       )
 
-      Judgment = Base::Struct.new(
+      Judgment = Base.new(
         just: Integer,
         perfect: Integer,
         great: Integer,
@@ -210,33 +218,35 @@ module MaimaiNet
         miss: Integer,
       )
 
-      Offset = Base::Struct.new(
+      Offset = Base.new(
         early: Integer,
         late: Integer,
       )
 
-      Challenge = Base::Struct.new(
+      Challenge = Base.new(
         type: Symbol,
         lives: Progress,
       )
 
-      ScoreLite = Base::Struct.new(
+      ScoreLite = Base.new(
         score: Float,
         deluxe_score: Progress,
         grade: Symbol,
         flags: Generic[Array, Symbol],
+        position: Optional[Integer],
       )
 
-      Score = Base::Struct.new(
+      Score = Base.new(
         score: Float,
         deluxe_score: Progress,
         combo: Progress,
         sync_score: Progress,
         grade: Symbol,
         flags: Generic[Array, Symbol],
+        position: Optional[Integer],
       )
 
-      ReferenceWebID = Base::Struct.new(
+      ReferenceWebID = Base.new(
         order: Integer,
         time: Time,
       ) do
@@ -251,7 +261,7 @@ module MaimaiNet
         alias to_s to_str
       end
 
-      Track = Base::Struct.new(
+      Track = Base.new(
         info: Chart::Info,
         score: Either[Score, ScoreLite],
         order: Integer,
@@ -259,32 +269,35 @@ module MaimaiNet
         challenge: Optional[Challenge],
       )
 
-      TrackReference = Base::Struct.new(
+      TrackReference = Base.new(
         track: Track,
         ref_web_id: ReferenceWebID,
       )
 
-      Data = Base::Struct.new(
+      Data = Base.new(
         track: Track,
         breakdown: Generic[Hash, Symbol, Judgment],
         timing: Offset,
+        rating_before: Integer,
+        rating_after:  Integer,
         members: Generic[Array, TourMember],
         rival: Optional[RivalInfo],
+        players: Generic[Array, PlayerInfo],
       )
     end
 
     module Record
-      History = Base::Struct.new(
+      History = Base.new(
         play_count: Integer,
         last_played: Time,
       )
 
-      ScoreOnly = Base::Struct.new(
+      ScoreOnly = Base.new(
         score: Float,
         grade: Symbol,
       )
 
-      Score = Base::Struct.new(
+      Score = Base.new(
         web_id: WebID,
         score: Float,
         deluxe_score: Result::Progress,
@@ -293,50 +306,50 @@ module MaimaiNet
         flags: Generic[Array, Symbol],
       )
 
-      ChartRecord = Base::Struct.new(
+      ChartRecord = Base.new(
         info: Chart::Info,
         record: Optional[Score],
         history: Optional[History],
       )
 
-      InfoCategory = Base::Struct.new(
+      InfoCategory = Base.new(
         info: Chart::Info,
         score: Optional[Result::ScoreLite],
       )
 
-      InfoBest = Base::Struct.new(
+      InfoBest = Base.new(
         info: Chart::Info,
         play_count: Integer,
       )
 
-      InfoRating = Base::Struct.new(
+      InfoRating = Base.new(
         info: Chart::Info,
         score: ScoreOnly,
       )
 
-      Data = Base::Struct.new(
+      Data = Base.new(
         info: Chart::Song,
         charts: Generic[Hash, Symbol, ChartRecord],
       )
     end
 
     module FinaleArchive
-      Decoration = Base::Struct.new(
+      Decoration = Base.new(
         icon: URI::Generic,
         player_frame: URI::Generic,
         nameplate: URI::Generic,
       )
-      Currency = Base::Struct.new(
+      Currency = Base.new(
         amount: Integer, piece: Integer, parts: Integer,
       )
-      ExtendedInfo = Base::Struct.new(
+      ExtendedInfo = Base.new(
         rating: Float, rating_highest: Float,
         region_count: Integer,
         currency: Currency,
         partner_level_total: Integer,
       )
 
-      DifficultyStatistic = Base::Struct.new(
+      DifficultyStatistic = Base.new(
         total_score: Integer,
         clears: SongCount,
         ranks: Generic[Hash, Symbol, SongCount],
@@ -345,7 +358,7 @@ module MaimaiNet
         multi_flags: Generic[Hash, Symbol, SongCount],
       )
 
-      Data = Base::Struct.new(
+      Data = Base.new(
         info:       PlayerCommon::Info,
         decoration: Decoration,
         extended:   ExtendedInfo,

data/lib/maimai_net/page-html_helper.rb

@@ -64,6 +64,18 @@ module MaimaiNet
       # and de-group all of the string into array of integers
       # @return [Array<Integer>]
       def scan_int(content); content.scan(GROUPED_INTEGER).map(&method(:int)); end
+      # parse time string as JST
+      # @return [Time]
+      def jst(time); ::Time.strptime(time + ' +09:00', '%Y/%m/%d %H:%M %z'); end
+      # parse time string as JST from stripped text content
+      # @return [Time]
+      def jst_from(node); jst(strip(node)); end
+      # @return [String] basename part of the path without any prefixes
+      def subpath(uri); ::Kernel.Pathname(::Kernel.URI(uri).path)&.sub_ext('')&.sub(/.+_/, '')&.basename.to_s; end
+      # (see #subpath)
+      def subpath_from(node); node ? subpath(src(node)) : -'' end
+      # @return [String] text contained directly under the node
+      def text(node); node.children.select(&:text?).map(&:content).inject('', :concat).strip end
 
       inspect_permit_variable_exclude :_page
       inspect_permit_expression do |value| false end
@@ -73,6 +85,43 @@ module MaimaiNet
       private :new
     end
 
+    module TrackHelper
+      # @return [Constants::Difficulty] difficulty value of given html element
+      def get_chart_difficulty_from(node)
+        Difficulty(subpath_from(node))
+      end
+
+      # @return [String] normalized difficulty text
+      def get_chart_level_text_from(node)
+        strip(node).sub(/\?$/, '')
+      end
+
+      # @return [String] chart type of given html element
+      # @return ["unknown"] if the chart element is not defined
+      def get_chart_type_from(node)
+        return -'unknown' if node.nil?
+
+        subpath_from(node)
+      end
+
+      # @return [String] chart variant of given html element
+      # @return [nil]    if the chart element is not utage
+      # @see HelperBlock#strip
+      # @note this is a semantic clarity for strip function.
+      def get_chart_variant_from(node)
+        node&.at_css('img[src*="music_utage.png"]').nil? ?
+          nil : strip(node)
+      end
+
+      # @return [0] for non buddy chart
+      # @return [1] for buddy chart
+      def get_chart_buddy_flag_from(node)
+        node&.at_css('img[src*="music_utage_buddy.png"]').nil? ? 0 : 1
+      end
+    end
+
+    HelperBlock.include TrackHelper
+
     # adds capability to inject methods using hidden helper block
     module HelperSupport
       # defines the method to be injected with hidden helper block.

data/lib/maimai_net/page-track_result_helper.rb

@@ -10,7 +10,8 @@ module MaimaiNet
       )
         HelperBlock.send(:new, nil).instance_exec do
           header_block = elm.at_css('.playlog_top_container')
-          difficulty = ::Kernel.Difficulty(::Kernel.Pathname(src(header_block.at_css('img.playlog_diff'))).sub_ext('').sub(/.+_/, '').basename)
+          difficulty = get_chart_difficulty_from(header_block.at_css('img.playlog_diff'))
+          utage_variant = get_chart_variant_from(header_block.at_css('.playlog_music_kind_icon_utage'))
 
           dx_container_classes = MaimaiNet::Difficulty::DELUXE.select do |k, v| v.positive? end
             .keys.map do |k| ".playlog_#{k}_container" end
@@ -20,32 +21,29 @@ module MaimaiNet
           result_block = info_block.at_css('.basic_block ~ div:nth-of-type(1)')
 
           track_order = get_fullint(strip(header_block.at_css('div.sub_title > span:nth-of-type(1)')))
-          play_time = Time.strptime(
-            strip(header_block.at_css('div.sub_title > span:nth-of-type(2)')) + ' +09:00',
-            '%Y/%m/%d %H:%M %z',
-          )
+          play_time = jst_from(header_block.at_css('div.sub_title > span:nth-of-type(2)'))
           song_name = strip(chart_header_block.children.last)
-          chart_level = strip(chart_header_block.at_css('div:nth-of-type(1)'))
+          chart_level = get_chart_level_text_from(chart_header_block.at_css('div:nth-of-type(1)'))
           song_jacket = src(result_block.at_css('img.music_img'))
-          chart_type = nil
-          result_block.at_css('img.playlog_music_kind_icon')&.tap do |elm|
-            chart_type = ::Kernel.Pathname(src(elm))&.sub_ext('')&.sub(/.+_/, '')&.basename&.to_s
-          end
+          chart_type  = get_chart_type_from(result_block.at_css('img.playlog_music_kind_icon'))
 
           result_score = strip(result_block.at_css('.playlog_achievement_txt')).to_f
           result_deluxe_scores = scan_int(strip(result_block.at_css('.playlog_result_innerblock .playlog_score_block div:nth-of-type(1)')))
-          result_grade = ::Kernel.Pathname(::Kernel.URI(src(result_block.at_css('.playlog_scorerank'))).path).sub_ext('')&.sub(/.+_/, '')&.basename&.to_s.to_sym
+          result_grade = subpath_from(result_block.at_css('.playlog_scorerank')).to_sym
           result_flags = result_block.css('.playlog_result_innerblock > img').map do |elm|
-            flag = ::Kernel.Pathname(::Kernel.URI(src(elm)).path).sub_ext('')&.basename.to_s
+            flag = subpath_from(elm)
             case flag
-            when *MaimaiNet::AchievementFlag::RESULT.values; MaimaiNet::AchievementFlag.new(result_key: flag)
+            when *MaimaiNet::AchievementFlag::RESULT.values; AchievementFlag(result_key: flag)
             when /_dummy$/; nil
             end
           end.compact
+          result_position = result_block.at_css('.playlog_result_innerblock img.playlog_matching_icon')&.yield_self do |elm|
+            /^\d+/.match(subpath_from(elm))[0].to_i
+          end
 
           challenge_info = nil
           result_block.at_css('div:has(> .playlog_life_block)')&.tap do |elm|
-            challenge_type = ::Kernel.Pathname(::Kernel.URI(src(elm.at_css('img:nth-of-type(1)'))).path).basename.sub_ext('').sub(/.+_/, '').to_s.to_sym
+            challenge_type = subpath_from(elm.at_css('img:nth-of-type(1)')).to_sym
             challenge_lives = scan_int(strip(elm.at_css('.playlog_life_block')))
 
             challenge_info = Model::Result::Challenge.new(
@@ -63,6 +61,7 @@ module MaimaiNet
             end.to_h,
             grade: result_grade,
             flags: result_flags.map(&:to_sym),
+            position: result_position,
           }
 
           score_cls = score_data.key?(:combo) && score_data.key?(:sync_score) ?
@@ -76,6 +75,7 @@ module MaimaiNet
               title: song_name,
               type: (chart_type or -'unknown'),
               difficulty: difficulty.id,
+              variant: utage_variant,
               level_text: chart_level,
             ),
             score: score_info,

data/lib/maimai_net/page.rb

@@ -135,22 +135,23 @@ module MaimaiNet
         images.map do |elm|
           elm = elm.at_css('> div')
 
-          chart_type = Pathname(src(elm.at_css('> .music_kind_icon'))).sub_ext('').basename
-          difficulty = Difficulty(Pathname(src(elm.at_css('> img:nth-of-type(2)'))).sub_ext('').sub('diff_', '').basename)
+          chart_type = get_chart_type_from(elm.at_css('> .music_kind_icon'))
+          difficulty = get_chart_difficulty_from(elm.at_css('> .block_info:nth-of-type(1) ~ img:nth-of-type(1)'))
+          chart_flags = [
+            get_chart_buddy_flag_from(elm.at_css('.music_kind_icon_utage:has(img[src*="music_utage_buddy.png"])')),
+          ].inject(0, :|)
 
           Model::PhotoUpload.new(
             info: Model::Chart::InfoLite.new(
-              title: strip(elm.at_css('> div:not(.clearfix):nth-of-type(2)')),
+              title: strip(elm.at_css('> .clearfix:nth-of-type(1) ~ div:nth-of-type(1)')),
               type: chart_type.to_s,
+              variant: get_chart_variant_from(elm.at_css('.music_kind_icon_utage:has(img[src*="music_utage.png"])')),
+              flags: chart_flags,
               difficulty: difficulty.id,
             ),
-            url: URI(src(elm.at_css('> img:nth-of-type(3)'))),
-            location: strip(elm.at_css('> div:not(.clearfix):nth-of-type(4)')),
-            time: Time.strptime(
-              strip(elm.at_css('> div:not(.clearfix):nth-of-type(1)')) + ' +09:00',
-              '%Y/%m/%d %H:%M %z',
-              Time.now.localtime(32400),
-            ),
+            url: URI(src(elm.at_css('> .block_info:nth-of-type(1) ~ img:nth-of-type(2)'))),
+            location: strip(elm.at_css('> .clearfix:nth-of-type(1) ~ div:nth-of-type(3)')),
+            time: jst_from(elm.at_css('> div:not(.clearfix):nth-of-type(1)')),
           )
         end
       end
@@ -167,8 +168,12 @@ module MaimaiNet
         song_info_elm = @summary_block.at_css('> div:nth-of-type(1)')
 
         song_jacket = URI(src(@summary_block.at_css('> img:nth-of-type(1)')))
-        set_type = Pathname(src(song_info_elm.at_css('> div:nth-of-type(1) > img'))).sub_ext('').sub(/.+_/, '').basename.to_s
-        song_genre = strip(song_info_elm.at_css('> div:nth-of-type(1)'))
+        set_type = get_chart_type_from(song_info_elm.at_css('> div:nth-of-type(1) > img'))
+        set_utage_variant = get_chart_variant_from(song_info_elm.at_css('> div:nth-of-type(1) > .music_kind_icon_utage:has(img[src*="music_utage.png"])'))
+        set_flag = [
+          get_chart_buddy_flag_from(song_info_elm.at_css('> div:nth-of-type(1) > .music_kind_icon_utage:has(img[src*="music_utage_buddy.png"])')),
+        ].inject(0, :|)
+        song_genre = text(song_info_elm.at_css('> div:nth-of-type(1)'))
         song_name = strip(song_info_elm.at_css('> div:nth-of-type(2)'))
         song_artist = strip(song_info_elm.at_css('> div:nth-of-type(3)'))
 
@@ -185,30 +190,33 @@ module MaimaiNet
         chart_score_blocks = @summary_block.css('~ div:has(~ img)')
 
         info_blocks.each do |info_block|
-          level_text = strip(info_block.at_css('.music_lv_back'))
+          level_text = get_chart_level_text_from(info_block.at_css('.music_lv_back'))
           form_block = info_block.at_css('form')
           form_inputs = form_block.css('input[name][type=hidden]').map do |elm|
             [elm['name'].to_sym, elm['value']]
           end.to_h
+
           difficulty = Difficulty(deluxe_web_id: form_inputs[:diff].to_i)
           difficulty_data[difficulty.abbrev] ||= {}
           difficulty_data[difficulty.abbrev].store(:info, Model::Chart::Info.new(
             web_id:     Model::WebID.parse(form_inputs[:idx]),
             title:      song_name,
             type:       set_type,
+            variant:    set_utage_variant,
+            flags:      set_flag,
             difficulty: difficulty.id,
             level_text: level_text,
           ))
         end
 
         chart_score_blocks.each do |chart_score_block|
-          difficulty = Difficulty(Pathname(src(chart_score_block.at_css('> img:nth-of-type(1)'))).sub_ext('').sub(/.+_/, '').basename)
-          chart_type = Pathname(src(chart_score_block.at_css('> img:nth-of-type(2)')))&.sub_ext('')&.sub(/.+_/, '')&.basename&.to_s or set_type
+          difficulty = get_chart_difficulty_from(chart_score_block.at_css('> img:nth-of-type(1)'))
+          chart_type = get_chart_type_from(chart_score_block.at_css('> img:nth-of-type(2)')) || set_type
           clearfixes = chart_score_block.css('.clearfix')
 
           chart_record_block = clearfixes[0].at_css('~ div:nth-of-type(2)')
           record_grade, record_flag, record_sync_flag = chart_record_block.css('> img').map do |elm|
-            value = Pathname(URI(src(elm)).path).sub_ext('')&.sub(/.+_/, '')&.basename.to_s
+            value = subpath_from(elm)
             case value
             when 'back'; nil
             when *MaimaiNet::AchievementFlag::RECORD.values; MaimaiNet::AchievementFlag.new(record_key: value)
@@ -216,7 +224,7 @@ module MaimaiNet
             end
           end
           last_played_date, total_play_count = chart_record_block.css('table tr td:nth-of-type(2)').zip([
-            ->(content){Time.strptime(content + ' +09:00', '%Y/%m/%d %H:%M %z')},
+            method(:jst),
             method(:int),
           ]).map do |elm, block|
             block.call(strip(elm))
@@ -227,7 +235,7 @@ module MaimaiNet
           chart_deluxe_scores = scan_int(strip(chart_best_block.at_css('.music_score_block:nth-of-type(2)')))
           chart_deluxe_grade_elm = chart_best_block.at_css('.music_score_block:nth-of-type(2) img:nth-child(2)')
           record_deluxe_grade = chart_deluxe_grade_elm ?
-            Pathname(src(chart_deluxe_grade_elm))&.sub_ext('')&.sub(/.+_/, '')&.basename&.to_s.to_i :
+            subpath_from(chart_deluxe_grade_elm).to_i :
             0
 
           difficulty_data[difficulty.abbrev].tap do |d|
@@ -265,13 +273,14 @@ module MaimaiNet
 
         start_anchor = @root.at_css('img.title')
         @otomodachi_block = start_anchor.at_css('~ div#vsUser > :first-child')
+        @multiplayer_block = start_anchor.at_css('~ div#matching')
         @score_block = start_anchor.at_css('~ div:not(#vsUser):nth-of-type(1)')
         @breakdown_block = start_anchor.at_css('~ div:not(#vsUser):nth-of-type(2)')
       end
 
       helper_method :data do
         result_breakdown = @breakdown_block.css('table.playlog_notes_detail tr:not(:first-child)').map do |row|
-          key = Pathname(URI(src(row.at_css('th img'))).path).sub_ext('').basename.to_s.to_sym
+          key = subpath_from(row.at_css('th img')).to_sym
           values = Model::Result::Judgment.new(**Model::Result::Judgment.members.zip(
             row.css('td').map(&method(:strip)).map(&method(:get_int))
           ).to_h)
@@ -281,8 +290,8 @@ module MaimaiNet
         result_offset_breakdown = @breakdown_block.css('.playlog_fl_block > div').map do |elm|
           get_int(strip(elm))
         end
-        result_rating_after = int(strip(@breakdown_block.at_css('.playlog_rating_detail_block > div:nth-of-type(1) .rating_block')))
-        result_rating_delta = int(strip(@breakdown_block.at_css('.playlog_rating_detail_block > div:nth-of-type(2)')))
+        result_rating_after = int(strip(@breakdown_block.at_css('.playlog_rating_detail_block > div:has(.rating_block) .rating_block')))
+        result_rating_delta = get_int(@breakdown_block.at_css('.playlog_rating_detail_block > div:has(.rating_block) ~ img[src*="/playlog/rating"] ~ div > span'))
         result_combos, result_sync_scores = @breakdown_block.css('.playlog_score_block').map do |elm|
           scan_int(strip(elm)).tap do |ary| ary.fill(0, ary.size...2) end
         end
@@ -310,6 +319,16 @@ module MaimaiNet
           )
         end
 
+        result_players = @multiplayer_block&.css(':has(img[src*="/diff"])').to_a.map do |elm|
+          difficulty = get_chart_difficulty_from(elm.at_css('> img:nth-of-type(1)'))
+          name = strip(elm.at_css('> div.basic_block:nth-of-type(1)'))
+
+          Model::Result::PlayerInfo.new(
+            player_name: name,
+            difficulty:  difficulty.id,
+          )
+        end
+
         chart_web_id = Model::WebID.parse(@root.at_css('form[action$="/record/musicDetail/"] input[name=idx]')['value'])
 
         Model::Result::Data.new(
@@ -321,8 +340,11 @@ module MaimaiNet
           ),
           breakdown: result_breakdown,
           timing: Model::Result::Offset.new(**Model::Result::Offset.members.zip(result_offset_breakdown).to_h),
+          rating_before: result_rating_after - result_rating_delta,
+          rating_after: result_rating_after,
           members: result_tour_members,
           rival: result_otomodachi_rival,
+          players: result_players,
         )
       end
     end
@@ -350,25 +372,42 @@ module MaimaiNet
         if track_group_blocks.empty? then
           track_segmented_blocks[current_group] = @root.css('div:has(> form[action$="/musicDetail/"] input[name=idx])')
         else
-          @root.css('.see_through_block ~ div').each do |elm|
-            if elm.classes.include? 'screw_block' then
-              current_group = elm.content
-              next
+          %w(.see_through_block .scroll_point).each do |anchor_class|
+            anchor_elm = @root.at_css(anchor_class)
+            next if anchor_elm.nil?
+
+            anchor_elm.css('~ div').each do |elm|
+              if elm.classes.include? 'screw_block' then
+                current_group = elm.content
+                next
+              end
+
+              track_segmented_blocks[current_group] ||= Nokogiri::XML::NodeSet.new(@document)
+              track_segmented_blocks[current_group] << elm
             end
 
-            track_segmented_blocks[current_group] ||= Nokogiri::XML::NodeSet.new(@document)
-            track_segmented_blocks[current_group] << elm
+            break
           end
         end
 
         result = track_segmented_blocks.transform_values do |elm_group|
           elm_group.map do |elm|
+            chart_info = {}
+
+            chart_info[:type] = get_chart_type_from(elm.at_css('.music_kind_icon'))
+            chart_info[:variant] = get_chart_variant_from(elm.at_css('.music_kind_icon_utage:has(img[src*="music_utage.png"])'))
+            chart_info[:flags]   = [
+              get_chart_buddy_flag_from(elm.at_css('.music_kind_icon_utage:has(img[src*="music_utage_buddy.png"])')),
+            ].inject(0, :|)
+
             chart_info = Model::Chart::Info.new(
               web_id: Model::WebID.parse(elm.at_css('input[name=idx][type=hidden]')['value']),
-              title: elm.at_css('.music_name_block').content,
-              type: Pathname(URI(src(elm.at_css('.music_kind_icon'))).path).sub_ext('').sub(/.+_/, '').basename.to_s,
-              difficulty: Difficulty(Pathname(URI(src(elm.at_css('form > img:nth-of-type(1)'))).path).sub_ext('').sub(/.+_/, '').basename.to_s).id,
-              level_text: elm.at_css('.music_lv_block').content,
+              title: strip(elm.at_css('.music_name_block')),
+              type: chart_info.fetch(:type, -'unknown'),
+              difficulty: get_chart_difficulty_from(elm.at_css('form > img:nth-of-type(1)')).id,
+              variant: chart_info.fetch(:variant, nil),
+              flags: chart_info[:flags],
+              level_text: get_chart_level_text_from(elm.at_css('.music_lv_block')),
             )
 
             score_info = nil
@@ -382,7 +421,7 @@ module MaimaiNet
                 )
               else
                 # ratingTargetMusic page
-                best_grade = Pathname(URI(src(elm.at_css('.music_score_block:nth-of-type(1) > div > img'))).path).sub_ext('').sub(/.+_/, '').basename.to_s.to_sym
+                best_grade = subpath_from(elm.at_css('.music_score_block:nth-of-type(1) > div > img')).to_sym
                 score_info = Model::Result::ScoreOnly.new(
                   score: strip(elm.at_css('.music_score_block:nth-of-type(1)')).to_f,
                   grade: best_grade,
@@ -398,7 +437,7 @@ module MaimaiNet
               if !elm.at_css('.music_score_block').nil? then
                 best_deluxe_score = scan_int(strip(elm.at_css('.music_score_block:nth-of-type(2)')))
                 flairs = elm.css('.music_score_block ~ img:has(~ .clearfix)').map do |img|
-                  Pathname(URI(src(img)).path).sub_ext('').sub(/.+_/, '').basename.to_s.to_sym.yield_self do |value|
+                  subpath_from(img).to_sym.yield_self do |value|
                     value == :back ? nil : value
                   end
                 end

data/lib/maimai_net/refines.rb

@@ -1,12 +1,20 @@
 module MaimaiNet
-  # includes AutoConstants into invokable class
+  # injects {CoreExt::AutoConstantInclusion} into {Kernel} and {BasicObject}.
+  # @note A bug noticed from v0.0.1 where refining Kernel only
+  #   is not reliable due to prepending on Kernel causes
+  #   all refines on Kernel are invalidated. A band-aid solution
+  #   for this is also injecting BasicObject with the same refine.
   module IncludeAutoConstant
     refine Kernel do
-      include CoreExt::KernelAutoConstantInclusion
+      include CoreExt::AutoConstantInclusion
+    end
+    refine BasicObject do
+      include CoreExt::AutoConstantInclusion
     end
   end
 
-  # converts any object into a single-element array unless it's an array
+  # grants any object an ability to convert itself into a single-element array.
+  # unless it's an array already.
   module ObjectAsArray
     refine Object do
       def as_array

data/lib/maimai_net/version.rb

@@ -1,3 +1,3 @@
 module MaimaiNet
-  VERSION = -'0.0.1'
+  VERSION = -'0.0.3'
 end

data/lib/maimai_net.rb

@@ -1,3 +1,5 @@
+require 'forwardable'
+
 module MaimaiNet
   require 'maimai_net/version'
   require 'maimai_net/error'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maimai_net
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Rei Hakurei
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-19 00:00:00.000000000 Z
+date: 2025-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -115,15 +115,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/gem.yml"
-- ".gitignore"
-- ".rspec"
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
 - lib/maimai_net.rb
 - lib/maimai_net/client.rb
 - lib/maimai_net/constants.rb
@@ -143,7 +136,6 @@ files:
 - lib/maimai_net/user_option.rb
 - lib/maimai_net/util.rb
 - lib/maimai_net/version.rb
-- maimai-net.gemspec
 homepage: https://github.com/ReiFan49/rb.maimai-net
 licenses:
 - BSD-3-Clause-Clear
@@ -165,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Parses maimai-net into readable data.

data/.github/workflows/gem.yml

@@ -1,53 +0,0 @@
-name: Ruby Gem
-
-on:
-  push:
-    tags:
-    - v*
-
-concurrency:
-  group: ${{ github.ref_name }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Build + Publish
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      id-token: write
-    env:
-      RUBY_VERSION: '2.7'
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Ruby ${{ env.RUBY_VERSION }}
-      uses: ruby/setup-ruby@v1
-      with:
-        bundler-cache: true
-        ruby-version: ${{ env.RUBY_VERSION }}
-    # Publish
-    - name: Publish to GPR
-      run: |
-        mkdir -p $HOME/.gem
-        touch $HOME/.gem/credentials
-        chmod 0600 $HOME/.gem/credentials
-        printf -- "---\n:github: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-        gem build *.gemspec
-        gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
-      env:
-        GEM_HOST_API_KEY: "Bearer ${{secrets.GITHUB_TOKEN}}"
-        OWNER: ${{ github.repository_owner }}
-    - name: Publish to RubyGems
-      if: ${{ false }}
-      run: |
-        mkdir -p $HOME/.gem
-        touch $HOME/.gem/credentials
-        chmod 0600 $HOME/.gem/credentials
-        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-        gem build *.gemspec
-        gem push *.gem
-      env:
-        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"
-    - name: Publish to RubyGems (Trusted)
-      uses: rubygems/release-gem@v1

data/.gitignore

@@ -1,165 +0,0 @@
-# Created by https://www.toptal.com/developers/gitignore/api/ruby,rubymine+all,linux
-# Edit at https://www.toptal.com/developers/gitignore?templates=ruby,rubymine+all,linux
-
-### Linux ###
-*~
-.*.swp
-
-# temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-# .nfs files are created when an open file is removed but is still being accessed
-.nfs*
-
-### Ruby ###
-*.gem
-*.rbc
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/spec/examples.txt
-/test/tmp/
-/test/version_tmp/
-/tmp/
-
-# Used by dotenv library to load environment variables.
-# .env
-
-# Ignore Byebug command history file.
-.byebug_history
-
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
-*.bridgesupport
-build-iPhoneOS/
-build-iPhoneSimulator/
-
-## Specific to RubyMotion (use of CocoaPods):
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-# vendor/Pods/
-
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-
-## Environment normalization:
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-Gemfile.lock
-.ruby-version
-.ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
-
-# Used by RuboCop. Remote config files pulled in from inherit_from directive.
-# .rubocop-https?--*
-
-### RubyMine+all ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# AWS User-specific
-.idea/**/aws.xml
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-# .idea/artifacts
-# .idea/compiler.xml
-# .idea/jarRepositories.xml
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
-
-# CMake
-cmake-build-*/
-
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
-# File-based project format
-*.iws
-
-# IntelliJ
-out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# SonarLint plugin
-.idea/sonarlint/
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-# Editor-based Rest Client
-.idea/httpRequests
-
-# Android studio 3.1+ serialized cache file
-.idea/caches/build_file_checksums.ser
-
-### RubyMine+all Patch ###
-# Ignore everything but code style settings and run configurations
-# that are supposed to be shared within teams.
-
-.idea/*
-
-!.idea/codeStyles
-!.idea/runConfigurations
-
-# End of https://www.toptal.com/developers/gitignore/api/ruby,rubymine+all,linux

data/.rspec

@@ -1,5 +0,0 @@
---format documentation
---color
---require spec_helper
---tag ~planned
---tag ~priority:low

data/Gemfile

@@ -1,4 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in maimai-net.gemspec
-gemspec

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec

data/bin/console

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-begin; require 'byebug'; rescue LoadError; end
-require "maimai_net"
-
-console = nil
-begin; require 'pry'
-rescue LoadError; require 'irb'; console = :irb
-else; console = :pry
-end
-
-case console
-when :pry; Pry.start
-else; IRB.start(__FILE__)
-end

data/bin/setup

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install

data/maimai-net.gemspec

@@ -1,44 +0,0 @@
-require_relative 'lib/maimai_net/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "maimai_net"
-  spec.version       = MaimaiNet::VERSION
-  spec.authors       = [
-    %(Rei Hakurei),
-  ]
-  spec.email         = %w(contact@bloom-juery.net)
-
-  spec.summary       = %q(Parses maimai-net into readable data.)
-  spec.homepage      = 'https://github.com/ReiFan49/rb.maimai-net'
-  spec.license       = 'BSD-3-Clause-Clear'
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
-
-  # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-  # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  begin
-    spec.files       = Dir.chdir(File.expand_path('..', __FILE__)) do
-      `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-    end
-  rescue Errno::ENOENT
-    spec.files       = Dir.glob('lib/**/*.rb', base: File.expand_path('..', __FILE__))
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'byebug'
-
-  spec.add_runtime_dependency 'nokogiri', '~> 1.13'
-  spec.add_runtime_dependency 'faraday',  '~> 2.0'
-  spec.add_runtime_dependency 'faraday-follow_redirects'
-
-  spec.add_runtime_dependency 'http-cookie', '~> 1.0.0'
-end