Skip to content

fix(driver/OneDrive): fix direct upload, show size and upload speed #300

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

Merged
jyxjjj merged 1 commit into from
Dec 4, 2025
Merged

fix(driver/OneDrive): fix direct upload, show size and upload speed #300

Show file tree
Hide file tree
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
13 changes: 8 additions & 5 deletions src/pages/home/uploads/Upload.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,14 @@ const UploadFile = (props: UploadFileProps) => {
>
{props.path}
</Text>
<HStack spacing="$2">
<Badge colorScheme={StatusBadge[props.status]}>
{t(`home.upload.${props.status}`)}
</Badge>
<Text>{getFileSize(props.speed)}/s</Text>
<HStack spacing="$2" w="$full" justifyContent="space-between">
<HStack spacing="$2">
<Badge colorScheme={StatusBadge[props.status]}>
{t(`home.upload.${props.status}`)}
</Badge>
<Text>{getFileSize(props.speed)}/s</Text>
</HStack>
<Text color="$neutral11">{getFileSize(props.size)}</Text>
</HStack>
<Progress
w="$full"
Expand Down
35 changes: 28 additions & 7 deletions src/pages/home/uploads/direct.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
import { Upload, SetUpload } from "./types"
import { r, pathDir } from "~/utils"

// Create a speed calculator using closure
function createSpeedCalculator(throttleMs = 500) {
let lastLoaded = 0
let lastTime = Date.now()

return (loaded: number, setUpload?: SetUpload) => {
const now = Date.now()
const timeDiff = (now - lastTime) / 1000

if (timeDiff >= throttleMs / 1000) {
const speed = (loaded - lastLoaded) / timeDiff
setUpload?.("speed", speed)
lastLoaded = loaded
lastTime = now
}
}
}

export const HttpDirectUpload: Upload = async (
uploadPath: string,
file: File,
Expand Down Expand Up @@ -39,8 +57,9 @@ export const HttpDirectUpload: Upload = async (
const uploadURL = uploadInfo.upload_url
const method = uploadInfo.method || "PUT"

if (chunkSize > 0 && file.size > chunkSize) {
// Chunked upload
if (chunkSize > 0) {
// Always use chunked upload when chunkSize is provided
// This ensures Content-Range header is set for all files
return await uploadChunked(
file,
uploadURL,
Expand All @@ -50,7 +69,7 @@ export const HttpDirectUpload: Upload = async (
setUpload,
)
} else {
// Single upload
// Single upload for drivers that don't support chunking
return await uploadSingle(
file,
uploadURL,
Expand All @@ -69,13 +88,14 @@ async function uploadSingle(
setUpload?: SetUpload,
): Promise<undefined> {
const xhr = new XMLHttpRequest()
const calcSpeed = createSpeedCalculator()

return new Promise((resolve, reject) => {
xhr.upload.addEventListener("progress", (e) => {
if (e.lengthComputable && setUpload) {
const progress = (e.loaded / e.total) * 100
setUpload("progress", progress)
setUpload("speed", 0) // Speed calculation not implemented
calcSpeed(e.loaded, setUpload)
}
})

Expand Down Expand Up @@ -113,6 +133,7 @@ async function uploadChunked(
setUpload?: SetUpload,
): Promise<undefined> {
const totalChunks = Math.ceil(file.size / chunkSize)
const calcSpeed = createSpeedCalculator()
let uploadedBytes = 0

for (let i = 0; i < totalChunks; i++) {
Expand All @@ -125,10 +146,10 @@ async function uploadChunked(
await new Promise<void>((resolve, reject) => {
xhr.upload.addEventListener("progress", (e) => {
if (e.lengthComputable && setUpload) {
const chunkProgress = uploadedBytes + e.loaded
const progress = (chunkProgress / file.size) * 100
const totalLoaded = uploadedBytes + e.loaded
const progress = (totalLoaded / file.size) * 100
setUpload("progress", progress)
setUpload("speed", 0) // Speed calculation not implemented
calcSpeed(totalLoaded, setUpload)
}
})

Expand Down