Skip to content
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
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ build-buf: $(node_modules) clean-buf
$(buf) generate buf.build/googleapis/googleapis
$(buf) generate buf.build/viamrobotics/api:$$(cat api_version.lock) --path common,component,robot,service,app,provisioning,tagger,stream
$(buf) generate buf.build/viamrobotics/goutils
$(buf) generate buf.build/grpc/grpc --path grpc/reflection/v1/reflection.proto

# js targets

Expand Down
9 changes: 4 additions & 5 deletions examples/vanilla/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 8 additions & 5 deletions src/robot/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,12 +170,15 @@ export class RobotClient extends EventDispatcher implements Robot {
this.onDisconnect();
}
);
this.sessionManager = new SessionManager((): Transport => {
if (!this.transport) {
throw new Error(RobotClient.notConnectedYetStr);
this.sessionManager = new SessionManager(
this.serviceHost,
(): Transport => {
if (!this.transport) {
throw new Error(RobotClient.notConnectedYetStr);
}
return this.transport;
}
return this.transport;
});
);

// For each connection event type, add a listener to capture that
// event and re-emit it with the 'connectionstatechange' event
Expand Down
2 changes: 1 addition & 1 deletion src/robot/session-manager.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const mockGetHeartBeatWindow = new Duration({

describe('SessionManager', () => {
beforeEach(() => {
sm = new SessionManager(() => mockTransport);
sm = new SessionManager('', () => mockTransport);
});

it('no session initially', () => {
Expand Down
103 changes: 102 additions & 1 deletion src/robot/session-manager.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
/* eslint-disable max-depth */
import {
BinaryReader,
FileDescriptorProto,
MethodOptions,
} from '@bufbuild/protobuf';
import {
Code,
ConnectError,
createClient,
type Transport,
} from '@connectrpc/connect';
import { createAsyncIterable } from '@connectrpc/connect/protocol';
import { safety_heartbeat_monitored as safteyHeartbeatMonitored } from '../gen/common/v1/common_pb';
import { ServerReflection } from '../gen/grpc/reflection/v1/reflection_connect';
import {
FileDescriptorResponse,
ListServiceResponse,
ServerReflectionRequest,
} from '../gen/grpc/reflection/v1/reflection_pb';
import { RobotService } from '../gen/robot/v1/robot_connect';
import {
SendSessionHeartbeatRequest,
Expand All @@ -22,11 +36,14 @@ const timeoutBlob = new Blob(
);

export default class SessionManager {
public static heartbeatMonitoredMethods: Record<string, boolean> = {};

public readonly transport: Transport;

private currentSessionID = '';
private sessionsSupported: boolean | undefined;
private heartbeatIntervalMs: number | undefined;
private host = '';

private starting: Promise<void> | undefined;

Expand All @@ -35,7 +52,11 @@ export default class SessionManager {
return createClient(RobotService, transport);
}

constructor(private deferredTransport: () => Transport) {
constructor(
host: string,
private deferredTransport: () => Transport
) {
this.host = host;
this.transport = new SessionTransport(this.deferredTransport, this);
}

Expand Down Expand Up @@ -167,6 +188,7 @@ export default class SessionManager {
(Number(heartbeatWindow.seconds) * 1e3 +
heartbeatWindow.nanos / 1e6) /
5;
await this.applyHeartbeatMonitoredMethods();
resolve();
this.heartbeat().catch(console.error); // eslint-disable-line no-console
})()
Expand All @@ -180,4 +202,83 @@ export default class SessionManager {

return this.getSessionMetadataInner();
}

private async applyHeartbeatMonitoredMethods(): Promise<void> {
try {
const client = createClient(ServerReflection, this.transport);
const request = new ServerReflectionRequest({
host: this.host,
messageRequest: { case: 'listServices', value: '' },
});
const responseStream = client.serverReflectionInfo(
createAsyncIterable([request]),
{ timeoutMs: 10_000 }
);
for await (const serviceResponse of responseStream) {
const fdpRequests = (
serviceResponse.messageResponse.value as ListServiceResponse
).service.map((service) => {
return new ServerReflectionRequest({
messageRequest: {
case: 'fileContainingSymbol',
value: service.name,
},
});
});
const fdpResponseStream = client.serverReflectionInfo(
createAsyncIterable(fdpRequests),
{ timeoutMs: 10_000 }
);
for await (const fdpResponse of fdpResponseStream) {
for (const fdp of (
fdpResponse.messageResponse.value as FileDescriptorResponse
).fileDescriptorProto) {
const protoFile = FileDescriptorProto.fromBinary(fdp);
for (const service of protoFile.service) {
for (const method of service.method) {
SessionManager.heartbeatMonitoredMethods[
`/${protoFile.package}.${service.name}/${method.name}`
] = SessionManager.hasHeartbeatOption(method.options);
}
}
}
}
}
} catch {
// If can't get heartbeat monitored methods via reflection, use defaults.
SessionManager.heartbeatMonitoredMethods = {
'/viam.component.arm.v1.ArmService/MoveToPosition': true,
'/viam.component.arm.v1.ArmService/MoveToJointPositions': true,
'/viam.component.arm.v1.ArmService/MoveThroughJointPositions': true,
'/viam.component.base.v1.BaseService/MoveStraight': true,
'/viam.component.base.v1.BaseService/Spin': true,
'/viam.component.base.v1.BaseService/SetPower': true,
'/viam.component.base.v1.BaseService/SetVelocity': true,
'/viam.component.gantry.v1.GantryService/MoveToPosition': true,
'/viam.component.gripper.v1.GripperService/Open': true,
'/viam.component.gripper.v1.GripperService/Grab': true,
'/viam.component.motor.v1.MotorService/SetPower': true,
'/viam.component.motor.v1.MotorService/GoFor': true,
'/viam.component.motor.v1.MotorService/GoTo': true,
'/viam.component.motor.v1.MotorService/SetRPM': true,
'/viam.component.servo.v1.ServoService/Move': true,
};
}
}

private static hasHeartbeatOption(options?: MethodOptions): boolean {
if (!options) {
return false;
}
const reader = new BinaryReader(options.toBinary());
while (reader.pos < reader.len) {
const tag = reader.tag();
const [fieldNumber] = tag;
if (fieldNumber === safteyHeartbeatMonitored.field.no) {
return true;
}
reader.string();
}
return false;
}
}
20 changes: 13 additions & 7 deletions src/robot/session-transport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
type UnaryResponse,
} from '@connectrpc/connect';
import { cloneHeaders } from '../rpc/dial';
import type SessionManager from './session-manager';
import SessionManager from './session-manager';

export default class SessionTransport implements Transport {
constructor(
Expand Down Expand Up @@ -49,10 +49,13 @@ export default class SessionTransport implements Transport {
message: PartialMessage<I>,
contextValues?: ContextValues
): Promise<UnaryResponse<I, O>> {
const md = await this.getSessionMetadata();
const newHeaders = cloneHeaders(header);
for (const [key, value] of md) {
newHeaders.set(key, value);
const methodPath = `/${service.typeName}/${method.name}`;
if (SessionManager.heartbeatMonitoredMethods[methodPath] ?? false) {
const md = await this.getSessionMetadata();
for (const [key, value] of md) {
newHeaders.set(key, value);
}
}
return this.deferredTransport().unary(
service,
Expand All @@ -77,10 +80,13 @@ export default class SessionTransport implements Transport {
input: AsyncIterable<PartialMessage<I>>,
contextValues?: ContextValues
): Promise<StreamResponse<I, O>> {
const md = await this.getSessionMetadata();
const newHeaders = cloneHeaders(header);
for (const [key, value] of md) {
newHeaders.set(key, value);
const methodPath = `/${service.typeName}/${method.name}`;
if (SessionManager.heartbeatMonitoredMethods[methodPath] ?? false) {
const md = await this.getSessionMetadata();
for (const [key, value] of md) {
newHeaders.set(key, value);
}
}
return this.deferredTransport().stream(
service,
Expand Down