From 665a7e7ee1f70b2bf4cddbd7e034357f55d14bad Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Mon, 17 Apr 2023 02:37:46 -0400 Subject: [PATCH] *Need to refactor and make mime parsing its own separate step, and then request the stream a second time --- src/contentProviders/ipfsProvider.ts | 55 ++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/src/contentProviders/ipfsProvider.ts b/src/contentProviders/ipfsProvider.ts index a7bbd0b..6504f96 100644 --- a/src/contentProviders/ipfsProvider.ts +++ b/src/contentProviders/ipfsProvider.ts @@ -125,17 +125,56 @@ export default class IpfsProvider extends BaseProvider { reqStream.close(); return {}; } - const streamWriter = reqStream.stream.writable.getWriter(); - const reader = await this._client.cat(cid, { path: urlPath }); - const provider = this; + let reader = await this._client.cat(cid, { path: urlPath }); + + let bufferRead = 0; + const fileTypeBufferLength = 4100; + const mimeBuffer = []; + + for await (const chunk of reader.iterable()) { + if (bufferRead < fileTypeBufferLength) { + if (chunk.length >= fileTypeBufferLength) { + mimeBuffer.push(chunk.slice(0, fileTypeBufferLength)); + bufferRead += fileTypeBufferLength; + } else { + mimeBuffer.push(chunk); + bufferRead += chunk.length; + } + + if (bufferRead >= fileTypeBufferLength) { + reader.abort(); + break; + } + } else { + reader.abort(); + break; + } + } + + if (bufferRead >= fileTypeBufferLength) { + const mime = await fileTypeFromBuffer( + mimeBuffer.reduce((acc, val) => { + return new Uint8Array([...acc, ...val]); + }, new Uint8Array()) + ); + + if (mime) { + this.setData(details, "contentType", mime.mime); + } + + if (!mime) { + const ext = path.parse(urlPath).ext.replace(".", ""); + if (extToMimes.has(ext)) { + this.setData(details, "contentType", extToMimes.get(ext)); + } + } + } + + reader = await this._client.cat(cid, { path: urlPath }); + const streamWriter = reqStream.stream.writable.getWriter(); let streaming = (async function () { - let bufferRead = 0; - const fileTypeBufferLength = 4100; - const mimeBuffer = []; - let checkMime = false; - try { // @ts-ignore for await (const chunk of reader.iterable()) {