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

fix: Revert "feat: support grpc-web client straming" #632

Merged
merged 1 commit into from
Jul 28, 2022
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: 0 additions & 1 deletion integration/grpc-web-go-server/.gitignore

This file was deleted.

10 changes: 7 additions & 3 deletions integration/grpc-web-go-server/build.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
#!/usr/bin/env bash

set -x
export GOPATH=$HOME/go

GO111MODULE=on go mod tidy

go build
# See https://grpc.io/docs/languages/go/quickstart/
# go get google.golang.org/protobuf/cmd/protoc-gen-go
# go get google.golang.org/grpc/cmd/protoc-gen-go-grpc
#
# go get github.com/improbable-eng/grpc-web/go/grpcweb

mkdir -p generated
protoc -I=. --go_out=generated/ --go-grpc_out=require_unimplemented_servers=false:generated/ example.proto

Binary file modified integration/grpc-web-go-server/example.bin
Binary file not shown.
4 changes: 1 addition & 3 deletions integration/grpc-web-go-server/example.proto
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ option go_package = "lib/rpx";
service DashState {
rpc UserSettings(Empty) returns (DashUserSettingsState);
rpc ActiveUserSettingsStream(Empty) returns (stream DashUserSettingsState);
rpc ManyUserSettingsStream(stream DashUserSettingsState) returns (DashUserSettingsState);
rpc ChangeUserSettingsStream (stream DashUserSettingsState) returns (stream DashUserSettingsState) {}
}

message DashFlash {
Expand Down Expand Up @@ -67,4 +65,4 @@ message DashAPICredsDeleteReq {
string id = 3;
}

message Empty {}
message Empty {}
16 changes: 0 additions & 16 deletions integration/grpc-web-go-server/example.ts
Original file line number Diff line number Diff line change
Expand Up @@ -593,8 +593,6 @@ export const Empty = {
export interface DashState {
UserSettings(request: Empty): Promise<DashUserSettingsState>;
ActiveUserSettingsStream(request: Empty): Observable<DashUserSettingsState>;
ManyUserSettingsStream(request: Observable<DashUserSettingsState>): Observable<DashUserSettingsState>;
ChangeUserSettingsStream(request: Observable<DashUserSettingsState>): Observable<DashUserSettingsState>;
}

export class DashStateClientImpl implements DashState {
Expand All @@ -603,8 +601,6 @@ export class DashStateClientImpl implements DashState {
this.rpc = rpc;
this.UserSettings = this.UserSettings.bind(this);
this.ActiveUserSettingsStream = this.ActiveUserSettingsStream.bind(this);
this.ManyUserSettingsStream = this.ManyUserSettingsStream.bind(this);
this.ChangeUserSettingsStream = this.ChangeUserSettingsStream.bind(this);
}
UserSettings(request: Empty): Promise<DashUserSettingsState> {
const data = Empty.encode(request).finish();
Expand All @@ -617,18 +613,6 @@ export class DashStateClientImpl implements DashState {
const result = this.rpc.serverStreamingRequest('rpx.DashState', 'ActiveUserSettingsStream', data);
return result.pipe(map((data) => DashUserSettingsState.decode(new _m0.Reader(data))));
}

ManyUserSettingsStream(request: Observable<DashUserSettingsState>): Observable<DashUserSettingsState> {
const data = request.pipe(map((request) => DashUserSettingsState.encode(request).finish()));
const promise = this.rpc.clientStreamingRequest('rpx.DashState', 'ManyUserSettingsStream', data);
return promise.then((data) => DashUserSettingsState.decode(new _m0.Reader(data)));
}

ChangeUserSettingsStream(request: Observable<DashUserSettingsState>): Observable<DashUserSettingsState> {
const data = request.pipe(map((request) => DashUserSettingsState.encode(request).finish()));
const result = this.rpc.bidirectionalStreamingRequest('rpx.DashState', 'ChangeUserSettingsStream', data);
return result.pipe(map((data) => DashUserSettingsState.decode(new _m0.Reader(data))));
}
}

/**
Expand Down
88 changes: 39 additions & 49 deletions integration/grpc-web-go-server/generated/lib/rpx/example.pb.go

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

Loading