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.

Sign up for GitHub

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-5228 - allow setting sdp values #181

Merged
merged 12 commits into from
Oct 27, 2023
Merged

RSDK-5228 - allow setting sdp values #181

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
62a1992
call dialwebrtc with priority attribute
purplenicole730 Oct 24, 2023
53106cf
make priority optional parameter without default
purplenicole730 Oct 24, 2023
c648352
call priority before default parameters
purplenicole730 Oct 24, 2023
0269ef3
call connect with options
purplenicole730 Oct 25, 2023
5d1dfdb
change priority to be sdpfield object
purplenicole730 Oct 26, 2023
0dd08a1
change type object to type record
purplenicole730 Oct 26, 2023
f557484
make connect options optional
purplenicole730 Oct 26, 2023
7b1d047
accept priority in connect
purplenicole730 Oct 26, 2023
968ed8d
update goutils
purplenicole730 Oct 26, 2023
82f8b39
npm install latest rpc
purplenicole730 Oct 26, 2023
b29d72a
add pr feedback
purplenicole730 Oct 27, 2023
a71633a
nit
purplenicole730 Oct 27, 2023
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
16 changes: 11 additions & 5 deletions src/robot/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ interface SessionOptions {
disabled: boolean;
}

export interface ConnectOptions {
priority?: number;
authEntity?: string;
creds?: Credentials;
}

abstract class ServiceClient {
constructor(public serviceHost: string, public options?: grpc.RpcOptions) {}
}
Expand Down Expand Up @@ -164,7 +170,7 @@ export class RobotClient extends EventDispatcher implements Robot {
console.debug('connection closed, will try to reconnect');
void backOff(
() =>
this.connect().then(
this.connect({}).then(
() => {
// eslint-disable-next-line no-console
console.debug('reconnected successfully!');
Expand Down Expand Up @@ -369,11 +375,11 @@ export class RobotClient extends EventDispatcher implements Robot {
return this.peerConn?.iceConnectionState === 'connected';
}

public async connect(
priority?: number,
public async connect({
priority,
authEntity = this.savedAuthEntity,
creds = this.savedCreds
) {
creds = this.savedCreds,
}: ConnectOptions) {
purplenicole730 marked this conversation as resolved.
Show resolved Hide resolved
if (this.connecting) {
// This lint is clearly wrong due to how the event loop works such that after an await, the condition may no longer be true.
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
Expand Down
8 changes: 6 additions & 2 deletions src/robot/dial.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const dialDirect = async (conf: DialDirectConf): Promise<RobotClient> => {
if (conf.credential) {
creds = conf.credential;
}
await client.connect(undefined, conf.authEntity, creds);
await client.connect({ authEntity: conf.authEntity, creds: creds });

// eslint-disable-next-line no-console
console.debug('connected via gRPC');
Expand Down Expand Up @@ -121,7 +121,11 @@ const dialWebRTC = async (conf: DialWebRTCConf): Promise<RobotClient> => {
if (conf.credential) {
creds = conf.credential;
}
await client.connect(conf.priority, conf.authEntity || impliedURL, creds);
await client.connect({
priority: conf.priority,
purplenicole730 marked this conversation as resolved.
Show resolved Hide resolved
authEntity: conf.authEntity || impliedURL,
creds: creds,
});

// eslint-disable-next-line no-console
console.debug('connected via WebRTC');
Expand Down
Loading