@underpostnet/cyberia 3.2.80 → 3.2.90

package/src/db/mongo/MongooseDB.js

@@ -15,6 +15,30 @@ const MONGODB_STATEFULSET_NAME = 'mongodb';
 const MONGODB_DEFAULT_AUTH_SOURCE = 'admin';
 const MONGODB_DEFAULT_REPLICA_SET = 'rs0';
 const MONGODB_DEFAULT_REPLICA_COUNT = 3;
+// Node-local base path backing the hostPath PVs (`<root>/v<replica index>`),
+// generated one-per-replica by MongoBootstrap.applyReplicaVolumes().
+const MONGODB_DATA_ROOT = '/data/mongodb';
+// Replica volumes are hostPath PVs generated one per member, each pinned by `claimRef`. The class
+// must stay static: a dynamic provisioner competes with the static binder and makes
+// member-to-directory assignment non-deterministic.
+const MONGODB_STORAGE_CLASS_NAME = 'mongodb-storage-class';
+const MONGODB_STORAGE_CLASS_PROVISIONER = 'kubernetes.io/no-provisioner';
+/**
+ * Mongoose connection options for MongoDB, with sensible defaults for production and development environments.
+ * @type {import('mongoose').ConnectOptions}
+ */
+const MONGODB_CONNECTION_OPTIONS = {
+  autoIndex: process.env.NODE_ENV !== 'production',
+  heartbeatFrequencyMS: 10000,
+  maxConnecting: 2,
+  maxPoolSize: 10,
+  minPoolSize: 0,
+  retryReads: true,
+  retryWrites: true,
+  serverSelectionTimeoutMS: 30000,
+  socketTimeoutMS: 120000,
+  waitQueueTimeoutMS: 10000,
+};
 
 /**
  * Resolves MongoDB replica hosts from explicit input or StatefulSet defaults.
@@ -49,6 +73,26 @@ const resolveMongoReplicaHosts = ({ hostList = '', replicaCount = MONGODB_DEFAUL
  * 3. No built-in defaults — both `host` and `name` are required from the caller or environment.
  */
 class MongooseDBService {
+  /**
+   * Establishes a Mongoose connection to the specified MongoDB instance.
+   *
+   * @async
+   * @param {object|string} configOrHost - Either a db config object or a legacy host string.
+   * @param {string} [configOrHost.host] - Legacy single host or comma-separated host list.
+   * @param {string} [configOrHost.name] - The database name.
+   * @param {string} [configOrHost.replicaSet] - The MongoDB replica set name.
+   * @param {string} [configOrHost.authSource] - The authentication database.
+   * @param {string} [configOrHost.user] - The MongoDB username.
+   * @param {string} [configOrHost.password] - The MongoDB password.
+   * @param {string} [name] - Legacy database name when a host string is passed.
+   * @returns {Promise<mongoose.Connection>} A promise that resolves to the established Mongoose connection object.
+   * @throws {Error} If neither the argument nor the corresponding environment variable supplies a value.
+   */
+  async connect(configOrHost, name) {
+    const uri = this.buildUri(configOrHost, name);
+    // if (process.env.NODE_ENV === 'development') logger.info(`Connecting to MongoDB with URI`, uri);
+    return await mongoose.createConnection(uri, MONGODB_CONNECTION_OPTIONS).asPromise();
+  }
   /**
    * Normalizes Mongo host inputs into plain host:port entries.
    * @param {Array<string>|string} hosts - Host input as list or comma-separated string.
@@ -125,38 +169,6 @@ class MongooseDBService {
     return `mongodb://${credentials}${config.hosts.join(',')}/${config.dbName}${query.size ? `?${query.toString()}` : ''}`;
   }
 
-  /**
-   * Establishes a Mongoose connection to the specified MongoDB instance.
-   *
-   * @async
-   * @param {object|string} configOrHost - Either a db config object or a legacy host string.
-   * @param {string} [configOrHost.host] - Legacy single host or comma-separated host list.
-   * @param {string} [configOrHost.name] - The database name.
-   * @param {string} [configOrHost.replicaSet] - The MongoDB replica set name.
-   * @param {string} [configOrHost.authSource] - The authentication database.
-   * @param {string} [configOrHost.user] - The MongoDB username.
-   * @param {string} [configOrHost.password] - The MongoDB password.
-   * @param {string} [name] - Legacy database name when a host string is passed.
-   * @returns {Promise<mongoose.Connection>} A promise that resolves to the established Mongoose connection object.
-   * @throws {Error} If neither the argument nor the corresponding environment variable supplies a value.
-   */
-  async connect(configOrHost, name) {
-    const uri = this.buildUri(configOrHost, name);
-    if (process.env.NODE_ENV === 'development') logger.info(`Connecting to MongoDB with URI`, uri);
-    return await mongoose
-      .createConnection(uri, {
-        autoIndex: process.env.NODE_ENV !== 'production',
-        heartbeatFrequencyMS: 10000,
-        maxPoolSize: 20,
-        minPoolSize: 2,
-        retryReads: true,
-        retryWrites: true,
-        serverSelectionTimeoutMS: 5000,
-        socketTimeoutMS: 45000,
-      })
-      .asPromise();
-  }
-
   /**
    * Dynamically loads Mongoose models for a list of APIs and binds them to the given connection.
    *
@@ -191,9 +203,12 @@ const MongooseDB = new MongooseDBService();
 export {
   MongooseDB,
   MongooseDBService as MongooseDBClass,
+  MONGODB_DATA_ROOT,
   MONGODB_DEFAULT_REPLICA_COUNT,
   MONGODB_DEFAULT_REPLICA_SET,
   MONGODB_SERVICE_NAME,
   MONGODB_STATEFULSET_NAME,
+  MONGODB_STORAGE_CLASS_NAME,
+  MONGODB_STORAGE_CLASS_PROVISIONER,
   resolveMongoReplicaHosts,
 };

package/src/index.js

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

package/src/projects/cyberia/besu-genesis-generator.js

@@ -19,6 +19,7 @@ import path from 'path';
 import { keccak256 as ethersKeccak256 } from 'ethers';
 import { loggerFactory } from '../../server/logger.js';
 import { shellExec } from '../../server/process.js';
+import { crictlCommandFactory } from '../../server/cri.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -1394,8 +1395,8 @@ async function deployBesu(options = {}) {
   // ── Step 2: Pull container images if requested ─────────────────────────
   if (pullImage) {
     logger.info('Pulling Besu images via crictl...');
-    shellExec(`sudo crictl pull ${besuImage}`);
-    shellExec(`sudo crictl pull ${curlImage}`);
+    shellExec(crictlCommandFactory(`pull ${besuImage}`));
+    shellExec(crictlCommandFactory(`pull ${curlImage}`));
   }
 
   // ── Step 3: Apply all besu resources via kustomize ─────────────────────

package/src/projects/cyberia/hot-reload-trigger.js

@@ -51,9 +51,9 @@ const serverApiKey = () => process.env.CYBERIA_SERVER_API_KEY || '';
  *
  * The URL sub-path is preserved as `basePath` ("", "/FOREST", "/TEST") and kept
  * on `restBaseUrl`: a path-based multi-instance proxy routes the REST trigger to
- * the right variant by that prefix (then strips it via pathRewritePolicy, so the
- * backend matches its own instanceCode). Using `url.origin` alone would drop the
- * sub-path and land every trigger on the default (root) deployment.
+ * the right variant, and cyberia-server consumes that same base path natively.
+ * Using `url.origin` alone would drop the sub-path and land every trigger on the
+ * default (root) deployment.
  */
 const resolveTargets = (rawUrl, { grpcPort = DEFAULT_GRPC_PORT } = {}) => {
   const trimmed = String(rawUrl || '').trim();

package/src/projects/cyberia/instance-data.js

@@ -24,11 +24,37 @@ import {
   DefaultCyberiaActions,
   DefaultCyberiaQuests,
 } from '../../api/cyberia-server-defaults/cyberia-server-defaults.js';
-import { DefaultCyberiaItems } from '../../client/components/cyberia/SharedDefaultsCyberia.js';
+import {
+  DEFAULT_INSTANCE_CODE,
+  DefaultCyberiaItems,
+} from '../../client/components/cyberia/SharedDefaultsCyberia.js';
 import { generateFallbackWorld } from '../../api/cyberia-instance/cyberia-fallback-world.js';
 
 const logger = loggerFactory(import.meta);
 
+/**
+ * Builds the runtime env for one Cyberia MMO variant. The generic instance
+ * loader deliberately has no knowledge of these application-specific keys;
+ * Cyberia derives them from the normalized variant path/code here.
+ * @param {object} context - Instance env build context.
+ * @param {object} context.instance - Expanded instance descriptor.
+ * @param {Object<string,string>} context.env - Parsed canonical env values.
+ * @returns {Object<string,string>} Materialized Cyberia env values.
+ */
+function buildCyberiaMmoInstanceEnv({ instance = {}, env = {} }) {
+  const built = { ...env };
+  const instanceCode = instance.path === '/' ? DEFAULT_INSTANCE_CODE : instance.instanceCode;
+  if (instance.runtime === 'cyberia-server') {
+    built.INSTANCE_CODE = instanceCode;
+    built.CYBERIA_BASE_PATH = instance.path;
+  } else if (instance.runtime === 'cyberia-client') {
+    built.CYBERIA_INSTANCE_CODE = instanceCode;
+    built.CYBERIA_DEFAULT_INSTANCE = DEFAULT_INSTANCE_CODE;
+    built.CYBERIA_BASE_PATH = instance.path;
+  }
+  return built;
+}
+
 /**
  * Resolves the mongoose model bag for a DB context.
  * @param {{host?: string, path?: string}|string} context - RouterOptions-style
@@ -304,6 +330,8 @@ function toInstanceMsg(doc) {
   };
 }
 
+const toCraftItemMsg = (i) => ({ itemId: i.itemId || '', qty: i.qty ?? 1 });
+
 // CyberiaAction → CyberiaActionMessage (proto camelCase fields).
 function toActionMsg(a) {
   return {
@@ -317,6 +345,17 @@ function toActionMsg(a) {
       questCode: qd.questCode || '',
       dialogCode: qd.dialogCode || '',
     })),
+    shopItems: (a.shopItems || []).map((si) => ({
+      itemId: si.itemId || '',
+      priceItemId: si.priceItemId || 'coin',
+      priceQty: si.priceQty ?? 1,
+    })),
+    craftRecipes: (a.craftRecipes || []).map((r) => ({
+      outputItems: (r.outputItems || []).map(toCraftItemMsg),
+      ingredients: (r.ingredients || []).map(toCraftItemMsg),
+      craftTimeMs: r.craftTimeMs ?? 0,
+    })),
+    storageSlots: a.storageSlots ?? 0,
   };
 }
 
@@ -693,6 +732,8 @@ async function fetchFullInstance(models, requestedInstanceCode) {
 }
 
 export {
+  buildCyberiaMmoInstanceEnv as buildInstanceEnv,
+  buildCyberiaMmoInstanceEnv,
   getInstanceModels,
   normalizeEntityDefault,
   applyInstanceDefaultPlayerInventory,

package/src/runtime/cyberia-client/Dockerfile

@@ -14,7 +14,7 @@ RUN make -f Web.mk clean all BUILD_MODE=${BUILD_MODE} OUTPUT_DIR=bin/
 
 # --- Runtime Image ---
 FROM rockylinux/rockylinux:9 AS runtime
-ARG UNDERPOST_VERSION=3.2.80
+ARG UNDERPOST_VERSION=3.2.90
 ARG NODE_VERSION=24.15.0
 
 RUN set -eux; \

package/src/runtime/cyberia-client/Dockerfile.dev

@@ -43,7 +43,7 @@ RUN make -f Web.mk all BUILD_MODE=${BUILD_MODE} OUTPUT_DIR=bin/
 # --- Runtime Image ---
 FROM rockylinux/rockylinux:9 AS runtime
 
-ARG UNDERPOST_VERSION=3.2.80
+ARG UNDERPOST_VERSION=3.2.90
 ARG NODE_VERSION=24.15.0
 RUN set -eux; \
     dnf -y update; \

package/src/runtime/cyberia-server/Dockerfile

@@ -11,7 +11,7 @@ RUN CGO_ENABLED=0 go build -trimpath -ldflags="-s -w" -o server ./cmd/cyberia-se
 
 # --- Runtime Image ---
 FROM rockylinux/rockylinux:9 AS runtime
-ARG UNDERPOST_VERSION=3.2.80
+ARG UNDERPOST_VERSION=3.2.90
 ARG NODE_VERSION=24.15.0
 
 RUN set -eux; \

package/src/runtime/cyberia-server/Dockerfile.dev

@@ -25,7 +25,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
 # --- Runtime Image ---
 FROM rockylinux/rockylinux:9 AS runtime
 
-ARG UNDERPOST_VERSION=3.2.80
+ARG UNDERPOST_VERSION=3.2.90
 ARG NODE_VERSION=24.15.0
 RUN set -eux; \
     dnf -y update; \

package/src/runtime/engine-cyberia/Dockerfile

@@ -6,7 +6,7 @@
 # Stage 1 — builder: clone the private deploy, build it, then scrub secrets.
 # ---------------------------------------------------------------------------
 FROM rockylinux/rockylinux:9 AS builder
-ARG UNDERPOST_VERSION=3.2.80
+ARG UNDERPOST_VERSION=3.2.90
 # Pin Node to an exact patch: dnf's nodejs:24 module lags (24.14.1) while
 # underpost's dependencies require >=24.15.0, so install the official binary.
 ARG NODE_VERSION=24.15.0

package/src/runtime/engine-cyberia/Dockerfile.dev

@@ -6,7 +6,7 @@
 # Stage 1 — builder: clone the private deploy, build it, then scrub secrets.
 # ---------------------------------------------------------------------------
 FROM rockylinux/rockylinux:9 AS builder
-ARG UNDERPOST_VERSION=3.2.80
+ARG UNDERPOST_VERSION=3.2.90
 # Pin Node to an exact patch: dnf's nodejs:24 module lags (24.14.1) while
 # underpost's dependencies require >=24.15.0, so install the official binary.
 ARG NODE_VERSION=24.15.0

package/src/runtime/engine-cyberia/Dockerfile.test

@@ -6,7 +6,7 @@
 # Stage 1 — builder: clone the private deploy, build it, then scrub secrets.
 # ---------------------------------------------------------------------------
 FROM rockylinux/rockylinux:9 AS builder
-ARG UNDERPOST_VERSION=3.2.80
+ARG UNDERPOST_VERSION=3.2.90
 # Pin Node to an exact patch: dnf's nodejs:24 module lags (24.14.1) while
 # underpost's dependencies require >=24.15.0, so install the official binary.
 ARG NODE_VERSION=24.15.0

package/src/runtime/engine-cyberia/compose.env

@@ -40,29 +40,27 @@ VALKEY_HOST=valkey-service
 VALKEY_PORT=6379
 
 # --- Cyberia instance wiring (compose service DNS) ---------------------------
-# cyberia-server-* -> engine-cyberia authority endpoints. INTERNAL only: these
-# use the docker service DNS (engine-cyberia) and must never leak to browser
-# clients. Per-instance INSTANCE_CODE is set on each generated server service
-# from conf.instances.json (multiInstance) — not here.
-ENGINE_API_BASE_URL=http://engine-cyberia:4005
-ENGINE_GRPC_ADDRESS=engine-cyberia:50051
+# cyberia-server-* -> stable engine gateway for HTTP and the raw engine runtime
+# for gRPC. The public engine-cyberia name belongs to nginx, avoiding ambiguous
+# Docker DNS while keeping one stable HTTP endpoint for every module.
+ENGINE_API_BASE_URL=http://engine-cyberia
+ENGINE_GRPC_ADDRESS=engine-cyberia-runtime:50051
 
 # Client-visible Content Authority origin, forwarded to browser/Raylib clients
 # for every engine-cyberia content/asset/metadata request. Host-reachable
-# (docker publishes engine-cyberia :4005). Distinct from ENGINE_API_BASE_URL:
+# (Docker publishes the raw engine runtime on host :4005). Unlike the internal
+# ENGINE_API_BASE_URL, this value is consumed outside the Compose network:
 # the two responsibilities must never overwrite each other.
 ENGINE_PUBLIC_URL=http://localhost:4005
 ENGINE_GRPC_RELOAD_INTERVAL_SEC=300
 
 # --- Browser-facing client runtime config (injected by docker-driver.py) -----
 # The single WASM bundle resolves its instance from the URL sub-path and builds
-# its endpoints from these origins. They point at the nginx proxy on localhost:80
-# (the single gateway that path-routes WS -> server, /api + /assets -> engine),
-# NOT at the raw client/engine container ports — a WS to the client port (8082)
-# has no server behind it. So this must be the proxy origin, not :8082 / :4005.
-#   http://localhost/          -> default instance,  ws -> ws://localhost/ws
-#   http://localhost/FOREST    -> FOREST instance,    ws -> ws://localhost/FOREST/ws
-CYBERIA_WS_ORIGIN=ws://localhost
+# its endpoints from these origins. HTTP client/API traffic uses nginx on :80;
+# WebSocket traffic uses the dedicated multi-path server gateway on :8081.
+#   http://localhost/          -> default, ws://localhost:8081/ws
+#   http://localhost/FOREST    -> FOREST,  ws://localhost:8081/FOREST/ws
+CYBERIA_WS_ORIGIN=ws://localhost:8081
 CYBERIA_ENGINE_API_ORIGIN=http://localhost
 CYBERIA_DEFAULT_INSTANCE=amethyst-strata-expansion
 
@@ -82,6 +80,7 @@ NODE_OPTIONS=--max-old-space-size=8192
 BASE_API=api
 DEFAULT_DEPLOY_ID=dd-cyberia
 DEPLOY_ID=dd-cyberia
+# Configuration/DB selector from conf.server.json; this is not a Docker DNS alias.
 DEFAULT_DEPLOY_HOST=www.cyberiaonline.com
 DEFAULT_DEPLOY_PATH=/
 DISABLE_API_RATE_LIMIT=true
@@ -131,7 +130,25 @@ IPFS_CLUSTER_API_URL=http://ipfs-cluster:9094
 # in docker-compose.yml). Override for a real/shared cluster.
 # CLUSTER_SECRET=
 
-# --- Host-published ports ----------------------------------------------------
+# --- Local access ------------------------------------------------------------
+# Client gateway:  http://localhost/{,FOREST,TEST}
+# Client port alias: http://localhost:8082/{,FOREST,TEST}
+# Server gateway:  http://localhost:8081/{,FOREST,TEST}
+# Engine authority: http://localhost:4005
+# Docker-network gateways:
+#   http://cyberia-client/{,FOREST,TEST}
+#   http://cyberia-server/{,FOREST,TEST}
+#   http://engine-cyberia/
+#
+# The *.localhost aliases normally resolve to loopback without configuration:
+#   http://client.cyberia.localhost/{,FOREST,TEST}
+#   http://server.cyberia.localhost/{,FOREST,TEST}
+#   http://engine.cyberia.localhost/
+# `node bin/cyberia run-workflow docker:up` maintains this host entry (the
+# aliases already work between containers):
+#   127.0.0.1 cyberia-client cyberia-server engine-cyberia
+#
+# Host-published ports:
 PROXY_HTTP_PORT=80
 IPFS_API_PORT=5001
 IPFS_GATEWAY_PORT=8080
@@ -140,5 +157,7 @@ MONGO_HOST_PORT=27017
 VALKEY_NODEPORT=32079
 ENGINE_CYBERIA_REST_PORT=4005
 ENGINE_CYBERIA_GRPC_PORT=50051
+# Multi-path nginx server gateway, not a single server container publication.
 CYBERIA_SERVER_PORT=8081
+# Multi-path nginx client gateway; raw client containers remain internal.
 CYBERIA_CLIENT_PORT=8082