cyberia 3.2.22 → 3.2.70

package/src/{server → projects/cyberia}/ipfs-client.js

@@ -11,8 +11,8 @@
  * @namespace IpfsClient
  */
 import stringify from 'fast-json-stable-stringify';
-import { loggerFactory } from './logger.js';
-import Underpost from '../index.js';
+import { loggerFactory } from '../../server/logger.js';
+import Underpost from '../../index.js';
 const logger = loggerFactory(import.meta);
 const DEFAULT_IPFS_HTTP_TIMEOUT_MS = Number(process.env.IPFS_HTTP_TIMEOUT_MS || 10000);
 const getRequestTimeoutMs = (kind = 'kubo') => {

package/src/{server → projects/cyberia}/object-layer.js

@@ -1,7 +1,7 @@
 /**
  * Provides utilities and engine logic for processing and managing Cyberia Online's object layer assets (skins, floors, weapons, etc.).
  * Shared logic consumed by both the Cyberia CLI and the REST API service layer.
- * @module src/server/object-layer.js
+ * @module src/projects/cyberia/object-layer.js
  * @namespace CyberiaObjectLayer
  */
 
@@ -13,9 +13,13 @@ import { Jimp, intToRGBA, rgbaToInt } from 'jimp';
 import crypto from 'crypto';
 import stringify from 'fast-json-stable-stringify';
 
-import { range } from '../client/components/core/CommonJs.js';
-import { random } from '../client/components/core/CommonJs.js';
-import { loggerFactory } from '../server/logger.js';
+import { range } from '../../client/components/core/CommonJs.js';
+import {
+  generateRandomStats,
+  getKeyframeDirectionsByCode,
+  OBJECT_LAYER_DIRECTION_NAME_TO_CODE,
+} from '../../client/components/cyberia/SharedDefaultsCyberia.js';
+import { loggerFactory } from '../../server/logger.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -206,46 +210,6 @@ export class ObjectLayerEngine {
     return { frame, colors };
   }
 
-  /**
-   * Converts a numerical folder direction (e.g., '08', '14') into an array of corresponding keyframe names (e.g., 'down_idle', 'left_walking').
-   * @static
-   * @param {string} direction - The numerical direction string.
-   * @returns {string[]} An array of keyframe direction names.
-   * @memberof CyberiaObjectLayer
-   */
-  static getKeyFramesDirectionsFromNumberFolderDirection(direction) {
-    let objectLayerFrameDirections = [];
-
-    switch (direction) {
-      case '08':
-        objectLayerFrameDirections = ['down_idle', 'none_idle', 'default_idle'];
-        break;
-      case '18':
-        objectLayerFrameDirections = ['down_walking'];
-        break;
-      case '02':
-        objectLayerFrameDirections = ['up_idle'];
-        break;
-      case '12':
-        objectLayerFrameDirections = ['up_walking'];
-        break;
-      case '04':
-        objectLayerFrameDirections = ['left_idle', 'up_left_idle', 'down_left_idle'];
-        break;
-      case '14':
-        objectLayerFrameDirections = ['left_walking', 'up_left_walking', 'down_left_walking'];
-        break;
-      case '06':
-        objectLayerFrameDirections = ['right_idle', 'up_right_idle', 'down_right_idle'];
-        break;
-      case '16':
-        objectLayerFrameDirections = ['right_walking', 'up_right_walking', 'down_right_walking'];
-        break;
-    }
-
-    return objectLayerFrameDirections;
-  }
-
   /**
    * Processes an image file through {@link ObjectLayerEngine.frameFactory} and adds the resulting frame to the render data structure.
    * Updates the color palette and pushes the frame to all keyframe directions corresponding to the given direction code.
@@ -278,7 +242,7 @@ export class ObjectLayerEngine {
     objectLayerRenderFramesData.colors = processedObjectLayerRenderFramesData.colors;
 
     // Get all keyframe directions for this direction code
-    const keyframeDirections = ObjectLayerEngine.getKeyFramesDirectionsFromNumberFolderDirection(directionCode);
+    const keyframeDirections = getKeyframeDirectionsByCode(directionCode);
 
     // Push the frame to all corresponding directions
     for (const keyframeDirection of keyframeDirections) {
@@ -355,23 +319,6 @@ export class ObjectLayerEngine {
     await image.write(imagePath);
   }
 
-  /**
-   * Generates a random set of character statistics for an item, with values between 0 and 10.
-   * @static
-   * @returns {{effect: number, resistance: number, agility: number, range: number, intelligence: number, utility: number}} The random stats object.
-   * @memberof CyberiaObjectLayer
-   */
-  static generateRandomStats() {
-    return {
-      effect: random(0, 10),
-      resistance: random(0, 10),
-      agility: random(0, 10),
-      range: random(0, 10),
-      intelligence: random(0, 10),
-      utility: random(0, 10),
-    };
-  }
-
   // ──────────────────────────────────────────────────────────────────────────
   // Document lifecycle methods
   // ──────────────────────────────────────────────────────────────────────────
@@ -441,7 +388,7 @@ export class ObjectLayerEngine {
             description: '',
             activable: true,
           },
-          stats: metadata.data.stats || ObjectLayerEngine.generateRandomStats(),
+          stats: metadata.data.stats || generateRandomStats(),
           ledger: metadata.data.ledger || { type: 'OFF_CHAIN' },
         },
       };
@@ -454,7 +401,7 @@ export class ObjectLayerEngine {
             description: '',
             activable: true,
           },
-          stats: ObjectLayerEngine.generateRandomStats(),
+          stats: generateRandomStats(),
           ledger: { type: 'OFF_CHAIN' },
         },
       };
@@ -506,34 +453,6 @@ export class ObjectLayerEngine {
     return crypto.createHash('sha256').update(stringify(data)).digest('hex');
   }
 
-  /**
-   * Map of keyframe direction names to their numeric folder direction codes.
-   * Inverse of {@link ObjectLayerEngine.getKeyFramesDirectionsFromNumberFolderDirection}.
-   * @static
-   * @type {Object<string, string>}
-   * @memberof CyberiaObjectLayer
-   */
-  static directionNameToCode = {
-    down_idle: '08',
-    none_idle: '08',
-    default_idle: '08',
-    up_idle: '02',
-    left_idle: '04',
-    up_left_idle: '04',
-    down_left_idle: '04',
-    right_idle: '06',
-    up_right_idle: '06',
-    down_right_idle: '06',
-    down_walking: '18',
-    up_walking: '12',
-    left_walking: '14',
-    up_left_walking: '14',
-    down_left_walking: '14',
-    right_walking: '16',
-    up_right_walking: '16',
-    down_right_walking: '16',
-  };
-
   /**
    * Writes frame PNGs and an optional metadata.json to one or more base asset
    * directories.  This is the shared write-to-disk step consumed by both the
@@ -571,7 +490,7 @@ export class ObjectLayerEngine {
     cellPixelDim = 20,
   }) {
     const writtenPaths = [];
-    const dirToCode = ObjectLayerEngine.directionNameToCode;
+    const dirToCode = OBJECT_LAYER_DIRECTION_NAME_TO_CODE;
 
     for (const basePath of basePaths) {
       // Track which directionCode/frameIndex combos we already wrote for
@@ -995,14 +914,6 @@ export const readPngAsync = ObjectLayerEngine.readPngAsync;
  */
 export const frameFactory = ObjectLayerEngine.frameFactory;
 
-/**
- * @see {@link ObjectLayerEngine.getKeyFramesDirectionsFromNumberFolderDirection}
- * @function getKeyFramesDirectionsFromNumberFolderDirection
- * @memberof CyberiaObjectLayer
- */
-export const getKeyFramesDirectionsFromNumberFolderDirection =
-  ObjectLayerEngine.getKeyFramesDirectionsFromNumberFolderDirection;
-
 /**
  * @see {@link ObjectLayerEngine.processAndPushFrame}
  * @function processAndPushFrame
@@ -1017,13 +928,6 @@ export const processAndPushFrame = ObjectLayerEngine.processAndPushFrame;
  */
 export const buildImgFromTile = ObjectLayerEngine.buildImgFromTile;
 
-/**
- * @see {@link ObjectLayerEngine.generateRandomStats}
- * @function generateRandomStats
- * @memberof CyberiaObjectLayer
- */
-export const generateRandomStats = ObjectLayerEngine.generateRandomStats;
-
 /**
  * @see {@link ObjectLayerEngine.buildObjectLayerDataFromDirectory}
  * @function buildObjectLayerDataFromDirectory

package/src/{server → projects/cyberia}/semantic-layer-generator-floor.js

@@ -9,7 +9,7 @@
  * parent module (circular import is safe because the function body is only
  * executed after module initialisation completes).
  *
- * @module src/server/semantic-layer-generator-floor.js
+ * @module src/projects/cyberia/semantic-layer-generator-floor.js
  * @namespace SemanticLayerGeneratorFloor
  */
 

package/src/{server → projects/cyberia}/semantic-layer-generator-resource.js

@@ -23,7 +23,7 @@
  * frame pipeline (`down_idle` / `default_idle`) is used — matching the
  * stateless, non-directional nature of world-placed resource pickups.
  *
- * @module src/server/semantic-layer-generator-resource.js
+ * @module src/projects/cyberia/semantic-layer-generator-resource.js
  * @namespace SemanticLayerGeneratorResource
  */
 

package/src/{server → projects/cyberia}/semantic-layer-generator-skin.js

@@ -24,7 +24,7 @@
  * The canonical side template is direction 06 (right); LEFT is derived by
  * mirroring it so generated frame keys stay aligned with 04 = left and 06 = right.
  *
- * @module src/server/semantic-layer-generator-skin.js
+ * @module src/projects/cyberia/semantic-layer-generator-skin.js
  * @namespace SemanticLayerGeneratorSkin
  */
 import { readFileSync } from 'fs';

package/src/{server → projects/cyberia}/semantic-layer-generator.js

@@ -12,14 +12,14 @@
  *        • semantic-layer-generator-floor.js — all floor-* descriptors
  *        • semantic-layer-generator-skin.js  — skin-* descriptors
  *
- * @module src/server/semantic-layer-generator.js
+ * @module src/projects/cyberia/semantic-layer-generator.js
  * @namespace SemanticLayerGenerator
  */
 
 import crypto from 'crypto';
 
 import { createRng, seedToInt, createNoise2D, generateShape, listShapes } from './shape-generator.js';
-import { loggerFactory } from './logger.js';
+import { loggerFactory } from '../../server/logger.js';
 
 import { registerFloorSemantics } from './semantic-layer-generator-floor.js';
 import { registerSkinSemantics } from './semantic-layer-generator-skin.js';

package/src/{server → projects/cyberia}/shape-generator.js

@@ -1,7 +1,7 @@
 /**
  * Parametric shape generator with procedural noise, seeded RNG, and arc-length resampling.
  * Exports a single pure function `generateShape` that returns ordered contour points.
- * @module src/server/shape-generator.js
+ * @module src/projects/cyberia/shape-generator.js
  * @namespace ShapeGenerator
  */
 
@@ -161,7 +161,7 @@ registerShape('thick-parabola', (t, params) => {
   // `a` controls curvature, `rangeX` controls horizontal span, and
   // `thickness` controls band width (vertical gap between outer/inner).
   const a = params.a ?? 0.6;
-  const rangeX = params.rangeX ?? 1.3;
+  const rangeX = params.rangeX ?? 2.0;
   const thickness = params.thickness ?? 0.35;
   if (t <= 0.5) {
     // Outer parabola (forward: left → right)

package/src/{server → projects/underpost}/catalog-underpost.js

@@ -1,7 +1,7 @@
 /**
  * Underpost platform content catalog — the base `pwa-microservices-template`.
  *
- * @module src/server/catalog-underpost.js
+ * @module src/projects/underpost/catalog-underpost.js
  * @namespace UnderpostCatalog
  */
 
@@ -11,7 +11,6 @@
  * @memberof UnderpostCatalog
  */
 const TEMPLATE_RESTORE_PATHS = [
-  `./src/server/catalog-underpost.js`,
   `./.github/workflows/pwa-microservices-template-page.cd.yml`,
   `./.github/workflows/pwa-microservices-template-test.ci.yml`,
   `./.github/workflows/npmpkg.ci.yml`,

package/src/runtime/cyberia-client/Dockerfile

@@ -2,82 +2,48 @@
 ARG BUILD_MODE=RELEASE
 
 # --- Build Image ---
-FROM rockylinux/rockylinux:9 AS builder
+FROM emscripten/emsdk:5.0.6 AS builder
 
 ARG BUILD_MODE=RELEASE
 
-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
-
-# System packages (raylib gfx + build dependencies)
-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 . .
 
-RUN make -f Web.mk clean && make -f Web.mk all BUILD_MODE=${BUILD_MODE} OUTPUT_DIR=bin/
+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.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 && \
-    npm install -g underpost@${UNDERPOST_VERSION} && \
-    dnf clean all && \
+ARG UNDERPOST_VERSION=3.2.70
+ARG NODE_VERSION=24.15.0
+
+RUN set -eux; \
+    dnf install -y python3 git tar xz; \
+    arch="$(uname -m)"; \
+    case "$arch" in \
+      x86_64) node_arch=x64 ;; \
+      aarch64) node_arch=arm64 ;; \
+      *) echo "unsupported arch: $arch" >&2; exit 1 ;; \
+    esac; \
+    curl -fsSL "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${node_arch}.tar.xz" \
+      | tar -xJ -C /usr/local --strip-components=1; \
+    node --version; npm --version; \
+    npm install -g underpost@${UNDERPOST_VERSION}; \
+    dnf clean all; rm -rf /var/cache/dnf; \
     npm cache clean --force
 
+# Path + server layout is the contract with conf.instances.json mmo-client cmd,
+# which execs `python3 /home/dd/engine/cyberia-client/docker-driver.py <port>
+# /home/dd/engine/cyberia-client/bin` in both development and production.
+# Keep this identical to Dockerfile.dev so prod and dev images are interchangeable.
 WORKDIR /home/dd/engine/cyberia-client
 
-COPY --from=builder /cyberia-client/server.py ./server.py
-COPY --from=builder /cyberia-client/bin       ./bin/
+COPY --from=builder /cyberia-client/docker-driver.py ./docker-driver.py
+COPY --from=builder /cyberia-client/bin              ./bin/
 
+ENV PYTHONUNBUFFERED=1
 ENV CYBERIA_PORT=8081
-ENV CYBERIA_MODE=production
 
-EXPOSE 8081 8082
+EXPOSE 8081
 
-CMD ["sh", "-c", "exec python3 server.py ${CYBERIA_PORT} bin ${CYBERIA_MODE}"]
+CMD ["sh", "-c", "exec python3 docker-driver.py ${CYBERIA_PORT} bin"]

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

@@ -43,25 +43,33 @@ 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 && \
+ARG UNDERPOST_VERSION=3.2.70
+ARG NODE_VERSION=24.15.0
+RUN set -eux; \
+    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} && \
+        curl git python3 tar xz \
+        procps-ng strace lsof vim-minimal; \
+    arch="$(uname -m)"; \
+    case "$arch" in \
+      x86_64) node_arch=x64 ;; \
+      aarch64) node_arch=arm64 ;; \
+      *) echo "unsupported arch: $arch" >&2; exit 1 ;; \
+    esac; \
+    curl -fsSL "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${node_arch}.tar.xz" \
+      | tar -xJ -C /usr/local --strip-components=1; \
+    node --version; npm --version; \
+    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/
+COPY --from=builder /cyberia-client/docker-driver.py ./docker-driver.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}"]
+CMD ["sh", "-c", "exec python3 docker-driver.py ${CYBERIA_PORT} bin"]

package/src/runtime/cyberia-server/Dockerfile

@@ -1,36 +1,37 @@
 # --- 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
+FROM golang:1.24 AS builder
 
 WORKDIR /build
 
-
 COPY go.mod go.sum ./
 RUN go mod download
 
 COPY . ./
-RUN chmod +x build.sh && ./build.sh
+RUN CGO_ENABLED=0 go build -trimpath -ldflags="-s -w" -o server ./cmd/cyberia-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 && \
-    curl -fsSL https://rpm.nodesource.com/setup_24.x | bash - && \
-    dnf install -y nodejs && \
-    npm install -g underpost@${UNDERPOST_VERSION} && \
-    dnf clean all && \
+ARG UNDERPOST_VERSION=3.2.70
+ARG NODE_VERSION=24.15.0
+
+RUN set -eux; \
+    dnf install -y git tar xz; \
+    arch="$(uname -m)"; \
+    case "$arch" in \
+      x86_64) node_arch=x64 ;; \
+      aarch64) node_arch=arm64 ;; \
+      *) echo "unsupported arch: $arch" >&2; exit 1 ;; \
+    esac; \
+    curl -fsSL "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${node_arch}.tar.xz" \
+      | tar -xJ -C /usr/local --strip-components=1; \
+    node --version; npm --version; \
+    npm install -g underpost@${UNDERPOST_VERSION}; \
+    dnf clean all; rm -rf /var/cache/dnf; \
     npm cache clean --force
 
+# Path is the contract with conf.instances.json mmo-server cmd, which execs
+# /home/dd/engine/cyberia-server/server in both development and production.
+# Keep this identical to Dockerfile.dev so prod and dev images are interchangeable.
 WORKDIR /home/dd/engine/cyberia-server
 
 COPY --from=builder /build/server ./server

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

@@ -25,15 +25,24 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
 # --- Runtime Image ---
 FROM rockylinux/rockylinux:9 AS runtime
 
-ARG UNDERPOST_VERSION=3.2.9
-RUN dnf -y update && \
-    dnf -y install epel-release && \
+ARG UNDERPOST_VERSION=3.2.70
+ARG NODE_VERSION=24.15.0
+RUN set -eux; \
+    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} && \
+        curl git tar xz \
+        procps-ng strace lsof vim-minimal; \
+    arch="$(uname -m)"; \
+    case "$arch" in \
+      x86_64) node_arch=x64 ;; \
+      aarch64) node_arch=arm64 ;; \
+      *) echo "unsupported arch: $arch" >&2; exit 1 ;; \
+    esac; \
+    curl -fsSL "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${node_arch}.tar.xz" \
+      | tar -xJ -C /usr/local --strip-components=1; \
+    node --version; npm --version; \
+    npm install -g underpost@${UNDERPOST_VERSION}; \
     dnf clean all
 
 WORKDIR /home/dd/engine/cyberia-server