truenorth 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d89d28373a48164f8f6cf1f93672dd70d4f8aaf8035ae40bdc144fe76a8d6be
-  data.tar.gz: 266756fa35b43d17ad657bb11ab46d0411c63da6620bf630594a08ac7f4d5226
+  metadata.gz: 1ae8cfc6540c62e513428be9bf6b460cba5f1207f405d5dd075d2f3754fe9976
+  data.tar.gz: 20382b0505099606ebf214359796a956947ee6cf3667b7ac8d5797debf7e995b
 SHA512:
-  metadata.gz: e1c0d586aa1b9146bedb498c81036d1446f23a9f6ee92cae1d14887007227196986e4ed245511cd39a58375729fa55831174f1536721f5d57a39ca8db03983bb
-  data.tar.gz: a764f05fe8325d6457f03467ba1c3a169b9422b8bbaa8d2030264a0f8bf5bcacda0e346fd913c0d415880f26d1f6dde03c6ef3fd58525c80e8e5ef2153b862c3
+  metadata.gz: 38de51f859b0c3c6f20a2c23d2bffabc91de6de3d4e8f065a9e9f25bacfa2b1ac6d53d5aed5e8755a67ba8b99ed46909a63f8ea891929958e0e0e020bdb37949
+  data.tar.gz: e8372584aaa758b89b29c620e0c31ff63d97740e1a8bfd3ccaec52e88a063b2934e05aad1c465995454d0ffa1171596d4fd74d3dc26160c85f1e5b2aa1a3249c

data/lib/truenorth/cli.rb

@@ -35,9 +35,17 @@ module Truenorth
     desc 'availability [DATE]', 'Check available slots'
     option :activity, aliases: '-a', default: 'squash', desc: 'Activity type (squash, golf, music, meeting)'
     option :json, type: :boolean, desc: 'Output as JSON'
+    option :debug, type: :boolean, desc: 'Show debug output'
+    option :http, type: :boolean, desc: 'Use HTTP mode (faster, but only 2 courts)'
     def availability(date = nil)
       date = parse_date(date)
-      client = Client.new
+
+      client = if options[:http]
+                 say 'Using HTTP mode (fast, 2 courts only)...', :yellow if !options[:json]
+                 Client.new(debug: options[:debug])
+               else
+                 BrowserClient.new(debug: options[:debug])
+               end
 
       say "Checking availability for #{date}...", :cyan
       result = client.availability(date, activity: options[:activity])
@@ -64,6 +72,8 @@ module Truenorth
     option :court, aliases: '-c', desc: 'Preferred court (e.g., "Court 1", "Squash Court 2")'
     option :activity, aliases: '-a', default: 'squash', desc: 'Activity type'
     option :dry_run, type: :boolean, aliases: '-n', desc: 'Test without actually booking'
+    option :http, type: :boolean, desc: 'Use HTTP mode (faster, but only 2 courts)'
+    option :debug, type: :boolean, desc: 'Show debug output'
     def book(time_or_description)
       # Parse natural language input
       parsed = parse_booking_request(time_or_description, options[:date], options[:activity])
@@ -71,7 +81,13 @@ module Truenorth
       date = parsed[:date]
       time = parsed[:time]
       activity = parsed[:activity]
-      client = Client.new
+
+      # Use browser mode unless --http flag is set (needed to see all 3 courts)
+      client = if options[:http]
+                 Client.new(debug: options[:debug])
+               else
+                 BrowserClient.new(debug: options[:debug])
+               end
 
       mode = options[:dry_run] ? ' (DRY RUN)' : ''
       say "Booking #{activity} at #{time} on #{date}#{mode}...", :cyan
@@ -109,8 +125,10 @@ module Truenorth
     desc 'reservations', 'List your current reservations'
     option :json, type: :boolean, desc: 'Output as JSON'
     option :all, type: :boolean, aliases: '-a', desc: 'Show all family members (default: only you)'
+    option :debug, type: :boolean, desc: 'Show debug output'
     def reservations
-      client = Client.new
+      # Use HTTP mode for reservations (works reliably)
+      client = Client.new(debug: options[:debug])
 
       say 'Fetching reservations...', :cyan
       results = client.reservations
@@ -153,6 +171,7 @@ module Truenorth
     option :all, type: :boolean, aliases: '-a', desc: 'Cancel from full list (use with --all view)'
     option :debug, type: :boolean, desc: 'Show debug output'
     def cancel(index)
+      # Use HTTP mode for cancellation (works reliably)
       client = Client.new(debug: options[:debug])
 
       say 'Fetching reservations...', :cyan

data/lib/truenorth/client.rb

@@ -15,7 +15,8 @@ module Truenorth
     BOOKING_PATH = '/group/pages/facility-booking'
     RESERVATIONS_PATH = '/group/pages/my-reservations'
 
-    USER_AGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) ' \
+    # Use a desktop user agent - server may detect mobile based on UA
+    USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) ' \
                  'AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36'
 
     # Activity type IDs
@@ -37,16 +38,27 @@ module Truenorth
       '32' => 'Court 3'
     }.freeze
 
+    # Court IDs by activity
+    COURT_IDS_BY_ACTIVITY = {
+      'squash' => %w[16 17 18],
+      'golf' => %w[30 31 32],
+      'music' => %w[16 17 18],  # May need to update these
+      'room' => %w[30 31 32],   # May need to update these
+      'meeting' => %w[30 31 32] # May need to update these
+    }.freeze
+
     attr_reader :cookies, :debug_log, :logged_in
 
     def initialize(base_url: nil, debug: false)
       @base_url = base_url || Config.base_url
       raise Error, 'No base URL configured. Run: truenorth configure' unless @base_url
 
-      @cookies = {}
+      @cookies = Config.cookies || {}
       @debug = debug
       @debug_log = StringIO.new
-      @logged_in = false
+      @logged_in = !@cookies.empty?  # If we have cookies, assume logged in
+
+      log "Loaded #{@cookies.length} cookies from cache" if @logged_in && @debug
     end
 
     # Login to the booking system
@@ -91,7 +103,8 @@ module Truenorth
 
       if response.body.include?('Sign Out') || response.body.include?('My Reservations')
         @logged_in = true
-        log 'Login successful'
+        Config.save_cookies(@cookies)
+        log 'Login successful (cookies saved)'
         true
       else
         html = Nokogiri::HTML(response.body)
@@ -128,8 +141,52 @@ module Truenorth
         html = change_activity(html, activity_id)
       end
 
-      slots = parse_slots(html)
-      log "Found #{slots.count} available time slots"
+      # Debug: Save HTML after activity change
+      if @debug
+        debug_file = "/tmp/truenorth_after_activity_#{Time.now.to_i}.html"
+        File.write(debug_file, html.to_s)
+        log "Saved HTML after activity change to: #{debug_file}"
+      end
+
+      # Court dropdown not available in HTML response - use hardcoded IDs
+      court_ids = COURT_IDS_BY_ACTIVITY[activity.to_s.downcase] || []
+
+      if court_ids.length >= 3
+        log "Querying #{court_ids.length} courts individually (IDs: #{court_ids.join(', ')})"
+        all_slots = {}
+
+        court_ids.each do |court_id|
+          court_name = COURTS[court_id] || "Court #{court_id}"
+          log "Querying #{court_name} (ID: #{court_id})"
+
+          # Set activityAreaId and refresh
+          form_id = extract_form_id(html)
+          view_state = extract_view_state(html)
+          form_fields = extract_all_form_fields(html, form_id)
+          form_fields["#{form_id}:activityAreaId"] = court_id
+
+          # Make AJAX request to update table for this court
+          result = change_date_ajax(form_id, view_state, requested_date, form_fields)
+          if result[:success]
+            court_html = Nokogiri::HTML(result[:body].scan(/<!\[CDATA\[(.*?)\]\]>/m).flatten.join("\n"))
+            court_slots = parse_slots(court_html)
+
+            # Merge slots
+            court_slots.each do |time, courts|
+              all_slots[time] ||= []
+              all_slots[time].concat(courts)
+              all_slots[time].uniq!
+            end
+          end
+        end
+
+        slots = all_slots
+        log "Combined #{slots.count} time slots from all courts"
+      else
+        # Fallback to original parsing
+        slots = parse_slots(html)
+        log "Found #{slots.count} available time slots"
+      end
 
       {
         success: true,
@@ -141,7 +198,8 @@ module Truenorth
 
 
     # Book a slot
-    def book(time, date: Date.today, court: nil, activity: 'squash', dry_run: false)
+    # If slot_info is provided, it should have: { area_id:, start_time:, end_time:, court: }
+    def book(time, date: Date.today, court: nil, activity: 'squash', dry_run: false, slot_info: nil)
       ensure_logged_in!
 
       log "\n=== BOOK SLOT ==="
@@ -172,11 +230,22 @@ module Truenorth
         form_fields = extract_all_form_fields(html, form_id)
       end
 
-      # Find the slot
-      slot = find_slot(html, time, court)
-      raise BookingError, "No slot available at #{time}" unless slot
-
-      log "Found slot: #{slot[:court]} at #{slot[:start_time]}"
+      # Find the slot (or use provided slot_info)
+      if slot_info
+        log "Using provided slot info: #{slot_info[:court]} at #{slot_info[:start_time]}"
+        # Convert slot_info keys from symbols if needed and ensure we have an id
+        slot = {
+          id: nil,  # We'll generate this or it's not needed for AJAX
+          area_id: slot_info[:area_id],
+          court: slot_info[:court],
+          start_time: slot_info[:start_time] || slot_info[:time],
+          end_time: slot_info[:end_time]
+        }
+      else
+        slot = find_slot(html, time, court)
+        raise BookingError, "No slot available at #{time}" unless slot
+        log "Found slot: #{slot[:court]} at #{slot[:start_time]}"
+      end
 
       # Select slot via AJAX
       select_result = select_slot_ajax(form_id, view_state, slot, components, form_fields)
@@ -417,6 +486,18 @@ module Truenorth
     def parse_slots(html)
       slots = {}
 
+      # Debug: Count total columns found
+      headers = html.css('thead th[role="columnheader"]')
+      log "Found #{headers.length} column headers: #{headers.map { |h| h['aria-label'] }.join(', ')}"
+
+      # Debug: Count slots by area-id
+      area_counts = Hash.new(0)
+      html.css('td.slot div[data-start-time]').each do |div|
+        area_id = div['data-area-id']
+        area_counts[area_id] += 1
+      end
+      log "Slots by area ID: #{area_counts.inspect}"
+
       # Find ALL slots with data-start-time
       html.css('td.slot div[data-start-time]').each do |div|
         td = div.parent
@@ -590,9 +671,66 @@ module Truenorth
       result = change_activity_ajax(form_id, view_state, activity_id, form_fields, components)
       return html unless result[:success]
 
+      # Parse the response and check for Court 3
+      parsed = Nokogiri::HTML(result[:body])
+      court3_elements = parsed.css('th[aria-label*="Court 3"], div[data-area-id="18"], div[data-area-id="32"]')
+      log "After change_activity: Found #{court3_elements.length} Court 3 elements in response"
+
+      parsed
+    end
+
+    def change_court_dropdown(html, court_id)
+      form_id = extract_form_id(html)
+      view_state = extract_view_state(html)
+      form_fields = extract_all_form_fields(html, form_id)
+
+      # Find the court dropdown field dynamically (in .activity-areas div)
+      court_dropdown = html.at_css('.activity-areas select, div[class*="area"] select[id*="j_idt"]')
+      return html unless court_dropdown
+
+      dropdown_id = court_dropdown['id']
+      dropdown_source = dropdown_id.gsub(/_input$/, '')
+
+      result = change_court_dropdown_ajax(form_id, view_state, court_id, dropdown_id, dropdown_source, form_fields)
+      return html unless result[:success]
+
+      # Parse CDATA content from response
+      cdata_content = result[:body].scan(/<!\[CDATA\[(.*?)\]\]>/m).flatten.join("\n")
+      if !cdata_content.empty?
+        cdata_html = Nokogiri::HTML(cdata_content)
+        slots = cdata_html.css('div[data-start-time]')
+        log "Court #{court_id}: Found #{slots.length} slots in CDATA response"
+        return cdata_html if slots.length > 0
+      end
+
       Nokogiri::HTML(result[:body])
     end
 
+    def change_court_area(html, area_id)
+      form_id = extract_form_id(html)
+      view_state = extract_view_state(html)
+      form_fields = extract_all_form_fields(html, form_id)
+
+      result = change_court_area_ajax(form_id, view_state, area_id, form_fields)
+      return html unless result[:success]
+
+      # Debug: Check response
+      parsed = Nokogiri::HTML(result[:body])
+      slot_divs = parsed.css('div[data-start-time]')
+      log "Court area #{area_id} response: #{slot_divs.length} slot divs found"
+
+      # Also check CDATA content
+      cdata_content = result[:body].scan(/<!\[CDATA\[(.*?)\]\]>/m).flatten.join("\n")
+      if !cdata_content.empty?
+        cdata_html = Nokogiri::HTML(cdata_content)
+        cdata_slots = cdata_html.css('div[data-start-time]')
+        log "Court area #{area_id} CDATA: #{cdata_slots.length} slot divs in CDATA"
+        return cdata_html if cdata_slots.length > 0
+      end
+
+      parsed
+    end
+
     def change_date(html, date_str, activity_id = nil)
       # Extract what we can from the HTML
       form_id = extract_form_id(html)
@@ -609,7 +747,17 @@ module Truenorth
       cdata_content = ajax_body.scan(/<!\[CDATA\[(.*?)\]\]>/m).flatten.join("\n")
 
       if !cdata_content.empty? && cdata_content.include?('slot')
-        Nokogiri::HTML(cdata_content)
+        parsed_html = Nokogiri::HTML(cdata_content)
+
+        # Debug: Check if Court 3 is in the response
+        court3_headers = parsed_html.css('th[aria-label*="Court 3"]')
+        log "Court 3 headers found in AJAX response: #{court3_headers.length}"
+
+        # Debug: Check for area ID 18 or 32 (Court 3 IDs)
+        court3_slots = parsed_html.css('div[data-area-id="18"], div[data-area-id="32"]')
+        log "Court 3 slots (area 18/32) found in AJAX response: #{court3_slots.length}"
+
+        parsed_html
       else
         html
       end
@@ -681,7 +829,22 @@ module Truenorth
 
         selected = select.at_css('option[selected]')
         fields[select['name']] = selected['value'] if selected
+
+        # Debug: Log select options
+        if select['name']&.include?('area') || select['name']&.include?('court') || select['name']&.include?('trainer')
+          options = select.css('option').map { |opt| "#{opt.text.strip}=#{opt['value']}" }
+          log "Found selector #{select['name']}: #{options.join(', ')}"
+        end
       end
+
+      # Force parameters to get all courts
+      fields["#{form_id}:mobileViewDisplay"] = '0'  # 0 = full view
+
+      # Debug: Log all field names and key values
+      log "Form fields: #{fields.keys.join(', ')}"
+      log "activityAreaId current value: #{fields["#{form_id}:activityAreaId"]}"
+      log "showAllAreasOrTrainers: #{fields["#{form_id}:showAllAreasOrTrainers"]}"
+
       fields
     end
 
@@ -710,6 +873,12 @@ module Truenorth
       form_data = form_fields.dup
       form_data["#{form_id}:j_idt51_input"] = activity_id
       form_data["#{form_id}:activityId"] = activity_id
+      form_data["#{form_id}:showAllAreasOrTrainers"] = 'true'  # Show all courts!
+
+      # Debug: Log what we're sending
+      log "Sending to #{form_id}:showAllAreasOrTrainers = #{form_data["#{form_id}:showAllAreasOrTrainers"]}"
+      log "Sending to #{form_id}:mobileViewDisplay = #{form_data["#{form_id}:mobileViewDisplay"]}"
+
       form_data.merge!(
         'javax.faces.partial.ajax' => 'true',
         'javax.faces.source' => activity_dropdown,
@@ -730,6 +899,56 @@ module Truenorth
       end
     end
 
+    def change_court_dropdown_ajax(form_id, view_state, court_id, dropdown_input_id, dropdown_source, form_fields)
+      ajax_url = build_ajax_url
+      encoded_url = URI.encode_www_form_component(ajax_url)
+
+      form_data = form_fields.dup
+      form_data[dropdown_input_id] = court_id
+      form_data.merge!(
+        'javax.faces.partial.ajax' => 'true',
+        'javax.faces.source' => dropdown_source,
+        'javax.faces.partial.execute' => dropdown_source,
+        'javax.faces.partial.render' => form_id,
+        'javax.faces.behavior.event' => 'change',
+        'javax.faces.partial.event' => 'change',
+        form_id => form_id,
+        'javax.faces.encodedURL' => encoded_url,
+        'javax.faces.ViewState' => view_state
+      )
+
+      response = post_ajax(ajax_url, form_data)
+      if response.is_a?(Net::HTTPSuccess)
+        { success: true, view_state: extract_view_state_from_ajax(response.body), body: response.body }
+      else
+        { success: false, error: "HTTP #{response.code}" }
+      end
+    end
+
+    def change_court_area_ajax(form_id, view_state, area_id, form_fields)
+      ajax_url = build_ajax_url
+      encoded_url = URI.encode_www_form_component(ajax_url)
+
+      form_data = form_fields.dup
+      form_data["#{form_id}:activityAreaId"] = area_id
+      form_data.merge!(
+        'javax.faces.partial.ajax' => 'true',
+        'javax.faces.source' => form_id,
+        'javax.faces.partial.execute' => form_id,
+        'javax.faces.partial.render' => form_id,
+        form_id => form_id,
+        'javax.faces.encodedURL' => encoded_url,
+        'javax.faces.ViewState' => view_state
+      )
+
+      response = post_ajax(ajax_url, form_data)
+      if response.is_a?(Net::HTTPSuccess)
+        { success: true, view_state: extract_view_state_from_ajax(response.body), body: response.body }
+      else
+        { success: false, error: "HTTP #{response.code}" }
+      end
+    end
+
     def change_date_ajax(form_id, view_state, date_str, form_data)
       return { success: false, error: 'No form_id' } unless form_id
 
@@ -742,6 +961,7 @@ module Truenorth
       form_data = form_data.dup
       form_data["#{form_id}:sheetDate"] = date_str
       form_data["#{form_id}:j_idt57_input"] = date_str
+      form_data["#{form_id}:showAllAreasOrTrainers"] = 'true'  # Show all courts!
 
       form_data.merge!(
         'javax.faces.partial.ajax' => 'true',
@@ -815,10 +1035,22 @@ module Truenorth
 
       response = post_ajax(ajax_url, form_data)
       if response.is_a?(Net::HTTPSuccess)
-        body = response.body.downcase
-        if body.include?('success') || body.include?('confirmed') || body.include?('booked')
+        body = response.body
+        body_lower = body.downcase
+
+        # Check for explicit error indicators
+        if body_lower.include?('error') || body_lower.include?('failed') ||
+           body_lower.include?('unable') || body_lower.include?('invalid')
+          log "Booking save returned error indicators in response"
+          { success: false, error: 'Booking save failed' }
+        # Check for success indicators OR assume success if reasonable response
+        elsif body_lower.include?('success') || body_lower.include?('confirmed') ||
+              body_lower.include?('booked') || body_lower.include?('reserved') ||
+              (body.length < 5000 && !body_lower.include?('exception'))
+          log "Booking save appears successful (HTTP 200)"
           { success: true, confirmation: 'Booking confirmed' }
         else
+          log "Uncertain booking result, response length: #{body.length}"
           { success: false, error: 'No confirmation in response' }
         end
       else

data/lib/truenorth/config.rb

@@ -8,6 +8,7 @@ module Truenorth
     CONFIG_DIR = File.expand_path('~/.config/truenorth')
     CONFIG_FILE = File.join(CONFIG_DIR, 'config.yml')
     CREDENTIALS_FILE = File.join(CONFIG_DIR, 'credentials.yml')
+    COOKIES_FILE = File.join(CONFIG_DIR, 'cookies.yml')
 
     class << self
       def load
@@ -62,8 +63,42 @@ module Truenorth
         CONFIG_DIR
       end
 
+      def cookies
+        load_cookies
+      end
+
+      def save_cookies(cookies_hash)
+        FileUtils.mkdir_p(CONFIG_DIR)
+        File.write(COOKIES_FILE, YAML.dump({
+          'cookies' => cookies_hash,
+          'timestamp' => Time.now.to_i
+        }))
+        FileUtils.chmod(0o600, COOKIES_FILE)
+      end
+
+      def clear_cookies
+        File.delete(COOKIES_FILE) if File.exist?(COOKIES_FILE)
+      end
+
       private
 
+      def load_cookies
+        return {} unless File.exist?(COOKIES_FILE)
+
+        data = YAML.safe_load(File.read(COOKIES_FILE)) || {}
+        timestamp = data['timestamp']
+
+        # Cookies expire after 24 hours
+        if timestamp && (Time.now.to_i - timestamp) < 86400
+          data['cookies'] || {}
+        else
+          clear_cookies
+          {}
+        end
+      rescue StandardError
+        {}
+      end
+
       def load_config
         return {} unless File.exist?(CONFIG_FILE)
 

data/lib/truenorth/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Truenorth
-  VERSION = '0.3.0'
+  VERSION = '0.5.0'
 end

data/lib/truenorth.rb

@@ -2,6 +2,7 @@
 
 require_relative 'truenorth/version'
 require_relative 'truenorth/client'
+require_relative 'truenorth/browser_client'
 require_relative 'truenorth/config'
 
 module Truenorth

data/truenorth.gemspec

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require_relative 'lib/truenorth/version'
+
 Gem::Specification.new do |spec|
   spec.name          = 'truenorth'
-  spec.version       = '0.3.0'
+  spec.version       = Truenorth::VERSION
   spec.authors       = ['usiegj00']
   spec.email         = ['112138+usiegj00@users.noreply.github.com']
 
@@ -28,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'base64', '~> 0.2'
+  spec.add_dependency 'ferrum', '~> 0.15'
   spec.add_dependency 'nokogiri', '~> 1.15'
   spec.add_dependency 'thor', '~> 1.3'
   spec.add_dependency 'tty-table', '~> 0.12'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: truenorth
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - usiegj00
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: ferrum
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement