mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-25 06:25:44 +03:00
aac36a2d2f
Updates #951. Squashed commit of the following: commit 6b840fd516f5a87fde0420e3aceb9c239b22c974 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Aug 29 19:53:03 2023 +0300 client: imp docs more commit 7fc8f0363fbe4c4266cb0f67428fe4d18c351d2d Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Aug 29 19:40:00 2023 +0300 client: imp docs commit 00bc14d5760614f2797714cdc2c4c19b1a94b86e Author: Ildar Kamalov <ik@adguard.com> Date: Mon Aug 28 18:43:49 2023 +0300 try to fix lock file commit d749df74b576091e0b58928d86ea8b3b49f919da Merge: c69f9230be1f6229e5
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Aug 28 18:14:02 2023 +0300 Merge branch 'master' into 951-blocked-services-schedule-api commit c69f9230b12f7c983db06b74324b3df77d74b32b Author: Ildar Kamalov <ik@adguard.com> Date: Mon Aug 28 17:16:20 2023 +0300 revert eslintrc commit b37916c2dff0ddea5293d87570bb58e3443d2d21 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Aug 28 12:02:39 2023 +0300 fix translations commit f5bb67d81506c687d0abd580049a3eee0af808e0 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Aug 28 11:43:57 2023 +0300 fix helpers commit 13ec6a8b3a0acfb62762ae7e46c6e98eb7c82212 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Aug 28 11:24:57 2023 +0300 remove todo commit 23724ec2fd683ed17b9f1cee841ad9aaf4c9d04f Author: Ildar Kamalov <ik@adguard.com> Date: Mon Aug 28 09:56:56 2023 +0300 add clients schedule form commit 84d29e558a329068e64e7a95ee183946aa4515b5 Author: Ildar Kamalov <ik@adguard.com> Date: Fri Aug 25 17:44:40 2023 +0300 fix schedule form commit 83e4017688082e9eb670091d5a24d98157050502 Author: Ildar Kamalov <ik@adguard.com> Date: Fri Aug 18 12:58:16 2023 +0300 remove unused commit ef2b68e138da382e3cf42586ae604e12d9493504 Author: Ildar Kamalov <ik@adguard.com> Date: Fri Aug 18 12:57:37 2023 +0300 client: fix translation string commit 32ea80c968f52f18adbc811b2f06874644cdfe20 Author: Ildar Kamalov <ik@adguard.com> Date: Fri Aug 18 12:26:26 2023 +0300 wip schedule commit 9b770873859186c9424c8d108812e32ddff33bad Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Jul 21 14:29:50 2023 +0300 all: imp naming commit ea4e9514ea3b264bcce7f2a301db817de4e87059 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jul 19 18:09:27 2023 +0300 all: imp code commit 98a705bdaa5c1e79394c73e5d75af2416fe9f297 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Jul 18 18:23:26 2023 +0300 all: imp naming commit 4f84b55c7bfc9f7b680feac0ec45f5ea9189299a Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Jul 14 15:01:17 2023 +0300 all: add global schedule api commit 87cf1646869ee9138964b47a27b7493674c8854a Merge: cabb80ac12adc8624c
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Jul 14 12:09:29 2023 +0300 Merge branch 'master' into 951-blocked-services-schedule-api commit cabb80ac16de437a8118bb0166479574379c97a3 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jul 13 13:37:23 2023 +0300 openapi: fix typo commit 2279b03acbcfc3d76216f8aaf30ae1c7894127bc Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jul 13 12:26:19 2023 +0300 all: imp docs ... and 3 more commits
142 lines
3.9 KiB
Go
142 lines
3.9 KiB
Go
package aghhttp
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"strconv"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/golibs/httphdr"
|
|
"github.com/AdguardTeam/golibs/log"
|
|
)
|
|
|
|
// JSON Utilities
|
|
|
|
// nsecPerMsec is the number of nanoseconds in a millisecond.
|
|
const nsecPerMsec = float64(time.Millisecond / time.Nanosecond)
|
|
|
|
// JSONDuration is a time.Duration that can be decoded from JSON and encoded
|
|
// into JSON according to our API conventions.
|
|
type JSONDuration time.Duration
|
|
|
|
// type check
|
|
var _ json.Marshaler = JSONDuration(0)
|
|
|
|
// MarshalJSON implements the json.Marshaler interface for JSONDuration. err is
|
|
// always nil.
|
|
func (d JSONDuration) MarshalJSON() (b []byte, err error) {
|
|
msec := float64(time.Duration(d)) / nsecPerMsec
|
|
b = strconv.AppendFloat(nil, msec, 'f', -1, 64)
|
|
|
|
return b, nil
|
|
}
|
|
|
|
// type check
|
|
var _ json.Unmarshaler = (*JSONDuration)(nil)
|
|
|
|
// UnmarshalJSON implements the json.Marshaler interface for *JSONDuration.
|
|
func (d *JSONDuration) UnmarshalJSON(b []byte) (err error) {
|
|
if d == nil {
|
|
return fmt.Errorf("json duration is nil")
|
|
}
|
|
|
|
msec, err := strconv.ParseFloat(string(b), 64)
|
|
if err != nil {
|
|
return fmt.Errorf("parsing json time: %w", err)
|
|
}
|
|
|
|
*d = JSONDuration(int64(msec * nsecPerMsec))
|
|
|
|
return nil
|
|
}
|
|
|
|
// JSONTime is a time.Time that can be decoded from JSON and encoded into JSON
|
|
// according to our API conventions.
|
|
type JSONTime time.Time
|
|
|
|
// type check
|
|
var _ json.Marshaler = JSONTime{}
|
|
|
|
// MarshalJSON implements the json.Marshaler interface for JSONTime. err is
|
|
// always nil.
|
|
func (t JSONTime) MarshalJSON() (b []byte, err error) {
|
|
msec := float64(time.Time(t).UnixNano()) / nsecPerMsec
|
|
b = strconv.AppendFloat(nil, msec, 'f', -1, 64)
|
|
|
|
return b, nil
|
|
}
|
|
|
|
// type check
|
|
var _ json.Unmarshaler = (*JSONTime)(nil)
|
|
|
|
// UnmarshalJSON implements the json.Marshaler interface for *JSONTime.
|
|
func (t *JSONTime) UnmarshalJSON(b []byte) (err error) {
|
|
if t == nil {
|
|
return fmt.Errorf("json time is nil")
|
|
}
|
|
|
|
msec, err := strconv.ParseFloat(string(b), 64)
|
|
if err != nil {
|
|
return fmt.Errorf("parsing json time: %w", err)
|
|
}
|
|
|
|
*t = JSONTime(time.Unix(0, int64(msec*nsecPerMsec)).UTC())
|
|
|
|
return nil
|
|
}
|
|
|
|
// WriteJSONResponse writes headers with the code, encodes resp into w, and logs
|
|
// any errors it encounters. r is used to get additional information from the
|
|
// request.
|
|
func WriteJSONResponse(w http.ResponseWriter, r *http.Request, code int, resp any) {
|
|
h := w.Header()
|
|
h.Set(httphdr.ContentType, HdrValApplicationJSON)
|
|
h.Set(httphdr.Server, UserAgent())
|
|
|
|
w.WriteHeader(code)
|
|
|
|
err := json.NewEncoder(w).Encode(resp)
|
|
if err != nil {
|
|
log.Error("aghhttp: writing json resp to %s %s: %s", r.Method, r.URL.Path, err)
|
|
}
|
|
}
|
|
|
|
// WriteJSONResponseOK writes headers with the code 200 OK, encodes v into w,
|
|
// and logs any errors it encounters. r is used to get additional information
|
|
// from the request.
|
|
func WriteJSONResponseOK(w http.ResponseWriter, r *http.Request, v any) {
|
|
WriteJSONResponse(w, r, http.StatusOK, v)
|
|
}
|
|
|
|
// ErrorCode is the error code as used by the HTTP API. See the ErrorCode
|
|
// definition in the OpenAPI specification.
|
|
type ErrorCode string
|
|
|
|
// ErrorCode constants.
|
|
//
|
|
// TODO(a.garipov): Expand and document codes.
|
|
const (
|
|
// ErrorCodeTMP000 is the temporary error code used for all errors.
|
|
ErrorCodeTMP000 = ""
|
|
)
|
|
|
|
// HTTPAPIErrorResp is the error response as used by the HTTP API. See the
|
|
// BadRequestResp, InternalServerErrorResp, and similar objects in the OpenAPI
|
|
// specification.
|
|
type HTTPAPIErrorResp struct {
|
|
Code ErrorCode `json:"code"`
|
|
Msg string `json:"msg"`
|
|
}
|
|
|
|
// WriteJSONResponseError encodes err as a JSON error into w, and logs any
|
|
// errors it encounters. r is used to get additional information from the
|
|
// request.
|
|
func WriteJSONResponseError(w http.ResponseWriter, r *http.Request, err error) {
|
|
log.Error("aghhttp: writing json error to %s %s: %s", r.Method, r.URL.Path, err)
|
|
|
|
WriteJSONResponse(w, r, http.StatusUnprocessableEntity, &HTTPAPIErrorResp{
|
|
Code: ErrorCodeTMP000,
|
|
Msg: err.Error(),
|
|
})
|
|
}
|