Backend update: Macro translation and refactor of saving and playing macros.

be/app/helper/device-helper.go

@@ -19,6 +19,8 @@ func TempPinFile(Uuid string, pin string) (bool, error) {
 	return true, nil
 }
 
+func RemovePinFile(Uuid string) error { return os.Remove("devices/" + Uuid + ".tmp") }
+
 func CheckPinFile(Uuid string) bool {
 	_, err := os.Stat("devices/" + Uuid + ".tmp")
 	return err == nil

be/app/helper/env-helper.go

@@ -1,49 +1,92 @@
 package helper
 
 import (
+	"encoding/json"
 	"log"
 	"net"
 	"os"
 	"strconv"
-
-	"github.com/joho/godotenv"
+	"strings"
 )
 
+var configPath = "../public/config.js"
+
 func EnvGet(key string) string {
-	envFile := "../.env"
-	fileExists := func() bool {
-		_, err := os.Stat(envFile)
-		return err == nil
+	if !configFileExists() {
+		createConfigFile(configPath)
+		checkFeDevDir()
 	}
-	if !fileExists() {
-		createEnvFile(envFile)
-	}
-	err := godotenv.Load(envFile)
+
+	data, err := os.ReadFile(configPath)
 	if err != nil {
+		log.Println("Error reading config.js:", err)
 		return ""
 	}
-	return os.Getenv("VITE_" + key)
+
+	raw := strings.TrimSpace(string(data))
+	raw = strings.TrimPrefix(raw, "window.__CONFIG__ = ")
+	raw = strings.TrimSuffix(raw, ";")
+
+	var config map[string]string
+	if err := json.Unmarshal([]byte(raw), &config); err != nil {
+		log.Println("Error parsing config.js:", err)
+		return ""
+	}
+
+	return config[key]
 }
 
-func createEnvFile(filename string) {
-	log.Println("Creating .env file...")
-	file, err := os.Create(filename)
+func configFileExists() bool {
+	_, err := os.Stat(configPath)
+	return err == nil
+}
+
+func checkFeDevDir() {
+	_, err := os.Stat("../fe")
+
 	if err != nil {
-		log.Println(err)
+		return
 	}
-	defer file.Close()
-	// You can add some default values to the .env file here if needed
-	// For example:
-	port, err := findOpenPort()
+
+	copyConfigToFe()
+}
+
+func copyConfigToFe() {
+	data, err := os.ReadFile("../public/config.js")
+
+	if err != nil {
+		log.Println("Error reading config.js:", err)
+		return
+	}
+
+	if err := os.WriteFile("../fe/config.js", data, 0644); err != nil {
+		log.Println("Error writing config.js:", err)
+	}
+}
+
+func createConfigFile(filename string) {
+	port, _ := findOpenPort()
 	saltKey := GenerateKey()
 	salt := saltKey[:28]
 	iv := GenerateRandomIntegerString(16)
 
-	log.Println(err, saltKey, iv)
+	config := map[string]string{
+		"MCRM__PORT": port,
+		"MCRM__SALT": salt,
+		"MCRM__IV":   iv,
+	}
 
-	_, err = file.WriteString("VITE_MCRM__PORT=" + string(port) + "\nVITE_MCRM__SALT=" + salt + "\nVITE_MCRM__IV=" + iv)
+	jsonData, err := json.MarshalIndent(config, "", "  ")
 	if err != nil {
-		log.Fatal(err)
+		log.Println("Error creating config JSON:", err)
+		return
+	}
+	jsData := "window.__CONFIG__ = " + string(jsonData) + ";"
+
+	log.Println("Created JS config:", jsData)
+
+	if err := os.WriteFile(filename, []byte(jsData), 0644); err != nil {
+		log.Println("Error writing config.js:", err)
 	}
 }
 

be/app/helper/macro-helper.go

@@ -3,13 +3,13 @@ package helper
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
+	"log"
 	"os"
 	"regexp"
 	"strings"
 	"time"
 
-	"be/app/structs"
-
 	"github.com/go-vgo/robotgo"
 )
 
@@ -33,7 +33,7 @@ func FormatMacroFileName(s string) string {
 	return s
 }
 
-func ReadMacroFile(filename string) (steps []structs.Step, err error) {
+func ReadMacroFile(filename string) (steps []map[string]interface{}, err error) {
 	content, err := os.ReadFile(filename)
 
 	if err != nil {
@@ -45,19 +45,48 @@ func ReadMacroFile(filename string) (steps []structs.Step, err error) {
 	return steps, err
 }
 
-func RunMacroSteps(steps []structs.Step) error {
+func RunMacroSteps(steps []map[string]interface{}) error {
 	for _, step := range steps {
-		switch step.Type {
+		switch step["type"] {
 		case "key":
-			err := robotgo.KeyToggle(step.Key, step.Direction)
-			if err != nil {
-				return errors.New("RunMacroSteps KeyToggle Error: " + err.Error())
+			keyCode := step["code"].(string)
+			if strings.Contains(keyCode, "|") {
+				keyCode = handleToggleCode(keyCode, step["direction"].(string))
 			}
+			log.Println("keycode", keyCode, step["direction"].(string))
+			robotgo.KeyToggle(keyCode, step["direction"].(string))
 		case "delay":
-			time.Sleep(time.Duration(step.Location) * time.Millisecond)
+			log.Println("delay", step["value"].(float64))
+			time.Sleep(time.Duration(step["value"].(float64)) * time.Millisecond)
 		default:
-			return errors.New("RunMacroSteps Unknown step type:" + step.Type)
+			return errors.New("RunMacroSteps Unknown step type: %v" + fmt.Sprint(step["type"]))
 		}
 	}
+	log.Println("-----")
 	return nil
 }
+
+var toggleCodes = map[string]bool{}
+
+func handleToggleCode(keyCode string, direction string) string {
+	splitCodes := strings.Split(keyCode, "|")
+
+	if direction == "down" {
+		if _, ok := toggleCodes[splitCodes[0]]; !ok {
+			toggleCodes[splitCodes[0]] = true
+			return splitCodes[0]
+		}
+		return splitCodes[1]
+	}
+
+	if direction == "up" {
+		if toggleCodes[splitCodes[0]] {
+			toggleCodes[splitCodes[0]] = false
+			return splitCodes[0]
+		}
+		delete(toggleCodes, splitCodes[0])
+		return splitCodes[1]
+	}
+
+	return ""
+}

be/app/helper/translation-helper.go

@@ -0,0 +1,93 @@
+package helper
+
+import "strings"
+
+func Translate(code string) string {
+	translations := map[string]string{
+		"ArrowUp":            "up",
+		"ArrowDown":          "down",
+		"ArrowRight":         "right",
+		"ArrowLeft":          "left",
+		"Meta":               "cmd",
+		"MetaLeft":           "lcmd",
+		"MetaRight":          "rcmd",
+		"Alt":                "alt",
+		"AltLeft":            "lalt",
+		"AltRight":           "ralt",
+		"Control":            "ctrl",
+		"ControlLeft":        "lctrl",
+		"ControlRight":       "rctrl",
+		"Shift":              "shift",
+		"ShiftLeft":          "lshift",
+		"ShiftRight":         "rshift",
+		"AudioVolumeMute":    "audio_mute",
+		"AudioVolumeDown":    "audio_vol_down",
+		"AudioVolumeUp":      "audio_vol_up",
+		"MediaTrackPrevious": "audio_prev",
+		"MediaTrackNext":     "audio_next",
+		"MediaPlayPause":     "audio_play|audio_pause",
+		"Numpad0":            "num0",
+		"Numpad1":            "num1",
+		"Numpad2":            "num2",
+		"Numpad3":            "num3",
+		"Numpad4":            "num4",
+		"Numpad5":            "num5",
+		"Numpad6":            "num6",
+		"Numpad7":            "num7",
+		"Numpad8":            "num8",
+		"Numpad9":            "num9",
+		"NumLock":            "num_lock",
+		"NumpadDecimal":      "num.",
+		"NumpadAdd":          "num+",
+		"NumpadSubtract":     "num-",
+		"NumpadMultiply":     "num*",
+		"NumpadDivide":       "num/",
+		"NumpadEnter":        "num_enter",
+		"Clear":              "num_clear",
+	}
+
+	if translations[code] == "" {
+		return strings.ToLower(code)
+	}
+
+	return translations[code]
+}
+
+// Redundant translation because tolower can be used
+// "Backspace":          "backspace",
+// "Delete":             "delete",
+// "Enter":              "enter",
+// "Tab":                "tab",
+// "Escape":             "esc",
+// "Home":               "home",
+// "End":                "end",
+// "PageUp":             "pageup",
+// "PageDown":           "pagedown",
+// "F1":                 "f1",
+// "F2":                 "f2",
+// "F3":                 "f3",
+// "F4":                 "f4",
+// "F5":                 "f5",
+// "F6":                 "f6",
+// "F7":                 "f7",
+// "F8":                 "f8",
+// "F9":                 "f9",
+// "F10":                "f10",
+// "F11":                "f11",
+// "F12":                "f12",
+// "F13":                "f13",
+// "F14":                "f14",
+// "F15":                "f15",
+// "F16":                "f16",
+// "F17":                "f17",
+// "F18":                "f18",
+// "F19":                "f19",
+// "F20":                "f20",
+// "F21":                "f21",
+// "F22":                "f22",
+// "F23":                "f23",
+// "F24":                "f24",
+// "CapsLock":           "capslock",
+// "Space":              "space",
+// "PrintScreen":        "printscreen",
+// "Insert":             "insert",