diff --git a/config/config.go b/config/config.go index 05727aa..7ad632c 100644 --- a/config/config.go +++ b/config/config.go @@ -2,7 +2,7 @@ package config import ( "bytes" - "encoding/json/v2" + "encoding/json" "flag" "fmt" "log" @@ -78,7 +78,9 @@ func ParseConfiguration() (conf SpaceapidConfig) { } // Parse JSON - err = json.UnmarshalRead(bytes.NewReader(file), &conf, json.RejectUnknownMembers(true)) + dec := json.NewDecoder(bytes.NewReader(file)) + dec.DisallowUnknownFields() + err = dec.Decode(&conf) if err != nil { log.Fatalln("Could not parse spaceapid config file:", err) } diff --git a/go.mod b/go.mod index 61b6d1f..506613d 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ module git.hamburg.ccc.de/ccchh/spaceapid -go 1.27 +go 1.22 diff --git a/handlers/root.go b/handlers/root.go index e79023a..88cdc55 100644 --- a/handlers/root.go +++ b/handlers/root.go @@ -1,7 +1,7 @@ package handlers import ( - "encoding/json/v2" + "encoding/json" "log" "net/http" @@ -19,7 +19,7 @@ func Root(resp *types.SpaceAPIResponse) func(http.ResponseWriter, *http.Request) } // Serialize response - response, err := json.Marshal(resp, json.Deterministic(true)) + response, err := json.Marshal(resp) if err != nil { log.Println("Failed to serialize JSON response:", err) w.WriteHeader(http.StatusInternalServerError) diff --git a/handlers/state.go b/handlers/state.go index 47d7878..d4962c1 100644 --- a/handlers/state.go +++ b/handlers/state.go @@ -10,7 +10,7 @@ import ( "git.hamburg.ccc.de/ccchh/spaceapid/types" ) -func StateOpenPUT( +func StateOpen( authDB config.HTTPBACredentials, validCredentials []config.HTTPBACredentialID, resp *types.SpaceAPIState, ) func(http.ResponseWriter, *http.Request) { @@ -22,7 +22,7 @@ func StateOpenPUT( } // Parse request body - doorNowOpen, err := strconv.ParseBool(string(body)) + newState, err := strconv.ParseBool(string(body)) if err != nil { log.Println("Failed to parse request body from", r.RemoteAddr, "with error:", err) http.Error(w, "HTTP request body should either be true or false", http.StatusBadRequest) @@ -30,28 +30,7 @@ func StateOpenPUT( } // Set SpaceAPI response values - if doorNowOpen { - resp.Open = types.SpaceAPIStateOpenIsOpen - } else { - resp.Open = types.SpaceAPIStateOpenIsClosed - } - resp.LastChange = time.Now().Unix() - } -} - -func StateOpenDELETE( - authDB config.HTTPBACredentials, validCredentials []config.HTTPBACredentialID, - resp *types.SpaceAPIState, -) func(http.ResponseWriter, *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - _, err := updateEndpointValidator(authDB, validCredentials, w, r) - if err != nil { - log.Println(err) - return - } - - // Set SpaceAPI response values - resp.Open = types.SpaceAPIStateOpenIsUnknown + resp.Open = newState resp.LastChange = time.Now().Unix() } } diff --git a/main.go b/main.go index 23bd31b..4b01eee 100644 --- a/main.go +++ b/main.go @@ -2,7 +2,6 @@ package main import ( "flag" - "fmt" "log" "net/http" "os" @@ -17,15 +16,11 @@ import ( ) var ( - flagHelp bool - listenAddress string - listenPort string - version string + flagHelp bool + version string ) func init() { - flag.StringVar(&listenAddress, "i", "", "IP address the HTTP server should bind to (all available addresses by default)") - flag.StringVar(&listenPort, "p", "8080", "Port the HTTP server should listen on") flag.BoolVar(&flagHelp, "h", false, "Print help output") } @@ -64,10 +59,7 @@ func main() { ) // state->open http.HandleFunc("PUT /state/open", - handlers.StateOpenPUT(conf.Credentials, conf.Dynamic.State.Open.AllowedCredentials, &conf.Response.State), - ) - http.HandleFunc("DELETE /state/open", - handlers.StateOpenDELETE(conf.Credentials, conf.Dynamic.State.Open.AllowedCredentials, &conf.Response.State), + handlers.StateOpen(conf.Credentials, conf.Dynamic.State.Open.AllowedCredentials, &conf.Response.State), ) // state->message http.HandleFunc("PUT /state/message", @@ -99,5 +91,5 @@ func main() { // Start webserver log.Println("Starting HTTP server...") - log.Fatalln(http.ListenAndServe(fmt.Sprintf("%s:%s", listenAddress, listenPort), nil)) + log.Fatalln(http.ListenAndServe(":8080", nil)) } diff --git a/persistence/persistentState.go b/persistence/persistentState.go index 1f72394..87c3121 100644 --- a/persistence/persistentState.go +++ b/persistence/persistentState.go @@ -1,8 +1,7 @@ package persistence import ( - "encoding/json/jsontext" - "encoding/json/v2" + "encoding/json" "errors" "log" "os" @@ -21,7 +20,7 @@ func MergeOldState(response *types.SpaceAPIResponse) { var ( err error oldState []byte - persistedState types.PersistentState + persistedState types.PersistentSpaceState ) log.Println("Merging old state from", persistentStatePath, "...") @@ -88,38 +87,27 @@ func SaveCurrentState(response types.SpaceAPIResponse) { defer file.Close() // Create persistent state - var ( - isOpen bool - isUnknown bool - ) - switch response.State.Open { - case types.SpaceAPIStateOpenIsUnknown: - isUnknown = true - case types.SpaceAPIStateOpenIsClosed: - break - case types.SpaceAPIStateOpenIsOpen: - isOpen = true - } - persistentState := types.PersistentState{ - State: types.PersistentSpaceState{ - Open: isOpen, IsUnknown: isUnknown, - LastChange: response.State.LastChange, Message: response.State.Message, - }, - Sensors: make(map[string][]types.PersistentEnvironmentSensor), + persistentStateV14 := types.PersistentSpaceState{ + State: struct { + Open bool `json:"open"` + LastChange int64 `json:"lastchange"` + Message string `json:"message,omitempty"` + }{Open: response.State.Open, LastChange: response.State.LastChange, Message: response.State.Message}, } // Save sensor state + persistentStateV14.Sensors = make(map[string][]types.PersistentEnvironmentSensor) for key, environmentSensors := range response.Sensors { - persistentState.Sensors[key] = make([]types.PersistentEnvironmentSensor, len(environmentSensors)) + persistentStateV14.Sensors[key] = make([]types.PersistentEnvironmentSensor, len(environmentSensors)) for i, sensor := range environmentSensors { - persistentState.Sensors[key][i].Value = sensor.Value - persistentState.Sensors[key][i].Location = sensor.Location - persistentState.Sensors[key][i].Name = sensor.Name - persistentState.Sensors[key][i].LastChange = sensor.LastChange + persistentStateV14.Sensors[key][i].Value = sensor.Value + persistentStateV14.Sensors[key][i].Location = sensor.Location + persistentStateV14.Sensors[key][i].Name = sensor.Name + persistentStateV14.Sensors[key][i].LastChange = sensor.LastChange } } // Serialize persistent state - marshal, err := json.Marshal(persistentState, json.JoinOptions(jsontext.Multiline(true), jsontext.SpaceAfterComma(true))) + marshal, err := json.MarshalIndent(persistentStateV14, "", "\t") if err != nil { log.Fatalln("Failed serializing persistent state... error:", err) } diff --git a/types/v15.go b/types/v15.go index b844175..5180ba6 100644 --- a/types/v15.go +++ b/types/v15.go @@ -1,9 +1,5 @@ package types -import ( - "encoding/json/v2" -) - const CurrentMessageVersion = "15" // SpaceAPIResponse represents the contents of the SpaceAPI message @@ -118,50 +114,19 @@ type SpaceAPILocationAreas struct { SquareMeters float64 `json:"square_meters"` // REQUIRED } -type SpaceAPIStateOpen int - -const ( - SpaceAPIStateOpenIsUnknown = iota - SpaceAPIStateOpenIsClosed - SpaceAPIStateOpenIsOpen -) - -func (state SpaceAPIStateOpen) MarshalJSON() ([]byte, error) { - switch state { - case SpaceAPIStateOpenIsClosed: - return json.Marshal(false) - case SpaceAPIStateOpenIsOpen: - return json.Marshal(true) - default: - return []byte{}, nil - } -} - -func (state SpaceAPIStateOpen) IsZero() bool { - return state == SpaceAPIStateOpenIsUnknown -} - type SpaceAPIState struct { - Open SpaceAPIStateOpen `json:"open,omitzero"` - LastChange int64 `json:"lastchange,omitempty"` - TriggerPerson string `json:"trigger_person,omitempty"` - Message string `json:"message,omitempty"` + Open bool `json:"open,omitempty"` + LastChange int64 `json:"lastchange,omitempty"` + TriggerPerson string `json:"trigger_person,omitempty"` + Message string `json:"message,omitempty"` Icon struct { Open string `json:"open,omitempty"` // REQUIRED Closed string `json:"closed,omitempty"` // REQUIRED } `json:"icon,omitzero"` } -func (s *SpaceAPIState) FromPersistentSpaceState(ps PersistentState) { - if ps.State.IsUnknown { - s.Open = SpaceAPIStateOpenIsUnknown - } else { - if ps.State.Open { - s.Open = SpaceAPIStateOpenIsOpen - } else { - s.Open = SpaceAPIStateOpenIsClosed - } - } +func (s *SpaceAPIState) FromPersistentSpaceState(ps PersistentSpaceState) { + s.Open = ps.State.Open s.LastChange = ps.State.LastChange s.Message = ps.State.Message } @@ -182,16 +147,13 @@ type EnvironmentSensor struct { LastChange int64 `json:"lastchange,omitempty"` } -type PersistentState struct { - State PersistentSpaceState `json:"state"` - Sensors map[string][]PersistentEnvironmentSensor `json:"sensors,omitempty"` -} - type PersistentSpaceState struct { - Open bool `json:"open"` - IsUnknown bool `json:"is_unknown"` - LastChange int64 `json:"lastchange"` - Message string `json:"message,omitempty"` + State struct { + Open bool `json:"open"` + LastChange int64 `json:"lastchange"` + Message string `json:"message,omitempty"` + } `json:"state"` + Sensors map[string][]PersistentEnvironmentSensor `json:"sensors,omitempty"` } type PersistentEnvironmentSensor struct {