@shipstatic/drop 2.10.4-beta.1 → 2.10.4-beta.10

package/dist/index.js

@@ -1108,7 +1108,7 @@ var initialState = {
 };
 function useDrop({ ship }) {
   const [state, setState] = useState(initialState);
-  const isProcessingRef = useRef(false);
+  const runRef = useRef(null);
   const folderInputRef = useRef(null);
   const filesInputRef = useRef(null);
   const isProcessing = state.phase === "processing";
@@ -1119,24 +1119,40 @@ function useDrop({ ship }) {
     [state.files]
   );
   const getFilesForUpload = useCallback(() => validFiles.map((f) => f.file), [validFiles]);
-  const processFiles2 = useCallback(
-    async (newFiles) => {
-      if (isProcessingRef.current) {
+  const prepare = useCallback(
+    async (collect) => {
+      if (runRef.current) {
         console.warn("File processing already in progress. Ignoring duplicate call.");
         return;
       }
-      if (!newFiles || newFiles.length === 0) return;
-      isProcessingRef.current = true;
+      const run = new AbortController();
+      runRef.current = run;
       setState({
         ...initialState,
         phase: "processing",
         status: { title: "Processing...", details: "Validating and preparing files." }
       });
       try {
-        const outcome = await processFiles(newFiles, {
-          limits: await ship.getLimits(),
+        const [files, limits] = await Promise.all([
+          collect(),
+          ship.getLimits({ signal: run.signal })
+        ]);
+        if (run.signal.aborted) return;
+        if (files.length === 0) {
+          setState({
+            ...initialState,
+            phase: "error",
+            status: { title: "Empty Folder", details: "It has no files to deploy." }
+          });
+          return;
+        }
+        const outcome = await processFiles(files, {
+          limits,
+          // The pipeline says its status before its first wait, so a
+          // cancelled run has none left to say.
           onStatus: (status) => setState((prev) => ({ ...prev, status }))
         });
+        if (run.signal.aborted) return;
         setState({
           phase: outcome.phase,
           isDragging: false,
@@ -1145,15 +1161,33 @@ function useDrop({ ship }) {
           status: outcome.status,
           needsBuild: outcome.needsBuild
         });
+      } catch (error) {
+        if (run.signal.aborted) return;
+        setState({
+          ...initialState,
+          phase: "error",
+          status: {
+            title: "Processing Failed",
+            details: error instanceof Error ? error.message : String(error)
+          }
+        });
       } finally {
-        isProcessingRef.current = false;
+        if (runRef.current === run) runRef.current = null;
       }
     },
     [ship]
   );
+  const processFiles2 = useCallback(
+    async (newFiles) => {
+      if (!newFiles || newFiles.length === 0) return;
+      await prepare(async () => newFiles);
+    },
+    [prepare]
+  );
   const reset = useCallback(() => {
+    runRef.current?.abort();
+    runRef.current = null;
     setState(initialState);
-    isProcessingRef.current = false;
   }, []);
   const handleDragOver = useCallback((e) => {
     e.preventDefault();
@@ -1188,13 +1222,13 @@ function useDrop({ ship }) {
           if (file) files.push(file);
         }
       }
-      await Promise.all(directories.map((d) => traverseFileTree(d.entry, files, d.path)));
-      if (files.length === 0 && e.dataTransfer.files.length > 0) {
-        files.push(...Array.from(e.dataTransfer.files));
-      }
-      if (files.length > 0) await processFiles2(files);
+      if (directories.length === 0 && files.length === 0) return;
+      await prepare(async () => {
+        await Promise.all(directories.map((d) => traverseFileTree(d.entry, files, d.path)));
+        return files;
+      });
     },
-    [processFiles2]
+    [prepare]
   );
   const handleInputChange = useCallback(
     (e) => {