Skip to content

Commit 036ed32

Browse files
authored
Migrate to connect-es (#4417)
1 parent 2d83228 commit 036ed32

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+732
-1137
lines changed

web/frontend/package-lock.json

Lines changed: 38 additions & 65 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/frontend/package.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,16 @@
3434
},
3535
"peerDependencies": {
3636
"@floating-ui/dom": "^1.5.3",
37-
"@improbable-eng/grpc-web": ">=0.15",
3837
"@viamrobotics/prime": ">=0.5",
39-
"@viamrobotics/rpc": ">=0.2",
40-
"@viamrobotics/sdk": "0.25.0",
41-
"google-protobuf": ">=3",
4238
"maplibre-gl": ">=4",
4339
"tailwindcss": ">=3.3",
4440
"three": ">=0.167"
4541
},
4642
"devDependencies": {
47-
"@improbable-eng/grpc-web": "0.15.0",
4843
"@mdi/js": "7.2.96",
4944
"@sveltejs/vite-plugin-svelte": "^2.4.4",
5045
"@threlte/core": "^7.3.1",
5146
"@threlte/extras": "^8.11.5",
52-
"@types/google-protobuf": "3.15.6",
5347
"@types/lodash-es": "^4.17.12",
5448
"@types/three": "0.167.2",
5549
"@typescript-eslint/eslint-plugin": "^6.9.0",
@@ -59,8 +53,7 @@
5953
"@viamrobotics/prime": "0.5.9",
6054
"@viamrobotics/prime-blocks": "^0.1.3",
6155
"@viamrobotics/prime-core": "^0.0.87",
62-
"@viamrobotics/rpc": "0.2.3",
63-
"@viamrobotics/sdk": "0.25.0",
56+
"@viamrobotics/sdk": "0.26.0",
6457
"@viamrobotics/three": "^0.0.3",
6558
"@viamrobotics/typescript-config": "^0.1.0",
6659
"cypress": "12.17.3",
@@ -70,7 +63,6 @@
7063
"eslint-plugin-svelte": "^2.34.0",
7164
"eslint-plugin-tailwindcss": "3.13.0",
7265
"eslint-plugin-unicorn": "48.0.1",
73-
"google-protobuf": "3.21.2",
7466
"jshashes": "1.0.8",
7567
"lodash-es": "^4.17.21",
7668
"maplibre-gl": "^4.6.0",

web/frontend/src/api/do-command.ts

Lines changed: 0 additions & 51 deletions
This file was deleted.

web/frontend/src/api/encoder.ts

Lines changed: 23 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,36 @@
1-
import { type Client, encoderApi } from '@viamrobotics/sdk';
21
import { rcLogConditionally } from '@/lib/log';
2+
import {
3+
EncoderClient,
4+
EncoderPositionType,
5+
type Client,
6+
} from '@viamrobotics/sdk';
37

48
export const getProperties = async (robotClient: Client, name: string) => {
5-
const request = new encoderApi.GetPropertiesRequest();
6-
request.setName(name);
7-
8-
rcLogConditionally(request);
9-
10-
const response = await new Promise<encoderApi.GetPropertiesResponse | null>(
11-
(resolve, reject) => {
12-
robotClient.encoderService.getProperties(request, (error, res) => {
13-
if (error) {
14-
reject(error);
15-
} else {
16-
resolve(res);
17-
}
18-
});
19-
}
20-
);
21-
22-
return response?.toObject();
9+
const client = new EncoderClient(robotClient, name, {
10+
requestLogger: rcLogConditionally,
11+
});
12+
return client.getProperties();
2313
};
2414

2515
export const getPosition = async (robotClient: Client, name: string) => {
26-
const request = new encoderApi.GetPositionRequest();
27-
request.setName(name);
28-
29-
rcLogConditionally(request);
30-
31-
const response = await new Promise<encoderApi.GetPositionResponse | null>(
32-
(resolve, reject) => {
33-
robotClient.encoderService.getPosition(request, (error, res) => {
34-
if (error) {
35-
reject(error);
36-
} else {
37-
resolve(res);
38-
}
39-
});
40-
}
41-
);
42-
43-
return response?.toObject().value;
16+
const client = new EncoderClient(robotClient, name, {
17+
requestLogger: rcLogConditionally,
18+
});
19+
const resp = await client.getPosition();
20+
return resp[0];
4421
};
4522

4623
export const getPositionDegrees = async (robotClient: Client, name: string) => {
47-
const request = new encoderApi.GetPositionRequest();
48-
request.setName(name);
49-
request.setPositionType(2);
50-
51-
rcLogConditionally(request);
52-
53-
const response = await new Promise<encoderApi.GetPositionResponse | null>(
54-
(resolve, reject) => {
55-
robotClient.encoderService.getPosition(request, (error, res) => {
56-
if (error) {
57-
reject(error);
58-
} else {
59-
resolve(res);
60-
}
61-
});
62-
}
63-
);
64-
65-
return response?.toObject().value;
24+
const client = new EncoderClient(robotClient, name, {
25+
requestLogger: rcLogConditionally,
26+
});
27+
const resp = await client.getPosition(EncoderPositionType.ANGLE_DEGREES);
28+
return resp[0];
6629
};
6730

6831
export const reset = async (robotClient: Client, name: string) => {
69-
const request = new encoderApi.ResetPositionRequest();
70-
request.setName(name);
71-
72-
rcLogConditionally(request);
73-
74-
const response = await new Promise<encoderApi.ResetPositionResponse | null>(
75-
(resolve, reject) => {
76-
robotClient.encoderService.resetPosition(request, (error, res) => {
77-
if (error) {
78-
reject(error);
79-
} else {
80-
resolve(res);
81-
}
82-
});
83-
}
84-
);
85-
86-
return response?.toObject();
32+
const client = new EncoderClient(robotClient, name, {
33+
requestLogger: rcLogConditionally,
34+
});
35+
return client.resetPosition();
8736
};

0 commit comments

Comments
 (0)