cyberia 3.0.2 → 3.1.3

package/package.json

@@ -2,25 +2,30 @@
     "type": "module",
     "main": "src/index.js",
     "name": "cyberia",
-    "version": "3.0.2",
+    "version": "3.1.3",
     "description": "Cyberia Engine - Object Layer and Assets Management Microservice",
     "scripts": {
-        "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
-        "build": "node bin/deploy build-full-client",
-        "test": "env-cmd -f .env.test c8 mocha",
-        "dev": "env-cmd -f .env.development nodemon src/server",
-        "dev-img": "env-cmd -f .env.development node src/server",
-        "prod-img": "env-cmd -f .env.production node src/server",
-        "dev-api": "env-cmd -f .env.development nodemon --watch src --ignore src/client src/api",
-        "dev-client": "env-cmd -f .env.development node src/client.dev",
-        "dev-proxy": "env-cmd -f .env.development node src/proxy proxy",
+        "start": "node --max-old-space-size=8192 src/server dd-core",
+        "build": "node bin client",
+        "test": "NODE_ENV=test c8 mocha",
+        "dev": "NODE_ENV=development nodemon src/server",
+        "dev:container": "NODE_ENV=development node src/server",
+        "prod:container": "NODE_ENV=production node src/server",
+        "dev:api": "NODE_ENV=development nodemon --watch src --ignore src/client src/api",
+        "dev:client": "NODE_ENV=development node src/client.dev",
+        "dev:proxy": "NODE_ENV=development node src/proxy proxy",
         "docs": "jsdoc -c jsdoc.json",
-        "install-global": "npm install -g jsdoc && npm install -g prettier && npm install -g env-cmd",
-        "install-test": "npm install -g mocha && npm install -g c8 && npm install -g coveralls",
-        "install": "npm run install-global && npm run install-test",
+        "install:global": "npm install -g jsdoc && npm install -g prettier",
+        "install:test": "npm install -g mocha && npm install -g c8 && npm install -g coveralls",
+        "install": "npm run install:global && npm run install:test",
         "prettier": "prettier --write .",
         "fix": "npm audit fix --force && npm audit",
-        "baremetal": "node bin baremetal --dev --commission --ls --create-machine"
+        "baremetal": "node bin baremetal --dev --commission --ls --create-machine",
+        "security:secrets": "gitleaks detect --source . --config .gitleaks.toml --report-path ./gitleaks-report.json --report-format json --redact=0",
+        "security:secrets:ci": "gitleaks detect --source . --config .gitleaks.toml --redact=1",
+        "security:deps": "npm audit",
+        "security": "npm run security:secrets:ci && npm run security:deps",
+        "clean": "node bin env clean && node bin run clean"
     },
     "bin": {
         "cyberia": "bin/index.js"
@@ -44,67 +49,68 @@
     },
     "homepage": "https://github.com/underpostnet/engine-cyberia#readme",
     "dependencies": {
-        "@fortawesome/fontawesome-free": "^6.4.2",
-        "@fullcalendar/rrule": "^6.1.15",
-        "@neodrag/vanilla": "^2.0.3",
+        "@fortawesome/fontawesome-free": "^7.2.0",
+        "@fullcalendar/rrule": "^6.1.20",
+        "@neodrag/vanilla": "^2.3.1",
         "adm-zip": "^0.5.10",
-        "ag-grid-community": "^31.3.4",
-        "axios": "^1.5.1",
-        "chai": "^5.1.0",
+        "ag-grid-community": "^35.1.0",
+        "axios": "^1.13.6",
+        "chai": "^6.2.2",
         "clean-jsdoc-theme": "^4.3.0",
-        "clipboardy": "^4.0.0",
+        "clipboardy": "^5.3.1",
         "cloudinary": "^2.5.1",
         "colors": "^1.4.0",
-        "commander": "^12.1.0",
+        "commander": "^14.0.3",
         "compression": "^1.7.4",
         "cookie-parser": "^1.4.7",
-        "cors": "^2.8.5",
+        "cors": "^2.8.6",
         "d3": "^7.9.0",
-        "dotenv": "^16.3.1",
+        "dotenv": "^17.3.1",
         "easymde": "^2.18.0",
-        "env-cmd": "^10.1.0",
-        "express": "^4.18.2",
+        "escape-string-regexp": "^5.0.0",
+        "express": "^5.2.1",
         "express-fileupload": "^1.4.3",
-        "express-rate-limit": "^8.1.0",
-        "express-slow-down": "^3.0.0",
+        "express-rate-limit": "^8.3.1",
+        "express-slow-down": "^3.1.0",
         "fast-json-stable-stringify": "^2.1.0",
         "favicons": "^7.2.0",
-        "fs-extra": "^11.1.1",
+        "fs-extra": "^11.3.4",
         "fullcalendar": "^6.1.15",
         "helmet": "^8.1.0",
         "html-minifier-terser": "^7.2.0",
-        "http-proxy-middleware": "^2.0.6",
+        "http-proxy-middleware": "^3.0.5",
         "ignore-walk": "^8.0.0",
-        "iovalkey": "^0.2.1",
-        "jimp": "^1.6.0",
-        "json-colorizer": "^2.2.2",
-        "jsonwebtoken": "^9.0.2",
+        "iovalkey": "^0.3.3",
+        "json-colorizer": "^3.0.1",
+        "jsonwebtoken": "^9.0.3",
         "mariadb": "^3.2.2",
-        "marked": "^12.0.2",
-        "maxrects-packer": "^2.7.3",
-        "mocha": "^7.2.0",
-        "mongoose": "^8.9.5",
+        "marked": "^17.0.4",
+        "mocha": "^11.3.0",
+        "mongoose": "^9.3.0",
         "morgan": "^1.10.0",
-        "nodemailer": "^7.0.9",
+        "nodemailer": "^8.0.2",
         "nodemon": "^3.0.1",
         "peer": "^1.0.2",
-        "peerjs": "^1.5.2",
-        "pngjs": "^7.0.0",
+        "peerjs": "^1.5.5",
         "prom-client": "^15.1.2",
-        "read": "^2.1.0",
+        "read": "^5.0.1",
         "rrule": "^2.8.1",
-        "sharp": "^0.32.5",
         "shelljs": "^0.10.0",
-        "sitemap": "^7.1.1",
-        "socket.io": "^4.8.0",
+        "sitemap": "^9.0.1",
+        "socket.io": "^4.8.3",
         "sortablejs": "^1.15.0",
         "split-file": "^2.3.0",
-        "swagger-autogen": "^2.9.2",
+        "swagger-autogen": "^2.23.7",
         "swagger-ui-express": "^5.0.0",
         "uglify-js": "^3.17.4",
         "validator": "^13.11.0",
-        "vanilla-jsoneditor": "^2.3.2",
-        "winston": "^3.11.0"
+        "vanilla-jsoneditor": "^3.11.0",
+        "winston": "^3.19.0",
+        "maxrects-packer": "^2.7.3",
+        "pngjs": "^7.0.0",
+        "jimp": "^1.6.0",
+        "sharp": "^0.32.5",
+        "ethers": "~6.16.0"
     },
     "publishConfig": {
         "provenance": true,
@@ -113,6 +119,10 @@
     },
     "overrides": {
         "minimatch": "^10.2.2",
-        "glob": "^11.0.0"
+        "glob": "^11.0.0",
+        "diff": ">=8.0.3",
+        "js-yaml": ">=3.14.2",
+        "debug": ">=4.3.6",
+        "serialize-javascript": ">=7.0.3"
     }
-}
+}

package/proxy.yaml

@@ -3,11 +3,11 @@
 apiVersion: projectcontour.io/v1
 kind: HTTPProxy
 metadata:
-  name: www.cyberiaonline.com
+  name: underpost.net
   namespace: default
 spec:
   virtualhost:
-    fqdn: www.cyberiaonline.com
+    fqdn: underpost.net
   routes:
     - conditions:
         - prefix: /
@@ -27,6 +27,125 @@ spec:
           port: 4006
           weight: 100
     
+---
+apiVersion: projectcontour.io/v1
+kind: HTTPProxy
+metadata:
+  name: www.underpost.net
+  namespace: default
+spec:
+  virtualhost:
+    fqdn: www.underpost.net
+  routes:
+    - conditions:
+        - prefix: /
+      
+      enableWebsockets: true
+      services:
+        - name: dd-cyberia-development-blue-service
+          port: 4007
+          weight: 100
+    
+---
+apiVersion: projectcontour.io/v1
+kind: HTTPProxy
+metadata:
+  name: www.cyberiaonline.com
+  namespace: default
+spec:
+  virtualhost:
+    fqdn: www.cyberiaonline.com
+  routes:
+    - conditions:
+        - prefix: /
+      
+      enableWebsockets: true
+      services:
+        - name: dd-cyberia-development-blue-service
+          port: 4008
+          weight: 100
+    
+    - conditions:
+        - prefix: /peer
+      
+      enableWebsockets: true
+      services:
+        - name: dd-cyberia-development-blue-service
+          port: 4009
+          weight: 100
+    
+    - conditions:
+        - prefix: /r1
+      
+      enableWebsockets: true
+      services:
+        - name: dd-cyberia-development-blue-service
+          port: 4010
+          weight: 100
+    
+    - conditions:
+        - prefix: /r1/peer
+      
+      enableWebsockets: true
+      services:
+        - name: dd-cyberia-development-blue-service
+          port: 4011
+          weight: 100
+    
+    - conditions:
+        - prefix: /r2
+      
+      enableWebsockets: true
+      services:
+        - name: dd-cyberia-development-blue-service
+          port: 4012
+          weight: 100
+    
+    - conditions:
+        - prefix: /r2/peer
+      
+      enableWebsockets: true
+      services:
+        - name: dd-cyberia-development-blue-service
+          port: 4013
+          weight: 100
+    
+    - conditions:
+        - prefix: /r3
+      
+      enableWebsockets: true
+      services:
+        - name: dd-cyberia-development-blue-service
+          port: 4014
+          weight: 100
+    
+    - conditions:
+        - prefix: /r3/peer
+      
+      enableWebsockets: true
+      services:
+        - name: dd-cyberia-development-blue-service
+          port: 4015
+          weight: 100
+    
+    - conditions:
+        - prefix: /r4
+      
+      enableWebsockets: true
+      services:
+        - name: dd-cyberia-development-blue-service
+          port: 4016
+          weight: 100
+    
+    - conditions:
+        - prefix: /r4/peer
+      
+      enableWebsockets: true
+      services:
+        - name: dd-cyberia-development-blue-service
+          port: 4017
+          weight: 100
+    
 ---
 apiVersion: projectcontour.io/v1
 kind: HTTPProxy
@@ -43,7 +162,7 @@ spec:
       enableWebsockets: true
       services:
         - name: dd-cyberia-development-blue-service
-          port: 4007
+          port: 4018
           weight: 100
     
 ---
@@ -62,7 +181,7 @@ spec:
       enableWebsockets: true
       services:
         - name: dd-cyberia-development-blue-service
-          port: 4008
+          port: 4019
           weight: 100
     
     - conditions:
@@ -71,7 +190,7 @@ spec:
       enableWebsockets: true
       services:
         - name: dd-cyberia-development-blue-service
-          port: 4009
+          port: 4020
           weight: 100
     
 ---
@@ -90,7 +209,7 @@ spec:
       enableWebsockets: true
       services:
         - name: dd-cyberia-development-blue-service
-          port: 4010
+          port: 4021
           weight: 100
     
 ---
@@ -109,7 +228,7 @@ spec:
       enableWebsockets: true
       services:
         - name: dd-cyberia-development-blue-service
-          port: 4011
+          port: 4022
           weight: 100
     
     - conditions:
@@ -118,7 +237,7 @@ spec:
       enableWebsockets: true
       services:
         - name: dd-cyberia-development-blue-service
-          port: 4012
+          port: 4023
           weight: 100
     
 ---
@@ -137,6 +256,6 @@ spec:
       enableWebsockets: true
       services:
         - name: dd-cyberia-development-blue-service
-          port: 4013
+          port: 4024
           weight: 100
     

package/pv-pvc.yaml

@@ -0,0 +1,132 @@
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: pv-public-dd-cyberia-dd-cyberia-development-blue
+spec:
+  capacity:
+    storage: 5Gi
+  accessModes:
+    - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: manual
+  claimRef:
+    apiVersion: v1
+    kind: PersistentVolumeClaim
+    name: pvc-public-dd-cyberia-dd-cyberia-development-blue
+    namespace: default
+  hostPath:
+    path: /home/dd/engine/volume/pv-public-dd-cyberia-dd-cyberia-development-blue
+    type: DirectoryOrCreate
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: pvc-public-dd-cyberia-dd-cyberia-development-blue
+spec:
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: manual
+  volumeName: pv-public-dd-cyberia-dd-cyberia-development-blue
+  resources:
+    requests:
+      storage: 5Gi
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: pv-public-dd-cyberia-underpost-dd-cyberia-development-blue
+spec:
+  capacity:
+    storage: 5Gi
+  accessModes:
+    - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: manual
+  claimRef:
+    apiVersion: v1
+    kind: PersistentVolumeClaim
+    name: pvc-public-dd-cyberia-underpost-dd-cyberia-development-blue
+    namespace: default
+  hostPath:
+    path: /home/dd/engine/volume/pv-public-dd-cyberia-underpost-dd-cyberia-development-blue
+    type: DirectoryOrCreate
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: pvc-public-dd-cyberia-underpost-dd-cyberia-development-blue
+spec:
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: manual
+  volumeName: pv-public-dd-cyberia-underpost-dd-cyberia-development-blue
+  resources:
+    requests:
+      storage: 5Gi
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: pv-public-dd-cyberia-dd-cyberia-development-green
+spec:
+  capacity:
+    storage: 5Gi
+  accessModes:
+    - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: manual
+  claimRef:
+    apiVersion: v1
+    kind: PersistentVolumeClaim
+    name: pvc-public-dd-cyberia-dd-cyberia-development-green
+    namespace: default
+  hostPath:
+    path: /home/dd/engine/volume/pv-public-dd-cyberia-dd-cyberia-development-green
+    type: DirectoryOrCreate
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: pvc-public-dd-cyberia-dd-cyberia-development-green
+spec:
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: manual
+  volumeName: pv-public-dd-cyberia-dd-cyberia-development-green
+  resources:
+    requests:
+      storage: 5Gi
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: pv-public-dd-cyberia-underpost-dd-cyberia-development-green
+spec:
+  capacity:
+    storage: 5Gi
+  accessModes:
+    - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: manual
+  claimRef:
+    apiVersion: v1
+    kind: PersistentVolumeClaim
+    name: pvc-public-dd-cyberia-underpost-dd-cyberia-development-green
+    namespace: default
+  hostPath:
+    path: /home/dd/engine/volume/pv-public-dd-cyberia-underpost-dd-cyberia-development-green
+    type: DirectoryOrCreate
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: pvc-public-dd-cyberia-underpost-dd-cyberia-development-green
+spec:
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: manual
+  volumeName: pv-public-dd-cyberia-underpost-dd-cyberia-development-green
+  resources:
+    requests:
+      storage: 5Gi

package/scripts/k3s-node-setup.sh

@@ -52,7 +52,7 @@ cd /home/dd/engine
 
 echo "Applying host configuration..."
 
-underpost install
+npm install
 
 node bin run secret
 

package/scripts/ports-ls.sh

@@ -3,6 +3,8 @@ set -euo pipefail
 
 BASHRC="$HOME/.bashrc"
 
+sudo dnf install -y iproute lsof nmap-ncat net-tools procps-ng
+
 # Check whether a "ports" function is already defined
 if grep -Eq '^\s*(function\s+ports|ports\s*\(\))' "$BASHRC"; then
   echo "The 'ports' function already exists in $BASHRC. Nothing was changed."

package/src/api/atlas-sprite-sheet/atlas-sprite-sheet.controller.js

@@ -51,7 +51,9 @@ const AtlasSpriteSheetController = {
   },
   get: async (req, res, options) => {
     try {
-      res.setHeader('Access-Control-Allow-Origin', '*');
+      if (req && req.headers && req.headers.origin) {
+        res.set('Access-Control-Allow-Origin', req.headers.origin);
+      } else res.setHeader('Access-Control-Allow-Origin', '*');
       res.setHeader('Cross-Origin-Resource-Policy', 'cross-origin');
       const { page, limit } = req.query;
       const result = await AtlasSpriteSheetService.get(

package/src/api/atlas-sprite-sheet/atlas-sprite-sheet.model.js

@@ -118,11 +118,10 @@ AtlasSpriteSheetSchema.index({ 'metadata.itemKey': 1 }, { unique: true });
 AtlasSpriteSheetSchema.index({ fileId: 1 });
 
 // Pre-save validation
-AtlasSpriteSheetSchema.pre('save', function (next) {
+AtlasSpriteSheetSchema.pre('save', function () {
   if (!this.fileId || !this.metadata) {
     throw new Error('AtlasSpriteSheet missing required fields: fileId or metadata');
   }
-  next();
 });
 
 const AtlasSpriteSheetModel = model('AtlasSpriteSheet', AtlasSpriteSheetSchema);

package/src/api/atlas-sprite-sheet/atlas-sprite-sheet.service.js

@@ -43,6 +43,8 @@ const AtlasSpriteSheetService = {
 
     // Add atlas PNG to IPFS and obtain its CID
     let atlasCid = '';
+    let atlasMetadataCid = '';
+    const userId = req.auth && req.auth.user ? req.auth.user._id : undefined;
     try {
       const ipfsResult = await IpfsClient.addBufferToIpfs(
         buffer,
@@ -51,8 +53,6 @@ const AtlasSpriteSheetService = {
       );
       if (ipfsResult) {
         atlasCid = ipfsResult.cid;
-        // Create pin record for the authenticated user (when available)
-        const userId = req.auth && req.auth.user ? req.auth.user._id : undefined;
         if (userId) {
           await createPinRecord({ cid: atlasCid, userId, options });
         }
@@ -62,6 +62,24 @@ const AtlasSpriteSheetService = {
       logger.warn('Failed to add atlas sprite sheet to IPFS:', ipfsError.message);
     }
 
+    // Pin atlas metadata JSON to IPFS (fast-json-stable-stringify) and obtain its CID
+    try {
+      const metadataIpfsResult = await IpfsClient.addJsonToIpfs(
+        metadata,
+        `${itemKey}_atlas_sprite_sheet_metadata.json`,
+        `/object-layer/${itemKey}/${itemKey}_atlas_sprite_sheet_metadata.json`,
+      );
+      if (metadataIpfsResult) {
+        atlasMetadataCid = metadataIpfsResult.cid;
+        if (userId) {
+          await createPinRecord({ cid: atlasMetadataCid, userId, options });
+        }
+        logger.info(`Atlas metadata pinned to IPFS – CID: ${atlasMetadataCid}`);
+      }
+    } catch (ipfsError) {
+      logger.warn('Failed to add atlas metadata to IPFS:', ipfsError.message);
+    }
+
     let atlasDoc = await AtlasSpriteSheet.findOne({ 'metadata.itemKey': itemKey });
 
     if (atlasDoc) {
@@ -82,8 +100,10 @@ const AtlasSpriteSheetService = {
     }
 
     objectLayer.atlasSpriteSheetId = atlasDoc._id;
-    objectLayer.data.atlasSpriteSheetCid = atlasCid;
-    objectLayer.markModified('data.atlasSpriteSheetCid');
+    if (!objectLayer.data.render) objectLayer.data.render = {};
+    objectLayer.data.render.cid = atlasCid;
+    objectLayer.data.render.metadataCid = atlasMetadataCid;
+    objectLayer.markModified('data.render');
     await objectLayer.save();
 
     return atlasDoc;
@@ -106,7 +126,8 @@ const AtlasSpriteSheetService = {
       const atlasDoc = await AtlasSpriteSheet.findById(objectLayer.atlasSpriteSheetId);
       if (atlasDoc) {
         // Remove pin records and unpin atlas CID from IPFS
-        const atlasCid = atlasDoc.cid || objectLayer.data.atlasSpriteSheetCid;
+        const atlasCid = atlasDoc.cid || objectLayer.data.render?.cid;
+        const atlasMetadataCid = objectLayer.data.render?.metadataCid;
         if (atlasCid) {
           try {
             await removePinRecordsAndUnpin(atlasCid, options);
@@ -118,6 +139,16 @@ const AtlasSpriteSheetService = {
             logger.warn(`Failed to clean up IPFS atlas CID ${atlasCid}: ${ipfsErr.message}`);
           }
         }
+        if (atlasMetadataCid) {
+          try {
+            await removePinRecordsAndUnpin(atlasMetadataCid, options);
+            const itemId = objectLayer.data.item.id;
+            await IpfsClient.removeMfsPath(`/object-layer/${itemId}/${itemId}_atlas_sprite_sheet_metadata.json`);
+            logger.info(`Cleaned up IPFS atlas metadata CID ${atlasMetadataCid} for ObjectLayer ${objectLayer._id}`);
+          } catch (ipfsErr) {
+            logger.warn(`Failed to clean up IPFS atlas metadata CID ${atlasMetadataCid}: ${ipfsErr.message}`);
+          }
+        }
 
         // Delete the atlas File document from MongoDB
         if (atlasDoc.fileId) {
@@ -127,8 +158,10 @@ const AtlasSpriteSheetService = {
         await AtlasSpriteSheet.findByIdAndDelete(atlasDoc._id);
       }
       objectLayer.atlasSpriteSheetId = undefined;
-      objectLayer.data.atlasSpriteSheetCid = '';
-      objectLayer.markModified('data.atlasSpriteSheetCid');
+      if (!objectLayer.data.render) objectLayer.data.render = {};
+      objectLayer.data.render.cid = '';
+      objectLayer.data.render.metadataCid = '';
+      objectLayer.markModified('data.render');
       await objectLayer.save();
     }
 

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

@@ -497,7 +497,7 @@ const DocumentService = {
         req.body.isPublic = isPublic;
         req.body.tags = tags;
 
-        return await Document.findByIdAndUpdate(req.params.id, req.body, { new: true });
+        return await Document.findByIdAndUpdate(req.params.id, req.body, { returnDocument: 'after' });
       }
     }
   },

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

@@ -19,7 +19,9 @@ const FileController = {
   },
   get: async (req, res, options) => {
     try {
-      res.setHeader('Access-Control-Allow-Origin', '*');
+      if (req && req.headers && req.headers.origin) {
+        res.set('Access-Control-Allow-Origin', req.headers.origin);
+      } else res.setHeader('Access-Control-Allow-Origin', '*');
       res.setHeader('Cross-Origin-Resource-Policy', 'cross-origin');
       const result = await FileService.get(req, res, options);
       if (result instanceof Buffer) {