git-fit 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2f295d660e818e0baf5fcd3a624aabff068288c1cc93cbb4a661b046fd58a3c
-  data.tar.gz: ee63230c3e1ae93aa7ef1bec736b5011ccbfcf013b35e70c39afcc38acbe2c06
+  metadata.gz: c3e935c4e4949dfd80ef84c659f9f64a727d9c1d3aab7c2b6303d6571f42156b
+  data.tar.gz: 771f645e5ae8a369c89237d3df03c00b06d5887f5331e7cfec306af0c57f8eb6
 SHA512:
-  metadata.gz: 6498333581ad0d68044f77c8de1ffddb1a3a4f6634a92f99081df76e5dda26fc7eb25eeb0eaf8ac0b04637db40257d43ade12c2325a6ebdec63cb95430964113
-  data.tar.gz: edda04a53ebaadd13d4bd15c325251bf4ab0f7b500917fe323c52968ca55303162f5fe95a62f4baaf2734ff8e9dc278c1786e44506b32fedcbb9cad43dbfe5c2
+  metadata.gz: 926a648129246714657066e5d7a21b9663682af63516a98d21646e9c58167b4c962150697a8d1d9e14068c834d1d010f9d3696628f8edae9b6ee8f2c614d36cc
+  data.tar.gz: 7bebd70ae9b51e18fc97278f7e691466ea5ca4aec07594c83bc7ca2c9ff913f85566dcf9b98b6013a279a3c2927216fd60ad82d860d8185b8fb133a873fbc5fe

data/lib/git-fit.rb

@@ -63,7 +63,7 @@ require_relative 'git_fit/util'
 require_relative 'git_fit/sync/lorem'
 require_relative 'git_fit/sync/garmin_base'
 require_relative 'git_fit/sync/garmin_base_di'
-require_relative 'git_fit/sync/garmin'
+require_relative 'git_fit/sync/garmin_com'
 require_relative 'git_fit/sync/garmin_cn'
 require_relative 'git_fit/sync/strava'
 require_relative 'git_fit/sync/keep'

data/lib/git_fit/auth/garmin/login_session.rb

@@ -15,7 +15,7 @@ module GitFit
       # Persists the pre-auth login session created during an interrupted MFA
       # flow. This is a *temporary* session (30-minute TTL matching the MFA code
       # validity window), distinct from the long-lived persistent session cookie
-      # (garmin_playwright_session_*.json) that Strategy B keeps after success.
+      # (data/auth/garmin/session.json) that Strategy B keeps after success.
       module LoginSession
         DIR = 'data/cache'
         TTL_SECONDS = 30 * 60

data/lib/git_fit/auth/garmin/strategy_b.rb

@@ -2,7 +2,8 @@
 
 require_relative 'di_exchange'
 require_relative 'login_session'
-require_relative '../../sync/garmin_base'
+require_relative '../../sync/garmin_com'
+require_relative '../paths'
 require 'json'
 require 'fileutils'
 
@@ -18,7 +19,6 @@ module GitFit
         MOBILE_SERVICE = 'https://mobile.integration.garmin.com/gcm/android'
         LOGIN_DELAY_MIN = 30.0
         LOGIN_DELAY_MAX = 45.0
-        SESSION_CACHE_DIR = 'data/cache'
         REDIRECT_STATUSES = [301, 302, 303, 307, 308].freeze
         AUTH_FLAG = '-B'
 
@@ -204,8 +204,8 @@ module GitFit
           sleep(delay)
         end
 
-        def _session_file_path(domain)
-          File.join(SESSION_CACHE_DIR, "garmin_playwright_session_#{domain.tr('.', '_')}.json")
+        def _session_file_path(_domain)
+          Auth.file(GitFit::Sync::GarminCom.source_prefix, 'session.json')
         end
 
         def _load_session(session_path)

data/lib/git_fit/auth/garmin.rb

@@ -4,6 +4,8 @@ require_relative 'garmin/strategy_a'
 require_relative 'garmin/strategy_b'
 require_relative 'garmin/di_exchange'
 require_relative 'garmin/login_session'
+require_relative 'paths'
+require_relative '../sync/garmin_com'
 require_relative '../config'
 require_relative '../cli/gh_cli'
 require 'json'
@@ -189,7 +191,7 @@ module GitFit
 
         def token_path
           garmin_cfg['token_path'] ||
-            File.join('data', 'auth', "garmin_#{domain.tr('.', '_')}_tokens.json")
+            Auth.file(GitFit::Sync::GarminCom.source_prefix, 'tokens.json')
         end
 
         def gh_ladder(seed)

data/lib/git_fit/auth/garmin_token.rb

@@ -10,7 +10,7 @@ module GitFit
     # commands, CI token checks).
     class GarminToken
       def self.for_intl(config)
-        authenticate_with(GitFit::Sync::Garmin, config, 'garmin.com')
+        authenticate_with(GitFit::Sync::GarminCom, config, 'garmin.com')
       end
 
       def self.for_cn(config)

data/lib/git_fit/auth/paths.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module GitFit
+  module Auth
+    module_function
+
+    # Canonical per-source auth storage: data/auth/{source}/{name}. All sync
+    # adapters, the auth orchestrator and strategies must resolve token/session
+    # defaults through this helper so they can never drift apart.
+    def file(source, name)
+      File.join('data', 'auth', source, name)
+    end
+  end
+end

data/lib/git_fit/cli/strava.rb

@@ -4,6 +4,7 @@ require 'thor'
 require 'fileutils'
 require 'tzinfo'
 require 'stravaweb'
+require_relative '../auth/paths'
 
 module GitFit
   class StravaCLI < Thor
@@ -60,7 +61,7 @@ module GitFit
       FileUtils.mkdir_p(output_dir)
       cache_dir = File.join('data', 'cache', 'strava_downloads')
       FileUtils.mkdir_p(cache_dir)
-      cookie_path = File.join('data', 'cache', 'strava_session.yml')
+      cookie_path = web_cfg['cookie_path'] || GitFit::Auth.file('strava', 'session.yml')
 
       if activity_ids.empty?
         activity_ids = pending_ids(config, output_dir)

data/lib/git_fit/config_template.rb

@@ -19,6 +19,7 @@ module GitFit
           #   web_auth:                                # web original-file fetch (git fit strava fetch)
           #     jwt: ""                                # env: GIT_FIT_STRAVA_WEB_AUTH_JWT (strava_remember_token)
           #     auth_seed: ""                          # env: GIT_FIT_STRAVA_WEB_AUTH_AUTH_SEED (base64 JWT)
+          #     cookie_path: ""                        # default data/auth/strava/session.yml
 
           # garmin:                                    # env: GIT_FIT_GARMIN_EMAIL
           #   email: ""                                # env: GIT_FIT_GARMIN_PASSWORD
@@ -44,12 +45,14 @@ module GitFit
           # xoss:                                        # env: GIT_FIT_XOSS_EMAIL
           #   email: ""                                  # env: GIT_FIT_XOSS_PASSWORD
           #   password: ""
+          #   token_path: ""                             # env: GIT_FIT_XOSS_TOKEN_PATH
+          #                                              # default data/auth/xoss/tokens.json
 
           # xingzhe:                                     # env: GIT_FIT_XINGZHE_EMAIL
           #   email: ""                                  # env: GIT_FIT_XINGZHE_PASSWORD
           #   password: ""
           #   session_path: ""                           # env: GIT_FIT_XINGZHE_SESSION_PATH
-          #                                              # default data/cache/xingzhe_session.json
+          #                                              # default data/auth/xingzhe/session.json
 
         export:
           json:

data/lib/git_fit/sync/garmin_base.rb

@@ -2,6 +2,7 @@
 
 require_relative 'base'
 require_relative '../fit/decoder'
+require_relative '../auth/paths'
 require 'ostruct'
 require 'base64'
 require 'oauth'
@@ -29,12 +30,17 @@ module GitFit
       OAUTH_CONSUMER_URL = 'https://thegarth.s3.amazonaws.com/oauth_consumer.json'
 
       SSO_HEADERS = {
-        'User-Agent' => 'Mozilla/5.0 (iPhone; CPU iPhone OS 18_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148',
+        'User-Agent' => 'Mozilla/5.0 (iPhone; CPU iPhone OS 18_7 like Mac OS X) ' \
+                        'AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148',
         'Accept' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
         'Accept-Language' => 'en-US,en;q=0.9',
       }.freeze
 
       def initialize(...)
+        if instance_of?(GarminBase)
+          raise NotImplementedError,
+                'GarminBase is abstract — instantiate a concrete subclass (Garmin, GarminCN)'
+        end
         super
         @domain = 'garmin.com'
         @email = @config['email']
@@ -53,19 +59,18 @@ module GitFit
       def authenticate
         @oauth_consumer = fetch_oauth_consumer
 
-        if @secret
-          if parse_secret_string(@secret)
-            if access_token_valid?
-              @auth_method = 'secret'
+        if @secret && parse_secret_string(@secret)
+          if access_token_valid?
+            @auth_method = 'secret'
+            return true
+          end
+          begin
+            if refresh_oauth2_via_oauth1
+              @auth_method = 'refreshed'
               return true
             end
-            begin
-              if refresh_oauth2_via_oauth1
-                @auth_method = 'refreshed'
-                return true
-              end
-            rescue AuthError
-            end
+          rescue AuthError => e
+            warn e.message
           end
         end
 
@@ -144,6 +149,14 @@ module GitFit
         attrs
       end
 
+      def self.source_prefix
+        raise NotImplementedError, "#{self} must implement source_prefix"
+      end
+
+      def source_prefix
+        self.class.source_prefix
+      end
+
       private
 
       def access_token_valid?
@@ -164,7 +177,7 @@ module GitFit
           oauth_token: o1['oauth_token'],
           oauth_token_secret: o1['oauth_token_secret'],
           mfa_token: o1['mfa_token'],
-          domain: @domain
+          domain: @domain,
         )
         @access_token = o2
         true
@@ -190,7 +203,7 @@ module GitFit
         return unless File.exist?(path)
 
         cfg = YAML.safe_load(File.read(path)) || {}
-        source = @domain == 'garmin.cn' ? 'garmin_cn' : 'garmin'
+        source = source_prefix
         cfg['sync'] ||= {}
         cfg['sync'][source] ||= {}
         cfg['sync'][source]['secret'] = @generated_secret
@@ -222,8 +235,8 @@ module GitFit
         save_tokens
         true
       rescue StandardError => e
-        raise AuthError, "Garmin OAuth refresh failed: #{e.message}" +
-          " — #{reauth_hint}"
+        raise AuthError, "Garmin OAuth refresh failed: #{e.message}" \
+                         " — #{reauth_hint}"
       end
 
       def fetch_oauth_consumer
@@ -258,16 +271,14 @@ module GitFit
             mfaVerificationCode: mfa_code,
             rememberMyBrowser: false,
             reconsentList: [],
-            mfaSetup: false
+            mfaSetup: false,
           )
           resp = sso_post(sso_base, '/mobile/api/mfa/verifyCode', login_params, mfa_body, jar)
           body = JSON.parse(resp.body)
           status = body.dig('responseStatus', 'type')
         end
 
-        unless status == 'SUCCESSFUL'
-          raise "Garmin login failed (#{body.dig("responseStatus", "message") || status})"
-        end
+        raise "Garmin login failed (#{body.dig('responseStatus', 'message') || status})" unless status == 'SUCCESSFUL'
 
         body['serviceTicketId']
       end
@@ -314,7 +325,8 @@ module GitFit
       def fetch_oauth1_token(ticket)
         base_url = "https://connectapi.#{@domain}/oauth-service/oauth/"
         login_url = "https://mobile.integration.#{@domain}/gcm/android"
-        url = "#{base_url}preauthorized?ticket=#{CGI.escape(ticket)}&login-url=#{CGI.escape(login_url)}&accepts-mfa-tokens=true"
+        url = "#{base_url}preauthorized?ticket=#{CGI.escape(ticket)}" \
+              "&login-url=#{CGI.escape(login_url)}&accepts-mfa-tokens=true"
 
         oauth_consumer = OAuth::Consumer.new(
           @oauth_consumer['consumer_key'], @oauth_consumer['consumer_secret'],
@@ -328,7 +340,7 @@ module GitFit
         req['User-Agent'] = 'com.garmin.android.apps.connectmobile'
         oauth_consumer.sign!(req, nil)
 
-        resp = retry_on_429(3, 5) { send_http(URI(url), req) }
+        resp = retry_on_rate_limit(3, 5) { send_http(URI(url), req) }
         raise "OAuth1 error: #{resp.code}" unless resp.code.to_i == 200
 
         parsed = CGI.parse(resp.body).transform_keys(&:to_s).transform_values(&:first)
@@ -337,7 +349,7 @@ module GitFit
           oauth_token: parsed['oauth_token'],
           oauth_token_secret: parsed['oauth_token_secret'],
           mfa_token: parsed['mfa_token'],
-          domain: @domain
+          domain: @domain,
         )
       end
 
@@ -359,7 +371,7 @@ module GitFit
         req.body = URI.encode_www_form(body_params)
         oauth_consumer.sign!(req, token)
 
-        resp = retry_on_429 { send_http(URI(url), req) }
+        resp = retry_on_rate_limit { send_http(URI(url), req) }
         raise "OAuth2 exchange error: #{resp.code}" unless resp.code.to_i == 200
 
         result = JSON.parse(resp.body)
@@ -374,7 +386,7 @@ module GitFit
 
       def existing_run_ids
         @db[:activities].where(source: source_prefix).select_map(:run_id)
-          .map { |id| id.sub("#{source_prefix}_", '') }
+                        .map { |id| id.sub("#{source_prefix}_", '') }
       end
 
       def fetch_activity_list(start, limit)
@@ -388,9 +400,9 @@ module GitFit
       def api_get(path)
         uri = URI("#{connectapi_base}#{path}")
         req = Net::HTTP::Get.new(uri)
-        req['Authorization'] = "Bearer #{@access_token["access_token"]}"
+        req['Authorization'] = "Bearer #{@access_token['access_token']}"
         req['User-Agent'] = 'GCM-iOS-5.22.1.4'
-        resp = retry_on_429 { send_http(uri, req) }
+        resp = retry_on_rate_limit { send_http(uri, req) }
         return nil unless resp.code.to_i == 200
         JSON.parse(resp.body)
       end
@@ -408,14 +420,14 @@ module GitFit
         http.start { |h| h.request(request) }
       end
 
-      def retry_on_429(max_retries = 3, base_delay = 2)
+      def retry_on_rate_limit(max_retries = 3, base_delay = 2)
         retries = 0
         loop do
           resp = yield
           return resp unless resp.code.to_i == 429 && retries < max_retries
 
           retries += 1
-          sleep(base_delay * (2 ** retries))
+          sleep(base_delay * (2**retries))
         end
       end
 
@@ -424,15 +436,17 @@ module GitFit
       end
 
       def resolve_local_time(start_utc, activity_id, polyline = nil)
-        lat = lng = nil
+        nil
 
         lat, lng = first_gps_from_l2(activity_id)
 
         if lat.nil? && polyline
-          decoded = GitFit::Geo::Polyline.decode(polyline) rescue nil
-          if decoded && decoded.any?
-            lat, lng = decoded.first
+          decoded = begin
+            GitFit::Geo::Polyline.decode(polyline)
+          rescue StandardError
+            nil
           end
+          lat, lng = decoded.first if decoded&.any?
         end
 
         tz_string = tz_resolver.resolve(lat, lng)
@@ -450,11 +464,11 @@ module GitFit
         l2 = JSON.parse(File.read(l2_path))
         return [nil, nil] unless l2.is_a?(Array) && l2.any?
 
-        first = l2.find { |r|
+        first = l2.find do |r|
           lat = r['positionLat']
           lng = r['positionLong']
           lat && lng && lat.to_f != 0.0 && lng.to_f != 0.0
-        }
+        end
         return [nil, nil] unless first
 
         [first['positionLat'].to_f, first['positionLong'].to_f]
@@ -462,10 +476,6 @@ module GitFit
         [nil, nil]
       end
 
-      def source_prefix
-        'garmin'
-      end
-
       def reauth_hint
         "Re-auth: set sync.#{source_prefix}.secret in config/config.yml"
       end
@@ -560,7 +570,7 @@ module GitFit
           oauth_token: o1['oauth_token'],
           oauth_token_secret: o1['oauth_token_secret'],
           mfa_token: o1['mfa_token'],
-          domain: @domain
+          domain: @domain,
         )
         @access_token = data['oauth2']
         @saved_expires_at = @access_token&.dig('expires_at')
@@ -571,7 +581,7 @@ module GitFit
       end
 
       def token_path
-        @config['token_path'] || File.join('data', 'auth', "garmin_#{@domain.tr(".", "_")}_tokens.json")
+        @config['token_path'] || GitFit::Auth.file(source_prefix, 'tokens.json')
       end
 
       FIT_EPOCH = 631_065_600
@@ -598,9 +608,9 @@ module GitFit
       def download_fit_raw(activity_id)
         uri = URI("#{connectapi_base}/download-service/files/activity/#{activity_id}")
         req = Net::HTTP::Get.new(uri)
-        req['Authorization'] = "Bearer #{@access_token.fetch("access_token")}"
+        req['Authorization'] = "Bearer #{@access_token.fetch('access_token')}"
         req['User-Agent'] = 'GCM-iOS-5.22.1.4'
-        resp = retry_on_429 { send_http(uri, req) }
+        resp = retry_on_rate_limit { send_http(uri, req) }
         return false unless resp.code.to_i == 200
 
         zip_data = resp.body
@@ -652,13 +662,13 @@ module GitFit
         nil
       end
 
-      def write_standardized_json(l2, activity_id)
-        return unless l2
+      def write_standardized_json(l2_data, activity_id)
+        return unless l2_data
 
         dir = std_dir
         FileUtils.mkdir_p(dir)
         tmp = File.join(dir, ".#{activity_id}.json.tmp")
-        File.write(tmp, JSON.generate(l2))
+        File.write(tmp, JSON.generate(l2_data))
         File.rename(tmp, std_path(activity_id))
       end
     end

data/lib/git_fit/sync/garmin_base_di.rb

@@ -5,6 +5,10 @@ require_relative 'garmin_base'
 module GitFit
   module Sync
     class GarminBaseDI < GarminBase
+      def self.source_prefix
+        'garmin'
+      end
+
       DI_CLIENT_IDS = %w[
         GARMIN_CONNECT_MOBILE_ANDROID_DI_2025Q2
         GARMIN_CONNECT_MOBILE_ANDROID_DI_2024Q4
@@ -131,10 +135,10 @@ module GitFit
         req.body = URI.encode_www_form(
           grant_type: 'refresh_token',
           client_id: client_id,
-          refresh_token: @access_token['refresh_token']
+          refresh_token: @access_token['refresh_token'],
         )
 
-        resp = retry_on_429 { send_http(uri, req) }
+        resp = retry_on_rate_limit { send_http(uri, req) }
         unless resp.code.to_i == 200
           msg = "DI refresh error: #{resp.code}"
           if resp.code.to_i == 400

data/lib/git_fit/sync/garmin_cn.rb

@@ -8,6 +8,10 @@ module GitFit
       register_adapter
       register_config :email, :password, :secret, :token_path
 
+      def self.source_prefix
+        'garmin_cn'
+      end
+
       def initialize(config:, db:, activity_filter: nil, privacy: nil, time_budget: nil)
         super
         @domain = 'garmin.cn'
@@ -21,10 +25,6 @@ module GitFit
       def std_dir
         File.join('data', 'std', 'garmin_cn')
       end
-
-      def source_prefix
-        'garmin_cn'
-      end
     end
   end
 end

data/lib/git_fit/sync/{garmin.rb → garmin_com.rb}

@@ -4,15 +4,21 @@ require_relative 'garmin_base_di'
 
 module GitFit
   module Sync
-    class Garmin < GarminBaseDI
+    class GarminCom < GarminBaseDI
       register_adapter
-      register_config :email, :password, :secret, :auth_seed, :token_path
       config_key 'garmin'
+      register_config :email, :password, :secret, :auth_seed, :token_path
 
       def initialize(config:, db:, activity_filter: nil, privacy: nil, time_budget: nil)
         super
         @domain = 'garmin.com'
       end
+
+      protected
+
+      def source_label
+        'Garmin'
+      end
     end
   end
 end

data/lib/git_fit/sync/xingzhe.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'base'
+require_relative '../auth/paths'
 require 'fileutils'
 require 'openssl'
 require 'tzinfo'
@@ -32,7 +33,7 @@ module GitFit
         super
         @email = @config['email']
         @password = @config['password']
-        @session_path = @config['session_path'] || File.join('data', 'cache', 'xingzhe_session.json')
+        @session_path = @config['session_path'] || GitFit::Auth.file('xingzhe', 'session.json')
       end
 
       def before_call

data/lib/git_fit/sync/xoss.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'base'
+require_relative '../auth/paths'
 require 'fileutils'
 require 'tzinfo'
 
@@ -32,7 +33,7 @@ module GitFit
         super
         @email = @config['email']
         @password = @config['password']
-        @token_path = @config['token_path'] || File.join('data', 'auth', 'xoss_tokens.json')
+        @token_path = @config['token_path'] || GitFit::Auth.file('xoss', 'tokens.json')
       end
 
       def before_call

data/lib/git_fit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitFit
-  VERSION = '0.12.0'
+  VERSION = '0.13.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fit
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Lax
@@ -252,6 +252,7 @@ files:
 - lib/git_fit/auth/garmin/strategy_a.rb
 - lib/git_fit/auth/garmin/strategy_b.rb
 - lib/git_fit/auth/garmin_token.rb
+- lib/git_fit/auth/paths.rb
 - lib/git_fit/auth/strava.rb
 - lib/git_fit/cli.rb
 - lib/git_fit/cli/checkpointable.rb
@@ -312,10 +313,10 @@ files:
 - lib/git_fit/std/resolver.rb
 - lib/git_fit/strava_web/file_check.rb
 - lib/git_fit/sync/base.rb
-- lib/git_fit/sync/garmin.rb
 - lib/git_fit/sync/garmin_base.rb
 - lib/git_fit/sync/garmin_base_di.rb
 - lib/git_fit/sync/garmin_cn.rb
+- lib/git_fit/sync/garmin_com.rb
 - lib/git_fit/sync/igpsport.rb
 - lib/git_fit/sync/keep.rb
 - lib/git_fit/sync/lorem.rb