@muhgholy/next-drive 4.23.22 → 4.23.24

package/dist/{chunk-SDOFFTZ5.cjs → chunk-IVSBLEMY.cjs}

@@ -1546,7 +1546,8 @@ var uploadChunkSchema = zod.z.object({
   fileName: nameSchema,
   fileSize: zod.z.number().int().min(0).max(Number.MAX_SAFE_INTEGER),
   fileType: zod.z.string().min(1).max(255),
-  folderId: zod.z.string().optional()
+  folderId: zod.z.string().optional(),
+  conflictAction: zod.z.enum(["rename", "replace"]).optional()
 }).refine((data) => data.chunkIndex < data.totalChunks, {
   message: "Chunk index must be less than total chunks"
 });
@@ -2268,13 +2269,14 @@ var handleDriveAction = async (ctx) => {
         fileName: getString(fields.fileName),
         fileSize: getInt(fields.fileSize),
         fileType: getString(fields.fileType),
-        folderId: getString(fields.folderId) || void 0
+        folderId: getString(fields.folderId) || void 0,
+        conflictAction: getString(fields.conflictAction) || void 0
       });
       if (!uploadData.success) {
         cleanupTempFiles(files);
         return void res.status(400).json({ status: 400, message: uploadData.error.errors[0].message });
       }
-      const { chunkIndex, totalChunks, driveId, fileName, fileSize: fileSizeInBytes, fileType, folderId } = uploadData.data;
+      const { chunkIndex, totalChunks, driveId, fileName, fileSize: fileSizeInBytes, fileType, folderId, conflictAction } = uploadData.data;
       let currentUploadId = driveId;
       const tempBaseDir = path__default.default.join(os2__default.default.tmpdir(), "next-drive-uploads");
       if (!currentUploadId) {
@@ -2350,6 +2352,7 @@ var handleDriveAction = async (ctx) => {
           fileSize: fileSizeInBytes,
           mimeType: fileType,
           totalChunks,
+          conflictAction: conflictAction ?? null,
           unauthenticated: !authenticated
         };
         fs__default.default.writeFileSync(path__default.default.join(uploadDir2, "metadata.json"), JSON.stringify(metadata));
@@ -2426,6 +2429,18 @@ var handleDriveAction = async (ctx) => {
           if (finalStats.size !== meta.fileSize) {
             throw new Error("Could not finish upload: the assembled file is incomplete (size mismatch)");
           }
+          let replaceTargetId = null;
+          if (meta.conflictAction === "replace") {
+            const existing = await drive_default.findOne({ owner: meta.owner, storageAccountId: meta.accountId || null, "provider.type": meta.providerName, parentId: meta.parentId, name: meta.name, "information.type": "FILE", trashedAt: null });
+            if (existing) replaceTargetId = String(existing._id);
+          } else {
+            const ext = path__default.default.extname(meta.name);
+            const base = meta.name.slice(0, meta.name.length - ext.length);
+            let n = 1;
+            while (await drive_default.exists({ owner: meta.owner, storageAccountId: meta.accountId || null, "provider.type": meta.providerName, parentId: meta.parentId, name: meta.name, "information.type": "FILE", trashedAt: null })) {
+              meta.name = `${base} (${n++})${ext}`;
+            }
+          }
           const drive = new drive_default({
             owner: meta.owner,
             storageAccountId: meta.accountId || null,
@@ -2445,6 +2460,7 @@ var handleDriveAction = async (ctx) => {
           await drive.save();
           try {
             const item = await provider.uploadFile(drive, finalTempPath, meta.accountId);
+            if (replaceTargetId) await provider.delete([replaceTargetId], meta.owner, meta.accountId);
             fs__default.default.rmSync(uploadDir, { recursive: true, force: true });
             if (meta.unauthenticated) globalThis.__nextDrive.abuse.concurrent = Math.max(0, globalThis.__nextDrive.abuse.concurrent - 1);
             const newQuota = await provider.getQuota(meta.owner, meta.accountId, information.storage.quotaInBytes);
@@ -2665,7 +2681,32 @@ var handleDriveAction = async (ctx) => {
 };
 
 // src/server/index.ts
+var parseJsonBody = (req) => {
+  return new Promise((resolve) => {
+    try {
+      const chunks = [];
+      req.on("data", (chunk) => chunks.push(chunk));
+      req.on("end", () => {
+        const raw = Buffer.concat(chunks).toString();
+        if (!raw) return resolve({});
+        try {
+          resolve(JSON.parse(raw));
+        } catch {
+          resolve({});
+        }
+      });
+      req.on("error", () => resolve({}));
+    } catch {
+      resolve({});
+    }
+  });
+};
 var driveAPIHandler = async (req, res) => {
+  if (req.body === void 0 && typeof req.on === "function" && (req.headers["content-type"] || "").includes("application/json")) {
+    req.body = await parseJsonBody(req);
+  } else if (req.body === void 0) {
+    req.body = {};
+  }
   const action = req.query.action || (req.query.code && req.query.state ? "callback" : void 0);
   let config;
   try {
@@ -2762,5 +2803,5 @@ exports.driveUpload = driveUpload;
 exports.drive_default = drive_default;
 exports.getDriveConfig = getDriveConfig;
 exports.getDriveInformation = getDriveInformation;
-//# sourceMappingURL=chunk-SDOFFTZ5.cjs.map
-//# sourceMappingURL=chunk-SDOFFTZ5.cjs.map
+//# sourceMappingURL=chunk-IVSBLEMY.cjs.map
+//# sourceMappingURL=chunk-IVSBLEMY.cjs.map