cyberia 3.2.9 → 3.2.22

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

@@ -10,7 +10,7 @@
  * @namespace CyberiaObjectLayerService
  */
 
-import { DataBaseProvider } from '../../db/DataBaseProvider.js';
+import { DataBaseProviderService } from '../../db/DataBaseProvider.js';
 import { loggerFactory } from '../../server/logger.js';
 import { ObjectLayerRenderFramesDto } from '../object-layer-render-frames/object-layer-render-frames.model.js';
 import { FileFactory } from '../file/file.service.js';
@@ -149,9 +149,9 @@ class ObjectLayerService {
       fs.writeFileSync(`${publicFolder}/metadata.json`, metadataContent);
 
       // Build object layer data from the asset directory
-      const ObjectLayer = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.ObjectLayer;
+      const ObjectLayer = DataBaseProviderService.getModel("ObjectLayer", options);
       const ObjectLayerRenderFrames =
-        DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.ObjectLayerRenderFrames;
+        DataBaseProviderService.getModel("ObjectLayerRenderFrames", options);
 
       const { objectLayerRenderFramesData, objectLayerData } =
         await ObjectLayerEngine.buildObjectLayerDataFromDirectory({
@@ -183,9 +183,9 @@ class ObjectLayerService {
     }
 
     // create object layer from body – cut-over consistency: stage all CIDs before writing to DB
-    const ObjectLayer = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.ObjectLayer;
+    const ObjectLayer = DataBaseProviderService.getModel("ObjectLayer", options);
     const ObjectLayerRenderFrames =
-      DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.ObjectLayerRenderFrames;
+      DataBaseProviderService.getModel("ObjectLayerRenderFrames", options);
 
     const bodyData = { ...req.body };
     if (!bodyData.data) bodyData.data = {};
@@ -270,7 +270,7 @@ class ObjectLayerService {
    */
   static get = async (req, res, options) => {
     /** @type {import('./object-layer.model.js').ObjectLayerModel} */
-    const ObjectLayer = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.ObjectLayer;
+    const ObjectLayer = DataBaseProviderService.getModel("ObjectLayer", options);
 
     // GET /search-item-ids?q=<partial> - Fast partial match search on data.item.id
     if (req.path.startsWith('/search-item-ids')) {
@@ -360,8 +360,8 @@ class ObjectLayerService {
       if (objectLayer.atlasSpriteSheetId) {
         try {
           const AtlasSpriteSheet =
-            DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.AtlasSpriteSheet;
-          const File = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.File;
+            DataBaseProviderService.getModel("AtlasSpriteSheet", options);
+          const File = DataBaseProviderService.getModel("File", options);
 
           const atlasDoc = await AtlasSpriteSheet.findById(objectLayer.atlasSpriteSheetId);
 
@@ -451,7 +451,7 @@ class ObjectLayerService {
    */
   static generateWebp = async (req, res, options) => {
     /** @type {import('./object-layer.model.js').ObjectLayerModel} */
-    const ObjectLayer = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.ObjectLayer;
+    const ObjectLayer = DataBaseProviderService.getModel("ObjectLayer", options);
 
     // GET /generate-webp/:itemType/:itemId/:directionCode - Generate webp animation from PNG frames
     const itemType = req.params.itemType;
@@ -515,7 +515,10 @@ class ObjectLayerService {
 
       logger.info(`Executing command: ${cmd}`);
 
-      const result = shellExec(cmd, { silent: false });
+      // silentOnError so we can build a domain-specific Error with the
+      // captured stderr/stdout context (callers want a friendly message,
+      // not a generic ShellExecError).
+      const result = shellExec(cmd, { silent: false, silentOnError: true });
 
       if (result.code !== 0) {
         throw new Error(`img2webp command failed: ${result.stderr || result.stdout}`);
@@ -586,7 +589,7 @@ class ObjectLayerService {
    */
   static put = async (req, res, options) => {
     /** @type {import('./object-layer.model.js').ObjectLayerModel} */
-    const ObjectLayer = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.ObjectLayer;
+    const ObjectLayer = DataBaseProviderService.getModel("ObjectLayer", options);
 
     // PUT /:id/frame-image/:itemType/:itemId/:directionCode - Update frame images for specific direction
     if (req.path.includes('/frame-image/')) {
@@ -686,7 +689,7 @@ class ObjectLayerService {
       fs.writeFileSync(`${publicFolder}/metadata.json`, metadataContent);
 
       const ObjectLayerRenderFrames =
-        DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.ObjectLayerRenderFrames;
+        DataBaseProviderService.getModel("ObjectLayerRenderFrames", options);
 
       // Build object layer data from the asset directory
       const { objectLayerRenderFramesData, objectLayerData } =
@@ -803,9 +806,9 @@ class ObjectLayerService {
    */
   static delete = async (req, res, options) => {
     /** @type {import('./object-layer.model.js').ObjectLayerModel} */
-    const ObjectLayer = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.ObjectLayer;
+    const ObjectLayer = DataBaseProviderService.getModel("ObjectLayer", options);
     const ObjectLayerRenderFrames =
-      DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.ObjectLayerRenderFrames;
+      DataBaseProviderService.getModel("ObjectLayerRenderFrames", options);
 
     if (req.params.id) {
       // Load the full object layer so we can access all references

package/src/api/object-layer-render-frames/object-layer-render-frames.router.js

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

package/src/api/object-layer-render-frames/object-layer-render-frames.service.js

@@ -1,4 +1,4 @@
-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';
 
@@ -8,13 +8,13 @@ class ObjectLayerRenderFramesService {
   static post = async (req, res, options) => {
     /** @type {import('./object-layer-render-frames.model.js').ObjectLayerRenderFramesModel} */
     const ObjectLayerRenderFrames =
-      DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.ObjectLayerRenderFrames;
+      DataBaseProviderService.getModel("ObjectLayerRenderFrames", options);
     return await new ObjectLayerRenderFrames(req.body).save();
   };
   static get = async (req, res, options) => {
     /** @type {import('./object-layer-render-frames.model.js').ObjectLayerRenderFramesModel} */
     const ObjectLayerRenderFrames =
-      DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.ObjectLayerRenderFrames;
+      DataBaseProviderService.getModel("ObjectLayerRenderFrames", options);
     if (req.params.id) return await ObjectLayerRenderFrames.findById(req.params.id);
 
     // Parse query parameters using DataQuery helper
@@ -31,13 +31,13 @@ class ObjectLayerRenderFramesService {
   static put = async (req, res, options) => {
     /** @type {import('./object-layer-render-frames.model.js').ObjectLayerRenderFramesModel} */
     const ObjectLayerRenderFrames =
-      DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.ObjectLayerRenderFrames;
+      DataBaseProviderService.getModel("ObjectLayerRenderFrames", options);
     return await ObjectLayerRenderFrames.findByIdAndUpdate(req.params.id, req.body);
   };
   static delete = async (req, res, options) => {
     /** @type {import('./object-layer-render-frames.model.js').ObjectLayerRenderFramesModel} */
     const ObjectLayerRenderFrames =
-      DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.ObjectLayerRenderFrames;
+      DataBaseProviderService.getModel("ObjectLayerRenderFrames", options);
     if (req.params.id) return await ObjectLayerRenderFrames.findByIdAndDelete(req.params.id);
     else return await ObjectLayerRenderFrames.deleteMany();
   };

package/src/api/test/test.router.js

@@ -4,18 +4,23 @@ import express from 'express';
 
 const logger = loggerFactory(import.meta);
 
-const TestRouter = (options) => {
-  const router = express.Router();
-  const authMiddleware = options.authMiddleware;
-  router.post(`/:id`, async (req, res) => await TestController.post(req, res, options));
-  router.post(`/`, authMiddleware, async (req, res) => await TestController.post(req, res, options));
-  router.get(`/:id`, async (req, res) => await TestController.get(req, res, options));
-  router.get(`/`, async (req, res) => await TestController.get(req, res, options));
-  router.delete(`/:id`, async (req, res) => await TestController.delete(req, res, options));
-  router.delete(`/`, async (req, res) => await TestController.delete(req, res, options));
-  return router;
-};
+class TestRouter {
+  /**
+   * @param {import('../types.js').RouterOptions} options
+   * @returns {import('express').Router}
+   */
+  static router(options) {
+    const router = express.Router();
+    router.post(`/:id`, async (req, res) => await TestController.post(req, res, options));
+    router.post(`/`, options.authMiddleware, async (req, res) => await TestController.post(req, res, options));
+    router.get(`/:id`, async (req, res) => await TestController.get(req, res, options));
+    router.get(`/`, async (req, res) => await TestController.get(req, res, options));
+    router.delete(`/:id`, async (req, res) => await TestController.delete(req, res, options));
+    router.delete(`/`, async (req, res) => await TestController.delete(req, res, options));
+    return router;
+  }
+}
 
-const ApiRouter = TestRouter;
+const ApiRouter = (options) => TestRouter.router(options);
 
 export { ApiRouter, TestRouter };

package/src/api/types.js

@@ -0,0 +1,24 @@
+/**
+ * @module src/api/types
+ * @description Shared type definitions for the Express router layer.
+ */
+
+/**
+ * Injected dependencies and runtime configuration for every API router instance.
+ * Keyed per-host/path by the multi-tenant engine (see src/runtime/express/Express.js).
+ *
+ * @typedef {Object} RouterOptions
+ * @property {import('express').Application} app - Express application instance.
+ * @property {string} host - Per-runtime host identifier (e.g. "nexodev.org").
+ * @property {string} path - Per-runtime path prefix (e.g. "/" or "/cyberia").
+ * @property {string} apiPath - Computed base URL for the API layer.
+ * @property {string[]} origins - Allowed origins for CORS validation.
+ * @property {import('express').RequestHandler} authMiddleware - Dynamically generated JWT auth middleware (keyed by host+path).
+ * @property {Object} [db] - DataBaseProviderService configuration or instance reference.
+ * @property {Object} [mailer] - MailerProvider configuration or instance reference.
+ * @property {Object} [png] - Cached mailer image buffers (populated by UserRouter on first load).
+ * @property {Record<string, Buffer>} [png.buffer] - Map of image key to raw PNG buffer.
+ * @property {Function} [png.header] - Sets CORS/Content-Type response headers for PNG responses.
+ */
+
+export { };

package/src/api/user/guest.service.js

@@ -22,12 +22,13 @@ const _guestTtlMs = () => {
  */
 const buildGuestUser = (options) => {
   const now = new Date().toISOString();
-  const _id = new mongoose.Types.ObjectId().toString();
+  const objectId = new mongoose.Types.ObjectId().toString();
   const role = 'guest';
+  const username = `${role}${objectId.slice(-5)}`;
   return {
-    _id: `${role}${_id}`,
-    username: `${role}${_id.slice(-5)}`,
-    email: `${_id}@${options.host || 'localhost'}`,
+    _id: `${role}${objectId}`,
+    username,
+    email: `${username}@${options.host || 'localhost'}`,
     password: hashPassword(process.env.JWT_SECRET),
     role,
     emailConfirmed: false,