Skip to content

refactor(go): cleanup #50

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

Merged
rvolosatovs merged 2 commits into from
May 10, 2024
Merged

refactor(go): cleanup #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3517a63
refactor(go): refactor `Serve` and subscription API
rvolosatovs May 10, 2024
e9fcf59
refactor(go): cleanup NATS implementation
rvolosatovs May 10, 2024
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
37 changes: 4 additions & 33 deletions crates/wit-bindgen-go/src/interface.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1337,38 +1337,8 @@ impl InterfaceGenerator<'_> {
let wrpc = self.deps.wrpc();
uwriteln!(
self.src,
r#"stop{i}, err := c.Serve("{instance}", "{name}", func(ctx {context}.Context, buffer []byte, tx {wrpc}.Transmitter, inv {wrpc}.IncomingInvocation) error {{"#,
r#"stop{i}, err := c.Serve("{instance}", "{name}", func(ctx {context}.Context, w {wrpc}.IndexWriter, r {wrpc}.IndexReader, errCh <-chan error) error {{"#,
);
if !params.is_empty() {
// TODO: Handle async parameters
uwriteln!(
self.src,
r#"{slog}.DebugContext(ctx, "subscribing for `{instance}.{name}` parameters")

payload := make(chan []byte)
stop, err := inv.Subscribe(func(ctx {context}.Context, buf []byte) {{
payload <- buf
}})
if err != nil {{
return err
}}
defer func() {{
if err := stop(); err != nil {{
{slog}.ErrorContext(ctx, "failed to stop parameter subscription", "err", err)
}}
}}()"#,
);
}
uwriteln!(
self.src,
r#"{slog}.DebugContext(ctx, "accepting handshake")
if err := inv.Accept(ctx, nil); err != nil {{
return {fmt}.Errorf("failed to complete handshake: %w", err)
}}"#,
);
if !params.is_empty() {
uwriteln!(self.src, "r := {wrpc}.NewChanReader(ctx, payload, buffer)");
}
for (i, (_, ty)) in params.iter().enumerate() {
uwrite!(
self.src,
Expand Down Expand Up @@ -1425,8 +1395,9 @@ impl InterfaceGenerator<'_> {
);
uwriteln!(
self.src,
r#"if err := tx.Transmit({context}.Background(), buf.Bytes()); err != nil {{
return {fmt}.Errorf("failed to transmit result: %w", err)
r#"_, err = w.Write(buf.Bytes())
if err != nil {{
return {fmt}.Errorf("failed to write result: %w", err)
}}"#,
);
self.push_str("return nil\n");
Expand Down
11 changes: 4 additions & 7 deletions examples/go/hello-server/bindings/exports/wrpc_examples/hello/handler/bindings.wrpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,7 @@ func ServeInterface(c wrpc.Client, h Handler) (stop func() error, err error) {
}
return nil
}
stop0, err := c.Serve("wrpc-examples:hello/handler", "hello", func(ctx context.Context, buffer []byte, tx wrpc.Transmitter, inv wrpc.IncomingInvocation) error {
slog.DebugContext(ctx, "accepting handshake")
if err := inv.Accept(ctx, nil); err != nil {
return fmt.Errorf("failed to complete handshake: %w", err)
}
stop0, err := c.Serve("wrpc-examples:hello/handler", "hello", func(ctx context.Context, w wrpc.IndexWriter, r wrpc.IndexReader, errCh <-chan error) error {
slog.DebugContext(ctx, "calling `wrpc-examples:hello/handler.hello` handler")
r0, err := h.Hello(ctx)
if err != nil {
Expand Down Expand Up @@ -61,8 +57,9 @@ func ServeInterface(c wrpc.Client, h Handler) (stop func() error, err error) {
return fmt.Errorf("failed to write result value 0: %w", err)
}
slog.DebugContext(ctx, "transmitting `wrpc-examples:hello/handler.hello` result")
if err := tx.Transmit(context.Background(), buf.Bytes()); err != nil {
return fmt.Errorf("failed to transmit result: %w", err)
_, err = w.Write(buf.Bytes())
if err != nil {
return fmt.Errorf("failed to write result: %w", err)
}
return nil
})
Expand Down
Loading