X-Git-Url: https://git.octo.it/?p=kraftakt.git;a=blobdiff_plain;f=kraftakt.go;h=72389bd1430b36450a071d09d8a491597d4805d7;hp=4768da8a0f05877dd268885e4fb69d8681edc9c2;hb=HEAD;hpb=6edb36816137a6ae2246eb8858fa3453dce8ab79 diff --git a/kraftakt.go b/kraftakt.go index 4768da8..72389bd 100644 --- a/kraftakt.go +++ b/kraftakt.go @@ -43,6 +43,12 @@ func init() { templates = t } +func internalServerError(ctx context.Context, w http.ResponseWriter, err error) { + log.Errorf(ctx, "%v", err) + + http.Error(w, "Internal Server Error\n\nReference: "+appengine.RequestID(ctx), http.StatusInternalServerError) +} + // ContextHandler implements http.Handler type ContextHandler func(context.Context, http.ResponseWriter, *http.Request) error @@ -50,12 +56,12 @@ func (hndl ContextHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { ctx := appengine.NewContext(r) if err := app.LoadConfig(ctx); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + internalServerError(ctx, w, fmt.Errorf("LoadConfig() = %v", err)) return } if err := hndl(ctx, w, r); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + internalServerError(ctx, w, err) return } } @@ -66,7 +72,7 @@ func (hndl AuthenticatedHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques ctx := appengine.NewContext(r) if err := app.LoadConfig(ctx); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + internalServerError(ctx, w, fmt.Errorf("LoadConfig() = %v", err)) return } @@ -74,7 +80,7 @@ func (hndl AuthenticatedHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques if gaeUser == nil { url, err := user.LoginURL(ctx, r.URL.String()) if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + internalServerError(ctx, w, fmt.Errorf("LoginURL() = %v", err)) return } http.Redirect(w, r, url, http.StatusTemporaryRedirect) @@ -83,12 +89,12 @@ func (hndl AuthenticatedHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques u, err := app.NewUser(ctx, gaeUser.Email) if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + internalServerError(ctx, w, fmt.Errorf("NewUser(%q) = %v", gaeUser.Email, err)) return } if err := hndl(ctx, w, r, u); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + internalServerError(ctx, w, err) return } } @@ -136,8 +142,8 @@ func loginHandler(_ context.Context, w http.ResponseWriter, r *http.Request, _ * return nil } -func fitbitConnectHandler(_ context.Context, w http.ResponseWriter, r *http.Request, _ *app.User) error { - http.Redirect(w, r, fitbit.AuthURL(), http.StatusTemporaryRedirect) +func fitbitConnectHandler(ctx context.Context, w http.ResponseWriter, r *http.Request, u *app.User) error { + http.Redirect(w, r, fitbit.AuthURL(ctx, u), http.StatusTemporaryRedirect) return nil } @@ -171,21 +177,12 @@ func fitbitDisconnectHandler(ctx context.Context, w http.ResponseWriter, r *http return err } - var errs appengine.MultiError - - for _, collection := range []string{"activities", "sleep"} { - if err := c.Unsubscribe(ctx, collection); err != nil { - errs = append(errs, fmt.Errorf("Unsubscribe(%q) = %v", collection, err)) - continue - } - log.Infof(ctx, "Successfully unsubscribed from %q", collection) + if err := c.UnsubscribeAll(ctx); err != nil { + return fmt.Errorf("UnsubscribeAll() = %v", err) } if err := c.DeleteToken(ctx); err != nil { - errs = append(errs, fmt.Errorf("DeleteToken() = %v", err)) - } - if len(errs) != 0 { - return errs + return err } redirectURL := r.URL @@ -196,8 +193,8 @@ func fitbitDisconnectHandler(ctx context.Context, w http.ResponseWriter, r *http return nil } -func googleConnectHandler(_ context.Context, w http.ResponseWriter, r *http.Request, _ *app.User) error { - http.Redirect(w, r, gfit.AuthURL(), http.StatusTemporaryRedirect) +func googleConnectHandler(ctx context.Context, w http.ResponseWriter, r *http.Request, u *app.User) error { + http.Redirect(w, r, gfit.AuthURL(ctx, u), http.StatusTemporaryRedirect) return nil } @@ -261,7 +258,7 @@ func fitbitNotifyHandler(ctx context.Context, w http.ResponseWriter, r *http.Req // Fitbit recommendation: "If signature verification fails, you should // respond with a 404" if !fitbit.CheckSignature(ctx, data, r.Header.Get("X-Fitbit-Signature")) { - log.Warningf(ctx, "signature mismatch") + log.Errorf(ctx, "signature mismatch") w.WriteHeader(http.StatusNotFound) return nil } @@ -277,6 +274,8 @@ func fitbitNotifyHandler(ctx context.Context, w http.ResponseWriter, r *http.Req // handleNotifications parses fitbit notifications and requests the individual // activities from Fitbit. It is executed asynchronously via the delay package. func handleNotifications(ctx context.Context, payload []byte) error { + log.Debugf(ctx, "NOTIFY -> %s", payload) + if err := app.LoadConfig(ctx); err != nil { return err } @@ -286,23 +285,38 @@ func handleNotifications(ctx context.Context, payload []byte) error { return err } + wg := &sync.WaitGroup{} + for _, s := range subscriptions { - if s.CollectionType != "activities" { + switch s.CollectionType { + case "activities": + wg.Add(1) + go func(s fitbit.Subscription) { + defer wg.Done() + if err := activitiesNotification(ctx, &s); err != nil { + log.Warningf(ctx, "activitiesNotification() = %v", err) + } + }(s) // copies s + case "sleep": + wg.Add(1) + go func(s fitbit.Subscription) { + defer wg.Done() + if err := sleepNotification(ctx, &s); err != nil { + log.Warningf(ctx, "sleepNotification() = %v", err) + } + }(s) // copies s + default: log.Warningf(ctx, "ignoring collection type %q", s.CollectionType) - continue - } - if err := handleNotification(ctx, &s); err != nil { - log.Errorf(ctx, "handleNotification() = %v", err) - continue } } + wg.Wait() return nil } -func handleNotification(ctx context.Context, s *fitbit.Subscription) error { - u, err := app.UserByID(ctx, s.SubscriptionID) +func activitiesNotification(ctx context.Context, s *fitbit.Subscription) error { + u, err := fitbit.UserFromSubscriberID(ctx, s.SubscriptionID) if err != nil { return err } @@ -419,7 +433,7 @@ func handleNotification(ctx context.Context, s *fitbit.Subscription) error { activities = append(activities, gfit.Activity{ Start: startTime, End: endTime, - Type: gfit.ParseFitbitActivity(a.Name), + Type: a.Name, }) } if err := gfitClient.SetActivities(ctx, activities, tm); err != nil { @@ -435,3 +449,78 @@ func handleNotification(ctx context.Context, s *fitbit.Subscription) error { } return nil } + +func sleepNotification(ctx context.Context, s *fitbit.Subscription) error { + u, err := fitbit.UserFromSubscriberID(ctx, s.SubscriptionID) + if err != nil { + return err + } + + var ( + wg = &sync.WaitGroup{} + gfitClient *gfit.Client + gfitErr error + ) + + wg.Add(1) + go func() { + gfitClient, gfitErr = gfit.NewClient(ctx, u) + wg.Done() + }() + + fitbitClient, err := fitbit.NewClient(ctx, s.OwnerID, u) + if err != nil { + return err + } + + profile, err := fitbitClient.Profile(ctx) + if err != nil { + return err + } + + tm, err := time.ParseInLocation("2006-01-02", s.Date, profile.Timezone) + if err != nil { + return err + } + + sleep, err := fitbitClient.Sleep(ctx, tm) + if err != nil { + return err + } + log.Debugf(ctx, "fitbitClient.Sleep(%v) returned %d sleep stages", tm, len(sleep.Stages)) + + var activities []gfit.Activity + for _, stg := range sleep.Stages { + a := gfit.Activity{ + Start: stg.StartTime, + End: stg.EndTime, + } + switch stg.Level { + case fitbit.SleepLevelDeep: + a.Type = "Deep sleep" + case fitbit.SleepLevelLight: + a.Type = "Light sleep" + case fitbit.SleepLevelREM: + a.Type = "REM sleep" + case fitbit.SleepLevelWake: + a.Type = "Awake (during sleep cycle)" + default: + log.Warningf(ctx, "unexpected sleep level %v", stg.Level) + continue + } + + activities = append(activities, a) + } + + wg.Wait() + if gfitErr != nil { + return gfitErr + } + + log.Debugf(ctx, "passing %d activities to gfitClient.SetActivities()", len(activities)) + if err := gfitClient.SetActivities(ctx, activities, tm); err != nil { + return fmt.Errorf("SetActivities() = %v", err) + } + + return nil +}