cyberia 3.0.1 → 3.0.2

package/src/client/services/object-layer/object-layer.management.js

@@ -1,15 +1,20 @@
 import { DefaultManagement } from '../default/default.management.js';
 import { ObjectLayerService } from './object-layer.service.js';
-import { commonUserGuard } from '../../components/core/CommonJs.js';
+import { commonUserGuard, commonModeratorGuard } from '../../components/core/CommonJs.js';
 import { getProxyPath, setPath, setQueryParams } from '../../components/core/Router.js';
 import { ObjectLayerEngineModal } from '../../components/cyberia/ObjectLayerEngineModal.js';
 import { ObjectLayerEngineViewer } from '../../components/cyberia/ObjectLayerEngineViewer.js';
 import { s } from '../../components/core/VanillaJs.js';
 import { Modal } from '../../components/core/Modal.js';
 import { BtnIcon } from '../../components/core/BtnIcon.js';
+import { NotificationManager } from '../../components/core/NotificationManager.js';
+import { AgGrid } from '../../components/core/AgGrid.js';
 
 const ObjectLayerManagement = {
-  RenderTable: async ({ Elements, idModal }) => {
+  RenderTable: async ({ Elements, idModal: rawIdModal }) => {
+    const idModal = rawIdModal || 'modal-object-layer-engine-management';
+    const serviceId = 'object-layer-engine-management';
+    const gridId = `${serviceId}-grid-${idModal}`;
     const user = Elements.Data.user.main.model.user;
     const { role } = user;
 
@@ -41,9 +46,9 @@ const ObjectLayerManagement = {
                 // Navigate to viewer route first
                 setPath(`${getProxyPath()}object-layer-engine-viewer`);
                 // Then add query param without replacing history
-                setQueryParams({ cid: data._id }, { replace: true });
+                setQueryParams({ id: data._id }, { replace: true });
                 if (s(`.modal-object-layer-engine-viewer`)) {
-                  await ObjectLayerEngineViewer.Reload({ Elements });
+                  await ObjectLayerEngineViewer.Reload({ Elements, force: true });
                 }
                 s(`.main-btn-object-layer-engine-viewer`).click();
               });
@@ -87,7 +92,7 @@ const ObjectLayerManagement = {
                 // Navigate to editor route first
                 setPath(`${getProxyPath()}object-layer-engine`);
                 // Then add query param without replacing history
-                setQueryParams({ cid: data._id }, { replace: true });
+                setQueryParams({ id: data._id }, { replace: true });
                 if (s(`.modal-object-layer-engine`)) await ObjectLayerEngineModal.Reload();
                 else s(`.main-btn-object-layer-engine`).click();
               });
@@ -148,6 +153,123 @@ const ObjectLayerManagement = {
       }
     }
 
+    // Custom renderer for delete button (moderator+ only)
+    const canDelete = commonModeratorGuard(role);
+
+    class DeleteButtonRenderer {
+      eGui;
+
+      async init(params) {
+        this.eGui = document.createElement('div');
+        const { data } = params;
+
+        if (!data || !data._id || !canDelete) {
+          this.eGui.innerHTML = '';
+          return;
+        }
+
+        this.eGui.innerHTML = html` ${await BtnIcon.Render({
+          label: html`<div class="abs center">
+            <i class="fas fa-trash" style="color: #dc3545;"></i>
+          </div> `,
+          class: `in fll section-mp management-table-btn-mini btn-delete-object-layer-${data._id}`,
+        })}`;
+
+        setTimeout(() => {
+          const btn = this.eGui.querySelector(`.btn-delete-object-layer-${data._id}`);
+          if (btn)
+            btn.onclick = async () => {
+              const itemId = data?.data?.item?.id || data._id;
+              const confirmResult = await Modal.RenderConfirm({
+                id: `delete-object-layer-${data._id}`,
+                html: async () => html`
+                  <div class="in section-mp" style="text-align: center">
+                    <p>Are you sure you want to permanently delete object layer <strong>"${itemId}"</strong>?</p>
+                    <p style="color: #dc3545; font-size: 13px; margin-top: 8px;">
+                      This will remove all associated data including render frames, atlas sprite sheet, IPFS pins, and
+                      static asset files.
+                    </p>
+                  </div>
+                `,
+              });
+              if (confirmResult.status !== 'confirm') return;
+              try {
+                const result = await ObjectLayerService.delete({ id: data._id });
+                if (result.status === 'success') {
+                  NotificationManager.Push({
+                    html: `Object layer "${itemId}" deleted successfully`,
+                    status: 'success',
+                  });
+                  if (AgGrid.grids[gridId]) {
+                    AgGrid.grids[gridId].applyTransaction({ remove: [data] });
+                  }
+                  const token = DefaultManagement.Tokens[idModal];
+                  if (token) {
+                    const newTotal = token.total - 1;
+                    const newTotalPages = Math.ceil(newTotal / token.limit);
+                    if (token.page > newTotalPages && newTotalPages > 0) {
+                      token.page = newTotalPages;
+                    }
+                    await DefaultManagement.loadTable(idModal, { reload: false });
+                  }
+                } else {
+                  throw new Error(result.message || 'Failed to delete object layer');
+                }
+              } catch (error) {
+                NotificationManager.Push({
+                  html: `Failed to delete: ${error.message}`,
+                  status: 'error',
+                });
+              }
+            };
+        });
+      }
+
+      getGui() {
+        return this.eGui;
+      }
+
+      refresh(params) {
+        return true;
+      }
+    }
+
+    const createCidRenderer = (cidAccessor) => {
+      return class {
+        eGui;
+
+        async init(params) {
+          this.eGui = document.createElement('div');
+          const { data } = params;
+          const cid = cidAccessor(data) || '';
+
+          if (!cid) {
+            this.eGui.innerHTML = html`<span style="color: #666; font-style: italic;">—</span>`;
+            return;
+          }
+
+          this.eGui.innerHTML = html`<span
+            title="${cid}"
+            style="font-family: monospace; font-size: 11px; cursor: default; user-select: all;"
+            >${cid}</span
+          >`;
+        }
+
+        getGui() {
+          return this.eGui;
+        }
+
+        refresh(params) {
+          return true;
+        }
+      };
+    };
+
+    // IPFS CID of object layer data JSON (fast-json-stable-stringify)
+    const CidRenderer = createCidRenderer((d) => d?.cid);
+    // IPFS CID of the consolidated atlas sprite sheet PNG
+    const AtlasCidRenderer = createCidRenderer((d) => d?.data?.atlasSpriteSheetCid || d?.atlasSpriteSheetId?.cid);
+
     let columnDefs = [
       // {
       //   field: '_id',
@@ -163,6 +285,24 @@ const ObjectLayerManagement = {
       },
       { field: 'data.item.type', headerName: 'Item Type', editable: role === 'user' },
       { field: 'data.item.description', headerName: 'Description', flex: 1, editable: role === 'user' },
+      {
+        field: 'cid',
+        headerName: 'IPFS CID',
+        width: 160,
+        cellRenderer: CidRenderer,
+        editable: false,
+        sortable: false,
+        filter: false,
+      },
+      {
+        field: 'data.atlasSpriteSheetCid',
+        headerName: 'Atlas CID',
+        width: 160,
+        cellRenderer: AtlasCidRenderer,
+        editable: false,
+        sortable: false,
+        filter: false,
+      },
       {
         field: 'frame08',
         headerName: 'Frame 08 Preview',
@@ -190,15 +330,28 @@ const ObjectLayerManagement = {
         sortable: false,
         filter: false,
       },
+      ...(canDelete
+        ? [
+            {
+              field: 'delete',
+              headerName: '',
+              width: 100,
+              cellRenderer: DeleteButtonRenderer,
+              editable: false,
+              sortable: false,
+              filter: false,
+            },
+          ]
+        : []),
     ];
 
     return await DefaultManagement.RenderTable({
-      idModal: idModal ? idModal : 'modal-object-layer-engine-management',
-      serviceId: 'object-layer-engine-management',
+      idModal,
+      serviceId,
       entity: 'object-layer',
       permissions: {
         add: commonUserGuard(role),
-        remove: commonUserGuard(role),
+        remove: false,
         reload: commonUserGuard(role),
       },
       customEvent: {

package/src/index.js

@@ -42,7 +42,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v3.0.1';
+  static version = 'v3.0.2';
 
   /**
    * Required Node.js major version

package/src/runtime/express/Express.js

@@ -99,7 +99,7 @@ class ExpressService {
 
     if (origins && isDevProxyContext())
       origins.push(devProxyHostFactory({ host, includeHttp: true, tls: isTlsDevProxy() }));
-    app.set('trust proxy', true);
+    app.set('trust proxy', 1);
 
     app.use((req, res, next) => {
       res.on('finish', () => {

package/src/server/auth.js

@@ -647,24 +647,24 @@ function applySecurity(app, opts = {}) {
     }),
   );
   logger.info('Cors origin', origin);
-
-  // Rate limiting + slow down
-  const limiter = rateLimit({
-    windowMs: rate.windowMs,
-    max: rate.max,
-    standardHeaders: true,
-    legacyHeaders: false,
-    message: { error: 'Too many requests, please try again later.' },
-  });
-  app.use(limiter);
-
-  const speedLimiter = slowDown({
-    windowMs: slowdown.windowMs,
-    delayAfter: slowdown.delayAfter,
-    delayMs: () => slowdown.delayMs,
-  });
-  app.use(speedLimiter);
-
+  if (!process.env.DISABLE_API_RATE_LIMIT) {
+    // Rate limiting + slow down
+    const limiter = rateLimit({
+      windowMs: rate.windowMs,
+      max: rate.max,
+      standardHeaders: true,
+      legacyHeaders: false,
+      message: { error: 'Too many requests, please try again later.' },
+    });
+    app.use(limiter);
+
+    const speedLimiter = slowDown({
+      windowMs: slowdown.windowMs,
+      delayAfter: slowdown.delayAfter,
+      delayMs: () => slowdown.delayMs,
+    });
+    app.use(speedLimiter);
+  }
   // Cookie parsing
   app.use(cookieParser(process.env.JWT_SECRET));
 }