this repo has no description
refactor api/*.go in to PLC and handle packages (#1005)
This is older code for working with PLC, and resolving handles.
This doesn't touch the code itself, just moves out of `api/*.go` to
other packages, and then marks those packages as deprecated.
Having this in `api/*.go` was weird because everything else under `api/`
is codegen (lexgen).
+31
-31
+1
-1
api/cbor_gen.go
plc/cbor_gen.go
+1
-1
api/cbor_gen.go
plc/cbor_gen.go
+1
-1
api/extra.go
handles/handles.go
+1
-1
api/extra.go
handles/handles.go
+1
-1
api/plc_test.go
plc/client_test.go
+1
-1
api/plc_test.go
plc/client_test.go
+3
-3
bgs/bgs.go
+3
-3
bgs/bgs.go
···
15
15
"sync"
16
16
"time"
17
17
18
-
"github.com/bluesky-social/indigo/api"
19
18
atproto "github.com/bluesky-social/indigo/api/atproto"
20
19
comatproto "github.com/bluesky-social/indigo/api/atproto"
21
20
"github.com/bluesky-social/indigo/carstore"
22
21
"github.com/bluesky-social/indigo/did"
23
22
"github.com/bluesky-social/indigo/events"
23
+
"github.com/bluesky-social/indigo/handles"
24
24
"github.com/bluesky-social/indigo/indexer"
25
25
"github.com/bluesky-social/indigo/models"
26
26
"github.com/bluesky-social/indigo/repomgr"
···
58
58
didr did.Resolver
59
59
repoFetcher *indexer.RepoFetcher
60
60
61
-
hr api.HandleResolver
61
+
hr handles.HandleResolver
62
62
63
63
// TODO: work on doing away with this flag in favor of more pluggable
64
64
// pieces that abstract the need for explicit ssl checks
···
134
134
}
135
135
}
136
136
137
-
func NewBGS(db *gorm.DB, ix *indexer.Indexer, repoman *repomgr.RepoManager, evtman *events.EventManager, didr did.Resolver, rf *indexer.RepoFetcher, hr api.HandleResolver, config *BGSConfig) (*BGS, error) {
137
+
func NewBGS(db *gorm.DB, ix *indexer.Indexer, repoman *repomgr.RepoManager, evtman *events.EventManager, didr did.Resolver, rf *indexer.RepoFetcher, hr handles.HandleResolver, config *BGSConfig) (*BGS, error) {
138
138
139
139
if config == nil {
140
140
config = DefaultBGSConfig()
+5
-5
cmd/bigsky/main.go
+5
-5
cmd/bigsky/main.go
···
14
14
"syscall"
15
15
"time"
16
16
17
-
"github.com/bluesky-social/indigo/api"
18
17
libbgs "github.com/bluesky-social/indigo/bgs"
19
18
"github.com/bluesky-social/indigo/carstore"
20
19
"github.com/bluesky-social/indigo/did"
21
20
"github.com/bluesky-social/indigo/events"
22
21
"github.com/bluesky-social/indigo/events/dbpersist"
23
22
"github.com/bluesky-social/indigo/events/diskpersist"
23
+
"github.com/bluesky-social/indigo/handles"
24
24
"github.com/bluesky-social/indigo/indexer"
25
25
"github.com/bluesky-social/indigo/plc"
26
26
"github.com/bluesky-social/indigo/repomgr"
···
399
399
{
400
400
mr := did.NewMultiResolver()
401
401
402
-
didr := &api.PLCServer{Host: cctx.String("plc-host")}
402
+
didr := &plc.PLCServer{Host: cctx.String("plc-host")}
403
403
mr.AddHandler("plc", didr)
404
404
405
405
webr := did.WebResolver{}
···
478
478
}
479
479
}, false)
480
480
481
-
prodHR, err := api.NewProdHandleResolver(100_000, cctx.String("resolve-address"), cctx.Bool("force-dns-udp"))
481
+
prodHR, err := handles.NewProdHandleResolver(100_000, cctx.String("resolve-address"), cctx.Bool("force-dns-udp"))
482
482
if err != nil {
483
483
return fmt.Errorf("failed to set up handle resolver: %w", err)
484
484
}
···
491
491
}
492
492
}
493
493
494
-
var hr api.HandleResolver = prodHR
494
+
var hr handles.HandleResolver = prodHR
495
495
if cctx.StringSlice("handle-resolver-hosts") != nil {
496
-
hr = &api.TestHandleResolver{
496
+
hr = &handles.TestHandleResolver{
497
497
TrialHosts: cctx.StringSlice("handle-resolver-hosts"),
498
498
}
499
499
}
+6
-6
cmd/gosky/admin.go
+6
-6
cmd/gosky/admin.go
···
10
10
"sync"
11
11
"time"
12
12
13
-
"github.com/bluesky-social/indigo/api"
14
13
"github.com/bluesky-social/indigo/api/atproto"
15
14
comatproto "github.com/bluesky-social/indigo/api/atproto"
16
15
toolsozone "github.com/bluesky-social/indigo/api/ozone"
17
16
"github.com/bluesky-social/indigo/atproto/identity"
18
17
"github.com/bluesky-social/indigo/atproto/syntax"
18
+
"github.com/bluesky-social/indigo/handles"
19
19
"github.com/bluesky-social/indigo/util/cliutil"
20
20
cli "github.com/urfave/cli/v2"
21
21
)
···
442
442
adminKey := cctx.String("admin-password")
443
443
xrpcc.AdminToken = &adminKey
444
444
445
-
phr := &api.ProdHandleResolver{}
445
+
phr := &handles.ProdHandleResolver{}
446
446
handle := cctx.Args().First()
447
447
if !strings.HasPrefix(handle, "did:") {
448
448
resp, err := phr.ResolveHandleToDid(ctx, handle)
···
486
486
487
487
handle := cctx.Args().First()
488
488
if !strings.HasPrefix(handle, "did:") {
489
-
phr := &api.ProdHandleResolver{}
489
+
phr := &handles.ProdHandleResolver{}
490
490
resp, err := phr.ResolveHandleToDid(ctx, handle)
491
491
if err != nil {
492
492
return err
···
530
530
531
531
ctx := context.Background()
532
532
533
-
phr := &api.ProdHandleResolver{}
533
+
phr := &handles.ProdHandleResolver{}
534
534
535
535
did := cctx.Args().First()
536
536
if !strings.HasPrefix(did, "did:") {
···
695
695
696
696
did := cctx.Args().First()
697
697
if !strings.HasPrefix(did, "did:") {
698
-
phr := &api.ProdHandleResolver{}
698
+
phr := &handles.ProdHandleResolver{}
699
699
resp, err := phr.ResolveHandleToDid(ctx, did)
700
700
if err != nil {
701
701
return err
···
768
768
count := cctx.Int("useCount")
769
769
num := cctx.Int("num")
770
770
771
-
phr := &api.ProdHandleResolver{}
771
+
phr := &handles.ProdHandleResolver{}
772
772
if bulkfi := cctx.String("bulk"); bulkfi != "" {
773
773
xrpcc.AdminToken = &adminKey
774
774
dids, err := readDids(bulkfi)
+3
-3
cmd/gosky/main.go
+3
-3
cmd/gosky/main.go
···
15
15
"syscall"
16
16
"time"
17
17
18
-
"github.com/bluesky-social/indigo/api"
19
18
"github.com/bluesky-social/indigo/api/atproto"
20
19
comatproto "github.com/bluesky-social/indigo/api/atproto"
21
20
"github.com/bluesky-social/indigo/api/bsky"
···
23
22
"github.com/bluesky-social/indigo/atproto/syntax"
24
23
"github.com/bluesky-social/indigo/events"
25
24
"github.com/bluesky-social/indigo/events/schedulers/sequential"
25
+
"github.com/bluesky-social/indigo/handles"
26
26
lexutil "github.com/bluesky-social/indigo/lex/util"
27
27
"github.com/bluesky-social/indigo/repo"
28
28
"github.com/bluesky-social/indigo/util"
···
194
194
}()
195
195
196
196
didr := cliutil.GetDidResolver(cctx)
197
-
hr := &api.ProdHandleResolver{}
197
+
hr := &handles.ProdHandleResolver{}
198
198
resolveHandles := cctx.Bool("resolve-handles")
199
199
200
200
cache, _ := lru.New[string, *cachedHandle](10000)
···
206
206
}
207
207
}
208
208
209
-
h, _, err := api.ResolveDidToHandle(ctx, didr, hr, did)
209
+
h, _, err := handles.ResolveDidToHandle(ctx, didr, hr, did)
210
210
if err != nil {
211
211
return "", err
212
212
}
+2
-2
gen/main.go
+2
-2
gen/main.go
···
3
3
import (
4
4
"reflect"
5
5
6
-
"github.com/bluesky-social/indigo/api"
7
6
atproto "github.com/bluesky-social/indigo/api/atproto"
8
7
bsky "github.com/bluesky-social/indigo/api/bsky"
9
8
chat "github.com/bluesky-social/indigo/api/chat"
···
14
13
"github.com/bluesky-social/indigo/events"
15
14
lexutil "github.com/bluesky-social/indigo/lex/util"
16
15
"github.com/bluesky-social/indigo/mst"
16
+
"github.com/bluesky-social/indigo/plc"
17
17
"github.com/bluesky-social/indigo/repo"
18
18
"github.com/bluesky-social/indigo/util/labels"
19
19
···
38
38
panic(err)
39
39
}
40
40
41
-
if err := genCfg.WriteMapEncodersToFile("api/cbor_gen.go", "api", api.CreateOp{}); err != nil {
41
+
if err := genCfg.WriteMapEncodersToFile("plc/cbor_gen.go", "plc", plc.CreateOp{}); err != nil {
42
42
panic(err)
43
43
}
44
44
+4
-4
testing/utils.go
+4
-4
testing/utils.go
···
19
19
"testing"
20
20
"time"
21
21
22
-
"github.com/bluesky-social/indigo/api"
23
22
atproto "github.com/bluesky-social/indigo/api/atproto"
24
23
bsky "github.com/bluesky-social/indigo/api/bsky"
25
24
"github.com/bluesky-social/indigo/bgs"
···
27
26
"github.com/bluesky-social/indigo/events"
28
27
"github.com/bluesky-social/indigo/events/diskpersist"
29
28
"github.com/bluesky-social/indigo/events/schedulers/sequential"
29
+
"github.com/bluesky-social/indigo/handles"
30
30
"github.com/bluesky-social/indigo/indexer"
31
31
lexutil "github.com/bluesky-social/indigo/lex/util"
32
32
"github.com/bluesky-social/indigo/models"
···
50
50
type TestPDS struct {
51
51
dir string
52
52
server *pds.Server
53
-
plc *api.PLCServer
53
+
plc *plc.PLCServer
54
54
55
55
listener net.Listener
56
56
···
496
496
497
497
type TestRelay struct {
498
498
bgs *bgs.BGS
499
-
tr *api.TestHandleResolver
499
+
tr *handles.TestHandleResolver
500
500
db *gorm.DB
501
501
502
502
// listener is owned by by the Relay structure and should be closed by
···
578
578
}
579
579
}, true) // TODO: actually want this to be false, but some tests use this to confirm the Relay has seen certain records
580
580
581
-
tr := &api.TestHandleResolver{}
581
+
tr := &handles.TestHandleResolver{}
582
582
583
583
bgsConfig := bgs.DefaultBGSConfig()
584
584
bgsConfig.SSL = false
+4
-4
util/cliutil/util.go
+4
-4
util/cliutil/util.go
···
16
16
"strings"
17
17
"time"
18
18
19
-
"github.com/bluesky-social/indigo/api"
20
19
"github.com/bluesky-social/indigo/did"
20
+
"github.com/bluesky-social/indigo/plc"
21
21
"github.com/bluesky-social/indigo/xrpc"
22
22
slogGorm "github.com/orandin/slog-gorm"
23
23
"github.com/urfave/cli/v2"
···
28
28
29
29
func GetDidResolver(cctx *cli.Context) did.Resolver {
30
30
mr := did.NewMultiResolver()
31
-
mr.AddHandler("plc", &api.PLCServer{
31
+
mr.AddHandler("plc", &plc.PLCServer{
32
32
Host: cctx.String("plc"),
33
33
})
34
34
mr.AddHandler("web", &did.WebResolver{})
···
36
36
return mr
37
37
}
38
38
39
-
func GetPLCClient(cctx *cli.Context) *api.PLCServer {
40
-
return &api.PLCServer{
39
+
func GetPLCClient(cctx *cli.Context) *plc.PLCServer {
40
+
return &plc.PLCServer{
41
41
Host: cctx.String("plc"),
42
42
}
43
43
}