From 8cb2ae883594f4f23611bbbdb875dc9e9e5bdfdf Mon Sep 17 00:00:00 2001 From: Alex Savin Date: Sun, 1 Jun 2025 12:23:59 -0400 Subject: [PATCH] More changes --- client.go | 28 +++++++++++++--------------- vehicle.go | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 37 insertions(+), 39 deletions(-) diff --git a/client.go b/client.go index 4b2e540..3f49a47 100644 --- a/client.go +++ b/client.go @@ -40,9 +40,7 @@ func (c *Client) auth() []byte { "pushToken": ""} reqURL := MOBILE_API_VERSION + apiURLs["API_LOGIN"] resp := c.execute(reqURL, POST, params, "", false) - - c.logger.Debug("AUTH HTTP OUTPUT", "body", string([]byte(resp))) - + // c.logger.Debug("AUTH HTTP OUTPUT", "body", string([]byte(resp))) return resp } @@ -171,18 +169,18 @@ func (c *Client) validateSession() bool { // } reqURL := MOBILE_API_VERSION + apiURLs["API_VALIDATE_SESSION"] resp := c.execute(reqURL, GET, map[string]string{}, "", false) - c.logger.Debug("http request output", "request", "GetVehicleStatus", "body", resp) + c.logger.Debug("http request output", "request", "validateSession", "body", resp) var r Response err := json.Unmarshal(resp, &r) if err != nil { - c.logger.Error("error while parsing json", "request", "GetClimatePresets", "error", err.Error()) + c.logger.Error("error while parsing json", "request", "validateSession", "error", err.Error()) } - if !r.Success { - return false + if r.Success { + return true } - return true + return false // result = False // js_resp = await self.__open(API_VALIDATE_SESSION, GET) @@ -240,7 +238,7 @@ func New(config *config.Config) (*Client, error) { if err != nil { client.logger.Error("error while parsing json", "request", "auth", "error", err.Error()) } - client.logger.Debug("unmarshaled json data", "request", "auth", "type", "sessionData", "body", sd) + // client.logger.Debug("unmarshaled json data", "request", "auth", "type", "sessionData", "body", sd) if client.isRegistered { client.logger.Debug("Client authentication successful", "isRegistered", sd.DeviceRegistered) @@ -250,10 +248,10 @@ func New(config *config.Config) (*Client, error) { client.registerDevice() } - client.logger.Debug("parcing cars assigned to the account", "quantity", len(sd.Vehicles)) + // client.logger.Debug("parsing cars assigned to the account", "quantity", len(sd.Vehicles)) if len(sd.Vehicles) > 0 { for _, vehicle := range sd.Vehicles { - client.logger.Debug("parsing car", "vin", vehicle.Vin) + // client.logger.Debug("parsing car", "vin", vehicle.Vin) client.listOfVins = append(client.listOfVins, vehicle.Vin) } client.currentVin = client.listOfVins[0] @@ -294,7 +292,7 @@ func (c *Client) SelectVehicle(vin string) VehicleData { "_": timestamp()} reqURL := MOBILE_API_VERSION + apiURLs["API_SELECT_VEHICLE"] resp := c.execute(reqURL, GET, params, "", false) - c.logger.Debug("http request output", "request", "SelectVehicle", "body", resp) + // c.logger.Debug("http request output", "request", "SelectVehicle", "body", resp) var r Response err := json.Unmarshal(resp, &r) @@ -308,7 +306,7 @@ func (c *Client) SelectVehicle(vin string) VehicleData { if err != nil { c.logger.Error("error while parsing json", "request", "GetClimatePresets", "error", err.Error()) } - c.logger.Debug("http request output", "request", "GetVehicleStatus", "body", resp) + // c.logger.Debug("http request output", "request", "GetVehicleStatus", "body", resp) return vd } else { @@ -359,7 +357,7 @@ func (c *Client) GetVehicleByVIN(vin string) *Vehicle { "_": timestamp()} reqURL := MOBILE_API_VERSION + apiURLs["API_SELECT_VEHICLE"] resp := c.execute(reqURL, GET, params, "", false) - c.logger.Debug("http request output", "request", "GetVehicleByVIN", "body", resp) + // c.logger.Debug("http request output", "request", "GetVehicleByVIN", "body", resp) var r Response err := json.Unmarshal(resp, &r) @@ -373,7 +371,7 @@ func (c *Client) GetVehicleByVIN(vin string) *Vehicle { if err != nil { c.logger.Error("error while parsing json", "request", "GetVehicleByVIN", "error", err.Error()) } - c.logger.Debug("http request output", "request", "GetVehicleByVIN", "body", resp) + // c.logger.Debug("http request output", "request", "GetVehicleByVIN", "body", resp) vehicle = &Vehicle{ Vin: vin, diff --git a/vehicle.go b/vehicle.go index 940d2a0..d53b088 100644 --- a/vehicle.go +++ b/vehicle.go @@ -497,7 +497,7 @@ func (v *Vehicle) GetClimateQuickPresets() { v.selectVehicle() reqURL := MOBILE_API_VERSION + apiURLs["API_G2_FETCH_RES_QUICK_START_SETTINGS"] resp := v.client.execute(reqURL, GET, map[string]string{}, "", false) - v.client.logger.Debug("http request output", "request", "GetClimateQuickPresets", "body", resp) + // v.client.logger.Debug("http request output", "request", "GetClimateQuickPresets", "body", resp) var r Response err := json.Unmarshal(resp, &r) @@ -577,7 +577,7 @@ func (v *Vehicle) GetVehicleStatus() { v.selectVehicle() reqURL := MOBILE_API_VERSION + urlToGen(apiURLs["API_VEHICLE_STATUS"], v.getAPIGen()) resp := v.client.execute(reqURL, GET, map[string]string{}, "", false) - v.client.logger.Debug("http request output", "request", "GetVehicleStatus", "body", resp) + // v.client.logger.Debug("http request output", "request", "GetVehicleStatus", "body", resp) var r Response err := json.Unmarshal(resp, &r) @@ -586,31 +586,31 @@ func (v *Vehicle) GetVehicleStatus() { } if r.Success { - var vSta VehicleStatus - err = json.Unmarshal(r.Data, &vSta) + var vs VehicleStatus + err = json.Unmarshal(r.Data, &vs) if err != nil { v.client.logger.Error("error while parsing json", "request", "GetClimatePresets", "error", err.Error()) } - v.client.logger.Debug("http request output", "request", "GetVehicleStatus", "body", resp) + // v.client.logger.Debug("http request output", "request", "GetVehicleStatus", "body", vs) - v.EngineState = vSta.VehicleStateType - v.Odometer.Miles = vSta.OdometerValue - v.Odometer.Kilometers = vSta.OdometerValueKm - v.DistanceToEmpty.Miles = int(vSta.DistanceToEmptyFuelMiles) - v.DistanceToEmpty.Kilometers = vSta.DistanceToEmptyFuelKilometers - v.DistanceToEmpty.Miles10s = vSta.DistanceToEmptyFuelMiles10s - v.DistanceToEmpty.Kilometers10s = vSta.DistanceToEmptyFuelKilometers10s - v.DistanceToEmpty.Percentage = vSta.RemainingFuelPercent - v.FuelConsumptionAvg.MPG = float64(vSta.AvgFuelConsumptionMpg) - v.FuelConsumptionAvg.LP100Km = float64(vSta.AvgFuelConsumptionLitersPer100Kilometers) + v.EngineState = vs.VehicleStateType + v.Odometer.Miles = vs.OdometerValue + v.Odometer.Kilometers = vs.OdometerValueKm + v.DistanceToEmpty.Miles = int(vs.DistanceToEmptyFuelMiles) + v.DistanceToEmpty.Kilometers = vs.DistanceToEmptyFuelKilometers + v.DistanceToEmpty.Miles10s = vs.DistanceToEmptyFuelMiles10s + v.DistanceToEmpty.Kilometers10s = vs.DistanceToEmptyFuelKilometers10s + v.DistanceToEmpty.Percentage = vs.RemainingFuelPercent + v.FuelConsumptionAvg.MPG = float64(vs.AvgFuelConsumptionMpg) + v.FuelConsumptionAvg.LP100Km = float64(vs.AvgFuelConsumptionLitersPer100Kilometers) - v.GeoLocation.Latitude = float64(vSta.Latitude) - v.GeoLocation.Longitude = float64(vSta.Longitude) - v.GeoLocation.Heading = vSta.Heading + v.GeoLocation.Latitude = float64(vs.Latitude) + v.GeoLocation.Longitude = float64(vs.Longitude) + v.GeoLocation.Heading = vs.Heading // re := regexp.MustCompile(`[A-Z][^A-Z]*`) - val := reflect.ValueOf(vSta) + val := reflect.ValueOf(vs) typeOfS := val.Type() for i := 0; i < val.NumField(); i++ { @@ -786,7 +786,7 @@ func (v *Vehicle) GetVehicleCondition() { v.selectVehicle() reqURL := MOBILE_API_VERSION + urlToGen(apiURLs["API_CONDITION"], v.getAPIGen()) resp := v.client.execute(reqURL, GET, map[string]string{}, "", false) - v.client.logger.Debug("http request output", "request", "GetVehicleCondition", "body", resp) + // v.client.logger.Debug("http request output", "request", "GetVehicleCondition", "body", resp) var r Response err := json.Unmarshal(resp, &r) @@ -800,14 +800,14 @@ func (v *Vehicle) GetVehicleCondition() { if err != nil { v.client.logger.Error("error while parsing json", "request", "GetClimatePresets", "error", err.Error()) } - v.client.logger.Debug("http request output", "request", "GetVehicleStatus", "body", resp) + // v.client.logger.Debug("http request output", "request", "GetVehicleStatus", "body", resp) var vc VehicleCondition err = json.Unmarshal(sr.Result, &vc) if err != nil { v.client.logger.Error("error while parsing json", "request", "GetClimatePresets", "error", err.Error()) } - v.client.logger.Debug("http request output", "request", "GetVehicleStatus", "body", resp) + // v.client.logger.Debug("http request output", "request", "GetVehicleStatus", "body", resp) val := reflect.ValueOf(vc) typeOfS := val.Type() @@ -950,7 +950,7 @@ func (v *Vehicle) GetVehicleHealth() { "_": timestamp()} reqURL := MOBILE_API_VERSION + apiURLs["API_VEHICLE_HEALTH"] resp := v.client.execute(reqURL, GET, params, "", false) - v.client.logger.Debug("http request output", "request", "GetVehicleHealth", "body", resp) + // v.client.logger.Debug("http request output", "request", "GetVehicleHealth", "body", resp) var r Response err := json.Unmarshal(resp, &r) @@ -964,7 +964,7 @@ func (v *Vehicle) GetVehicleHealth() { if err != nil { v.client.logger.Error("error while parsing json", "request", "GetVehicleHealth", "error", err.Error()) } - v.client.logger.Debug("http request output", "request", "GetVehicleHealth", "body", resp) + v.client.logger.Debug("http request output", "request", "GetVehicleHealth", "vehicle health", vh) // TODO: Loop over all the Vehicle Health Items