@muhgholy/next-drive 4.15.0 → 4.16.0

package/dist/{chunk-2DGLSDQ7.cjs → chunk-HNLXZW5G.cjs}

@@ -4,7 +4,7 @@ var formidable = require('formidable');
 var path = require('path');
 var fs = require('fs');
 var os3 = require('os');
-var crypto3 = require('crypto');
+var crypto2 = require('crypto');
 var mongoose = require('mongoose');
 var sharp2 = require('sharp');
 var zod = require('zod');
@@ -17,7 +17,7 @@ var formidable__default = /*#__PURE__*/_interopDefault(formidable);
 var path__default = /*#__PURE__*/_interopDefault(path);
 var fs__default = /*#__PURE__*/_interopDefault(fs);
 var os3__default = /*#__PURE__*/_interopDefault(os3);
-var crypto3__default = /*#__PURE__*/_interopDefault(crypto3);
+var crypto2__default = /*#__PURE__*/_interopDefault(crypto2);
 var mongoose__default = /*#__PURE__*/_interopDefault(mongoose);
 var sharp2__default = /*#__PURE__*/_interopDefault(sharp2);
 var ffmpeg__default = /*#__PURE__*/_interopDefault(ffmpeg);
@@ -272,10 +272,12 @@ var driveConfiguration = async (config) => {
         ...config.storage,
         path: resolvedPath
       },
-      security: config.security || {
-        maxUploadSizeInBytes: 1024 * 1024 * 1024 * 10,
+      security: {
+        maxUploadSizeInBytes: config.security?.maxUploadSizeInBytes ?? 1024 * 1024 * 1024 * 10,
         // 10GB default for ROOT
-        allowedMimeTypes: ["*/*"]
+        allowedMimeTypes: config.security?.allowedMimeTypes ?? ["*/*"],
+        signedUrls: config.security?.signedUrls,
+        trash: config.security?.trash
       }
     };
   } else {
@@ -364,7 +366,7 @@ var validateMimeType = (mime, allowedTypes) => {
   });
 };
 var computeFileHash = (filePath) => new Promise((resolve, reject) => {
-  const hash = crypto3__default.default.createHash("sha256");
+  const hash = crypto2__default.default.createHash("sha256");
   const stream = fs__default.default.createReadStream(filePath);
   stream.on("data", (data) => hash.update(data));
   stream.on("end", () => resolve(hash.digest("hex")));
@@ -1286,7 +1288,7 @@ var driveGetUrl = (fileId, options) => {
   } else {
     expiryTimestamp = Math.floor(Date.now() / 1e3) + expiresIn;
   }
-  const signature = crypto3__default.default.createHmac("sha256", secret).update(`${fileId}:${expiryTimestamp}`).digest("hex");
+  const signature = crypto2__default.default.createHmac("sha256", secret).update(`${fileId}:${expiryTimestamp}`).digest("hex");
   const token = Buffer.from(`${expiryTimestamp}:${signature}`).toString("base64url");
   return `/api/drive?action=serve&id=${fileId}&token=${token}`;
 };
@@ -1552,7 +1554,7 @@ var driveUpload = async (source, key, options) => {
     if (!fs__default.default.existsSync(tempDir)) {
       fs__default.default.mkdirSync(tempDir, { recursive: true });
     }
-    tempFilePath = path__default.default.join(tempDir, `upload-${crypto3__default.default.randomUUID()}.tmp`);
+    tempFilePath = path__default.default.join(tempDir, `upload-${crypto2__default.default.randomUUID()}.tmp`);
     fs__default.default.writeFileSync(tempFilePath, source);
     sourceFilePath = tempFilePath;
     fileSize = source.length;
@@ -1561,7 +1563,7 @@ var driveUpload = async (source, key, options) => {
     if (!fs__default.default.existsSync(tempDir)) {
       fs__default.default.mkdirSync(tempDir, { recursive: true });
     }
-    tempFilePath = path__default.default.join(tempDir, `upload-${crypto3__default.default.randomUUID()}.tmp`);
+    tempFilePath = path__default.default.join(tempDir, `upload-${crypto2__default.default.randomUUID()}.tmp`);
     const writeStream = fs__default.default.createWriteStream(tempFilePath);
     await new Promise((resolve, reject) => {
       source.pipe(writeStream);
@@ -1669,6 +1671,21 @@ var getProvider = async (req, owner) => {
   if (account.metadata.provider === "GOOGLE") return { provider: GoogleDriveProvider, accountId: account._id.toString() };
   return { provider: LocalStorageProvider };
 };
+var addSignedUrlToken = (item, config) => {
+  if (!config.security?.signedUrls?.enabled || !config.security.signedUrls.secret) {
+    return item;
+  }
+  const { secret, expiresIn } = config.security.signedUrls;
+  const expiryTimestamp = Math.floor(Date.now() / 1e3) + expiresIn;
+  const signature = crypto2__default.default.createHmac("sha256", secret).update(`${item.id}:${expiryTimestamp}`).digest("hex");
+  return { ...item, token: Buffer.from(`${expiryTimestamp}:${signature}`).toString("base64url") };
+};
+var addSignedUrlTokens = (items, config) => {
+  if (!config.security?.signedUrls?.enabled || !config.security.signedUrls.secret) {
+    return items;
+  }
+  return items.map((item) => addSignedUrlToken(item, config));
+};
 var applyCorsHeaders = (req, res, config) => {
   const cors = config.cors;
   if (!cors?.enabled) return false;
@@ -1750,7 +1767,7 @@ var driveAPIHandler = async (req, res) => {
             return res.status(401).json({ status: 401, message: "Token expired" });
           }
           const { secret } = config.security.signedUrls;
-          const expectedSignature = crypto3__default.default.createHmac("sha256", secret).update(`${id}:${expiry}`).digest("hex");
+          const expectedSignature = crypto2__default.default.createHmac("sha256", secret).update(`${id}:${expiry}`).digest("hex");
           if (signature !== expectedSignature) {
             return res.status(401).json({ status: 401, message: "Invalid token" });
           }
@@ -2024,15 +2041,7 @@ var driveAPIHandler = async (req, res) => {
         }
         if (afterId) query._id = { $lt: afterId };
         const items = await drive_default.find(query, {}, { sort: { order: 1, _id: -1 }, limit });
-        let plainItems = await Promise.all(items.map((item) => item.toClient()));
-        if (config.security?.signedUrls?.enabled) {
-          const { secret, expiresIn } = config.security.signedUrls;
-          plainItems = plainItems.map((item) => {
-            const expiryTimestamp = Math.floor(Date.now() / 1e3) + expiresIn;
-            const signature = crypto3__default.default.createHmac("sha256", secret).update(`${item.id}:${expiryTimestamp}`).digest("hex");
-            return { ...item, token: Buffer.from(`${expiryTimestamp}:${signature}`).toString("base64url") };
-          });
-        }
+        const plainItems = addSignedUrlTokens(await Promise.all(items.map((item) => item.toClient())), config);
         res.status(200).json({ status: 200, message: "Items retrieved", data: { items: plainItems, hasMore: items.length === limit } });
         return;
       }
@@ -2059,15 +2068,7 @@ var driveAPIHandler = async (req, res) => {
         }
         if (folderId && folderId !== "root") query.parentId = folderId;
         const items = await drive_default.find(query, {}, { limit, sort: { createdAt: -1 } });
-        let plainItems = await Promise.all(items.map((i) => i.toClient()));
-        if (config.security?.signedUrls?.enabled) {
-          const { secret, expiresIn } = config.security.signedUrls;
-          plainItems = plainItems.map((item) => {
-            const expiryTimestamp = Math.floor(Date.now() / 1e3) + expiresIn;
-            const signature = crypto3__default.default.createHmac("sha256", secret).update(`${item.id}:${expiryTimestamp}`).digest("hex");
-            return { ...item, token: Buffer.from(`${expiryTimestamp}:${signature}`).toString("base64url") };
-          });
-        }
+        const plainItems = addSignedUrlTokens(await Promise.all(items.map((i) => i.toClient())), config);
         return res.status(200).json({ status: 200, message: "Results", data: { items: plainItems } });
       }
       // ** 3. UPLOAD **
@@ -2125,7 +2126,7 @@ var driveAPIHandler = async (req, res) => {
               return res.status(413).json({ status: 413, message: "Storage quota exceeded" });
             }
           }
-          currentUploadId = crypto3__default.default.randomUUID();
+          currentUploadId = crypto2__default.default.randomUUID();
           const uploadDir = path__default.default.join(tempBaseDir, currentUploadId);
           fs__default.default.mkdirSync(uploadDir, { recursive: true });
           const metadata = {
@@ -2230,7 +2231,7 @@ var driveAPIHandler = async (req, res) => {
                 const item = await provider.uploadFile(drive, finalTempPath, meta.accountId);
                 fs__default.default.rmSync(uploadDir, { recursive: true, force: true });
                 const newQuota = await provider.getQuota(meta.owner, meta.accountId, information.storage.quotaInBytes);
-                res.status(200).json({ status: 200, message: "Upload complete", data: { type: "UPLOAD_COMPLETE", driveId: String(drive._id), item }, statistic: { storage: newQuota } });
+                res.status(200).json({ status: 200, message: "Upload complete", data: { type: "UPLOAD_COMPLETE", driveId: String(drive._id), item: addSignedUrlToken(item, config) }, statistic: { storage: newQuota } });
               } catch (err) {
                 await drive_default.deleteOne({ _id: drive._id });
                 throw err;
@@ -2272,7 +2273,7 @@ var driveAPIHandler = async (req, res) => {
         const folderData = createFolderBodySchema.safeParse(req.body);
         if (!folderData.success) return res.status(400).json({ status: 400, message: folderData.error.errors[0].message });
         const { name, parentId } = folderData.data;
-        const item = await provider.createFolder(name, parentId ?? null, owner, accountId);
+        const item = addSignedUrlToken(await provider.createFolder(name, parentId ?? null, owner, accountId), config);
         return res.status(201).json({ status: 201, message: "Folder created", data: { item } });
       }
       // ** 5. DELETE **
@@ -2327,15 +2328,7 @@ var driveAPIHandler = async (req, res) => {
           trashedAt: { $ne: null }
         };
         const items = await drive_default.find(query, {}, { sort: { trashedAt: -1 } });
-        let plainItems = await Promise.all(items.map((item) => item.toClient()));
-        if (config.security?.signedUrls?.enabled) {
-          const { secret, expiresIn } = config.security.signedUrls;
-          plainItems = plainItems.map((item) => {
-            const expiryTimestamp = Math.floor(Date.now() / 1e3) + expiresIn;
-            const signature = crypto3__default.default.createHmac("sha256", secret).update(`${item.id}:${expiryTimestamp}`).digest("hex");
-            return { ...item, token: Buffer.from(`${expiryTimestamp}:${signature}`).toString("base64url") };
-          });
-        }
+        const plainItems = addSignedUrlTokens(await Promise.all(items.map((item) => item.toClient())), config);
         return res.status(200).json({
           status: 200,
           message: "Trash items",
@@ -2390,14 +2383,14 @@ var driveAPIHandler = async (req, res) => {
             console.error(`Failed to move item ${id}`, e);
           }
         }
-        return res.status(200).json({ status: 200, message: "Moved", data: { items } });
+        return res.status(200).json({ status: 200, message: "Moved", data: { items: addSignedUrlTokens(items, config) } });
       }
       // ** 8. RENAME **
       case "rename": {
         const renameData = renameBodySchema.safeParse({ id: req.query.id, ...req.body });
         if (!renameData.success) return res.status(400).json({ status: 400, message: "Invalid data" });
         const { id, newName } = renameData.data;
-        const item = await provider.rename(id, newName, owner, accountId);
+        const item = addSignedUrlToken(await provider.rename(id, newName, owner, accountId), config);
         return res.status(200).json({ status: 200, message: "Renamed", data: { item } });
       }
       // ** 9. THUMBNAIL **
@@ -2422,5 +2415,5 @@ exports.driveReadFile = driveReadFile;
 exports.driveUpload = driveUpload;
 exports.getDriveConfig = getDriveConfig;
 exports.getDriveInformation = getDriveInformation;
-//# sourceMappingURL=chunk-2DGLSDQ7.cjs.map
-//# sourceMappingURL=chunk-2DGLSDQ7.cjs.map
+//# sourceMappingURL=chunk-HNLXZW5G.cjs.map
+//# sourceMappingURL=chunk-HNLXZW5G.cjs.map