BYOK Personal Data Server (PDS) written in Go
ipfs
vow
atproto
pds
go
refactor: simplify handling
+22
-19
+2
-1
docker-compose.yaml
+2
-1
docker-compose.yaml
+4
-10
server/blockstore_factory.go
+4
-10
server/blockstore_factory.go
···
1
1
package server
2
2
3
3
import (
4
-
"net/http"
5
-
6
4
"github.com/ipfs/kubo/client/rpc"
7
5
vowblockstore "pkg.rbrt.fr/vow/blockstore"
8
6
)
9
7
10
8
// newBlockstoreForRepo returns the blockstore for a DID.
11
-
func newBlockstoreForRepo(did string, ipfsCfg *IPFSConfig) *vowblockstore.IPFSBlockstore {
12
-
cli, err := rpc.NewURLApiWithClient(ipfsCfg.NodeURL, http.DefaultClient)
13
-
if err != nil {
14
-
panic(err)
15
-
}
16
-
return vowblockstore.NewIPFS(did, cli)
9
+
func newBlockstoreForRepo(did string, ipfsAPI *rpc.HttpApi) *vowblockstore.IPFSBlockstore {
10
+
return vowblockstore.NewIPFS(did, ipfsAPI)
17
11
}
18
12
19
13
// newRecordingBlockstoreForRepo adds read/write logging.
20
-
func newRecordingBlockstoreForRepo(did string, ipfsCfg *IPFSConfig) (*vowblockstore.RecordingBlockstore, *vowblockstore.IPFSBlockstore) {
21
-
base := newBlockstoreForRepo(did, ipfsCfg)
14
+
func newRecordingBlockstoreForRepo(did string, ipfsAPI *rpc.HttpApi) (*vowblockstore.RecordingBlockstore, *vowblockstore.IPFSBlockstore) {
15
+
base := newBlockstoreForRepo(did, ipfsAPI)
22
16
return vowblockstore.NewRecording(base), base
23
17
}
+1
-1
server/handle_account_signup.go
+1
-1
server/handle_account_signup.go
+1
-1
server/handle_import_repo.go
+1
-1
server/handle_import_repo.go
+1
-1
server/handle_server_create_account.go
+1
-1
server/handle_server_create_account.go
+1
-1
server/handle_sync_get_blocks.go
+1
-1
server/handle_sync_get_blocks.go
+1
-1
server/handle_sync_get_repo.go
+1
-1
server/handle_sync_get_repo.go
···
55
55
return
56
56
}
57
57
58
-
bs := newBlockstoreForRepo(urepo.Repo.Did, s.ipfsConfig)
58
+
bs := newBlockstoreForRepo(urepo.Repo.Did, s.ipfsAPI)
59
59
if err := writeRepoBlocksFromBlockstore(ctx, buf, bs, rc); err != nil {
60
60
logger.Error("error writing repo blocks to car", "error", err)
61
61
helpers.ServerError(w, nil)
+3
-3
server/repo.go
+3
-3
server/repo.go
···
352
352
return nil, err
353
353
}
354
354
355
-
bs, baseBS := newRecordingBlockstoreForRepo(urepo.Did, rm.s.ipfsConfig)
355
+
bs, baseBS := newRecordingBlockstoreForRepo(urepo.Did, rm.s.ipfsAPI)
356
356
// dbs is the unwrapped base blockstore used for direct reads when building
357
357
// the firehose CAR slice.
358
358
dbs := baseBS
···
623
623
sigBytes []byte,
624
624
dbs blockstore.Blockstore,
625
625
) ([]ApplyWriteResult, error) {
626
-
bs, _ := newRecordingBlockstoreForRepo(urepo.Did, rm.s.ipfsConfig)
626
+
bs, _ := newRecordingBlockstoreForRepo(urepo.Did, rm.s.ipfsAPI)
627
627
628
628
// Replay the write log blocks into the fresh blockstore so finaliseCommit
629
629
// can locate them when building the CAR.
···
790
790
var proofBlocks []blocks.Block
791
791
var recordCid *cid.Cid
792
792
793
-
dbs := newBlockstoreForRepo(urepo.Did, rm.s.ipfsConfig)
793
+
dbs := newBlockstoreForRepo(urepo.Did, rm.s.ipfsAPI)
794
794
795
795
if err := rm.withRepo(ctx, urepo.Did, commitCid, dbs, func(r *atp.Repo) (cid.Cid, error) {
796
796
path := collection + "/" + rkey
+8
server/server.go
+8
server/server.go
···
30
30
"github.com/go-playground/validator"
31
31
"github.com/gorilla/sessions"
32
32
"github.com/ipfs/go-cid"
33
+
"github.com/ipfs/kubo/client/rpc"
33
34
"github.com/prometheus/client_golang/prometheus/promhttp"
34
35
"pkg.rbrt.fr/vow/identity"
35
36
"pkg.rbrt.fr/vow/internal/db"
···
93
94
94
95
dbName string
95
96
ipfsConfig *IPFSConfig
97
+
ipfsAPI *rpc.HttpApi
96
98
}
97
99
98
100
type Args struct {
···
392
394
return nil, fmt.Errorf("failed to create event persister: %w", err)
393
395
}
394
396
397
+
ipfsAPI, err := rpc.NewURLApiWithClient(args.IPFSConfig.NodeURL, nil)
398
+
if err != nil {
399
+
return nil, fmt.Errorf("failed to create IPFS client: %w", err)
400
+
}
401
+
395
402
cookieStore := sessions.NewCookieStore([]byte(args.SessionSecret))
396
403
397
404
s := &Server{
···
425
432
426
433
dbName: args.DbName,
427
434
ipfsConfig: args.IPFSConfig,
435
+
ipfsAPI: ipfsAPI,
428
436
429
437
oauthProvider: provider.NewProvider(provider.Args{
430
438
Hostname: args.Hostname,