killbill-aviate 2.4.0 → 2.4.1.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5adcf4012c2b8055a67f0724c1b537e51c20f41456375f35d5670d2b232abbf5
-  data.tar.gz: 190802f0514736ee87c8740ede305175254fe51d09bf1263e7f004e7f848b191
+  metadata.gz: 668e8f43e5ab2c7c9c617b13e6e741b355613950f64e850682174001f93ac03c
+  data.tar.gz: b8eaa6d33bd8029125ca1ecb6e78d6c29902730c15a75ecf74498814b2f78ef3
 SHA512:
-  metadata.gz: 79e74b08be7e317e4d4f96a7dbae76019b1420f906da3cff97b39bfc4cad3a87e10ec36b0d961336eec9bbb20eb6bd73b8684998cf7245da5578693c1b8702a1
-  data.tar.gz: e778000ade2913989a6e2b3e9038d129bbd6e5364d7fd9e97a4273b0536968246d26f939e1abc1b9261284e62d0a7af61878fd373dd5838478e64d27dbfb8655
+  metadata.gz: 57a7d1d3458d82f0891c67a3a243bc9a45b679a67e53c17703059d3a2e49454f5dd77a12fc4211f63a6492d94f2080eb5fd92e79e229b2facf68fabb83f6b29a
+  data.tar.gz: d4ecb9bad5c487cab51f82912a6daaabd424ad996d2a4d6fdd52ed2857371523c32ffa7dd9247a7676902056826a1d6ad71c016afa33362d0840b50100531e49

data/app/assets/config/aviate_manifest.js

@@ -1,3 +1,2 @@
-//= link_tree ../images
 //= link_directory ../javascripts .js
 //= link_directory ../stylesheets .css

data/app/assets/javascripts/aviate/kiddo/charts/line_chart.js

@@ -47,15 +47,24 @@
           return result.concat(element.values);
         }, []);
 
-        var x_domain = d3.extent(allValues, function (d) {
-          return d.x;
-        });
-        self.x.domain(x_domain);
-
-        var y_domain = d3.extent(allValues, function (d) {
-          return d.y;
-        });
-        self.y.domain(y_domain);
+        // X domain: union of billing period bounds and actual data so that data
+        // points recorded just before the period start (e.g. on the charge date)
+        // remain visible.
+        var period_start = json.period_start ? helper.parseDate(json.period_start) : null;
+        var period_end   = json.period_end   ? helper.parseDate(json.period_end)   : null;
+        var x_values = allValues.map(function (d) { return d.x; });
+        if (period_start) x_values.push(period_start);
+        if (period_end)   x_values.push(period_end);
+        self.x.domain(d3.extent(x_values));
+
+        // Y domain: always start at 0 and use nice() for clean tick values.
+        var y_max = d3.max(allValues, function (d) { return d.y; }) || 1;
+        self.y.domain([0, y_max]).nice();
+
+        // Cap y-axis tick count to the domain max so integer formatting never
+        // produces duplicate labels (e.g. [0,3] with 10 ticks → "0,0,1,1,2,2,3").
+        var y_domain_max = self.y.domain()[1];
+        axes.y.ticks(Math.min(y_domain_max, 10));
 
         // Render axes
         axes.render(svg);
@@ -112,6 +121,17 @@
           yOffset += 22;
         });
 
+        // Extend each series to the right edge of the x domain so the cumulative
+        // step line is always visible — d3.curveStepAfter needs at least two points
+        // to produce a visible line segment; a single point produces only a move.
+        var x_domain_end = self.x.domain()[1];
+        datasets.forEach(function (dataset) {
+          var vals = dataset.values;
+          if (vals.length > 0 && vals[vals.length - 1].x < x_domain_end) {
+            vals.push({ x: x_domain_end, y: vals[vals.length - 1].y });
+          }
+        });
+
         // Render data lines (stepped)
         datasets.forEach(function (dataset) {
           var data = dataset.values,

data/app/controllers/aviate/usage_controller.rb

@@ -49,7 +49,7 @@ module Aviate
       @wallet_balance = fetch_wallet_balance(@account_id, cached_options)
 
       # Build chart JSON for the view
-      @chart_json = build_chart_json(@chart_data)
+      @chart_json = build_chart_json(@chart_data, start_date, end_date)
     end
 
     private
@@ -89,6 +89,23 @@ module Aviate
     end
 
     def fetch_unit_types(subscription, start_date, cached_options)
+      if Killbill::Aviate::AviateClient.aviate_catalog?(subscription.account_id, cached_options)
+        fetch_billing_meter_codes(subscription, cached_options)
+      else
+        fetch_catalog_phase_unit_types(subscription, start_date, cached_options)
+      end
+    end
+
+    # Aviate catalogs record usage against a billing meter code, resolved via the Aviate plugin's
+    # own (JWT-authenticated) Catalog API, rather than a standard catalog unit type.
+    def fetch_billing_meter_codes(subscription, cached_options)
+      Killbill::Aviate::AviateClient.billing_meter_codes_for_plan(subscription.plan_name, subscription.account_id, cached_options)
+    rescue StandardError => e
+      Rails.logger.warn("Failed to fetch Aviate billing meter codes: #{e.message}")
+      []
+    end
+
+    def fetch_catalog_phase_unit_types(subscription, start_date, cached_options)
       # NOTE: KillBillClient::Model::Catalog.get_catalog_phase parses the response as a
       # Catalog object by default, but the API actually returns a Phase-shaped payload
       # (it has no `usages` accessor otherwise) - request it as a Phase explicitly.
@@ -173,14 +190,17 @@ module Aviate
       chart_data
     end
 
-    def build_chart_json(chart_data)
+    def build_chart_json(chart_data, period_start = nil, period_end = nil)
       return nil if chart_data.empty?
 
       series = chart_data.map do |unit_type, values|
         { 'name' => unit_type, 'values' => values }
       end
 
-      { 'type' => 'TIMELINE', 'data' => series }.to_json
+      json = { 'type' => 'TIMELINE', 'data' => series }
+      json['period_start'] = period_start.to_s if period_start
+      json['period_end'] = period_end.to_s if period_end
+      json.to_json
     end
 
     def fetch_accrued_cost(account_id, cached_options)

data/app/views/aviate/usage/show.html.erb

@@ -1,5 +1,10 @@
 <div class="kaui-container usage-show">
-  <%= render "kaui/components/breadcrumb/breadcrumb" %>
+  <%= render "kaui/components/breadcrumb/breadcrumb", breadcrumbs: [
+    { label: 'Accounts', href: '/accounts' },
+    { label: @account.name.presence || "Account #{@account_id}", href: "/accounts/#{@account_id}" },
+    { label: 'Usage', href: "/aviate/accounts/#{@account_id}/usage" },
+    { label: 'Usage Detail' }
+  ] %>
   <div class="d-flex" style="gap: 4rem;">
     <%= render :template => 'kaui/layouts/kaui_account_sidebar' %>
     <div class="usage-content" style="max-width: 67.5rem; width: 100%;">

data/lib/aviate/client.rb

@@ -5,6 +5,8 @@ module Killbill
     class AviateClient < KillBillClient::Model::Resource
       KILLBILL_AVIATE_PREFIX = '/plugins/aviate-plugin/v1'
 
+      CATALOG_STATE_AVIATE = 'CATALOG_STATE_AVIATE'
+
       class << self
         def aviate_plugin_available?(options = nil)
           path = "#{KILLBILL_AVIATE_PREFIX}/health/data"
@@ -17,6 +19,51 @@ module Killbill
           [false, e.message.to_s]
         end
 
+        # Returns true if the account/subscription is billed via an Aviate catalog (as opposed to a
+        # standard XML one). Any error (plugin not installed, missing/invalid JWT, network issue, etc.)
+        # is treated as "not Aviate" so callers can safely fall back to the standard catalog behavior.
+        #
+        # JWT authentication is handled by build_request_options, which sets the Authorization header
+        # from options[:jwt_token] when present (populated from the session cookie by EngineController).
+        def aviate_catalog?(account_id, options = nil)
+          path = "#{KILLBILL_AVIATE_PREFIX}/catalog/info"
+          request_options = build_request_options(options)
+
+          response = KillBillClient::API.get path, catalog_params(account_id), request_options
+          JSON.parse(response.body)['state'] == CATALOG_STATE_AVIATE
+        rescue StandardError
+          false
+        end
+
+        # Returns the list of billing meter codes configured on the given plan's usage phases.
+        # Aviate catalogs record usage against a billing meter code rather than a standard
+        # catalog unit type, so this must be used instead of the plain KillBillClient catalog/phase
+        # lookup whenever `aviate_catalog?` is true.
+        # JWT authentication is handled by build_request_options (see aviate_catalog? above).
+        def billing_meter_codes_for_plan(plan_name, account_id, options = nil)
+          return [] if plan_name.blank?
+
+          path = "#{KILLBILL_AVIATE_PREFIX}/catalog/#{plan_name}/plan"
+          request_options = build_request_options(options)
+
+          response = KillBillClient::API.get path, catalog_params(account_id), request_options
+          plan = JSON.parse(response.body)
+
+          codes = []
+          Array(plan['phases']).each do |phase|
+            Array(phase['usages']).each do |usage|
+              Array(usage['tiers']).each do |tier|
+                Array(tier['blocks']).each do |block|
+                  codes << block['billingMeterCode'] if block['billingMeterCode'].present?
+                end
+              end
+            end
+          end
+          codes.uniq
+        rescue StandardError
+          []
+        end
+
         def aviate_plugin_installed(options = nil)
           nodes_info = KillBillClient::Model::NodesInfo.nodes_info(options) || []
           plugins_info = nodes_info.empty? ? [] : (nodes_info.first.plugins_info || [])
@@ -117,18 +164,39 @@ module Killbill
 
         private
 
+        def catalog_params(account_id)
+          account_id.present? ? { accountId: account_id } : {}
+        end
+
         def parse_csv_response(body)
           return [] if body.nil? || body.strip.empty?
 
-          require 'csv'
-          rows = CSV.parse(body, headers: true)
-          rows.map do |row|
-            {
-              date: row['timestamp']&.strip,
-              value: row['value']&.strip&.to_f
-            }
+          # The host_samples endpoint returns a JSON array. Each element has a
+          # "samples" field with usage data serialized as flat comma-separated
+          # timestamp/value pairs: "ts1,val1,ts2,val2,..." (observed format).
+          # Newlines, if ever present, are normalized to commas before parsing.
+          parsed = JSON.parse(body)
+          return [] unless parsed.is_a?(Array)
+
+          result = []
+          parsed.each do |entry|
+            samples_str = entry['samples']
+            next if samples_str.nil? || samples_str.strip.empty?
+
+            tokens = samples_str.tr("\n", ',').split(',').map(&:strip).reject(&:empty?)
+            tokens.each_slice(2) do |ts_str, val_str|
+              next if ts_str.nil? || val_str.nil?
+
+              ts = ts_str.to_i
+              next if ts.zero?
+
+              date = Time.at(ts).utc.strftime('%Y-%m-%dT%H:%M:%S')
+              result << { date: date, value: val_str.to_f }
+            end
           end
-        rescue CSV::MalformedCSVError
+
+          result
+        rescue StandardError
           []
         end
 

data/lib/aviate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Aviate
-  VERSION = '2.4.0'
+  VERSION = '2.4.1.pre.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-aviate
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1.pre.3
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-05 00:00:00.000000000 Z
+date: 2026-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill-assets-ui
@@ -76,6 +76,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/aviate_manifest.js
+- app/assets/images/aviate/.keep
 - app/assets/javascripts/aviate/aviate.js
 - app/assets/javascripts/aviate/kiddo/axes.js
 - app/assets/javascripts/aviate/kiddo/charts/line_chart.js
@@ -124,9 +125,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.10
 signing_key: