wip

Author: andig

vehicle/carwings.go

@@ -26,8 +26,8 @@ type CarWings struct {
 	*embed
 	user, password string
 	session        *carwings.Session
-	statusG        func() (interface{}, error)
-	climateG       func() (interface{}, error)
+	statusG        func() (carwings.BatteryStatus, error)
+	climateG       func() (carwings.ClimateStatus, error)
 	refreshKey     string
 	refreshTime    time.Time
 }
@@ -91,13 +91,8 @@ func NewCarWingsFromConfig(other map[string]interface{}) (api.Vehicle, error) {
 		return nil, fmt.Errorf("login failed: %w", err)
 	}
 
-	v.statusG = provider.Cached[](func() (interface{}, error) {
-		return v.status()
-	}, cc.Cache)
-
-	v.climateG = provider.Cached[](func() (interface{}, error) {
-		return v.session.ClimateControlStatus()
-	}, cc.Cache)
+	v.statusG = provider.Cached[carwings.BatteryStatus](v.status, cc.Cache)
+	v.climateG = provider.Cached[carwings.ClimateStatus](v.session.ClimateControlStatus, cc.Cache)
 
 	return v, nil
 }
@@ -112,11 +107,11 @@ func (v *CarWings) connectIfRequired(err error) error {
 	return err
 }
 
-func (v *CarWings) status() (interface{}, error) {
+func (v *CarWings) status() (carwings.BatteryStatus, error) {
 	// api result is stale
 	if v.refreshKey != "" {
 		if err := v.refreshResult(); err != nil {
-			return nil, err
+			return *new(carwings.BatteryStatus), err
 		}
 	}
 
@@ -125,7 +120,7 @@ func (v *CarWings) status() (interface{}, error) {
 	if err == nil {
 		if elapsed := time.Since(bs.Timestamp); elapsed > carwingsStatusExpiry {
 			if err = v.refreshRequest(); err != nil {
-				return nil, err
+				return *new(carwings.BatteryStatus), err
 			}
 
 			err = api.ErrMustRetry
@@ -182,7 +177,7 @@ func (v *CarWings) refreshRequest() (err error) {
 // SoC implements the api.Vehicle interface
 func (v *CarWings) SoC() (float64, error) {
 	res, err := v.statusG()
-	if res, ok := res.(carwings.BatteryStatus); err == nil && ok {
+	if err == nil {
 		return float64(res.StateOfCharge), nil
 	}
 
@@ -196,7 +191,7 @@ func (v *CarWings) Status() (api.ChargeStatus, error) {
 	status := api.StatusA // disconnected
 
 	res, err := v.statusG()
-	if res, ok := res.(carwings.BatteryStatus); err == nil && ok {
+	if err == nil {
 		if res.PluginState == carwings.Connected {
 			status = api.StatusB // connected, not charging
 		}
@@ -213,7 +208,7 @@ var _ api.VehicleRange = (*CarWings)(nil)
 // Range implements the api.VehicleRange interface
 func (v *CarWings) Range() (int64, error) {
 	res, err := v.statusG()
-	if res, ok := res.(carwings.BatteryStatus); err == nil && ok {
+	if err == nil {
 		return int64(res.CruisingRangeACOn) / 1000, nil
 	}
 
@@ -226,7 +221,7 @@ var _ api.VehicleClimater = (*CarWings)(nil)
 func (v *CarWings) Climater() (active bool, outsideTemp float64, targetTemp float64, err error) {
 	res, err := v.climateG()
 
-	if res, ok := res.(carwings.ClimateStatus); err == nil && ok {
+	if err == nil {
 		active = res.Running
 		targetTemp = float64(res.Temperature)
 		outsideTemp = targetTemp

vehicle/renault.go

@@ -105,9 +105,9 @@ type Renault struct {
 	gigya, kamereon     configServer
 	gigyaJwtToken       string
 	accountID           string
-	batteryG            func() (interface{}, error)
-	cockpitG            func() (interface{}, error)
-	hvacG               func() (interface{}, error)
+	batteryG            func() (kamereonResponse, error)
+	cockpitG            func() (kamereonResponse, error)
+	hvacG               func() (kamereonResponse, error)
 }
 
 func init() {
@@ -150,9 +150,9 @@ func NewRenaultFromConfig(other map[string]interface{}) (api.Vehicle, error) {
 		})
 	}
 
-	v.batteryG = provider.Cached[](v.batteryAPI, cc.Cache)
-	v.cockpitG = provider.Cached[](v.cockpitAPI, cc.Cache)
-	v.hvacG = provider.Cached[](v.hvacAPI, cc.Cache)
+	v.batteryG = provider.Cached[kamereonResponse](v.batteryAPI, cc.Cache)
+	v.cockpitG = provider.Cached[kamereonResponse](v.cockpitAPI, cc.Cache)
+	v.hvacG = provider.Cached[kamereonResponse](v.hvacAPI, cc.Cache)
 
 	return v, err
 }
@@ -312,7 +312,7 @@ func (v *Renault) kamereonVehicles(accountID string) ([]string, error) {
 }
 
 // batteryAPI provides battery-status api response
-func (v *Renault) batteryAPI() (interface{}, error) {
+func (v *Renault) batteryAPI() (kamereonResponse, error) {
 	uri := fmt.Sprintf("%s/commerce/v1/accounts/%s/kamereon/kca/car-adapter/v2/cars/%s/battery-status", v.kamereon.Target, v.accountID, v.vin)
 	res, err := v.kamereonRequest(uri)
 
@@ -327,7 +327,7 @@ func (v *Renault) batteryAPI() (interface{}, error) {
 }
 
 // hvacAPI provides hvac-status api response
-func (v *Renault) hvacAPI() (interface{}, error) {
+func (v *Renault) hvacAPI() (kamereonResponse, error) {
 	uri := fmt.Sprintf("%s/commerce/v1/accounts/%s/kamereon/kca/car-adapter/v1/cars/%s/hvac-status", v.kamereon.Target, v.accountID, v.vin)
 	res, err := v.kamereonRequest(uri)
 
@@ -360,7 +360,7 @@ func (v *Renault) cockpitAPI() (interface{}, error) {
 func (v *Renault) SoC() (float64, error) {
 	res, err := v.batteryG()
 
-	if res, ok := res.(kamereonResponse); err == nil && ok {
+	if err == nil {
 		return float64(res.Data.Attributes.BatteryLevel), nil
 	}
 
@@ -374,7 +374,7 @@ func (v *Renault) Status() (api.ChargeStatus, error) {
 	status := api.StatusA // disconnected
 
 	res, err := v.batteryG()
-	if res, ok := res.(kamereonResponse); err == nil && ok {
+	if err == nil {
 		if res.Data.Attributes.PlugStatus > 0 {
 			status = api.StatusB
 		}
@@ -392,7 +392,7 @@ var _ api.VehicleRange = (*Renault)(nil)
 func (v *Renault) Range() (int64, error) {
 	res, err := v.batteryG()
 
-	if res, ok := res.(kamereonResponse); err == nil && ok {
+	if err == nil {
 		return int64(res.Data.Attributes.BatteryAutonomy), nil
 	}
 
@@ -405,7 +405,7 @@ var _ api.VehicleOdometer = (*Renault)(nil)
 func (v *Renault) Odometer() (float64, error) {
 	res, err := v.cockpitG()
 
-	if res, ok := res.(kamereonResponse); err == nil && ok {
+	if err == nil {
 		return res.Data.Attributes.TotalMileage, nil
 	}
 
@@ -418,7 +418,7 @@ var _ api.VehicleFinishTimer = (*Renault)(nil)
 func (v *Renault) FinishTime() (time.Time, error) {
 	res, err := v.batteryG()
 
-	if res, ok := res.(kamereonResponse); err == nil && ok {
+	if err == nil {
 		timestamp, err := time.Parse(time.RFC3339, res.Data.Attributes.Timestamp)
 
 		if res.Data.Attributes.RemainingTime == nil {
@@ -442,7 +442,7 @@ func (v *Renault) Climater() (active bool, outsideTemp float64, targetTemp float
 		return false, 0, 0, api.ErrNotAvailable
 	}
 
-	if res, ok := res.(kamereonResponse); err == nil && ok {
+	if err == nil {
 		state := strings.ToLower(res.Data.Attributes.HvacStatus)
 
 		if state == "" {