Skip to content

fix(s3): implement pagination and fix prefix filtering in listObjects #729

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
DemoMacro wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(s3): implement pagination and fix prefix filtering in listObjects #729

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
39 changes: 31 additions & 8 deletions src/drivers/s3.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,31 @@ export default defineDriver((options: S3DriverOptions) => {

// https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html
const listObjects = async (prefix?: string) => {
const res = await awsFetch(baseURL).then((r) => r?.text());
if (!res) {
console.log("no list", prefix ? `${baseURL}?prefix=${prefix}` : baseURL);
return null;
}
return parseList(res);
const keys: string[] = [];
let continuationToken: string | undefined;

do {
const params = new URLSearchParams();
params.append("list-type", "2");
if (prefix) {
params.append("prefix", normalizeKey(prefix, "/"));
}
if (continuationToken) {
params.append("continuation-token", continuationToken);
}

const url = `${baseURL}?${params.toString()}`;
const res = await awsFetch(url).then((r) => r?.text());
if (!res) {
break;
}

const result = parseList(res);
keys.push(...result.keys);
continuationToken = result.nextToken;
} while (continuationToken);

return keys.length > 0 ? keys : null;
};

// https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html
Expand Down Expand Up @@ -226,12 +245,16 @@ function parseList(xml: string) {
/<Contents[^>]*>([\s\S]*?)<\/Contents>/g
);
if (!contents?.length) {
return [];
return { keys: [] };
}
return contents
const keys = contents
.map((content) => {
const key = content.match(/<Key>([\s\S]+?)<\/Key>/)?.[1];
return key;
})
.filter(Boolean) as string[];
const nextToken = listBucketResult.match(
/<NextContinuationToken>([\s\S]*?)<\/NextContinuationToken>/
)?.[1];
return { keys, nextToken };
}