-
Notifications
You must be signed in to change notification settings - Fork 51
Feature/rpc #170
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
Closed
Closed
Feature/rpc #170
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
a4bf60e
initial working rpc stuff
topi314 f2917d2
ipc & ws transport support. working message read example
topi314 97bab68
event & cmd payloads
topi314 e5551b5
fix errors
topi314 550cd08
some fixes and missing event unmarshalling
topi314 17e63c9
fix example
topi314 bbd6565
Merge branch 'development' into feature/rpc
topi314 788b0f7
Merge branch 'development' into feature/rpc
topi314 a596820
add rpc client config, add port & pipe retrying, some refactoring
topi314 a18e9f2
Merge branch 'master' into feature/rpc
topi314 ea2ffae
go mod tidy
topi314 c86b58e
Merge branch 'master' into feature/rpc
topi314 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "os" | ||
| "os/signal" | ||
| "syscall" | ||
|
|
||
| "github.com/disgoorg/log" | ||
| "github.com/disgoorg/snowflake/v2" | ||
|
|
||
| "github.com/disgoorg/disgo/discord" | ||
| "github.com/disgoorg/disgo/rest" | ||
| "github.com/disgoorg/disgo/rpc" | ||
| ) | ||
|
|
||
| var ( | ||
| clientID = snowflake.GetEnv("disgo_client_id") | ||
| clientSecret = os.Getenv("disgo_client_secret") | ||
| channelID = snowflake.GetEnv("disgo_channel_id") | ||
| ) | ||
|
|
||
| func main() { | ||
| log.SetLevel(log.LevelDebug) | ||
| log.SetFlags(log.LstdFlags | log.Lshortfile) | ||
| log.Info("example is starting...") | ||
|
|
||
| oauth2Client := rest.NewOAuth2(rest.NewClient("")) | ||
|
|
||
| client, err := rpc.NewClient(clientID) | ||
| if err != nil { | ||
| log.Fatal(err) | ||
| return | ||
| } | ||
| defer client.Close() | ||
|
|
||
| var tokenRs *discord.AccessTokenResponse | ||
| if err = client.Send(rpc.Message{ | ||
| Cmd: rpc.CmdAuthorize, | ||
| Args: rpc.CmdArgsAuthorize{ | ||
| ClientID: clientID, | ||
| Scopes: []discord.OAuth2Scope{discord.OAuth2ScopeRPC, discord.OAuth2ScopeMessagesRead}, | ||
| }, | ||
| }, rpc.NewHandler(func(data rpc.CmdRsAuthorize) { | ||
| tokenRs, err = oauth2Client.GetAccessToken(clientID, clientSecret, data.Code, "http://localhost") | ||
| if err != nil { | ||
| log.Fatal(err) | ||
| } | ||
| })); err != nil { | ||
| log.Fatal(err) | ||
| } | ||
|
|
||
| if err = client.Send(rpc.Message{ | ||
| Cmd: rpc.CmdAuthenticate, | ||
| Args: rpc.CmdArgsAuthenticate{ | ||
| AccessToken: tokenRs.AccessToken, | ||
| }, | ||
| }, nil); err != nil { | ||
| log.Fatal(err) | ||
| } | ||
|
|
||
| if err = client.Subscribe(rpc.EventMessageCreate, rpc.CmdArgsSubscribeMessage{ | ||
| ChannelID: channelID, | ||
| }, rpc.NewHandler(func(data rpc.EventDataMessageCreate) { | ||
| log.Info("message: ", data.Message.Content) | ||
| })); err != nil { | ||
| log.Fatal(err) | ||
| } | ||
|
|
||
| log.Info("example is now running. Press CTRL-C to exit.") | ||
| s := make(chan os.Signal, 1) | ||
| signal.Notify(s, syscall.SIGINT, syscall.SIGTERM, os.Interrupt) | ||
| <-s | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,237 @@ | ||
| package rpc | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "context" | ||
| "errors" | ||
| "io" | ||
| "net" | ||
| "time" | ||
|
|
||
| "github.com/disgoorg/json" | ||
| "github.com/disgoorg/log" | ||
| "github.com/disgoorg/snowflake/v2" | ||
|
|
||
| "github.com/disgoorg/disgo/discord" | ||
| "github.com/disgoorg/disgo/internal/insecurerandstr" | ||
| ) | ||
|
|
||
| var Version = 1 | ||
|
|
||
| type TransportCreate func(clientID snowflake.ID, origin string) (Transport, error) | ||
|
|
||
| type Transport interface { | ||
| NextWriter() (io.WriteCloser, error) | ||
| NextReader() (io.Reader, error) | ||
| Close() error | ||
| } | ||
|
|
||
| type Client interface { | ||
| Logger() log.Logger | ||
| ServerConfig() ServerConfig | ||
| User() discord.User | ||
| V() int | ||
| Transport() Transport | ||
|
|
||
| Subscribe(event Event, args CmdArgs, handler Handler) error | ||
| Unsubscribe(event Event, args CmdArgs) error | ||
| Send(message Message, handler Handler) error | ||
| Close() | ||
| } | ||
|
|
||
| func NewClient(clientID snowflake.ID, opts ...ConfigOpt) (Client, error) { | ||
| config := DefaultConfig() | ||
| config.Apply(opts) | ||
|
|
||
| client := &clientImpl{ | ||
| logger: config.Logger, | ||
| eventHandlers: map[Event]Handler{}, | ||
| commandHandlers: map[string]internalHandler{}, | ||
| readyChan: make(chan struct{}, 1), | ||
| } | ||
|
|
||
| if config.Transport == nil { | ||
| var err error | ||
| config.Transport, err = config.TransportCreate(clientID, config.Origin) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| } | ||
| client.transport = config.Transport | ||
|
|
||
| go client.listen(client.transport) | ||
|
|
||
| ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) | ||
| defer cancel() | ||
| select { | ||
| case <-ctx.Done(): | ||
| return nil, ctx.Err() | ||
| case <-client.readyChan: | ||
| } | ||
|
|
||
| return client, nil | ||
| } | ||
|
|
||
| type clientImpl struct { | ||
| logger log.Logger | ||
| transport Transport | ||
|
|
||
| eventHandlers map[Event]Handler | ||
| commandHandlers map[string]internalHandler | ||
|
|
||
| readyChan chan struct{} | ||
| user discord.User | ||
| serverConfig ServerConfig | ||
| v int | ||
| } | ||
|
|
||
| func (c *clientImpl) Logger() log.Logger { | ||
| return c.logger | ||
| } | ||
|
|
||
| func (c *clientImpl) ServerConfig() ServerConfig { | ||
| return c.serverConfig | ||
| } | ||
|
|
||
| func (c *clientImpl) User() discord.User { | ||
| return c.user | ||
| } | ||
|
|
||
| func (c *clientImpl) V() int { | ||
| return c.v | ||
| } | ||
|
|
||
| func (c *clientImpl) Transport() Transport { | ||
| return c.transport | ||
| } | ||
|
|
||
| func (c *clientImpl) send(r io.Reader) error { | ||
| writer, err := c.transport.NextWriter() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| defer writer.Close() | ||
|
|
||
| buff := new(bytes.Buffer) | ||
| newWriter := io.MultiWriter(writer, buff) | ||
|
|
||
| _, err = io.Copy(newWriter, r) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| data, _ := io.ReadAll(buff) | ||
| c.logger.Tracef("Sending message: data: %s", string(data)) | ||
|
|
||
| return err | ||
| } | ||
|
|
||
| func (c *clientImpl) Subscribe(event Event, args CmdArgs, handler Handler) error { | ||
| if _, ok := c.eventHandlers[event]; ok { | ||
| return errors.New("event already subscribed") | ||
| } | ||
| c.eventHandlers[event] = handler | ||
| return c.Send(Message{ | ||
| Cmd: CmdSubscribe, | ||
| Args: args, | ||
| Event: event, | ||
| }, nil) | ||
| } | ||
|
|
||
| func (c *clientImpl) Unsubscribe(event Event, args CmdArgs) error { | ||
| if _, ok := c.eventHandlers[event]; ok { | ||
| delete(c.eventHandlers, event) | ||
| return c.Send(Message{ | ||
| Cmd: CmdUnsubscribe, | ||
| Args: args, | ||
| Event: event, | ||
| }, nil) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (c *clientImpl) Send(message Message, handler Handler) error { | ||
| nonce := insecurerandstr.RandStr(32) | ||
| buff := new(bytes.Buffer) | ||
|
|
||
| message.Nonce = nonce | ||
| if err := json.NewEncoder(buff).Encode(message); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| errChan := make(chan error, 1) | ||
|
|
||
| c.commandHandlers[nonce] = internalHandler{ | ||
| handler: handler, | ||
| errChan: errChan, | ||
| } | ||
| if err := c.send(buff); err != nil { | ||
| delete(c.commandHandlers, nonce) | ||
| close(errChan) | ||
| return err | ||
| } | ||
| return <-errChan | ||
| } | ||
|
|
||
| func (c *clientImpl) listen(transport Transport) { | ||
| loop: | ||
| for { | ||
| reader, err := transport.NextReader() | ||
| if errors.Is(err, net.ErrClosed) { | ||
| c.logger.Error("Connection closed") | ||
| break loop | ||
| } | ||
| if err != nil { | ||
| c.logger.Errorf("Error reading message: %s", err) | ||
| continue | ||
| } | ||
|
|
||
| data, err := io.ReadAll(reader) | ||
| if err != nil { | ||
| c.logger.Errorf("Error reading message: %s", err) | ||
| continue | ||
| } | ||
| c.logger.Tracef("Received message: data: %s", string(data)) | ||
|
|
||
| reader = bytes.NewReader(data) | ||
|
|
||
| var v Message | ||
| if err = json.NewDecoder(reader).Decode(&v); err != nil { | ||
| c.logger.Errorf("failed to decode message: %s", err) | ||
| continue | ||
| } | ||
|
|
||
| if v.Cmd == CmdDispatch { | ||
| if d, ok := v.Data.(EventDataReady); ok { | ||
| c.readyChan <- struct{}{} | ||
| c.user = d.User | ||
| c.serverConfig = d.Config | ||
| c.v = d.V | ||
| } | ||
| if handler, ok := c.eventHandlers[v.Event]; ok { | ||
| handler.Handle(v.Data) | ||
| } | ||
| continue | ||
| } | ||
| if handler, ok := c.commandHandlers[v.Nonce]; ok { | ||
| if v.Event == EventError { | ||
| handler.errChan <- v.Data.(EventDataError) | ||
| } else { | ||
| if handler.handler != nil { | ||
| handler.handler.Handle(v.Data) | ||
| } | ||
| handler.errChan <- nil | ||
| } | ||
| close(handler.errChan) | ||
| delete(c.commandHandlers, v.Nonce) | ||
| } else { | ||
| c.logger.Errorf("No handler for nonce: %s", v.Nonce) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func (c *clientImpl) Close() { | ||
| if c.transport != nil { | ||
| _ = c.transport.Close() | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.