tordarus/omada-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: tordarus:v0.0.2
Branches Tags
tordarus:main
tordarus:v0.0.10 tordarus:v0.0.9 tordarus:v0.0.8 tordarus:v0.0.7 tordarus:v0.0.6 tordarus:v0.0.5 tordarus:v0.0.4 tordarus:v0.0.3 tordarus:v0.0.2 tordarus:v0.0.1
..
compare: tordarus:v0.0.7
Branches Tags
tordarus:main
tordarus:v0.0.10 tordarus:v0.0.9 tordarus:v0.0.8 tordarus:v0.0.7 tordarus:v0.0.6 tordarus:v0.0.5 tordarus:v0.0.4 tordarus:v0.0.3 tordarus:v0.0.2 tordarus:v0.0.1

6 Commits
v0.0.2 ... v0.0.7

Author SHA1 Message Date
Tordarus
12c700a5c5 PanicOnError implemented 2025-02-02 22:33:24 +01:00
Tordarus
db413ce145 return error channels 2025-02-02 22:29:40 +01:00
Tordarus
12e379ab62 updated dependencies 2025-02-02 20:07:38 +01:00
Tordarus
3949597e01 use ezhttp v0.0.4 for better error handling 2025-02-02 20:03:47 +01:00
Tordarus
f732d0ed44 refreshBeforeExpiration introduced 2025-02-02 19:44:21 +01:00
Tordarus
b320c395df removed debug logs 2025-02-02 10:57:52 +01:00
8 changed files with 46 additions and 23 deletions
Expand all files Collapse all files

2
ap_info.go
View File

@ -27,7 +27,7 @@ func (api *Api) GetApInfo(siteID model.SiteID, macAddress string) (*model.ApInfo
} }
defer resp.Body.Close() defer resp.Body.Close()
response, err := ezhttp.ParseJsonResponse[model.Response[model.ApInfo]](resp.Body) response, err := ezhttp.ParseJsonResponse[model.Response[model.ApInfo]](resp)
if err != nil { if err != nil {
return nil, err return nil, err
} }

24
api.go
View File

@ -67,7 +67,7 @@ func NewApi(config ApiConfig) (*Api, error) {
return nil, fmt.Errorf("auth token request failed: %s", authTokenResponse.Message) return nil, fmt.Errorf("auth token request failed: %s", authTokenResponse.Message)
} }
api.expiration = time.Now().Add(time.Duration(authTokenResponse.Result.ExpiresIn-1) * time.Second) api.expiration = time.Now().Add(time.Duration(authTokenResponse.Result.ExpiresIn) * time.Second)
api.accessToken = authTokenResponse.Result.AccessToken api.accessToken = authTokenResponse.Result.AccessToken
api.refreshToken = authTokenResponse.Result.RefreshToken api.refreshToken = authTokenResponse.Result.RefreshToken
@ -102,7 +102,7 @@ func (api *Api) Login() (*model.LoginResponse, error) {
} }
defer resp.Body.Close() defer resp.Body.Close()
response, err := ezhttp.ParseJsonResponse[model.LoginResponse](resp.Body) response, err := ezhttp.ParseJsonResponse[model.LoginResponse](resp)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -128,7 +128,7 @@ func (api *Api) AuthCode(csrfToken, sessionID string) (*model.AuthCodeResponse,
} }
defer resp.Body.Close() defer resp.Body.Close()
response, err := ezhttp.ParseJsonResponse[model.AuthCodeResponse](resp.Body) response, err := ezhttp.ParseJsonResponse[model.AuthCodeResponse](resp)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -158,7 +158,7 @@ func (api *Api) AuthToken(authCode string) (*model.AuthTokenResponse, error) {
} }
defer resp.Body.Close() defer resp.Body.Close()
response, err := ezhttp.ParseJsonResponse[model.AuthTokenResponse](resp.Body) response, err := ezhttp.ParseJsonResponse[model.AuthTokenResponse](resp)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -166,12 +166,18 @@ func (api *Api) AuthToken(authCode string) (*model.AuthTokenResponse, error) {
return response, nil return response, nil
} }
func (api *Api) AutoRefresh(ctx context.Context) error { func (api *Api) MustAutoRefresh(ctx context.Context, refreshBeforeExpiration time.Duration) {
if err := api.AutoRefresh(ctx, refreshBeforeExpiration); err != nil {
panic(err)
}
}
func (api *Api) AutoRefresh(ctx context.Context, refreshBeforeExpiration time.Duration) error {
for { for {
select { select {
case <-ctx.Done(): case <-ctx.Done():
return nil return nil
case <-time.After(time.Until(api.expiration)): case <-time.After(time.Until(api.expiration.Add(-refreshBeforeExpiration))):
if err := api.Refresh(); err != nil { if err := api.Refresh(); err != nil {
return err return err
} }
@ -180,7 +186,6 @@ func (api *Api) AutoRefresh(ctx context.Context) error {
} }
func (api *Api) Refresh() error { func (api *Api) Refresh() error {
fmt.Println("refresh")
api.refreshMutex.Lock() api.refreshMutex.Lock()
defer api.refreshMutex.Unlock() defer api.refreshMutex.Unlock()
@ -202,15 +207,14 @@ func (api *Api) Refresh() error {
} }
defer resp.Body.Close() defer resp.Body.Close()
response, err := ezhttp.ParseJsonResponse[model.AuthTokenResponse](resp.Body) response, err := ezhttp.ParseJsonResponse[model.AuthTokenResponse](resp)
if err != nil { if err != nil {
return err return err
} }
api.expiration = time.Now().Add(time.Duration(response.Result.ExpiresIn-1) * time.Second) api.expiration = time.Now().Add(time.Duration(response.Result.ExpiresIn) * time.Second)
api.accessToken = response.Result.AccessToken api.accessToken = response.Result.AccessToken
api.refreshToken = response.Result.RefreshToken api.refreshToken = response.Result.RefreshToken
fmt.Println("refresh successful")
return nil return nil
} }

9
client.go
View File

@ -8,15 +8,18 @@ import (
"git.tordarus.net/tordarus/omada-api/model" "git.tordarus.net/tordarus/omada-api/model"
) )
func (api *Api) GetClients(siteID model.SiteID) <-chan *model.Client { func (api *Api) GetClients(siteID model.SiteID) (<-chan *model.Client, <-chan error) {
out := make(chan *model.Client, 1000) out := make(chan *model.Client, 1000)
errChan := make(chan error)
go func() { go func() {
defer close(out) defer close(out)
defer close(errChan)
for page := 1; ; page++ { for page := 1; ; page++ {
resp, err := api.getClients(page, siteID) resp, err := api.getClients(page, siteID)
if err != nil { if err != nil {
errChan <- err
return return
} }
@ -30,7 +33,7 @@ func (api *Api) GetClients(siteID model.SiteID) <-chan *model.Client {
} }
}() }()
return out return out, errChan
} }
func (api *Api) getClients(page int, siteID model.SiteID) (*model.PagedResponse[model.Client], error) { func (api *Api) getClients(page int, siteID model.SiteID) (*model.PagedResponse[model.Client], error) {
@ -53,7 +56,7 @@ func (api *Api) getClients(page int, siteID model.SiteID) (*model.PagedResponse[
} }
defer resp.Body.Close() defer resp.Body.Close()
response, err := ezhttp.ParseJsonResponse[model.PagedResponse[model.Client]](resp.Body) response, err := ezhttp.ParseJsonResponse[model.PagedResponse[model.Client]](resp)
if err != nil { if err != nil {
return nil, err return nil, err
} }

9
device.go
View File

@ -8,15 +8,18 @@ import (
"git.tordarus.net/tordarus/omada-api/model" "git.tordarus.net/tordarus/omada-api/model"
) )
func (api *Api) GetDevices(siteID model.SiteID) <-chan *model.Device { func (api *Api) GetDevices(siteID model.SiteID) (<-chan *model.Device, <-chan error) {
out := make(chan *model.Device, 1000) out := make(chan *model.Device, 1000)
errChan := make(chan error)
go func() { go func() {
defer close(out) defer close(out)
defer close(errChan)
for page := 1; ; page++ { for page := 1; ; page++ {
resp, err := api.getDevices(page, siteID) resp, err := api.getDevices(page, siteID)
if err != nil { if err != nil {
errChan <- err
return return
} }
@ -30,7 +33,7 @@ func (api *Api) GetDevices(siteID model.SiteID) <-chan *model.Device {
} }
}() }()
return out return out, errChan
} }
func (api *Api) getDevices(page int, siteID model.SiteID) (*model.PagedResponse[model.Device], error) { func (api *Api) getDevices(page int, siteID model.SiteID) (*model.PagedResponse[model.Device], error) {
@ -53,7 +56,7 @@ func (api *Api) getDevices(page int, siteID model.SiteID) (*model.PagedResponse[
} }
defer resp.Body.Close() defer resp.Body.Close()
response, err := ezhttp.ParseJsonResponse[model.PagedResponse[model.Device]](resp.Body) response, err := ezhttp.ParseJsonResponse[model.PagedResponse[model.Device]](resp)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
go.mod
View File

@ -2,4 +2,4 @@ module git.tordarus.net/tordarus/omada-api
go 1.23.0 go 1.23.0
require git.tordarus.net/tordarus/ezhttp v0.0.3 require git.tordarus.net/tordarus/ezhttp v0.0.5

4
go.sum
View File

@ -1,2 +1,2 @@
git.tordarus.net/tordarus/ezhttp v0.0.3 h1:K6IlLmqkAFUF68HJsOTKcP3ejco7qfm+MuEagohoouo= git.tordarus.net/tordarus/ezhttp v0.0.5 h1:pxfEdfDeOHT/ATXYy5OQHmeBIho121SBuFvU4ISQ7w0=
git.tordarus.net/tordarus/ezhttp v0.0.3/go.mod h1:Zq9o0Hibny61GqSCwJHa0PfGjVoUFv/zt2PjiQHXvmY= git.tordarus.net/tordarus/ezhttp v0.0.5/go.mod h1:Zq9o0Hibny61GqSCwJHa0PfGjVoUFv/zt2PjiQHXvmY=

9
site.go
View File

@ -8,15 +8,18 @@ import (
"git.tordarus.net/tordarus/omada-api/model" "git.tordarus.net/tordarus/omada-api/model"
) )
func (api *Api) GetSites() <-chan *model.Site { func (api *Api) GetSites() (<-chan *model.Site, <-chan error) {
out := make(chan *model.Site, 1000) out := make(chan *model.Site, 1000)
errChan := make(chan error)
go func() { go func() {
defer close(out) defer close(out)
defer close(errChan)
for page := 1; ; page++ { for page := 1; ; page++ {
resp, err := api.getSites(page) resp, err := api.getSites(page)
if err != nil { if err != nil {
errChan <- err
return return
} }
@ -30,7 +33,7 @@ func (api *Api) GetSites() <-chan *model.Site {
} }
}() }()
return out return out, errChan
} }
func (api *Api) getSites(page int) (*model.PagedResponse[model.Site], error) { func (api *Api) getSites(page int) (*model.PagedResponse[model.Site], error) {
@ -53,7 +56,7 @@ func (api *Api) getSites(page int) (*model.PagedResponse[model.Site], error) {
} }
defer resp.Body.Close() defer resp.Body.Close()
response, err := ezhttp.ParseJsonResponse[model.PagedResponse[model.Site]](resp.Body) response, err := ezhttp.ParseJsonResponse[model.PagedResponse[model.Site]](resp)
if err != nil { if err != nil {
return nil, err return nil, err
} }

10
utils.go Normal file
View File

@ -0,0 +1,10 @@
package omadaapi
func PanicOnError[T any](valueChan <-chan T, errChan <-chan error) <-chan T {
go func() {
for err := range errChan {
panic(err)
}
}()
return valueChan
}