hacklab/T-HUB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

oCIS upload: drain to buffer + explicit content-length (reva rejects chunked PUTs)

Browse source
This commit is contained in:
glass beadian 2026-10-13 05:47:19 +00:00
parent c918fb984e
commit f98fca45d0
1 changed files with 14 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

88
apps/api/src/group-files/ocis-webdav.ts
View file

@ -183,84 +183,24 @@ export class OcisWebdavClient {
*/
async upload(groupId: string, safeName: string, body: Readable, contentType: string): Promise<OcisUploadResult> {
await this.ensureGroupFolder(groupId);
// reva rejects chunked PUTs, so the source drains into a bounded buffer
// (the upload cap is 20 MiB) and goes out with an explicit content-length.
const hash = createHash("sha256");
const chunks: Buffer[] = [];
let sizeBytes = 0;
let queuedBytes = 0;
const queue: Buffer[] = [];
let sourceEnded = false;
let sourceError: Error | undefined;
let wakeTransport: (() => void) | undefined;
let wakePump: (() => void) | undefined;
const requestStream = new ReadableStream<Buffer>({
async pull(controller): Promise<void> {
if (queue.length > 0) {
const next = queue.shift()!;
queuedBytes -= next.byteLength;
controller.enqueue(next);
wakePump?.();
return;
}
if (sourceEnded) {
if (sourceError !== undefined) controller.error(sourceError);
else controller.close();
return;
}
await new Promise<void>((resolve) => {
wakeTransport = resolve;
});
wakeTransport = undefined;
if (queue.length > 0) {
controller.enqueue(queue.shift()!);
wakePump?.();
} else if (sourceError !== undefined) {
controller.error(sourceError);
} else if (sourceEnded) {
controller.close();
}
},
cancel(): void {
// The transport hung up (e.g. it rejected early): keep draining the
// source so the digest/size accounting still completes.
wakeTransport?.();
},
});
const pumped = (async (): Promise<void> => {
for await (const chunk of body) {
const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk as Uint8Array | string);
hash.update(buffer);
sizeBytes += buffer.byteLength;
queuedBytes += buffer.byteLength;
queue.push(buffer);
wakeTransport?.();
while (queuedBytes > UPLOAD_BUFFER_CAP) {
await new Promise<void>((resolve) => {
wakePump = resolve;
});
wakePump = undefined;
}
}
sourceEnded = true;
wakeTransport?.();
})().catch((err: unknown) => {
sourceError = err instanceof Error ? err : new Error(String(err));
wakeTransport?.();
wakePump?.();
});
for await (const chunk of body) {
const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk as Uint8Array | string);
hash.update(buffer);
sizeBytes += buffer.byteLength;
chunks.push(buffer);
}
const payload = Buffer.concat(chunks);
const response = await this.fetcher(this.uploadUrl(groupId, safeName), {
method: "PUT",
headers: { ...this.authHeaders(), "content-type": contentType },
body: requestStream as unknown as ReadableStream,
duplex: "half",
} satisfies FetchInitWithDuplex);
if (!response.ok) {
requestStream.cancel().catch(() => undefined);
await pumped;
throw new Error(`oCIS upload failed with ${response.status}`);
}
await pumped;
headers: { ...this.authHeaders(), "content-type": contentType, "content-length": String(payload.byteLength) },
body: payload,
});
if (!response.ok) throw new Error(`oCIS upload failed with ${response.status}`);
const etag = response.headers.get("oc-etag") ?? response.headers.get("etag");
const resourceId = response.headers.get("oc-fileid");
return {