Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RSDK-8607 - fix timeout generation bug #255

Merged
merged 2 commits into from
Aug 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions lib/src/rpc/web_rtc/web_rtc_client_connection.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:fixnum/fixnum.dart';
import 'package:grpc/grpc.dart';
import 'package:grpc/grpc_connection_interface.dart';

import '../../utils.dart';
import '../../gen/google/protobuf/duration.pb.dart' as grpc_duration;
import '../../gen/proto/rpc/webrtc/v1/grpc.pb.dart' as grpc;
import 'web_rtc_client.dart';
Expand Down Expand Up @@ -41,12 +42,7 @@ class WebRtcClientConnection extends ClientConnection {
}) {
final stream = grpc.Stream()..id = Int64(id++);
final grpMetadata = grpc.Metadata()..md.addAll(metadata.map((key, value) => MapEntry(key, grpc.Strings()..values.addAll([value]))));
final grpc_duration.Duration? grpcTimeout = timeout != null
? (grpc_duration.Duration()
..seconds = Int64(timeout.inSeconds)
..nanos = timeout.inMicroseconds * 1000)
: null;
// final headers = grpc.RequestHeaders(method: path, metadata: grpMetadata, timeout: grpcTimeout);
final grpc_duration.Duration? grpcTimeout = timeout != null ? durationToProto(timeout) : null;
final headers = grpc.RequestHeaders()
..method = path
..metadata = grpMetadata;
Expand Down
9 changes: 9 additions & 0 deletions lib/src/utils.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import 'package:fixnum/fixnum.dart';
import 'package:grpc/grpc.dart';
import 'package:logger/logger.dart';

import 'gen/google/protobuf/struct.pb.dart';
import 'gen/google/protobuf/duration.pb.dart' as grpc_duration;

final _logger = Logger();

Expand Down Expand Up @@ -83,6 +85,13 @@ extension MapStructUtils on Map<String, dynamic> {
}
}

grpc_duration.Duration durationToProto(Duration duration) {
final micros = duration.inMicroseconds % Duration.microsecondsPerSecond;
return grpc_duration.Duration()
..seconds = Int64(duration.inSeconds)
..nanos = micros * 1000;
}

String getVersionMetadata() {
const String sdkVersion = 'v0.0.19';
const String apiTag = 'v0.1.328';
Expand Down
21 changes: 21 additions & 0 deletions test/unit_test/utils/utils_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,27 @@ void main() {
});
});

test('durationToProto', () {
// check that a standard one second duration converts to proto successfully
const oneSecond = Duration(seconds: 1);
final oneSecondProto = durationToProto(oneSecond);
expect(oneSecondProto.seconds.toInt(), 1);
expect(oneSecondProto.nanos, 0);

// check that a > 2sec duration converts to proto successfully without causing an int
// overflow in nanos
const fiveSeconds = Duration(seconds: 5);
final fiveSecondProto = durationToProto(fiveSeconds);
expect(fiveSecondProto.seconds.toInt(), 5);
expect(fiveSecondProto.nanos, 0);

// check that a mixed "seconds and microseconds" Duration successfully converts to proto.
const mixed = Duration(seconds: 3, microseconds: 1234);
final mixedProto = durationToProto(mixed);
expect(mixedProto.seconds.toInt(), 3);
expect(mixedProto.nanos, 1234000);
});

test('StructUtils toMap', () {
final struct = Struct()..fields.addAll({'foo': Value()..stringValue = 'bar'});
expect(struct.toMap(), {'foo': 'bar'});
Expand Down
Loading