@underpostnet/cyberia 3.2.90 → 3.3.73

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

@@ -1,12 +1,14 @@
 import { DataBaseProviderService } from '../../db/DataBaseProvider.js';
-import { loggerFactory } from '../../server/logger.js';
-import { DataQuery } from '../../server/data-query.js';
+import { loggerFactory } from '../../server/ops/logger.js';
+import { DataQuery } from '../../server/storage/data-query.js';
 import { connectPortals } from './cyberia-portal-connector.js';
 import {
   generateFallbackWorld,
   fallbackListInstance,
   DEFAULT_FALLBACK_INSTANCE_CODE,
 } from './cyberia-fallback-world.js';
+import { getFallbackDefaultItems, setFallbackDefaultItems } from './cyberia-fallback-default-items.js';
+import { CYBERIA_INSTANCE_CONF_DEFAULTS } from '../cyberia-server-defaults/cyberia-server-defaults.js';
 import { triggerHotReload } from '../../projects/cyberia/hot-reload-trigger.js';
 
 const logger = loggerFactory(import.meta);
@@ -183,8 +185,49 @@ class CyberiaInstanceService {
       botCount: q.botCount ? parseInt(q.botCount, 10) : undefined,
       obstacleCount: q.obstacleCount ? parseInt(q.obstacleCount, 10) : undefined,
       foregroundCount: q.foregroundCount ? parseInt(q.foregroundCount, 10) : undefined,
+      itemIds: getFallbackDefaultItems(),
     });
   };
+
+  /**
+   * Current fallback-world default items — the volatile set the
+   * FallbackWorldEngine view last pushed, or `[]` when the engine is running on
+   * pure code defaults. Lets the view reopen showing what this process serves.
+   *
+   * `entityDefaultItemIds` are the ids the code defaults already ship in an
+   * entity's `defaultObjectLayers`. Selecting one of them and leaving
+   * `defaultPlayerInventory` unchecked REMOVES it (see
+   * applyInstanceDefaultPlayerInventory), so the editor needs to be able to warn
+   * before an operator silently strips the player's starting skin or weapon.
+   */
+  static fallbackDefaultItems = async () => {
+    const entityDefaultItemIds = new Set();
+    for (const entityDefault of CYBERIA_INSTANCE_CONF_DEFAULTS.entityDefaults || []) {
+      for (const layer of entityDefault.defaultObjectLayers || []) {
+        if (layer.itemId) entityDefaultItemIds.add(layer.itemId);
+      }
+    }
+    return { itemIds: getFallbackDefaultItems(), entityDefaultItemIds: [...entityDefaultItemIds].sort() };
+  };
+
+  /**
+   * Stage the fallback world's default items, then ask a running cyberia-server
+   * to rebuild. The items are not persisted (see cyberia-fallback-default-items):
+   * they are staged here first so the rebuild's `getFullInstance` re-fetch picks
+   * them up, which is what makes them reach the server at all.
+   *
+   * `instanceCode` is intentionally left empty — the target world is addressed by
+   * `serverUrl` (origin, or origin + variant sub-path), and naming the synthetic
+   * `fallback` code would be rejected by any server serving a real instance code.
+   */
+  static fallbackHotReload = async (req) => {
+    const { serverUrl, mode, itemIds } = req.body || {};
+    if (!serverUrl) throw new Error('serverUrl is required');
+
+    const staged = setFallbackDefaultItems(itemIds || []);
+    const { transport, result, grpcError } = await triggerHotReload({ serverUrl, instanceCode: '', mode });
+    return { transport, itemIds: staged, grpcError, ...result };
+  };
 }
 
 export { CyberiaInstanceService };

package/src/api/cyberia-instance-conf/cyberia-instance-conf.controller.js

@@ -1,4 +1,4 @@
-import { buildCrudController } from '../../server/middlewares.js';
+import { buildCrudController } from '../../server/network/middlewares.js';
 import { CyberiaInstanceConfService } from './cyberia-instance-conf.service.js';
 
 const CyberiaInstanceConfController = buildCrudController(CyberiaInstanceConfService);

package/src/api/cyberia-instance-conf/cyberia-instance-conf.model.js

@@ -148,6 +148,7 @@ const CyberiaInstanceConfSchema = new Schema(
     // ── Player defaults ──────────────────────────────────────────────
     defaultPlayerWidth: { type: Number, default: D.defaultPlayerWidth },
     defaultPlayerHeight: { type: Number, default: D.defaultPlayerHeight },
+    playerBaseSpeed: { type: Number, default: D.playerBaseSpeed },
     playerBaseLifeRegenMin: { type: Number, default: D.playerBaseLifeRegenMin },
     playerBaseLifeRegenMax: { type: Number, default: D.playerBaseLifeRegenMax },
     sumStatsLimit: { type: Number, default: D.sumStatsLimit },

package/src/api/cyberia-instance-conf/cyberia-instance-conf.router.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { registerCrudRoutes } from '../../server/middlewares.js';
+import { registerCrudRoutes } from '../../server/network/middlewares.js';
 import { CyberiaInstanceConfController } from './cyberia-instance-conf.controller.js';
 
 class CyberiaInstanceConfRouter {

package/src/api/cyberia-instance-conf/cyberia-instance-conf.service.js

@@ -1,6 +1,6 @@
 import { DataBaseProviderService } from '../../db/DataBaseProvider.js';
-import { loggerFactory } from '../../server/logger.js';
-import { DataQuery } from '../../server/data-query.js';
+import { loggerFactory } from '../../server/ops/logger.js';
+import { DataQuery } from '../../server/storage/data-query.js';
 
 const logger = loggerFactory(import.meta);
 

package/src/api/cyberia-map/cyberia-map.controller.js

@@ -1,4 +1,4 @@
-import { buildCrudController } from '../../server/middlewares.js';
+import { buildCrudController } from '../../server/network/middlewares.js';
 import { CyberiaMapService } from './cyberia-map.service.js';
 
 const CyberiaMapController = buildCrudController(CyberiaMapService);

package/src/api/cyberia-map/cyberia-map.router.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { registerCrudRoutes } from '../../server/middlewares.js';
+import { registerCrudRoutes } from '../../server/network/middlewares.js';
 import { CyberiaMapController } from './cyberia-map.controller.js';
 
 class CyberiaMapRouter {

package/src/api/cyberia-map/cyberia-map.service.js

@@ -1,6 +1,6 @@
 import { DataBaseProviderService } from '../../db/DataBaseProvider.js';
-import { loggerFactory } from '../../server/logger.js';
-import { DataQuery } from '../../server/data-query.js';
+import { loggerFactory } from '../../server/ops/logger.js';
+import { DataQuery } from '../../server/storage/data-query.js';
 
 const logger = loggerFactory(import.meta);
 

package/src/api/cyberia-quest/cyberia-quest.controller.js

@@ -1,4 +1,4 @@
-import { buildCrudController, serviceHandler } from '../../server/middlewares.js';
+import { buildCrudController, serviceHandler } from '../../server/network/middlewares.js';
 import { CyberiaQuestService } from './cyberia-quest.service.js';
 
 const CyberiaQuestController = buildCrudController(CyberiaQuestService, {

package/src/api/cyberia-quest/cyberia-quest.router.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { registerCrudRoutes } from '../../server/middlewares.js';
+import { registerCrudRoutes } from '../../server/network/middlewares.js';
 import { CyberiaQuestController } from './cyberia-quest.controller.js';
 
 class CyberiaQuestRouter {

package/src/api/cyberia-quest/cyberia-quest.service.js

@@ -1,6 +1,6 @@
 import { DataBaseProviderService } from '../../db/DataBaseProvider.js';
-import { loggerFactory } from '../../server/logger.js';
-import { DataQuery } from '../../server/data-query.js';
+import { loggerFactory } from '../../server/ops/logger.js';
+import { DataQuery } from '../../server/storage/data-query.js';
 import { DefaultCyberiaQuests } from '../cyberia-server-defaults/cyberia-server-defaults.js';
 
 const logger = loggerFactory(import.meta);

package/src/api/cyberia-quest-progress/cyberia-quest-progress.controller.js

@@ -1,4 +1,4 @@
-import { buildCrudController } from '../../server/middlewares.js';
+import { buildCrudController } from '../../server/network/middlewares.js';
 import { CyberiaQuestProgressService } from './cyberia-quest-progress.service.js';
 
 const CyberiaQuestProgressController = buildCrudController(CyberiaQuestProgressService);

package/src/api/cyberia-quest-progress/cyberia-quest-progress.router.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { registerCrudRoutes } from '../../server/middlewares.js';
+import { registerCrudRoutes } from '../../server/network/middlewares.js';
 import { CyberiaQuestProgressController } from './cyberia-quest-progress.controller.js';
 
 class CyberiaQuestProgressRouter {

package/src/api/cyberia-quest-progress/cyberia-quest-progress.service.js

@@ -1,6 +1,6 @@
 import { DataBaseProviderService } from '../../db/DataBaseProvider.js';
-import { loggerFactory } from '../../server/logger.js';
-import { DataQuery } from '../../server/data-query.js';
+import { loggerFactory } from '../../server/ops/logger.js';
+import { DataQuery } from '../../server/storage/data-query.js';
 
 const logger = loggerFactory(import.meta);
 

package/src/api/cyberia-saga/cyberia-saga.controller.js

@@ -1,4 +1,4 @@
-import { buildCrudController } from '../../server/middlewares.js';
+import { buildCrudController } from '../../server/network/middlewares.js';
 import { CyberiaSagaService } from './cyberia-saga.service.js';
 
 const CyberiaSagaController = buildCrudController(CyberiaSagaService);

package/src/api/cyberia-saga/cyberia-saga.router.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { registerCrudRoutes } from '../../server/middlewares.js';
+import { registerCrudRoutes } from '../../server/network/middlewares.js';
 import { CyberiaSagaController } from './cyberia-saga.controller.js';
 
 class CyberiaSagaRouter {

package/src/api/cyberia-saga/cyberia-saga.service.js

@@ -1,6 +1,6 @@
 import { DataBaseProviderService } from '../../db/DataBaseProvider.js';
-import { loggerFactory } from '../../server/logger.js';
-import { DataQuery } from '../../server/data-query.js';
+import { loggerFactory } from '../../server/ops/logger.js';
+import { DataQuery } from '../../server/storage/data-query.js';
 
 const logger = loggerFactory(import.meta);
 

package/src/api/cyberia-server-defaults/cyberia-server-defaults.js

@@ -47,32 +47,6 @@ export const DOCKER_COMPOSE_ID = 'cyberia';
 
 export const DEPLOY_ID = 'dd-cyberia';
 
-/**
- * Native-dependency pin list. Consumed by `bin/build.js` and `bin/deploy.js`
- * when materialising the Cyberia subtree so versions stay reproducible
- * across CI / production deploys.
- */
-export class CyberiaDependencies {
-  static 'maxrects-packer' = '^2.7.3';
-  static pngjs = '^7.0.0';
-  static jimp = '^1.6.0';
-  static sharp = '^0.34.5';
-  static ethers = '~6.16.0';
-}
-
-export const DOCKER_SCRIPTS = {
-  'docker:generate': `node bin docker-compose --generate --deploy-id ${DEPLOY_ID} --docker-compose-id ${DOCKER_COMPOSE_ID}`,
-  'docker:up': `node bin docker-compose --up --deploy-id ${DEPLOY_ID} --docker-compose-id ${DOCKER_COMPOSE_ID}`,
-  'docker:up:build': `node bin docker-compose --up --build --deploy-id ${DEPLOY_ID} --docker-compose-id ${DOCKER_COMPOSE_ID}`,
-  'docker:down': `node bin docker-compose --down --deploy-id ${DEPLOY_ID} --docker-compose-id ${DOCKER_COMPOSE_ID}`,
-  'docker:down:volumes': `node bin docker-compose --down --volumes --deploy-id ${DEPLOY_ID} --docker-compose-id ${DOCKER_COMPOSE_ID}`,
-  'docker:restart': `node bin docker-compose --restart --deploy-id ${DEPLOY_ID} --docker-compose-id ${DOCKER_COMPOSE_ID}`,
-  'docker:pull': `node bin docker-compose --pull --deploy-id ${DEPLOY_ID} --docker-compose-id ${DOCKER_COMPOSE_ID}`,
-  'docker:logs': `node bin docker-compose --logs --deploy-id ${DEPLOY_ID} --docker-compose-id ${DOCKER_COMPOSE_ID}`,
-  'docker:status': `node bin docker-compose --status --deploy-id ${DEPLOY_ID} --docker-compose-id ${DOCKER_COMPOSE_ID}`,
-  'docker:reset': `node bin docker-compose --reset --deploy-id ${DEPLOY_ID} --docker-compose-id ${DOCKER_COMPOSE_ID}`,
-};
-
 // ─────────────────────────────────────────────────────────────────────────────
 // Skill / action / quest seed content
 // ─────────────────────────────────────────────────────────────────────────────
@@ -909,7 +883,6 @@ export const ENTITY_TYPE_DEFAULTS = Object.freeze([
       { itemId: 'anon', active: true, quantity: 1 },
       { itemId: 'atlas_pistol_mk2', active: true, quantity: 1 },
       { itemId: 'coin', active: false, quantity: 0 },
-      { itemId: 'eiri', active: false, quantity: 1 },
     ],
   },
   {
@@ -939,8 +912,18 @@ export const ENTITY_TYPE_DEFAULTS = Object.freeze([
   { entityType: ENTITY_TYPES.bot, liveItemIds: ['alex'], deadItemIds: [DEFAULT_DEAD_ITEM_ID], behavior: 'provider' },
   { entityType: ENTITY_TYPES.bot, liveItemIds: ['agent'], deadItemIds: [DEFAULT_DEAD_ITEM_ID], behavior: 'provider' },
   { entityType: ENTITY_TYPES.bot, liveItemIds: ['punk'], deadItemIds: [DEFAULT_DEAD_ITEM_ID], behavior: 'provider' },
-  { entityType: ENTITY_TYPES.bot, liveItemIds: ['eiri'], deadItemIds: [DEFAULT_DEAD_ITEM_ID], behavior: 'provider-static' },
-  { entityType: ENTITY_TYPES.bot, liveItemIds: ['kaneki'], deadItemIds: [DEFAULT_DEAD_ITEM_ID], behavior: 'provider-static' },
+  {
+    entityType: ENTITY_TYPES.bot,
+    liveItemIds: ['eiri'],
+    deadItemIds: [DEFAULT_DEAD_ITEM_ID],
+    behavior: 'provider-static',
+  },
+  {
+    entityType: ENTITY_TYPES.bot,
+    liveItemIds: ['kaneki'],
+    deadItemIds: [DEFAULT_DEAD_ITEM_ID],
+    behavior: 'provider-static',
+  },
   {
     entityType: ENTITY_TYPES.bot,
     liveItemIds: ['lain'],
@@ -1027,6 +1010,10 @@ export const CYBERIA_INSTANCE_CONF_DEFAULTS = {
   defaultPlayerHeight: 2,
   playerBaseLifeRegenMin: 0.5,
   playerBaseLifeRegenMax: 1.5,
+  // Movement speed for the player entity only, in grid cells per second. Bots,
+  // projectiles and every other entity keep entityBaseSpeed. 0 falls back to
+  // entityBaseSpeed.
+  playerBaseSpeed: 8,
   sumStatsLimit: 500,
   maxActiveLayers: 4,
   initialLifeFraction: 1.0,

package/src/api/cyberia-skill/cyberia-skill.controller.js

@@ -1,4 +1,4 @@
-import { buildCrudController } from '../../server/middlewares.js';
+import { buildCrudController } from '../../server/network/middlewares.js';
 import { CyberiaSkillService } from './cyberia-skill.service.js';
 
 const CyberiaSkillController = buildCrudController(CyberiaSkillService);

package/src/api/cyberia-skill/cyberia-skill.router.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { registerCrudRoutes } from '../../server/middlewares.js';
+import { registerCrudRoutes } from '../../server/network/middlewares.js';
 import { CyberiaSkillController } from './cyberia-skill.controller.js';
 
 class CyberiaSkillRouter {

package/src/api/cyberia-skill/cyberia-skill.service.js

@@ -1,6 +1,6 @@
 import { DataBaseProviderService } from '../../db/DataBaseProvider.js';
-import { loggerFactory } from '../../server/logger.js';
-import { DataQuery } from '../../server/data-query.js';
+import { loggerFactory } from '../../server/ops/logger.js';
+import { DataQuery } from '../../server/storage/data-query.js';
 
 const logger = loggerFactory(import.meta);
 

package/src/api/default/default.controller.js

@@ -1,4 +1,4 @@
-import { buildCrudController } from '../../server/middlewares.js';
+import { buildCrudController } from '../../server/network/middlewares.js';
 import { DefaultService } from './default.service.js';
 
 const DefaultController = buildCrudController(DefaultService);

package/src/api/default/default.router.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { registerCrudRoutes } from '../../server/middlewares.js';
+import { registerCrudRoutes } from '../../server/network/middlewares.js';
 import { DefaultController } from './default.controller.js';
 
 class DefaultRouter {

package/src/api/default/default.service.js

@@ -1,6 +1,6 @@
 import { DataBaseProviderService } from '../../db/DataBaseProvider.js';
-import { loggerFactory } from '../../server/logger.js';
-import { DataQuery } from '../../server/data-query.js';
+import { loggerFactory } from '../../server/ops/logger.js';
+import { DataQuery } from '../../server/storage/data-query.js';
 
 const logger = loggerFactory(import.meta);
 

package/src/api/document/document.controller.js

@@ -1,4 +1,4 @@
-import { buildCrudController, serviceHandler } from '../../server/middlewares.js';
+import { buildCrudController, serviceHandler } from '../../server/network/middlewares.js';
 import { DocumentService } from './document.service.js';
 
 const DocumentController = buildCrudController(DocumentService, {

package/src/api/document/document.router.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { registerCrudRoutes } from '../../server/middlewares.js';
+import { registerCrudRoutes } from '../../server/network/middlewares.js';
 import { DocumentController } from './document.controller.js';
 
 class DocumentRouter {

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

@@ -7,11 +7,11 @@
  * @namespace DocumentService
  */
 
-import { loggerFactory } from '../../server/logger.js';
+import { loggerFactory } from '../../server/ops/logger.js';
 import { DataBaseProviderService } from '../../db/DataBaseProvider.js';
 import { DocumentDto } from './document.model.js';
 import { uniqueArray } from '../../client/components/core/CommonJs.js';
-import { getBearerToken, verifyJWT } from '../../server/auth.js';
+import { getBearerToken, verifyJWT } from '../../server/security/auth.js';
 import { isValidObjectId } from 'mongoose';
 import { FileCleanup } from '../file/file.service.js';
 

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

@@ -1,4 +1,4 @@
-import { controllerHandler, sendSuccess, serviceHandler, setCrossOriginHeaders } from '../../server/middlewares.js';
+import { controllerHandler, sendSuccess, serviceHandler, setCrossOriginHeaders } from '../../server/network/middlewares.js';
 import { FileService } from './file.service.js';
 
 class FileController {

package/src/api/file/file.router.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { adminGuard } from '../../server/auth.js';
+import { adminGuard } from '../../server/security/auth.js';
 import { FileController } from './file.controller.js';
 
 class FileRouter {

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

@@ -7,8 +7,8 @@
  */
 
 import { DataBaseProviderService } from '../../db/DataBaseProvider.js';
-import { getBearerToken, jwtVerify } from '../../server/auth.js';
-import { loggerFactory } from '../../server/logger.js';
+import { getBearerToken, jwtVerify } from '../../server/security/auth.js';
+import { loggerFactory } from '../../server/ops/logger.js';
 import crypto from 'crypto';
 import { Types } from 'mongoose';
 

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

@@ -1,4 +1,4 @@
-import { buildCrudController, serviceHandler } from '../../server/middlewares.js';
+import { buildCrudController, serviceHandler } from '../../server/network/middlewares.js';
 import { InstanceService } from './instance.service.js';
 
 const InstanceController = buildCrudController(InstanceService, {

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

@@ -1,5 +1,5 @@
 import express from 'express';
-import { adminGuard } from '../../server/auth.js';
+import { adminGuard } from '../../server/security/auth.js';
 import { InstanceController } from './instance.controller.js';
 
 class InstanceRouter {

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

@@ -1,6 +1,6 @@
 import { DataBaseProviderService } from '../../db/DataBaseProvider.js';
-import { loggerFactory } from '../../server/logger.js';
-import { DataQuery } from '../../server/data-query.js';
+import { loggerFactory } from '../../server/ops/logger.js';
+import { DataQuery } from '../../server/storage/data-query.js';
 import { InstanceDto } from './instance.model.js';
 
 const logger = loggerFactory(import.meta);

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

@@ -1,4 +1,4 @@
-import { buildCrudController, serviceHandler } from '../../server/middlewares.js';
+import { buildCrudController, serviceHandler } from '../../server/network/middlewares.js';
 import { IpfsService } from './ipfs.service.js';
 
 const IpfsController = buildCrudController(IpfsService, {

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

@@ -1,6 +1,6 @@
 import express from 'express';
-import { registerCrudRoutes } from '../../server/middlewares.js';
-import { adminGuard } from '../../server/auth.js';
+import { registerCrudRoutes } from '../../server/network/middlewares.js';
+import { adminGuard } from '../../server/security/auth.js';
 import { IpfsController } from './ipfs.controller.js';
 
 class IpfsRouter {

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

@@ -1,6 +1,6 @@
 import { DataBaseProviderService } from '../../db/DataBaseProvider.js';
-import { loggerFactory } from '../../server/logger.js';
-import { DataQuery } from '../../server/data-query.js';
+import { loggerFactory } from '../../server/ops/logger.js';
+import { DataQuery } from '../../server/storage/data-query.js';
 import { IpfsClient } from '../../projects/cyberia/ipfs-client.js';
 import { IpfsDto } from './ipfs.model.js';
 const logger = loggerFactory(import.meta);

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

@@ -1,4 +1,4 @@
-import { buildCrudController, controllerHandler, sendBlob, serviceHandler } from '../../server/middlewares.js';
+import { buildCrudController, controllerHandler, sendBlob, serviceHandler } from '../../server/network/middlewares.js';
 import { ObjectLayerService } from './object-layer.service.js';
 
 const ObjectLayerController = buildCrudController(ObjectLayerService, {