git-fit 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e28cf553804e9da6cdf7ed898602802136f6c9689a826b9719e63e2143d3211a
-  data.tar.gz: c4de8625a28667946149d9685de1f880bbe4eb56ec00c18ca1f1c7e3c49d9ba2
+  metadata.gz: 69674e0fc800279e2099fe879318f4b8f3ce751325515192474dc40223438293
+  data.tar.gz: f91fd18620742288f923f302917667121d310a5707ac71cc185f77da5fc154a6
 SHA512:
-  metadata.gz: 32c53064259112990880d3bf91ab648bb06b6e27261e020b6fbf154c0f7e372737d5175c4e760216d1c62e0f15fe3f48a2d5546620d1ba7c6d31f17bf6c5e553
-  data.tar.gz: 4eff014203d8c5dcf8f68fb6f7c93e239a4ff3dfb7aea444ddd058023532122eb65f9aeaa75d509435b43d3b8a599884d71650e682cded206365ef92cd7675ac
+  metadata.gz: f204350fdd449be0942ba5d42917a54460198f61ffdfde00b6c51fa39cdb379c0e056851c05e0bae6577b2d3dca9a0428bc967247245528c65c94b1b9f32d591
+  data.tar.gz: 9d4bf7e3c1c72ebfc4a35c05e2b5c150b87c17cfd67ca634ede7e4026b72978c89360434baac73b9e36addd1f88b8c61b8820c0089712086f9cc9dee8777e989

data/lib/git_fit/source/keep.rb

@@ -0,0 +1,117 @@
+# frozen_string_literal: true
+
+require 'base64'
+require 'zlib'
+require 'openssl'
+require 'json'
+require 'time'
+require_relative '../geo/coord_transform'
+
+module GitFit
+  module Source
+    module Keep
+      PLACEHOLDER_POLYLINE = 'gqqrFurkeU??'
+
+      AES_KEY = Base64.decode64('NTZmZTU5OzgyZzpkODczYw==').freeze
+      AES_IV = Base64.decode64('MjM0Njg5MjQzMjkyMDMwMA==').freeze
+
+      TIMESTAMP_THRESHOLD = 3_600_000
+      HR_THRESHOLD = 100
+
+      module_function
+
+      def decode_geo_points(geo_data)
+        return nil unless geo_data
+        raw = Base64.decode64(geo_data)
+        decrypted = aes_decrypt(raw)
+        decompressed = zlib_inflate(decrypted)
+        JSON.parse(decompressed)
+      rescue StandardError
+        nil
+      end
+
+      def decode_hr_data(hr_data)
+        return nil unless hr_data
+        raw = Base64.decode64(hr_data)
+        decompressed = zlib_inflate(raw)
+        JSON.parse(decompressed)
+      rescue StandardError
+        nil
+      end
+
+      def aes_decrypt(data)
+        cipher = OpenSSL::Cipher.new('AES-128-CBC')
+        cipher.decrypt
+        cipher.key = AES_KEY
+        cipher.iv = AES_IV
+        cipher.update(data) + cipher.final
+      end
+
+      def zlib_inflate(data)
+        [-Zlib::MAX_WBITS, Zlib::MAX_WBITS, Zlib::MAX_WBITS + 16].each do |wbits|
+          inflater = Zlib::Inflate.new(wbits)
+          result = inflater.inflate(data)
+          begin
+            inflater.finish
+          rescue StandardError
+            nil
+          end
+          inflater.close
+          return result
+        rescue Zlib::DataError
+          next
+        end
+        raise Zlib::DataError, 'cannot inflate data'
+      end
+
+      def compute_wgs_points(payload, run_data)
+        geo_points = payload[:geo_points]
+        hr_data = payload[:hr_data]
+        return [] unless geo_points&.any?
+
+        start_time = run_data['startTime']
+        use_absolute_ts = geo_points.first['timestamp'].to_i > TIMESTAMP_THRESHOLD
+        effective_start = use_absolute_ts ? 0 : start_time
+
+        geo_points.map do |p|
+          lat, lng = Geo::CoordTransform.gcj02_to_wgs84_exact(p['latitude'], p['longitude'])
+          ts = p['timestamp'] || p['unixTimestamp']
+          pt_time = ts ? Time.at(effective_start / 1000.0 + ts.to_i / 10.0).utc : nil
+          hr = find_nearest_hr(hr_data, ts, start_time)
+          [lat, lng, p['altitude'], pt_time, hr]
+        end
+      end
+
+      def find_nearest_hr(hr_data, geo_ts, start_time, threshold: HR_THRESHOLD)
+        return nil unless hr_data&.any? && geo_ts
+
+        normalize = lambda { |ts|
+          if ts > TIMESTAMP_THRESHOLD
+            ts - start_time / 100
+          else
+            ts
+          end
+        }
+
+        target = normalize.call(geo_ts)
+
+        nearest = nil
+        min_diff = Float::INFINITY
+
+        hr_data.each do |item|
+          ts = item['timestamp']
+          next unless ts
+
+          diff = (normalize.call(ts) - target).abs
+          if diff <= threshold && diff < min_diff
+            nearest = item
+            min_diff = diff
+          end
+        end
+
+        hr = nearest&.dig('beatsPerMinute')
+        hr&.positive? ? hr : nil
+      end
+    end
+  end
+end

data/lib/git_fit/source.rb

@@ -7,5 +7,6 @@ end
 
 require_relative 'util/tally'
 require_relative 'source/base'
+require_relative 'source/keep'
 
 GitFit::Source::Tally = GitFit::Util::Tally

data/lib/git_fit/sync/keep.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 require_relative 'base'
-require 'base64'
-require 'zlib'
-require 'openssl'
 require 'time'
 require 'tzinfo'
 
@@ -14,11 +11,6 @@ module GitFit
       STATS_URL = 'https://api.gotokeep.com/pd/v3/stats/detail?dateUnit=all&type=%{sport}&lastDate=%{last_date}'
       LOG_URL = 'https://api.gotokeep.com/pd/v3/%{sport}log/%{run_id}'
 
-      AES_KEY = Base64.decode64('NTZmZTU5OzgyZzpkODczYw==')
-      AES_IV = Base64.decode64('MjM0Njg5MjQzMjkyMDMwMA==')
-
-      PLACEHOLDER_POLYLINE = 'gqqrFurkeU??'
-
       KEEP_TYPES = %w[running hiking cycling].freeze
       KEEP_RAW_EXT = 'json'
 
@@ -38,9 +30,6 @@ module GitFit
         'mountaineering' => 'Hiking',
       }.freeze
 
-      TIMESTAMP_THRESHOLD = 3_600_000
-      HR_THRESHOLD = 100
-
       register_adapter
       register_config :phone, :password
 
@@ -231,7 +220,7 @@ module GitFit
           heartRates: payload[:hr_data],
         }, keep_id)
 
-        wgs_points = compute_wgs_points(payload, run_data)
+        wgs_points = Source::Keep.compute_wgs_points(payload, run_data)
         write_standardized_json(wgs_points, payload, run_data, keep_id)
 
         attrs = build_activity_from_wgs(run_data, wgs_points)
@@ -273,35 +262,17 @@ module GitFit
         else
           payload = { geo_points: raw['geoPoints'], hr_data: raw['heartRates'] }
           run_data = raw['meta']
-          compute_wgs_points(payload, run_data)
+          Source::Keep.compute_wgs_points(payload, run_data)
         end
       end
 
       def decrypt_raw_payload(run_data)
         {
-          geo_points: decode_geo_points(run_data['geoPoints']),
-          hr_data: decode_hr_data(run_data.dig('heartRate', 'heartRates')),
+          geo_points: Source::Keep.decode_geo_points(run_data['geoPoints']),
+          hr_data: Source::Keep.decode_hr_data(run_data.dig('heartRate', 'heartRates')),
         }
       end
 
-      def compute_wgs_points(payload, run_data)
-        geo_points = payload[:geo_points]
-        hr_data = payload[:hr_data]
-        return [] unless geo_points&.any?
-
-        start_time = run_data['startTime']
-        use_absolute_ts = geo_points.first['timestamp'].to_i > TIMESTAMP_THRESHOLD
-        effective_start = use_absolute_ts ? 0 : start_time
-
-        geo_points.map do |p|
-          lat, lng = Geo::CoordTransform.gcj02_to_wgs84_exact(p['latitude'], p['longitude'])
-          ts = p['timestamp'] || p['unixTimestamp']
-          pt_time = ts ? Time.at(effective_start / 1000.0 + ts.to_i / 10.0).utc : nil
-          hr = find_nearest_hr(hr_data, ts, start_time)
-          [lat, lng, p['altitude'], pt_time, hr]
-        end
-      end
-
       def tz_resolver
         @tz_resolver ||= GitFit::Timezone::Resolver.new({})
       end
@@ -414,79 +385,6 @@ module GitFit
         id_str.split('_')[1]
       end
 
-      def decode_geo_points(geo_data)
-        return nil unless geo_data
-        raw = Base64.decode64(geo_data)
-        decrypted = aes_decrypt(raw)
-        decompressed = zlib_inflate(decrypted)
-        JSON.parse(decompressed)
-      rescue StandardError
-        nil
-      end
-
-      def decode_hr_data(hr_data)
-        return nil unless hr_data
-        raw = Base64.decode64(hr_data)
-        decompressed = zlib_inflate(raw)
-        JSON.parse(decompressed)
-      rescue StandardError
-        nil
-      end
-
-      def aes_decrypt(data)
-        cipher = OpenSSL::Cipher.new('AES-128-CBC')
-        cipher.decrypt
-        cipher.key = AES_KEY
-        cipher.iv = AES_IV
-        cipher.update(data) + cipher.final
-      end
-
-      def zlib_inflate(data)
-        [-Zlib::MAX_WBITS, Zlib::MAX_WBITS, Zlib::MAX_WBITS + 16].each do |wbits|
-          begin
-            inflater = Zlib::Inflate.new(wbits)
-            result = inflater.inflate(data)
-            inflater.finish rescue nil
-            inflater.close
-            return result
-          rescue Zlib::DataError
-            next
-          end
-        end
-        raise Zlib::DataError, 'cannot inflate data'
-      end
-
-      def find_nearest_hr(hr_data, geo_ts, start_time, threshold: HR_THRESHOLD)
-        return nil unless hr_data&.any? && geo_ts
-
-        normalize = ->(ts) {
-          if ts > TIMESTAMP_THRESHOLD
-            ts - start_time / 100
-          else
-            ts
-          end
-        }
-
-        target = normalize.call(geo_ts)
-
-        nearest = nil
-        min_diff = Float::INFINITY
-
-        hr_data.each do |item|
-          ts = item['timestamp']
-          next unless ts
-
-          diff = (normalize.call(ts) - target).abs
-          if diff <= threshold && diff < min_diff
-            nearest = item
-            min_diff = diff
-          end
-        end
-
-        hr = nearest&.dig('beatsPerMinute')
-        hr&.positive? ? hr : nil
-      end
-
       def compute_avg_hr(points)
         hrs = points.map { |p| p[4] }.compact
         return nil if hrs.empty?

data/lib/git_fit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fit
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Lax
@@ -262,6 +262,7 @@ files:
 - lib/git_fit/privacy/polyline_filter.rb
 - lib/git_fit/source.rb
 - lib/git_fit/source/base.rb
+- lib/git_fit/source/keep.rb
 - lib/git_fit/source/tally.rb
 - lib/git_fit/sport_mapper.rb
 - lib/git_fit/strava_web/file_check.rb