Merge pull request #126 from droppyjs/feat/storage-provider

markhughes · web-flow · commit 4688b666af65 · 2026-01-05T00:07:06.000+11:00
feat(storage): move storage to provider
diff --git a/packages/client/lib/client.js b/packages/client/lib/client.js
@@ -726,9 +726,9 @@ function uploadBlob(view, blob) {
 
 function upload(view, fd, files) {
     let rename = false;
-    if (view[0].currentData && Object.keys(view[0].currentData).length) {
+    if (view[0].currentData?.length) {
         let conflict = false;
-        const existingFiles = Object.keys(view[0].currentData);
+        const existingFiles = view[0].currentData.map((file) => file.name);
 
         for (const file of files) {
             if (existingFiles.includes(file)) {
@@ -1198,16 +1198,20 @@ function checkPathOverflow(view) {
 
 function getTemplateEntries(view, data) {
     const entries = [];
-    Object.keys(data).forEach((name) => {
-        const split = data[name].split("|");
-        const type = split[0];
-        const mtime = Number(split[1]) * 1e3;
-        const size = Number(split[2]);
+    data.forEach((file) => {
+        const type =
+            file.type === "file"
+                ? "f"
+                : file.type === "directory"
+                  ? "d"
+                  : file.type;
+        const mtime = Number(file.mtime) * 1e3;
+        const size = Number(file.size);
         // Preserve filenames exactly as received from the server (no Unicode normalization).
 
         const entry = {
-            name,
-            sortname: name.replace(/['"]/g, "_").toLowerCase(),
+            name: file.name,
+            sortname: file.name.replace(/['"]/g, "_").toLowerCase(),
             type,
             mtime,
             age: timeDifference(mtime),
@@ -1216,25 +1220,25 @@ function getTemplateEntries(view, data) {
             id:
                 (view[0].currentFolder === "/"
                     ? "/"
-                    : `${view[0].currentFolder}/`) + name,
-            sprite: getSpriteClass(fileExtension(name)),
+                    : `${view[0].currentFolder}/`) + file.name,
+            sprite: getSpriteClass(fileExtension(file.name)),
             classes: "",
         };
 
-        if (Object.keys(droppy.audioTypes).includes(fileExtension(name))) {
+        if (Object.keys(droppy.audioTypes).includes(fileExtension(file.name))) {
             entry.classes = "playable";
             entry.playable = true;
         } else if (
-            Object.keys(droppy.videoTypes).includes(fileExtension(name))
+            Object.keys(droppy.videoTypes).includes(fileExtension(file.name))
         ) {
             entry.classes = "viewable viewable-video";
             entry.viewableVideo = true;
         } else if (
-            Object.keys(droppy.imageTypes).includes(fileExtension(name))
+            Object.keys(droppy.imageTypes).includes(fileExtension(file.name))
         ) {
             entry.classes = "viewable viewable-image";
             entry.viewableImage = true;
-        } else if (fileExtension(name) === "pdf") {
+        } else if (fileExtension(file.name) === "pdf") {
             entry.classes = "viewable viewable-pdf";
             entry.viewablePdf = true;
         }
diff --git a/packages/server/src/commands/clipboard.ts b/packages/server/src/commands/clipboard.ts
@@ -1,10 +1,8 @@
-import fs from "node:fs";
 import escRe from "escape-string-regexp";
 
-import filetree from "../services/filetree/index.js";
 import log from "../services/log/index.js";
+import storage from "../services/storage/index.js";
 import { utils } from "../utils/index.js";
-
 import type { CommandHandler } from "./index.js";
 
 interface ClipboardMessage {
@@ -42,18 +40,21 @@ export const CLIPBOARD: CommandHandler<ClipboardMessage> = {
             return sendError(sid, vId, "Can't copy directory into itself");
         }
 
-        fs.stat(utils.addFilesPath(msg.data.dst), async (err, stats) => {
-            if ((!err && stats) || msg.data.src === msg.data.dst) {
-                utils.getNewPath(utils.addFilesPath(msg.data.dst), (newDst) => {
-                    filetree.clipboard(
-                        msg.data.src,
-                        utils.removeFilesPath(newDst),
-                        msg.data.type,
-                    );
-                });
-            } else {
-                filetree.clipboard(msg.data.src, msg.data.dst, msg.data.type);
-            }
-        });
+        const destinationExists = await storage.exists(
+            utils.addFilesPath(msg.data.dst),
+        );
+
+        let destination = msg.data.dst;
+        if (destinationExists || msg.data.src === msg.data.dst) {
+            destination = utils.removeFilesPath(
+                utils.addFilesPath(msg.data.dst),
+            );
+        }
+
+        if (msg.data.type === "cut") {
+            storage.move(msg.data.src, destination);
+        } else if (msg.data.type === "copy") {
+            storage.copy(msg.data.src, destination);
+        }
     },
 };
diff --git a/packages/server/src/commands/createFile.ts b/packages/server/src/commands/createFile.ts
@@ -1,5 +1,5 @@
-import filetree from "../services/filetree/index.js";
 import log from "../services/log/index.js";
+import storage from "../services/storage/index.js";
 
 import type { CommandHandler } from "./index.js";
 
@@ -25,7 +25,7 @@ export const CREATE_FILE: CommandHandler<CreateFileMessage> = {
         }
 
         try {
-            await filetree.mk(msg.data);
+            await storage.makeFile(msg.data);
         } catch (err) {
             log.error(ws, null, err);
             const error = err instanceof Error ? err : new Error(String(err));
diff --git a/packages/server/src/commands/createFiles.ts b/packages/server/src/commands/createFiles.ts
@@ -1,9 +1,8 @@
 import path from "node:path";
 
-import filetree from "../services/filetree/index.js";
 import log from "../services/log/index.js";
+import storage from "../services/storage/index.js";
 import { utils } from "../utils/index.js";
-
 import type { CommandHandler } from "./index.js";
 
 interface CreateFilesMessage {
@@ -31,8 +30,8 @@ export const CREATE_FILES: CommandHandler<CreateFilesMessage> = {
 
         for (const file of msg.data.files) {
             try {
-                await filetree.mkdir(utils.addFilesPath(path.dirname(file)));
-                await filetree.mk(utils.addFilesPath(file));
+                await storage.makekDir(utils.addFilesPath(path.dirname(file)));
+                await storage.makeFile(utils.addFilesPath(file));
             } catch (err) {
                 log.error(ws, null, err);
                 sendError(sid, vId, `Error creating file`);
diff --git a/packages/server/src/commands/createFolder.ts b/packages/server/src/commands/createFolder.ts
@@ -1,5 +1,5 @@
-import filetree from "../services/filetree/index.js";
 import log from "../services/log/index.js";
+import storage from "../services/storage/index.js";
 
 import type { CommandHandler } from "./index.js";
 
@@ -26,7 +26,7 @@ export const CREATE_FOLDER: CommandHandler<CreateFolderMessage> = {
         }
 
         try {
-            await filetree.mkdir(msg.data);
+            await storage.makekDir(msg.data);
         } catch (err) {
             log.error(ws, null, err);
             const error = err instanceof Error ? err : new Error(String(err));
diff --git a/packages/server/src/commands/createFolders.ts b/packages/server/src/commands/createFolders.ts
@@ -1,5 +1,5 @@
-import filetree from "../services/filetree/index.js";
 import log from "../services/log/index.js";
+import storage from "../services/storage/index.js";
 import { utils } from "../utils/index.js";
 import type { CommandHandler } from "./index.js";
 
@@ -30,7 +30,7 @@ export const CREATE_FOLDERS: CommandHandler<CreateFoldersMessage> = {
 
         for (const folder of msg.data.folders) {
             try {
-                await filetree.mkdir(utils.addFilesPath(folder));
+                await storage.makekDir(utils.addFilesPath(folder));
             } catch (err) {
                 log.error(ws, null, err);
                 sendError(sid, vId, `Error creating folder ${folder}`);
diff --git a/packages/server/src/commands/deleteFile.ts b/packages/server/src/commands/deleteFile.ts
@@ -1,5 +1,5 @@
-import filetree from "../services/filetree/index.js";
 import log from "../services/log/index.js";
+import storage from "../services/storage/index.js";
 
 import type { CommandHandler } from "./index.js";
 
@@ -42,7 +42,7 @@ export const DELETE_FILE: CommandHandler<DeleteFileMessage> = {
             log.info(ws, null, `Deleting: ${path}`);
 
             try {
-                await filetree.del(path);
+                await storage.delete(path);
             } catch (err) {
                 log.info(ws, null, `Error deleting file: ${path}`);
                 log.error(err);
diff --git a/packages/server/src/commands/getMedia.ts b/packages/server/src/commands/getMedia.ts
@@ -1,10 +1,9 @@
 import path from "node:path";
 import { imageSize } from "image-size";
 
-import filetree from "../services/filetree/index.js";
 import log from "../services/log/index.js";
+import storage from "../services/storage/index.js";
 import { utils } from "../utils/index.js";
-
 import type { CommandHandler } from "./index.js";
 
 interface GetMediaMessage {
@@ -35,18 +34,23 @@ export const GET_MEDIA: CommandHandler<GetMediaMessage> = {
         }
 
         const allExts = exts.img.concat(exts.vid).concat(exts.pdf);
-        const files = filetree.lsFilter(dir, utils.extensionRe(allExts));
-        if (!files) {
+        const files = (
+            await storage.listDir(dir, utils.extensionRe(allExts))
+        ).filter((entry) => entry.type === "file");
+        if (!files.length) {
             return sendError(sid, vId, "No displayable files in directory");
         }
 
         const mediaFiles = await Promise.all(
             files.map((file) => {
                 return new Promise((resolve) => {
-                    if (utils.extensionRe(exts.pdf).test(file)) {
-                        resolve({ pdf: true, src: file });
-                    } else if (utils.extensionRe(exts.img).test(file)) {
-                        const input = path.join(utils.addFilesPath(dir), file);
+                    if (utils.extensionRe(exts.pdf).test(file.name)) {
+                        resolve({ pdf: true, src: file.name });
+                    } else if (utils.extensionRe(exts.img).test(file.name)) {
+                        const input = path.join(
+                            utils.addFilesPath(dir),
+                            file.name,
+                        );
                         imageSize(input, (err, dims) => {
                             let width: number | undefined,
                                 height: number | undefined;
@@ -68,13 +72,13 @@ export const GET_MEDIA: CommandHandler<GetMediaMessage> = {
                             }
 
                             resolve({
-                                src: file,
+                                src: file.name,
                                 w: width ? width : 0,
                                 h: height ? height : 0,
                             });
                         });
                     } else {
-                        resolve({ video: true, src: file });
+                        resolve({ video: true, src: file.name });
                     }
                 });
             }),
diff --git a/packages/server/src/commands/reloadDirectory.ts b/packages/server/src/commands/reloadDirectory.ts
@@ -1,4 +1,4 @@
-import filetree from "../services/filetree/index.js";
+import storage from "../services/storage/index.js";
 
 import type { CommandHandler } from "./index.js";
 
@@ -15,7 +15,7 @@ export const RELOAD_DIRECTORY: CommandHandler<ReloadDirectoryMessage> = {
             return;
         }
 
-        await filetree.updateDir(msg.data.dir);
+        await storage.refreshDir(msg.data.dir);
 
         sendFiles(sid, vId);
     },
diff --git a/packages/server/src/commands/rename.ts b/packages/server/src/commands/rename.ts
@@ -1,7 +1,6 @@
-// @ts-nocheck
 import db from "../services/db/index.js";
-import filetree from "../services/filetree/index.js";
 import log from "../services/log/index.js";
+import storage from "../services/storage/index.js";
 
 import type { CommandHandler } from "./index.js";
 
@@ -43,13 +42,13 @@ export const RENAME: CommandHandler<RenameMessage> = {
         }
 
         try {
-            await filetree.move(rSrc, rDst);
+            await storage.move(rSrc, rDst);
         } catch (err) {
             log.error(ws, null, err);
             sendError(
                 sid,
                 vId,
-                `Error renaming ${rSrc} to ${rDst}: ${err.message}`,
+                `Error renaming ${rSrc} to ${rDst}: ${err instanceof Error ? err.message : String(err)}`,
             );
             return;
         }
@@ -61,6 +60,6 @@ export const RENAME: CommandHandler<RenameMessage> = {
             { location: rDst },
         );
 
-        log.info(ws, null, `Share link updated: ${link} -> ${rDst}`);
+        log.info(ws, null, `Share link updated: ${rSrc} -> ${rDst}`);
     },
 };
diff --git a/packages/server/src/commands/saveFile.ts b/packages/server/src/commands/saveFile.ts
@@ -1,6 +1,5 @@
-// @ts-nocheck
-import filetree from "../services/filetree/index.js";
 import log from "../services/log/index.js";
+import storage from "../services/storage/index.js";
 
 import type { CommandHandler } from "./index.js";
 
@@ -39,10 +38,14 @@ export const SAVE_FILE: CommandHandler<SaveFileMessage> = {
         log.info(ws, null, `Saving: ${msg.data.to}`);
 
         try {
-            await filetree.save(msg.data.to, msg.data.value);
+            await storage.saveFile(msg.data.to, msg.data.value);
         } catch (err) {
             sendObj(sid, { type: "SAVE_STATUS", vId, status: 1 });
-            sendError(sid, vId, `Error saving: ${err.message}`);
+            sendError(
+                sid,
+                vId,
+                `Error saving: ${err instanceof Error ? err.message : String(err)}`,
+            );
             log.error(err);
             return;
         }
diff --git a/packages/server/src/commands/search.ts b/packages/server/src/commands/search.ts
@@ -1,4 +1,4 @@
-import filetree from "../services/filetree/index.js";
+import storage from "../services/storage/index.js";
 
 import type { CommandHandler } from "./index.js";
 
@@ -22,7 +22,7 @@ export const SEARCH: CommandHandler<SearchMessage> = {
             type: "SEARCH_RESULTS",
             vId,
             folder: dir,
-            results: filetree.search(query, dir),
+            results: await storage.search(query, dir),
         });
     },
 };
diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts
@@ -4,11 +4,11 @@ export { default as cfg } from "./services/cfg/index.js";
 export { default as cookies } from "./services/cookies/index.js";
 export { default as csrf } from "./services/csrf/index.js";
 export { default as db } from "./services/db/index.js";
-export { default as filetree } from "./services/filetree/index.js";
 export { default as log } from "./services/log/index.js";
 export { default as manifest } from "./services/manifest/index.js";
 export { default as paths } from "./services/paths/index.js";
 export { default as resources } from "./services/resources/index.js";
+export { default as storage } from "./services/storage/index.js";
 export { default as svg } from "./services/svg/index.js";
 export { default as users } from "./services/users/index.js";
 
diff --git a/packages/server/src/services/db/index.ts b/packages/server/src/services/db/index.ts
@@ -1,4 +1,4 @@
-import { DbJson } from "./impl/db-json.js";
+import { DbJson } from "./provider/db-json.js";
 import type { DbHandler } from "./types.js";
 
 const db = new DbJson() as DbHandler;
diff --git a/packages/server/src/services/db/provider/db-json.ts b/packages/server/src/services/db/provider/db-json.ts
diff --git a/packages/server/src/services/filetree/index.ts b/packages/server/src/services/filetree/index.ts
diff --git a/packages/server/src/services/server/index.ts b/packages/server/src/services/server/index.ts
diff --git a/packages/server/src/services/storage/index.ts b/packages/server/src/services/storage/index.ts
diff --git a/packages/server/src/services/storage/provider/storage-filesystem.ts b/packages/server/src/services/storage/provider/storage-filesystem.ts
diff --git a/packages/server/src/services/storage/types.ts b/packages/server/src/services/storage/types.ts
