cleanup

chrome_debugger.go

@@ -49,7 +49,7 @@ func StartProcessAndConnectDebugger(program string) (*ChromeDebugger, *exec.Cmd,
 }
 
 func ConnectDebugger(port int) (*ChromeDebugger, error) {
-	url, err := getWebsocketUrl(port)
+	url, err := GetWebsocketDebuggerUrl(port)
 	if err != nil {
 		return nil, err
 	}
@@ -64,7 +64,7 @@ func ConnectDebugger(port int) (*ChromeDebugger, error) {
 	}, nil
 }
 
-func getWebsocketUrl(port int) (string, error) {
+func GetWebsocketDebuggerUrl(port int) (string, error) {
 	var url string
 
 	err := retry.Do(

main.go

@@ -17,7 +17,7 @@ func GetLunarExecutable() (string, error) {
 	} else {
 		switch runtime.GOOS {
 		case "windows":
-			var home, err = os.UserHomeDir()
+			home, err := os.UserHomeDir()
 			if err != nil {
 				return "", err
 			}
@@ -38,54 +38,48 @@ func GetLunarExecutable() (string, error) {
 	return "", fmt.Errorf("'%s' does not exist", exe)
 }
 
-func GetExecutableDirectory() (string, error) {
-	ex, err := os.Executable()
-	if err != nil {
-		return "", err
-	}
-
-	return filepath.Dir(ex), nil
-}
-
-//go:embed inject.js
-var injectJs string
-
-func main() {
-	log.SetFlags(0)
-
+func Run() (err error) {
 	lunarExe, err := GetLunarExecutable()
 	if err != nil {
-		log.Println(err)
-		log.Fatalln("failed to locate the lunar launcher executable, try passing it by argument")
+		return fmt.Errorf("%w\nfailed to locate the lunar launcher executable, try passing it by argument", err)
 	}
 
 	d, cmd, err := StartProcessAndConnectDebugger(lunarExe)
+	if cmd != nil {
+		defer func() {
+			if err != nil {
+				_ = cmd.Process.Kill()
+			}
+		}()
+	}
 	if err != nil {
-		if cmd != nil {
-			_ = cmd.Process.Kill()
-		}
-
-		log.Fatalln(err)
+		return
 	}
 	defer d.Close()
-	dir, err := GetExecutableDirectory()
+
+	ex, err := os.Executable()
 	if err != nil {
-		_ = cmd.Process.Kill()
-		log.Fatalln(err)
+		return
 	}
 
-	err = d.Send("Runtime.callFunctionOn", map[string]any{
+	return d.Send("Runtime.callFunctionOn", map[string]any{
+		"executionContextId":  1,
 		"functionDeclaration": injectJs,
 		"arguments": []any{
 			map[string]any{
-				"value": dir,
+				"value": filepath.Dir(ex),
 			},
 		},
-		"executionContextId": 1,
 	})
+}
 
-	if err != nil {
-		_ = cmd.Process.Kill()
+func main() {
+	log.SetFlags(0)
+
+	if err := Run(); err != nil {
 		log.Fatalln(err)
 	}
 }
+
+//go:embed inject.js
+var injectJs string