Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
Use stream consumers while uploading (#2064)
Bogdan Chadkinfe50a537fec8
diff --git a/packages/asset-uploader/src/clients/fs/upload.ts b/packages/asset-uploader/src/clients/fs/upload.tsindex c031c7e7f5..01f756f5c3 100644--- a/packages/asset-uploader/src/clients/fs/upload.ts+++ b/packages/asset-uploader/src/clients/fs/upload.ts@@ -1,7 +1,7 @@import { mkdir, writeFile } from "node:fs/promises";import { dirname, resolve } from "node:path";+import { buffer } from "node:stream/consumers";import { getAssetData } from "../../utils/get-asset-data";-import { toUint8Array } from "../../utils/to-uint8-array";import { createSizeLimiter } from "../../utils/size-limiter";export const uploadToFs = async ({@@ -23,7 +23,7 @@ export const uploadToFs = async ({await mkdir(dirname(filepath), { recursive: true }).catch(() => {});const limitSize = createSizeLimiter(maxSize, name);- const data = await toUint8Array(limitSize(dataStream));+ const data = await buffer(limitSize(dataStream));await writeFile(filepath, data);const assetData = await getAssetData({diff --git a/packages/asset-uploader/src/clients/s3/upload.ts b/packages/asset-uploader/src/clients/s3/upload.tsindex 0109571b46..7e1f347d6a 100644--- a/packages/asset-uploader/src/clients/s3/upload.ts+++ b/packages/asset-uploader/src/clients/s3/upload.ts@@ -1,5 +1,5 @@+import { arrayBuffer } from "node:stream/consumers";import type { SignatureV4 } from "@smithy/signature-v4";-import { toUint8Array } from "../../utils/to-uint8-array";import { getAssetData } from "../../utils/get-asset-data";import { createSizeLimiter } from "../../utils/size-limiter";@@ -28,7 +28,7 @@ export const uploadToS3 = async ({// this has to be a stream that goes directly to s3// Size check has to happen as you stream and interrupted when size is too big// Also check if S3 client has an option to check the size limit- const data = await toUint8Array(limitSize(dataStream));+ const data = await arrayBuffer(limitSize(dataStream));const url = new URL(`/${bucket}/${name}`, endpoint);@@ -64,7 +64,7 @@ export const uploadToS3 = async ({const assetData = await getAssetData({type: type.startsWith("image") ? "image" : "font",size: data.byteLength,- data,+ data: new Uint8Array(data),});return assetData;diff --git a/packages/asset-uploader/src/utils/to-uint8-array.ts b/packages/asset-uploader/src/utils/to-uint8-array.tsdeleted file mode 100644index 426bece0a4..0000000000--- a/packages/asset-uploader/src/utils/to-uint8-array.ts+++ /dev/null@@ -1,8 +0,0 @@-export const toUint8Array = async (data: AsyncIterable<ArrayBuffer>) => {- const result = [];- for await (const chunk of data) {- result.push(Buffer.from(chunk));- }-- return new Uint8Array(Buffer.concat(result));-};