cyberia 3.2.9 → 3.2.22

package/src/db/mongo/MongooseDB.js

@@ -1,6 +1,6 @@
 import mongoose from 'mongoose';
-import { loggerFactory } from '../../server/logger.js';
 import { getCapVariableName } from '../../client/components/core/CommonJs.js';
+import { loggerFactory } from '../../server/logger.js';
 
 /**
  * Module for connecting to and loading models for a MongoDB database using Mongoose.
@@ -10,6 +10,32 @@ import { getCapVariableName } from '../../client/components/core/CommonJs.js';
 
 const logger = loggerFactory(import.meta);
 
+const MONGODB_SERVICE_NAME = 'mongodb-service';
+const MONGODB_STATEFULSET_NAME = 'mongodb';
+const MONGODB_DEFAULT_AUTH_SOURCE = 'admin';
+const MONGODB_DEFAULT_REPLICA_SET = 'rs0';
+const MONGODB_DEFAULT_REPLICA_COUNT = 3;
+
+/**
+ * Resolves MongoDB replica hosts from explicit input or StatefulSet defaults.
+ * @param {{hostList?: string, replicaCount?: number}} [options] - Host resolution options.
+ * @returns {Array<string>} Normalized host:port entries.
+ */
+const resolveMongoReplicaHosts = ({ hostList = '', replicaCount = MONGODB_DEFAULT_REPLICA_COUNT }) => {
+  if (hostList) {
+    return hostList
+      .split(',')
+      .map((host) => host.trim())
+      .filter(Boolean)
+      .map((host) => (host.includes(':') ? host : `${host}:27017`));
+  }
+
+  return Array.from(
+    { length: replicaCount },
+    (_, index) => `${MONGODB_STATEFULSET_NAME}-${index}.${MONGODB_SERVICE_NAME}:27017`,
+  );
+};
+
 /**
  * @class
  * @alias MongooseDBService
@@ -23,35 +49,110 @@ const logger = loggerFactory(import.meta);
  * 3. No built-in defaults — both `host` and `name` are required from the caller or environment.
  */
 class MongooseDBService {
+  /**
+   * Normalizes Mongo host inputs into plain host:port entries.
+   * @param {Array<string>|string} hosts - Host input as list or comma-separated string.
+   * @returns {Array<string>} Normalized host:port entries.
+   */
+  normalizeHosts(hosts) {
+    const hostEntries = Array.isArray(hosts) ? hosts : `${hosts || ''}`.split(',');
+
+    return hostEntries
+      .map((entry) => `${entry || ''}`.trim())
+      .filter(Boolean)
+      .map((entry) => entry.replace(/^mongodb:\/\//, '').replace(/\/.*$/, ''));
+  }
+
+  /**
+   * Normalizes connection config from object or legacy host/name signature.
+   * @param {object|string} configOrHost - Connection config object or host string.
+   * @param {string} [name] - Legacy DB name when using host string input.
+   * @returns {{authSource: string, dbName: string, directConnection: boolean, hosts: Array<string>, password: string, replicaSet: string, user: string}} Normalized config.
+   */
+  normalizeConfig(configOrHost, name) {
+    const config =
+      typeof configOrHost === 'object' && configOrHost !== null ? { ...configOrHost } : { host: configOrHost, name };
+
+    const rawHosts = config.host || process.env.DB_HOST;
+    const hosts = this.normalizeHosts(rawHosts);
+    const dbName = config.name || process.env.DB_NAME;
+
+    if (!hosts.length || !dbName) {
+      const missing = [!hosts.length && 'host (db.host|DB_HOST)', !dbName && 'name (db.name|DB_NAME)']
+        .filter(Boolean)
+        .join(', ');
+      throw new Error(`MongooseDBService.connect: missing required parameter(s): ${missing}`);
+    }
+
+    const user = config.user || process.env.DB_USER || '';
+    const password = config.password || process.env.DB_PASSWORD || '';
+    const hasExplicitReplicaSet = !!(config.replicaSet || process.env.DB_REPLICA_SET);
+    const directConnection = hosts.length === 1 && !hasExplicitReplicaSet;
+    const replicaSet = directConnection
+      ? ''
+      : config.replicaSet || process.env.DB_REPLICA_SET || MONGODB_DEFAULT_REPLICA_SET;
+    const authSource = config.authSource || process.env.DB_AUTH_SOURCE || (user ? MONGODB_DEFAULT_AUTH_SOURCE : '');
+
+    return {
+      authSource,
+      dbName,
+      directConnection,
+      hosts,
+      password,
+      replicaSet,
+      user,
+    };
+  }
+
+  /**
+   * Builds a MongoDB URI from normalized config options.
+   * @param {object|string} configOrHost - Connection config object or host string.
+   * @param {string} [name] - Legacy DB name when using host string input.
+   * @returns {string} MongoDB connection URI.
+   */
+  buildUri(configOrHost, name) {
+    const config = this.normalizeConfig(configOrHost, name);
+    const credentials =
+      config.user && config.password
+        ? `${encodeURIComponent(config.user)}:${encodeURIComponent(config.password)}@`
+        : '';
+    const query = new URLSearchParams();
+
+    if (config.directConnection) query.set('directConnection', 'true');
+    else if (config.replicaSet) query.set('replicaSet', config.replicaSet);
+    if (config.authSource) query.set('authSource', config.authSource);
+
+    return `mongodb://${credentials}${config.hosts.join(',')}/${config.dbName}${query.size ? `?${query.toString()}` : ''}`;
+  }
+
   /**
    * Establishes a Mongoose connection to the specified MongoDB instance.
    *
    * @async
-   * @param {string} host - The MongoDB host URI (e.g., `'mongodb://localhost:27017'`).
-   *   Falls back to `process.env.DB_HOST` when not provided.
-   * @param {string} name - The database name.
-   *   Falls back to `process.env.DB_NAME` when not provided.
+   * @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(host, name) {
-    host = host || process.env.DB_HOST;
-    name = name || process.env.DB_NAME;
-
-    if (!host || !name) {
-      const missing = [!host && 'host (DB_HOST)', !name && 'name (DB_NAME)'].filter(Boolean).join(', ');
-      throw new Error(`MongooseDBService.connect: missing required parameter(s): ${missing}`);
-    }
-
-    const uri = `${host}/${name}`;
-    // logger.info('MongooseDB connect', { host, name, uri });
+  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,
-        // readPreference: 'primary',
-        // directConnection: true,
-        // useNewUrlParser: true,
-        // useUnifiedTopology: true,
+        socketTimeoutMS: 45000,
       })
       .asPromise();
   }
@@ -87,4 +188,12 @@ class MongooseDBService {
  */
 const MongooseDB = new MongooseDBService();
 
-export { MongooseDB, MongooseDBService as MongooseDBClass };
+export {
+  MongooseDB,
+  MongooseDBService as MongooseDBClass,
+  MONGODB_DEFAULT_REPLICA_COUNT,
+  MONGODB_DEFAULT_REPLICA_SET,
+  MONGODB_SERVICE_NAME,
+  MONGODB_STATEFULSET_NAME,
+  resolveMongoReplicaHosts,
+};

package/src/grpc/cyberia/grpc-server.js

@@ -13,13 +13,15 @@ import * as protoLoader from '@grpc/proto-loader';
 import crypto from 'crypto';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { DataBaseProvider } from '../../db/DataBaseProvider.js';
+import { DataBaseProviderService } from '../../db/DataBaseProvider.js';
 import { loggerFactory } from '../../server/logger.js';
 import {
   CYBERIA_INSTANCE_CONF_DEFAULTS as FALLBACK_CONFIG_DEFAULTS,
   ENTITY_TYPE_DEFAULTS,
-  STATUS_ICONS,
-} from '../../api/cyberia-instance-conf/cyberia-instance-conf.defaults.js';
+  // STATUS_ICONS deliberately not imported here — see toInstanceConfig.
+  // Server simulation only cares about the numeric u8 IDs (which travel on
+  // the AOI wire). Icon stems + border colours live in SharedDefaultsCyberia.
+} from '../../api/cyberia-server-defaults/cyberia-server-defaults.js';
 import { generateFallbackWorld } from '../../api/cyberia-instance/cyberia-fallback-world.js';
 
 const logger = loggerFactory(import.meta);
@@ -27,7 +29,7 @@ const logger = loggerFactory(import.meta);
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-const PROTO_PATH = path.resolve(__dirname, '../../../cyberia-server/proto/cyberia.proto');
+const PROTO_PATH = path.resolve(__dirname, '../../../cyberia-server/gen/proto/cyberia.proto');
 
 const packageDefinition = protoLoader.loadSync(PROTO_PATH, {
   keepCase: false,
@@ -44,11 +46,11 @@ const proto = grpc.loadPackageDefinition(packageDefinition).cyberia;
 // ═══════════════════════════════════════════════════════════════════
 
 function getModels(dbKey) {
-  const bucket = DataBaseProvider.instance[dbKey];
-  if (!bucket || !bucket.mongoose || !bucket.mongoose.models) {
-    throw new Error(`DataBaseProvider not loaded for key "${dbKey}"`);
+  const bucket = DataBaseProviderService.getProvider(dbKey, 'mongoose');
+  if (!bucket || !bucket.models) {
+    throw new Error(`DataBaseProviderService not loaded for key "${dbKey}"`);
   }
-  return bucket.mongoose.models;
+  return bucket.models;
 }
 
 function countSharedItemIds(source = [], target = []) {
@@ -72,7 +74,6 @@ function normalizeEntityDefault(entityDefault = {}, canonical = {}) {
     liveItemIds: [...(entityDefault.liveItemIds ?? canonical.liveItemIds ?? [])],
     deadItemIds: [...(entityDefault.deadItemIds ?? canonical.deadItemIds ?? [])],
     dropItemIds: [...(entityDefault.dropItemIds ?? canonical.dropItemIds ?? [])],
-    colorKey: entityDefault.colorKey ?? canonical.colorKey ?? '',
     defaultObjectLayers: defaultObjectLayers.map((ol) => ({
       itemId: ol.itemId || '',
       active: !!ol.active,
@@ -96,10 +97,6 @@ function selectCanonicalEntityDefaultIndex(entityDefault, canonicalDefaults, use
       if (firstSameTypeIndex === -1) {
         firstSameTypeIndex = index;
       }
-      if (entityDefault.colorKey && canonical.colorKey === entityDefault.colorKey) {
-        return index;
-      }
-
       const liveOverlap = countSharedItemIds(entityDefault.liveItemIds, canonical.liveItemIds);
       if (
         liveOverlap > 0 &&
@@ -264,36 +261,24 @@ function toInstanceConfig(gc) {
   const fb = FALLBACK_CONFIG_DEFAULTS;
   if (!gc) return buildFallbackConfig();
 
-  // Per-key merge: start with canonical defaults, overlay any DB-defined colours.
-  const dbColorMap = new Map((gc.colors || []).map((c) => [c.key, c]));
-  const colors = fb.colors.map((c) => {
-    const ov = dbColorMap.get(c.key);
-    return ov ? { key: c.key, r: ov.r ?? c.r, g: ov.g ?? c.g, b: ov.b ?? c.b, a: ov.a ?? c.a } : { ...c };
-  });
-  // Append any DB colours whose keys are absent from the canonical defaults.
-  for (const [key, c] of dbColorMap) {
-    if (!colors.some((fc) => fc.key === key)) {
-      colors.push({ key, r: c.r ?? 0, g: c.g ?? 0, b: c.b ?? 0, a: c.a ?? 255 });
-    }
-  }
+  // STRICT BOUNDARY — this function produces the *simulation* config for
+  // cyberia-server only. Every presentation concern is excluded:
+  //
+  //   - palette (colors), camera tunings, screen factors, devUi,
+  //     interpolationMs, status-icon visuals, entityDefaults[].colorKey,
+  //     cellSize, defaultObj* — all of these reach the client through
+  //     /api/cyberia-client-hints, never through gRPC.
+  //
+  // The Go simulation does not need any of them to advance world state;
+  // the C/WASM cyberia-client owns its own render policy. See
+  // src/client/components/cyberia/SharedDefaultsCyberia.js.
 
-  // Merge entity defaults while preserving duplicate builds (for example,
-  // multiple resource or portal variants sharing the same entityType).
   const gcDefaults = gc.entityDefaults && gc.entityDefaults.length > 0 ? gc.entityDefaults : [];
   const entityDefaults = mergeEntityDefaults(gcDefaults);
 
   return {
-    cellSize: gc.cellSize ?? fb.cellSize,
-    fps: gc.fps ?? fb.fps,
-    interpolationMs: gc.interpolationMs ?? fb.interpolationMs,
-    defaultObjWidth: gc.defaultObjWidth ?? fb.defaultObjWidth,
-    defaultObjHeight: gc.defaultObjHeight ?? fb.defaultObjHeight,
-    cameraSmoothing: gc.cameraSmoothing ?? fb.cameraSmoothing,
-    cameraZoom: gc.cameraZoom ?? fb.cameraZoom,
-    defaultWidthScreenFactor: gc.defaultWidthScreenFactor ?? fb.defaultWidthScreenFactor,
-    defaultHeightScreenFactor: gc.defaultHeightScreenFactor ?? fb.defaultHeightScreenFactor,
-    devUi: gc.devUi ?? fb.devUi,
-    colors,
+    tickRate: gc.tickRate ?? fb.tickRate,
+    snapshotRate: gc.snapshotRate ?? fb.snapshotRate,
     aoiRadius: gc.aoiRadius ?? fb.aoiRadius,
     portalHoldTimeMs: gc.portalHoldTimeMs ?? fb.portalHoldTimeMs,
     portalSpawnRadius: gc.portalSpawnRadius ?? fb.portalSpawnRadius,
@@ -352,23 +337,6 @@ function toInstanceConfig(gc) {
       onePerType: gc.equipmentRules?.onePerType ?? fb.equipmentRules.onePerType,
       requireSkin: gc.equipmentRules?.requireSkin ?? fb.equipmentRules.requireSkin,
     },
-    // Status icon mapping — u8 ID → icon filename stem + border colour.
-    // Border colours come from the frozen STATUS_ICONS constant (canonical
-    // source of truth).  DB entries may override iconId but borderColor is
-    // always canonical — the DB schema defaults are generic grey, not the
-    // actual per-status colours.
-    statusIcons: STATUS_ICONS.map((canon) => {
-      const dbEntry = (gc.statusIcons || []).find((s) => s.id === canon.id);
-      const bc = canon.borderColor || {};
-      return {
-        id: canon.id,
-        iconId: (dbEntry && dbEntry.iconId) || canon.iconId || '',
-        borderColorR: bc.r ?? 100,
-        borderColorG: bc.g ?? 100,
-        borderColorB: bc.b ?? 100,
-        borderColorA: bc.a ?? 200,
-      };
-    }),
   };
 }
 
@@ -598,8 +566,8 @@ class GrpcServer {
 
   /**
    * @param {Object} opts
-   * @param {string} opts.host  - DataBaseProvider host key
-   * @param {string} opts.path  - DataBaseProvider path key
+   * @param {string} opts.host  - DataBaseProviderService host key
+   * @param {string} opts.path  - DataBaseProviderService path key
    * @param {number} [opts.port=50051]
    */
   static async start({ host, path: dbPath, port = 50051 } = {}) {

package/src/index.js

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

package/src/runtime/cyberia-client/Dockerfile

@@ -1,9 +1,9 @@
 # BUILD_MODE: RELEASE | DEBUG
 ARG BUILD_MODE=RELEASE
 
-# --- Build Image
+# --- Build Image ---
 FROM rockylinux/rockylinux:9 AS builder
-# Re-declare ARG after FROM so it is in scope for RUN
+
 ARG BUILD_MODE=RELEASE
 
 RUN dnf -y update && \
@@ -44,7 +44,6 @@ RUN dnf groupinstall -y "Development Tools" && \
 ENV EMSDK=/opt/emsdk
 ENV PATH="${EMSDK}:${EMSDK}/upstream/emscripten:${PATH}"
 
-# Pin emsdk version for reproducible builds
 ARG EMSDK_VERSION=5.0.6
 WORKDIR /opt
 RUN git clone https://github.com/emscripten-core/emsdk.git ${EMSDK}
@@ -53,19 +52,23 @@ RUN ./emsdk install ${EMSDK_VERSION} && \
     ./emsdk activate ${EMSDK_VERSION}
 
 WORKDIR /cyberia-client
-COPY cyberia-client/ .
 
-RUN make -f Web.mk all BUILD_MODE=${BUILD_MODE} OUTPUT_DIR=bin/
+COPY . .
+
+RUN make -f Web.mk clean && make -f Web.mk all BUILD_MODE=${BUILD_MODE} OUTPUT_DIR=bin/
 
-# --- Runtime Image
+# --- Runtime Image ---
 FROM rockylinux/rockylinux:9 AS runtime
 
+ARG UNDERPOST_VERSION=3.2.9
 RUN dnf -y update && \
     dnf -y install epel-release && \
     dnf -y install --allowerasing curl git python3 && \
     curl -fsSL https://rpm.nodesource.com/setup_24.x | bash - && \
     dnf install -y nodejs && \
-    dnf clean all
+    npm install -g underpost@${UNDERPOST_VERSION} && \
+    dnf clean all && \
+    npm cache clean --force
 
 WORKDIR /home/dd/engine/cyberia-client
 

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

@@ -0,0 +1,67 @@
+# cyberia-client DEV runtime image.
+
+ARG BUILD_MODE=DEBUG
+
+# --- Build Image ---
+FROM rockylinux/rockylinux:9 AS builder
+ARG BUILD_MODE=DEBUG
+
+RUN dnf -y update && \
+    dnf -y install epel-release && \
+    dnf -y install --allowerasing \
+    git curl wget openssl-devel libnsl perl gnupg2 bzip2 && \
+    dnf clean all
+
+RUN dnf groupinstall -y "Development Tools" && \
+    dnf install -y \
+        cmake unzip python3 python3.11 \
+        alsa-lib-devel mesa-libGL-devel mesa-libGLU-devel \
+        libX11-devel libXrandr-devel libXi-devel libXcursor-devel \
+        libXinerama-devel libXfixes-devel \
+        freeglut-devel glfw-devel libatomic.x86_64 && \
+    dnf clean all && \
+    alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 2 && \
+    alternatives --set python3 /usr/bin/python3.11
+
+ENV EMSDK=/opt/emsdk
+ENV PATH="${EMSDK}:${EMSDK}/upstream/emscripten:${PATH}"
+
+ARG EMSDK_VERSION=5.0.6
+WORKDIR /opt
+RUN git clone https://github.com/emscripten-core/emsdk.git ${EMSDK}
+WORKDIR ${EMSDK}
+RUN ./emsdk install ${EMSDK_VERSION} && \
+    ./emsdk activate ${EMSDK_VERSION}
+
+WORKDIR /cyberia-client
+
+COPY . .
+
+# Dev build: BUILD_MODE=DEBUG keeps symbols, asserts, source maps.
+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.9
+RUN dnf -y update && \
+    dnf -y install epel-release && \
+    dnf -y install --allowerasing \
+        curl git python3 \
+        procps-ng strace lsof vim-minimal && \
+    curl -fsSL https://rpm.nodesource.com/setup_24.x | bash - && \
+    dnf install -y nodejs && \
+    npm install -g underpost@${UNDERPOST_VERSION} && \
+    dnf clean all
+
+WORKDIR /home/dd/engine/cyberia-client
+
+COPY --from=builder /cyberia-client/server.py ./server.py
+COPY --from=builder /cyberia-client/bin       ./bin/
+
+ENV CYBERIA_PORT=8082
+ENV CYBERIA_MODE=development
+
+EXPOSE 8081 8082
+
+CMD ["sh", "-c", "exec python3 server.py ${CYBERIA_PORT} bin ${CYBERIA_MODE}"]

package/src/runtime/cyberia-server/Dockerfile

@@ -1,4 +1,4 @@
-# --- Build Image
+# --- Build Image ---
 FROM rockylinux/rockylinux:9 AS builder
 
 RUN dnf -y update && \
@@ -11,27 +11,32 @@ RUN dnf -y update && \
 
 WORKDIR /build
 
-# Cache dependency downloads independently of source changes
-COPY cyberia-server/go.mod cyberia-server/go.sum ./
+
+COPY go.mod go.sum ./
 RUN go mod download
 
-COPY cyberia-server/ ./
+COPY . ./
 RUN chmod +x build.sh && ./build.sh
 
-# --- Runtime Image
+# --- Runtime Image ---
 FROM rockylinux/rockylinux:9 AS runtime
 
+ARG UNDERPOST_VERSION=3.2.9
 RUN dnf -y update && \
     dnf -y install epel-release && \
     dnf -y install --allowerasing curl git && \
     curl -fsSL https://rpm.nodesource.com/setup_24.x | bash - && \
     dnf install -y nodejs && \
-    dnf clean all
+    npm install -g underpost@${UNDERPOST_VERSION} && \
+    dnf clean all && \
+    npm cache clean --force
 
 WORKDIR /home/dd/engine/cyberia-server
 
 COPY --from=builder /build/server ./server
 
+COPY public/ ./public/
+
 EXPOSE 8081
 
 ENTRYPOINT ["/home/dd/engine/cyberia-server/server"]

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

@@ -0,0 +1,47 @@
+# cyberia-server DEV runtime image.
+
+# --- Build Image ---
+FROM rockylinux/rockylinux:9 AS builder
+
+RUN dnf -y update && \
+    dnf -y install epel-release && \
+    dnf -y install --allowerasing \
+    git \
+    make \
+    golang && \
+    dnf clean all
+
+WORKDIR /build
+
+COPY go.mod go.sum ./
+RUN go mod download
+
+COPY . ./
+
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
+      go build -gcflags="all=-N -l" -o server ./cmd/cyberia-server/ && \
+    echo "DEV build complete: $(pwd)/server"
+
+# --- Runtime Image ---
+FROM rockylinux/rockylinux:9 AS runtime
+
+ARG UNDERPOST_VERSION=3.2.9
+RUN dnf -y update && \
+    dnf -y install epel-release && \
+    dnf -y install --allowerasing \
+        curl git \
+        procps-ng strace lsof vim-minimal && \
+    curl -fsSL https://rpm.nodesource.com/setup_24.x | bash - && \
+    dnf install -y nodejs && \
+    npm install -g underpost@${UNDERPOST_VERSION} && \
+    dnf clean all
+
+WORKDIR /home/dd/engine/cyberia-server
+
+COPY --from=builder /build/server ./server
+
+COPY public/ ./public/
+
+EXPOSE 8081
+
+ENTRYPOINT ["/home/dd/engine/cyberia-server/server"]

package/src/runtime/express/Express.js

@@ -15,7 +15,7 @@ import { createServer } from 'http';
 import { loggerFactory, loggerMiddleware } from '../../server/logger.js';
 import { getCapVariableName, newInstance } from '../../client/components/core/CommonJs.js';
 import { MailerProvider } from '../../mailer/MailerProvider.js';
-import { DataBaseProvider } from '../../db/DataBaseProvider.js';
+import { DataBaseProviderService } from '../../db/DataBaseProvider.js';
 import { createPeerServer } from '../../server/peer.js';
 import { createValkeyConnection } from '../../server/valkey.js';
 import { applySecurity, authMiddlewareFactory } from '../../server/auth.js';
@@ -192,7 +192,7 @@ class ExpressService {
       }
 
       // Database and Valkey connections
-      if (db && apis) await DataBaseProvider.load({ apis, host, path, db });
+      if (db && apis) await DataBaseProviderService.load({ apis, host, path, db });
 
       if (valkey) await createValkeyConnection({ host, path }, valkey);
 

package/src/runtime/wp/Dockerfile

@@ -3,7 +3,7 @@ FROM rockylinux:9
 # System packages 
 RUN dnf -y update && \
     dnf -y install epel-release && \
-    dnf -y install --allowerasing \
+    dnf -y install --allowerasing --nobest \
     bzip2 \
     sudo \
     curl \
@@ -20,8 +20,8 @@ RUN dnf -y update && \
     perl && \
     dnf clean all
 
-# Download and install XAMPP (PHP 8.2)
-RUN curl -L -o /tmp/xampp-linux-installer.run "https://sourceforge.net/projects/xampp/files/XAMPP%20Linux/8.2.12/xampp-linux-x64-8.2.12-0-installer.run" && \
+# Download and install XAMPP (PHP 8.2) with retry logic for flaky SourceForge transfers
+RUN curl -L --retry 5 --retry-delay 10 --retry-max-time 180 -o /tmp/xampp-linux-installer.run "https://sourceforge.net/projects/xampp/files/XAMPP%20Linux/8.2.12/xampp-linux-x64-8.2.12-0-installer.run" && \
     chmod +x /tmp/xampp-linux-installer.run && \
     bash -c "/tmp/xampp-linux-installer.run --mode unattended" && \
     ln -sf /opt/lampp/lampp /usr/bin/lampp

package/src/runtime/wp/Wp.js

@@ -56,10 +56,11 @@ class WpService {
    * to `/usr/local/bin/wp` if it is not already present.
    */
   static ensureWpCli() {
-    const existing = shellExec(`PATH="${LAMPP_BIN}:$PATH" which wp 2>/dev/null || true`, {
+    const existing = shellExec(`PATH="${LAMPP_BIN}:$PATH" which wp`, {
       stdout: true,
       silent: true,
       disableLog: true,
+      silentOnError: true,
     });
     if (existing && existing.trim()) return;
     logger.info('WP-CLI not found — installing to /usr/local/bin/wp');
@@ -76,10 +77,11 @@ class WpService {
    */
   static ensureSendmail() {
     const sendmailPath = '/usr/sbin/sendmail';
-    const existing = shellExec(`test -x "${sendmailPath}" && echo ok || true`, {
+    const existing = shellExec(`test -x "${sendmailPath}" && echo ok`, {
       stdout: true,
       silent: true,
       disableLog: true,
+      silentOnError: true,
     });
     if (existing && existing.trim() === 'ok') return;
     logger.info('sendmail stub missing — creating no-op at /usr/sbin/sendmail');
@@ -494,7 +496,7 @@ Thumbs.db
    * `git clone` yields a fully working site without needing a fresh install.
    *
    * Safe to call repeatedly — `git commit` is a no-op when the working tree
-   * is clean (`|| true` prevents non-zero exit).
+   * is clean (`silentOnError: true` swallows the non-zero exit gracefully).
    *
    * @param {object} opts
    * @param {string}      opts.siteRoot   - Absolute path to the WordPress root.
@@ -514,7 +516,8 @@ Thumbs.db
 
     logger.info(`${host}: persisting site to repository`);
     shellExec(
-      `cd "${siteRoot}" && git add -A && git commit -m "wp provision ${host} $(date -u +%Y-%m-%dT%H:%M:%SZ)" || true`,
+      `cd "${siteRoot}" && git add -A && git commit -m "wp provision ${host} $(date -u +%Y-%m-%dT%H:%M:%SZ)"`,
+      { silentOnError: true },
     );
     shellExec(`cd "${siteRoot}" && underpost push . ${githubOrg}/${repoName} -f`);
     logger.info(`${host}: initial commit pushed to ${githubOrg}/${repoName}`);
@@ -627,7 +630,7 @@ if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROT
 
     // MariaDB export is handled by the shared db.js backup flow — no duplicate dump here.
     if (fs.existsSync(path.join(siteRoot, '.git'))) {
-      shellExec(`cd "${siteRoot}" && git add -A && git commit -m "wp backup $(date -u +%Y-%m-%dT%H:%M:%SZ)" || true`);
+      shellExec(`cd "${siteRoot}" && git add -A && git commit -m "wp backup $(date -u +%Y-%m-%dT%H:%M:%SZ)"`, { silentOnError: true });
       shellExec(`cd "${siteRoot}" && underpost push . ${githubOrg}/${repository.split('/').pop().split('.')[0]}`);
       logger.info(`backup: git push done for ${siteRoot}`);
     } else {

package/src/server/auth.js

@@ -20,7 +20,7 @@ import rateLimit from 'express-rate-limit';
 import slowDown from 'express-slow-down';
 import cors from 'cors';
 import cookieParser from 'cookie-parser';
-import { DataBaseProvider } from '../db/DataBaseProvider.js';
+import { DataBaseProviderService } from '../db/DataBaseProvider.js';
 import { isDevProxyContext } from './conf.js';
 
 const logger = loggerFactory(import.meta);
@@ -229,7 +229,7 @@ const authMiddlewareFactory = (options = { host: '', path: '' }) => {
 
       // Non-guest verify session exists
       if (payload.jwtid && payload.role !== 'guest') {
-        const User = DataBaseProvider.instance[`${payload.host}${payload.path}`].mongoose.models.User;
+        const User = DataBaseProviderService.getModel('user', { host: payload.host, path: payload.path });
         const user = await User.findOne({ _id: payload._id, 'activeSessions._id': payload.jwtid }).lean();
 
         if (!user) {