Merge branch 'main' into SEC-39

viamrobotics · Sep 24, 2024 · 76ad87e · 76ad87e
2 parents 02ea251 + 740bd5d
commit 76ad87e
Show file tree

Hide file tree

Showing 44 changed files with 6,474 additions and 1,568 deletions.
diff --git a/buf.yaml b/buf.yaml
@@ -6,6 +6,7 @@ build:
   excludes:
     - node_modules
     - rpc/examples/echo/frontend/node_modules
+    - rpc/examples/echo/node-client/node_modules
     - rpc/examples/fileupload/frontend/node_modules
     - rpc/js/node_modules
     - vendor

diff --git a/etc/buf.web.gen.yaml b/etc/buf.web.gen.yaml
@@ -1,15 +1,8 @@
 version: v1
+managed:
+  enabled: true
 plugins:
-  - name: js
+  - plugin: buf.build/connectrpc/es:v1.5.0
     out: dist/js
-    opt:
-      - import_style=commonjs
-  - name: grpc-web
+  - plugin: buf.build/bufbuild/es:v1.10.0
     out: dist/js
-    opt:
-      - import_style=commonjs
-      - mode=grpcwebtext
-  - name: ts
-    out: dist/js
-    opt:
-      - service=grpc-web
diff --git a/proto/rpc/examples/fileupload/v1/fileupload.pb.go b/proto/rpc/examples/fileupload/v1/fileupload.pb.go
diff --git a/proto/rpc/examples/fileupload/v1/fileupload.pb.gw.go b/proto/rpc/examples/fileupload/v1/fileupload.pb.gw.go
diff --git a/proto/rpc/examples/fileupload/v1/fileupload.proto b/proto/rpc/examples/fileupload/v1/fileupload.proto
@@ -16,7 +16,5 @@ message UploadFileResponse {
 }
 
 service FileUploadService {
-  // Due to an issue described by https://github.com/improbable-eng/ts-protoc-gen/pull/264
-  // we use a streaming response but only expect one response.
-  rpc UploadFile(stream UploadFileRequest) returns (stream UploadFileResponse) {}
+  rpc UploadFile(stream UploadFileRequest) returns (UploadFileResponse) {}
 }
diff --git a/proto/rpc/examples/fileupload/v1/fileupload_grpc.pb.go b/proto/rpc/examples/fileupload/v1/fileupload_grpc.pb.go
diff --git a/rpc/examples/echo/Makefile b/rpc/examples/echo/Makefile
@@ -20,6 +20,9 @@ test-run-server: build install-playwright
 run-client:
 	go run client/main.go -host=echo-server
 
+run-node-client:
+	cd node-client && npm start
+
 setup-auth:
 	cd ${ROOT_DIR} && make setup-cert setup-priv-key