♻️ All parts into nexus

pkg/internal/gap/net.go

@@ -1,15 +0,0 @@
-package gap
-
-import "net"
-
-func GetOutboundIP() (net.IP, error) {
-	conn, err := net.Dial("udp", "1.1.1.1:80")
-	if err != nil {
-		return nil, err
-	} else {
-		defer conn.Close()
-	}
-
-	localAddr := conn.LocalAddr().(*net.UDPAddr)
-	return localAddr.IP, nil
-}

pkg/internal/gap/server.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex"
 	"git.solsynth.dev/hypernet/nexus/pkg/proto"
+	"git.solsynth.dev/hypernet/pusher/pkg/pushkit/pushcon"
 	"github.com/rs/zerolog/log"
 	"strings"
 
@@ -11,18 +12,19 @@ import (
 )
 
 var Nx *nex.Conn
+var Px *pushcon.Conn
 
 func InitializeToNexus() error {
 	grpcBind := strings.SplitN(viper.GetString("grpc_bind"), ":", 2)
 	httpBind := strings.SplitN(viper.GetString("bind"), ":", 2)
 
-	outboundIp, _ := GetOutboundIP()
+	outboundIp, _ := nex.GetOutboundIP()
 
 	grpcOutbound := fmt.Sprintf("%s:%s", outboundIp, grpcBind[1])
 	httpOutbound := fmt.Sprintf("%s:%s", outboundIp, httpBind[1])
 
 	var err error
-	Nx, err = nex.NewNexusConn(viper.GetString("dealer.addr"), &proto.ServiceInfo{
+	Nx, err = nex.NewNexusConn(viper.GetString("nexus_addr"), &proto.ServiceInfo{
 		Id:       viper.GetString("id"),
 		Type:     nex.ServiceTypeAuth,
 		Label:    "Passport",
@@ -38,5 +40,10 @@ func InitializeToNexus() error {
 		}()
 	}
 
+	Px, err = pushcon.NewConn(Nx)
+	if err != nil {
+		return fmt.Errorf("error during initialize pushcon: %v", err)
+	}
+
 	return err
 }