next-tinacms-s3 5.0.9 → 7.0.0

package/dist/handlers.d.ts

@@ -1,7 +1,7 @@
 /**
 
 */
-import { S3ClientConfig } from '@aws-sdk/client-s3';
+import { S3Client, S3ClientConfig } from '@aws-sdk/client-s3';
 import { NextApiRequest, NextApiResponse } from 'next';
 export interface S3Config {
     config: S3ClientConfig;
@@ -18,3 +18,4 @@ export declare const mediaHandlerConfig: {
     };
 };
 export declare const createMediaHandler: (config: S3Config, options?: S3Options) => (req: NextApiRequest, res: NextApiResponse) => Promise<void>;
+export declare const getUploadUrl: (bucket: string, key: string, expiresIn: number, client: S3Client) => Promise<string>;

package/dist/handlers.js

@@ -26,14 +26,13 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var handlers_exports = {};
 __export(handlers_exports, {
   createMediaHandler: () => createMediaHandler,
+  getUploadUrl: () => getUploadUrl,
   mediaHandlerConfig: () => mediaHandlerConfig
 });
 module.exports = __toCommonJS(handlers_exports);
 var import_client_s3 = require("@aws-sdk/client-s3");
+var import_s3_request_presigner = require("@aws-sdk/s3-request-presigner");
 var import_path = __toESM(require("path"));
-var import_fs = __toESM(require("fs"));
-var import_multer = __toESM(require("multer"));
-var import_util = require("util");
 var mediaHandlerConfig = {
   api: {
     bodyParser: false
@@ -63,9 +62,25 @@ var createMediaHandler = (config, options) => {
     }
     switch (req.method) {
       case "GET":
-        return listMedia(req, res, client, bucket, mediaRoot, cdnUrl);
-      case "POST":
-        return uploadMedia(req, res, client, bucket, mediaRoot, cdnUrl);
+        if (req.url.startsWith("/api/s3/media/upload_url")) {
+          const expiresIn = req.query.expiresIn && Number(req.query.expiresIn) || 3600;
+          const s3_key = req.query.key ? Array.isArray(req.query.key) ? req.query.key[0] : req.query.key : null;
+          if (!s3_key) {
+            return res.status(400).json({ message: "key is required" });
+          }
+          if (await keyExists(client, bucket, s3_key)) {
+            return res.status(400).json({ message: "key already exists" });
+          }
+          const signedUrl = await getUploadUrl(
+            bucket,
+            s3_key,
+            expiresIn,
+            client
+          );
+          return res.json({ signedUrl, src: cdnUrl + s3_key });
+        } else {
+          return listMedia(req, res, client, bucket, mediaRoot, cdnUrl);
+        }
       case "DELETE":
         return deleteAsset(req, res, client, bucket);
       default:
@@ -73,66 +88,6 @@ var createMediaHandler = (config, options) => {
     }
   };
 };
-async function uploadMedia(req, res, client, bucket, mediaRoot, cdnUrl) {
-  var _a;
-  try {
-    const upload = (0, import_util.promisify)(
-      (0, import_multer.default)({
-        storage: import_multer.default.diskStorage({
-          directory: (req2, file, cb) => {
-            cb(null, "/tmp");
-          },
-          filename: (req2, file, cb) => {
-            cb(null, file.originalname);
-          }
-        })
-      }).single("file")
-    );
-    await upload(req, res);
-    const { directory } = req.body;
-    let prefix = directory.replace(/^\//, "").replace(/\/$/, "");
-    if (prefix)
-      prefix = prefix + "/";
-    const filePath = req.file.path;
-    const fileType = (_a = req.file) == null ? void 0 : _a.mimetype;
-    const blob = import_fs.default.readFileSync(filePath);
-    const filename = import_path.default.basename(filePath);
-    const params = {
-      Bucket: bucket,
-      Key: mediaRoot ? import_path.default.join(mediaRoot, prefix + filename) : prefix + filename,
-      Body: blob,
-      ACL: "public-read",
-      ContentType: fileType || "application/octet-stream"
-    };
-    const command = new import_client_s3.PutObjectCommand(params);
-    try {
-      await client.send(command);
-      const src = cdnUrl + prefix + filename;
-      res.json({
-        type: "file",
-        id: prefix + filename,
-        filename,
-        directory: prefix,
-        thumbnails: {
-          "75x75": src,
-          "400x400": src,
-          "1000x1000": src
-        },
-        src: cdnUrl + (mediaRoot ? import_path.default.join(mediaRoot, prefix + filename) : prefix + filename)
-      });
-    } catch (e) {
-      console.error("Error uploading media to s3");
-      console.error(e);
-      res.status(500).send(findErrorMessage(e));
-    }
-  } catch (e) {
-    console.error("Error uploading media");
-    console.error(e);
-    res.status(500);
-    const message = findErrorMessage(e);
-    res.json({ e: message });
-  }
-}
 function stripMediaRoot(mediaRoot, key) {
   if (!mediaRoot) {
     return key;
@@ -228,6 +183,35 @@ async function deleteAsset(req, res, client, bucket) {
     res.json({ e: message });
   }
 }
+async function keyExists(client, bucket, key) {
+  var _a, _b;
+  try {
+    const cmd = new import_client_s3.HeadObjectCommand({
+      Bucket: bucket,
+      Key: key
+    });
+    const output = await client.send(cmd);
+    return output && output.$metadata.httpStatusCode === 200;
+  } catch (error) {
+    if (((_a = error.$metadata) == null ? void 0 : _a.httpStatusCode) === 404) {
+      return false;
+    } else if (((_b = error.$metadata) == null ? void 0 : _b.httpStatusCode) === 403) {
+      return false;
+    } else {
+      throw new Error("unexpected error checking if key exists");
+    }
+  }
+}
+var getUploadUrl = async (bucket, key, expiresIn, client) => {
+  return (0, import_s3_request_presigner.getSignedUrl)(
+    client,
+    new import_client_s3.PutObjectCommand({
+      Bucket: bucket,
+      Key: key
+    }),
+    { expiresIn }
+  );
+};
 function getS3ToTinaFunc(cdnUrl, mediaRoot) {
   return function s3ToTina(file) {
     const strippedKey = stripMediaRoot(mediaRoot, file.Key);
@@ -251,5 +235,6 @@ function getS3ToTinaFunc(cdnUrl, mediaRoot) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createMediaHandler,
+  getUploadUrl,
   mediaHandlerConfig
 });

package/dist/index.js

@@ -47,6 +47,7 @@
         return E_DEFAULT;
     }
   };
+  const s3ErrorRegex = /<Error>.*<Code>(.+)<\/Code>.*<Message>(.+)<\/Message>.*/;
   class S3MediaStore {
     constructor() {
       this.fetchFunction = (input, init) => {
@@ -60,24 +61,57 @@
     async persist(media) {
       const newFiles = [];
       for (const item of media) {
-        const { file, directory } = item;
-        const formData = new FormData();
-        formData.append("file", file);
-        formData.append("directory", directory);
-        formData.append("filename", file.name);
-        const res = await this.fetchFunction(`/api/s3/media`, {
-          method: "POST",
-          body: formData
-        });
+        let directory = item.directory;
+        if (directory == null ? void 0 : directory.endsWith("/")) {
+          directory = directory.substr(0, directory.length - 1);
+        }
+        const path = `${directory && directory !== "/" ? `${directory}/${item.file.name}` : item.file.name}`;
+        const res = await this.fetchFunction(
+          `/api/s3/media/upload_url?key=${path}`,
+          {
+            method: "GET"
+          }
+        );
         if (res.status != 200) {
           const responseData = await res.json();
           throw new Error(responseData.message);
         }
-        const fileRes = await res.json();
+        const { signedUrl, src } = await res.json();
+        if (!signedUrl || !src) {
+          throw new Error("Unexpected error generating upload url");
+        }
+        const uploadRes = await fetch(signedUrl, {
+          method: "PUT",
+          body: item.file,
+          headers: {
+            "Content-Type": item.file.type || "application/octet-stream"
+          }
+        });
+        if (!uploadRes.ok) {
+          const xmlRes = await uploadRes.text();
+          const matches = s3ErrorRegex.exec(xmlRes);
+          console.error(xmlRes);
+          if (!matches) {
+            throw new Error("Unexpected error uploading media asset");
+          } else {
+            throw new Error(`Upload error: '${matches[2]}'`);
+          }
+        }
         await new Promise((resolve) => {
           setTimeout(resolve, 2e3);
         });
-        newFiles.push(fileRes);
+        newFiles.push({
+          directory: item.directory,
+          filename: item.file.name,
+          id: item.file.name,
+          type: "file",
+          thumbnails: {
+            "75x75": src,
+            "400x400": src,
+            "1000x1000": src
+          },
+          src
+        });
       }
       return newFiles;
     }

package/dist/index.mjs

@@ -44,6 +44,7 @@ const interpretErrorMessage = (message) => {
       return E_DEFAULT;
   }
 };
+const s3ErrorRegex = /<Error>.*<Code>(.+)<\/Code>.*<Message>(.+)<\/Message>.*/;
 class S3MediaStore {
   constructor() {
     this.fetchFunction = (input, init) => {
@@ -57,24 +58,57 @@ class S3MediaStore {
   async persist(media) {
     const newFiles = [];
     for (const item of media) {
-      const { file, directory } = item;
-      const formData = new FormData();
-      formData.append("file", file);
-      formData.append("directory", directory);
-      formData.append("filename", file.name);
-      const res = await this.fetchFunction(`/api/s3/media`, {
-        method: "POST",
-        body: formData
-      });
+      let directory = item.directory;
+      if (directory == null ? void 0 : directory.endsWith("/")) {
+        directory = directory.substr(0, directory.length - 1);
+      }
+      const path = `${directory && directory !== "/" ? `${directory}/${item.file.name}` : item.file.name}`;
+      const res = await this.fetchFunction(
+        `/api/s3/media/upload_url?key=${path}`,
+        {
+          method: "GET"
+        }
+      );
       if (res.status != 200) {
         const responseData = await res.json();
         throw new Error(responseData.message);
       }
-      const fileRes = await res.json();
+      const { signedUrl, src } = await res.json();
+      if (!signedUrl || !src) {
+        throw new Error("Unexpected error generating upload url");
+      }
+      const uploadRes = await fetch(signedUrl, {
+        method: "PUT",
+        body: item.file,
+        headers: {
+          "Content-Type": item.file.type || "application/octet-stream"
+        }
+      });
+      if (!uploadRes.ok) {
+        const xmlRes = await uploadRes.text();
+        const matches = s3ErrorRegex.exec(xmlRes);
+        console.error(xmlRes);
+        if (!matches) {
+          throw new Error("Unexpected error uploading media asset");
+        } else {
+          throw new Error(`Upload error: '${matches[2]}'`);
+        }
+      }
       await new Promise((resolve) => {
         setTimeout(resolve, 2e3);
       });
-      newFiles.push(fileRes);
+      newFiles.push({
+        directory: item.directory,
+        filename: item.file.name,
+        id: item.file.name,
+        type: "file",
+        thumbnails: {
+          "75x75": src,
+          "400x400": src,
+          "1000x1000": src
+        },
+        src
+      });
     }
     return newFiles;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-tinacms-s3",
-  "version": "5.0.9",
+  "version": "7.0.0",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "files": [
@@ -26,11 +26,11 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "typescript": "^5.6.2",
-    "@tinacms/scripts": "1.2.3",
-    "tinacms": "2.2.9"
+    "@tinacms/scripts": "1.3.0",
+    "tinacms": "2.4.0"
   },
   "peerDependencies": {
-    "tinacms": "2.2.9"
+    "tinacms": "2.4.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -40,8 +40,8 @@
     "directory": "packages/next-tinacms-s3"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.658.1",
-    "multer": "1.4.5-lts.1"
+    "@aws-sdk/s3-request-presigner": "^3.658.1",
+    "@aws-sdk/client-s3": "^3.658.1"
   },
   "scripts": {
     "types": "pnpm tsc",