forked from ionorg/ion
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
28 changed files
with
901 additions
and
677 deletions.
There are no files selected for viewing
This file contains 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 |
|---|---|---|
|
|
@@ -14,5 +14,7 @@ cmd/islb/islb | |
| cmd/avp/avp | ||
| ./ion | ||
| .idea | ||
| .vscode | ||
| node_modules/ | ||
| cover.out | ||
|
|
||
This file contains 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 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 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 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 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 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 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 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 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 |
|---|---|---|
| @@ -1,21 +1,19 @@ | ||
| package avp | ||
|
|
||
| import ( | ||
| nprotoo "github.com/cloudwebrtc/nats-protoo" | ||
| ) | ||
| import "github.com/pion/ion/pkg/proto" | ||
|
|
||
| var ( | ||
| //nolint:unused | ||
| dc = "default" | ||
| //nolint:unused | ||
| nid = "avp-unkown-node-id" | ||
| protoo *nprotoo.NatsProtoo | ||
| nid = "avp-unkown-node-id" | ||
| nrpc *proto.NatsRPC | ||
| ) | ||
|
|
||
| // Init func | ||
| func Init(dcID, nodeID, rpcID, eventID, natsURL string) { | ||
| func Init(dcID, nodeID, natsURL string) { | ||
| dc = dcID | ||
| nid = nodeID | ||
| protoo = nprotoo.NewNatsProtoo(natsURL) | ||
| handleRequest(rpcID) | ||
| nrpc = proto.NewNatsRPC(natsURL) | ||
| handleRequest(nid) | ||
| } |
This file contains 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 |
|---|---|---|
| @@ -1,40 +1,31 @@ | ||
| package avp | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "errors" | ||
|
|
||
| nprotoo "github.com/cloudwebrtc/nats-protoo" | ||
| log "github.com/pion/ion-log" | ||
| "github.com/pion/ion/pkg/proto" | ||
| "github.com/pion/ion/pkg/util" | ||
| ) | ||
|
|
||
| func handleRequest(rpcID string) { | ||
| log.Infof("handleRequest: rpcID => [%v]", rpcID) | ||
| protoo.OnRequest(rpcID, func(request nprotoo.Request, accept nprotoo.RespondFunc, reject nprotoo.RejectFunc) { | ||
| method := request.Method | ||
| data := request.Data | ||
| log.Infof("handleRequest: method => %s, data => %s", method, data) | ||
| log.Infof("handleRequest: rpcID => [%s]", rpcID) | ||
|
|
||
| var result interface{} | ||
| errResult := util.NewNpError(400, fmt.Sprintf("Unknown method [%s]", method)) | ||
| _, err := nrpc.Subscribe(rpcID, func(msg interface{}) (interface{}, error) { | ||
| log.Infof("handleRequest: %T, %+v", msg, msg) | ||
|
|
||
| switch method { | ||
| case proto.AvpProcess: | ||
| var msg proto.ToAvpProcessMsg | ||
| if errResult = data.Unmarshal(&msg); errResult != nil { | ||
| break | ||
| switch v := msg.(type) { | ||
| case *proto.ToAvpProcessMsg: | ||
| if err := s.Process(v.Addr, v.PID, v.SID, v.TID, v.EID, v.Config); err != nil { | ||
| return nil, err | ||
| } | ||
| if err := s.Process(msg.Addr, msg.PID, msg.SID, msg.TID, msg.EID, msg.Config); err != nil { | ||
| errResult = util.NewNpError(500, err.Error()) | ||
| } | ||
| errResult = nil | ||
| default: | ||
| return nil, errors.New("unkonw message") | ||
| } | ||
|
|
||
| if errResult != nil { | ||
| reject(errResult.Code, errResult.Reason) | ||
| } else { | ||
| accept(result) | ||
| } | ||
| return nil, nil | ||
| }) | ||
|
|
||
| if err != nil { | ||
| log.Errorf("nrpc subscribe error: %v", err) | ||
| } | ||
| } |
Oops, something went wrong.