s3kit 0.1.0 → 0.1.1

package/dist/react/index.d.cts

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { CSSProperties } from 'react';
-import { i as S3Entry } from '../types-g2IYvH3O.cjs';
+import { i as S3Entry } from '../types-B0yU5sod.cjs';
 
 interface FileManagerProps {
     /** API endpoint URL, e.g., "/api/s3" */

package/dist/react/index.d.ts

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { CSSProperties } from 'react';
-import { i as S3Entry } from '../types-g2IYvH3O.js';
+import { i as S3Entry } from '../types-B0yU5sod.js';
 
 interface FileManagerProps {
     /** API endpoint URL, e.g., "/api/s3" */

package/dist/react/index.js

@@ -96,11 +96,25 @@ var S3FileManagerClient = class {
   getPreviewUrl(options) {
     return fetchJson(this.f, this.endpoint("/preview"), options);
   }
+  getFolderLock(options) {
+    return fetchJson(this.f, this.endpoint("/folder/lock/get"), options);
+  }
+  getFileAttributes(options) {
+    return fetchJson(this.f, this.endpoint("/file/attributes/get"), options);
+  }
+  setFileAttributes(options) {
+    return fetchJson(this.f, this.endpoint("/file/attributes/set"), options);
+  }
   async uploadFiles(args) {
     const prepare = {
       items: args.files.map((f) => ({
         path: f.path,
-        contentType: f.contentType ?? f.file.type
+        contentType: f.contentType ?? f.file.type,
+        ...f.cacheControl !== void 0 ? { cacheControl: f.cacheControl } : {},
+        ...f.contentDisposition !== void 0 ? { contentDisposition: f.contentDisposition } : {},
+        ...f.metadata !== void 0 ? { metadata: f.metadata } : {},
+        ...f.expiresAt !== void 0 ? { expiresAt: f.expiresAt } : {},
+        ...f.ifNoneMatch !== void 0 ? { ifNoneMatch: f.ifNoneMatch } : {}
       })),
       ...args.expiresInSeconds !== void 0 ? { expiresInSeconds: args.expiresInSeconds } : {}
     };
@@ -601,10 +615,15 @@ function FileManager({
   const [hoverRow, setHoverRow] = useState2(null);
   const [previewData, setPreviewData] = useState2(null);
   const [previewDisplay, setPreviewDisplay] = useState2(null);
+  const [fileAttributes, setFileAttributes] = useState2(null);
+  const [attributesLoading, setAttributesLoading] = useState2(false);
+  const [attributesError, setAttributesError] = useState2(null);
   const [isPreviewClosing, setIsPreviewClosing] = useState2(false);
   const [sidebarWidth, setSidebarWidth] = useState2(320);
   const [isResizing, setIsResizing] = useState2(false);
   const [inlinePreviews, setInlinePreviews] = useState2({});
+  const [folderLocks, setFolderLocks] = useState2({});
+  const [pendingFolderMoves, setPendingFolderMoves] = useState2(/* @__PURE__ */ new Set());
   const [isSelectionMode, setIsSelectionMode] = useState2(false);
   const [searchQuery, setSearchQuery] = useState2("");
   const [sortBy, setSortBy] = useState2("name");
@@ -655,7 +674,111 @@ function FileManager({
   const longPressTimerRef = useRef(null);
   const suppressClickRef = useRef(false);
   const dragSelectionBaseRef = useRef(/* @__PURE__ */ new Set());
+  const requestFolderLock = useCallback(
+    (path2) => {
+      if (folderLocks[path2]) return;
+      setFolderLocks((prev) => ({ ...prev, [path2]: { status: "loading" } }));
+      const run = async () => {
+        try {
+          const out = await client.getFolderLock({ path: path2 });
+          const isActive = out?.expiresAt && new Date(out.expiresAt).getTime() > Date.now() ? true : false;
+          setFolderLocks((prev) => ({
+            ...prev,
+            [path2]: isActive && out ? { status: "locked", lock: out } : { status: "unlocked" }
+          }));
+        } catch {
+          setFolderLocks((prev) => ({ ...prev, [path2]: { status: "unlocked" } }));
+        }
+      };
+      void run();
+    },
+    [client, folderLocks]
+  );
+  const getFolderLockLabel = useCallback(
+    (entry) => {
+      if (entry.type !== "folder") return null;
+      if (entry.path === `${TRASH_PATH}/`) return null;
+      if (pendingFolderMoves.has(entry.path)) return "Renaming";
+      const lock = folderLocks[entry.path];
+      if (lock?.status === "locked") return "Locked";
+      return null;
+    },
+    [folderLocks, pendingFolderMoves]
+  );
+  const handleEntryHover = useCallback(
+    (entry) => {
+      setHoverRow(entry.path);
+      if (entry.type === "folder" && entry.path !== `${TRASH_PATH}/`) {
+        requestFolderLock(entry.path);
+      }
+    },
+    [requestFolderLock]
+  );
+  const resolveEntryEtag = useCallback(
+    (entry) => {
+      if (entry.type !== "file") return void 0;
+      if (fileAttributes?.path === entry.path && fileAttributes.etag) return fileAttributes.etag;
+      return entry.etag;
+    },
+    [fileAttributes]
+  );
+  const parseApiError = useCallback((err) => {
+    const fallback = err instanceof Error ? { code: void 0, message: err.message } : { code: void 0, message: "Request failed" };
+    if (!(err instanceof Error)) return fallback;
+    const raw = err.message;
+    if (!raw.trim().startsWith("{")) return fallback;
+    try {
+      const parsed = JSON.parse(raw);
+      if (parsed?.error) {
+        return { code: parsed.error.code, message: parsed.error.message ?? raw };
+      }
+    } catch {
+      return fallback;
+    }
+    return fallback;
+  }, []);
+  const isConflictError = useCallback(
+    (err) => {
+      const info = parseApiError(err);
+      if (info.code === "conflict") return true;
+      if (info.message && /conflict|already in progress/i.test(info.message)) return true;
+      return false;
+    },
+    [parseApiError]
+  );
+  const showConflictAlert = useCallback(() => {
+    window.alert("This item changed elsewhere. Refresh and try again.");
+  }, []);
+  const renderFolderLockBadge = useCallback(
+    (entry, variant) => {
+      const label = getFolderLockLabel(entry);
+      if (!label) return null;
+      const isPending = label === "Renaming";
+      const style2 = {
+        display: "inline-flex",
+        alignItems: "center",
+        fontSize: 10,
+        fontWeight: 600,
+        textTransform: "uppercase",
+        letterSpacing: "0.04em",
+        padding: "4px 6px",
+        borderRadius: 6,
+        border: `1px solid ${isPending ? theme.accent : theme.border}`,
+        backgroundColor: isPending ? theme.accent : theme.bgSecondary,
+        color: isPending ? theme.bg : theme.textSecondary
+      };
+      return /* @__PURE__ */ jsx5(
+        "div",
+        {
+          style: variant === "grid" ? { ...style2, position: "absolute", top: 10, right: 10 } : { ...style2, marginLeft: 8 },
+          children: label
+        }
+      );
+    },
+    [getFolderLockLabel, theme]
+  );
   const lastSelectionSigRef = useRef("");
+  const lastSelectedPathsRef = useRef(/* @__PURE__ */ new Set());
   const [dragSelect, setDragSelect] = useState2(null);
   const handleKeyDown = useCallback(
     (e) => {
@@ -921,6 +1044,9 @@ function FileManager({
       setPath("");
     }
   }, [hideTrash, view]);
+  useEffect2(() => {
+    lastSelectedPathsRef.current = /* @__PURE__ */ new Set();
+  }, [mode]);
   useEffect2(() => {
     const timeoutId = setTimeout(() => {
       performSearch(searchQuery);
@@ -937,7 +1063,16 @@ function FileManager({
     if (sig === lastSelectionSigRef.current) return;
     lastSelectionSigRef.current = sig;
     onSelectionChange?.(selectedEntries);
-  }, [entries, searchResults, selected, searchQuery, onSelectionChange]);
+    const nextSelectedPaths = new Set(selectedEntries.map((entry) => entry.path));
+    if (mode === "picker" && onFileSelect) {
+      selectedEntries.forEach((entry) => {
+        if (entry.type === "file" && !lastSelectedPathsRef.current.has(entry.path)) {
+          onFileSelect(entry);
+        }
+      });
+    }
+    lastSelectedPathsRef.current = nextSelectedPaths;
+  }, [entries, searchResults, selected, searchQuery, onSelectionChange, onFileSelect, mode]);
   useEffect2(() => {
     const source = searchQuery.trim() ? searchResults : entries;
     const selectedFiles = source.filter((entry) => selected.has(entry.path)).filter((entry) => entry.type === "file");
@@ -979,6 +1114,45 @@ function FileManager({
       setPreviewData(null);
     }
   }, [selected, lastSelected, client]);
+  useEffect2(() => {
+    if (selected.size !== 1) return;
+    const selectedPath = Array.from(selected)[0];
+    if (!selectedPath) return;
+    const source = searchQuery.trim() ? searchResults : entries;
+    const entry = source.find((item) => item.path === selectedPath);
+    if (entry?.type === "folder") {
+      requestFolderLock(entry.path);
+    }
+  }, [entries, requestFolderLock, searchQuery, searchResults, selected]);
+  useEffect2(() => {
+    const entry = previewData?.entry;
+    if (!entry || entry.type !== "file") {
+      setFileAttributes(null);
+      setAttributesError(null);
+      return;
+    }
+    let cancelled = false;
+    setAttributesLoading(true);
+    setAttributesError(null);
+    const run = async () => {
+      try {
+        const out = await client.getFileAttributes({ path: entry.path });
+        if (cancelled) return;
+        setFileAttributes(out);
+      } catch (e) {
+        if (cancelled) return;
+        const message = e instanceof Error ? e.message : "Failed to load attributes";
+        setAttributesError(message);
+        setFileAttributes(null);
+      } finally {
+        if (!cancelled) setAttributesLoading(false);
+      }
+    };
+    void run();
+    return () => {
+      cancelled = true;
+    };
+  }, [client, previewData?.entry]);
   useEffect2(() => {
     if (previewData) {
       setPreviewDisplay(previewData);
@@ -1119,6 +1293,7 @@ function FileManager({
     if (isRenaming) return;
     const target = renameTarget ?? lastSelected;
     if (!target) return;
+    const isFolder = target.type === "folder";
     const oldPath = target.path;
     const parent = getParentPath(oldPath);
     const existingNames = new Set(
@@ -1133,16 +1308,40 @@ function FileManager({
       return;
     }
     try {
+      if (isFolder) {
+        setPendingFolderMoves((prev) => {
+          const next = new Set(prev);
+          next.add(oldPath);
+          return next;
+        });
+      }
       setIsRenaming(true);
-      await client.move({ fromPath: oldPath, toPath: newPath });
+      const renameEtag = target.type === "file" ? resolveEntryEtag(target) : void 0;
+      await client.move({
+        fromPath: oldPath,
+        toPath: newPath,
+        ...renameEtag ? { ifMatch: renameEtag } : {}
+      });
       setRenameOpen(false);
       setRenameTarget(null);
       refresh();
     } catch (e) {
       console.error("Rename failed", e);
-      alert("Rename failed");
+      if (isConflictError(e)) {
+        showConflictAlert();
+      } else {
+        alert("Rename failed");
+      }
     } finally {
       setIsRenaming(false);
+      if (isFolder) {
+        setPendingFolderMoves((prev) => {
+          const next = new Set(prev);
+          next.delete(oldPath);
+          return next;
+        });
+        setFolderLocks((prev) => ({ ...prev, [oldPath]: { status: "unlocked" } }));
+      }
     }
   }
   async function deleteEntries(targets) {
@@ -1151,12 +1350,26 @@ function FileManager({
       for (const target of targets) {
         if (target.path.startsWith(TRASH_PATH)) continue;
         const dest = joinPath(TRASH_PATH, target.path);
-        await client.move({ fromPath: target.path, toPath: dest });
+        const moveEtag = target.type === "file" ? resolveEntryEtag(target) : void 0;
+        await client.move({
+          fromPath: target.path,
+          toPath: dest,
+          ...moveEtag ? { ifMatch: moveEtag } : {}
+        });
       }
     } else {
-      const files = targets.filter((e) => e.type === "file").map((e) => e.path);
+      const files = targets.filter((e) => e.type === "file");
       const folders = targets.filter((e) => e.type === "folder");
-      if (files.length > 0) await client.deleteFiles({ paths: files });
+      if (files.length > 0)
+        await client.deleteFiles({
+          items: files.map((file) => {
+            const deleteEtag = resolveEntryEtag(file);
+            return {
+              path: file.path,
+              ...deleteEtag ? { ifMatch: deleteEtag } : {}
+            };
+          })
+        });
       for (const folder of folders) {
         await client.deleteFolder({ path: folder.path, recursive: true });
       }
@@ -1174,7 +1387,11 @@ function FileManager({
       refresh();
     } catch (e) {
       console.error("Delete failed", e);
-      alert("Delete failed");
+      if (isConflictError(e)) {
+        showConflictAlert();
+      } else {
+        alert("Delete failed");
+      }
     } finally {
       setIsDeleting(false);
     }
@@ -1185,15 +1402,29 @@ function FileManager({
       if (!target.path.startsWith(TRASH_PATH)) continue;
       const originalPath = target.path.slice(TRASH_PATH.length + 1);
       if (!originalPath) continue;
-      await client.move({ fromPath: target.path, toPath: originalPath });
+      const restoreEtag = target.type === "file" ? resolveEntryEtag(target) : void 0;
+      await client.move({
+        fromPath: target.path,
+        toPath: originalPath,
+        ...restoreEtag ? { ifMatch: restoreEtag } : {}
+      });
     }
   }
   async function onRestore() {
     if (!can.restore) return;
     const source = searchQuery.trim() ? searchResults : entries;
     const targets = source.filter((e) => selected.has(e.path));
-    await restoreEntries(targets);
-    refresh();
+    try {
+      await restoreEntries(targets);
+      refresh();
+    } catch (e) {
+      console.error("Restore failed", e);
+      if (isConflictError(e)) {
+        showConflictAlert();
+      } else {
+        alert("Restore failed");
+      }
+    }
   }
   async function onEmptyTrash() {
     if (!can.restore) return;
@@ -1502,11 +1733,26 @@ function FileManager({
     const dest = window.prompt("Copy to folder path", path || "");
     if (!dest) return;
     const baseDest = dest.replace(/\/+$/, "");
-    for (const entry of entriesToCopy) {
-      if (entry.path.startsWith(TRASH_PATH)) continue;
-      const targetName = entry.name || entry.path.split("/").pop() || entry.path;
-      const toPath = entry.type === "folder" ? `${joinPath(baseDest, targetName)}/` : joinPath(baseDest, targetName);
-      await client.copy({ fromPath: entry.path, toPath });
+    try {
+      for (const entry of entriesToCopy) {
+        if (entry.path.startsWith(TRASH_PATH)) continue;
+        const targetName = entry.name || entry.path.split("/").pop() || entry.path;
+        const toPath = entry.type === "folder" ? `${joinPath(baseDest, targetName)}/` : joinPath(baseDest, targetName);
+        const copyEtag = entry.type === "file" ? resolveEntryEtag(entry) : void 0;
+        await client.copy({
+          fromPath: entry.path,
+          toPath,
+          ...copyEtag ? { ifMatch: copyEtag } : {}
+        });
+      }
+    } catch (e) {
+      console.error("Copy failed", e);
+      if (isConflictError(e)) {
+        showConflictAlert();
+      } else {
+        alert("Copy failed");
+      }
+      return;
     }
     refresh();
   }
@@ -1515,11 +1761,26 @@ function FileManager({
     const dest = window.prompt("Move to folder path", path || "");
     if (!dest) return;
     const baseDest = dest.replace(/\/+$/, "");
-    for (const entry of entriesToMove) {
-      if (entry.path.startsWith(TRASH_PATH)) continue;
-      const targetName = entry.name || entry.path.split("/").pop() || entry.path;
-      const toPath = entry.type === "folder" ? `${joinPath(baseDest, targetName)}/` : joinPath(baseDest, targetName);
-      await client.move({ fromPath: entry.path, toPath });
+    try {
+      for (const entry of entriesToMove) {
+        if (entry.path.startsWith(TRASH_PATH)) continue;
+        const targetName = entry.name || entry.path.split("/").pop() || entry.path;
+        const toPath = entry.type === "folder" ? `${joinPath(baseDest, targetName)}/` : joinPath(baseDest, targetName);
+        const moveEtag = entry.type === "file" ? resolveEntryEtag(entry) : void 0;
+        await client.move({
+          fromPath: entry.path,
+          toPath,
+          ...moveEtag ? { ifMatch: moveEtag } : {}
+        });
+      }
+    } catch (e) {
+      console.error("Move failed", e);
+      if (isConflictError(e)) {
+        showConflictAlert();
+      } else {
+        alert("Move failed");
+      }
+      return;
     }
     refresh();
   }
@@ -2310,7 +2571,7 @@ function FileManager({
                                       },
                                       onClick: (e) => handleEntryClickWithSelection(entry, index, filteredEntries, e),
                                       onDoubleClick: () => openEntry(entry),
-                                      onMouseEnter: () => setHoverRow(entry.path),
+                                      onMouseEnter: () => handleEntryHover(entry),
                                       onMouseLeave: () => setHoverRow(null),
                                       onTouchStart: () => {
                                         if (!isMobile) return;
@@ -2346,7 +2607,8 @@ function FileManager({
                                             },
                                             children: entryLabel
                                           }
-                                        )
+                                        ),
+                                        renderFolderLockBadge(entry, "grid")
                                       ]
                                     },
                                     entry.path
@@ -2376,7 +2638,7 @@ function FileManager({
                                       },
                                       onClick: (e) => handleEntryClickWithSelection(entry, index, filteredEntries, e),
                                       onDoubleClick: () => openEntry(entry),
-                                      onMouseEnter: () => setHoverRow(entry.path),
+                                      onMouseEnter: () => handleEntryHover(entry),
                                       onMouseLeave: () => setHoverRow(null),
                                       onTouchStart: () => {
                                         if (!isMobile) return;
@@ -2462,7 +2724,7 @@ function FileManager({
                                               e.stopPropagation();
                                             }
                                           },
-                                          onMouseEnter: () => setHoverRow(entry.path),
+                                          onMouseEnter: () => handleEntryHover(entry),
                                           onMouseLeave: () => setHoverRow(null),
                                           onTouchStart: () => {
                                             if (!isMobile) return;
@@ -2498,7 +2760,8 @@ function FileManager({
                                                 },
                                                 children: entryLabel
                                               }
-                                            )
+                                            ),
+                                            renderFolderLockBadge(entry, "grid")
                                           ]
                                         }
                                       ),
@@ -2739,7 +3002,7 @@ function FileManager({
                                   handleEntryClickWithSelection(entry, index, filteredEntries, e);
                                 },
                                 onDoubleClick: () => openEntry(entry),
-                                onMouseEnter: () => setHoverRow(entry.path),
+                                onMouseEnter: () => handleEntryHover(entry),
                                 onMouseLeave: () => setHoverRow(null),
                                 onTouchStart: () => {
                                   if (!isMobile) return;
@@ -2836,7 +3099,7 @@ function FileManager({
                                   handleEntryClickWithSelection(entry, index, filteredEntries, e);
                                 },
                                 onDoubleClick: () => openEntry(entry),
-                                onMouseEnter: () => setHoverRow(entry.path),
+                                onMouseEnter: () => handleEntryHover(entry),
                                 onMouseLeave: () => setHoverRow(null),
                                 onTouchStart: () => {
                                   if (!isMobile) return;
@@ -2919,7 +3182,8 @@ function FileManager({
                                                 }
                                                 return getFileIcon(entry.name);
                                               })(),
-                                              entryLabel
+                                              entryLabel,
+                                              renderFolderLockBadge(entry, "list")
                                             ]
                                           }
                                         ),
@@ -2994,7 +3258,7 @@ function FileManager({
                                       }
                                       e.stopPropagation();
                                     },
-                                    onMouseEnter: () => setHoverRow(entry.path),
+                                    onMouseEnter: () => handleEntryHover(entry),
                                     onMouseLeave: () => setHoverRow(null),
                                     onTouchStart: () => {
                                       if (!isMobile) return;
@@ -3077,7 +3341,8 @@ function FileManager({
                                                     }
                                                     return getFileIcon(entry.name);
                                                   })(),
-                                                  entryLabel
+                                                  entryLabel,
+                                                  renderFolderLockBadge(entry, "list")
                                                 ]
                                               }
                                             ),
@@ -3731,6 +3996,44 @@ function FileManager({
                         /* @__PURE__ */ jsx5("div", { className: FileManager_default.metaLabel, children: "Modified" }),
                         /* @__PURE__ */ jsx5("div", { className: FileManager_default.metaValue, children: previewDisplay.entry.type === "file" && previewDisplay.entry.lastModified ? new Date(previewDisplay.entry.lastModified).toLocaleString() : "--" })
                       ] }),
+                      attributesLoading && /* @__PURE__ */ jsxs2("div", { className: FileManager_default.metaItem, children: [
+                        /* @__PURE__ */ jsx5("div", { className: FileManager_default.metaLabel, children: "Attributes" }),
+                        /* @__PURE__ */ jsx5("div", { className: FileManager_default.metaValue, children: "Loading..." })
+                      ] }),
+                      attributesError && /* @__PURE__ */ jsxs2("div", { className: FileManager_default.metaItem, children: [
+                        /* @__PURE__ */ jsx5("div", { className: FileManager_default.metaLabel, children: "Attributes" }),
+                        /* @__PURE__ */ jsx5("div", { className: FileManager_default.metaValue, children: attributesError })
+                      ] }),
+                      !attributesLoading && !attributesError && previewDisplay.entry.type === "file" && /* @__PURE__ */ jsxs2(Fragment, { children: [
+                        /* @__PURE__ */ jsxs2("div", { className: FileManager_default.metaItem, children: [
+                          /* @__PURE__ */ jsx5("div", { className: FileManager_default.metaLabel, children: "Content Type" }),
+                          /* @__PURE__ */ jsx5("div", { className: FileManager_default.metaValue, children: fileAttributes?.contentType ?? "--" })
+                        ] }),
+                        /* @__PURE__ */ jsxs2("div", { className: FileManager_default.metaItem, children: [
+                          /* @__PURE__ */ jsx5("div", { className: FileManager_default.metaLabel, children: "Cache Control" }),
+                          /* @__PURE__ */ jsx5("div", { className: FileManager_default.metaValue, children: fileAttributes?.cacheControl ?? "--" })
+                        ] }),
+                        /* @__PURE__ */ jsxs2("div", { className: FileManager_default.metaItem, children: [
+                          /* @__PURE__ */ jsx5("div", { className: FileManager_default.metaLabel, children: "Disposition" }),
+                          /* @__PURE__ */ jsx5("div", { className: FileManager_default.metaValue, children: fileAttributes?.contentDisposition ?? "--" })
+                        ] }),
+                        /* @__PURE__ */ jsxs2("div", { className: FileManager_default.metaItem, children: [
+                          /* @__PURE__ */ jsx5("div", { className: FileManager_default.metaLabel, children: "ETag" }),
+                          /* @__PURE__ */ jsx5("div", { className: FileManager_default.metaValue, children: fileAttributes?.etag ?? previewDisplay.entry.etag ?? "--" })
+                        ] }),
+                        /* @__PURE__ */ jsxs2("div", { className: FileManager_default.metaItem, children: [
+                          /* @__PURE__ */ jsx5("div", { className: FileManager_default.metaLabel, children: "Expires" }),
+                          /* @__PURE__ */ jsx5("div", { className: FileManager_default.metaValue, children: fileAttributes?.expiresAt ? new Date(fileAttributes.expiresAt).toLocaleString() : "--" })
+                        ] }),
+                        /* @__PURE__ */ jsxs2("div", { className: FileManager_default.metaItem, children: [
+                          /* @__PURE__ */ jsx5("div", { className: FileManager_default.metaLabel, children: "Metadata" }),
+                          /* @__PURE__ */ jsx5("div", { className: FileManager_default.metaValue, children: fileAttributes?.metadata && Object.keys(fileAttributes.metadata).length > 0 ? /* @__PURE__ */ jsx5("div", { style: { display: "flex", flexDirection: "column", gap: 4 }, children: Object.entries(fileAttributes.metadata).map(([k, v]) => /* @__PURE__ */ jsxs2("div", { children: [
+                            k,
+                            ": ",
+                            v
+                          ] }, k)) }) : "--" })
+                        ] })
+                      ] }),
                       /* @__PURE__ */ jsx5(
                         "div",
                         {