killbill-aviate 2.4.1.pre.1 → 2.4.1.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a03c9fbf0ae747d2accce4e819edb24433676609f46680b890223ce3cd89246f
-  data.tar.gz: 37970b56d1c29958a87006f0e7b62a9d665bcca49f585dca71780ca0173728e7
+  metadata.gz: 668e8f43e5ab2c7c9c617b13e6e741b355613950f64e850682174001f93ac03c
+  data.tar.gz: b8eaa6d33bd8029125ca1ecb6e78d6c29902730c15a75ecf74498814b2f78ef3
 SHA512:
-  metadata.gz: bdee42559069177e241a5617bfedb9ce15c9e2315d17c9e757a48b51da4649ed149e1cdcdd80a8b57600698097579a2f3bb3f63d4ffc3dbdc0852c986a97625f
-  data.tar.gz: 032f003efb1423053ed5185ff5bc614cf6b391351d8aae9040cf43809aad2e1fceaf913805da184bae7d873e4dedc488f51ddae281567f7d221c7c646bd5a9eb
+  metadata.gz: 57a7d1d3458d82f0891c67a3a243bc9a45b679a67e53c17703059d3a2e49454f5dd77a12fc4211f63a6492d94f2080eb5fd92e79e229b2facf68fabb83f6b29a
+  data.tar.gz: d4ecb9bad5c487cab51f82912a6daaabd424ad996d2a4d6fdd52ed2857371523c32ffa7dd9247a7676902056826a1d6ad71c016afa33362d0840b50100531e49

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
@@ -190,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/lib/aviate/client.rb

@@ -22,6 +22,9 @@ module Killbill
         # 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)
@@ -36,6 +39,7 @@ module Killbill
         # 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?
 
@@ -167,15 +171,32 @@ module Killbill
         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.1.pre.1'
+  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.1.pre.1
+  version: 2.4.1.pre.3
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-10 00:00:00.000000000 Z
+date: 2026-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill-assets-ui