lamp/atproto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mismatched roots fix ()

Browse Source
This commit is contained in:
Daniel Holmgren 2022-04-28 16:08:05 -05:00 committed by GitHub
parent 30aa03254e
commit 07d7fcfd18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 25 deletions
cli/src/commands/setup
destroy.ts
server/src/routes/data
repo.ts

2
cli/src/commands/setup/destroy.ts

@ -20,7 +20,7 @@ export default cmd({
required: true,
default: false,
})
if (!isSure) {
if (!isSure.question) {
console.log('Exiting without deleting')
return
}

51
server/src/routes/data/repo.ts

@ -32,32 +32,8 @@ router.post('/:did', async (req, res) => {
const { did } = util.checkReqBody(req.params, postRepoReq)
const bytes = await util.readReqBytes(req)
const maybeRepo = await util.maybeLoadRepo(res, did)
const db = util.getDB(res)
let repo: Repo
const evts: delta.Event[] = []
// @TODO: we should do these on a temp in-memory blockstore before merging down to our on-disk one
if (maybeRepo) {
repo = maybeRepo
await repo.loadAndVerifyDiff(bytes, async (evt) => {
evts.push(evt)
})
await db.updateRepoRoot(did, repo.cid)
} else {
const blockstore = util.getBlockstore(res)
repo = await Repo.fromCarFile(bytes, blockstore, async (evt) => {
evts.push(evt)
})
await db.createRepoRoot(did, repo.cid)
}
for (const evt of evts) {
await processEvent(db, util.getOwnHost(req), repo, did, evt)
}
await subscriptions.notifySubscribers(db, repo)
// check to see if we have their username in DB, for indexed queries
const haveUsername = await db.isDidRegistered(did)
if (!haveUsername) {
@ -68,6 +44,33 @@ router.post('/:did', async (req, res) => {
}
}
const maybeRepo = await util.maybeLoadRepo(res, did)
const isNewRepo = maybeRepo === null
let repo: Repo
const evts: delta.Event[] = []
// @TODO: we should do these on a temp in-memory blockstore before merging down to our on-disk one
if (!isNewRepo) {
repo = maybeRepo
await repo.loadAndVerifyDiff(bytes, async (evt) => {
evts.push(evt)
})
} else {
const blockstore = util.getBlockstore(res)
repo = await Repo.fromCarFile(bytes, blockstore, async (evt) => {
evts.push(evt)
})
}
for (const evt of evts) {
await processEvent(db, util.getOwnHost(req), repo, did, evt)
}
await subscriptions.notifySubscribers(db, repo)
if (isNewRepo) {
await db.createRepoRoot(did, repo.cid)
} else [await db.updateRepoRoot(did, repo.cid)]
res.status(200).send()
})