@kne/fastify-file-manager 3.0.3 → 3.0.6

package/index.js

@@ -23,9 +23,9 @@ module.exports = fp(
         createAuthenticate: () => {
           return [];
         },
-        // 文件夹能力依赖 @kne/fastify-group，需先注册；设为 false 可关闭
+        // 文件夹能力；插件内部自行注册 @kne/fastify-group，无需宿主再挂一份
         enableFolder: true,
-        groupName: 'group',
+        groupName: 'file-manager-folder',
         // 上传自动挂载文件系统时的默认业务域
         defaultFolderType: 'admin-file-system',
         getAuthenticate: () => {
@@ -35,6 +35,25 @@ module.exports = fp(
       options
     );
     await fs.ensureDir(options.root);
+
+    if (options.enableFolder !== false) {
+      const denyGroupHttp = () => [
+        async () => {
+          const err = new Error('Forbidden');
+          err.statusCode = 403;
+          throw err;
+        }
+      ];
+      await fastify.register(require('@kne/fastify-group'), {
+        name: options.groupName,
+        // 表名 = prefix + snakeCase(name + Model)，默认 t_ + file_manager_folder_tag
+        dbTableNamePrefix: options.groupDbTableNamePrefix || 't_',
+        // 仅使用 group 的 models/services；HTTP API 一律 403，业务走 folder/*
+        prefix: options.groupPrefix || `${options.prefix}/folder-group`,
+        getAuthenticate: denyGroupHttp
+      });
+    }
+
     fastify.register(require('@fastify/multipart'), options.multipart);
     fastify.register(require('@kne/fastify-namespace'), {
       name: 'fileManager',

package/libs/controllers/index.js

@@ -356,12 +356,13 @@ module.exports = fp(async (fastify, options) => {
       onRequest: folderOnRequest('read', 'query'),
       schema: {
         summary: '获取文件夹树',
-        description: '基于 fastify-group 获取指定 type 的文件树；未传 type 时使用 defaultFolderType',
+        description: '获取指定 type 的文件树；kind=folder 时仅返回文件夹节点；未传 type 时使用 defaultFolderType',
         query: {
           type: 'object',
           properties: {
             type: { type: 'string', description: '业务域类型，默认 admin-file-system' },
-            language: { type: 'string', description: '语言' }
+            language: { type: 'string', description: '语言' },
+            kind: { type: 'string', description: '传 folder 时仅返回文件夹树' }
           }
         }
       }
@@ -371,6 +372,46 @@ module.exports = fp(async (fastify, options) => {
     }
   );
 
+  fastify.post(
+    `${options.prefix}/folder/list`,
+    {
+      onRequest: folderOnRequest('read', 'body'),
+      schema: {
+        summary: '分页获取目录子节点',
+        description: '按 parentId 分页列出直接子节点；文件夹优先，再按名称排序；未传 type 时使用 defaultFolderType',
+        body: {
+          type: 'object',
+          properties: {
+            type: { type: 'string', description: '业务域类型，默认 admin-file-system' },
+            parentId: { type: 'string', description: '父文件夹 id，根目录可不传' },
+            currentPage: { type: 'number', description: '当前页数' },
+            perPage: { type: 'number', description: '每页数量' },
+            keyword: { type: 'string', description: '按名称模糊搜索' },
+            language: { type: 'string', description: '语言' }
+          }
+        }
+      }
+    },
+    async request => {
+      const { type, parentId, currentPage, perPage, keyword, language } = Object.assign(
+        {},
+        {
+          currentPage: 1,
+          perPage: 20
+        },
+        request.body
+      );
+      return await services.folder.getList({
+        type,
+        parentId,
+        currentPage,
+        perPage,
+        keyword,
+        language
+      });
+    }
+  );
+
   fastify.post(
     `${options.prefix}/folder/mkdir`,
     {

package/libs/services/folder.js

@@ -5,10 +5,10 @@ module.exports = fp(async (fastify, fastifyOptions) => {
     return;
   }
 
-  const groupName = fastifyOptions.groupName || 'group';
+  const groupName = fastifyOptions.groupName || 'file-manager-folder';
   const group = fastify[groupName];
   if (!group?.services) {
-    throw new Error(`文件夹功能需要先注册 @kne/fastify-group（fastify.${groupName}）`);
+    throw new Error(`文件夹功能未就绪：缺少内部 group 命名空间 fastify['${groupName}']`);
   }
 
   const { services } = fastify.fileManager;
@@ -47,6 +47,44 @@ module.exports = fp(async (fastify, fastifyOptions) => {
     return node ? (typeof node.get === 'function' ? node.get({ plain: true }) : node) : null;
   };
 
+  /** 重名时在扩展名前加 [_时间戳]，如 avatar.png → avatar[_1712345678901].png */
+  const withTimestampSuffix = name => {
+    const str = String(name || 'file');
+    const lastDot = str.lastIndexOf('.');
+    const hasExt = lastDot > 0 && lastDot < str.length - 1;
+    const base = hasExt ? str.slice(0, lastDot) : str;
+    const ext = hasExt ? str.slice(lastDot) : '';
+    return `${base}[_${Date.now()}]${ext}`;
+  };
+
+  const allocateUniqueSiblingName = async ({ type, parentId, name, language, tenantId, existingNames }) => {
+    const taken = async candidate => {
+      if (existingNames && existingNames.has(String(candidate))) {
+        return true;
+      }
+      const existing = await findChildByName({
+        type,
+        parentId: parentId || null,
+        name: candidate,
+        language,
+        tenantId
+      });
+      return !!existing;
+    };
+
+    let candidate = String(name || 'file');
+    if (!(await taken(candidate))) {
+      return candidate;
+    }
+    for (let i = 0; i < 5; i++) {
+      candidate = withTimestampSuffix(name);
+      if (!(await taken(candidate))) {
+        return candidate;
+      }
+    }
+    return withTimestampSuffix(`${name}_${Math.random().toString(36).slice(2, 8)}`);
+  };
+
   const assertUniqueSiblingName = async ({ type, parentId, name, language, tenantId, excludeId }) => {
     const existing = await findChildByName({ type, parentId: parentId || null, name, language, tenantId });
     if (existing && String(existing.id) !== String(excludeId || '')) {
@@ -71,13 +109,8 @@ module.exports = fp(async (fastify, fastifyOptions) => {
     return ids;
   };
 
-  const enrichTree = async tree => {
-    const fileIds = collectFileIds(tree);
-    if (fileIds.length === 0) {
-      return tree;
-    }
-
-    const uniqueIds = [...new Set(fileIds.map(String))];
+  const loadFileMap = async fileIds => {
+    const uniqueIds = [...new Set((fileIds || []).map(String).filter(Boolean))];
     const fileMap = new Map();
     await Promise.all(
       uniqueIds.map(async id => {
@@ -85,33 +118,44 @@ module.exports = fp(async (fastify, fastifyOptions) => {
           const file = await services.fileRecord.getFileInstance({ id });
           fileMap.set(String(id), file);
         } catch (e) {
-          // 文件记录缺失时仍返回树节点
+          // 文件记录缺失时仍返回节点
         }
       })
     );
+    return fileMap;
+  };
 
-    const mapNode = node => {
-      const plain = { ...node };
-      const kind = getNodeKind(plain);
-      plain.options = Object.assign({}, plain.options, { kind });
-      if (kind === 'file' && plain.options.fileId) {
-        const file = fileMap.get(String(plain.options.fileId));
-        if (file) {
-          plain.options = Object.assign({}, plain.options, {
-            size: file.size,
-            mimetype: file.mimetype,
-            filename: file.filename
-          });
-          if (file.createdAt) {
-            plain.createdAt = file.createdAt;
-          }
-          if (file.updatedAt) {
-            plain.updatedAt = file.updatedAt;
-          }
+  const applyFileMeta = (node, fileMap) => {
+    const plain = { ...node };
+    const kind = getNodeKind(plain);
+    plain.options = Object.assign({}, plain.options, { kind });
+    if (kind === 'file' && plain.options.fileId) {
+      const file = fileMap.get(String(plain.options.fileId));
+      if (file) {
+        plain.options = Object.assign({}, plain.options, {
+          size: file.size,
+          mimetype: file.mimetype,
+          filename: file.filename
+        });
+        if (file.createdAt) {
+          plain.createdAt = file.createdAt;
+        }
+        if (file.updatedAt) {
+          plain.updatedAt = file.updatedAt;
         }
       }
-      if (plain.children?.length) {
-        plain.children = plain.children.map(mapNode);
+    }
+    return plain;
+  };
+
+  const enrichTree = async tree => {
+    const fileIds = collectFileIds(tree);
+    const fileMap = fileIds.length === 0 ? new Map() : await loadFileMap(fileIds);
+
+    const mapNode = node => {
+      const plain = applyFileMeta(node, fileMap);
+      if (node.children?.length) {
+        plain.children = node.children.map(mapNode);
       }
       return plain;
     };
@@ -119,12 +163,75 @@ module.exports = fp(async (fastify, fastifyOptions) => {
     return (tree || []).map(mapNode);
   };
 
-  const getTree = async ({ type, language, tenantId }) => {
+  const enrichNodes = async nodes => {
+    const list = nodes || [];
+    const fileIds = list
+      .filter(node => getNodeKind(node) === 'file' && node.options?.fileId)
+      .map(node => node.options.fileId);
+    const fileMap = await loadFileMap(fileIds);
+    return list.map(node => applyFileMeta(node, fileMap));
+  };
+
+  const filterFoldersOnly = tree =>
+    (tree || [])
+      .filter(node => getNodeKind(node) === 'folder')
+      .map(node => {
+        const plain = { ...node };
+        plain.options = Object.assign({}, plain.options, { kind: 'folder' });
+        plain.children = filterFoldersOnly(node.children);
+        return plain;
+      });
+
+  const sortSiblingNodes = (left, right) => {
+    const leftIsFolder = getNodeKind(left) === 'folder' ? 0 : 1;
+    const rightIsFolder = getNodeKind(right) === 'folder' ? 0 : 1;
+    if (leftIsFolder !== rightIsFolder) {
+      return leftIsFolder - rightIsFolder;
+    }
+    return String(left.name || '').localeCompare(String(right.name || ''), undefined, {
+      numeric: true,
+      sensitivity: 'base'
+    });
+  };
+
+  const getTree = async ({ type, language, tenantId, kind }) => {
     if (!type) {
       throw new Error('必须传入类型');
     }
     const tree = await groupServices.groupList({ type, language, output: 'tree', tenantId });
-    return enrichTree(tree);
+    const enriched = await enrichTree(tree);
+    if (kind === 'folder' || kind === 'foldersOnly') {
+      return filterFoldersOnly(enriched);
+    }
+    return enriched;
+  };
+
+  const getList = async ({ type, parentId, currentPage = 1, perPage = 20, keyword, language, tenantId }) => {
+    if (!type) {
+      throw new Error('必须传入类型');
+    }
+    const { Op } = fastify.sequelize.Sequelize;
+    const page = Math.max(1, Number(currentPage) || 1);
+    const size = Math.min(200, Math.max(1, Number(perPage) || 20));
+    const where = Object.assign(
+      { type, parentId: parentId || null },
+      language ? { language } : {},
+      tenantId != null ? { tenantId } : {}
+    );
+    const trimmedKeyword = String(keyword || '').trim();
+    if (trimmedKeyword) {
+      where.name = { [Op.like]: `%${trimmedKeyword}%` };
+    }
+
+    const rows = await group.models.tag.findAll({ where });
+    const plainRows = rows
+      .map(item => (typeof item.get === 'function' ? item.get({ plain: true }) : item))
+      .sort(sortSiblingNodes);
+    const totalCount = plainRows.length;
+    const start = (page - 1) * size;
+    const pageRows = plainRows.slice(start, start + size);
+    const pageData = await enrichNodes(pageRows);
+    return { pageData, totalCount };
   };
 
   const mkdir = async ({ type, name, parentId, language, tenantId }) => {
@@ -155,7 +262,7 @@ module.exports = fp(async (fastify, fastifyOptions) => {
     }
 
     const targetParentId = parentId || null;
-    await assertUniqueSiblingName({
+    const uniqueName = await allocateUniqueSiblingName({
       type,
       parentId: targetParentId,
       name: file.filename,
@@ -164,7 +271,7 @@ module.exports = fp(async (fastify, fastifyOptions) => {
     });
 
     const record = await services.fileRecord.uploadToFileSystem({
-      file,
+      file: Object.assign({}, file, { filename: uniqueName }),
       namespace: namespace || fastifyOptions.namespace
     });
 
@@ -496,7 +603,7 @@ module.exports = fp(async (fastify, fastifyOptions) => {
       return null;
     }
 
-    await assertUniqueSiblingName({
+    const uniqueName = await allocateUniqueSiblingName({
       type,
       parentId: targetParentId,
       name: record.filename,
@@ -506,7 +613,7 @@ module.exports = fp(async (fastify, fastifyOptions) => {
 
     const tag = await groupServices.save({
       type,
-      name: record.filename,
+      name: uniqueName,
       parentId: targetParentId,
       language,
       tenantId,
@@ -570,12 +677,17 @@ module.exports = fp(async (fastify, fastifyOptions) => {
       if (existingFileIds.has(linkedFileId) || existingFileIds.has(String(record.id)) || existingFileIds.has(String(fileId))) {
         continue;
       }
-      if (existingNames.has(String(record.filename))) {
-        throw new Error(`同一文件夹下已存在同名文件或文件夹：${record.filename}`);
-      }
-      const tag = await groupServices.save({
+      const uniqueName = await allocateUniqueSiblingName({
         type,
+        parentId: targetParentId,
         name: record.filename,
+        language,
+        tenantId,
+        existingNames
+      });
+      const tag = await groupServices.save({
+        type,
+        name: uniqueName,
         parentId: targetParentId,
         language,
         tenantId,
@@ -588,7 +700,7 @@ module.exports = fp(async (fastify, fastifyOptions) => {
         }
       });
       existingFileIds.add(linkedFileId);
-      existingNames.add(String(record.filename));
+      existingNames.add(String(uniqueName));
       results.push(typeof tag.get === 'function' ? tag.get({ plain: true }) : tag);
     }
     return results;
@@ -597,6 +709,7 @@ module.exports = fp(async (fastify, fastifyOptions) => {
   Object.assign(services, {
     folder: {
       getTree,
+      getList,
       mkdir,
       upload,
       remove,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne/fastify-file-manager",
-  "version": "3.0.3",
+  "version": "3.0.6",
   "description": "用于管理静态文件上传查看等",
   "main": "index.js",
   "scripts": {
@@ -45,7 +45,6 @@
     "sqlite3": "^5.1.7"
   },
   "peerDependencies": {
-    "@kne/fastify-group": "*",
     "@kne/fastify-namespace": "*",
     "@kne/fastify-sequelize": "*",
     "fastify-plugin": ">=5"
@@ -53,7 +52,8 @@
   "dependencies": {
     "@fastify/multipart": "^9.0.3",
     "@fastify/static": "^8.1.1",
-    "compressing": "^2.0.0",
+    "@kne/fastify-group": "^0.2.5",
+    "compressing": "^2.1.1",
     "fs-extra": "^11.2.0",
     "glob": "^13.0.0",
     "http-errors": "^2.0.0",