Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
122 changes: 83 additions & 39 deletions src/lib/stores/uploader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ const temporaryFunctions = (region: string, projectId: string) => {
return new Functions(clientProject);
};

const MAX_CONCURRENT_UPLOADS = 5;

const createUploader = () => {
const { subscribe, set, update } = writable<Uploader>({
isOpen: false,
Expand All @@ -58,6 +60,85 @@ const createUploader = () => {
});
};

const uploadFile = async (
region: string,
projectId: string,
bucketId: string,
id: string,
file: File,
permissions: string[]
) => {
const newFile: UploaderFile = {
$id: id,
resourceId: bucketId,
name: file.name,
size: file.size,
progress: 0,
status: 'pending'
};
update((n) => {
n.isOpen = true;
n.isCollapsed = false;
n.files.unshift(newFile);
return n;
});
try {
const uploadedFile = await temporaryStorage(region, projectId).createFile({
bucketId,
fileId: id ?? ID.unique(),
file,
permissions,
onProgress: (progress) => {
newFile.$id = progress.$id;
newFile.progress = progress.progress;
newFile.status = progress.progress === 100 ? 'success' : 'pending';
updateFile(progress.$id, newFile);
}
});
newFile.$id = uploadedFile.$id;
newFile.progress = 100;
newFile.status = 'success';
updateFile(newFile.$id, newFile);
} catch (e) {
newFile.status = 'failed';
newFile.error = e?.message ?? 'Upload failed';
updateFile(newFile.$id, newFile);
throw e;
}
};

const uploadFiles = async (
region: string,
projectId: string,
bucketId: string,
files: { id: string; file: File }[],
permissions: string[]
) => {
const results: PromiseSettledResult<void>[] = [];
const executing = new Set<Promise<void>>();

for (const { id, file } of files) {
const task = uploadFile(region, projectId, bucketId, id, file, permissions).then(
() => {
results.push({ status: 'fulfilled', value: undefined });
executing.delete(task);
},
(reason) => {
results.push({ status: 'rejected', reason });
executing.delete(task);
}
);
executing.add(task);

if (executing.size >= MAX_CONCURRENT_UPLOADS) {
await Promise.race(executing);
}
}

await Promise.all(executing);
return results;
};

return {
subscribe,

Expand All @@ -78,45 +159,8 @@ const createUploader = () => {
isCollapsed: false,
files: []
}),
uploadFile: async (
region: string,
projectId: string,
bucketId: string,
id: string,
file: File,
permissions: string[]
) => {
const newFile: UploaderFile = {
$id: id,
resourceId: bucketId,
name: file.name,
size: file.size,
progress: 0,
status: 'pending'
};
update((n) => {
n.isOpen = true;
n.isCollapsed = false;
n.files.unshift(newFile);
return n;
});
const uploadedFile = await temporaryStorage(region, projectId).createFile({
bucketId,
fileId: id ?? ID.unique(),
file,
permissions,
onProgress: (progress) => {
newFile.$id = progress.$id;
newFile.progress = progress.progress;
newFile.status = progress.progress === 100 ? 'success' : 'pending';
updateFile(progress.$id, newFile);
}
});
newFile.$id = uploadedFile.$id;
newFile.progress = 100;
newFile.status = 'success';
updateFile(newFile.$id, newFile);
},
uploadFile,
uploadFiles,
uploadSiteDeployment: async ({
siteId,
code,
Expand Down
Loading
Loading