cyberia 3.2.5 → 3.2.12

package/src/api/default/default.service.js

@@ -1,18 +1,18 @@
-import { DataBaseProvider } from '../../db/DataBaseProvider.js';
+import { DataBaseProviderService } from '../../db/DataBaseProvider.js';
 import { loggerFactory } from '../../server/logger.js';
 import { DataQuery } from '../../server/data-query.js';
 
 const logger = loggerFactory(import.meta);
 
-const DefaultService = {
-  post: async (req, res, options) => {
+class DefaultService {
+  static post = async (req, res, options) => {
     /** @type {import('./default.model.js').DefaultModel} */
-    const Default = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Default;
+    const Default = DataBaseProviderService.getModel("Default", options);
     return await new Default(req.body).save();
-  },
-  get: async (req, res, options) => {
+  };
+  static get = async (req, res, options) => {
     /** @type {import('./default.model.js').DefaultModel} */
-    const Default = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Default;
+    const Default = DataBaseProviderService.getModel("Default", options);
     if (req.params.id) return await Default.findById(req.params.id);
 
     // Parse query parameters using DataQuery helper
@@ -25,18 +25,18 @@ const DefaultService = {
 
     const totalPages = Math.ceil(total / limit);
     return { data, total, page, totalPages };
-  },
-  put: async (req, res, options) => {
+  };
+  static put = async (req, res, options) => {
     /** @type {import('./default.model.js').DefaultModel} */
-    const Default = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Default;
+    const Default = DataBaseProviderService.getModel("Default", options);
     return await Default.findByIdAndUpdate(req.params.id, req.body);
-  },
-  delete: async (req, res, options) => {
+  };
+  static delete = async (req, res, options) => {
     /** @type {import('./default.model.js').DefaultModel} */
-    const Default = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Default;
+    const Default = DataBaseProviderService.getModel("Default", options);
     if (req.params.id) return await Default.findByIdAndDelete(req.params.id);
     else return await Default.deleteMany();
-  },
-};
+  };
+}
 
 export { DefaultService };

package/src/api/document/document.controller.js

@@ -2,8 +2,8 @@ import { loggerFactory } from '../../server/logger.js';
 import { DocumentService } from './document.service.js';
 const logger = loggerFactory(import.meta);
 
-const DocumentController = {
-  post: async (req, res, options) => {
+class DocumentController {
+  static post = async (req, res, options) => {
     try {
       return res.status(200).json({
         status: 'success',
@@ -16,8 +16,8 @@ const DocumentController = {
         message: error.message,
       });
     }
-  },
-  get: async (req, res, options) => {
+  };
+  static get = async (req, res, options) => {
     try {
       return res.status(200).json({
         status: 'success',
@@ -30,8 +30,8 @@ const DocumentController = {
         message: error.message,
       });
     }
-  },
-  delete: async (req, res, options) => {
+  };
+  static delete = async (req, res, options) => {
     try {
       const result = await DocumentService.delete(req, res, options);
       return res.status(200).json({
@@ -45,8 +45,8 @@ const DocumentController = {
         message: error.message,
       });
     }
-  },
-  put: async (req, res, options) => {
+  };
+  static put = async (req, res, options) => {
     try {
       const result = await DocumentService.put(req, res, options);
       return res.status(200).json({
@@ -60,8 +60,8 @@ const DocumentController = {
         message: error.message,
       });
     }
-  },
-  patch: async (req, res, options) => {
+  };
+  static patch = async (req, res, options) => {
     try {
       const result = await DocumentService.patch(req, res, options);
       return res.status(200).json({
@@ -75,7 +75,7 @@ const DocumentController = {
         message: error.message,
       });
     }
-  },
-};
+  };
+}
 
 export { DocumentController };

package/src/api/document/document.model.js

@@ -1,7 +1,5 @@
 import { Schema, model, Types } from 'mongoose';
-
 // https://mongoosejs.com/docs/2.7.x/docs/schematypes.html
-
 const DocumentSchema = new Schema(
   {
     userId: {
@@ -35,13 +33,10 @@ const DocumentSchema = new Schema(
     timestamps: true,
   },
 );
-
 const DocumentModel = model('Document', DocumentSchema);
-
 const ProviderSchema = DocumentSchema;
-
-const DocumentDto = {
-  populate: {
+class DocumentDto {
+  static populate = {
     file: () => {
       return {
         path: 'fileId',
@@ -68,34 +63,33 @@ const DocumentDto = {
         },
       };
     },
-  },
-  getTotalCopyShareLinkCount: (document) => {
+  };
+  static getTotalCopyShareLinkCount = (document) => {
     if (!document.share || !document.share.copyShareLinkEvent) return 0;
     return document.share.copyShareLinkEvent.reduce((total, event) => total + (event.count || 0), 0);
-  },
+  };
   /**
    * Filter 'public' tag from tags array
    * The 'public' tag is internal and should not be rendered to users
    * @param {string[]} tags - Array of tags
    * @returns {string[]} - Filtered tags without 'public'
    */
-  filterPublicTag: (tags) => {
+  static filterPublicTag = (tags) => {
     if (!tags || !Array.isArray(tags)) return [];
     return tags.filter((tag) => tag !== 'public');
-  },
+  };
   /**
    * Extract isPublic boolean from tags array and return cleaned tags
    * @param {string[]} tags - Array of tags potentially containing 'public'
    * @returns {{ isPublic: boolean, tags: string[] }} - Object with isPublic flag and cleaned tags
    */
-  extractPublicFromTags: (tags) => {
+  static extractPublicFromTags = (tags) => {
     if (!tags || !Array.isArray(tags)) {
       return { isPublic: false, tags: [] };
     }
     const hasPublicTag = tags.includes('public');
     const cleanedTags = tags.filter((tag) => tag !== 'public');
     return { isPublic: hasPublicTag, tags: cleanedTags };
-  },
-};
-
+  };
+}
 export { DocumentSchema, DocumentModel, ProviderSchema, DocumentDto };

package/src/api/document/document.router.js

@@ -1,31 +1,36 @@
 import { loggerFactory } from '../../server/logger.js';
 import { DocumentController } from './document.controller.js';
 import express from 'express';
-import fs from 'fs-extra';
+
 const logger = loggerFactory(import.meta);
 
-const DocumentRouter = (options) => {
-  const router = express.Router();
-  const authMiddleware = options.authMiddleware;
-  router.post(`/:id`, authMiddleware, async (req, res) => await DocumentController.post(req, res, options));
-  router.post(`/`, authMiddleware, async (req, res) => await DocumentController.post(req, res, options));
-  router.get(`/public/high`, async (req, res) => await DocumentController.get(req, res, options));
-  router.get(`/public`, async (req, res) => await DocumentController.get(req, res, options));
-  router.get(`/:id`, authMiddleware, async (req, res) => await DocumentController.get(req, res, options));
-  router.get(`/`, authMiddleware, async (req, res) => await DocumentController.get(req, res, options));
-  router.put(`/:id`, authMiddleware, async (req, res) => await DocumentController.put(req, res, options));
-  router.put(`/`, authMiddleware, async (req, res) => await DocumentController.put(req, res, options));
-  router.patch(`/:id/copy-share-link`, async (req, res) => await DocumentController.patch(req, res, options));
-  router.patch(
-    `/:id/toggle-public`,
-    authMiddleware,
-    async (req, res) => await DocumentController.patch(req, res, options),
-  );
-  router.delete(`/:id`, authMiddleware, async (req, res) => await DocumentController.delete(req, res, options));
-  router.delete(`/`, authMiddleware, async (req, res) => await DocumentController.delete(req, res, options));
-  return router;
-};
+class DocumentRouter {
+  /**
+   * @param {import('../types.js').RouterOptions} options
+   * @returns {import('express').Router}
+   */
+  static router(options) {
+    const router = express.Router();
+    router.post(`/:id`, options.authMiddleware, async (req, res) => await DocumentController.post(req, res, options));
+    router.post(`/`, options.authMiddleware, async (req, res) => await DocumentController.post(req, res, options));
+    router.get(`/public/high`, async (req, res) => await DocumentController.get(req, res, options));
+    router.get(`/public`, async (req, res) => await DocumentController.get(req, res, options));
+    router.get(`/:id`, options.authMiddleware, async (req, res) => await DocumentController.get(req, res, options));
+    router.get(`/`, options.authMiddleware, async (req, res) => await DocumentController.get(req, res, options));
+    router.put(`/:id`, options.authMiddleware, async (req, res) => await DocumentController.put(req, res, options));
+    router.put(`/`, options.authMiddleware, async (req, res) => await DocumentController.put(req, res, options));
+    router.patch(`/:id/copy-share-link`, async (req, res) => await DocumentController.patch(req, res, options));
+    router.patch(
+      `/:id/toggle-public`,
+      options.authMiddleware,
+      async (req, res) => await DocumentController.patch(req, res, options),
+    );
+    router.delete(`/:id`, options.authMiddleware, async (req, res) => await DocumentController.delete(req, res, options));
+    router.delete(`/`, options.authMiddleware, async (req, res) => await DocumentController.delete(req, res, options));
+    return router;
+  }
+}
 
-const ApiRouter = DocumentRouter;
+const ApiRouter = (options) => DocumentRouter.router(options);
 
 export { ApiRouter, DocumentRouter };

package/src/api/document/document.service.js

@@ -1,5 +1,14 @@
+/**
+ * Document service module for handling document CRUD operations.
+ * Provides REST API handlers for document management with security-aware
+ * public/private document access control, search, and file cleanup integration.
+ *
+ * @module src/api/document/document.service.js
+ * @namespace DocumentService
+ */
+
 import { loggerFactory } from '../../server/logger.js';
-import { DataBaseProvider } from '../../db/DataBaseProvider.js';
+import { DataBaseProviderService } from '../../db/DataBaseProvider.js';
 import { DocumentDto } from './document.model.js';
 import { uniqueArray } from '../../client/components/core/CommonJs.js';
 import { getBearerToken, verifyJWT } from '../../server/auth.js';
@@ -8,10 +17,26 @@ import { FileCleanup } from '../file/file.service.js';
 
 const logger = loggerFactory(import.meta);
 
-const DocumentService = {
-  post: async (req, res, options) => {
+/**
+ * Document Service for handling REST API document operations.
+ * Implements a security model for public/private document access control
+ * with support for high-query typeahead search, tag filtering, and pagination.
+ * @namespace DocumentService
+ */
+class DocumentService {
+  /**
+   * POST - Create a new document.
+   * @async
+   * @function post
+   * @memberof DocumentService
+   * @param {Object} req - Express request object.
+   * @param {Object} res - Express response object.
+   * @param {Object} options - Request options containing host and path.
+   * @returns {Promise<Object>} Created document object.
+   */
+  static post = async (req, res, options) => {
     /** @type {import('./document.model.js').DocumentModel} */
-    const Document = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Document;
+    const Document = DataBaseProviderService.getModel("Document", options);
 
     switch (req.params.id) {
       default:
@@ -25,14 +50,28 @@ const DocumentService = {
 
         return await new Document(req.body).save();
     }
-  },
-  get: async (req, res, options) => {
+  };
+
+  /**
+   * GET - Retrieve documents.
+   * Supports public high-query search, public tag-filtered listing,
+   * and authenticated user document retrieval with pagination.
+   * @async
+   * @function get
+   * @memberof DocumentService
+   * @param {Object} req - Express request object.
+   * @param {Object} res - Express response object.
+   * @param {Object} options - Request options containing host and path.
+   * @returns {Promise<Object>} Document data with optional pagination metadata.
+   * @throws {Error} If search query is invalid or document not found.
+   */
+  static get = async (req, res, options) => {
     /** @type {import('./document.model.js').DocumentModel} */
-    const Document = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Document;
+    const Document = DataBaseProviderService.getModel("Document", options);
     /** @type {import('../user/user.model.js').UserModel} */
-    const User = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.User;
+    const User = DataBaseProviderService.getModel("User", options);
     /** @type {import('../file/file.model.js').FileModel} */
-    const File = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.File;
+    const File = DataBaseProviderService.getModel("File", options);
 
     // High-query endpoint for typeahead search
     //
@@ -436,12 +475,24 @@ const DocumentService = {
         };
       }
     }
-  },
-  delete: async (req, res, options) => {
+  };
+
+  /**
+   * DELETE - Remove a document and its associated files.
+   * @async
+   * @function delete
+   * @memberof DocumentService
+   * @param {Object} req - Express request object.
+   * @param {Object} res - Express response object.
+   * @param {Object} options - Request options containing host and path.
+   * @returns {Promise<Object>} Deleted document object.
+   * @throws {Error} If document not found or user not authorized.
+   */
+  static delete = async (req, res, options) => {
     /** @type {import('./document.model.js').DocumentModel} */
-    const Document = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Document;
+    const Document = DataBaseProviderService.getModel("Document", options);
     /** @type {import('../file/file.model.js').FileModel} */
-    const File = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.File;
+    const File = DataBaseProviderService.getModel("File", options);
 
     switch (req.params.id) {
       default: {
@@ -460,12 +511,25 @@ const DocumentService = {
         return await Document.findByIdAndDelete(req.params.id);
       }
     }
-  },
-  put: async (req, res, options) => {
+  };
+
+  /**
+   * PUT - Update a document.
+   * Cleans up replaced files and handles tag-based isPublic extraction.
+   * @async
+   * @function put
+   * @memberof DocumentService
+   * @param {Object} req - Express request object.
+   * @param {Object} res - Express response object.
+   * @param {Object} options - Request options containing host and path.
+   * @returns {Promise<Object>} Updated document object.
+   * @throws {Error} If document not found.
+   */
+  static put = async (req, res, options) => {
     /** @type {import('./document.model.js').DocumentModel} */
-    const Document = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Document;
+    const Document = DataBaseProviderService.getModel("Document", options);
     /** @type {import('../file/file.model.js').FileModel} */
-    const File = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.File;
+    const File = DataBaseProviderService.getModel("File", options);
 
     switch (req.params.id) {
       default: {
@@ -500,10 +564,23 @@ const DocumentService = {
         return await Document.findByIdAndUpdate(req.params.id, req.body, { returnDocument: 'after' });
       }
     }
-  },
-  patch: async (req, res, options) => {
+  };
+
+  /**
+   * PATCH - Partially update a document.
+   * Supports toggle-public and copy-share-link operations.
+   * @async
+   * @function patch
+   * @memberof DocumentService
+   * @param {Object} req - Express request object.
+   * @param {Object} res - Express response object.
+   * @param {Object} options - Request options containing host and path.
+   * @returns {Promise<Object>} Updated document or result object.
+   * @throws {Error} If document not found or invalid patch endpoint.
+   */
+  static patch = async (req, res, options) => {
     /** @type {import('./document.model.js').DocumentModel} */
-    const Document = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Document;
+    const Document = DataBaseProviderService.getModel("Document", options);
 
     if (req.path.includes('/toggle-public')) {
       const document = await Document.findById(req.params.id);
@@ -550,7 +627,7 @@ const DocumentService = {
     }
 
     throw new Error('Invalid patch endpoint');
-  },
-};
+  };
+}
 
-export { DocumentService };
+export { DocumentService };

package/src/api/file/file.controller.js

@@ -2,8 +2,8 @@ import { loggerFactory } from '../../server/logger.js';
 import { FileService } from './file.service.js';
 const logger = loggerFactory(import.meta);
 
-const FileController = {
-  post: async (req, res, options) => {
+class FileController {
+  static post = async (req, res, options) => {
     try {
       return res.status(200).json({
         status: 'success',
@@ -16,8 +16,8 @@ const FileController = {
         message: error.message,
       });
     }
-  },
-  get: async (req, res, options) => {
+  };
+  static get = async (req, res, options) => {
     try {
       if (req && req.headers && req.headers.origin) {
         res.set('Access-Control-Allow-Origin', req.headers.origin);
@@ -38,8 +38,8 @@ const FileController = {
         message: error.message,
       });
     }
-  },
-  delete: async (req, res, options) => {
+  };
+  static delete = async (req, res, options) => {
     try {
       const result = await FileService.delete(req, res, options);
       return res.status(200).json({
@@ -53,7 +53,7 @@ const FileController = {
         message: error.message,
       });
     }
-  },
-};
+  };
+}
 
 export { FileController };

package/src/api/file/file.model.js

@@ -47,7 +47,7 @@ const ProviderSchema = FileSchema;
  * @namespace FileModelServer.FileModelDto
  * @memberof FileModelServer
  */
-const FileModelDto = {
+class FileModelDto {
   /**
    * Returns file metadata only (no buffer data).
    * Used for list responses and API integration.
@@ -56,7 +56,7 @@ const FileModelDto = {
    * @param {Object} file - File document from database.
    * @returns {Object|null} File metadata object, or null if file is falsy.
    */
-  toMetadata: (file) => {
+  static toMetadata = (file) => {
     if (!file) return null;
     return {
       _id: file._id,
@@ -68,7 +68,7 @@ const FileModelDto = {
       createdAt: file.createdAt,
       updatedAt: file.updatedAt,
     };
-  },
+  };
 
   /**
    * Returns file with complete data.
@@ -78,7 +78,7 @@ const FileModelDto = {
    * @param {Object} file - File document from database.
    * @returns {Object|null} Complete file object with buffer data, or null if file is falsy.
    */
-  toFull: (file) => {
+  static toFull = (file) => {
     if (!file) return null;
     return {
       _id: file._id,
@@ -92,7 +92,7 @@ const FileModelDto = {
       createdAt: file.createdAt,
       updatedAt: file.updatedAt,
     };
-  },
+  };
 
   /**
    * Transforms array of files to metadata only.
@@ -101,10 +101,10 @@ const FileModelDto = {
    * @param {Array} files - Array of file documents.
    * @returns {Array} Array of file metadata objects.
    */
-  toMetadataArray: (files) => {
+  static toMetadataArray = (files) => {
     if (!Array.isArray(files)) return [];
     return files.map((file) => FileModelDto.toMetadata(file));
-  },
+  };
 
   /**
    * Ensures UTF-8 encoding for filenames.
@@ -114,14 +114,14 @@ const FileModelDto = {
    * @param {string} filename - Raw filename from upload.
    * @returns {string} UTF-8 encoded filename.
    */
-  normalizeFilename: (filename) => {
+  static normalizeFilename = (filename) => {
     if (!filename) return '';
     // Ensure string and normalize to UTF-8
     let normalized = String(filename);
     // Replace any incorrectly encoded sequences
     normalized = Buffer.from(normalized, 'utf8').toString('utf8');
     return normalized;
-  },
-};
+  };
+}
 
 export { FileSchema, FileModel, ProviderSchema, FileModelDto };

package/src/api/file/file.router.js

@@ -2,21 +2,27 @@ import { adminGuard } from '../../server/auth.js';
 import { loggerFactory } from '../../server/logger.js';
 import { FileController } from './file.controller.js';
 import express from 'express';
+
 const logger = loggerFactory(import.meta);
 
-const FileRouter = (options) => {
-  const router = express.Router();
-  const authMiddleware = options.authMiddleware;
-  router.post(`/:id`, authMiddleware, async (req, res) => await FileController.post(req, res, options));
-  router.post(`/`, authMiddleware, async (req, res) => await FileController.post(req, res, options));
-  router.get(`/blob/:id`, async (req, res) => await FileController.get(req, res, options));
-  router.get(`/:id`, async (req, res) => await FileController.get(req, res, options));
-  router.get(`/`, async (req, res) => await FileController.get(req, res, options));
-  router.delete(`/:id`, authMiddleware, adminGuard, async (req, res) => await FileController.delete(req, res, options));
-  router.delete(`/`, authMiddleware, adminGuard, async (req, res) => await FileController.delete(req, res, options));
-  return router;
-};
+class FileRouter {
+  /**
+   * @param {import('../types.js').RouterOptions} options
+   * @returns {import('express').Router}
+   */
+  static router(options) {
+    const router = express.Router();
+    router.post(`/:id`, options.authMiddleware, async (req, res) => await FileController.post(req, res, options));
+    router.post(`/`, options.authMiddleware, async (req, res) => await FileController.post(req, res, options));
+    router.get(`/blob/:id`, async (req, res) => await FileController.get(req, res, options));
+    router.get(`/:id`, async (req, res) => await FileController.get(req, res, options));
+    router.get(`/`, async (req, res) => await FileController.get(req, res, options));
+    router.delete(`/:id`, options.authMiddleware, adminGuard, async (req, res) => await FileController.delete(req, res, options));
+    router.delete(`/`, options.authMiddleware, adminGuard, async (req, res) => await FileController.delete(req, res, options));
+    return router;
+  }
+}
 
-const ApiRouter = FileRouter;
+const ApiRouter = (options) => FileRouter.router(options);
 
 export { ApiRouter, FileRouter };