cyberia 3.2.5 → 3.2.12

package/src/api/ipfs/ipfs.service.js

@@ -1,11 +1,9 @@
-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 { IpfsClient } from '../../server/ipfs-client.js';
 import { IpfsDto } from './ipfs.model.js';
-
 const logger = loggerFactory(import.meta);
-
 /**
  * Upsert a CID registry entry.
  * Called by asset services (ObjectLayer, AtlasSpriteSheet) after a successful
@@ -19,7 +17,7 @@ const logger = loggerFactory(import.meta);
  * @returns {Promise<import('mongoose').Document>}
  */
 const createPinRecord = async ({ cid, resourceType, mfsPath = '', options }) => {
-  const Ipfs = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Ipfs;
+  const Ipfs = DataBaseProviderService.getModel("Ipfs", options);
   const record = await Ipfs.findOneAndUpdate(
     { cid, resourceType },
     { cid, resourceType, mfsPath },
@@ -28,7 +26,6 @@ const createPinRecord = async ({ cid, resourceType, mfsPath = '', options }) =>
   logger.info(`IPFS registry upserted – CID: ${cid}, type: ${resourceType}, mfsPath: ${mfsPath}`);
   return record;
 };
-
 /**
  * Remove all DB registry entries for a CID, then best-effort unpin from the IPFS node.
  * Always deletes DB records first so the registry stays clean even if the node is down.
@@ -38,7 +35,7 @@ const createPinRecord = async ({ cid, resourceType, mfsPath = '', options }) =>
  * @returns {Promise<void>}
  */
 const removePinRecordsAndUnpin = async (cid, options) => {
-  const Ipfs = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Ipfs;
+  const Ipfs = DataBaseProviderService.getModel("Ipfs", options);
   await Ipfs.deleteMany({ cid });
   logger.info(`Removed IPFS registry entries for CID: ${cid}`);
   try {
@@ -47,23 +44,19 @@ const removePinRecordsAndUnpin = async (cid, options) => {
     logger.warn(`Best-effort IPFS unpin failed for CID ${cid}: ${err.message}`);
   }
 };
-
-const IpfsService = {
+class IpfsService {
   /** Expose helpers so other modules can import them directly. */
-  createPinRecord,
-  removePinRecordsAndUnpin,
-
+  static createPinRecord = createPinRecord;
+  static removePinRecordsAndUnpin = removePinRecordsAndUnpin;
   // ──────────────────────────────────────────────
   //  Standard CRUD
   // ──────────────────────────────────────────────
-
-  post: async (req, res, options) => {
-    const Ipfs = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Ipfs;
+  static post = async (req, res, options) => {
+    const Ipfs = DataBaseProviderService.getModel("Ipfs", options);
     return await new Ipfs(req.body).save();
-  },
-
-  get: async (req, res, options) => {
-    const Ipfs = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Ipfs;
+  };
+  static get = async (req, res, options) => {
+    const Ipfs = DataBaseProviderService.getModel("Ipfs", options);
     if (req.params.id) {
       return await Ipfs.findById(req.params.id).select(IpfsDto.select.get());
     }
@@ -74,15 +67,13 @@ const IpfsService = {
     ]);
     const totalPages = Math.ceil(total / limit);
     return { data, total, page, totalPages };
-  },
-
-  put: async (req, res, options) => {
-    const Ipfs = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Ipfs;
+  };
+  static put = async (req, res, options) => {
+    const Ipfs = DataBaseProviderService.getModel("Ipfs", options);
     return await Ipfs.findByIdAndUpdate(req.params.id, req.body, { returnDocument: 'after' });
-  },
-
-  delete: async (req, res, options) => {
-    const Ipfs = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Ipfs;
+  };
+  static delete = async (req, res, options) => {
+    const Ipfs = DataBaseProviderService.getModel("Ipfs", options);
     if (req.params.id) {
       const record = await Ipfs.findById(req.params.id);
       if (record) {
@@ -101,12 +92,10 @@ const IpfsService = {
       return null;
     }
     return await Ipfs.deleteMany();
-  },
-
+  };
   // ──────────────────────────────────────────────
   //  Health / audit
   // ──────────────────────────────────────────────
-
   /**
    * GET /ipfs/verify
    *
@@ -117,10 +106,9 @@ const IpfsService = {
    * Response shape:
    *   { total, pinned, unpinned, errors, entries: [{ cid, resourceType, mfsPath, pinned, error? }] }
    */
-  verify: async (req, res, options) => {
-    const Ipfs = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Ipfs;
+  static verify = async (req, res, options) => {
+    const Ipfs = DataBaseProviderService.getModel("Ipfs", options);
     const records = await Ipfs.find({}).select(IpfsDto.select.get()).lean();
-
     let pinned = 0;
     let unpinned = 0;
     let errors = 0;
@@ -137,9 +125,7 @@ const IpfsService = {
         }
       }),
     );
-
     return { total: records.length, pinned, unpinned, errors, entries };
-  },
-};
-
+  };
+}
 export { IpfsService, createPinRecord, removePinRecordsAndUnpin };

package/src/api/object-layer/object-layer.controller.js

@@ -3,8 +3,8 @@ import { ObjectLayerService } from './object-layer.service.js';
 
 const logger = loggerFactory(import.meta);
 
-const ObjectLayerController = {
-  post: async (req, res, options) => {
+class ObjectLayerController {
+  static post = async (req, res, options) => {
     try {
       const result = await ObjectLayerService.post(req, res, options);
       return res.status(200).json({
@@ -18,8 +18,8 @@ const ObjectLayerController = {
         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);
@@ -37,8 +37,8 @@ const ObjectLayerController = {
         message: error.message,
       });
     }
-  },
-  generateWebp: async (req, res, options) => {
+  };
+  static generateWebp = async (req, res, options) => {
     try {
       const result = await ObjectLayerService.generateWebp(req, res, options);
       if (req && req.headers && req.headers.origin) {
@@ -59,8 +59,8 @@ const ObjectLayerController = {
         message: error.message,
       });
     }
-  },
-  put: async (req, res, options) => {
+  };
+  static put = async (req, res, options) => {
     try {
       const result = await ObjectLayerService.put(req, res, options);
       return res.status(200).json({
@@ -74,8 +74,8 @@ const ObjectLayerController = {
         message: error.message,
       });
     }
-  },
-  delete: async (req, res, options) => {
+  };
+  static delete = async (req, res, options) => {
     try {
       const result = await ObjectLayerService.delete(req, res, options);
       return res.status(200).json({
@@ -89,7 +89,7 @@ const ObjectLayerController = {
         message: error.message,
       });
     }
-  },
-};
+  };
+}
 
 export { ObjectLayerController };

package/src/api/object-layer/object-layer.model.js

@@ -3,9 +3,7 @@
  * @module src/api/object-layer/object-layer.model.js
  * @namespace CyberiaObjectLayerModel
  */
-
 import { Schema, model } from 'mongoose';
-
 /**
  * @typedef {Object} Stats
  * @property {number} effect - The effect attribute value
@@ -27,7 +25,6 @@ const StatsSchema = new Schema(
   },
   { _id: false },
 );
-
 /**
  * @typedef {Object} Item
  * @property {string} id - Unique identifier for the item
@@ -45,7 +42,6 @@ const ItemSchema = new Schema(
   },
   { _id: false },
 );
-
 /**
  * @typedef {Object} Ledger
  * Blockchain protocol metadata linking the visual object-layer prefab to its economic reality.
@@ -68,7 +64,6 @@ const LedgerSchema = new Schema(
   },
   { _id: false },
 );
-
 /**
  * @typedef {Object} Render
  * IPFS content identifiers for the consolidated atlas sprite sheet.
@@ -83,7 +78,6 @@ const RenderSchema = new Schema(
   },
   { _id: false },
 );
-
 /**
  * @typedef {Object} ObjectLayer
  * @property {Object} data - Object layer data
@@ -138,11 +132,9 @@ const ObjectLayerSchema = new Schema(
     toObject: { virtuals: true },
   },
 );
-
 // Index for faster querying
 ObjectLayerSchema.index({ 'data.item.id': 1 });
 ObjectLayerSchema.index({ 'data.item.type': 1 });
-
 // Add text index for searchable fields
 ObjectLayerSchema.index(
   {
@@ -158,7 +150,6 @@ ObjectLayerSchema.index(
     },
   },
 );
-
 // Pre-save hook to ensure data consistency
 ObjectLayerSchema.pre('save', function () {
   // Ensure all required fields are present
@@ -167,14 +158,11 @@ ObjectLayerSchema.pre('save', function () {
   }
   // cid (object layer data JSON) and data.render.cid (atlas PNG) are optional – default to ''
 });
-
 // Create and export the model
 const ObjectLayerModel = model('ObjectLayer', ObjectLayerSchema);
-
 const ProviderSchema = ObjectLayerSchema;
-
-const ObjectLayerDto = {
-  select: {
+class ObjectLayerDto {
+  static select = {
     get: () => {
       return {
         _id: 1,
@@ -207,7 +195,6 @@ const ObjectLayerDto = {
         objectLayerRenderFramesId: 1,
       };
     },
-  },
-};
-
+  };
+}
 export { ObjectLayerSchema, ObjectLayerModel, ProviderSchema, ObjectLayerDto };