Skip to content

fix(webrtc): Implement flow control to prevent dropped connections #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(webrtc): Implement flow control to prevent dropped connections #296

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 58 additions & 50 deletions src/hooks/useUploaderConnections.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,54 @@ export function useUploaderConnections(
}

let sendChunkTimeout: NodeJS.Timeout | null = null

let chunkCount = 0
const sendNextChunkAsync = (file: UploadedFile, offset: number) => {
sendChunkTimeout = setTimeout(() => {
const end = Math.min(file.size, offset + MAX_CHUNK_SIZE)
const final = isFinalChunk(offset, file.size)
chunkCount++
// Log for e2e testing
console.log(
`[UploaderConnections] sending chunk ${chunkCount} for ${
getFileName(file)
} (${offset}-${end}/${file.size}) final=${final}`,
)
const request: Message = {
type: MessageType.Chunk,
fileName: getFileName(file),
offset,
bytes: file.slice(offset, end),
final,
}
conn.send(request)

updateConnection((draft) => {
if (final) {
console.log(
'[UploaderConnections] completed file',
getFileName(file),
'- file',
draft.completedFiles + 1,
'of',
draft.totalFiles,
)
return {
...draft,
status: UploaderConnectionStatus.Ready,
completedFiles: draft.completedFiles + 1,
currentFileProgress: 0,
}
} else {
return {
...draft,
uploadingOffset: end,
currentFileProgress: end / file.size,
}
}
})
}, 0)
}
const newConn = {
status: UploaderConnectionStatus.Pending,
dataConnection: conn,
Expand Down Expand Up @@ -226,7 +274,7 @@ export function useUploaderConnections(

case MessageType.Start: {
const fileName = message.fileName
let offset = message.offset
const offset = message.offset
console.log(
'[UploaderConnections] starting transfer of',
fileName,
Expand All @@ -235,54 +283,6 @@ export function useUploaderConnections(
)
const file = validateOffset(files, fileName, offset)

let chunkCount = 0
const sendNextChunkAsync = () => {
sendChunkTimeout = setTimeout(() => {
const end = Math.min(file.size, offset + MAX_CHUNK_SIZE)
const final = isFinalChunk(offset, file.size)
chunkCount++
// Log for e2e testing
console.log(
`[UploaderConnections] sending chunk ${chunkCount} for ${fileName} (${offset}-${end}/${file.size}) final=${final}`,
)
const request: Message = {
type: MessageType.Chunk,
fileName,
offset,
bytes: file.slice(offset, end),
final,
}
conn.send(request)

updateConnection((draft) => {
offset = end
if (final) {
console.log(
'[UploaderConnections] completed file',
fileName,
'- file',
draft.completedFiles + 1,
'of',
draft.totalFiles,
)
return {
...draft,
status: UploaderConnectionStatus.Ready,
completedFiles: draft.completedFiles + 1,
currentFileProgress: 0,
}
} else {
sendNextChunkAsync()
return {
...draft,
uploadingOffset: end,
currentFileProgress: end / file.size,
}
}
})
}, 0)
}

updateConnection((draft) => {
if (
draft.status !== UploaderConnectionStatus.Ready &&
Expand All @@ -291,7 +291,7 @@ export function useUploaderConnections(
return draft
}

sendNextChunkAsync()
sendNextChunkAsync(file, offset)

return {
...draft,
Expand Down Expand Up @@ -338,6 +338,8 @@ export function useUploaderConnections(
)

updateConnection((draft) => {
if (draft.status !== UploaderConnectionStatus.Uploading) return draft

const currentAcked = draft.acknowledgedBytes || 0
const newAcked = currentAcked + ackMessage.bytesReceived

Expand All @@ -347,6 +349,12 @@ export function useUploaderConnections(
)
if (file) {
const acknowledgedProgress = newAcked / file.size

// Send next chunk if not complete
if (newAcked < file.size) {
sendNextChunkAsync(file, newAcked)
}

return {
...draft,
acknowledgedBytes: newAcked,
Expand Down