Merge pull request #884 from mrpalide/remove-heartbeat

Remove heartbeat | Add Deregister

cmd/skywire-visor/commands/systray.go

@@ -4,6 +4,7 @@ package commands
 
 import (
 	"context"
+
 	"github.com/getlantern/systray"
 	"github.com/skycoin/skycoin/src/util/logging"
 

internal/gui/gui_darwin.go

@@ -13,7 +13,7 @@ const (
 	pngIconPath     = "/Applications/Skywire.app/Contents/Resources/icon.png"
 	iconPath        = "/Applications/Skywire.app/Contents/Resources/tray_icon.tiff"
 	deinstallerPath = "/Applications/Skywire.app/Contents/deinstaller"
-	appPath = "/Applications/Skywire.app"
+	appPath         = "/Applications/Skywire.app"
 )
 
 func preReadIcon() error {

pkg/app/appdisc/discovery_manager.go

@@ -0,0 +1,42 @@
+package appdisc
+
+import (
+	"context"
+
+	"github.com/skycoin/skywire/pkg/servicedisc"
+)
+
+// Updater updates the associated app discovery
+type Updater interface {
+
+	// Start starts the updater.
+	Start()
+
+	// Stop stops the updater.
+	Stop()
+}
+
+// emptyUpdater is for apps that do not require discovery updates.
+type emptyUpdater struct{}
+
+func (emptyUpdater) Start() {}
+func (emptyUpdater) Stop()  {}
+
+// serviceUpdater updates service-discovery entry of locally running App.
+type serviceUpdater struct {
+	client *servicedisc.HTTPClient
+}
+
+func (u *serviceUpdater) Start() {
+	ctx := context.Background()
+	if err := u.client.Register(ctx); err != nil {
+		return
+	}
+}
+
+func (u *serviceUpdater) Stop() {
+	ctx := context.Background()
+	if err := u.client.DeleteEntry(ctx); err != nil {
+		return
+	}
+}

pkg/app/updatedisc/factory.go → pkg/app/appdisc/factory.go

@@ -1,8 +1,6 @@
-package updatedisc
+package appdisc
 
 import (
-	"time"
-
 	"github.com/sirupsen/logrus"
 	"github.com/skycoin/dmsg/cipher"
 	"github.com/skycoin/skycoin/src/util/logging"
@@ -14,20 +12,16 @@ import (
 
 // Factory creates appdisc.Updater instances based on the app name.
 type Factory struct {
-	Log            logrus.FieldLogger
-	PK             cipher.PubKey
-	SK             cipher.SecKey
-	UpdateInterval time.Duration
-	ServiceDisc    string // Address of service-discovery
+	Log         logrus.FieldLogger
+	PK          cipher.PubKey
+	SK          cipher.SecKey
+	ServiceDisc string // Address of service-discovery
 }
 
 func (f *Factory) setDefaults() {
 	if f.Log == nil {
 		f.Log = logging.MustGetLogger("appdisc")
 	}
-	if f.UpdateInterval == 0 {
-		f.UpdateInterval = skyenv.ServiceDiscUpdateInterval
-	}
 	if f.ServiceDisc == "" {
 		f.ServiceDisc = skyenv.DefaultServiceDiscAddr
 	}
@@ -49,8 +43,7 @@ func (f *Factory) VisorUpdater(port uint16) Updater {
 	}
 
 	return &serviceUpdater{
-		client:   servicedisc.NewClient(f.Log, conf),
-		interval: f.UpdateInterval,
+		client: servicedisc.NewClient(f.Log, conf),
 	}
 }
 
@@ -81,8 +74,11 @@ func (f *Factory) AppUpdater(conf appcommon.ProcConfig) (Updater, bool) {
 	switch conf.AppName {
 	case skyenv.VPNServerName:
 		return &serviceUpdater{
-			client:   servicedisc.NewClient(log, getServiceDiscConf(conf, servicedisc.ServiceTypeVPN)),
-			interval: f.UpdateInterval,
+			client: servicedisc.NewClient(log, getServiceDiscConf(conf, servicedisc.ServiceTypeVPN)),
+		}, true
+	case skyenv.SkysocksName:
+		return &serviceUpdater{
+			client: servicedisc.NewClient(log, getServiceDiscConf(conf, servicedisc.ServiceTypeSkysocks)),
 		}, true
 	default:
 		return &emptyUpdater{}, false

pkg/app/appserver/proc.go

@@ -7,7 +7,6 @@ import (
 	"net/rpc"
 	"os"
 	"os/exec"
-	"strconv"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -16,8 +15,8 @@ import (
 	"github.com/skycoin/skycoin/src/util/logging"
 
 	"github.com/skycoin/skywire/pkg/app/appcommon"
+	"github.com/skycoin/skywire/pkg/app/appdisc"
 	"github.com/skycoin/skywire/pkg/app/appnet"
-	"github.com/skycoin/skywire/pkg/app/updatedisc"
 )
 
 var (
@@ -29,7 +28,7 @@ var (
 // communication.
 // TODO(evanlinjin): In the future, we will implement the ability to run multiple instances (procs) of a single app.
 type Proc struct {
-	disc updatedisc.Updater // app discovery client
+	disc appdisc.Updater // app discovery client
 	conf appcommon.ProcConfig
 	log  *logging.Logger
 
@@ -57,7 +56,7 @@ type Proc struct {
 }
 
 // NewProc constructs `Proc`.
-func NewProc(mLog *logging.MasterLogger, conf appcommon.ProcConfig, disc updatedisc.Updater, m ProcManager,
+func NewProc(mLog *logging.MasterLogger, conf appcommon.ProcConfig, disc appdisc.Updater, m ProcManager,
 	appName string) *Proc {
 	if mLog == nil {
 		mLog = logging.NewMasterLogger()
@@ -136,26 +135,6 @@ func (p *Proc) awaitConn() bool {
 		panic(err)
 	}
 
-	connDelta := p.rpcGW.cm.AddDeltaInformer()
-	go func() {
-		for n := range connDelta.Chan() {
-			if err := p.disc.ChangeValue(updatedisc.ConnCountValue, []byte(strconv.Itoa(n))); err != nil {
-				p.log.WithError(err).WithField("value", updatedisc.ConnCountValue).
-					Error("Failed to change app discovery value.")
-			}
-		}
-	}()
-
-	lisDelta := p.rpcGW.lm.AddDeltaInformer()
-	go func() {
-		for n := range lisDelta.Chan() {
-			if err := p.disc.ChangeValue(updatedisc.ListenerCountValue, []byte(strconv.Itoa(n))); err != nil {
-				p.log.WithError(err).WithField("value", updatedisc.ListenerCountValue).
-					Error("Failed to change app discovery value.")
-			}
-		}
-	}()
-
 	go rpcS.ServeConn(p.conn)
 
 	p.log.Info("Associated and serving proc conn.")
@@ -259,6 +238,9 @@ func (p *Proc) Stop() error {
 		}
 	}
 
+	// deregister discovery service
+	p.disc.Stop()
+
 	// the lock will be acquired as soon as the cmd finishes its work
 	p.waitMx.Lock()
 	defer func() {

pkg/app/appserver/proc_manager.go

@@ -13,8 +13,8 @@ import (
 	"github.com/skycoin/skycoin/src/util/logging"
 
 	"github.com/skycoin/skywire/pkg/app/appcommon"
+	"github.com/skycoin/skywire/pkg/app/appdisc"
 	"github.com/skycoin/skywire/pkg/app/appevent"
-	"github.com/skycoin/skywire/pkg/app/updatedisc"
 )
 
 //go:generate mockery -name ProcManager -case underscore -inpkg
@@ -57,7 +57,7 @@ type procManager struct {
 	conns   map[string]net.Conn
 	connsWG sync.WaitGroup
 
-	discF      *updatedisc.Factory
+	discF      *appdisc.Factory
 	procs      map[string]*Proc
 	procsByKey map[appcommon.ProcKey]*Proc
 
@@ -69,12 +69,12 @@ type procManager struct {
 }
 
 // NewProcManager constructs `ProcManager`.
-func NewProcManager(mLog *logging.MasterLogger, discF *updatedisc.Factory, eb *appevent.Broadcaster, addr string) (ProcManager, error) {
+func NewProcManager(mLog *logging.MasterLogger, discF *appdisc.Factory, eb *appevent.Broadcaster, addr string) (ProcManager, error) {
 	if mLog == nil {
 		mLog = logging.NewMasterLogger()
 	}
 	if discF == nil {
-		discF = new(updatedisc.Factory)
+		discF = new(appdisc.Factory)
 	}
 	if eb == nil {
 		eb = appevent.NewBroadcaster(mLog.PackageLogger("event_broadcaster"), time.Second)