cyberia 3.2.5 → 3.2.12

package/src/api/file/file.service.js

@@ -6,7 +6,7 @@
  * @namespace FileServiceServer
  */
 
-import { DataBaseProvider } from '../../db/DataBaseProvider.js';
+import { DataBaseProviderService } from '../../db/DataBaseProvider.js';
 import { getBearerToken, jwtVerify } from '../../server/auth.js';
 import { loggerFactory } from '../../server/logger.js';
 import crypto from 'crypto';
@@ -27,7 +27,7 @@ const logger = loggerFactory(import.meta);
  * @namespace FileServiceServer.FileServiceDto
  * @memberof FileServiceServer
  */
-const FileServiceDto = {
+class FileServiceDto {
   /**
    * Returns file metadata only (no buffer data).
    * Used for list responses and API integration.
@@ -36,7 +36,7 @@ const FileServiceDto = {
    * @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,
@@ -48,7 +48,7 @@ const FileServiceDto = {
       createdAt: file.createdAt,
       updatedAt: file.updatedAt,
     };
-  },
+  };
 
   /**
    * Transforms array of files to metadata only.
@@ -57,10 +57,10 @@ const FileServiceDto = {
    * @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) => FileServiceDto.toMetadata(file));
-  },
+  };
 
   /**
    * Ensures UTF-8 encoding for filenames.
@@ -70,14 +70,14 @@ const FileServiceDto = {
    * @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;
-  },
+  };
 
   /**
    * Get select fields for metadata-only queries.
@@ -86,17 +86,17 @@ const FileServiceDto = {
    * @memberof FileServiceServer.FileServiceDto
    * @returns {string} Space-separated list of field names for metadata selection.
    */
-  metadataSelect: () => {
+  static metadataSelect = () => {
     return '_id name mimetype size encoding md5 cid createdAt updatedAt';
-  },
-};
+  };
+}
 
 /**
  * File Factory for file extraction, upload, and creation utilities.
  * @namespace FileServiceServer.FileFactory
  * @memberof FileServiceServer
  */
-const FileFactory = {
+class FileFactory {
   /**
    * Extract files from request.
    * Handles both standard 'file' field and custom fields.
@@ -105,7 +105,7 @@ const FileFactory = {
    * @param {Object} req - Express request object with files.
    * @returns {Array} Array of extracted file objects.
    */
-  filesExtract: (req) => {
+  static filesExtract = (req) => {
     const files = [];
     if (!req.files || Object.keys(req.files).length === 0) {
       return files;
@@ -139,7 +139,7 @@ const FileFactory = {
     }
 
     return files;
-  },
+  };
 
   /**
    * Upload files to database with UTF-8 encoding.
@@ -150,7 +150,7 @@ const FileFactory = {
    * @param {import('mongoose').Model} File - Mongoose File model.
    * @returns {Promise<Array>} Array of uploaded file metadata objects.
    */
-  upload: async function (req, File) {
+  static async upload(req, File) {
     const results = FileFactory.filesExtract(req);
     let index = -1;
 
@@ -172,7 +172,7 @@ const FileFactory = {
     }
 
     return results;
-  },
+  }
 
   /**
    * Convert string to hexadecimal.
@@ -181,9 +181,9 @@ const FileFactory = {
    * @param {string} [raw=''] - Raw string to convert.
    * @returns {string} Hexadecimal representation of the string.
    */
-  hex: (raw = '') => {
+  static hex = (raw = '') => {
     return Buffer.from(raw, 'utf8').toString('hex');
-  },
+  };
 
   /**
    * Get MIME type from file path based on extension.
@@ -192,7 +192,7 @@ const FileFactory = {
    * @param {string} path - File path or filename with extension.
    * @returns {string} MIME type string.
    */
-  getMymeTypeFromPath: (path) => {
+  static getMymeTypeFromPath = (path) => {
     const ext = String(path || '')
       .toLowerCase()
       .split('.')
@@ -210,7 +210,7 @@ const FileFactory = {
       json: 'application/json',
     };
     return mimeTypes[ext] || 'application/octet-stream';
-  },
+  };
 
   /**
    * Create file object with proper encoding.
@@ -220,7 +220,7 @@ const FileFactory = {
    * @param {string} [name=''] - File name.
    * @returns {Object} File object with name, data, size, encoding, mimetype, and md5.
    */
-  create: (data = Buffer.from([]), name = '') => {
+  static create = (data = Buffer.from([]), name = '') => {
     const normalizedName = FileServiceDto.normalizeFilename(name);
 
     return {
@@ -234,8 +234,8 @@ const FileFactory = {
       md5: crypto.createHash('md5').update(data).digest('hex'),
       cid: undefined,
     };
-  },
-};
+  };
+}
 
 /**
  * File cleanup utilities for preventing orphaned files.
@@ -244,7 +244,7 @@ const FileFactory = {
  * @namespace FileServiceServer.FileCleanup
  * @memberof FileServiceServer
  */
-const FileCleanup = {
+class FileCleanup {
   /**
    * Clean up old file references when document fields are updated.
    * Deletes old files that are being replaced by new file IDs.
@@ -258,7 +258,7 @@ const FileCleanup = {
    * @param {import('mongoose').Model} options.File - Mongoose File model.
    * @returns {Promise<Array>} Array of deleted file IDs.
    */
-  cleanupReplacedFiles: async ({ oldDoc, newData, fileFields, File }) => {
+  static cleanupReplacedFiles = async ({ oldDoc, newData, fileFields, File }) => {
     const deletedFileIds = [];
 
     for (const field of fileFields) {
@@ -266,7 +266,9 @@ const FileCleanup = {
       const newFileId = newData[field];
 
       // If field has old file and new data changes or removes it
-      if (oldFileId && newFileId !== undefined && String(oldFileId) !== String(newFileId)) {
+      // newFileId === null means client explicitly wants to remove the file
+      // newFileId === undefined means field was not included in request (no change)
+      if (oldFileId && newFileId !== undefined && (newFileId === null || String(oldFileId) !== String(newFileId))) {
         try {
           const file = await File.findOne({ _id: oldFileId });
           if (file) {
@@ -281,7 +283,7 @@ const FileCleanup = {
     }
 
     return deletedFileIds;
-  },
+  };
 
   /**
    * Delete all files referenced in a document.
@@ -297,7 +299,7 @@ const FileCleanup = {
    * @param {import('mongoose').Model} options.File - Mongoose File model.
    * @returns {Promise<Array>} Array of deleted file IDs.
    */
-  deleteDocumentFiles: async ({ doc, fileFields, File }) => {
+  static deleteDocumentFiles = async ({ doc, fileFields, File }) => {
     const deletedFileIds = [];
 
     for (const field of fileFields) {
@@ -318,15 +320,15 @@ const FileCleanup = {
     }
 
     return deletedFileIds;
-  },
-};
+  };
+}
 
 /**
  * File Service for handling REST API file operations.
  * @namespace FileServiceServer.FileService
  * @memberof FileServiceServer
  */
-const FileService = {
+class FileService {
   /**
    * POST - Upload files.
    * Returns metadata-only response (no buffer data).
@@ -338,18 +340,18 @@ const FileService = {
    * @param {Object} options - Request options containing host and path.
    * @returns {Promise<Array>} Array of uploaded file metadata objects.
    */
-  post: async (req, res, options) => {
+  static post = async (req, res, options) => {
     // Check that user is authenticated and not a guest
     if (!req.auth || !req.auth.user || req.auth.user.role === 'guest') {
       throw new Error('Authentication required. Guest users cannot upload files.');
     }
 
     /** @type {import('./file.model.js').FileModel} */
-    const File = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.File;
+    const File = DataBaseProviderService.getModel("File", options);
 
     const uploadedFiles = await FileFactory.upload(req, File);
     return FileServiceDto.toMetadataArray(uploadedFiles);
-  },
+  };
 
   /**
    * GET - Retrieve files.
@@ -365,13 +367,13 @@ const FileService = {
    * @returns {Promise<Array|Buffer>} Array of file metadata objects or Buffer for blob endpoint.
    * @throws {Error} If file not found or user not authorized.
    */
-  get: async (req, res, options) => {
+  static get = async (req, res, options) => {
     /** @type {import('./file.model.js').FileModel} */
-    const File = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.File;
+    const File = DataBaseProviderService.getModel("File", options);
     /** @type {import('../document/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').User} */
-    const User = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.User;
+    const User = DataBaseProviderService.getModel("User", options);
 
     const isFileAuthorized = async (fileId) => {
       try {
@@ -467,7 +469,7 @@ const FileService = {
         return FileServiceDto.toMetadataArray(files);
       }
     }
-  },
+  };
 
   /**
    * DELETE - Remove files.
@@ -480,9 +482,9 @@ const FileService = {
    * @returns {Promise<Object>} Deleted file metadata object.
    * @throws {Error} If file not found.
    */
-  delete: async (req, res, options) => {
+  static delete = async (req, res, options) => {
     /** @type {import('./file.model.js').FileModel} */
-    const File = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.File;
+    const File = DataBaseProviderService.getModel("File", options);
 
     const result = await File.findByIdAndDelete(req.params.id);
 
@@ -491,7 +493,7 @@ const FileService = {
     }
 
     return FileServiceDto.toMetadata(result);
-  },
-};
+  };
+}
 
 export { FileService, FileFactory, FileServiceDto, FileCleanup };

package/src/api/instance/instance.controller.js

@@ -3,8 +3,8 @@ import { InstanceService } from './instance.service.js';
 
 const logger = loggerFactory(import.meta);
 
-const InstanceController = {
-  post: async (req, res, options) => {
+class InstanceController {
+  static post = async (req, res, options) => {
     try {
       const result = await InstanceService.post(req, res, options);
       return res.status(200).json({
@@ -18,8 +18,8 @@ const InstanceController = {
         message: error.message,
       });
     }
-  },
-  get: async (req, res, options) => {
+  };
+  static get = async (req, res, options) => {
     try {
       const result = await InstanceService.get(req, res, options);
       return res.status(200).json({
@@ -33,8 +33,8 @@ const InstanceController = {
         message: error.message,
       });
     }
-  },
-  put: async (req, res, options) => {
+  };
+  static put = async (req, res, options) => {
     try {
       const result = await InstanceService.put(req, res, options);
       return res.status(200).json({
@@ -48,8 +48,8 @@ const InstanceController = {
         message: error.message,
       });
     }
-  },
-  delete: async (req, res, options) => {
+  };
+  static delete = async (req, res, options) => {
     try {
       const result = await InstanceService.delete(req, res, options);
       return res.status(200).json({
@@ -63,7 +63,7 @@ const InstanceController = {
         message: error.message,
       });
     }
-  },
-};
+  };
+}
 
 export { InstanceController };

package/src/api/instance/instance.model.js

@@ -1,7 +1,5 @@
 import { Schema, model, Types } from 'mongoose';
-
 // https://mongoosejs.com/docs/2.7.x/docs/schematypes.html
-
 const InstanceSchema = new Schema(
   {
     deployId: { type: String },
@@ -20,9 +18,8 @@ const InstanceSchema = new Schema(
     timestamps: true,
   },
 );
-
-const InstanceDto = {
-  populate: {
+class InstanceDto {
+  static populate = {
     get: () => {
       return {
         path: 'userId',
@@ -30,11 +27,8 @@ const InstanceDto = {
         select: '_id email',
       };
     },
-  },
-};
-
+  };
+}
 const InstanceModel = model('Instance', InstanceSchema);
-
 const ProviderSchema = InstanceSchema;
-
 export { InstanceSchema, InstanceModel, ProviderSchema, InstanceDto };

package/src/api/instance/instance.router.js

@@ -5,30 +5,35 @@ import express from 'express';
 
 const logger = loggerFactory(import.meta);
 
-const InstanceRouter = (options) => {
-  const router = express.Router();
-  const authMiddleware = options.authMiddleware;
-  router.post(`/:id`, authMiddleware, adminGuard, async (req, res) => await InstanceController.post(req, res, options));
-  router.post(`/`, authMiddleware, adminGuard, async (req, res) => await InstanceController.post(req, res, options));
-  router.get(`/:id`, authMiddleware, adminGuard, async (req, res) => await InstanceController.get(req, res, options));
-  router.get(`/`, authMiddleware, async (req, res) => await InstanceController.get(req, res, options));
-  router.put(`/:id`, authMiddleware, adminGuard, async (req, res) => await InstanceController.put(req, res, options));
-  router.put(`/`, authMiddleware, adminGuard, async (req, res) => await InstanceController.put(req, res, options));
-  router.delete(
-    `/:id`,
-    authMiddleware,
-    adminGuard,
-    async (req, res) => await InstanceController.delete(req, res, options),
-  );
-  router.delete(
-    `/`,
-    authMiddleware,
-    adminGuard,
-    async (req, res) => await InstanceController.delete(req, res, options),
-  );
-  return router;
-};
+class InstanceRouter {
+  /**
+   * @param {import('../types.js').RouterOptions} options
+   * @returns {import('express').Router}
+   */
+  static router(options) {
+    const router = express.Router();
+    router.post(`/:id`, options.authMiddleware, adminGuard, async (req, res) => await InstanceController.post(req, res, options));
+    router.post(`/`, options.authMiddleware, adminGuard, async (req, res) => await InstanceController.post(req, res, options));
+    router.get(`/:id`, options.authMiddleware, adminGuard, async (req, res) => await InstanceController.get(req, res, options));
+    router.get(`/`, options.authMiddleware, async (req, res) => await InstanceController.get(req, res, options));
+    router.put(`/:id`, options.authMiddleware, adminGuard, async (req, res) => await InstanceController.put(req, res, options));
+    router.put(`/`, options.authMiddleware, adminGuard, async (req, res) => await InstanceController.put(req, res, options));
+    router.delete(
+      `/:id`,
+      options.authMiddleware,
+      adminGuard,
+      async (req, res) => await InstanceController.delete(req, res, options),
+    );
+    router.delete(
+      `/`,
+      options.authMiddleware,
+      adminGuard,
+      async (req, res) => await InstanceController.delete(req, res, options),
+    );
+    return router;
+  }
+}
 
-const ApiRouter = InstanceRouter;
+const ApiRouter = (options) => InstanceRouter.router(options);
 
 export { ApiRouter, InstanceRouter };

package/src/api/instance/instance.service.js

@@ -1,22 +1,22 @@
-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';
 import { InstanceDto } from './instance.model.js';
 
 const logger = loggerFactory(import.meta);
 
-const InstanceService = {
-  post: async (req, res, options) => {
+class InstanceService {
+  static post = async (req, res, options) => {
     /** @type {import('./instance.model.js').InstanceModel} */
-    const Instance = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Instance;
+    const Instance = DataBaseProviderService.getModel("Instance", options);
     return await new Instance(req.body).save();
-  },
-  get: async (req, res, options) => {
+  };
+  static get = async (req, res, options) => {
     /** @type {import('./instance.model.js').InstanceModel} */
-    const Instance = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Instance;
+    const Instance = DataBaseProviderService.getModel("Instance", 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);
 
     const user = await User.findOne({
       _id: req.auth.user._id,
@@ -58,18 +58,18 @@ const InstanceService = {
             return { data: dataUser, total: totalUser, page, totalPages: Math.ceil(totalUser / limit) };
         }
     }
-  },
-  put: async (req, res, options) => {
+  };
+  static put = async (req, res, options) => {
     /** @type {import('./instance.model.js').InstanceModel} */
-    const Instance = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Instance;
+    const Instance = DataBaseProviderService.getModel("Instance", options);
     return await Instance.findByIdAndUpdate(req.params.id, req.body);
-  },
-  delete: async (req, res, options) => {
+  };
+  static delete = async (req, res, options) => {
     /** @type {import('./instance.model.js').InstanceModel} */
-    const Instance = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Instance;
+    const Instance = DataBaseProviderService.getModel("Instance", options);
     if (req.params.id) return await Instance.findByIdAndDelete(req.params.id);
     else return await Instance.deleteMany();
-  },
-};
+  };
+}
 
 export { InstanceService };

package/src/api/ipfs/ipfs.controller.js

@@ -3,8 +3,8 @@ import { IpfsService } from './ipfs.service.js';
 
 const logger = loggerFactory(import.meta);
 
-const IpfsController = {
-  post: async (req, res, options) => {
+class IpfsController {
+  static post = async (req, res, options) => {
     try {
       const result = await IpfsService.post(req, res, options);
       return res.status(200).json({
@@ -18,8 +18,8 @@ const IpfsController = {
         message: error.message,
       });
     }
-  },
-  get: async (req, res, options) => {
+  };
+  static get = async (req, res, options) => {
     try {
       const { page, limit } = req.query;
       const result = await IpfsService.get(
@@ -38,8 +38,8 @@ const IpfsController = {
         message: error.message,
       });
     }
-  },
-  put: async (req, res, options) => {
+  };
+  static put = async (req, res, options) => {
     try {
       const result = await IpfsService.put(req, res, options);
       return res.status(200).json({
@@ -53,8 +53,8 @@ const IpfsController = {
         message: error.message,
       });
     }
-  },
-  delete: async (req, res, options) => {
+  };
+  static delete = async (req, res, options) => {
     try {
       const result = await IpfsService.delete(req, res, options);
       return res.status(200).json({
@@ -68,8 +68,8 @@ const IpfsController = {
         message: error.message,
       });
     }
-  },
-  verify: async (req, res, options) => {
+  };
+  static verify = async (req, res, options) => {
     try {
       const result = await IpfsService.verify(req, res, options);
       return res.status(200).json({ status: 'success', data: result });
@@ -77,7 +77,7 @@ const IpfsController = {
       logger.error(error, error.stack);
       return res.status(400).json({ status: 'error', message: error.message });
     }
-  },
-};
+  };
+}
 
 export { IpfsController };

package/src/api/ipfs/ipfs.model.js

@@ -21,9 +21,7 @@
  * @module src/api/ipfs/ipfs.model.js
  * @namespace IpfsModel
  */
-
 import { Schema, model } from 'mongoose';
-
 const IpfsSchema = new Schema(
   {
     cid: {
@@ -50,22 +48,16 @@ const IpfsSchema = new Schema(
     timestamps: true,
   },
 );
-
 // One DB record per (CID, resourceType) pair.
 IpfsSchema.index({ cid: 1, resourceType: 1 }, { unique: true });
-
 // Fast look-ups for health-check and garbage-collection by type.
 IpfsSchema.index({ resourceType: 1 });
-
 // Fast look-ups for targeted MFS cleanup.
 IpfsSchema.index({ mfsPath: 1 });
-
 const IpfsModel = model('Ipfs', IpfsSchema);
-
 const ProviderSchema = IpfsSchema;
-
-const IpfsDto = {
-  select: {
+class IpfsDto {
+  static select = {
     get: () => ({
       _id: 1,
       cid: 1,
@@ -74,7 +66,6 @@ const IpfsDto = {
       createdAt: 1,
       updatedAt: 1,
     }),
-  },
-};
-
+  };
+}
 export { IpfsSchema, IpfsModel, ProviderSchema, IpfsDto };

package/src/api/ipfs/ipfs.router.js

@@ -5,22 +5,27 @@ import express from 'express';
 
 const logger = loggerFactory(import.meta);
 
-const IpfsRouter = (options) => {
-  const router = express.Router();
-  const authMiddleware = options.authMiddleware;
-  // Health / audit — must come before /:id to avoid matching conflicts.
-  router.get(`/verify`, authMiddleware, adminGuard, async (req, res) => await IpfsController.verify(req, res, options));
-  router.post(`/:id`, authMiddleware, adminGuard, async (req, res) => await IpfsController.post(req, res, options));
-  router.post(`/`, authMiddleware, adminGuard, async (req, res) => await IpfsController.post(req, res, options));
-  router.get(`/:id`, authMiddleware, adminGuard, async (req, res) => await IpfsController.get(req, res, options));
-  router.get(`/`, authMiddleware, adminGuard, async (req, res) => await IpfsController.get(req, res, options));
-  router.put(`/:id`, authMiddleware, adminGuard, async (req, res) => await IpfsController.put(req, res, options));
-  router.put(`/`, authMiddleware, adminGuard, async (req, res) => await IpfsController.put(req, res, options));
-  router.delete(`/:id`, authMiddleware, adminGuard, async (req, res) => await IpfsController.delete(req, res, options));
-  router.delete(`/`, authMiddleware, adminGuard, async (req, res) => await IpfsController.delete(req, res, options));
-  return router;
-};
+class IpfsRouter {
+  /**
+   * @param {import('../types.js').RouterOptions} options
+   * @returns {import('express').Router}
+   */
+  static router(options) {
+    const router = express.Router();
+    // Health / audit — must come before /:id to avoid matching conflicts.
+    router.get(`/verify`, options.authMiddleware, adminGuard, async (req, res) => await IpfsController.verify(req, res, options));
+    router.post(`/:id`, options.authMiddleware, adminGuard, async (req, res) => await IpfsController.post(req, res, options));
+    router.post(`/`, options.authMiddleware, adminGuard, async (req, res) => await IpfsController.post(req, res, options));
+    router.get(`/:id`, options.authMiddleware, adminGuard, async (req, res) => await IpfsController.get(req, res, options));
+    router.get(`/`, options.authMiddleware, adminGuard, async (req, res) => await IpfsController.get(req, res, options));
+    router.put(`/:id`, options.authMiddleware, adminGuard, async (req, res) => await IpfsController.put(req, res, options));
+    router.put(`/`, options.authMiddleware, adminGuard, async (req, res) => await IpfsController.put(req, res, options));
+    router.delete(`/:id`, options.authMiddleware, adminGuard, async (req, res) => await IpfsController.delete(req, res, options));
+    router.delete(`/`, options.authMiddleware, adminGuard, async (req, res) => await IpfsController.delete(req, res, options));
+    return router;
+  }
+}
 
-const ApiRouter = IpfsRouter;
+const ApiRouter = (options) => IpfsRouter.router(options);
 
 export { ApiRouter, IpfsRouter };