niujiuru hace 1 mes
padre
commit
7b4d69e1c5
Se han modificado 3 ficheros con 28 adiciones y 13 borrados
  1. 15 0
      mqtt_reporter/client.go
  2. 8 8
      mqtt_reporter/config.go
  3. 5 5
      utils/utils.go

+ 15 - 0
mqtt_reporter/client.go

@@ -1 +1,16 @@
 package mqttreporter
 package mqttreporter
+
+import "errors"
+
+var (
+	ErrNotStarted   = errors.New("mqtt client not started")
+	ErrNotConnected = errors.New("mqtt client not connected")
+	ErrClosed       = errors.New("mqtt client is closed, cannot perform operation")
+)
+
+type ClientConfig struct {
+	Broker   string
+	ClientID string
+	Username string
+	Password string
+}

+ 8 - 8
mqtt_reporter/config.go

@@ -96,12 +96,12 @@ const defaultConfig = `{
   ]
   ]
 }`
 }`
 
 
-func LoadServerConfig(path, id string) (*ServerConfig, error) {
-	if strings.TrimSpace(id) == "" {
+func LoadServerConfig(filePath, deviceID string) (*ServerConfig, error) {
+	if strings.TrimSpace(deviceID) == "" {
 		return nil, errors.New("device id is empty")
 		return nil, errors.New("device id is empty")
 	}
 	}
 
 
-	data, err := os.ReadFile(path)
+	data, err := os.ReadFile(filePath)
 	useDefault := os.IsNotExist(err)
 	useDefault := os.IsNotExist(err)
 	if err != nil && !useDefault {
 	if err != nil && !useDefault {
 		return nil, err
 		return nil, err
@@ -110,14 +110,14 @@ func LoadServerConfig(path, id string) (*ServerConfig, error) {
 	var cfg configFile
 	var cfg configFile
 	if !useDefault {
 	if !useDefault {
 		if err := json.Unmarshal(data, &cfg); err != nil {
 		if err := json.Unmarshal(data, &cfg); err != nil {
-			baseapp.Logger.Warnf("[%s] 解析配置文件 %s 失败,使用默认配置: %v!", MODULE_NAME, path, err)
+			baseapp.Logger.Warnf("[%s] 解析配置文件 %s 失败,使用默认配置: %v!", MODULE_NAME, filePath, err)
 			useDefault = true
 			useDefault = true
 		}
 		}
 	}
 	}
 
 
 	if useDefault {
 	if useDefault {
 		data = []byte(defaultConfig)
 		data = []byte(defaultConfig)
-		if err := utils.WriteFileAtomic(path, append(data, '\n')); err != nil {
+		if err := utils.WriteFileAtomic(filePath, append(data, '\n')); err != nil {
 			baseapp.Logger.Warnf("[%s] 保存默认配置文件失败: %v!", MODULE_NAME, err)
 			baseapp.Logger.Warnf("[%s] 保存默认配置文件失败: %v!", MODULE_NAME, err)
 		}
 		}
 	}
 	}
@@ -126,7 +126,7 @@ func LoadServerConfig(path, id string) (*ServerConfig, error) {
 		return nil, err
 		return nil, err
 	}
 	}
 
 
-	r := strings.NewReplacer("${id}", id)
+	r := strings.NewReplacer("${id}", deviceID)
 
 
 	for i := range cfg.MQTTServers {
 	for i := range cfg.MQTTServers {
 		cfg.MQTTServers[i].Topics.Pub = r.Replace(cfg.MQTTServers[i].Topics.Pub)
 		cfg.MQTTServers[i].Topics.Pub = r.Replace(cfg.MQTTServers[i].Topics.Pub)
@@ -149,7 +149,7 @@ func LoadServerConfig(path, id string) (*ServerConfig, error) {
 	}, nil
 	}, nil
 }
 }
 
 
-func (c *ServerConfig) Save(path string) error {
+func (c *ServerConfig) Save(filePath string) error {
 	c.mu.RLock()
 	c.mu.RLock()
 	defer c.mu.RUnlock()
 	defer c.mu.RUnlock()
 
 
@@ -162,7 +162,7 @@ func (c *ServerConfig) Save(path string) error {
 		return err
 		return err
 	}
 	}
 
 
-	return utils.WriteFileAtomic(path, append(data, '\n'))
+	return utils.WriteFileAtomic(filePath, append(data, '\n'))
 }
 }
 
 
 func (c *ServerConfig) GetMQTSServers() []MQTTServer {
 func (c *ServerConfig) GetMQTSServers() []MQTTServer {

+ 5 - 5
utils/utils.go

@@ -49,12 +49,12 @@ func GetCPUTemperature() (float64, error) {
 }
 }
 
 
 func PlayWelcomeAudio() {
 func PlayWelcomeAudio() {
-	path := filepath.Join(baseapp.EXEC_DIR, "voices/welcome.wav")
-	PlayAudioAsync(path)
+	filePath := filepath.Join(baseapp.EXEC_DIR, "voices/welcome.wav")
+	PlayAudioAsync(filePath)
 }
 }
 
 
-func WriteFileAtomic(path string, data []byte) error {
-	tmp, err := os.CreateTemp(filepath.Dir(path), "."+filepath.Base(path)+".tmp-*")
+func WriteFileAtomic(filePath string, data []byte) error {
+	tmp, err := os.CreateTemp(filepath.Dir(filePath), "."+filepath.Base(filePath)+".tmp-*")
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}
@@ -76,5 +76,5 @@ func WriteFileAtomic(path string, data []byte) error {
 		return err
 		return err
 	}
 	}
 
 
-	return os.Rename(tmpPath, path)
+	return os.Rename(tmpPath, filePath)
 }
 }