make connection public on receive

Signed-off-by: Ghanshyam Thakkar <shyamthakkar001@gmail.com>

Author: spectre10

cmd/root.go

@@ -13,7 +13,7 @@ var rootCmd = &cobra.Command{
 	Use:     "fs-cli",
 	Short:   "Peer-to-Peer filesharing CLI application",
 	Long:    `A Peer-to-Peer multi-threaded filesharing CLI app using WebRTC.`,
-	Version: "v0.5.1",
+	Version: "v0.5.2",
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.

session/receive/handlers.go

@@ -14,7 +14,7 @@ import (
 // Handle all the listeners.
 func (s *Session) HandleState() {
 	//print the state change
-	s.peerConnection.OnICEConnectionStateChange(func(state webrtc.ICEConnectionState) {
+	s.PeerConnection.OnICEConnectionStateChange(func(state webrtc.ICEConnectionState) {
 		if state == webrtc.ICEConnectionStateFailed {
 			fmt.Printf("\nICE Connection State has changed: %s\n\n", state.String())
 			s.done <- struct{}{}
@@ -27,7 +27,7 @@ func (s *Session) HandleState() {
 	})
 
 	//On new DataChannel being created by sender.
-	s.peerConnection.OnDataChannel(func(dc *webrtc.DataChannel) {
+	s.PeerConnection.OnDataChannel(func(dc *webrtc.DataChannel) {
 		if dc.Label() == "control" {
 			s.controlChannel = dc
 			//add listeners to control channel.
@@ -62,7 +62,7 @@ func (s *Session) HandleState() {
 					s.Channels[i].File, err = os.OpenFile(s.Channels[i].Name, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0644)
 
 					//increment the channelsDone counter
-					//atomic write is used avoid race conditions due to multiple channels being intiallized at once.
+					//atomic write is used avoid race conditions due to multiple channels being initiallized at once.
 					atomic.AddInt32(&s.channelsDone, 1)
 					if err != nil {
 						panic(err)

session/receive/methods.go

@@ -26,8 +26,8 @@ func (s *Session) CreateConnection() error {
 	if err != nil {
 		return err
 	}
-	s.peerConnection = peerConnection
-	s.gatherDone = webrtc.GatheringCompletePromise(s.peerConnection)
+	s.PeerConnection = peerConnection
+	s.gatherDone = webrtc.GatheringCompletePromise(s.PeerConnection)
 	s.HandleState()
 	return nil
 }
@@ -62,13 +62,13 @@ func (s *Session) transfer() {
 			mpb.PrependDecorators(
 				decor.Name(fmt.Sprintf("Receiving '%s': ", s.Channels[i].Name), decor.WCSyncSpaceR),
 
-				//Make the size counter disapper on completion.
+				//Make the size counter disappear on completion.
 				// decor.OnComplete(decor.Counters(decor.SizeB1024(0), "% .2f / % .2f", decor.WCSyncSpaceR), ""),
 
 				//display the received amount
 				//decor.SizeB1024 converts the amount into appropriate units of data (KiB,MiB,Gib)
 				decor.OnComplete(decor.Any(func(st decor.Statistics) string {
-					stats, _ := s.peerConnection.GetStats().GetDataChannelStats(doc.DC)
+					stats, _ := s.PeerConnection.GetStats().GetDataChannelStats(doc.DC)
 					return fmt.Sprintf("% .2f ", decor.SizeB1024(int64(stats.BytesReceived)))
 				}, decor.WCSyncSpaceR), ""),
 
@@ -78,7 +78,7 @@ func (s *Session) transfer() {
 					period := float64(time.Now().UnixMilli()-doc.StartTime) / 1000.0
 
 					// If the clients are disconnected, do not update speed.
-					if s.peerConnection.ICEConnectionState() == webrtc.ICEConnectionStateDisconnected {
+					if s.PeerConnection.ICEConnectionState() == webrtc.ICEConnectionStateDisconnected {
 						return fmt.Sprintf("%.2f MiB/s", 0.0)
 					}
 					return fmt.Sprintf("%.2f MiB/s", amount/period)
@@ -149,24 +149,24 @@ func (s *Session) fileWrite(proxyWriter io.WriteCloser, wg *sync.WaitGroup, i in
 
 func (s *Session) GenSDP(offer webrtc.SessionDescription) (string, error) {
 	var sdp string
-	err := s.peerConnection.SetRemoteDescription(offer)
+	err := s.PeerConnection.SetRemoteDescription(offer)
 	if err != nil {
 		return sdp, err
 	}
 
-	answer, err := s.peerConnection.CreateAnswer(nil)
+	answer, err := s.PeerConnection.CreateAnswer(nil)
 	if err != nil {
 		return sdp, err
 	}
 
-	err = s.peerConnection.SetLocalDescription(answer)
+	err = s.PeerConnection.SetLocalDescription(answer)
 	if err != nil {
 		return sdp, err
 	}
 	<-s.gatherDone
 
 	//Encode the SDP to base64
-	sdp, err = lib.Encode(s.peerConnection.LocalDescription())
+	sdp, err = lib.Encode(s.PeerConnection.LocalDescription())
 	return sdp, err
 }
 

session/receive/session.go

@@ -7,7 +7,7 @@ import (
 
 // Receiver's session struct to manage Datachannels, PeerConnection, Go Signaling Channels etc.
 type Session struct {
-	peerConnection *webrtc.PeerConnection
+	PeerConnection *webrtc.PeerConnection
 
 	controlChannel *webrtc.DataChannel //handling consent and metadata
 	Channels       []struct {

session/send/handlers.go

@@ -16,7 +16,7 @@ import (
 
 // Prints the state change.
 func (s *Session) handleState() {
-	s.peerConnection.OnICEConnectionStateChange(func(state webrtc.ICEConnectionState) {
+	s.PeerConnection.OnICEConnectionStateChange(func(state webrtc.ICEConnectionState) {
 		if state != webrtc.ICEConnectionStateClosed {
 			fmt.Printf("\nICE Connection State has changed: %s\n\n", state.String())
 		}
@@ -75,7 +75,7 @@ func (s *Session) handleopen() func() {
 					//display the sent amount
 					//decor.SizeB1024 converts the amount into appropriate units of data (KiB,MiB,Gib)
 					decor.OnComplete(decor.Any(func(st decor.Statistics) string {
-						stats, _ := s.peerConnection.GetStats().GetDataChannelStats(doc.DC)
+						stats, _ := s.PeerConnection.GetStats().GetDataChannelStats(doc.DC)
 						return fmt.Sprintf("% .2f ", decor.SizeB1024(int64(stats.BytesSent-doc.DC.BufferedAmount())))
 					}, decor.WCSyncSpaceR), ""),
 
@@ -85,7 +85,7 @@ func (s *Session) handleopen() func() {
 						period := float64(time.Now().UnixMilli()-doc.StartTime) / 1000.0
 
 						//If the clients are disconnected, do not update the speed.
-						if s.peerConnection.ICEConnectionState() == webrtc.ICEConnectionStateDisconnected {
+						if s.PeerConnection.ICEConnectionState() == webrtc.ICEConnectionStateDisconnected {
 							return fmt.Sprintf("%.2f MiB/s", 0.0)
 						}
 						return fmt.Sprintf("%.2f MiB/s", amount/period)
@@ -176,7 +176,7 @@ func (s *Session) close(closehandler bool) {
 			}
 		}
 		s.controlChannel.Close()
-		err := s.peerConnection.Close()
+		err := s.PeerConnection.Close()
 		if err != nil {
 			panic(err)
 		}

session/send/methods.go

@@ -32,7 +32,7 @@ func (s *Session) SetupConnection(paths []string) error {
 
 // Connects clients.
 func (s *Session) Connect(answer webrtc.SessionDescription) error {
-	err := s.peerConnection.SetRemoteDescription(answer)
+	err := s.PeerConnection.SetRemoteDescription(answer)
 	if err != nil {
 		return err
 	}
@@ -55,7 +55,7 @@ func (s *Session) createConnection() error {
 	if err != nil {
 		return err
 	}
-	s.peerConnection = peerConnection
+	s.PeerConnection = peerConnection
 	s.handleState()
 	return nil
 }
@@ -94,7 +94,7 @@ func (s *Session) createTransferChannel(path string, i int) error {
 	//mplt means MaxPacketLifeTime.
 	//It is the time in Miliseconds during which if the sender does not receive acknowledgement of the packet, it will retransmit.
 	mplt := uint16(5000)
-	s.channels[i].DC, err = s.peerConnection.CreateDataChannel(fmt.Sprintf("dc%d", i), &webrtc.DataChannelInit{
+	s.channels[i].DC, err = s.PeerConnection.CreateDataChannel(fmt.Sprintf("dc%d", i), &webrtc.DataChannelInit{
 		Ordered:           &ordered,
 		MaxPacketLifeTime: &mplt,
 	})
@@ -129,7 +129,7 @@ func (s *Session) createTransferChannel(path string, i int) error {
 func (s *Session) createControlChannel() error {
 	ordered := true
 	mplt := uint16(5000)
-	channel, err := s.peerConnection.CreateDataChannel("control", &webrtc.DataChannelInit{
+	channel, err := s.PeerConnection.CreateDataChannel("control", &webrtc.DataChannelInit{
 		Ordered:           &ordered,
 		MaxPacketLifeTime: &mplt,
 	})
@@ -160,14 +160,14 @@ func (s *Session) createControlChannel() error {
 }
 
 func (s *Session) GenOffer() (string, error) {
-	offer, err := s.peerConnection.CreateOffer(nil)
+	offer, err := s.PeerConnection.CreateOffer(nil)
 	if err != nil {
 		return "", err
 	}
-	s.gatherDone = webrtc.GatheringCompletePromise(s.peerConnection)
-	err = s.peerConnection.SetLocalDescription(offer)
+	s.gatherDone = webrtc.GatheringCompletePromise(s.PeerConnection)
+	err = s.PeerConnection.SetLocalDescription(offer)
 	<-s.gatherDone
-	offer2 := s.peerConnection.LocalDescription()
+	offer2 := s.PeerConnection.LocalDescription()
 
 	if err != nil {
 		return "", err