next-tinacms-s3 1.3.0 → 1.3.2

package/dist/handlers.d.ts

@@ -6,6 +6,7 @@ import { NextApiRequest, NextApiResponse } from 'next';
 export interface S3Config {
     config: S3ClientConfig;
     bucket: string;
+    mediaRoot?: string;
     authorized: (_req: NextApiRequest, _res: NextApiResponse) => Promise<boolean>;
 }
 export interface S3Options {

package/dist/handlers.js

@@ -43,6 +43,15 @@ var createMediaHandler = (config, options) => {
   const client = new import_client_s3.S3Client(config.config);
   const bucket = config.bucket;
   const region = config.config.region || "us-east-1";
+  let mediaRoot = config.mediaRoot || "";
+  if (mediaRoot) {
+    if (!mediaRoot.endsWith("/")) {
+      mediaRoot = mediaRoot + "/";
+    }
+    if (mediaRoot.startsWith("/")) {
+      mediaRoot = mediaRoot.substr(1);
+    }
+  }
   const endpoint = config.config.endpoint || `https://s3.${region}.amazonaws.com`;
   let cdnUrl = (options == null ? void 0 : options.cdnUrl) || endpoint.toString().replace(/http(s|):\/\//i, `https://${bucket}.`);
   cdnUrl = cdnUrl + (cdnUrl.endsWith("/") ? "" : "/");
@@ -54,9 +63,9 @@ var createMediaHandler = (config, options) => {
     }
     switch (req.method) {
       case "GET":
-        return listMedia(req, res, client, bucket, cdnUrl);
+        return listMedia(req, res, client, bucket, mediaRoot, cdnUrl);
       case "POST":
-        return uploadMedia(req, res, client, bucket, cdnUrl);
+        return uploadMedia(req, res, client, bucket, mediaRoot, cdnUrl);
       case "DELETE":
         return deleteAsset(req, res, client, bucket);
       default:
@@ -64,7 +73,7 @@ var createMediaHandler = (config, options) => {
     }
   };
 };
-async function uploadMedia(req, res, client, bucket, cdnUrl) {
+async function uploadMedia(req, res, client, bucket, mediaRoot, cdnUrl) {
   try {
     const upload = (0, import_util.promisify)(
       (0, import_multer.default)({
@@ -88,7 +97,7 @@ async function uploadMedia(req, res, client, bucket, cdnUrl) {
     const filename = import_path.default.basename(filePath);
     const params = {
       Bucket: bucket,
-      Key: prefix + filename,
+      Key: mediaRoot ? import_path.default.join(mediaRoot, prefix + filename) : prefix + filename,
       Body: blob,
       ACL: "public-read"
     };
@@ -106,18 +115,38 @@ async function uploadMedia(req, res, client, bucket, cdnUrl) {
           "400x400": src,
           "1000x1000": src
         },
-        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 });
   }
 }
-async function listMedia(req, res, client, bucket, cdnUrl) {
+function stripMediaRoot(mediaRoot, key) {
+  if (!mediaRoot) {
+    return key;
+  }
+  const mediaRootParts = mediaRoot.split("/").filter((part) => part);
+  if (!mediaRootParts || !mediaRootParts[0]) {
+    return key;
+  }
+  const keyParts = key.split("/").filter((part) => part);
+  for (let i = 0; i < mediaRootParts.length; i++) {
+    if (keyParts[0] === mediaRootParts[i]) {
+      keyParts.shift();
+    }
+  }
+  return keyParts.join("/");
+}
+async function listMedia(req, res, client, bucket, mediaRoot, cdnUrl) {
   var _a;
   try {
     const {
@@ -131,29 +160,38 @@ async function listMedia(req, res, client, bucket, cdnUrl) {
     const params = {
       Bucket: bucket,
       Delimiter: "/",
-      Prefix: prefix,
+      Prefix: mediaRoot ? import_path.default.join(mediaRoot, prefix) : prefix,
       Marker: offset == null ? void 0 : offset.toString(),
       MaxKeys: directory && !offset ? +limit + 1 : +limit
     };
     const command = new import_client_s3.ListObjectsCommand(params);
     const response = await client.send(command);
     const items = [];
-    (_a = response.CommonPrefixes) == null ? void 0 : _a.forEach(
-      ({ Prefix }) => items.push({
+    (_a = response.CommonPrefixes) == null ? void 0 : _a.forEach(({ Prefix }) => {
+      const strippedPrefix = stripMediaRoot(mediaRoot, Prefix);
+      if (!strippedPrefix) {
+        return;
+      }
+      items.push({
         id: Prefix,
         type: "dir",
-        filename: import_path.default.basename(Prefix),
-        directory: import_path.default.dirname(Prefix)
-      })
-    );
+        filename: import_path.default.basename(strippedPrefix),
+        directory: import_path.default.dirname(strippedPrefix)
+      });
+    });
     items.push(
-      ...(response.Contents || []).filter((file) => file.Key !== prefix).map(getS3ToTinaFunc(cdnUrl))
+      ...(response.Contents || []).filter((file) => {
+        const strippedKey = stripMediaRoot(mediaRoot, file.Key);
+        return strippedKey !== prefix;
+      }).map(getS3ToTinaFunc(cdnUrl, mediaRoot))
     );
     res.json({
       items,
       offset: response.NextMarker
     });
   } catch (e) {
+    console.error("Error listing media");
+    console.error(e);
     res.status(500);
     const message = findErrorMessage(e);
     res.json({ e: message });
@@ -180,15 +218,18 @@ async function deleteAsset(req, res, client, bucket) {
     const data = await client.send(command);
     res.json(data);
   } catch (e) {
+    console.error("Error deleting media");
+    console.error(e);
     res.status(500);
     const message = findErrorMessage(e);
     res.json({ e: message });
   }
 }
-function getS3ToTinaFunc(cdnUrl) {
+function getS3ToTinaFunc(cdnUrl, mediaRoot) {
   return function s3ToTina(file) {
-    const filename = import_path.default.basename(file.Key);
-    const directory = import_path.default.dirname(file.Key) + "/";
+    const strippedKey = stripMediaRoot(mediaRoot, file.Key);
+    const filename = import_path.default.basename(strippedKey);
+    const directory = import_path.default.dirname(strippedKey) + "/";
     const src = cdnUrl + file.Key;
     return {
       id: file.Key,