zio
/
bsky-app
2
0
Fork 0
Code Pull Requests Packages Releases Activity

Add retries to all handlers (#3935)

zio/stable
Eric Bailey 2024-05-09 16:31:36 -05:00 committed by GitHub
parent becc708c61
commit 55fdbc7399
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 90 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/state/messages/convo/agent.ts
View File

@ -7,6 +7,7 @@ import {
} from '@atproto-labs/api' } from '@atproto-labs/api'
import {nanoid} from 'nanoid/non-secure' import {nanoid} from 'nanoid/non-secure'
import {networkRetry} from '#/lib/async/retry'
import {logger} from '#/logger' import {logger} from '#/logger'
import {isNative} from '#/platform/detection' import {isNative} from '#/platform/detection'
import { import {
@ -459,7 +460,8 @@ export class Convo {
recipients: AppBskyActorDefs.ProfileViewBasic[] recipients: AppBskyActorDefs.ProfileViewBasic[]
}>(async (resolve, reject) => { }>(async (resolve, reject) => {
try { try {
const response = await this.agent.api.chat.bsky.convo.getConvo( const response = await networkRetry(2, () => {
return this.agent.api.chat.bsky.convo.getConvo(
{ {
convoId: this.convoId, convoId: this.convoId,
}, },
@ -469,6 +471,7 @@ export class Convo {
}, },
}, },
) )
})
const convo = response.data.convo const convo = response.data.convo
@ -544,11 +547,13 @@ export class Convo {
// throw new Error('UNCOMMENT TO TEST RETRY') // throw new Error('UNCOMMENT TO TEST RETRY')
} }
const response = await this.agent.api.chat.bsky.convo.getMessages( const nextCursor = this.oldestRev // for TS
const response = await networkRetry(2, () => {
return this.agent.api.chat.bsky.convo.getMessages(
{ {
cursor: this.oldestRev, cursor: nextCursor,
convoId: this.convoId, convoId: this.convoId,
limit: isNative ? 25 : 50, limit: isNative ? 40 : 60,
}, },
{ {
headers: { headers: {
@ -556,6 +561,7 @@ export class Convo {
}, },
}, },
) )
})
const {cursor, messages} = response.data const {cursor, messages} = response.data
this.oldestRev = cursor ?? null this.oldestRev = cursor ?? null
@ -736,7 +742,8 @@ export class Convo {
// throw new Error('UNCOMMENT TO TEST RETRY') // throw new Error('UNCOMMENT TO TEST RETRY')
const {id, message} = pendingMessage const {id, message} = pendingMessage
const response = await this.agent.api.chat.bsky.convo.sendMessage( const response = await networkRetry(2, () => {
return this.agent.api.chat.bsky.convo.sendMessage(
{ {
convoId: this.convoId, convoId: this.convoId,
message, message,
@ -748,6 +755,7 @@ export class Convo {
}, },
}, },
) )
})
const res = response.data const res = response.data
/* /*
@ -786,7 +794,8 @@ export class Convo {
try { try {
const messageArray = Array.from(this.pendingMessages.values()) const messageArray = Array.from(this.pendingMessages.values())
const {data} = await this.agent.api.chat.bsky.convo.sendMessageBatch( const {data} = await networkRetry(2, () => {
return this.agent.api.chat.bsky.convo.sendMessageBatch(
{ {
items: messageArray.map(({message}) => ({ items: messageArray.map(({message}) => ({
convoId: this.convoId, convoId: this.convoId,
@ -800,6 +809,7 @@ export class Convo {
}, },
}, },
) )
})
const {items} = data const {items} = data
/* /*
@ -838,7 +848,8 @@ export class Convo {
this.commit() this.commit()
try { try {
await this.agent.api.chat.bsky.convo.deleteMessageForSelf( await networkRetry(2, () => {
return this.agent.api.chat.bsky.convo.deleteMessageForSelf(
{ {
convoId: this.convoId, convoId: this.convoId,
messageId, messageId,
@ -850,6 +861,7 @@ export class Convo {
}, },
}, },
) )
})
} catch (e) { } catch (e) {
this.deletedMessages.delete(messageId) this.deletedMessages.delete(messageId)
this.commit() this.commit()

9
src/state/messages/events/agent.ts
View File

@ -2,6 +2,7 @@ import {BskyAgent, ChatBskyConvoGetLog} from '@atproto-labs/api'
import EventEmitter from 'eventemitter3' import EventEmitter from 'eventemitter3'
import {nanoid} from 'nanoid/non-secure' import {nanoid} from 'nanoid/non-secure'
import {networkRetry} from '#/lib/async/retry'
import {logger} from '#/logger' import {logger} from '#/logger'
import {DEFAULT_POLL_INTERVAL} from '#/state/messages/events/const' import {DEFAULT_POLL_INTERVAL} from '#/state/messages/events/const'
import { import {
@ -265,7 +266,8 @@ export class MessagesEventBus {
logger.debug(`${LOGGER_CONTEXT}: init`, {}, logger.DebugContext.convo) logger.debug(`${LOGGER_CONTEXT}: init`, {}, logger.DebugContext.convo)
try { try {
const response = await this.agent.api.chat.bsky.convo.listConvos( const response = await networkRetry(2, () => {
return this.agent.api.chat.bsky.convo.listConvos(
{ {
limit: 1, limit: 1,
}, },
@ -275,6 +277,7 @@ export class MessagesEventBus {
}, },
}, },
) )
})
// throw new Error('UNCOMMENT TO TEST INIT FAILURE') // throw new Error('UNCOMMENT TO TEST INIT FAILURE')
const {convos} = response.data const {convos} = response.data
@ -358,7 +361,8 @@ export class MessagesEventBus {
// ) // )
try { try {
const response = await this.agent.api.chat.bsky.convo.getLog( const response = await networkRetry(2, () => {
return this.agent.api.chat.bsky.convo.getLog(
{ {
cursor: this.latestRev, cursor: this.latestRev,
}, },
@ -368,6 +372,7 @@ export class MessagesEventBus {
}, },
}, },
) )
})
// throw new Error('UNCOMMENT TO TEST POLL FAILURE') // throw new Error('UNCOMMENT TO TEST POLL FAILURE')