Merge pull request #518 from mfts/feat/bulk

chore(tus): misc, analytics and cleanup

Author: mfts

components/upload-zone.tsx

@@ -1,3 +1,5 @@
+import { useRouter } from "next/router";
+
 import { useCallback, useRef, useState } from "react";
 
 import { useTeam } from "@/context/team-context";
@@ -11,9 +13,10 @@ import {
   Presentation as PresentationChartBarIcon,
 } from "lucide-react";
 import { useSession } from "next-auth/react";
-import { FileError, FileRejection, useDropzone } from "react-dropzone";
+import { FileRejection, useDropzone } from "react-dropzone";
 import { mutate } from "swr";
 
+import { useAnalytics } from "@/lib/analytics";
 import { createDocument } from "@/lib/documents/create-document";
 import { resumableUpload } from "@/lib/files/tus-upload";
 import { usePlan } from "@/lib/swr/use-billing";
@@ -86,7 +89,9 @@ export default function UploadZone({
   >;
   folderPathName?: string;
 }) {
+  const analytics = useAnalytics();
   const { plan, loading } = usePlan();
+  const router = useRouter();
   const teamInfo = useTeam();
   const { data: session } = useSession();
   const maxSize = plan === "business" || plan === "datarooms" ? 100 : 30;
@@ -141,6 +146,16 @@ export default function UploadZone({
 
             setProgress(Math.round(_progress / acceptedFiles.length));
           },
+          onError: (error) => {
+            setUploads((prev) =>
+              prev.filter((upload) => upload.fileName !== file.name),
+            );
+
+            setRejectedFiles((prev) => [
+              { fileName: file.name, message: "Error uploading file" },
+              ...prev,
+            ]);
+          },
           ownerId: (session?.user as CustomUser).id,
           teamId: teamInfo?.currentTeam?.id as string,
           numPages,
@@ -174,6 +189,16 @@ export default function UploadZone({
         // update progress to 100%
         onUploadProgress(index, 100, document.id);
 
+        analytics.capture("Document Added", {
+          documentId: document.id,
+          name: document.name,
+          numPages: document.numPages,
+          path: router.asPath,
+          type: document.type,
+          teamId: teamInfo?.currentTeam?.id,
+          bulkupload: true,
+        });
+
         return document;
       });
 

lib/files/tus-upload.ts

@@ -5,6 +5,7 @@ import { decodeBase64Url } from "../utils/decode-base64url";
 type ResumableUploadParams = {
   file: File;
   onProgress?: (bytesUploaded: number, bytesTotal: number) => void;
+  onError?: (error: Error | tus.DetailedError) => void;
   ownerId: string;
   teamId: string;
   numPages: number;
@@ -25,6 +26,7 @@ type UploadResult = {
 export function resumableUpload({
   file,
   onProgress,
+  onError,
   ownerId,
   teamId,
   numPages,
@@ -54,9 +56,22 @@ export function resumableUpload({
         },
         chunkSize: 4 * 1024 * 1024,
         onError: (error) => {
+          onError && onError(error);
           console.error("Failed because: " + error);
           reject(error);
         },
+        onShouldRetry(error, retryAttempt, options) {
+          console.error(`Should retry upload. Attempt ${retryAttempt}`);
+          var status = error.originalResponse
+            ? error.originalResponse.getStatus()
+            : 0;
+          // Do not retry if the status is a 500.
+          if (status === 500 || status === 403) {
+            return false;
+          }
+          // For any other status code, we retry.
+          return true;
+        },
         onProgress,
         onSuccess: () => {
           console.log("Uploaded successfully");

pages/api/file/tus/[[...file]].ts

@@ -7,6 +7,7 @@ import { getServerSession } from "next-auth/next";
 import path from "node:path";
 
 import { newId } from "@/lib/id-helper";
+import { log } from "@/lib/utils";
 
 import { authOptions } from "../../auth/[...nextauth]";
 
@@ -19,10 +20,11 @@ export const config = {
 const tusServer = new Server({
   // `path` needs to match the route declared by the next file router
   path: "/api/file/tus",
-  // maxSize: 1024 * 1024 * 1024 * 2, // 2 GiB
-  // respectForwardedHeaders: true,
+  maxSize: 1024 * 1024 * 1024 * 2, // 2 GiB
+  respectForwardedHeaders: true,
   datastore: new S3Store({
     partSize: 8 * 1024 * 1024, // each uploaded part will have ~8MiB,
+    // TODO: expirationPeriodInMilliseconds is not working due to a permissions issue
     // expirationPeriodInMilliseconds: 1000 * 60 * 60 * 3, // 3 hours
     s3ClientConfig: {
       bucket: process.env.NEXT_PRIVATE_UPLOAD_BUCKET as string,
@@ -47,39 +49,23 @@ const tusServer = new Server({
   generateUrl(req, { proto, host, path, id }) {
     // Encode the ID to be URL safe
     id = Buffer.from(id, "utf-8").toString("base64url");
-    console.log("proto", proto);
-    // INFO: hardcoding the protocol to https for now - https://github.com/tus/tus-node-server/issues/635
-    proto = process.env.NODE_ENV === "development" ? "http" : "https";
     return `${proto}://${host}${path}/${id}`;
   },
   getFileIdFromRequest(req) {
     // Extract the ID from the URL
     const id = (req.url as string).split("/api/file/tus/")[1];
     return Buffer.from(id, "base64url").toString("utf-8");
   },
+  onResponseError(req, res, err) {
+    log({
+      message: "Error uploading a file. Error: \n\n" + err,
+      type: "error",
+    });
+    return { status_code: 500, body: "Internal Server Error" };
+  },
 });
 
 export default function handler(req: NextApiRequest, res: NextApiResponse) {
-  // // Set CORS headers for all responses
-  // res.setHeader(
-  //   "Access-Control-Allow-Methods",
-  //   "GET,POST,PUT,HEAD,DELETE,OPTIONS",
-  // );
-  // res.setHeader(
-  //   "Access-Control-Allow-Headers",
-  //   "Content-Type,Upload-Length,Upload-Offset,Upload-Metadata,Upload-Defer-Length,Upload-Concat",
-  // );
-  // res.setHeader(
-  //   "Access-Control-Expose-Headers",
-  //   "Upload-Offset,Upload-Length,Location",
-  // );
-
-  // if (req.method === "OPTIONS") {
-  //   // Handle preflight requests
-  //   res.status(204).end();
-  //   return;
-  // }
-
   // Get the session
   const session = getServerSession(req, res, authOptions);
   if (!session) {