fix asset upload to s3

zplata · zplata · commit 4f77dfb38566 · 2025-04-15T18:49:15.000-05:00
diff --git a/package.json b/package.json
@@ -12,7 +12,6 @@
         "test": "jest"
     },
     "dependencies": {
-        "axios": "^1.8.4",
         "crypto-browserify": "^3.12.1",
         "form-data": "^4.0.0",
         "formdata-node": "^6.0.3",
diff --git a/src/api/resources/assets/client/Client.ts b/src/api/resources/assets/client/Client.ts
@@ -31,28 +31,6 @@ export declare namespace Assets {
     }
 }
 
-interface TestAssetUploadRequest {
-    /**
-     * File to upload via various formats
-     */
-    file: ArrayBuffer | ReadableStream | string;
-
-    /**
-     * The file MIME type
-     */
-    mimeType?: string;
-
-    /**
-     * Name of the file
-     */
-    fileName: string;
-
-    /**
-     * Name of the parent folder to upload to
-     */
-    parentFolder?: string;
-}
-
 /**
  * Assets are files that are uploaded to your Webflow account.
  */
@@ -176,194 +154,6 @@ export class Assets {
         }
     }
 
-    public async createAndUpload(
-        siteId: string,
-        request: TestAssetUploadRequest,
-        requestOptions?: Assets.RequestOptions
-    ): Promise<Webflow.AssetUpload> {
-        if (siteId) {
-            throw new errors.WebflowError({
-                statusCode: 400,
-                body: "a test",
-            });
-        }
-        /** 1. Generate the hash */
-        const getBufferFromUrl = async (url: string): Promise<ArrayBuffer> => {
-            const response = await fetch(url);
-            const buffer = await response.arrayBuffer();
-            console.log("BUF", buffer);
-            return buffer;
-            // return crypto.createHash("md5").update(Buffer.from(buffer)).digest("hex");
-        };
-        const file = request.file;
-        let tempBuffer: Buffer | null = null;
-        if (typeof file === 'string') {
-            const arrBuffer = await getBufferFromUrl(file);
-            tempBuffer = Buffer.from(arrBuffer);
-        } else if (file instanceof ArrayBuffer) {
-            tempBuffer = Buffer.from(file);
-        }
-        if (tempBuffer === null) {
-            throw new Error('Invalid file');
-        }
-        const hash = crypto.createHash("md5").update(Buffer.from(tempBuffer)).digest("hex");
-        const fileName = request.fileName;
-
-        const wfUploadRequest = {
-            fileName,
-            fileHash: hash,
-        };
-
-        /** 2. Create the Asset Metadata in Webflow */
-        const createWfAssetMetadata = async () => {
-            const _response = await core.fetcher({
-                url: urlJoin(
-                    (await core.Supplier.get(this._options.environment)) ?? environments.WebflowEnvironment.Default,
-                    `sites/${encodeURIComponent(siteId)}/assets`
-                ),
-                method: "POST",
-                headers: {
-                    Authorization: await this._getAuthorizationHeader(),
-                    "X-Fern-Language": "JavaScript",
-                    "X-Fern-SDK-Name": "webflow-api",
-                    "X-Fern-SDK-Version": "3.1.1",
-                    "User-Agent": "webflow-api/3.1.1",
-                    "X-Fern-Runtime": core.RUNTIME.type,
-                    "X-Fern-Runtime-Version": core.RUNTIME.version,
-                    ...requestOptions?.headers,
-                },
-                contentType: "application/json",
-                requestType: "json",
-                body: serializers.AssetsCreateRequest.jsonOrThrow(wfUploadRequest, {
-                    unrecognizedObjectKeys: "passthrough",
-                    allowUnrecognizedUnionMembers: true,
-                    allowUnrecognizedEnumValues: true,
-                }),
-                timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
-                maxRetries: requestOptions?.maxRetries,
-                abortSignal: requestOptions?.abortSignal,
-            });
-            if (_response.ok) {
-                return serializers.AssetUpload.parseOrThrow(_response.body, {
-                    unrecognizedObjectKeys: "passthrough",
-                    allowUnrecognizedUnionMembers: true,
-                    allowUnrecognizedEnumValues: true,
-                    skipValidation: true,
-                    breadcrumbsPrefix: ["response"],
-                });
-            }
-    
-            if (_response.error.reason === "status-code") {
-                switch (_response.error.statusCode) {
-                    case 400:
-                        throw new Webflow.BadRequestError(_response.error.body);
-                    case 401:
-                        throw new Webflow.UnauthorizedError(
-                            serializers.Error_.parseOrThrow(_response.error.body, {
-                                unrecognizedObjectKeys: "passthrough",
-                                allowUnrecognizedUnionMembers: true,
-                                allowUnrecognizedEnumValues: true,
-                                skipValidation: true,
-                                breadcrumbsPrefix: ["response"],
-                            })
-                        );
-                    case 404:
-                        throw new Webflow.NotFoundError(
-                            serializers.Error_.parseOrThrow(_response.error.body, {
-                                unrecognizedObjectKeys: "passthrough",
-                                allowUnrecognizedUnionMembers: true,
-                                allowUnrecognizedEnumValues: true,
-                                skipValidation: true,
-                                breadcrumbsPrefix: ["response"],
-                            })
-                        );
-                    case 429:
-                        throw new Webflow.TooManyRequestsError(
-                            serializers.Error_.parseOrThrow(_response.error.body, {
-                                unrecognizedObjectKeys: "passthrough",
-                                allowUnrecognizedUnionMembers: true,
-                                allowUnrecognizedEnumValues: true,
-                                skipValidation: true,
-                                breadcrumbsPrefix: ["response"],
-                            })
-                        );
-                    case 500:
-                        throw new Webflow.InternalServerError(
-                            serializers.Error_.parseOrThrow(_response.error.body, {
-                                unrecognizedObjectKeys: "passthrough",
-                                allowUnrecognizedUnionMembers: true,
-                                allowUnrecognizedEnumValues: true,
-                                skipValidation: true,
-                                breadcrumbsPrefix: ["response"],
-                            })
-                        );
-                    default:
-                        throw new errors.WebflowError({
-                            statusCode: _response.error.statusCode,
-                            body: _response.error.body,
-                        });
-                }
-            }
-    
-            switch (_response.error.reason) {
-                case "non-json":
-                    throw new errors.WebflowError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.rawBody,
-                    });
-                case "timeout":
-                    throw new errors.WebflowTimeoutError("Timeout exceeded when calling POST /sites/{site_id}/assets.");
-                case "unknown":
-                    throw new errors.WebflowError({
-                        message: _response.error.errorMessage,
-                    });
-            }
-        };
-
-        console.log("Step 2 done");
-
-        /** 3. Upload to AWS */
-        const wfUploadedAsset = await createWfAssetMetadata();
-
-        console.log("Step 2.5 done");
-        const wfUploadDetails = wfUploadedAsset.uploadDetails!;
-        const uploadUrl = wfUploadedAsset.uploadUrl as string;
-        // Temp workaround since headers from response are being camelCased and we need them to be exact when sending to S3
-        const headerMappings = {
-            'xAmzAlgorithm': 'X-Amz-Algorithm',
-            'xAmzDate': 'X-Amz-Date',
-            'xAmzCredential': 'X-Amz-Credential',
-            'xAmzSignature': 'X-Amz-Signature',
-            'successActionStatus': 'success_action_status',
-            'contentType': 'Content-Type',
-            'cacheControl': 'Cache-Control',
-        };
-        const transformedUploadHeaders = Object.keys(wfUploadDetails).reduce((acc: Record<string, any>, key) => {
-            const mappedKey = headerMappings[key as keyof typeof headerMappings] || key;
-            acc[mappedKey] = wfUploadDetails[key as keyof typeof headerMappings ];
-            return acc;
-        }, {});
-        const formDataToUpload = new FormData();
-        Object.keys(transformedUploadHeaders).forEach((key) => {
-            formDataToUpload.append(key, transformedUploadHeaders[key]);
-        });
-        console.log("STEP 2.6 done", tempBuffer);
-        const newBlob = Readable.from(tempBuffer);
-        console.log("NEW BLOB", newBlob);
-        formDataToUpload.append("file", newBlob, {
-            filename: fileName,
-            contentType: wfUploadedAsset.contentType,
-        });
-        console.log("STEP 2.75 done");
-        const uploadResponse = await fetch(uploadUrl, {
-            method: 'POST',
-            body: formDataToUpload,
-            headers: {...formDataToUpload.getHeaders()},
-        });
-        console.log("UPLOAD RESPONSE", JSON.stringify(uploadResponse));
-        return wfUploadedAsset;
-    }
-
     /**
      * The first step in uploading an asset to a site.
      *
diff --git a/src/wrapper/AssetsUtilitiesClient.ts b/src/wrapper/AssetsUtilitiesClient.ts
@@ -3,12 +3,9 @@ import * as Webflow from "../api";
 import { Assets } from "../api/resources/assets/client/Client";
 import * as core from "../core";
 import * as environments from "../environments";
-import * as errors from "../errors";
-import * as serializers from "../serialization";
 import crypto from "crypto";
 import fetch from "node-fetch";
-import FormData from 'form-data';
-import { Readable } from 'stream';
+import FormDataConstructor from 'form-data';
 
 export declare namespace AssetsUtilities {
     interface Options {
@@ -32,7 +29,7 @@ interface TestAssetUploadRequest {
     /**
      * File to upload via various formats
      */
-    file: ArrayBuffer | ReadableStream | string;
+    file: ArrayBuffer  | string;
 
     /**
      * The file MIME type
@@ -56,6 +53,12 @@ export class Client extends Assets {
         super(_options);
     }
 
+    private async _getBufferFromUrl(url: string): Promise<ArrayBuffer> {
+        const response = await fetch(url);
+        const buffer = await response.arrayBuffer();
+        return buffer;
+    }
+
     /**
      * Create the Asset metadata in Webflow, and immediately upload it to the S3 bucket on behalf of the user to simplify the 2-step process
      * 
@@ -69,24 +72,11 @@ export class Client extends Assets {
         request: TestAssetUploadRequest,
         requestOptions?: Assets.RequestOptions
     ): Promise<Webflow.AssetUpload> {
-        // if (siteId) {
-        //     throw new errors.WebflowError({
-        //         statusCode: 400,
-        //         body: "a test",
-        //     });
-        // }
         /** 1. Generate the hash */
-        const getBufferFromUrl = async (url: string): Promise<ArrayBuffer> => {
-            const response = await fetch(url);
-            const buffer = await response.arrayBuffer();
-            console.log("BUF", buffer);
-            return buffer;
-            // return crypto.createHash("md5").update(Buffer.from(buffer)).digest("hex");
-        };
         const file = request.file;
         let tempBuffer: Buffer | null = null;
         if (typeof file === 'string') {
-            const arrBuffer = await getBufferFromUrl(file);
+            const arrBuffer = await this._getBufferFromUrl(file);
             tempBuffer = Buffer.from(arrBuffer);
         } else if (file instanceof ArrayBuffer) {
             tempBuffer = Buffer.from(file);
@@ -107,12 +97,9 @@ export class Client extends Assets {
             return await this.create(siteId, wfUploadRequest, requestOptions);
         };
 
-        console.log("Step 2 done");
-
-        /** 3. Upload to AWS */
+        /** 3. Create FormData with S3 bucket signature */
         const wfUploadedAsset = await createWfAssetMetadata();
 
-        console.log("Step 2.5 done", wfUploadedAsset);
         const wfUploadDetails = wfUploadedAsset.uploadDetails!;
         const uploadUrl = wfUploadedAsset.uploadUrl as string;
         // Temp workaround since headers from response are being camelCased and we need them to be exact when sending to S3
@@ -130,25 +117,27 @@ export class Client extends Assets {
             acc[mappedKey] = wfUploadDetails[key as keyof typeof headerMappings ];
             return acc;
         }, {});
-        const formDataToUpload = new FormData();
+        const formDataToUpload = new FormDataConstructor();
         Object.keys(transformedUploadHeaders).forEach((key) => {
             formDataToUpload.append(key, transformedUploadHeaders[key]);
         });
-        console.log("STEP 2.6 done");
-        const newBlob = Readable.from(tempBuffer);
-        console.log("NEW BLOB");
-        formDataToUpload.append("file", newBlob, {
+
+        if (!Buffer.isBuffer(tempBuffer)) {
+            throw new Error("Invalid Buffer: Expected a Buffer instance from file");
+        }
+
+        formDataToUpload.append("file", tempBuffer, {
             filename: fileName,
-            contentType: wfUploadedAsset.contentType,
+            contentType: wfUploadedAsset.contentType || "application/octet-stream",
         });
-        console.log("STEP 2.75 done");
-        // TOOO: SOMETHING WEIRD HERE.. NOT UPLOADING TO S3 PROPERLY
-        const uploadResponse = await fetch(uploadUrl, {
+
+        /** 4. Upload to S3  */
+        await fetch(uploadUrl, {
             method: 'POST',
             body: formDataToUpload,
             headers: {...formDataToUpload.getHeaders()},
         });
-        console.log("UPLOAD RESPONSE", JSON.stringify(uploadResponse));
+
         return wfUploadedAsset;
     }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -954,15 +954,6 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
-axios@^1.8.4:
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.4.tgz#78990bb4bc63d2cae072952d374835950a82f447"
-  integrity sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==
-  dependencies:
-    follow-redirects "^1.15.6"
-    form-data "^4.0.0"
-    proxy-from-env "^1.1.0"
-
 babel-jest@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.7.0.tgz#f4369919225b684c56085998ac63dbd05be020d5"
@@ -1683,11 +1674,6 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-follow-redirects@^1.15.6:
-  version "1.15.9"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
-  integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
-
 form-data@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.2.tgz#35cabbdd30c3ce73deb2c42d3c8d3ed9ca51794c"
@@ -2810,11 +2796,6 @@ prompts@^2.0.1:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
-proxy-from-env@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
-  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
-
 psl@^1.1.33:
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.15.0.tgz#bdace31896f1d97cec6a79e8224898ce93d974c6"
