HoshinoKoji/r2-webdav
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor resource deletion logic and fix bug in

Browse Source 
resource copy operation
This commit is contained in:
abersheeran 2023-12-06 11:12:42 +08:00
parent f8c25a23c1
commit dbd81d9e81
1 changed files with 85 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
src/index.ts
View File

@ -114,11 +114,8 @@ export default {
include: ['httpMetadata', 'customMetadata'], include: ['httpMetadata', 'customMetadata'],
}); });
let page = ''; let page = '';
// for (let dirname of r2_objects.delimitedPrefixes) { for (let object of r2_objects.objects.filter(object => object.key !== resource_path)) {
// page += `<a href="${dirname}">${dirname}</a><br>`; page += `<a href="/${object.key}">${object.httpMetadata?.contentDisposition ?? object.key}</a><br>`;
// }
for (let object of r2_objects.objects) {
page += `<a href="${object.key}">${object.httpMetadata?.contentDisposition ?? object.key}</a><br>`;
} }
response = new Response(page, { status: 200, headers: { 'Content-Type': 'text/html' } }); response = new Response(page, { status: 200, headers: { 'Content-Type': 'text/html' } });
} else { } else {
@ -170,10 +167,13 @@ export default {
} }
// Check if the parent directory exists // Check if the parent directory exists
let dirpath = resource_path.split('/').slice(0, -1).join('/') + '/'; let dirpath = resource_path.split('/').slice(0, -1).join('/');
let dir = await bucket.head(dirpath); if (dirpath !== '') {
if (!dir || dir.customMetadata?.resourcetype !== '<collection />') { let dir = await bucket.head(dirpath);
response = new Response('Conflict', { status: 409 }); if (!(dir && dir.customMetadata?.resourcetype === '<collection />')) {
response = new Response('Conflict', { status: 409 });
break;
}
} }
let body = await request.arrayBuffer(); let body = await request.arrayBuffer();
@ -185,16 +185,44 @@ export default {
} }
break; break;
case 'DELETE': { case 'DELETE': {
if (resource_path.endsWith('/')) { if (!resource_path.endsWith('/')) {
let r2_objects = await bucket.list({ let resource = await bucket.head(resource_path);
prefix: resource_path, if (resource === null) {
}); response = new Response('Not Found', { status: 404 });
await Promise.all(r2_objects.objects.map( break;
object => bucket.delete(object.key) } else {
)); if (resource.customMetadata?.resourcetype !== '<collection />') {
} else { await bucket.delete(resource_path);
await bucket.delete(resource_path); response = new Response(null, { status: 204 });
break;
}
}
} }
let dirpath = resource_path.slice(0, -1);
if (await bucket.head(dirpath) === null) {
response = new Response('Not Found', { status: 404 });
break;
}
await bucket.delete(dirpath);
let r2_objects, cursor: string | undefined = undefined;
do {
r2_objects = await bucket.list({
prefix: resource_path,
cursor: cursor,
});
let keys = r2_objects.objects.map(object => object.key);
if (keys.length > 0) {
await bucket.delete(keys);
}
if (r2_objects.truncated) {
cursor = r2_objects.cursor;
}
} while (r2_objects.truncated);
response = new Response(null, { status: 204 }); response = new Response(null, { status: 204 });
} }
break; break;
@ -213,7 +241,7 @@ export default {
} }
// Check if the parent directory exists // Check if the parent directory exists
let parent_dir = resource_path.split('/').slice(0, -2).join("/"); let parent_dir = resource_path.split('/').slice(0, -1).join("/");
if (parent_dir !== '' && !await bucket.head(parent_dir)) { if (parent_dir !== '' && !await bucket.head(parent_dir)) {
response = new Response('Conflict', { status: 409 }); response = new Response('Conflict', { status: 409 });
@ -235,7 +263,7 @@ export default {
response = new Response(`<?xml version="1.0" encoding="utf-8"?> response = new Response(`<?xml version="1.0" encoding="utf-8"?>
<multistatus xmlns="DAV:"> <multistatus xmlns="DAV:">
<response> <response>
<href>${resource_path}</href> <href>/</href>
<propstat> <propstat>
<prop> <prop>
<resourcetype><collection /></resourcetype> <resourcetype><collection /></resourcetype>
@ -260,7 +288,7 @@ export default {
let page = `<?xml version="1.0" encoding="utf-8"?> let page = `<?xml version="1.0" encoding="utf-8"?>
<multistatus xmlns="DAV:"> <multistatus xmlns="DAV:">
<response> <response>
<href>${resource_path}</href> <href>/${resource_path}</href>
<propstat> <propstat>
<prop> <prop>
${Object.entries(fromR2Object(object)) ${Object.entries(fromR2Object(object))
@ -296,23 +324,10 @@ export default {
include: ['httpMetadata', 'customMetadata'], include: ['httpMetadata', 'customMetadata'],
}); });
// for (let dirname of r2_objects.delimitedPrefixes) { for (let object of r2_objects.objects.filter(object => object.key !== resource_path)) {
// page += `
// <response>
// <href>${dirname}</href>
// <propstat>
// <prop>
// <resourcetype><collection /></resourcetype>
// </prop>
// <status>HTTP/1.1 200 OK</status>
// </propstat>
// </response>`;
// }
for (let object of r2_objects.objects) {
page += ` page += `
<response> <response>
<href>${object.key}</href> <href>/${object.key}</href>
<propstat> <propstat>
<prop> <prop>
${Object.entries(fromR2Object(object)) ${Object.entries(fromR2Object(object))
@ -424,36 +439,44 @@ export default {
} }
let destination = new URL(destination_header).pathname.slice(1); let destination = new URL(destination_header).pathname.slice(1);
let destination_exists = await bucket.head(destination); let destination_exists = await bucket.head(destination);
if (destination_exists) { if (destination_exists && !overwrite) {
if (overwrite) { response = new Response('Precondition Failed', { status: 412 });
await Promise.all((await bucket.list({ break;
prefix: destination,
})).objects.map(object => bucket.delete(object.key)));
} else {
response = new Response('Precondition Failed', { status: 412 });
break;
}
} }
// TODO delete recursively (if destination is a directory)
// await bucket.delete(
// (await bucket.list({ prefix: destination, delimiter: '/' })).objects.map(object => object.key)
// );
if (resource_path.endsWith('/')) { if (resource_path.endsWith('/')) {
let depth = request.headers.get('Depth') ?? 'infinity'; let depth = request.headers.get('Depth') ?? 'infinity';
switch (depth) { switch (depth) {
case 'infinity': { case 'infinity': {
let r2_objects = await bucket.list({ let r2_objects, cursor: string | undefined = undefined;
prefix: resource_path, do {
}); r2_objects = await bucket.list({
await Promise.all(r2_objects.objects.map( prefix: resource_path,
object => (async () => { cursor: cursor,
let target = destination + object.key.slice(resource_path.length); include: ['httpMetadata', 'customMetadata'],
let src = await bucket.get(object.key); });
if (src !== null) { await Promise.all(r2_objects.objects.map(
await bucket.put(target, src.body, { object => (async () => {
httpMetadata: object.httpMetadata, let target = destination + object.key.slice(resource_path.length);
customMetadata: object.customMetadata, let src = await bucket.get(object.key);
}); if (src !== null) {
await bucket.delete(object.key); await bucket.put(target, src.body, {
} httpMetadata: object.httpMetadata,
})() customMetadata: object.customMetadata,
)); });
await bucket.delete(object.key);
}
})()
));
if (r2_objects.truncated) {
cursor = r2_objects.cursor;
}
} while (r2_objects.truncated)
response = new Response('', { status: 201 }); response = new Response('', { status: 201 });
} }
break; break;
@ -478,6 +501,7 @@ export default {
} }
} }
} }
break;
default: { default: {
response = new Response('Method Not Allowed', { response = new Response('Method Not Allowed', {
status: 405, status: 405,