LumeWeb
/
portal
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

feat: add CtxAborted and use in account pin

This commit is contained in:
Derrick Hammer 2024-03-05 13:41:47 -05:00
parent e6d51cd9e7
commit caac09cc6f
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/middleware/middleware.go
View File

@ -186,3 +186,11 @@ func GetUserFromContext(ctx context.Context, key ...string) uint {
return userId return userId
} }
func CtxAborted(ctx context.Context) bool {
select {
case <-ctx.Done():
return true
default:
return false
}
}

25
api/s5/s5.go
View File

@ -844,9 +844,13 @@ func (s *S5API) accountPinDelete(jc jape.Context) {
jc.ResponseWriter.WriteHeader(http.StatusNoContent) jc.ResponseWriter.WriteHeader(http.StatusNoContent)
} }
func (s *S5API) getManifestCids(cid *encoding.CID) ([]*encoding.CID, error) { func (s *S5API) getManifestCids(ctx context.Context, cid *encoding.CID) ([]*encoding.CID, error) {
var cids []*encoding.CID var cids []*encoding.CID
if middleware.CtxAborted(ctx) {
return nil, ctx.Err()
}
manifest, err := s.getNode().Services().Storage().GetMetadataByCID(cid) manifest, err := s.getNode().Services().Storage().GetMetadataByCID(cid)
if err != nil { if err != nil {
return nil, err return nil, err
@ -869,6 +873,9 @@ func (s *S5API) getManifestCids(cid *encoding.CID) ([]*encoding.CID, error) {
dir := manifest.(*s5libmetadata.DirectoryMetadata) dir := manifest.(*s5libmetadata.DirectoryMetadata)
lo.ForEach(lo.Values(dir.Directories.Items()), func(d *s5libmetadata.DirectoryReference, _i int) { lo.ForEach(lo.Values(dir.Directories.Items()), func(d *s5libmetadata.DirectoryReference, _i int) {
if middleware.CtxAborted(ctx) {
return
}
entry, err := s.getNode().Services().Registry().Get(d.PublicKey) entry, err := s.getNode().Services().Registry().Get(d.PublicKey)
if err != nil || entry == nil { if err != nil || entry == nil {
s.logger.Error("Error getting registry entry", zap.Error(err)) s.logger.Error("Error getting registry entry", zap.Error(err))
@ -881,7 +888,7 @@ func (s *S5API) getManifestCids(cid *encoding.CID) ([]*encoding.CID, error) {
return return
} }
childCids, err := s.getManifestCids(cid) childCids, err := s.getManifestCids(ctx, cid)
if err != nil { if err != nil {
s.logger.Error("Error getting child manifest CIDs", zap.Error(err)) s.logger.Error("Error getting child manifest CIDs", zap.Error(err))
return return
@ -902,6 +909,10 @@ func (s *S5API) getManifestCids(cid *encoding.CID) ([]*encoding.CID, error) {
}) })
} }
if middleware.CtxAborted(ctx) {
return nil, ctx.Err()
}
return cids, nil return cids, nil
} }
@ -917,7 +928,7 @@ func (s *S5API) accountPinManifest(jc jape.Context, userId uint, cid *encoding.C
cid *encoding.CID cid *encoding.CID
} }
cids, err := s.getManifestCids(cid) cids, err := s.getManifestCids(jc.Request.Context(), cid)
if err != nil { if err != nil {
s.sendErrorResponse(jc, NewS5Error(ErrKeyInvalidOperation, err)) s.sendErrorResponse(jc, NewS5Error(ErrKeyInvalidOperation, err))
return return
@ -982,6 +993,10 @@ func (s *S5API) accountPinManifest(jc jape.Context, userId uint, cid *encoding.C
}() }()
q.Wait() q.Wait()
if middleware.CtxAborted(jc.Request.Context()) {
return
}
jc.Encode(&results) jc.Encode(&results)
} }
@ -1134,6 +1149,10 @@ func (s *S5API) pinEntity(ctx context.Context, userId uint, cid *encoding.CID) e
return nil return nil
} }
if middleware.CtxAborted(ctx) {
return ctx.Err()
}
jobName := fmt.Sprintf("pin-import-%s", cid64) jobName := fmt.Sprintf("pin-import-%s", cid64)
if job := s.cron.GetJobByName(jobName); job == nil { if job := s.cron.GetJobByName(jobName); job == nil {