Allow cross-origin connections to websocket

simconnect/simconnect.go

@@ -7,7 +7,6 @@ package simconnect
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -55,7 +54,7 @@ func New(name string) (*SimConnect, error) {
 		if _, err = os.Stat(dllPath); os.IsNotExist(err) {
 			buf := MustAsset("MSFS-SDK/SimConnect SDK/lib/SimConnect.dll")
 
-			if err := ioutil.WriteFile(dllPath, buf, 0644); err != nil {
+			if err := os.WriteFile(dllPath, buf, 0644); err != nil {
 				return nil, err
 			}
 		}
@@ -92,9 +91,14 @@ func New(name string) (*SimConnect, error) {
 	//   HANDLE hEventHandle,
 	//   DWORD ConfigIndex
 	// );
+
+	var ptr, err = syscall.UTF16PtrFromString(name)
+	if err != nil {
+		return nil, err
+	}
 	args := []uintptr{
 		uintptr(unsafe.Pointer(&s.handle)),
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(name))),
+		uintptr(unsafe.Pointer(ptr)),
 		0,
 		0,
 		0,
@@ -165,7 +169,6 @@ func (s *SimConnect) Close() error {
 	r1, _, err := proc_SimConnect_Close.Call(uintptr(s.handle))
 	if int32(r1) < 0 {
 		return fmt.Errorf("SimConnect_Close error: %d %s", int32(r1), err)
-		panic("failed")
 	}
 	return nil
 }

vfrmap/main.go

@@ -103,45 +103,19 @@ func main() {
 	flag.Parse()
 
 	fmt.Printf("\nmsfs2020-go/vfrmap\n  readme: https://github.com/lian/msfs2020-go/blob/master/vfrmap/README.md\n  issues: https://github.com/lian/msfs2020-go/issues\n  version: %s (%s)\n\n", buildVersion, buildTime)
+	fmt.Print("https://kivle.github.io/msfs-map\n")
 
 	exitSignal := make(chan os.Signal, 1)
 	signal.Notify(exitSignal, os.Interrupt, syscall.SIGTERM)
+	go func() {
+		<-exitSignal
+		fmt.Print("\n\nExiting...\n")
+		os.Exit(0)
+	}()
 	exePath, _ := os.Executable()
 
 	ws := websockets.New()
 
-	s, err := simconnect.New("msfs2020-go/vfrmap")
-	if err != nil {
-		panic(err)
-	}
-	fmt.Println("connected to flight simulator!")
-
-	report := &Report{}
-	err = s.RegisterDataDefinition(report)
-	if err != nil {
-		panic(err)
-	}
-
-	trafficReport := &TrafficReport{}
-	err = s.RegisterDataDefinition(trafficReport)
-	if err != nil {
-		panic(err)
-	}
-
-	teleportReport := &TeleportRequest{}
-	err = s.RegisterDataDefinition(teleportReport)
-	if err != nil {
-		panic(err)
-	}
-
-	eventSimStartID := s.GetEventID()
-	//s.SubscribeToSystemEvent(eventSimStartID, "SimStart")
-	//s.SubscribeToFacilities(simconnect.FACILITY_LIST_TYPE_AIRPORT, s.GetDefineID(&simconnect.DataFacilityAirport{}))
-	//s.SubscribeToFacilities(simconnect.FACILITY_LIST_TYPE_WAYPOINT, s.GetDefineID(&simconnect.DataFacilityWaypoint{}))
-
-	startupTextEventID := s.GetEventID()
-	s.ShowText(simconnect.TEXT_TYPE_PRINT_WHITE, 15, startupTextEventID, "msfs2020-go/vfrmap connected")
-
 	go func() {
 		app := func(w http.ResponseWriter, r *http.Request) {
 			w.Header().Set("Access-Control-Allow-Origin", "*")
@@ -152,7 +126,8 @@ func main() {
 
 			filePath := filepath.Join(filepath.Dir(exePath), "index.html")
 
-			if _, err = os.Stat(filePath); os.IsNotExist(err) {
+			var _, err = os.Stat(filePath)
+			if os.IsNotExist(err) {
 				w.Write(MustAsset(filepath.Base(filePath)))
 			} else {
 				fmt.Println("use local", filePath)
@@ -171,6 +146,49 @@ func main() {
 		}
 	}()
 
+	for {
+		mainLoop(exitSignal, ws)
+		time.Sleep(time.Second * 5)
+	}
+}
+
+func mainLoop(exitSignal chan os.Signal, ws *websockets.Websocket) {
+	s, err := simconnect.New("msfs2020-go/vfrmap")
+	if err != nil {
+		fmt.Printf("\nFailed to create simconnect connection: %s", err)
+		return
+	}
+	fmt.Println("connected to flight simulator!")
+
+	report := &Report{}
+	err = s.RegisterDataDefinition(report)
+	if err != nil {
+		fmt.Printf("\nFailed to register data definition for Report: %s", err)
+		return
+	}
+
+	trafficReport := &TrafficReport{}
+	err = s.RegisterDataDefinition(trafficReport)
+	if err != nil {
+		fmt.Printf("\nFailed to register data definition for TrafficReport: %s", err)
+		return
+	}
+
+	teleportReport := &TeleportRequest{}
+	err = s.RegisterDataDefinition(teleportReport)
+	if err != nil {
+		fmt.Printf("\nFailed to register data definition for TeleportRequest: %s", err)
+		return
+	}
+
+	eventSimStartID := s.GetEventID()
+	//s.SubscribeToSystemEvent(eventSimStartID, "SimStart")
+	//s.SubscribeToFacilities(simconnect.FACILITY_LIST_TYPE_AIRPORT, s.GetDefineID(&simconnect.DataFacilityAirport{}))
+	//s.SubscribeToFacilities(simconnect.FACILITY_LIST_TYPE_WAYPOINT, s.GetDefineID(&simconnect.DataFacilityWaypoint{}))
+
+	startupTextEventID := s.GetEventID()
+	s.ShowText(simconnect.TEXT_TYPE_PRINT_WHITE, 15, startupTextEventID, "msfs2020-go/vfrmap connected")
+
 	simconnectTick := time.NewTicker(100 * time.Millisecond)
 	planePositionTick := time.NewTicker(200 * time.Millisecond)
 	trafficPositionTick := time.NewTicker(10000 * time.Millisecond)
@@ -280,7 +298,7 @@ func main() {
 			}
 			os.Exit(0)
 
-		case _ = <-ws.NewConnection:
+		case <-ws.NewConnection:
 			// drain and skip
 
 		case m := <-ws.ReceiveMessages:

vfrmap/websockets/connection.go

@@ -1,6 +1,7 @@
 package websockets
 
 import (
+	"net/http"
 	"bytes"
 	"encoding/json"
 	"fmt"
@@ -29,9 +30,14 @@ var (
 	upgrader = websocket.Upgrader{
 		ReadBufferSize:  1024,
 		WriteBufferSize: 1024,
+		CheckOrigin: CustomCheckOrigin,
 	}
 )
 
+func CustomCheckOrigin(r *http.Request) bool {
+	return true;
+}
+
 type ReceiveMessage struct {
 	Message    []byte
 	Connection *Connection