Removed DSM

Introduce the notFoundError struct to provide more detailed error messages for missing handlers like alarms, JSON operations, and payload types. Update error handling to leverage the new custom type and use errors.As for better flexibility. Additionally, update module imports to version v2 in relevant files.

cmd/dev-server/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"errors"
 	"fmt"
-	"gitea.unprism.ru/KRBL/n9m"
+	"gitea.unprism.ru/KRBL/n9m/v2"
 	"io"
 	"net"
 	"os"
@@ -88,6 +88,13 @@ func handleGetConfig(sPack *n9m.SmartPackage, pack n9m.Package) (err error) {
 
 	os.WriteFile(fmt.Sprintf("./%s.json", serial), pack.RawPayload, 0644)
 
+	var request n9m.ConfigModelSetRequest
+
+	if err = pack.GetParametersAs(&request); err != nil {
+		fmt.Println(err)
+		return err
+	}
+
 	return
 }
 

params.go

@@ -331,5 +331,5 @@ type Setting struct {
 	PSI       PSI       `json:"PSI,omitempty"`
 
 	SWUS SWUS `json:"SWUS,omitempty"`
-	DSM  DSM  `json:"DSM,omitempty"`
+	// DSM  DSM  `json:"DSM,omitempty"`
 }

smart.go

@@ -1,10 +1,19 @@
 package n9m
 
 import (
+	"errors"
 	"fmt"
 	"net"
 )
 
+type notFoundError struct {
+	message string
+}
+
+func (e *notFoundError) Error() string {
+	return fmt.Sprintf("not found %s", e.message)
+}
+
 func NewSmartPackage(conn net.Conn) *SmartPackage {
 	return &SmartPackage{
 		pack:           Package{},
@@ -42,7 +51,9 @@ func (pack *SmartPackage) handleAlarm() (err error) {
 	var processFunc AlarmProcessFunc
 	var ok bool
 	if processFunc, ok = pack.alarmProcess[params.AlarmType]; !ok {
-		return fmt.Errorf("unhanled alarm")
+		return &notFoundError{
+			message: fmt.Sprintf("alarm %d", params.AlarmType),
+		}
 	}
 
 	var response SendAlarmInfoResponse
@@ -62,28 +73,35 @@ func (pack *SmartPackage) handleJson() (err error) {
 		return fmt.Errorf("invalid json payload type")
 	}
 
-	if err = pack.handleAlarm(); err == nil {
+	var nfErr *notFoundError
+	if err = pack.handleAlarm(); err == nil || errors.As(err, &nfErr) {
 		return
 	}
 
 	var processFunc ProcessFunc
 	var ok bool
-	if processFunc, ok = pack.jsonProcess[fmt.Sprintf("%s:%s", pack.pack.Payload.Module, pack.pack.Payload.Operation)]; !ok {
-		return fmt.Errorf("unhanled operation")
+	var key = fmt.Sprintf("%s:%s", pack.pack.Payload.Module, pack.pack.Payload.Operation)
+	if processFunc, ok = pack.jsonProcess[key]; !ok {
+		return &notFoundError{
+			message: fmt.Sprintf("json %s", key),
+		}
 	}
 
 	return processFunc(pack, pack.pack)
 }
 
 func (pack *SmartPackage) handle() (err error) {
-	if err = pack.handleJson(); err == nil {
+	var nfErr *notFoundError
+	if err = pack.handleJson(); err == nil || errors.As(err, &nfErr) {
 		return
 	}
 
 	var processFunc ProcessFunc
 	var ok bool
 	if processFunc, ok = pack.payloadProcess[pack.pack.PayloadType]; !ok {
-		return fmt.Errorf("unhanled payload type")
+		return &notFoundError{
+			message: fmt.Sprintf("payload type %d", pack.pack.PayloadType),
+		}
 	}
 
 	return processFunc(pack, pack.pack)

test/certificate_test.go

@@ -2,7 +2,7 @@ package test
 
 import (
 	"fmt"
-	"gitea.unprism.ru/KRBL/n9m"
+	"gitea.unprism.ru/KRBL/n9m/v2"
 	"testing"
 )