From 12a0750f239c2354cc026949149ff08aba3cd635 Mon Sep 17 00:00:00 2001
From: hexbabe <sean.xiaochen.yu@gmail.com>
Date: Tue, 8 Oct 2024 10:41:23 -0400
Subject: [PATCH 1/3] Init draft

---
 lib/src/robot/client.dart | 42 ++++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/lib/src/robot/client.dart b/lib/src/robot/client.dart
index 55ced9a9fc..332809a0df 100644
--- a/lib/src/robot/client.dart
+++ b/lib/src/robot/client.dart
@@ -5,7 +5,7 @@ import 'package:grpc/grpc_connection_interface.dart';
 import 'package:logger/logger.dart';
 
 import '../gen/common/v1/common.pb.dart';
-import '../gen/robot/v1/robot.pbgrpc.dart';
+import '../gen/robot/v1/robot.pbgrpc.dart' as rpb;
 import '../media/stream/client.dart';
 import '../resource/base.dart';
 import '../resource/manager.dart';
@@ -15,7 +15,7 @@ import '../rpc/web_rtc/web_rtc_client.dart';
 import 'sessions_client.dart';
 
 /// {@category Viam SDK}
-typedef CloudMetadata = GetCloudMetadataResponse;
+typedef CloudMetadata = rpb.GetCloudMetadataResponse;
 Logger _logger = Logger();
 
 /// {@category Viam SDK}
@@ -52,6 +52,15 @@ class RobotClientOptions {
       : dialOptions = DialOptions()..credentials = Credentials.locationSecret(locationSecret);
 }
 
+/// {@category Viam SDK}
+/// Represents a discovery query in the SDK to query for components.
+class DiscoveryQuery {
+  final String subtype;
+  final String model;
+
+  DiscoveryQuery({required this.subtype, required this.model});
+}
+
 /// {@category Viam SDK}
 /// gRPC client for a Robot. This class should be used for all interactions with a robot.
 ///
@@ -62,7 +71,7 @@ class RobotClient {
   late String _address;
   late RobotClientOptions _options;
   late ClientChannelBase _channel;
-  late RobotServiceClient _client;
+  late rpb.RobotServiceClient _client;
   late SessionsClient _sessionsClient;
   List<ResourceName> resourceNames = [];
   ResourceManager _manager = ResourceManager();
@@ -97,7 +106,7 @@ class RobotClient {
     client._options = options;
     client._channel = await dial(url, options.dialOptions, () => client._sessionsClient.metadata());
     client._sessionsClient = SessionsClient(client._channel, options.enableSessions);
-    client._client = RobotServiceClient(client._channel);
+    client._client = rpb.RobotServiceClient(client._channel);
     client._streamManager = StreamManager(client._channel as WebRtcClientChannel);
     await client.refresh();
     client._startCheckConnectionTask();
@@ -110,7 +119,7 @@ class RobotClient {
   /// await machine.refresh();
   /// ```
   Future<void> refresh() async {
-    final ResourceNamesResponse response = await _client.resourceNames(ResourceNamesRequest());
+    final rpb.ResourceNamesResponse response = await _client.resourceNames(rpb.ResourceNamesRequest());
     if (setEquals(response.resources.toSet(), resourceNames.toSet())) {
       resourceNames.forEach((element) {
         _resetResourceChannel(element);
@@ -166,7 +175,7 @@ class RobotClient {
     // Failure to grab resources could be for spurious, non-networking reasons. Try three times just to be safe.
     for (int i = 0; i < 3; i++) {
       try {
-        await _client.resourceNames(ResourceNamesRequest(), options: CallOptions(timeout: const Duration(seconds: 1)));
+        await _client.resourceNames(rpb.ResourceNamesRequest(), options: CallOptions(timeout: const Duration(seconds: 1)));
         _connected = true;
         break;
       } catch (e) {
@@ -195,8 +204,8 @@ class RobotClient {
       _sessionsClient.stop();
       try {
         final channel = await dial(_address, _options.dialOptions, () => _sessionsClient.metadata());
-        final client = RobotServiceClient(channel);
-        await client.resourceNames(ResourceNamesRequest());
+        final client = rpb.RobotServiceClient(channel);
+        await client.resourceNames(rpb.ResourceNamesRequest());
 
         _channel = channel;
         _streamManager.channel = _channel as WebRtcClientChannel;
@@ -263,6 +272,21 @@ class RobotClient {
   /// var metadata = await machine.getCloudMetadata();
   /// ```
   Future<CloudMetadata> getCloudMetadata() async {
-    return await _client.getCloudMetadata(GetCloudMetadataRequest());
+    return await _client.getCloudMetadata(rpb.GetCloudMetadataRequest());
+  }
+
+  /// Discover components connected to the robot using a more abstract SDK query.
+  ///
+  /// ```
+  /// var queries = [DiscoveryQuerySDK(subtype: 'camera', model: 'webcam')];
+  /// var discoveredComponents = await machine.discoverComponents(queries);
+  /// ```
+  Future<rpb.DiscoverComponentsResponse> discoverComponents([List<DiscoveryQuery> queries = const []]) async {
+    final request = rpb.DiscoverComponentsRequest()
+      ..queries.addAll(queries.map((sdkQuery) => rpb.DiscoveryQuery()
+        ..subtype = sdkQuery.subtype
+        ..model = sdkQuery.model));
+
+    return await _client.discoverComponents(request);
   }
 }

From 199c0cd75cb603ed5f43a3298e7627c8405186c5 Mon Sep 17 00:00:00 2001
From: hexbabe <sean.xiaochen.yu@gmail.com>
Date: Fri, 11 Oct 2024 14:05:11 -0400
Subject: [PATCH 2/3] Bump protos; Consume extra field

---
 lib/src/gen/app/build/v1/build.pb.dart        |  15 +
 lib/src/gen/app/build/v1/build.pbjson.dart    |   5 +-
 lib/src/gen/app/v1/billing.pb.dart            | 547 ++++++++++--------
 lib/src/gen/app/v1/billing.pbenum.dart        |  46 ++
 lib/src/gen/app/v1/billing.pbjson.dart        | 265 ++++++---
 .../examples/fileupload/v1/fileupload.pb.dart | 162 ------
 .../fileupload/v1/fileupload.pbenum.dart      |  11 -
 .../fileupload/v1/fileupload.pbgrpc.dart      |  55 --
 .../fileupload/v1/fileupload.pbjson.dart      |  46 --
 lib/src/gen/proto/rpc/v1/auth.pbgrpc.dart     |  38 +-
 lib/src/gen/proto/rpc/webrtc/v1/grpc.pb.dart  |  24 +-
 .../gen/proto/rpc/webrtc/v1/signaling.pb.dart |  98 +++-
 .../proto/rpc/webrtc/v1/signaling.pbgrpc.dart |  72 +--
 .../proto/rpc/webrtc/v1/signaling.pbjson.dart |  14 +-
 lib/src/gen/robot/v1/robot.pb.dart            |  16 +
 lib/src/gen/robot/v1/robot.pbjson.dart        |   3 +-
 lib/src/robot/client.dart                     |  12 +-
 lib/src/utils.dart                            |   2 +-
 18 files changed, 743 insertions(+), 688 deletions(-)
 delete mode 100644 lib/src/gen/proto/rpc/examples/fileupload/v1/fileupload.pb.dart
 delete mode 100644 lib/src/gen/proto/rpc/examples/fileupload/v1/fileupload.pbenum.dart
 delete mode 100644 lib/src/gen/proto/rpc/examples/fileupload/v1/fileupload.pbgrpc.dart
 delete mode 100644 lib/src/gen/proto/rpc/examples/fileupload/v1/fileupload.pbjson.dart

diff --git a/lib/src/gen/app/build/v1/build.pb.dart b/lib/src/gen/app/build/v1/build.pb.dart
index 20e3afeecd..fedc68bb13 100644
--- a/lib/src/gen/app/build/v1/build.pb.dart
+++ b/lib/src/gen/app/build/v1/build.pb.dart
@@ -26,6 +26,7 @@ class StartBuildRequest extends $pb.GeneratedMessage {
     $core.String? moduleId,
     $core.String? moduleVersion,
     $core.String? token,
+    $core.String? workdir,
   }) {
     final $result = create();
     if (repo != null) {
@@ -46,6 +47,9 @@ class StartBuildRequest extends $pb.GeneratedMessage {
     if (token != null) {
       $result.token = token;
     }
+    if (workdir != null) {
+      $result.workdir = workdir;
+    }
     return $result;
   }
   StartBuildRequest._() : super();
@@ -59,6 +63,7 @@ class StartBuildRequest extends $pb.GeneratedMessage {
     ..aOS(4, _omitFieldNames ? '' : 'moduleId')
     ..aOS(5, _omitFieldNames ? '' : 'moduleVersion')
     ..aOS(6, _omitFieldNames ? '' : 'token')
+    ..aOS(7, _omitFieldNames ? '' : 'workdir')
     ..hasRequiredFields = false
   ;
 
@@ -137,6 +142,16 @@ class StartBuildRequest extends $pb.GeneratedMessage {
   $core.bool hasToken() => $_has(5);
   @$pb.TagNumber(6)
   void clearToken() => clearField(6);
+
+  /// optional working directory. defaults to repo root.
+  @$pb.TagNumber(7)
+  $core.String get workdir => $_getSZ(6);
+  @$pb.TagNumber(7)
+  set workdir($core.String v) { $_setString(6, v); }
+  @$pb.TagNumber(7)
+  $core.bool hasWorkdir() => $_has(6);
+  @$pb.TagNumber(7)
+  void clearWorkdir() => clearField(7);
 }
 
 class StartBuildResponse extends $pb.GeneratedMessage {
diff --git a/lib/src/gen/app/build/v1/build.pbjson.dart b/lib/src/gen/app/build/v1/build.pbjson.dart
index dd780d6c85..a35232c56f 100644
--- a/lib/src/gen/app/build/v1/build.pbjson.dart
+++ b/lib/src/gen/app/build/v1/build.pbjson.dart
@@ -39,10 +39,12 @@ const StartBuildRequest$json = {
     {'1': 'module_id', '3': 4, '4': 1, '5': 9, '10': 'moduleId'},
     {'1': 'module_version', '3': 5, '4': 1, '5': 9, '10': 'moduleVersion'},
     {'1': 'token', '3': 6, '4': 1, '5': 9, '9': 1, '10': 'token', '17': true},
+    {'1': 'workdir', '3': 7, '4': 1, '5': 9, '9': 2, '10': 'workdir', '17': true},
   ],
   '8': [
     {'1': '_ref'},
     {'1': '_token'},
+    {'1': '_workdir'},
   ],
 };
 
@@ -51,7 +53,8 @@ final $typed_data.Uint8List startBuildRequestDescriptor = $convert.base64Decode(
     'ChFTdGFydEJ1aWxkUmVxdWVzdBISCgRyZXBvGAEgASgJUgRyZXBvEhUKA3JlZhgCIAEoCUgAUg'
     'NyZWaIAQESHAoJcGxhdGZvcm1zGAMgAygJUglwbGF0Zm9ybXMSGwoJbW9kdWxlX2lkGAQgASgJ'
     'Ughtb2R1bGVJZBIlCg5tb2R1bGVfdmVyc2lvbhgFIAEoCVINbW9kdWxlVmVyc2lvbhIZCgV0b2'
-    'tlbhgGIAEoCUgBUgV0b2tlbogBAUIGCgRfcmVmQggKBl90b2tlbg==');
+    'tlbhgGIAEoCUgBUgV0b2tlbogBARIdCgd3b3JrZGlyGAcgASgJSAJSB3dvcmtkaXKIAQFCBgoE'
+    'X3JlZkIICgZfdG9rZW5CCgoIX3dvcmtkaXI=');
 
 @$core.Deprecated('Use startBuildResponseDescriptor instead')
 const StartBuildResponse$json = {
diff --git a/lib/src/gen/app/v1/billing.pb.dart b/lib/src/gen/app/v1/billing.pb.dart
index 72d4e048f1..bc9431bf9b 100644
--- a/lib/src/gen/app/v1/billing.pb.dart
+++ b/lib/src/gen/app/v1/billing.pb.dart
@@ -144,52 +144,27 @@ class InvoiceSummary extends $pb.GeneratedMessage {
   $44.Timestamp ensurePaidDate() => $_ensure(5);
 }
 
-class BillableResourceEvent extends $pb.GeneratedMessage {
-  factory BillableResourceEvent({
-    $core.String? id,
-    $core.String? type,
-    $core.double? usageQuantity,
-    $core.String? usageQuantityUnit,
-    $core.String? usageCost,
-    $44.Timestamp? occurredAt,
-    $core.String? userName,
+class PaymentMethodCard extends $pb.GeneratedMessage {
+  factory PaymentMethodCard({
+    $core.String? brand,
+    $core.String? lastFourDigits,
   }) {
     final $result = create();
-    if (id != null) {
-      $result.id = id;
-    }
-    if (type != null) {
-      $result.type = type;
-    }
-    if (usageQuantity != null) {
-      $result.usageQuantity = usageQuantity;
-    }
-    if (usageQuantityUnit != null) {
-      $result.usageQuantityUnit = usageQuantityUnit;
-    }
-    if (usageCost != null) {
-      $result.usageCost = usageCost;
-    }
-    if (occurredAt != null) {
-      $result.occurredAt = occurredAt;
+    if (brand != null) {
+      $result.brand = brand;
     }
-    if (userName != null) {
-      $result.userName = userName;
+    if (lastFourDigits != null) {
+      $result.lastFourDigits = lastFourDigits;
     }
     return $result;
   }
-  BillableResourceEvent._() : super();
-  factory BillableResourceEvent.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory BillableResourceEvent.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  PaymentMethodCard._() : super();
+  factory PaymentMethodCard.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory PaymentMethodCard.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'BillableResourceEvent', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'id')
-    ..aOS(2, _omitFieldNames ? '' : 'type')
-    ..a<$core.double>(3, _omitFieldNames ? '' : 'usageQuantity', $pb.PbFieldType.OD)
-    ..aOS(4, _omitFieldNames ? '' : 'usageQuantityUnit')
-    ..aOS(5, _omitFieldNames ? '' : 'usageCost')
-    ..aOM<$44.Timestamp>(6, _omitFieldNames ? '' : 'occurredAt', subBuilder: $44.Timestamp.create)
-    ..aOS(7, _omitFieldNames ? '' : 'userName')
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PaymentMethodCard', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'brand')
+    ..aOS(2, _omitFieldNames ? '' : 'lastFourDigits')
     ..hasRequiredFields = false
   ;
 
@@ -197,135 +172,113 @@ class BillableResourceEvent extends $pb.GeneratedMessage {
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  BillableResourceEvent clone() => BillableResourceEvent()..mergeFromMessage(this);
+  PaymentMethodCard clone() => PaymentMethodCard()..mergeFromMessage(this);
   @$core.Deprecated(
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  BillableResourceEvent copyWith(void Function(BillableResourceEvent) updates) => super.copyWith((message) => updates(message as BillableResourceEvent)) as BillableResourceEvent;
+  PaymentMethodCard copyWith(void Function(PaymentMethodCard) updates) => super.copyWith((message) => updates(message as PaymentMethodCard)) as PaymentMethodCard;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static BillableResourceEvent create() => BillableResourceEvent._();
-  BillableResourceEvent createEmptyInstance() => create();
-  static $pb.PbList<BillableResourceEvent> createRepeated() => $pb.PbList<BillableResourceEvent>();
+  static PaymentMethodCard create() => PaymentMethodCard._();
+  PaymentMethodCard createEmptyInstance() => create();
+  static $pb.PbList<PaymentMethodCard> createRepeated() => $pb.PbList<PaymentMethodCard>();
   @$core.pragma('dart2js:noInline')
-  static BillableResourceEvent getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<BillableResourceEvent>(create);
-  static BillableResourceEvent? _defaultInstance;
+  static PaymentMethodCard getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PaymentMethodCard>(create);
+  static PaymentMethodCard? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.String get id => $_getSZ(0);
+  $core.String get brand => $_getSZ(0);
   @$pb.TagNumber(1)
-  set id($core.String v) { $_setString(0, v); }
+  set brand($core.String v) { $_setString(0, v); }
   @$pb.TagNumber(1)
-  $core.bool hasId() => $_has(0);
+  $core.bool hasBrand() => $_has(0);
   @$pb.TagNumber(1)
-  void clearId() => clearField(1);
+  void clearBrand() => clearField(1);
 
   @$pb.TagNumber(2)
-  $core.String get type => $_getSZ(1);
+  $core.String get lastFourDigits => $_getSZ(1);
   @$pb.TagNumber(2)
-  set type($core.String v) { $_setString(1, v); }
+  set lastFourDigits($core.String v) { $_setString(1, v); }
   @$pb.TagNumber(2)
-  $core.bool hasType() => $_has(1);
+  $core.bool hasLastFourDigits() => $_has(1);
   @$pb.TagNumber(2)
-  void clearType() => clearField(2);
+  void clearLastFourDigits() => clearField(2);
+}
 
-  @$pb.TagNumber(3)
-  $core.double get usageQuantity => $_getN(2);
-  @$pb.TagNumber(3)
-  set usageQuantity($core.double v) { $_setDouble(2, v); }
-  @$pb.TagNumber(3)
-  $core.bool hasUsageQuantity() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearUsageQuantity() => clearField(3);
+class GetCurrentMonthUsageRequest extends $pb.GeneratedMessage {
+  factory GetCurrentMonthUsageRequest({
+    $core.String? orgId,
+  }) {
+    final $result = create();
+    if (orgId != null) {
+      $result.orgId = orgId;
+    }
+    return $result;
+  }
+  GetCurrentMonthUsageRequest._() : super();
+  factory GetCurrentMonthUsageRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory GetCurrentMonthUsageRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  @$pb.TagNumber(4)
-  $core.String get usageQuantityUnit => $_getSZ(3);
-  @$pb.TagNumber(4)
-  set usageQuantityUnit($core.String v) { $_setString(3, v); }
-  @$pb.TagNumber(4)
-  $core.bool hasUsageQuantityUnit() => $_has(3);
-  @$pb.TagNumber(4)
-  void clearUsageQuantityUnit() => clearField(4);
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetCurrentMonthUsageRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'orgId')
+    ..hasRequiredFields = false
+  ;
 
-  @$pb.TagNumber(5)
-  $core.String get usageCost => $_getSZ(4);
-  @$pb.TagNumber(5)
-  set usageCost($core.String v) { $_setString(4, v); }
-  @$pb.TagNumber(5)
-  $core.bool hasUsageCost() => $_has(4);
-  @$pb.TagNumber(5)
-  void clearUsageCost() => clearField(5);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  GetCurrentMonthUsageRequest clone() => GetCurrentMonthUsageRequest()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  GetCurrentMonthUsageRequest copyWith(void Function(GetCurrentMonthUsageRequest) updates) => super.copyWith((message) => updates(message as GetCurrentMonthUsageRequest)) as GetCurrentMonthUsageRequest;
 
-  @$pb.TagNumber(6)
-  $44.Timestamp get occurredAt => $_getN(5);
-  @$pb.TagNumber(6)
-  set occurredAt($44.Timestamp v) { setField(6, v); }
-  @$pb.TagNumber(6)
-  $core.bool hasOccurredAt() => $_has(5);
-  @$pb.TagNumber(6)
-  void clearOccurredAt() => clearField(6);
-  @$pb.TagNumber(6)
-  $44.Timestamp ensureOccurredAt() => $_ensure(5);
+  $pb.BuilderInfo get info_ => _i;
 
-  @$pb.TagNumber(7)
-  $core.String get userName => $_getSZ(6);
-  @$pb.TagNumber(7)
-  set userName($core.String v) { $_setString(6, v); }
-  @$pb.TagNumber(7)
-  $core.bool hasUserName() => $_has(6);
-  @$pb.TagNumber(7)
-  void clearUserName() => clearField(7);
+  @$core.pragma('dart2js:noInline')
+  static GetCurrentMonthUsageRequest create() => GetCurrentMonthUsageRequest._();
+  GetCurrentMonthUsageRequest createEmptyInstance() => create();
+  static $pb.PbList<GetCurrentMonthUsageRequest> createRepeated() => $pb.PbList<GetCurrentMonthUsageRequest>();
+  @$core.pragma('dart2js:noInline')
+  static GetCurrentMonthUsageRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetCurrentMonthUsageRequest>(create);
+  static GetCurrentMonthUsageRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get orgId => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set orgId($core.String v) { $_setString(0, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasOrgId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearOrgId() => clearField(1);
 }
 
-class Invoice extends $pb.GeneratedMessage {
-  factory Invoice({
-    $core.String? id,
-    $44.Timestamp? invoiceDate,
-    $core.double? invoiceAmount,
-    $core.String? status,
-    $44.Timestamp? dueDate,
-    $core.Iterable<BillableResourceEvent>? items,
-    $core.String? emailedTo,
+class UsageCost extends $pb.GeneratedMessage {
+  factory UsageCost({
+    UsageCostType? resourceType,
+    $core.double? cost,
   }) {
     final $result = create();
-    if (id != null) {
-      $result.id = id;
-    }
-    if (invoiceDate != null) {
-      $result.invoiceDate = invoiceDate;
-    }
-    if (invoiceAmount != null) {
-      $result.invoiceAmount = invoiceAmount;
-    }
-    if (status != null) {
-      $result.status = status;
-    }
-    if (dueDate != null) {
-      $result.dueDate = dueDate;
-    }
-    if (items != null) {
-      $result.items.addAll(items);
+    if (resourceType != null) {
+      $result.resourceType = resourceType;
     }
-    if (emailedTo != null) {
-      $result.emailedTo = emailedTo;
+    if (cost != null) {
+      $result.cost = cost;
     }
     return $result;
   }
-  Invoice._() : super();
-  factory Invoice.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory Invoice.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  UsageCost._() : super();
+  factory UsageCost.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory UsageCost.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Invoice', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'id')
-    ..aOM<$44.Timestamp>(2, _omitFieldNames ? '' : 'invoiceDate', subBuilder: $44.Timestamp.create)
-    ..a<$core.double>(3, _omitFieldNames ? '' : 'invoiceAmount', $pb.PbFieldType.OD)
-    ..aOS(4, _omitFieldNames ? '' : 'status')
-    ..aOM<$44.Timestamp>(5, _omitFieldNames ? '' : 'dueDate', subBuilder: $44.Timestamp.create)
-    ..pc<BillableResourceEvent>(6, _omitFieldNames ? '' : 'items', $pb.PbFieldType.PM, subBuilder: BillableResourceEvent.create)
-    ..aOS(7, _omitFieldNames ? '' : 'emailedTo')
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UsageCost', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
+    ..e<UsageCostType>(1, _omitFieldNames ? '' : 'resourceType', $pb.PbFieldType.OE, defaultOrMaker: UsageCostType.USAGE_COST_TYPE_UNSPECIFIED, valueOf: UsageCostType.valueOf, enumValues: UsageCostType.values)
+    ..a<$core.double>(2, _omitFieldNames ? '' : 'cost', $pb.PbFieldType.OD)
     ..hasRequiredFields = false
   ;
 
@@ -333,106 +286,68 @@ class Invoice extends $pb.GeneratedMessage {
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  Invoice clone() => Invoice()..mergeFromMessage(this);
+  UsageCost clone() => UsageCost()..mergeFromMessage(this);
   @$core.Deprecated(
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  Invoice copyWith(void Function(Invoice) updates) => super.copyWith((message) => updates(message as Invoice)) as Invoice;
+  UsageCost copyWith(void Function(UsageCost) updates) => super.copyWith((message) => updates(message as UsageCost)) as UsageCost;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static Invoice create() => Invoice._();
-  Invoice createEmptyInstance() => create();
-  static $pb.PbList<Invoice> createRepeated() => $pb.PbList<Invoice>();
+  static UsageCost create() => UsageCost._();
+  UsageCost createEmptyInstance() => create();
+  static $pb.PbList<UsageCost> createRepeated() => $pb.PbList<UsageCost>();
   @$core.pragma('dart2js:noInline')
-  static Invoice getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Invoice>(create);
-  static Invoice? _defaultInstance;
+  static UsageCost getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<UsageCost>(create);
+  static UsageCost? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.String get id => $_getSZ(0);
+  UsageCostType get resourceType => $_getN(0);
   @$pb.TagNumber(1)
-  set id($core.String v) { $_setString(0, v); }
+  set resourceType(UsageCostType v) { setField(1, v); }
   @$pb.TagNumber(1)
-  $core.bool hasId() => $_has(0);
+  $core.bool hasResourceType() => $_has(0);
   @$pb.TagNumber(1)
-  void clearId() => clearField(1);
+  void clearResourceType() => clearField(1);
 
   @$pb.TagNumber(2)
-  $44.Timestamp get invoiceDate => $_getN(1);
+  $core.double get cost => $_getN(1);
   @$pb.TagNumber(2)
-  set invoiceDate($44.Timestamp v) { setField(2, v); }
+  set cost($core.double v) { $_setDouble(1, v); }
   @$pb.TagNumber(2)
-  $core.bool hasInvoiceDate() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearInvoiceDate() => clearField(2);
+  $core.bool hasCost() => $_has(1);
   @$pb.TagNumber(2)
-  $44.Timestamp ensureInvoiceDate() => $_ensure(1);
-
-  @$pb.TagNumber(3)
-  $core.double get invoiceAmount => $_getN(2);
-  @$pb.TagNumber(3)
-  set invoiceAmount($core.double v) { $_setDouble(2, v); }
-  @$pb.TagNumber(3)
-  $core.bool hasInvoiceAmount() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearInvoiceAmount() => clearField(3);
-
-  @$pb.TagNumber(4)
-  $core.String get status => $_getSZ(3);
-  @$pb.TagNumber(4)
-  set status($core.String v) { $_setString(3, v); }
-  @$pb.TagNumber(4)
-  $core.bool hasStatus() => $_has(3);
-  @$pb.TagNumber(4)
-  void clearStatus() => clearField(4);
-
-  @$pb.TagNumber(5)
-  $44.Timestamp get dueDate => $_getN(4);
-  @$pb.TagNumber(5)
-  set dueDate($44.Timestamp v) { setField(5, v); }
-  @$pb.TagNumber(5)
-  $core.bool hasDueDate() => $_has(4);
-  @$pb.TagNumber(5)
-  void clearDueDate() => clearField(5);
-  @$pb.TagNumber(5)
-  $44.Timestamp ensureDueDate() => $_ensure(4);
-
-  @$pb.TagNumber(6)
-  $core.List<BillableResourceEvent> get items => $_getList(5);
-
-  @$pb.TagNumber(7)
-  $core.String get emailedTo => $_getSZ(6);
-  @$pb.TagNumber(7)
-  set emailedTo($core.String v) { $_setString(6, v); }
-  @$pb.TagNumber(7)
-  $core.bool hasEmailedTo() => $_has(6);
-  @$pb.TagNumber(7)
-  void clearEmailedTo() => clearField(7);
+  void clearCost() => clearField(2);
 }
 
-class PaymentMethodCard extends $pb.GeneratedMessage {
-  factory PaymentMethodCard({
-    $core.String? brand,
-    $core.String? lastFourDigits,
+class ResourceUsageCostsBySource extends $pb.GeneratedMessage {
+  factory ResourceUsageCostsBySource({
+    SourceType? sourceType,
+    ResourceUsageCosts? resourceUsageCosts,
+    $core.String? tierName,
   }) {
     final $result = create();
-    if (brand != null) {
-      $result.brand = brand;
+    if (sourceType != null) {
+      $result.sourceType = sourceType;
     }
-    if (lastFourDigits != null) {
-      $result.lastFourDigits = lastFourDigits;
+    if (resourceUsageCosts != null) {
+      $result.resourceUsageCosts = resourceUsageCosts;
+    }
+    if (tierName != null) {
+      $result.tierName = tierName;
     }
     return $result;
   }
-  PaymentMethodCard._() : super();
-  factory PaymentMethodCard.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory PaymentMethodCard.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PaymentMethodCard', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'brand')
-    ..aOS(2, _omitFieldNames ? '' : 'lastFourDigits')
+  ResourceUsageCostsBySource._() : super();
+  factory ResourceUsageCostsBySource.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ResourceUsageCostsBySource.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ResourceUsageCostsBySource', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
+    ..e<SourceType>(1, _omitFieldNames ? '' : 'sourceType', $pb.PbFieldType.OE, defaultOrMaker: SourceType.SOURCE_TYPE_UNSPECIFIED, valueOf: SourceType.valueOf, enumValues: SourceType.values)
+    ..aOM<ResourceUsageCosts>(2, _omitFieldNames ? '' : 'resourceUsageCosts', subBuilder: ResourceUsageCosts.create)
+    ..aOS(3, _omitFieldNames ? '' : 'tierName')
     ..hasRequiredFields = false
   ;
 
@@ -440,58 +355,84 @@ class PaymentMethodCard extends $pb.GeneratedMessage {
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  PaymentMethodCard clone() => PaymentMethodCard()..mergeFromMessage(this);
+  ResourceUsageCostsBySource clone() => ResourceUsageCostsBySource()..mergeFromMessage(this);
   @$core.Deprecated(
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  PaymentMethodCard copyWith(void Function(PaymentMethodCard) updates) => super.copyWith((message) => updates(message as PaymentMethodCard)) as PaymentMethodCard;
+  ResourceUsageCostsBySource copyWith(void Function(ResourceUsageCostsBySource) updates) => super.copyWith((message) => updates(message as ResourceUsageCostsBySource)) as ResourceUsageCostsBySource;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static PaymentMethodCard create() => PaymentMethodCard._();
-  PaymentMethodCard createEmptyInstance() => create();
-  static $pb.PbList<PaymentMethodCard> createRepeated() => $pb.PbList<PaymentMethodCard>();
+  static ResourceUsageCostsBySource create() => ResourceUsageCostsBySource._();
+  ResourceUsageCostsBySource createEmptyInstance() => create();
+  static $pb.PbList<ResourceUsageCostsBySource> createRepeated() => $pb.PbList<ResourceUsageCostsBySource>();
   @$core.pragma('dart2js:noInline')
-  static PaymentMethodCard getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PaymentMethodCard>(create);
-  static PaymentMethodCard? _defaultInstance;
+  static ResourceUsageCostsBySource getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ResourceUsageCostsBySource>(create);
+  static ResourceUsageCostsBySource? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.String get brand => $_getSZ(0);
+  SourceType get sourceType => $_getN(0);
   @$pb.TagNumber(1)
-  set brand($core.String v) { $_setString(0, v); }
+  set sourceType(SourceType v) { setField(1, v); }
   @$pb.TagNumber(1)
-  $core.bool hasBrand() => $_has(0);
+  $core.bool hasSourceType() => $_has(0);
   @$pb.TagNumber(1)
-  void clearBrand() => clearField(1);
+  void clearSourceType() => clearField(1);
 
   @$pb.TagNumber(2)
-  $core.String get lastFourDigits => $_getSZ(1);
+  ResourceUsageCosts get resourceUsageCosts => $_getN(1);
   @$pb.TagNumber(2)
-  set lastFourDigits($core.String v) { $_setString(1, v); }
+  set resourceUsageCosts(ResourceUsageCosts v) { setField(2, v); }
   @$pb.TagNumber(2)
-  $core.bool hasLastFourDigits() => $_has(1);
+  $core.bool hasResourceUsageCosts() => $_has(1);
   @$pb.TagNumber(2)
-  void clearLastFourDigits() => clearField(2);
+  void clearResourceUsageCosts() => clearField(2);
+  @$pb.TagNumber(2)
+  ResourceUsageCosts ensureResourceUsageCosts() => $_ensure(1);
+
+  @$pb.TagNumber(3)
+  $core.String get tierName => $_getSZ(2);
+  @$pb.TagNumber(3)
+  set tierName($core.String v) { $_setString(2, v); }
+  @$pb.TagNumber(3)
+  $core.bool hasTierName() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearTierName() => clearField(3);
 }
 
-class GetCurrentMonthUsageRequest extends $pb.GeneratedMessage {
-  factory GetCurrentMonthUsageRequest({
-    $core.String? orgId,
+class ResourceUsageCosts extends $pb.GeneratedMessage {
+  factory ResourceUsageCosts({
+    $core.Iterable<UsageCost>? usageCosts,
+    $core.double? discount,
+    $core.double? totalWithDiscount,
+    $core.double? totalWithoutDiscount,
   }) {
     final $result = create();
-    if (orgId != null) {
-      $result.orgId = orgId;
+    if (usageCosts != null) {
+      $result.usageCosts.addAll(usageCosts);
+    }
+    if (discount != null) {
+      $result.discount = discount;
+    }
+    if (totalWithDiscount != null) {
+      $result.totalWithDiscount = totalWithDiscount;
+    }
+    if (totalWithoutDiscount != null) {
+      $result.totalWithoutDiscount = totalWithoutDiscount;
     }
     return $result;
   }
-  GetCurrentMonthUsageRequest._() : super();
-  factory GetCurrentMonthUsageRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetCurrentMonthUsageRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetCurrentMonthUsageRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'orgId')
+  ResourceUsageCosts._() : super();
+  factory ResourceUsageCosts.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ResourceUsageCosts.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ResourceUsageCosts', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create)
+    ..pc<UsageCost>(1, _omitFieldNames ? '' : 'usageCosts', $pb.PbFieldType.PM, subBuilder: UsageCost.create)
+    ..a<$core.double>(2, _omitFieldNames ? '' : 'discount', $pb.PbFieldType.OD)
+    ..a<$core.double>(3, _omitFieldNames ? '' : 'totalWithDiscount', $pb.PbFieldType.OD)
+    ..a<$core.double>(4, _omitFieldNames ? '' : 'totalWithoutDiscount', $pb.PbFieldType.OD)
     ..hasRequiredFields = false
   ;
 
@@ -499,48 +440,82 @@ class GetCurrentMonthUsageRequest extends $pb.GeneratedMessage {
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
   'Will be removed in next major version')
-  GetCurrentMonthUsageRequest clone() => GetCurrentMonthUsageRequest()..mergeFromMessage(this);
+  ResourceUsageCosts clone() => ResourceUsageCosts()..mergeFromMessage(this);
   @$core.Deprecated(
   'Using this can add significant overhead to your binary. '
   'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
   'Will be removed in next major version')
-  GetCurrentMonthUsageRequest copyWith(void Function(GetCurrentMonthUsageRequest) updates) => super.copyWith((message) => updates(message as GetCurrentMonthUsageRequest)) as GetCurrentMonthUsageRequest;
+  ResourceUsageCosts copyWith(void Function(ResourceUsageCosts) updates) => super.copyWith((message) => updates(message as ResourceUsageCosts)) as ResourceUsageCosts;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static GetCurrentMonthUsageRequest create() => GetCurrentMonthUsageRequest._();
-  GetCurrentMonthUsageRequest createEmptyInstance() => create();
-  static $pb.PbList<GetCurrentMonthUsageRequest> createRepeated() => $pb.PbList<GetCurrentMonthUsageRequest>();
+  static ResourceUsageCosts create() => ResourceUsageCosts._();
+  ResourceUsageCosts createEmptyInstance() => create();
+  static $pb.PbList<ResourceUsageCosts> createRepeated() => $pb.PbList<ResourceUsageCosts>();
   @$core.pragma('dart2js:noInline')
-  static GetCurrentMonthUsageRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetCurrentMonthUsageRequest>(create);
-  static GetCurrentMonthUsageRequest? _defaultInstance;
+  static ResourceUsageCosts getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ResourceUsageCosts>(create);
+  static ResourceUsageCosts? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.String get orgId => $_getSZ(0);
-  @$pb.TagNumber(1)
-  set orgId($core.String v) { $_setString(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasOrgId() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearOrgId() => clearField(1);
+  $core.List<UsageCost> get usageCosts => $_getList(0);
+
+  @$pb.TagNumber(2)
+  $core.double get discount => $_getN(1);
+  @$pb.TagNumber(2)
+  set discount($core.double v) { $_setDouble(1, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasDiscount() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearDiscount() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.double get totalWithDiscount => $_getN(2);
+  @$pb.TagNumber(3)
+  set totalWithDiscount($core.double v) { $_setDouble(2, v); }
+  @$pb.TagNumber(3)
+  $core.bool hasTotalWithDiscount() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearTotalWithDiscount() => clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.double get totalWithoutDiscount => $_getN(3);
+  @$pb.TagNumber(4)
+  set totalWithoutDiscount($core.double v) { $_setDouble(3, v); }
+  @$pb.TagNumber(4)
+  $core.bool hasTotalWithoutDiscount() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearTotalWithoutDiscount() => clearField(4);
 }
 
 class GetCurrentMonthUsageResponse extends $pb.GeneratedMessage {
   factory GetCurrentMonthUsageResponse({
     $44.Timestamp? startDate,
     $44.Timestamp? endDate,
+  @$core.Deprecated('This field is deprecated.')
     $core.double? cloudStorageUsageCost,
+  @$core.Deprecated('This field is deprecated.')
     $core.double? dataUploadUsageCost,
+  @$core.Deprecated('This field is deprecated.')
     $core.double? dataEgresUsageCost,
+  @$core.Deprecated('This field is deprecated.')
     $core.double? remoteControlUsageCost,
+  @$core.Deprecated('This field is deprecated.')
     $core.double? standardComputeUsageCost,
+  @$core.Deprecated('This field is deprecated.')
     $core.double? discountAmount,
+  @$core.Deprecated('This field is deprecated.')
     $core.double? totalUsageWithDiscount,
+  @$core.Deprecated('This field is deprecated.')
     $core.double? totalUsageWithoutDiscount,
+  @$core.Deprecated('This field is deprecated.')
     $core.double? perMachineUsageCost,
+  @$core.Deprecated('This field is deprecated.')
     $core.double? binaryDataCloudStorageUsageCost,
+  @$core.Deprecated('This field is deprecated.')
     $core.double? otherCloudStorageUsageCost,
+    $core.Iterable<ResourceUsageCostsBySource>? resourceUsageCostsBySource,
+    $core.double? subtotal,
   }) {
     final $result = create();
     if (startDate != null) {
@@ -550,38 +525,55 @@ class GetCurrentMonthUsageResponse extends $pb.GeneratedMessage {
       $result.endDate = endDate;
     }
     if (cloudStorageUsageCost != null) {
+      // ignore: deprecated_member_use_from_same_package
       $result.cloudStorageUsageCost = cloudStorageUsageCost;
     }
     if (dataUploadUsageCost != null) {
+      // ignore: deprecated_member_use_from_same_package
       $result.dataUploadUsageCost = dataUploadUsageCost;
     }
     if (dataEgresUsageCost != null) {
+      // ignore: deprecated_member_use_from_same_package
       $result.dataEgresUsageCost = dataEgresUsageCost;
     }
     if (remoteControlUsageCost != null) {
+      // ignore: deprecated_member_use_from_same_package
       $result.remoteControlUsageCost = remoteControlUsageCost;
     }
     if (standardComputeUsageCost != null) {
+      // ignore: deprecated_member_use_from_same_package
       $result.standardComputeUsageCost = standardComputeUsageCost;
     }
     if (discountAmount != null) {
+      // ignore: deprecated_member_use_from_same_package
       $result.discountAmount = discountAmount;
     }
     if (totalUsageWithDiscount != null) {
+      // ignore: deprecated_member_use_from_same_package
       $result.totalUsageWithDiscount = totalUsageWithDiscount;
     }
     if (totalUsageWithoutDiscount != null) {
+      // ignore: deprecated_member_use_from_same_package
       $result.totalUsageWithoutDiscount = totalUsageWithoutDiscount;
     }
     if (perMachineUsageCost != null) {
+      // ignore: deprecated_member_use_from_same_package
       $result.perMachineUsageCost = perMachineUsageCost;
     }
     if (binaryDataCloudStorageUsageCost != null) {
+      // ignore: deprecated_member_use_from_same_package
       $result.binaryDataCloudStorageUsageCost = binaryDataCloudStorageUsageCost;
     }
     if (otherCloudStorageUsageCost != null) {
+      // ignore: deprecated_member_use_from_same_package
       $result.otherCloudStorageUsageCost = otherCloudStorageUsageCost;
     }
+    if (resourceUsageCostsBySource != null) {
+      $result.resourceUsageCostsBySource.addAll(resourceUsageCostsBySource);
+    }
+    if (subtotal != null) {
+      $result.subtotal = subtotal;
+    }
     return $result;
   }
   GetCurrentMonthUsageResponse._() : super();
@@ -602,6 +594,8 @@ class GetCurrentMonthUsageResponse extends $pb.GeneratedMessage {
     ..a<$core.double>(11, _omitFieldNames ? '' : 'perMachineUsageCost', $pb.PbFieldType.OD)
     ..a<$core.double>(12, _omitFieldNames ? '' : 'binaryDataCloudStorageUsageCost', $pb.PbFieldType.OD)
     ..a<$core.double>(13, _omitFieldNames ? '' : 'otherCloudStorageUsageCost', $pb.PbFieldType.OD)
+    ..pc<ResourceUsageCostsBySource>(14, _omitFieldNames ? '' : 'resourceUsageCostsBySource', $pb.PbFieldType.PM, subBuilder: ResourceUsageCostsBySource.create)
+    ..a<$core.double>(15, _omitFieldNames ? '' : 'subtotal', $pb.PbFieldType.OD)
     ..hasRequiredFields = false
   ;
 
@@ -648,104 +642,161 @@ class GetCurrentMonthUsageResponse extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $44.Timestamp ensureEndDate() => $_ensure(1);
 
+  /// all fields below are deprecated
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   $core.double get cloudStorageUsageCost => $_getN(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   set cloudStorageUsageCost($core.double v) { $_setDouble(2, v); }
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   $core.bool hasCloudStorageUsageCost() => $_has(2);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(3)
   void clearCloudStorageUsageCost() => clearField(3);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(4)
   $core.double get dataUploadUsageCost => $_getN(3);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(4)
   set dataUploadUsageCost($core.double v) { $_setDouble(3, v); }
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(4)
   $core.bool hasDataUploadUsageCost() => $_has(3);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(4)
   void clearDataUploadUsageCost() => clearField(4);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(5)
   $core.double get dataEgresUsageCost => $_getN(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(5)
   set dataEgresUsageCost($core.double v) { $_setDouble(4, v); }
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(5)
   $core.bool hasDataEgresUsageCost() => $_has(4);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(5)
   void clearDataEgresUsageCost() => clearField(5);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(6)
   $core.double get remoteControlUsageCost => $_getN(5);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(6)
   set remoteControlUsageCost($core.double v) { $_setDouble(5, v); }
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(6)
   $core.bool hasRemoteControlUsageCost() => $_has(5);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(6)
   void clearRemoteControlUsageCost() => clearField(6);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   $core.double get standardComputeUsageCost => $_getN(6);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   set standardComputeUsageCost($core.double v) { $_setDouble(6, v); }
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   $core.bool hasStandardComputeUsageCost() => $_has(6);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(7)
   void clearStandardComputeUsageCost() => clearField(7);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(8)
   $core.double get discountAmount => $_getN(7);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(8)
   set discountAmount($core.double v) { $_setDouble(7, v); }
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(8)
   $core.bool hasDiscountAmount() => $_has(7);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(8)
   void clearDiscountAmount() => clearField(8);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(9)
   $core.double get totalUsageWithDiscount => $_getN(8);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(9)
   set totalUsageWithDiscount($core.double v) { $_setDouble(8, v); }
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(9)
   $core.bool hasTotalUsageWithDiscount() => $_has(8);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(9)
   void clearTotalUsageWithDiscount() => clearField(9);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(10)
   $core.double get totalUsageWithoutDiscount => $_getN(9);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(10)
   set totalUsageWithoutDiscount($core.double v) { $_setDouble(9, v); }
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(10)
   $core.bool hasTotalUsageWithoutDiscount() => $_has(9);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(10)
   void clearTotalUsageWithoutDiscount() => clearField(10);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(11)
   $core.double get perMachineUsageCost => $_getN(10);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(11)
   set perMachineUsageCost($core.double v) { $_setDouble(10, v); }
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(11)
   $core.bool hasPerMachineUsageCost() => $_has(10);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(11)
   void clearPerMachineUsageCost() => clearField(11);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(12)
   $core.double get binaryDataCloudStorageUsageCost => $_getN(11);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(12)
   set binaryDataCloudStorageUsageCost($core.double v) { $_setDouble(11, v); }
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(12)
   $core.bool hasBinaryDataCloudStorageUsageCost() => $_has(11);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(12)
   void clearBinaryDataCloudStorageUsageCost() => clearField(12);
 
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(13)
   $core.double get otherCloudStorageUsageCost => $_getN(12);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(13)
   set otherCloudStorageUsageCost($core.double v) { $_setDouble(12, v); }
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(13)
   $core.bool hasOtherCloudStorageUsageCost() => $_has(12);
+  @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(13)
   void clearOtherCloudStorageUsageCost() => clearField(13);
+
+  @$pb.TagNumber(14)
+  $core.List<ResourceUsageCostsBySource> get resourceUsageCostsBySource => $_getList(13);
+
+  @$pb.TagNumber(15)
+  $core.double get subtotal => $_getN(14);
+  @$pb.TagNumber(15)
+  set subtotal($core.double v) { $_setDouble(14, v); }
+  @$pb.TagNumber(15)
+  $core.bool hasSubtotal() => $_has(14);
+  @$pb.TagNumber(15)
+  void clearSubtotal() => clearField(15);
 }
 
 class GetOrgBillingInformationRequest extends $pb.GeneratedMessage {
diff --git a/lib/src/gen/app/v1/billing.pbenum.dart b/lib/src/gen/app/v1/billing.pbenum.dart
index 0810cc5444..efcc52af0d 100644
--- a/lib/src/gen/app/v1/billing.pbenum.dart
+++ b/lib/src/gen/app/v1/billing.pbenum.dart
@@ -28,5 +28,51 @@ class PaymentMethodType extends $pb.ProtobufEnum {
   const PaymentMethodType._($core.int v, $core.String n) : super(v, n);
 }
 
+class UsageCostType extends $pb.ProtobufEnum {
+  static const UsageCostType USAGE_COST_TYPE_UNSPECIFIED = UsageCostType._(0, _omitEnumNames ? '' : 'USAGE_COST_TYPE_UNSPECIFIED');
+  static const UsageCostType USAGE_COST_TYPE_DATA_UPLOAD = UsageCostType._(1, _omitEnumNames ? '' : 'USAGE_COST_TYPE_DATA_UPLOAD');
+  static const UsageCostType USAGE_COST_TYPE_DATA_EGRESS = UsageCostType._(2, _omitEnumNames ? '' : 'USAGE_COST_TYPE_DATA_EGRESS');
+  static const UsageCostType USAGE_COST_TYPE_REMOTE_CONTROL = UsageCostType._(3, _omitEnumNames ? '' : 'USAGE_COST_TYPE_REMOTE_CONTROL');
+  static const UsageCostType USAGE_COST_TYPE_STANDARD_COMPUTE = UsageCostType._(4, _omitEnumNames ? '' : 'USAGE_COST_TYPE_STANDARD_COMPUTE');
+  static const UsageCostType USAGE_COST_TYPE_CLOUD_STORAGE = UsageCostType._(5, _omitEnumNames ? '' : 'USAGE_COST_TYPE_CLOUD_STORAGE');
+  static const UsageCostType USAGE_COST_TYPE_BINARY_DATA_CLOUD_STORAGE = UsageCostType._(6, _omitEnumNames ? '' : 'USAGE_COST_TYPE_BINARY_DATA_CLOUD_STORAGE');
+  static const UsageCostType USAGE_COST_TYPE_OTHER_CLOUD_STORAGE = UsageCostType._(7, _omitEnumNames ? '' : 'USAGE_COST_TYPE_OTHER_CLOUD_STORAGE');
+  static const UsageCostType USAGE_COST_TYPE_PER_MACHINE = UsageCostType._(8, _omitEnumNames ? '' : 'USAGE_COST_TYPE_PER_MACHINE');
+
+  static const $core.List<UsageCostType> values = <UsageCostType> [
+    USAGE_COST_TYPE_UNSPECIFIED,
+    USAGE_COST_TYPE_DATA_UPLOAD,
+    USAGE_COST_TYPE_DATA_EGRESS,
+    USAGE_COST_TYPE_REMOTE_CONTROL,
+    USAGE_COST_TYPE_STANDARD_COMPUTE,
+    USAGE_COST_TYPE_CLOUD_STORAGE,
+    USAGE_COST_TYPE_BINARY_DATA_CLOUD_STORAGE,
+    USAGE_COST_TYPE_OTHER_CLOUD_STORAGE,
+    USAGE_COST_TYPE_PER_MACHINE,
+  ];
+
+  static final $core.Map<$core.int, UsageCostType> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static UsageCostType? valueOf($core.int value) => _byValue[value];
+
+  const UsageCostType._($core.int v, $core.String n) : super(v, n);
+}
+
+class SourceType extends $pb.ProtobufEnum {
+  static const SourceType SOURCE_TYPE_UNSPECIFIED = SourceType._(0, _omitEnumNames ? '' : 'SOURCE_TYPE_UNSPECIFIED');
+  static const SourceType SOURCE_TYPE_ORG = SourceType._(1, _omitEnumNames ? '' : 'SOURCE_TYPE_ORG');
+  static const SourceType SOURCE_TYPE_FRAGMENT = SourceType._(2, _omitEnumNames ? '' : 'SOURCE_TYPE_FRAGMENT');
+
+  static const $core.List<SourceType> values = <SourceType> [
+    SOURCE_TYPE_UNSPECIFIED,
+    SOURCE_TYPE_ORG,
+    SOURCE_TYPE_FRAGMENT,
+  ];
+
+  static final $core.Map<$core.int, SourceType> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static SourceType? valueOf($core.int value) => _byValue[value];
+
+  const SourceType._($core.int v, $core.String n) : super(v, n);
+}
+
 
 const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
diff --git a/lib/src/gen/app/v1/billing.pbjson.dart b/lib/src/gen/app/v1/billing.pbjson.dart
index 266f8ce05f..582095d7a5 100644
--- a/lib/src/gen/app/v1/billing.pbjson.dart
+++ b/lib/src/gen/app/v1/billing.pbjson.dart
@@ -27,6 +27,47 @@ final $typed_data.Uint8List paymentMethodTypeDescriptor = $convert.base64Decode(
     'ChFQYXltZW50TWV0aG9kVHlwZRIjCh9QQVlNRU5UX01FVEhPRF9UWVBFX1VOU1BFQ0lGSUVEEA'
     'ASHAoYUEFZTUVOVF9NRVRIT0RfVFlQRV9DQVJEEAE=');
 
+@$core.Deprecated('Use usageCostTypeDescriptor instead')
+const UsageCostType$json = {
+  '1': 'UsageCostType',
+  '2': [
+    {'1': 'USAGE_COST_TYPE_UNSPECIFIED', '2': 0},
+    {'1': 'USAGE_COST_TYPE_DATA_UPLOAD', '2': 1},
+    {'1': 'USAGE_COST_TYPE_DATA_EGRESS', '2': 2},
+    {'1': 'USAGE_COST_TYPE_REMOTE_CONTROL', '2': 3},
+    {'1': 'USAGE_COST_TYPE_STANDARD_COMPUTE', '2': 4},
+    {'1': 'USAGE_COST_TYPE_CLOUD_STORAGE', '2': 5},
+    {'1': 'USAGE_COST_TYPE_BINARY_DATA_CLOUD_STORAGE', '2': 6},
+    {'1': 'USAGE_COST_TYPE_OTHER_CLOUD_STORAGE', '2': 7},
+    {'1': 'USAGE_COST_TYPE_PER_MACHINE', '2': 8},
+  ],
+};
+
+/// Descriptor for `UsageCostType`. Decode as a `google.protobuf.EnumDescriptorProto`.
+final $typed_data.Uint8List usageCostTypeDescriptor = $convert.base64Decode(
+    'Cg1Vc2FnZUNvc3RUeXBlEh8KG1VTQUdFX0NPU1RfVFlQRV9VTlNQRUNJRklFRBAAEh8KG1VTQU'
+    'dFX0NPU1RfVFlQRV9EQVRBX1VQTE9BRBABEh8KG1VTQUdFX0NPU1RfVFlQRV9EQVRBX0VHUkVT'
+    'UxACEiIKHlVTQUdFX0NPU1RfVFlQRV9SRU1PVEVfQ09OVFJPTBADEiQKIFVTQUdFX0NPU1RfVF'
+    'lQRV9TVEFOREFSRF9DT01QVVRFEAQSIQodVVNBR0VfQ09TVF9UWVBFX0NMT1VEX1NUT1JBR0UQ'
+    'BRItCilVU0FHRV9DT1NUX1RZUEVfQklOQVJZX0RBVEFfQ0xPVURfU1RPUkFHRRAGEicKI1VTQU'
+    'dFX0NPU1RfVFlQRV9PVEhFUl9DTE9VRF9TVE9SQUdFEAcSHwobVVNBR0VfQ09TVF9UWVBFX1BF'
+    'Ul9NQUNISU5FEAg=');
+
+@$core.Deprecated('Use sourceTypeDescriptor instead')
+const SourceType$json = {
+  '1': 'SourceType',
+  '2': [
+    {'1': 'SOURCE_TYPE_UNSPECIFIED', '2': 0},
+    {'1': 'SOURCE_TYPE_ORG', '2': 1},
+    {'1': 'SOURCE_TYPE_FRAGMENT', '2': 2},
+  ],
+};
+
+/// Descriptor for `SourceType`. Decode as a `google.protobuf.EnumDescriptorProto`.
+final $typed_data.Uint8List sourceTypeDescriptor = $convert.base64Decode(
+    'CgpTb3VyY2VUeXBlEhsKF1NPVVJDRV9UWVBFX1VOU1BFQ0lGSUVEEAASEwoPU09VUkNFX1RZUE'
+    'VfT1JHEAESGAoUU09VUkNFX1RZUEVfRlJBR01FTlQQAg==');
+
 @$core.Deprecated('Use invoiceSummaryDescriptor instead')
 const InvoiceSummary$json = {
   '1': 'InvoiceSummary',
@@ -48,51 +89,6 @@ final $typed_data.Uint8List invoiceSummaryDescriptor = $convert.base64Decode(
     'RhdGUYBSABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wUgdkdWVEYXRlEjcKCXBhaWRf'
     'ZGF0ZRgGIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBSCHBhaWREYXRl');
 
-@$core.Deprecated('Use billableResourceEventDescriptor instead')
-const BillableResourceEvent$json = {
-  '1': 'BillableResourceEvent',
-  '2': [
-    {'1': 'id', '3': 1, '4': 1, '5': 9, '10': 'id'},
-    {'1': 'type', '3': 2, '4': 1, '5': 9, '10': 'type'},
-    {'1': 'usage_quantity', '3': 3, '4': 1, '5': 1, '10': 'usageQuantity'},
-    {'1': 'usage_quantity_unit', '3': 4, '4': 1, '5': 9, '10': 'usageQuantityUnit'},
-    {'1': 'usage_cost', '3': 5, '4': 1, '5': 9, '10': 'usageCost'},
-    {'1': 'occurred_at', '3': 6, '4': 1, '5': 11, '6': '.google.protobuf.Timestamp', '10': 'occurredAt'},
-    {'1': 'user_name', '3': 7, '4': 1, '5': 9, '10': 'userName'},
-  ],
-};
-
-/// Descriptor for `BillableResourceEvent`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List billableResourceEventDescriptor = $convert.base64Decode(
-    'ChVCaWxsYWJsZVJlc291cmNlRXZlbnQSDgoCaWQYASABKAlSAmlkEhIKBHR5cGUYAiABKAlSBH'
-    'R5cGUSJQoOdXNhZ2VfcXVhbnRpdHkYAyABKAFSDXVzYWdlUXVhbnRpdHkSLgoTdXNhZ2VfcXVh'
-    'bnRpdHlfdW5pdBgEIAEoCVIRdXNhZ2VRdWFudGl0eVVuaXQSHQoKdXNhZ2VfY29zdBgFIAEoCV'
-    'IJdXNhZ2VDb3N0EjsKC29jY3VycmVkX2F0GAYgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVz'
-    'dGFtcFIKb2NjdXJyZWRBdBIbCgl1c2VyX25hbWUYByABKAlSCHVzZXJOYW1l');
-
-@$core.Deprecated('Use invoiceDescriptor instead')
-const Invoice$json = {
-  '1': 'Invoice',
-  '2': [
-    {'1': 'id', '3': 1, '4': 1, '5': 9, '10': 'id'},
-    {'1': 'invoice_date', '3': 2, '4': 1, '5': 11, '6': '.google.protobuf.Timestamp', '10': 'invoiceDate'},
-    {'1': 'invoice_amount', '3': 3, '4': 1, '5': 1, '10': 'invoiceAmount'},
-    {'1': 'status', '3': 4, '4': 1, '5': 9, '10': 'status'},
-    {'1': 'due_date', '3': 5, '4': 1, '5': 11, '6': '.google.protobuf.Timestamp', '10': 'dueDate'},
-    {'1': 'items', '3': 6, '4': 3, '5': 11, '6': '.viam.app.v1.BillableResourceEvent', '10': 'items'},
-    {'1': 'emailed_to', '3': 7, '4': 1, '5': 9, '10': 'emailedTo'},
-  ],
-};
-
-/// Descriptor for `Invoice`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List invoiceDescriptor = $convert.base64Decode(
-    'CgdJbnZvaWNlEg4KAmlkGAEgASgJUgJpZBI9CgxpbnZvaWNlX2RhdGUYAiABKAsyGi5nb29nbG'
-    'UucHJvdG9idWYuVGltZXN0YW1wUgtpbnZvaWNlRGF0ZRIlCg5pbnZvaWNlX2Ftb3VudBgDIAEo'
-    'AVINaW52b2ljZUFtb3VudBIWCgZzdGF0dXMYBCABKAlSBnN0YXR1cxI1CghkdWVfZGF0ZRgFIA'
-    'EoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBSB2R1ZURhdGUSOAoFaXRlbXMYBiADKAsy'
-    'Ii52aWFtLmFwcC52MS5CaWxsYWJsZVJlc291cmNlRXZlbnRSBWl0ZW1zEh0KCmVtYWlsZWRfdG'
-    '8YByABKAlSCWVtYWlsZWRUbw==');
-
 @$core.Deprecated('Use paymentMethodCardDescriptor instead')
 const PaymentMethodCard$json = {
   '1': 'PaymentMethodCard',
@@ -119,23 +115,151 @@ const GetCurrentMonthUsageRequest$json = {
 final $typed_data.Uint8List getCurrentMonthUsageRequestDescriptor = $convert.base64Decode(
     'ChtHZXRDdXJyZW50TW9udGhVc2FnZVJlcXVlc3QSFQoGb3JnX2lkGAEgASgJUgVvcmdJZA==');
 
+@$core.Deprecated('Use usageCostDescriptor instead')
+const UsageCost$json = {
+  '1': 'UsageCost',
+  '2': [
+    {'1': 'resource_type', '3': 1, '4': 1, '5': 14, '6': '.viam.app.v1.UsageCostType', '10': 'resourceType'},
+    {'1': 'cost', '3': 2, '4': 1, '5': 1, '10': 'cost'},
+  ],
+};
+
+/// Descriptor for `UsageCost`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List usageCostDescriptor = $convert.base64Decode(
+    'CglVc2FnZUNvc3QSPwoNcmVzb3VyY2VfdHlwZRgBIAEoDjIaLnZpYW0uYXBwLnYxLlVzYWdlQ2'
+    '9zdFR5cGVSDHJlc291cmNlVHlwZRISCgRjb3N0GAIgASgBUgRjb3N0');
+
+@$core.Deprecated('Use resourceUsageCostsBySourceDescriptor instead')
+const ResourceUsageCostsBySource$json = {
+  '1': 'ResourceUsageCostsBySource',
+  '2': [
+    {'1': 'source_type', '3': 1, '4': 1, '5': 14, '6': '.viam.app.v1.SourceType', '10': 'sourceType'},
+    {'1': 'resource_usage_costs', '3': 2, '4': 1, '5': 11, '6': '.viam.app.v1.ResourceUsageCosts', '10': 'resourceUsageCosts'},
+    {'1': 'tier_name', '3': 3, '4': 1, '5': 9, '10': 'tierName'},
+  ],
+};
+
+/// Descriptor for `ResourceUsageCostsBySource`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List resourceUsageCostsBySourceDescriptor = $convert.base64Decode(
+    'ChpSZXNvdXJjZVVzYWdlQ29zdHNCeVNvdXJjZRI4Cgtzb3VyY2VfdHlwZRgBIAEoDjIXLnZpYW'
+    '0uYXBwLnYxLlNvdXJjZVR5cGVSCnNvdXJjZVR5cGUSUQoUcmVzb3VyY2VfdXNhZ2VfY29zdHMY'
+    'AiABKAsyHy52aWFtLmFwcC52MS5SZXNvdXJjZVVzYWdlQ29zdHNSEnJlc291cmNlVXNhZ2VDb3'
+    'N0cxIbCgl0aWVyX25hbWUYAyABKAlSCHRpZXJOYW1l');
+
+@$core.Deprecated('Use resourceUsageCostsDescriptor instead')
+const ResourceUsageCosts$json = {
+  '1': 'ResourceUsageCosts',
+  '2': [
+    {'1': 'usage_costs', '3': 1, '4': 3, '5': 11, '6': '.viam.app.v1.UsageCost', '10': 'usageCosts'},
+    {'1': 'discount', '3': 2, '4': 1, '5': 1, '10': 'discount'},
+    {'1': 'total_with_discount', '3': 3, '4': 1, '5': 1, '10': 'totalWithDiscount'},
+    {'1': 'total_without_discount', '3': 4, '4': 1, '5': 1, '10': 'totalWithoutDiscount'},
+  ],
+};
+
+/// Descriptor for `ResourceUsageCosts`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List resourceUsageCostsDescriptor = $convert.base64Decode(
+    'ChJSZXNvdXJjZVVzYWdlQ29zdHMSNwoLdXNhZ2VfY29zdHMYASADKAsyFi52aWFtLmFwcC52MS'
+    '5Vc2FnZUNvc3RSCnVzYWdlQ29zdHMSGgoIZGlzY291bnQYAiABKAFSCGRpc2NvdW50Ei4KE3Rv'
+    'dGFsX3dpdGhfZGlzY291bnQYAyABKAFSEXRvdGFsV2l0aERpc2NvdW50EjQKFnRvdGFsX3dpdG'
+    'hvdXRfZGlzY291bnQYBCABKAFSFHRvdGFsV2l0aG91dERpc2NvdW50');
+
 @$core.Deprecated('Use getCurrentMonthUsageResponseDescriptor instead')
 const GetCurrentMonthUsageResponse$json = {
   '1': 'GetCurrentMonthUsageResponse',
   '2': [
     {'1': 'start_date', '3': 1, '4': 1, '5': 11, '6': '.google.protobuf.Timestamp', '10': 'startDate'},
     {'1': 'end_date', '3': 2, '4': 1, '5': 11, '6': '.google.protobuf.Timestamp', '10': 'endDate'},
-    {'1': 'cloud_storage_usage_cost', '3': 3, '4': 1, '5': 1, '10': 'cloudStorageUsageCost'},
-    {'1': 'data_upload_usage_cost', '3': 4, '4': 1, '5': 1, '10': 'dataUploadUsageCost'},
-    {'1': 'data_egres_usage_cost', '3': 5, '4': 1, '5': 1, '10': 'dataEgresUsageCost'},
-    {'1': 'remote_control_usage_cost', '3': 6, '4': 1, '5': 1, '10': 'remoteControlUsageCost'},
-    {'1': 'standard_compute_usage_cost', '3': 7, '4': 1, '5': 1, '10': 'standardComputeUsageCost'},
-    {'1': 'discount_amount', '3': 8, '4': 1, '5': 1, '10': 'discountAmount'},
-    {'1': 'total_usage_with_discount', '3': 9, '4': 1, '5': 1, '10': 'totalUsageWithDiscount'},
-    {'1': 'total_usage_without_discount', '3': 10, '4': 1, '5': 1, '10': 'totalUsageWithoutDiscount'},
-    {'1': 'per_machine_usage_cost', '3': 11, '4': 1, '5': 1, '10': 'perMachineUsageCost'},
-    {'1': 'binary_data_cloud_storage_usage_cost', '3': 12, '4': 1, '5': 1, '10': 'binaryDataCloudStorageUsageCost'},
-    {'1': 'other_cloud_storage_usage_cost', '3': 13, '4': 1, '5': 1, '10': 'otherCloudStorageUsageCost'},
+    {'1': 'resource_usage_costs_by_source', '3': 14, '4': 3, '5': 11, '6': '.viam.app.v1.ResourceUsageCostsBySource', '10': 'resourceUsageCostsBySource'},
+    {'1': 'subtotal', '3': 15, '4': 1, '5': 1, '10': 'subtotal'},
+    {
+      '1': 'cloud_storage_usage_cost',
+      '3': 3,
+      '4': 1,
+      '5': 1,
+      '8': {'3': true},
+      '10': 'cloudStorageUsageCost',
+    },
+    {
+      '1': 'data_upload_usage_cost',
+      '3': 4,
+      '4': 1,
+      '5': 1,
+      '8': {'3': true},
+      '10': 'dataUploadUsageCost',
+    },
+    {
+      '1': 'data_egres_usage_cost',
+      '3': 5,
+      '4': 1,
+      '5': 1,
+      '8': {'3': true},
+      '10': 'dataEgresUsageCost',
+    },
+    {
+      '1': 'remote_control_usage_cost',
+      '3': 6,
+      '4': 1,
+      '5': 1,
+      '8': {'3': true},
+      '10': 'remoteControlUsageCost',
+    },
+    {
+      '1': 'standard_compute_usage_cost',
+      '3': 7,
+      '4': 1,
+      '5': 1,
+      '8': {'3': true},
+      '10': 'standardComputeUsageCost',
+    },
+    {
+      '1': 'discount_amount',
+      '3': 8,
+      '4': 1,
+      '5': 1,
+      '8': {'3': true},
+      '10': 'discountAmount',
+    },
+    {
+      '1': 'total_usage_with_discount',
+      '3': 9,
+      '4': 1,
+      '5': 1,
+      '8': {'3': true},
+      '10': 'totalUsageWithDiscount',
+    },
+    {
+      '1': 'total_usage_without_discount',
+      '3': 10,
+      '4': 1,
+      '5': 1,
+      '8': {'3': true},
+      '10': 'totalUsageWithoutDiscount',
+    },
+    {
+      '1': 'per_machine_usage_cost',
+      '3': 11,
+      '4': 1,
+      '5': 1,
+      '8': {'3': true},
+      '10': 'perMachineUsageCost',
+    },
+    {
+      '1': 'binary_data_cloud_storage_usage_cost',
+      '3': 12,
+      '4': 1,
+      '5': 1,
+      '8': {'3': true},
+      '10': 'binaryDataCloudStorageUsageCost',
+    },
+    {
+      '1': 'other_cloud_storage_usage_cost',
+      '3': 13,
+      '4': 1,
+      '5': 1,
+      '8': {'3': true},
+      '10': 'otherCloudStorageUsageCost',
+    },
   ],
 };
 
@@ -143,19 +267,22 @@ const GetCurrentMonthUsageResponse$json = {
 final $typed_data.Uint8List getCurrentMonthUsageResponseDescriptor = $convert.base64Decode(
     'ChxHZXRDdXJyZW50TW9udGhVc2FnZVJlc3BvbnNlEjkKCnN0YXJ0X2RhdGUYASABKAsyGi5nb2'
     '9nbGUucHJvdG9idWYuVGltZXN0YW1wUglzdGFydERhdGUSNQoIZW5kX2RhdGUYAiABKAsyGi5n'
-    'b29nbGUucHJvdG9idWYuVGltZXN0YW1wUgdlbmREYXRlEjcKGGNsb3VkX3N0b3JhZ2VfdXNhZ2'
-    'VfY29zdBgDIAEoAVIVY2xvdWRTdG9yYWdlVXNhZ2VDb3N0EjMKFmRhdGFfdXBsb2FkX3VzYWdl'
-    'X2Nvc3QYBCABKAFSE2RhdGFVcGxvYWRVc2FnZUNvc3QSMQoVZGF0YV9lZ3Jlc191c2FnZV9jb3'
-    'N0GAUgASgBUhJkYXRhRWdyZXNVc2FnZUNvc3QSOQoZcmVtb3RlX2NvbnRyb2xfdXNhZ2VfY29z'
-    'dBgGIAEoAVIWcmVtb3RlQ29udHJvbFVzYWdlQ29zdBI9ChtzdGFuZGFyZF9jb21wdXRlX3VzYW'
-    'dlX2Nvc3QYByABKAFSGHN0YW5kYXJkQ29tcHV0ZVVzYWdlQ29zdBInCg9kaXNjb3VudF9hbW91'
-    'bnQYCCABKAFSDmRpc2NvdW50QW1vdW50EjkKGXRvdGFsX3VzYWdlX3dpdGhfZGlzY291bnQYCS'
-    'ABKAFSFnRvdGFsVXNhZ2VXaXRoRGlzY291bnQSPwocdG90YWxfdXNhZ2Vfd2l0aG91dF9kaXNj'
-    'b3VudBgKIAEoAVIZdG90YWxVc2FnZVdpdGhvdXREaXNjb3VudBIzChZwZXJfbWFjaGluZV91c2'
-    'FnZV9jb3N0GAsgASgBUhNwZXJNYWNoaW5lVXNhZ2VDb3N0Ek0KJGJpbmFyeV9kYXRhX2Nsb3Vk'
-    'X3N0b3JhZ2VfdXNhZ2VfY29zdBgMIAEoAVIfYmluYXJ5RGF0YUNsb3VkU3RvcmFnZVVzYWdlQ2'
-    '9zdBJCCh5vdGhlcl9jbG91ZF9zdG9yYWdlX3VzYWdlX2Nvc3QYDSABKAFSGm90aGVyQ2xvdWRT'
-    'dG9yYWdlVXNhZ2VDb3N0');
+    'b29nbGUucHJvdG9idWYuVGltZXN0YW1wUgdlbmREYXRlEmsKHnJlc291cmNlX3VzYWdlX2Nvc3'
+    'RzX2J5X3NvdXJjZRgOIAMoCzInLnZpYW0uYXBwLnYxLlJlc291cmNlVXNhZ2VDb3N0c0J5U291'
+    'cmNlUhpyZXNvdXJjZVVzYWdlQ29zdHNCeVNvdXJjZRIaCghzdWJ0b3RhbBgPIAEoAVIIc3VidG'
+    '90YWwSOwoYY2xvdWRfc3RvcmFnZV91c2FnZV9jb3N0GAMgASgBQgIYAVIVY2xvdWRTdG9yYWdl'
+    'VXNhZ2VDb3N0EjcKFmRhdGFfdXBsb2FkX3VzYWdlX2Nvc3QYBCABKAFCAhgBUhNkYXRhVXBsb2'
+    'FkVXNhZ2VDb3N0EjUKFWRhdGFfZWdyZXNfdXNhZ2VfY29zdBgFIAEoAUICGAFSEmRhdGFFZ3Jl'
+    'c1VzYWdlQ29zdBI9ChlyZW1vdGVfY29udHJvbF91c2FnZV9jb3N0GAYgASgBQgIYAVIWcmVtb3'
+    'RlQ29udHJvbFVzYWdlQ29zdBJBChtzdGFuZGFyZF9jb21wdXRlX3VzYWdlX2Nvc3QYByABKAFC'
+    'AhgBUhhzdGFuZGFyZENvbXB1dGVVc2FnZUNvc3QSKwoPZGlzY291bnRfYW1vdW50GAggASgBQg'
+    'IYAVIOZGlzY291bnRBbW91bnQSPQoZdG90YWxfdXNhZ2Vfd2l0aF9kaXNjb3VudBgJIAEoAUIC'
+    'GAFSFnRvdGFsVXNhZ2VXaXRoRGlzY291bnQSQwocdG90YWxfdXNhZ2Vfd2l0aG91dF9kaXNjb3'
+    'VudBgKIAEoAUICGAFSGXRvdGFsVXNhZ2VXaXRob3V0RGlzY291bnQSNwoWcGVyX21hY2hpbmVf'
+    'dXNhZ2VfY29zdBgLIAEoAUICGAFSE3Blck1hY2hpbmVVc2FnZUNvc3QSUQokYmluYXJ5X2RhdG'
+    'FfY2xvdWRfc3RvcmFnZV91c2FnZV9jb3N0GAwgASgBQgIYAVIfYmluYXJ5RGF0YUNsb3VkU3Rv'
+    'cmFnZVVzYWdlQ29zdBJGCh5vdGhlcl9jbG91ZF9zdG9yYWdlX3VzYWdlX2Nvc3QYDSABKAFCAh'
+    'gBUhpvdGhlckNsb3VkU3RvcmFnZVVzYWdlQ29zdA==');
 
 @$core.Deprecated('Use getOrgBillingInformationRequestDescriptor instead')
 const GetOrgBillingInformationRequest$json = {
diff --git a/lib/src/gen/proto/rpc/examples/fileupload/v1/fileupload.pb.dart b/lib/src/gen/proto/rpc/examples/fileupload/v1/fileupload.pb.dart
deleted file mode 100644
index 04782d52aa..0000000000
--- a/lib/src/gen/proto/rpc/examples/fileupload/v1/fileupload.pb.dart
+++ /dev/null
@@ -1,162 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: proto/rpc/examples/fileupload/v1/fileupload.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-import 'dart:core' as $core;
-
-import 'package:fixnum/fixnum.dart' as $fixnum;
-import 'package:protobuf/protobuf.dart' as $pb;
-
-enum UploadFileRequest_Data {
-  name, 
-  chunkData, 
-  notSet
-}
-
-class UploadFileRequest extends $pb.GeneratedMessage {
-  factory UploadFileRequest({
-    $core.String? name,
-    $core.List<$core.int>? chunkData,
-  }) {
-    final $result = create();
-    if (name != null) {
-      $result.name = name;
-    }
-    if (chunkData != null) {
-      $result.chunkData = chunkData;
-    }
-    return $result;
-  }
-  UploadFileRequest._() : super();
-  factory UploadFileRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory UploadFileRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static const $core.Map<$core.int, UploadFileRequest_Data> _UploadFileRequest_DataByTag = {
-    1 : UploadFileRequest_Data.name,
-    2 : UploadFileRequest_Data.chunkData,
-    0 : UploadFileRequest_Data.notSet
-  };
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UploadFileRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'proto.rpc.examples.fileupload.v1'), createEmptyInstance: create)
-    ..oo(0, [1, 2])
-    ..aOS(1, _omitFieldNames ? '' : 'name')
-    ..a<$core.List<$core.int>>(2, _omitFieldNames ? '' : 'chunkData', $pb.PbFieldType.OY)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  UploadFileRequest clone() => UploadFileRequest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  UploadFileRequest copyWith(void Function(UploadFileRequest) updates) => super.copyWith((message) => updates(message as UploadFileRequest)) as UploadFileRequest;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static UploadFileRequest create() => UploadFileRequest._();
-  UploadFileRequest createEmptyInstance() => create();
-  static $pb.PbList<UploadFileRequest> createRepeated() => $pb.PbList<UploadFileRequest>();
-  @$core.pragma('dart2js:noInline')
-  static UploadFileRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<UploadFileRequest>(create);
-  static UploadFileRequest? _defaultInstance;
-
-  UploadFileRequest_Data whichData() => _UploadFileRequest_DataByTag[$_whichOneof(0)]!;
-  void clearData() => clearField($_whichOneof(0));
-
-  @$pb.TagNumber(1)
-  $core.String get name => $_getSZ(0);
-  @$pb.TagNumber(1)
-  set name($core.String v) { $_setString(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasName() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearName() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.List<$core.int> get chunkData => $_getN(1);
-  @$pb.TagNumber(2)
-  set chunkData($core.List<$core.int> v) { $_setBytes(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasChunkData() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearChunkData() => clearField(2);
-}
-
-class UploadFileResponse extends $pb.GeneratedMessage {
-  factory UploadFileResponse({
-    $core.String? name,
-    $fixnum.Int64? size,
-  }) {
-    final $result = create();
-    if (name != null) {
-      $result.name = name;
-    }
-    if (size != null) {
-      $result.size = size;
-    }
-    return $result;
-  }
-  UploadFileResponse._() : super();
-  factory UploadFileResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory UploadFileResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UploadFileResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'proto.rpc.examples.fileupload.v1'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'name')
-    ..aInt64(2, _omitFieldNames ? '' : 'size')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  UploadFileResponse clone() => UploadFileResponse()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  UploadFileResponse copyWith(void Function(UploadFileResponse) updates) => super.copyWith((message) => updates(message as UploadFileResponse)) as UploadFileResponse;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static UploadFileResponse create() => UploadFileResponse._();
-  UploadFileResponse createEmptyInstance() => create();
-  static $pb.PbList<UploadFileResponse> createRepeated() => $pb.PbList<UploadFileResponse>();
-  @$core.pragma('dart2js:noInline')
-  static UploadFileResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<UploadFileResponse>(create);
-  static UploadFileResponse? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.String get name => $_getSZ(0);
-  @$pb.TagNumber(1)
-  set name($core.String v) { $_setString(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasName() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearName() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $fixnum.Int64 get size => $_getI64(1);
-  @$pb.TagNumber(2)
-  set size($fixnum.Int64 v) { $_setInt64(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasSize() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearSize() => clearField(2);
-}
-
-
-const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/lib/src/gen/proto/rpc/examples/fileupload/v1/fileupload.pbenum.dart b/lib/src/gen/proto/rpc/examples/fileupload/v1/fileupload.pbenum.dart
deleted file mode 100644
index b2fad696e0..0000000000
--- a/lib/src/gen/proto/rpc/examples/fileupload/v1/fileupload.pbenum.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: proto/rpc/examples/fileupload/v1/fileupload.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
diff --git a/lib/src/gen/proto/rpc/examples/fileupload/v1/fileupload.pbgrpc.dart b/lib/src/gen/proto/rpc/examples/fileupload/v1/fileupload.pbgrpc.dart
deleted file mode 100644
index 00488ad95b..0000000000
--- a/lib/src/gen/proto/rpc/examples/fileupload/v1/fileupload.pbgrpc.dart
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: proto/rpc/examples/fileupload/v1/fileupload.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-import 'dart:async' as $async;
-import 'dart:core' as $core;
-
-import 'package:grpc/service_api.dart' as $grpc;
-import 'package:protobuf/protobuf.dart' as $pb;
-
-import 'fileupload.pb.dart' as $2;
-
-export 'fileupload.pb.dart';
-
-@$pb.GrpcServiceName('proto.rpc.examples.fileupload.v1.FileUploadService')
-class FileUploadServiceClient extends $grpc.Client {
-  static final _$uploadFile = $grpc.ClientMethod<$2.UploadFileRequest, $2.UploadFileResponse>(
-      '/proto.rpc.examples.fileupload.v1.FileUploadService/UploadFile',
-      ($2.UploadFileRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $2.UploadFileResponse.fromBuffer(value));
-
-  FileUploadServiceClient($grpc.ClientChannel channel,
-      {$grpc.CallOptions? options,
-      $core.Iterable<$grpc.ClientInterceptor>? interceptors})
-      : super(channel, options: options,
-        interceptors: interceptors);
-
-  $grpc.ResponseFuture<$2.UploadFileResponse> uploadFile($async.Stream<$2.UploadFileRequest> request, {$grpc.CallOptions? options}) {
-    return $createStreamingCall(_$uploadFile, request, options: options).single;
-  }
-}
-
-@$pb.GrpcServiceName('proto.rpc.examples.fileupload.v1.FileUploadService')
-abstract class FileUploadServiceBase extends $grpc.Service {
-  $core.String get $name => 'proto.rpc.examples.fileupload.v1.FileUploadService';
-
-  FileUploadServiceBase() {
-    $addMethod($grpc.ServiceMethod<$2.UploadFileRequest, $2.UploadFileResponse>(
-        'UploadFile',
-        uploadFile,
-        true,
-        false,
-        ($core.List<$core.int> value) => $2.UploadFileRequest.fromBuffer(value),
-        ($2.UploadFileResponse value) => value.writeToBuffer()));
-  }
-
-  $async.Future<$2.UploadFileResponse> uploadFile($grpc.ServiceCall call, $async.Stream<$2.UploadFileRequest> request);
-}
diff --git a/lib/src/gen/proto/rpc/examples/fileupload/v1/fileupload.pbjson.dart b/lib/src/gen/proto/rpc/examples/fileupload/v1/fileupload.pbjson.dart
deleted file mode 100644
index 568bcf25c6..0000000000
--- a/lib/src/gen/proto/rpc/examples/fileupload/v1/fileupload.pbjson.dart
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: proto/rpc/examples/fileupload/v1/fileupload.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-import 'dart:convert' as $convert;
-import 'dart:core' as $core;
-import 'dart:typed_data' as $typed_data;
-
-@$core.Deprecated('Use uploadFileRequestDescriptor instead')
-const UploadFileRequest$json = {
-  '1': 'UploadFileRequest',
-  '2': [
-    {'1': 'name', '3': 1, '4': 1, '5': 9, '9': 0, '10': 'name'},
-    {'1': 'chunk_data', '3': 2, '4': 1, '5': 12, '9': 0, '10': 'chunkData'},
-  ],
-  '8': [
-    {'1': 'data'},
-  ],
-};
-
-/// Descriptor for `UploadFileRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List uploadFileRequestDescriptor = $convert.base64Decode(
-    'ChFVcGxvYWRGaWxlUmVxdWVzdBIUCgRuYW1lGAEgASgJSABSBG5hbWUSHwoKY2h1bmtfZGF0YR'
-    'gCIAEoDEgAUgljaHVua0RhdGFCBgoEZGF0YQ==');
-
-@$core.Deprecated('Use uploadFileResponseDescriptor instead')
-const UploadFileResponse$json = {
-  '1': 'UploadFileResponse',
-  '2': [
-    {'1': 'name', '3': 1, '4': 1, '5': 9, '10': 'name'},
-    {'1': 'size', '3': 2, '4': 1, '5': 3, '10': 'size'},
-  ],
-};
-
-/// Descriptor for `UploadFileResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List uploadFileResponseDescriptor = $convert.base64Decode(
-    'ChJVcGxvYWRGaWxlUmVzcG9uc2USEgoEbmFtZRgBIAEoCVIEbmFtZRISCgRzaXplGAIgASgDUg'
-    'RzaXpl');
-
diff --git a/lib/src/gen/proto/rpc/v1/auth.pbgrpc.dart b/lib/src/gen/proto/rpc/v1/auth.pbgrpc.dart
index f61f050a15..f25de4166b 100644
--- a/lib/src/gen/proto/rpc/v1/auth.pbgrpc.dart
+++ b/lib/src/gen/proto/rpc/v1/auth.pbgrpc.dart
@@ -15,16 +15,16 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'auth.pb.dart' as $3;
+import 'auth.pb.dart' as $2;
 
 export 'auth.pb.dart';
 
 @$pb.GrpcServiceName('proto.rpc.v1.AuthService')
 class AuthServiceClient extends $grpc.Client {
-  static final _$authenticate = $grpc.ClientMethod<$3.AuthenticateRequest, $3.AuthenticateResponse>(
+  static final _$authenticate = $grpc.ClientMethod<$2.AuthenticateRequest, $2.AuthenticateResponse>(
       '/proto.rpc.v1.AuthService/Authenticate',
-      ($3.AuthenticateRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $3.AuthenticateResponse.fromBuffer(value));
+      ($2.AuthenticateRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $2.AuthenticateResponse.fromBuffer(value));
 
   AuthServiceClient($grpc.ClientChannel channel,
       {$grpc.CallOptions? options,
@@ -32,7 +32,7 @@ class AuthServiceClient extends $grpc.Client {
       : super(channel, options: options,
         interceptors: interceptors);
 
-  $grpc.ResponseFuture<$3.AuthenticateResponse> authenticate($3.AuthenticateRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$2.AuthenticateResponse> authenticate($2.AuthenticateRequest request, {$grpc.CallOptions? options}) {
     return $createUnaryCall(_$authenticate, request, options: options);
   }
 }
@@ -42,27 +42,27 @@ abstract class AuthServiceBase extends $grpc.Service {
   $core.String get $name => 'proto.rpc.v1.AuthService';
 
   AuthServiceBase() {
-    $addMethod($grpc.ServiceMethod<$3.AuthenticateRequest, $3.AuthenticateResponse>(
+    $addMethod($grpc.ServiceMethod<$2.AuthenticateRequest, $2.AuthenticateResponse>(
         'Authenticate',
         authenticate_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $3.AuthenticateRequest.fromBuffer(value),
-        ($3.AuthenticateResponse value) => value.writeToBuffer()));
+        ($core.List<$core.int> value) => $2.AuthenticateRequest.fromBuffer(value),
+        ($2.AuthenticateResponse value) => value.writeToBuffer()));
   }
 
-  $async.Future<$3.AuthenticateResponse> authenticate_Pre($grpc.ServiceCall call, $async.Future<$3.AuthenticateRequest> request) async {
+  $async.Future<$2.AuthenticateResponse> authenticate_Pre($grpc.ServiceCall call, $async.Future<$2.AuthenticateRequest> request) async {
     return authenticate(call, await request);
   }
 
-  $async.Future<$3.AuthenticateResponse> authenticate($grpc.ServiceCall call, $3.AuthenticateRequest request);
+  $async.Future<$2.AuthenticateResponse> authenticate($grpc.ServiceCall call, $2.AuthenticateRequest request);
 }
 @$pb.GrpcServiceName('proto.rpc.v1.ExternalAuthService')
 class ExternalAuthServiceClient extends $grpc.Client {
-  static final _$authenticateTo = $grpc.ClientMethod<$3.AuthenticateToRequest, $3.AuthenticateToResponse>(
+  static final _$authenticateTo = $grpc.ClientMethod<$2.AuthenticateToRequest, $2.AuthenticateToResponse>(
       '/proto.rpc.v1.ExternalAuthService/AuthenticateTo',
-      ($3.AuthenticateToRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $3.AuthenticateToResponse.fromBuffer(value));
+      ($2.AuthenticateToRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $2.AuthenticateToResponse.fromBuffer(value));
 
   ExternalAuthServiceClient($grpc.ClientChannel channel,
       {$grpc.CallOptions? options,
@@ -70,7 +70,7 @@ class ExternalAuthServiceClient extends $grpc.Client {
       : super(channel, options: options,
         interceptors: interceptors);
 
-  $grpc.ResponseFuture<$3.AuthenticateToResponse> authenticateTo($3.AuthenticateToRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$2.AuthenticateToResponse> authenticateTo($2.AuthenticateToRequest request, {$grpc.CallOptions? options}) {
     return $createUnaryCall(_$authenticateTo, request, options: options);
   }
 }
@@ -80,18 +80,18 @@ abstract class ExternalAuthServiceBase extends $grpc.Service {
   $core.String get $name => 'proto.rpc.v1.ExternalAuthService';
 
   ExternalAuthServiceBase() {
-    $addMethod($grpc.ServiceMethod<$3.AuthenticateToRequest, $3.AuthenticateToResponse>(
+    $addMethod($grpc.ServiceMethod<$2.AuthenticateToRequest, $2.AuthenticateToResponse>(
         'AuthenticateTo',
         authenticateTo_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $3.AuthenticateToRequest.fromBuffer(value),
-        ($3.AuthenticateToResponse value) => value.writeToBuffer()));
+        ($core.List<$core.int> value) => $2.AuthenticateToRequest.fromBuffer(value),
+        ($2.AuthenticateToResponse value) => value.writeToBuffer()));
   }
 
-  $async.Future<$3.AuthenticateToResponse> authenticateTo_Pre($grpc.ServiceCall call, $async.Future<$3.AuthenticateToRequest> request) async {
+  $async.Future<$2.AuthenticateToResponse> authenticateTo_Pre($grpc.ServiceCall call, $async.Future<$2.AuthenticateToRequest> request) async {
     return authenticateTo(call, await request);
   }
 
-  $async.Future<$3.AuthenticateToResponse> authenticateTo($grpc.ServiceCall call, $3.AuthenticateToRequest request);
+  $async.Future<$2.AuthenticateToResponse> authenticateTo($grpc.ServiceCall call, $2.AuthenticateToRequest request);
 }
diff --git a/lib/src/gen/proto/rpc/webrtc/v1/grpc.pb.dart b/lib/src/gen/proto/rpc/webrtc/v1/grpc.pb.dart
index 27f97aa373..b926aa9c29 100644
--- a/lib/src/gen/proto/rpc/webrtc/v1/grpc.pb.dart
+++ b/lib/src/gen/proto/rpc/webrtc/v1/grpc.pb.dart
@@ -14,8 +14,8 @@ import 'dart:core' as $core;
 import 'package:fixnum/fixnum.dart' as $fixnum;
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import '../../../../google/protobuf/duration.pb.dart' as $5;
-import '../../../../google/rpc/status.pb.dart' as $6;
+import '../../../../google/protobuf/duration.pb.dart' as $4;
+import '../../../../google/rpc/status.pb.dart' as $5;
 
 /// A PacketMessage is used to packetize large messages (> 64KiB) to be able to safely
 /// transmit over WebRTC data channels.
@@ -259,7 +259,7 @@ class RequestHeaders extends $pb.GeneratedMessage {
   factory RequestHeaders({
     $core.String? method,
     Metadata? metadata,
-    $5.Duration? timeout,
+    $4.Duration? timeout,
   }) {
     final $result = create();
     if (method != null) {
@@ -280,7 +280,7 @@ class RequestHeaders extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RequestHeaders', package: const $pb.PackageName(_omitMessageNames ? '' : 'proto.rpc.webrtc.v1'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'method')
     ..aOM<Metadata>(2, _omitFieldNames ? '' : 'metadata', subBuilder: Metadata.create)
-    ..aOM<$5.Duration>(3, _omitFieldNames ? '' : 'timeout', subBuilder: $5.Duration.create)
+    ..aOM<$4.Duration>(3, _omitFieldNames ? '' : 'timeout', subBuilder: $4.Duration.create)
     ..hasRequiredFields = false
   ;
 
@@ -326,15 +326,15 @@ class RequestHeaders extends $pb.GeneratedMessage {
   Metadata ensureMetadata() => $_ensure(1);
 
   @$pb.TagNumber(3)
-  $5.Duration get timeout => $_getN(2);
+  $4.Duration get timeout => $_getN(2);
   @$pb.TagNumber(3)
-  set timeout($5.Duration v) { setField(3, v); }
+  set timeout($4.Duration v) { setField(3, v); }
   @$pb.TagNumber(3)
   $core.bool hasTimeout() => $_has(2);
   @$pb.TagNumber(3)
   void clearTimeout() => clearField(3);
   @$pb.TagNumber(3)
-  $5.Duration ensureTimeout() => $_ensure(2);
+  $4.Duration ensureTimeout() => $_ensure(2);
 }
 
 /// A RequestMessage contains individual gRPC messages and a potential
@@ -650,7 +650,7 @@ class ResponseMessage extends $pb.GeneratedMessage {
 /// ResponseTrailers contain the status of a response and any custom metadata.
 class ResponseTrailers extends $pb.GeneratedMessage {
   factory ResponseTrailers({
-    $6.Status? status,
+    $5.Status? status,
     Metadata? metadata,
   }) {
     final $result = create();
@@ -667,7 +667,7 @@ class ResponseTrailers extends $pb.GeneratedMessage {
   factory ResponseTrailers.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ResponseTrailers', package: const $pb.PackageName(_omitMessageNames ? '' : 'proto.rpc.webrtc.v1'), createEmptyInstance: create)
-    ..aOM<$6.Status>(1, _omitFieldNames ? '' : 'status', subBuilder: $6.Status.create)
+    ..aOM<$5.Status>(1, _omitFieldNames ? '' : 'status', subBuilder: $5.Status.create)
     ..aOM<Metadata>(2, _omitFieldNames ? '' : 'metadata', subBuilder: Metadata.create)
     ..hasRequiredFields = false
   ;
@@ -694,15 +694,15 @@ class ResponseTrailers extends $pb.GeneratedMessage {
   static ResponseTrailers? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $6.Status get status => $_getN(0);
+  $5.Status get status => $_getN(0);
   @$pb.TagNumber(1)
-  set status($6.Status v) { setField(1, v); }
+  set status($5.Status v) { setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasStatus() => $_has(0);
   @$pb.TagNumber(1)
   void clearStatus() => clearField(1);
   @$pb.TagNumber(1)
-  $6.Status ensureStatus() => $_ensure(0);
+  $5.Status ensureStatus() => $_ensure(0);
 
   @$pb.TagNumber(2)
   Metadata get metadata => $_getN(1);
diff --git a/lib/src/gen/proto/rpc/webrtc/v1/signaling.pb.dart b/lib/src/gen/proto/rpc/webrtc/v1/signaling.pb.dart
index f50307c4e3..2fed37a316 100644
--- a/lib/src/gen/proto/rpc/webrtc/v1/signaling.pb.dart
+++ b/lib/src/gen/proto/rpc/webrtc/v1/signaling.pb.dart
@@ -13,8 +13,8 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import '../../../../google/protobuf/timestamp.pb.dart' as $7;
-import '../../../../google/rpc/status.pb.dart' as $6;
+import '../../../../google/protobuf/timestamp.pb.dart' as $6;
+import '../../../../google/rpc/status.pb.dart' as $5;
 
 /// ICECandidate represents an ICE candidate.
 /// From https://github.com/pion/webrtc/blob/5f6baf73255598a7b4a7c9400bb0381acc9aa3dc/icecandidateinit.go
@@ -395,7 +395,7 @@ class CallUpdateRequest extends $pb.GeneratedMessage {
     $core.String? uuid,
     ICECandidate? candidate,
     $core.bool? done,
-    $6.Status? error,
+    $5.Status? error,
   }) {
     final $result = create();
     if (uuid != null) {
@@ -427,7 +427,7 @@ class CallUpdateRequest extends $pb.GeneratedMessage {
     ..aOS(1, _omitFieldNames ? '' : 'uuid')
     ..aOM<ICECandidate>(2, _omitFieldNames ? '' : 'candidate', subBuilder: ICECandidate.create)
     ..aOB(3, _omitFieldNames ? '' : 'done')
-    ..aOM<$6.Status>(4, _omitFieldNames ? '' : 'error', subBuilder: $6.Status.create)
+    ..aOM<$5.Status>(4, _omitFieldNames ? '' : 'error', subBuilder: $5.Status.create)
     ..hasRequiredFields = false
   ;
 
@@ -485,15 +485,15 @@ class CallUpdateRequest extends $pb.GeneratedMessage {
   void clearDone() => clearField(3);
 
   @$pb.TagNumber(4)
-  $6.Status get error => $_getN(3);
+  $5.Status get error => $_getN(3);
   @$pb.TagNumber(4)
-  set error($6.Status v) { setField(4, v); }
+  set error($5.Status v) { setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasError() => $_has(3);
   @$pb.TagNumber(4)
   void clearError() => clearField(4);
   @$pb.TagNumber(4)
-  $6.Status ensureError() => $_ensure(3);
+  $5.Status ensureError() => $_ensure(3);
 }
 
 /// CallUpdateResponse contains nothing in response to a call update.
@@ -669,7 +669,7 @@ class AnswerRequestInitStage extends $pb.GeneratedMessage {
   factory AnswerRequestInitStage({
     $core.String? sdp,
     WebRTCConfig? optionalConfig,
-    $7.Timestamp? deadline,
+    $6.Timestamp? deadline,
   }) {
     final $result = create();
     if (sdp != null) {
@@ -690,7 +690,7 @@ class AnswerRequestInitStage extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AnswerRequestInitStage', package: const $pb.PackageName(_omitMessageNames ? '' : 'proto.rpc.webrtc.v1'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'sdp')
     ..aOM<WebRTCConfig>(2, _omitFieldNames ? '' : 'optionalConfig', subBuilder: WebRTCConfig.create)
-    ..aOM<$7.Timestamp>(3, _omitFieldNames ? '' : 'deadline', subBuilder: $7.Timestamp.create)
+    ..aOM<$6.Timestamp>(3, _omitFieldNames ? '' : 'deadline', subBuilder: $6.Timestamp.create)
     ..hasRequiredFields = false
   ;
 
@@ -736,15 +736,15 @@ class AnswerRequestInitStage extends $pb.GeneratedMessage {
   WebRTCConfig ensureOptionalConfig() => $_ensure(1);
 
   @$pb.TagNumber(3)
-  $7.Timestamp get deadline => $_getN(2);
+  $6.Timestamp get deadline => $_getN(2);
   @$pb.TagNumber(3)
-  set deadline($7.Timestamp v) { setField(3, v); }
+  set deadline($6.Timestamp v) { setField(3, v); }
   @$pb.TagNumber(3)
   $core.bool hasDeadline() => $_has(2);
   @$pb.TagNumber(3)
   void clearDeadline() => clearField(3);
   @$pb.TagNumber(3)
-  $7.Timestamp ensureDeadline() => $_ensure(2);
+  $6.Timestamp ensureDeadline() => $_ensure(2);
 }
 
 /// AnswerRequestUpdateStage is multiply used to trickle in ICE candidates to
@@ -837,7 +837,7 @@ class AnswerRequestDoneStage extends $pb.GeneratedMessage {
 /// AnswerRequestErrorStage indicates the exchange has failed with an error.
 class AnswerRequestErrorStage extends $pb.GeneratedMessage {
   factory AnswerRequestErrorStage({
-    $6.Status? status,
+    $5.Status? status,
   }) {
     final $result = create();
     if (status != null) {
@@ -850,7 +850,7 @@ class AnswerRequestErrorStage extends $pb.GeneratedMessage {
   factory AnswerRequestErrorStage.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AnswerRequestErrorStage', package: const $pb.PackageName(_omitMessageNames ? '' : 'proto.rpc.webrtc.v1'), createEmptyInstance: create)
-    ..aOM<$6.Status>(1, _omitFieldNames ? '' : 'status', subBuilder: $6.Status.create)
+    ..aOM<$5.Status>(1, _omitFieldNames ? '' : 'status', subBuilder: $5.Status.create)
     ..hasRequiredFields = false
   ;
 
@@ -876,15 +876,48 @@ class AnswerRequestErrorStage extends $pb.GeneratedMessage {
   static AnswerRequestErrorStage? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $6.Status get status => $_getN(0);
+  $5.Status get status => $_getN(0);
   @$pb.TagNumber(1)
-  set status($6.Status v) { setField(1, v); }
+  set status($5.Status v) { setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasStatus() => $_has(0);
   @$pb.TagNumber(1)
   void clearStatus() => clearField(1);
   @$pb.TagNumber(1)
-  $6.Status ensureStatus() => $_ensure(0);
+  $5.Status ensureStatus() => $_ensure(0);
+}
+
+/// AnswerRequestHeartbeatStage is sent periodically to verify liveness of answerer.
+class AnswerRequestHeartbeatStage extends $pb.GeneratedMessage {
+  factory AnswerRequestHeartbeatStage() => create();
+  AnswerRequestHeartbeatStage._() : super();
+  factory AnswerRequestHeartbeatStage.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory AnswerRequestHeartbeatStage.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AnswerRequestHeartbeatStage', package: const $pb.PackageName(_omitMessageNames ? '' : 'proto.rpc.webrtc.v1'), createEmptyInstance: create)
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  AnswerRequestHeartbeatStage clone() => AnswerRequestHeartbeatStage()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  AnswerRequestHeartbeatStage copyWith(void Function(AnswerRequestHeartbeatStage) updates) => super.copyWith((message) => updates(message as AnswerRequestHeartbeatStage)) as AnswerRequestHeartbeatStage;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static AnswerRequestHeartbeatStage create() => AnswerRequestHeartbeatStage._();
+  AnswerRequestHeartbeatStage createEmptyInstance() => create();
+  static $pb.PbList<AnswerRequestHeartbeatStage> createRepeated() => $pb.PbList<AnswerRequestHeartbeatStage>();
+  @$core.pragma('dart2js:noInline')
+  static AnswerRequestHeartbeatStage getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<AnswerRequestHeartbeatStage>(create);
+  static AnswerRequestHeartbeatStage? _defaultInstance;
 }
 
 enum AnswerRequest_Stage {
@@ -892,6 +925,7 @@ enum AnswerRequest_Stage {
   update, 
   done, 
   error, 
+  heartbeat, 
   notSet
 }
 
@@ -904,6 +938,7 @@ class AnswerRequest extends $pb.GeneratedMessage {
     AnswerRequestUpdateStage? update,
     AnswerRequestDoneStage? done,
     AnswerRequestErrorStage? error,
+    AnswerRequestHeartbeatStage? heartbeat,
   }) {
     final $result = create();
     if (uuid != null) {
@@ -921,6 +956,9 @@ class AnswerRequest extends $pb.GeneratedMessage {
     if (error != null) {
       $result.error = error;
     }
+    if (heartbeat != null) {
+      $result.heartbeat = heartbeat;
+    }
     return $result;
   }
   AnswerRequest._() : super();
@@ -932,15 +970,17 @@ class AnswerRequest extends $pb.GeneratedMessage {
     3 : AnswerRequest_Stage.update,
     4 : AnswerRequest_Stage.done,
     5 : AnswerRequest_Stage.error,
+    6 : AnswerRequest_Stage.heartbeat,
     0 : AnswerRequest_Stage.notSet
   };
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AnswerRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'proto.rpc.webrtc.v1'), createEmptyInstance: create)
-    ..oo(0, [2, 3, 4, 5])
+    ..oo(0, [2, 3, 4, 5, 6])
     ..aOS(1, _omitFieldNames ? '' : 'uuid')
     ..aOM<AnswerRequestInitStage>(2, _omitFieldNames ? '' : 'init', subBuilder: AnswerRequestInitStage.create)
     ..aOM<AnswerRequestUpdateStage>(3, _omitFieldNames ? '' : 'update', subBuilder: AnswerRequestUpdateStage.create)
     ..aOM<AnswerRequestDoneStage>(4, _omitFieldNames ? '' : 'done', subBuilder: AnswerRequestDoneStage.create)
     ..aOM<AnswerRequestErrorStage>(5, _omitFieldNames ? '' : 'error', subBuilder: AnswerRequestErrorStage.create)
+    ..aOM<AnswerRequestHeartbeatStage>(6, _omitFieldNames ? '' : 'heartbeat', subBuilder: AnswerRequestHeartbeatStage.create)
     ..hasRequiredFields = false
   ;
 
@@ -1022,6 +1062,18 @@ class AnswerRequest extends $pb.GeneratedMessage {
   void clearError() => clearField(5);
   @$pb.TagNumber(5)
   AnswerRequestErrorStage ensureError() => $_ensure(4);
+
+  /// heartbeat is sent periodically to verify liveness of answerer
+  @$pb.TagNumber(6)
+  AnswerRequestHeartbeatStage get heartbeat => $_getN(5);
+  @$pb.TagNumber(6)
+  set heartbeat(AnswerRequestHeartbeatStage v) { setField(6, v); }
+  @$pb.TagNumber(6)
+  $core.bool hasHeartbeat() => $_has(5);
+  @$pb.TagNumber(6)
+  void clearHeartbeat() => clearField(6);
+  @$pb.TagNumber(6)
+  AnswerRequestHeartbeatStage ensureHeartbeat() => $_ensure(5);
 }
 
 /// AnswerResponseInitStage is the first and a one time stage that represents the
@@ -1166,7 +1218,7 @@ class AnswerResponseDoneStage extends $pb.GeneratedMessage {
 /// AnswerResponseErrorStage indicates the exchange has failed with an error.
 class AnswerResponseErrorStage extends $pb.GeneratedMessage {
   factory AnswerResponseErrorStage({
-    $6.Status? status,
+    $5.Status? status,
   }) {
     final $result = create();
     if (status != null) {
@@ -1179,7 +1231,7 @@ class AnswerResponseErrorStage extends $pb.GeneratedMessage {
   factory AnswerResponseErrorStage.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AnswerResponseErrorStage', package: const $pb.PackageName(_omitMessageNames ? '' : 'proto.rpc.webrtc.v1'), createEmptyInstance: create)
-    ..aOM<$6.Status>(1, _omitFieldNames ? '' : 'status', subBuilder: $6.Status.create)
+    ..aOM<$5.Status>(1, _omitFieldNames ? '' : 'status', subBuilder: $5.Status.create)
     ..hasRequiredFields = false
   ;
 
@@ -1205,15 +1257,15 @@ class AnswerResponseErrorStage extends $pb.GeneratedMessage {
   static AnswerResponseErrorStage? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $6.Status get status => $_getN(0);
+  $5.Status get status => $_getN(0);
   @$pb.TagNumber(1)
-  set status($6.Status v) { setField(1, v); }
+  set status($5.Status v) { setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasStatus() => $_has(0);
   @$pb.TagNumber(1)
   void clearStatus() => clearField(1);
   @$pb.TagNumber(1)
-  $6.Status ensureStatus() => $_ensure(0);
+  $5.Status ensureStatus() => $_ensure(0);
 }
 
 enum AnswerResponse_Stage {
diff --git a/lib/src/gen/proto/rpc/webrtc/v1/signaling.pbgrpc.dart b/lib/src/gen/proto/rpc/webrtc/v1/signaling.pbgrpc.dart
index 89a6d7ee89..506585106a 100644
--- a/lib/src/gen/proto/rpc/webrtc/v1/signaling.pbgrpc.dart
+++ b/lib/src/gen/proto/rpc/webrtc/v1/signaling.pbgrpc.dart
@@ -15,28 +15,28 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'signaling.pb.dart' as $4;
+import 'signaling.pb.dart' as $3;
 
 export 'signaling.pb.dart';
 
 @$pb.GrpcServiceName('proto.rpc.webrtc.v1.SignalingService')
 class SignalingServiceClient extends $grpc.Client {
-  static final _$call = $grpc.ClientMethod<$4.CallRequest, $4.CallResponse>(
+  static final _$call = $grpc.ClientMethod<$3.CallRequest, $3.CallResponse>(
       '/proto.rpc.webrtc.v1.SignalingService/Call',
-      ($4.CallRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $4.CallResponse.fromBuffer(value));
-  static final _$callUpdate = $grpc.ClientMethod<$4.CallUpdateRequest, $4.CallUpdateResponse>(
+      ($3.CallRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $3.CallResponse.fromBuffer(value));
+  static final _$callUpdate = $grpc.ClientMethod<$3.CallUpdateRequest, $3.CallUpdateResponse>(
       '/proto.rpc.webrtc.v1.SignalingService/CallUpdate',
-      ($4.CallUpdateRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $4.CallUpdateResponse.fromBuffer(value));
-  static final _$answer = $grpc.ClientMethod<$4.AnswerResponse, $4.AnswerRequest>(
+      ($3.CallUpdateRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $3.CallUpdateResponse.fromBuffer(value));
+  static final _$answer = $grpc.ClientMethod<$3.AnswerResponse, $3.AnswerRequest>(
       '/proto.rpc.webrtc.v1.SignalingService/Answer',
-      ($4.AnswerResponse value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $4.AnswerRequest.fromBuffer(value));
-  static final _$optionalWebRTCConfig = $grpc.ClientMethod<$4.OptionalWebRTCConfigRequest, $4.OptionalWebRTCConfigResponse>(
+      ($3.AnswerResponse value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $3.AnswerRequest.fromBuffer(value));
+  static final _$optionalWebRTCConfig = $grpc.ClientMethod<$3.OptionalWebRTCConfigRequest, $3.OptionalWebRTCConfigResponse>(
       '/proto.rpc.webrtc.v1.SignalingService/OptionalWebRTCConfig',
-      ($4.OptionalWebRTCConfigRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $4.OptionalWebRTCConfigResponse.fromBuffer(value));
+      ($3.OptionalWebRTCConfigRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $3.OptionalWebRTCConfigResponse.fromBuffer(value));
 
   SignalingServiceClient($grpc.ClientChannel channel,
       {$grpc.CallOptions? options,
@@ -44,19 +44,19 @@ class SignalingServiceClient extends $grpc.Client {
       : super(channel, options: options,
         interceptors: interceptors);
 
-  $grpc.ResponseStream<$4.CallResponse> call($4.CallRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseStream<$3.CallResponse> call($3.CallRequest request, {$grpc.CallOptions? options}) {
     return $createStreamingCall(_$call, $async.Stream.fromIterable([request]), options: options);
   }
 
-  $grpc.ResponseFuture<$4.CallUpdateResponse> callUpdate($4.CallUpdateRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$3.CallUpdateResponse> callUpdate($3.CallUpdateRequest request, {$grpc.CallOptions? options}) {
     return $createUnaryCall(_$callUpdate, request, options: options);
   }
 
-  $grpc.ResponseStream<$4.AnswerRequest> answer($async.Stream<$4.AnswerResponse> request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseStream<$3.AnswerRequest> answer($async.Stream<$3.AnswerResponse> request, {$grpc.CallOptions? options}) {
     return $createStreamingCall(_$answer, request, options: options);
   }
 
-  $grpc.ResponseFuture<$4.OptionalWebRTCConfigResponse> optionalWebRTCConfig($4.OptionalWebRTCConfigRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$3.OptionalWebRTCConfigResponse> optionalWebRTCConfig($3.OptionalWebRTCConfigRequest request, {$grpc.CallOptions? options}) {
     return $createUnaryCall(_$optionalWebRTCConfig, request, options: options);
   }
 }
@@ -66,50 +66,50 @@ abstract class SignalingServiceBase extends $grpc.Service {
   $core.String get $name => 'proto.rpc.webrtc.v1.SignalingService';
 
   SignalingServiceBase() {
-    $addMethod($grpc.ServiceMethod<$4.CallRequest, $4.CallResponse>(
+    $addMethod($grpc.ServiceMethod<$3.CallRequest, $3.CallResponse>(
         'Call',
         call_Pre,
         false,
         true,
-        ($core.List<$core.int> value) => $4.CallRequest.fromBuffer(value),
-        ($4.CallResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$4.CallUpdateRequest, $4.CallUpdateResponse>(
+        ($core.List<$core.int> value) => $3.CallRequest.fromBuffer(value),
+        ($3.CallResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$3.CallUpdateRequest, $3.CallUpdateResponse>(
         'CallUpdate',
         callUpdate_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $4.CallUpdateRequest.fromBuffer(value),
-        ($4.CallUpdateResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$4.AnswerResponse, $4.AnswerRequest>(
+        ($core.List<$core.int> value) => $3.CallUpdateRequest.fromBuffer(value),
+        ($3.CallUpdateResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$3.AnswerResponse, $3.AnswerRequest>(
         'Answer',
         answer,
         true,
         true,
-        ($core.List<$core.int> value) => $4.AnswerResponse.fromBuffer(value),
-        ($4.AnswerRequest value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$4.OptionalWebRTCConfigRequest, $4.OptionalWebRTCConfigResponse>(
+        ($core.List<$core.int> value) => $3.AnswerResponse.fromBuffer(value),
+        ($3.AnswerRequest value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$3.OptionalWebRTCConfigRequest, $3.OptionalWebRTCConfigResponse>(
         'OptionalWebRTCConfig',
         optionalWebRTCConfig_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $4.OptionalWebRTCConfigRequest.fromBuffer(value),
-        ($4.OptionalWebRTCConfigResponse value) => value.writeToBuffer()));
+        ($core.List<$core.int> value) => $3.OptionalWebRTCConfigRequest.fromBuffer(value),
+        ($3.OptionalWebRTCConfigResponse value) => value.writeToBuffer()));
   }
 
-  $async.Stream<$4.CallResponse> call_Pre($grpc.ServiceCall call, $async.Future<$4.CallRequest> request) async* {
+  $async.Stream<$3.CallResponse> call_Pre($grpc.ServiceCall call, $async.Future<$3.CallRequest> request) async* {
     yield* this.call(call, await request);
   }
 
-  $async.Future<$4.CallUpdateResponse> callUpdate_Pre($grpc.ServiceCall call, $async.Future<$4.CallUpdateRequest> request) async {
+  $async.Future<$3.CallUpdateResponse> callUpdate_Pre($grpc.ServiceCall call, $async.Future<$3.CallUpdateRequest> request) async {
     return callUpdate(call, await request);
   }
 
-  $async.Future<$4.OptionalWebRTCConfigResponse> optionalWebRTCConfig_Pre($grpc.ServiceCall call, $async.Future<$4.OptionalWebRTCConfigRequest> request) async {
+  $async.Future<$3.OptionalWebRTCConfigResponse> optionalWebRTCConfig_Pre($grpc.ServiceCall call, $async.Future<$3.OptionalWebRTCConfigRequest> request) async {
     return optionalWebRTCConfig(call, await request);
   }
 
-  $async.Stream<$4.CallResponse> call($grpc.ServiceCall call, $4.CallRequest request);
-  $async.Future<$4.CallUpdateResponse> callUpdate($grpc.ServiceCall call, $4.CallUpdateRequest request);
-  $async.Stream<$4.AnswerRequest> answer($grpc.ServiceCall call, $async.Stream<$4.AnswerResponse> request);
-  $async.Future<$4.OptionalWebRTCConfigResponse> optionalWebRTCConfig($grpc.ServiceCall call, $4.OptionalWebRTCConfigRequest request);
+  $async.Stream<$3.CallResponse> call($grpc.ServiceCall call, $3.CallRequest request);
+  $async.Future<$3.CallUpdateResponse> callUpdate($grpc.ServiceCall call, $3.CallUpdateRequest request);
+  $async.Stream<$3.AnswerRequest> answer($grpc.ServiceCall call, $async.Stream<$3.AnswerResponse> request);
+  $async.Future<$3.OptionalWebRTCConfigResponse> optionalWebRTCConfig($grpc.ServiceCall call, $3.OptionalWebRTCConfigRequest request);
 }
diff --git a/lib/src/gen/proto/rpc/webrtc/v1/signaling.pbjson.dart b/lib/src/gen/proto/rpc/webrtc/v1/signaling.pbjson.dart
index b88470bd98..87565605c9 100644
--- a/lib/src/gen/proto/rpc/webrtc/v1/signaling.pbjson.dart
+++ b/lib/src/gen/proto/rpc/webrtc/v1/signaling.pbjson.dart
@@ -211,6 +211,15 @@ final $typed_data.Uint8List answerRequestErrorStageDescriptor = $convert.base64D
     'ChdBbnN3ZXJSZXF1ZXN0RXJyb3JTdGFnZRIqCgZzdGF0dXMYASABKAsyEi5nb29nbGUucnBjLl'
     'N0YXR1c1IGc3RhdHVz');
 
+@$core.Deprecated('Use answerRequestHeartbeatStageDescriptor instead')
+const AnswerRequestHeartbeatStage$json = {
+  '1': 'AnswerRequestHeartbeatStage',
+};
+
+/// Descriptor for `AnswerRequestHeartbeatStage`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List answerRequestHeartbeatStageDescriptor = $convert.base64Decode(
+    'ChtBbnN3ZXJSZXF1ZXN0SGVhcnRiZWF0U3RhZ2U=');
+
 @$core.Deprecated('Use answerRequestDescriptor instead')
 const AnswerRequest$json = {
   '1': 'AnswerRequest',
@@ -220,6 +229,7 @@ const AnswerRequest$json = {
     {'1': 'update', '3': 3, '4': 1, '5': 11, '6': '.proto.rpc.webrtc.v1.AnswerRequestUpdateStage', '9': 0, '10': 'update'},
     {'1': 'done', '3': 4, '4': 1, '5': 11, '6': '.proto.rpc.webrtc.v1.AnswerRequestDoneStage', '9': 0, '10': 'done'},
     {'1': 'error', '3': 5, '4': 1, '5': 11, '6': '.proto.rpc.webrtc.v1.AnswerRequestErrorStage', '9': 0, '10': 'error'},
+    {'1': 'heartbeat', '3': 6, '4': 1, '5': 11, '6': '.proto.rpc.webrtc.v1.AnswerRequestHeartbeatStage', '9': 0, '10': 'heartbeat'},
   ],
   '8': [
     {'1': 'stage'},
@@ -233,7 +243,9 @@ final $typed_data.Uint8List answerRequestDescriptor = $convert.base64Decode(
     'ZRgDIAEoCzItLnByb3RvLnJwYy53ZWJydGMudjEuQW5zd2VyUmVxdWVzdFVwZGF0ZVN0YWdlSA'
     'BSBnVwZGF0ZRJBCgRkb25lGAQgASgLMisucHJvdG8ucnBjLndlYnJ0Yy52MS5BbnN3ZXJSZXF1'
     'ZXN0RG9uZVN0YWdlSABSBGRvbmUSRAoFZXJyb3IYBSABKAsyLC5wcm90by5ycGMud2VicnRjLn'
-    'YxLkFuc3dlclJlcXVlc3RFcnJvclN0YWdlSABSBWVycm9yQgcKBXN0YWdl');
+    'YxLkFuc3dlclJlcXVlc3RFcnJvclN0YWdlSABSBWVycm9yElAKCWhlYXJ0YmVhdBgGIAEoCzIw'
+    'LnByb3RvLnJwYy53ZWJydGMudjEuQW5zd2VyUmVxdWVzdEhlYXJ0YmVhdFN0YWdlSABSCWhlYX'
+    'J0YmVhdEIHCgVzdGFnZQ==');
 
 @$core.Deprecated('Use answerResponseInitStageDescriptor instead')
 const AnswerResponseInitStage$json = {
diff --git a/lib/src/gen/robot/v1/robot.pb.dart b/lib/src/gen/robot/v1/robot.pb.dart
index 6b017914fa..9cdfc70751 100644
--- a/lib/src/gen/robot/v1/robot.pb.dart
+++ b/lib/src/gen/robot/v1/robot.pb.dart
@@ -1237,6 +1237,7 @@ class DiscoveryQuery extends $pb.GeneratedMessage {
   factory DiscoveryQuery({
     $core.String? subtype,
     $core.String? model,
+    $43.Struct? extra,
   }) {
     final $result = create();
     if (subtype != null) {
@@ -1245,6 +1246,9 @@ class DiscoveryQuery extends $pb.GeneratedMessage {
     if (model != null) {
       $result.model = model;
     }
+    if (extra != null) {
+      $result.extra = extra;
+    }
     return $result;
   }
   DiscoveryQuery._() : super();
@@ -1254,6 +1258,7 @@ class DiscoveryQuery extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DiscoveryQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.robot.v1'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'subtype')
     ..aOS(2, _omitFieldNames ? '' : 'model')
+    ..aOM<$43.Struct>(99, _omitFieldNames ? '' : 'extra', subBuilder: $43.Struct.create)
     ..hasRequiredFields = false
   ;
 
@@ -1295,6 +1300,17 @@ class DiscoveryQuery extends $pb.GeneratedMessage {
   $core.bool hasModel() => $_has(1);
   @$pb.TagNumber(2)
   void clearModel() => clearField(2);
+
+  @$pb.TagNumber(99)
+  $43.Struct get extra => $_getN(2);
+  @$pb.TagNumber(99)
+  set extra($43.Struct v) { setField(99, v); }
+  @$pb.TagNumber(99)
+  $core.bool hasExtra() => $_has(2);
+  @$pb.TagNumber(99)
+  void clearExtra() => clearField(99);
+  @$pb.TagNumber(99)
+  $43.Struct ensureExtra() => $_ensure(2);
 }
 
 class Discovery extends $pb.GeneratedMessage {
diff --git a/lib/src/gen/robot/v1/robot.pbjson.dart b/lib/src/gen/robot/v1/robot.pbjson.dart
index bcfc4ad450..026df2697c 100644
--- a/lib/src/gen/robot/v1/robot.pbjson.dart
+++ b/lib/src/gen/robot/v1/robot.pbjson.dart
@@ -342,13 +342,14 @@ const DiscoveryQuery$json = {
   '2': [
     {'1': 'subtype', '3': 1, '4': 1, '5': 9, '10': 'subtype'},
     {'1': 'model', '3': 2, '4': 1, '5': 9, '10': 'model'},
+    {'1': 'extra', '3': 99, '4': 1, '5': 11, '6': '.google.protobuf.Struct', '10': 'extra'},
   ],
 };
 
 /// Descriptor for `DiscoveryQuery`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List discoveryQueryDescriptor = $convert.base64Decode(
     'Cg5EaXNjb3ZlcnlRdWVyeRIYCgdzdWJ0eXBlGAEgASgJUgdzdWJ0eXBlEhQKBW1vZGVsGAIgAS'
-    'gJUgVtb2RlbA==');
+    'gJUgVtb2RlbBItCgVleHRyYRhjIAEoCzIXLmdvb2dsZS5wcm90b2J1Zi5TdHJ1Y3RSBWV4dHJh');
 
 @$core.Deprecated('Use discoveryDescriptor instead')
 const Discovery$json = {
diff --git a/lib/src/robot/client.dart b/lib/src/robot/client.dart
index 332809a0df..63c7915ee5 100644
--- a/lib/src/robot/client.dart
+++ b/lib/src/robot/client.dart
@@ -5,6 +5,7 @@ import 'package:grpc/grpc_connection_interface.dart';
 import 'package:logger/logger.dart';
 
 import '../gen/common/v1/common.pb.dart';
+import '../gen/google/protobuf/struct.pb.dart';
 import '../gen/robot/v1/robot.pbgrpc.dart' as rpb;
 import '../media/stream/client.dart';
 import '../resource/base.dart';
@@ -12,6 +13,7 @@ import '../resource/manager.dart';
 import '../resource/registry.dart';
 import '../rpc/dial.dart';
 import '../rpc/web_rtc/web_rtc_client.dart';
+import '../utils.dart';
 import 'sessions_client.dart';
 
 /// {@category Viam SDK}
@@ -57,8 +59,11 @@ class RobotClientOptions {
 class DiscoveryQuery {
   final String subtype;
   final String model;
+  final Map<String, dynamic> extra;
 
-  DiscoveryQuery({required this.subtype, required this.model});
+  DiscoveryQuery({required this.subtype, required this.model, Map<String, dynamic>? extra}) : extra = extra ?? {};
+
+  Struct get extraStruct => extra.toStruct();
 }
 
 /// {@category Viam SDK}
@@ -278,14 +283,15 @@ class RobotClient {
   /// Discover components connected to the robot using a more abstract SDK query.
   ///
   /// ```
-  /// var queries = [DiscoveryQuerySDK(subtype: 'camera', model: 'webcam')];
+  /// var queries = [DiscoveryQuery(subtype: 'camera', model: 'webcam', extra: {'resolution': '1080p'})];
   /// var discoveredComponents = await machine.discoverComponents(queries);
   /// ```
   Future<rpb.DiscoverComponentsResponse> discoverComponents([List<DiscoveryQuery> queries = const []]) async {
     final request = rpb.DiscoverComponentsRequest()
       ..queries.addAll(queries.map((sdkQuery) => rpb.DiscoveryQuery()
         ..subtype = sdkQuery.subtype
-        ..model = sdkQuery.model));
+        ..model = sdkQuery.model
+        ..extra = sdkQuery.extraStruct));
 
     return await _client.discoverComponents(request);
   }
diff --git a/lib/src/utils.dart b/lib/src/utils.dart
index 1fdd497b2b..b7231be1b1 100644
--- a/lib/src/utils.dart
+++ b/lib/src/utils.dart
@@ -94,6 +94,6 @@ grpc_duration.Duration durationToProto(Duration duration) {
 
 String getVersionMetadata() {
   const String sdkVersion = 'v0.0.22';
-  const String apiTag = 'v0.1.345';
+  const String apiTag = 'v0.1.348';
   return 'flutter;$sdkVersion;$apiTag';
 }

From 77608588a07e0505114c278078a73a79ca736d27 Mon Sep 17 00:00:00 2001
From: hexbabe <sean.xiaochen.yu@gmail.com>
Date: Fri, 11 Oct 2024 14:19:53 -0400
Subject: [PATCH 3/3] Make comments less AI vibes

---
 lib/src/robot/client.dart | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/src/robot/client.dart b/lib/src/robot/client.dart
index 63c7915ee5..63d0dcdc50 100644
--- a/lib/src/robot/client.dart
+++ b/lib/src/robot/client.dart
@@ -55,7 +55,7 @@ class RobotClientOptions {
 }
 
 /// {@category Viam SDK}
-/// Represents a discovery query in the SDK to query for components.
+/// Represents a discovery query in the SDK to query for discoverable components.
 class DiscoveryQuery {
   final String subtype;
   final String model;
@@ -280,10 +280,10 @@ class RobotClient {
     return await _client.getCloudMetadata(rpb.GetCloudMetadataRequest());
   }
 
-  /// Discover components connected to the robot using a more abstract SDK query.
+  /// Discover components that the robot can connect to, given specific query metadata.
   ///
   /// ```
-  /// var queries = [DiscoveryQuery(subtype: 'camera', model: 'webcam', extra: {'resolution': '1080p'})];
+  /// var queries = [DiscoveryQuery(subtype: 'camera', model: 'webcam', extra: {'username': 'admin', 'password': 'admin'})];
   /// var discoveredComponents = await machine.discoverComponents(queries);
   /// ```
   Future<rpb.DiscoverComponentsResponse> discoverComponents([List<DiscoveryQuery> queries = const []]) async {