added graceful shutdown

internal/ble/beacon.go

@@ -14,7 +14,7 @@ const airDropBit = 0x05
 func SendAirDropBeacon(appleAccount account.AppleAccount) error {
 	manufacturerData := appleAccount.BuildManufacturerData()
 
-	adv := adapter.DefaultAdvertisement()
+	adv = adapter.DefaultAdvertisement()
 	adv.Configure(bluetooth.AdvertisementOptions{
 		LocalName:    device,
 		ServiceUUIDs: nil,
@@ -49,3 +49,8 @@ func StartScan(onBeaconReceive chan AirDropBeacon) error {
 		}
 	})
 }
+
+func Shutdown() error {
+	adv.Stop()
+	return adapter.StopScan() // This doesn't work
+}

internal/ble/ble.go

@@ -3,6 +3,7 @@ package ble
 import "github.com/Binozo/tinygo-bluetooth"
 
 var adapter = bluetooth.DefaultAdapter
+var adv *bluetooth.Advertisement
 
 const device = "hci0"
 

pkg/airdrop/api.go

@@ -14,6 +14,8 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"os"
+	"os/signal"
+	"syscall"
 	"time"
 )
 
@@ -101,6 +103,7 @@ func Init() error {
 	if debug {
 		log.Info().Msg("GoDrop setup successful")
 	}
+	go listenForShutdown()
 	return nil
 }
 
@@ -171,3 +174,22 @@ func OnAsk(callback func(request air.Request) bool) {
 func OnFiles(callback func(request air.Request, files []*cpio.File)) {
 	interaction.AddFilesCallback(callback)
 }
+
+// Shutdown gracefully
+func listenForShutdown() {
+	ch := make(chan os.Signal)
+	signal.Notify(ch, os.Interrupt, syscall.SIGTERM) // all OS signals
+	sig := <-ch
+	log.Info().Msgf("[GoDrop] Shutting down... (%v)", sig)
+	if err := owl.Kill(); err != nil {
+		log.Error().Err(err).Msg("Couldn't kill Owl")
+	}
+
+	if err := ble.Shutdown(); err != nil {
+		log.Error().Err(err).Msg("Couldn't BLE scan")
+	}
+
+	awdl.ShutdownService()
+
+	//os.Exit(-1)
+}

pkg/owl/owl.go

@@ -9,22 +9,24 @@ import (
 
 const OwlInterface = "awdl0"
 
+var owlCmd *exec.Cmd
+
 // Setup the Wifi interface and start OWL
 func Setup(wifiInterface string) error {
 	setupWifi(wifiInterface)
 	return startOwl(wifiInterface)
 }
 
 func startOwl(wifiInterface string) error {
-	cmd := exec.Command("owl", "-i", wifiInterface, "-c", "44") // -c 44 works best
+	owlCmd = exec.Command("owl", "-i", wifiInterface, "-c", "44") // -c 44 works best
 
 	// Owl is somehow only using stderr as main log output
-	//stdout, _ := cmd.StdoutPipe()
-	stderr, _ := cmd.StderrPipe()
+	//stdout, _ := owlCmd.StdoutPipe()
+	stderr, _ := owlCmd.StderrPipe()
 	//go listenOnOutput(stdout)
 	go listenOnOutput(stderr)
 
-	err := cmd.Start()
+	err := owlCmd.Start()
 	if err != nil {
 		return err
 	}
@@ -34,7 +36,7 @@ func startOwl(wifiInterface string) error {
 	//log.Info().Msgf("Owl is up and running at %s", GetOwlInterfaceAddr())
 
 	go func() {
-		err = cmd.Wait()
+		err = owlCmd.Wait()
 		if err != nil {
 			// Exited with error
 			owlTerminated(outLogs)
@@ -77,3 +79,8 @@ func GetOwlInterfaceAddr() string {
 	log.Fatal().Msg("Couldn't find Owl interface")
 	return ""
 }
+
+// Kill Owl
+func Kill() error {
+	return owlCmd.Process.Kill()
+}