@open-core/framework 1.0.5-beta.1 → 1.0.5-beta.2

package/dist/runtime/server/controllers/vehicle.controller.js

@@ -11,6 +11,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 import { inject } from 'tsyringe';
+import { EventsAPI } from '../../../adapters/contracts/transport/events.api';
 import { Controller, OnNet } from '../decorators';
 import { Player } from '../entities/player';
 import { Vehicles } from '../apis/vehicles.api';
@@ -22,8 +23,10 @@ import { Vehicles } from '../apis/vehicles.api';
  */
 let VehicleController = class VehicleController {
     vehicleService;
-    constructor(vehicleService) {
+    events;
+    constructor(vehicleService, events) {
         this.vehicleService = vehicleService;
+        this.events = events;
     }
     /**
      * Handles client request to get vehicle data.
@@ -31,11 +34,11 @@ let VehicleController = class VehicleController {
     handleGetData(player, networkId) {
         const vehicle = this.vehicleService.getByNetworkId(networkId);
         if (!vehicle) {
-            emitNet('opencore:vehicle:dataResult', player.clientID, null);
+            this.events.emit('opencore:vehicle:dataResult', player.clientID, null);
             return null;
         }
         const data = vehicle.serialize();
-        emitNet('opencore:vehicle:dataResult', player.clientID, data);
+        this.events.emit('opencore:vehicle:dataResult', player.clientID, data);
         return data;
     }
     /**
@@ -44,7 +47,7 @@ let VehicleController = class VehicleController {
     handleGetPlayerVehicles(player) {
         const vehicles = this.vehicleService.getPlayerVehicles(player.clientID);
         const serialized = vehicles.map((v) => v.serialize());
-        emitNet('opencore:vehicle:playerVehiclesResult', player.clientID, serialized);
+        this.events.emit('opencore:vehicle:playerVehiclesResult', player.clientID, serialized);
         return serialized;
     }
 };
@@ -63,6 +66,8 @@ __decorate([
 VehicleController = __decorate([
     Controller(),
     __param(0, inject(Vehicles)),
-    __metadata("design:paramtypes", [Vehicles])
+    __param(1, inject(EventsAPI)),
+    __metadata("design:paramtypes", [Vehicles,
+        EventsAPI])
 ], VehicleController);
 export { VehicleController };

package/dist/runtime/server/core.d.ts

@@ -1,7 +1,9 @@
 import { type OpenCorePlugin } from './library/plugin';
 import { type FrameworkMode, type ServerInitOptions } from './runtime';
+import { OpenCoreServerAdapter } from './adapter';
 export declare let _mode: FrameworkMode;
 export interface OpenCoreInitOptions extends ServerInitOptions {
     plugins?: OpenCorePlugin[];
 }
+export declare function useAdapter(adapter: OpenCoreServerAdapter): void;
 export declare function init(options: OpenCoreInitOptions): Promise<void>;

package/dist/runtime/server/core.js

@@ -4,11 +4,16 @@ import { Server } from './server.runtime';
 import { initServer } from './bootstrap';
 import { resolveRuntimeOptions, } from './runtime';
 export let _mode;
+let _pendingAdapter;
+export function useAdapter(adapter) {
+    _pendingAdapter = adapter;
+}
 function createConfigAccessor(options) {
+    const runtimeOptions = { ...options };
     return {
         get(key) {
             const segments = key.split('.').filter(Boolean);
-            let current = options;
+            let current = runtimeOptions;
             for (const segment of segments) {
                 if (typeof current !== 'object' || current === null) {
                     return undefined;
@@ -20,6 +25,9 @@ function createConfigAccessor(options) {
     };
 }
 export async function init(options) {
+    if (!options.adapter && _pendingAdapter) {
+        options = { ...options, adapter: _pendingAdapter };
+    }
     const resolved = resolveRuntimeOptions(options);
     _mode = resolved.mode;
     const registry = new PluginRegistry();

package/dist/runtime/server/decorators/onRuntimeEvent.d.ts

@@ -1,3 +1,4 @@
+import type { RuntimeEventName } from '../../../adapters/contracts/runtime';
 /**
  * Registers a method as a server-side listener for a native Runtime event.
  * Runtime === CitizenFX (Cfx)
@@ -22,4 +23,4 @@
  * }
  * ```
  */
-export declare function OnRuntimeEvent(event: string): (target: any, propertyKey: string) => void;
+export declare function OnRuntimeEvent(event: RuntimeEventName): (target: any, propertyKey: string) => void;

package/dist/runtime/server/entities/npc.d.ts

@@ -1,5 +1,6 @@
 import { NativeHandle } from 'src/runtime/core/nativehandle';
 import { IEntityServer } from '../../../adapters/contracts/server/IEntityServer';
+import { INpcLifecycleServer } from '../../../adapters/contracts/server/npc-lifecycle/INpcLifecycleServer';
 import { IPedServer } from '../../../adapters/contracts/server/IPedServer';
 import { Vector3 } from '../../../kernel/utils/vector3';
 import { BaseEntity } from '../../core/entity';
@@ -8,6 +9,7 @@ import { SerializedNpcData } from '../types/npc.types';
 export interface NpcAdapters {
     entityServer: IEntityServer;
     pedServer: IPedServer;
+    npcLifecycle: INpcLifecycleServer;
 }
 /**
  * Immutable-ish runtime session snapshot for an NPC.

package/dist/runtime/server/entities/npc.js

@@ -137,7 +137,7 @@ export class NPC extends BaseEntity {
     setRoutingBucket(bucket) {
         if (!this.exists)
             return;
-        this.adapters.entityServer.setRoutingBucket(this.session.handle, bucket);
+        this.adapters.entityServer.setDimension(this.session.handle, bucket);
         this.session.routingBucket = bucket;
         this._dimension = bucket;
     }
@@ -147,7 +147,7 @@ export class NPC extends BaseEntity {
      * @returns Routing bucket.
      */
     getRoutingBucket() {
-        return this.adapters.entityServer.getRoutingBucket(this.session.handle);
+        return this.adapters.entityServer.getDimension(this.session.handle);
     }
     /**
      * Current dimension of the NPC.
@@ -272,7 +272,7 @@ export class NPC extends BaseEntity {
     delete() {
         if (!this.exists)
             return;
-        this.adapters.pedServer.delete(this.session.handle);
+        void this.adapters.npcLifecycle.delete({ handle: this.session.handle });
     }
     /**
      * Serialize the NPC into a transport-friendly plain object.

package/dist/runtime/server/entities/player.d.ts

@@ -1,6 +1,8 @@
 import { IPlayerInfo } from '../../../adapters';
 import { EventsAPI } from '../../../adapters/contracts/transport/events.api';
 import { IEntityServer } from '../../../adapters/contracts/server/IEntityServer';
+import { IPlayerLifecycleServer } from '../../../adapters/contracts/server/player-lifecycle/IPlayerLifecycleServer';
+import { IPlayerStateSyncServer } from '../../../adapters/contracts/server/player-state/IPlayerStateSyncServer';
 import { IPlayerServer } from '../../../adapters/contracts/server/IPlayerServer';
 import type { PlayerIdentifier } from '../../../adapters/contracts/types/identifier';
 import { Vector3 } from '../../../kernel/utils/vector3';
@@ -17,6 +19,8 @@ import { NativeHandle } from 'src/runtime/core/nativehandle';
 export interface PlayerAdapters {
     playerInfo: IPlayerInfo;
     playerServer: IPlayerServer;
+    playerLifecycle: IPlayerLifecycleServer;
+    playerStateSync: IPlayerStateSyncServer;
     entityServer: IEntityServer;
     events: EventsAPI<'server'>;
     defaultSpawnModel: string;
@@ -36,6 +40,7 @@ export declare class Player extends BaseEntity implements Spatial, NativeHandle
     private readonly session;
     private readonly adapters;
     private _position;
+    private _model;
     /**
      * Creates a new Player entity instance.
      * This is typically instantiated by the `PlayerService` upon connection.
@@ -117,23 +122,13 @@ export declare class Player extends BaseEntity implements Spatial, NativeHandle
      * @param model - The ped model to use (default from platform capabilities)
      */
     spawn(vector: Vector3, model?: string): void;
+    respawn(vector: Vector3, model?: string): void;
     /**
      * Disconnects the player from the server.
      *
      * @param reason - The message displayed to the player upon disconnection.
      */
     kick(reason?: string): void;
-    /**
-     * Sets the routing bucket (virtual world/dimension) for the player.
-     * Players in different buckets cannot see or interact with each other.
-     *
-     * @param bucket - The bucket ID (0 is the default shared world).
-     */
-    setRoutingBucket(bucket: number): void;
-    /**
-     * Gets the current routing bucket.
-     */
-    getRoutingBucket(): number;
     /**
      * Sets the player dimension (alias for setRoutingBucket).
      */
@@ -218,6 +213,8 @@ export declare class Player extends BaseEntity implements Spatial, NativeHandle
      * @param armor - Armor value to set (typically 0-100).
      */
     setArmor(armor: number): void;
+    get model(): string | undefined;
+    set model(model: string);
     /**
      * Kills the player by setting health to 0.
      */

package/dist/runtime/server/entities/player.js

@@ -1,3 +1,4 @@
+import { loggers } from '../../../kernel/logger';
 import { BaseEntity } from '../../core/entity';
 /**
  * Core-level representation of a connected player on the server.
@@ -14,6 +15,7 @@ export class Player extends BaseEntity {
     session;
     adapters;
     _position;
+    _model;
     /**
      * Creates a new Player entity instance.
      * This is typically instantiated by the `PlayerService` upon connection.
@@ -133,7 +135,13 @@ export class Player extends BaseEntity {
      * @param vector - The target coordinates (x, y, z).
      */
     teleport(vector) {
-        this.emit('opencore:spawner:teleport', vector);
+        const request = { position: vector };
+        void Promise.resolve(this.adapters.playerLifecycle.teleport(this.clientID.toString(), request)).catch((error) => {
+            loggers.spawn.error('Failed to teleport player', {
+                clientID: this.clientID,
+                error: error instanceof Error ? error.message : String(error),
+            });
+        });
     }
     /**
      * Spawns the player at a position with a specific model.
@@ -142,7 +150,22 @@ export class Player extends BaseEntity {
      * @param model - The ped model to use (default from platform capabilities)
      */
     spawn(vector, model = this.adapters.defaultSpawnModel) {
-        this.emit('opencore:spawner:spawn', { position: vector, model });
+        const request = { position: vector, model };
+        void Promise.resolve(this.adapters.playerLifecycle.spawn(this.clientID.toString(), request)).catch((error) => {
+            loggers.spawn.error('Failed to spawn player', {
+                clientID: this.clientID,
+                error: error instanceof Error ? error.message : String(error),
+            });
+        });
+    }
+    respawn(vector, model = this.adapters.defaultSpawnModel) {
+        const request = { position: vector, model };
+        void Promise.resolve(this.adapters.playerLifecycle.respawn(this.clientID.toString(), request)).catch((error) => {
+            loggers.spawn.error('Failed to respawn player', {
+                clientID: this.clientID,
+                error: error instanceof Error ? error.message : String(error),
+            });
+        });
     }
     // ─────────────────────────────────────────────────────────────────
     // Connection Management
@@ -158,33 +181,18 @@ export class Player extends BaseEntity {
     // ─────────────────────────────────────────────────────────────────
     // Dimension / Routing Bucket
     // ─────────────────────────────────────────────────────────────────
-    /**
-     * Sets the routing bucket (virtual world/dimension) for the player.
-     * Players in different buckets cannot see or interact with each other.
-     *
-     * @param bucket - The bucket ID (0 is the default shared world).
-     */
-    setRoutingBucket(bucket) {
-        this.adapters.playerServer.setRoutingBucket(this.clientID.toString(), bucket);
-        this._dimension = bucket;
-    }
-    /**
-     * Gets the current routing bucket.
-     */
-    getRoutingBucket() {
-        return this.adapters.playerServer.getRoutingBucket(this.clientID.toString());
-    }
     /**
      * Sets the player dimension (alias for setRoutingBucket).
      */
     set dimension(value) {
-        this.setRoutingBucket(value);
+        this.adapters.playerServer.setDimension(this.clientID.toString(), value);
+        this._dimension = value;
     }
     /**
      * Gets the player dimension (alias for getRoutingBucket).
      */
     get dimension() {
-        return this.getRoutingBucket();
+        return this.adapters.playerServer.getDimension(this.clientID.toString());
     }
     // ─────────────────────────────────────────────────────────────────
     // Session Metadata (Transient)
@@ -276,8 +284,7 @@ export class Player extends BaseEntity {
      * Gets the current health of the player's ped.
      */
     getHealth() {
-        const ped = this.adapters.playerServer.getPed(this.clientID.toString());
-        return this.adapters.entityServer.getHealth(ped);
+        return this.adapters.playerStateSync.getHealth(this.clientID.toString());
     }
     /**
      * Sets the health of the player's ped.
@@ -285,15 +292,13 @@ export class Player extends BaseEntity {
      * @param health - Health value to set (platform-specific range).
      */
     setHealth(health) {
-        const ped = this.adapters.playerServer.getPed(this.clientID.toString());
-        this.adapters.entityServer.setHealth(ped, health);
+        this.adapters.playerStateSync.setHealth(this.clientID.toString(), health);
     }
     /**
      * Gets the current armor of the player's ped.
      */
     getArmor() {
-        const ped = this.adapters.playerServer.getPed(this.clientID.toString());
-        return this.adapters.entityServer.getArmor(ped);
+        return this.adapters.playerStateSync.getArmor(this.clientID.toString());
     }
     /**
      * Sets the armor of the player's ped.
@@ -301,8 +306,14 @@ export class Player extends BaseEntity {
      * @param armor - Armor value to set (typically 0-100).
      */
     setArmor(armor) {
-        const ped = this.adapters.playerServer.getPed(this.clientID.toString());
-        this.adapters.entityServer.setArmor(ped, armor);
+        this.adapters.playerStateSync.setArmor(this.clientID.toString(), armor);
+    }
+    get model() {
+        return this._model;
+    }
+    set model(model) {
+        this.adapters.playerServer.setModel(this.clientID.toString(), model);
+        this._model = model;
     }
     /**
      * Kills the player by setting health to 0.

package/dist/runtime/server/entities/vehicle.js

@@ -154,13 +154,13 @@ export class Vehicle extends BaseEntity {
         if (!this.exists) {
             return this.session.routingBucket;
         }
-        return this.adapters.entityServer.getRoutingBucket(this.session.handle);
+        return this.adapters.entityServer.getDimension(this.session.handle);
     }
     /** Sets routing bucket and updates local dimension snapshot. */
     setRoutingBucket(bucket) {
         if (!this.exists)
             return;
-        this.adapters.entityServer.setRoutingBucket(this.session.handle, bucket);
+        this.adapters.entityServer.setDimension(this.session.handle, bucket);
         this.session.routingBucket = bucket;
         this._dimension = bucket;
     }

package/dist/runtime/server/error-handler.js

@@ -1,5 +1,13 @@
+import { GLOBAL_CONTAINER } from '../../kernel/di/container';
 import { AppError, isAppError } from '../../kernel/error/app.error';
 import { loggers } from '../../kernel/logger';
+import { EventsAPI } from '../../adapters/contracts/transport/events.api';
+function getServerEvents() {
+    if (!GLOBAL_CONTAINER.isRegistered(EventsAPI)) {
+        return null;
+    }
+    return GLOBAL_CONTAINER.resolve(EventsAPI);
+}
 function normalizeError(error, origin) {
     if (isAppError(error)) {
         return error;
@@ -21,16 +29,19 @@ export function handleCommandError(error, meta, playerId) {
         details: appError.details,
     });
     if (playerId !== null) {
+        const events = getServerEvents();
+        if (!events)
+            return;
         switch (appError.code) {
             case 'ECONOMY:INSUFFICIENT_FUNDS':
             case 'AUTH:PERMISSION_DENIED':
             case 'AUTH:UNAUTHORIZED':
-                emitNet('chat:addMessage', playerId, {
+                events.emit('chat:addMessage', playerId, {
                     args: ['^1Error', appError.message],
                 });
                 break;
             default:
-                emitNet('chat:addMessage', playerId, {
+                events.emit('chat:addMessage', playerId, {
                     args: ['^1Error', 'Ha ocurrido un error interno.'],
                 });
                 break;

package/dist/runtime/server/helpers/command-validation.helper.js

@@ -1,7 +1,7 @@
 import z from 'zod';
 import { AppError } from '../../../kernel';
 import { generateSchemaFromTypes } from '../system/schema-generator';
-import { processTupleSchema } from './process-tuple-schema';
+import { processTupleSchema } from '../../shared/helpers/process-tuple-schema';
 export async function validateAndExecuteCommand(meta, player, args, handler) {
     const paramNames = meta.expectsPlayer ? meta.paramNames.slice(1) : meta.paramNames;
     let schema = meta.schema;

package/dist/runtime/server/implementations/local/player.local.d.ts

@@ -1,7 +1,9 @@
 import { IPlayerInfo } from '../../../../adapters';
-import { IPlatformCapabilities } from '../../../../adapters/contracts/IPlatformCapabilities';
+import { IPlatformContext } from '../../../../adapters/contracts/IPlatformContext';
 import { EventsAPI } from '../../../../adapters/contracts/transport/events.api';
 import { IEntityServer } from '../../../../adapters/contracts/server/IEntityServer';
+import { IPlayerLifecycleServer } from '../../../../adapters/contracts/server/player-lifecycle/IPlayerLifecycleServer';
+import { IPlayerStateSyncServer } from '../../../../adapters/contracts/server/player-state/IPlayerStateSyncServer';
 import { IPlayerServer } from '../../../../adapters/contracts/server/IPlayerServer';
 import { WorldContext } from '../../../core/world';
 import { Player } from '../../entities';
@@ -22,11 +24,13 @@ export declare class LocalPlayerImplementation implements Players, PlayerSession
     private readonly world;
     private readonly playerInfo;
     private readonly playerServer;
+    private readonly playerLifecycle;
+    private readonly playerStateSync;
     private readonly entityServer;
     private readonly events;
-    private readonly platformCapabilities;
+    private readonly platformContext;
     private readonly playerAdapters;
-    constructor(world: WorldContext, playerInfo: IPlayerInfo, playerServer: IPlayerServer, entityServer: IEntityServer, events: EventsAPI<'server'>, platformCapabilities: IPlatformCapabilities);
+    constructor(world: WorldContext, playerInfo: IPlayerInfo, playerServer: IPlayerServer, playerLifecycle: IPlayerLifecycleServer, playerStateSync: IPlayerStateSyncServer, entityServer: IEntityServer, events: EventsAPI<'server'>, platformContext: IPlatformContext);
     private isPlayer;
     /**
      * Initializes a new player session for a connecting client.

package/dist/runtime/server/implementations/local/player.local.js

@@ -12,13 +12,15 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 import { inject, injectable } from 'tsyringe';
 import { IPlayerInfo } from '../../../../adapters';
-import { IPlatformCapabilities } from '../../../../adapters/contracts/IPlatformCapabilities';
+import { IPlatformContext } from '../../../../adapters/contracts/IPlatformContext';
 import { EventsAPI } from '../../../../adapters/contracts/transport/events.api';
 import { IEntityServer } from '../../../../adapters/contracts/server/IEntityServer';
+import { IPlayerLifecycleServer } from '../../../../adapters/contracts/server/player-lifecycle/IPlayerLifecycleServer';
+import { IPlayerStateSyncServer } from '../../../../adapters/contracts/server/player-state/IPlayerStateSyncServer';
 import { IPlayerServer } from '../../../../adapters/contracts/server/IPlayerServer';
 import { loggers } from '../../../../kernel/logger';
 import { WorldContext } from '../../../core/world';
-import { Player } from '../../entities';
+import { createLocalServerPlayer } from '../../adapter/registry';
 /**
  * Service responsible for managing the lifecycle of player sessions.
  * It acts as the central registry for all connected players, mapping FiveM client IDs
@@ -32,21 +34,27 @@ let LocalPlayerImplementation = class LocalPlayerImplementation {
     world;
     playerInfo;
     playerServer;
+    playerLifecycle;
+    playerStateSync;
     entityServer;
     events;
-    platformCapabilities;
+    platformContext;
     playerAdapters;
-    constructor(world, playerInfo, playerServer, entityServer, events, platformCapabilities) {
+    constructor(world, playerInfo, playerServer, playerLifecycle, playerStateSync, entityServer, events, platformContext) {
         this.world = world;
         this.playerInfo = playerInfo;
         this.playerServer = playerServer;
+        this.playerLifecycle = playerLifecycle;
+        this.playerStateSync = playerStateSync;
         this.entityServer = entityServer;
         this.events = events;
-        this.platformCapabilities = platformCapabilities;
-        const defaultSpawnModel = this.platformCapabilities.getConfig('defaultSpawnModel') ?? 'mp_m_freemode_01';
+        this.platformContext = platformContext;
+        const defaultSpawnModel = this.platformContext.defaultSpawnModel;
         this.playerAdapters = {
             playerInfo: this.playerInfo,
             playerServer: this.playerServer,
+            playerLifecycle: this.playerLifecycle,
+            playerStateSync: this.playerStateSync,
             entityServer: this.entityServer,
             events: this.events,
             defaultSpawnModel,
@@ -71,7 +79,7 @@ let LocalPlayerImplementation = class LocalPlayerImplementation {
             identifiers,
             meta: {},
         };
-        const player = new Player(session, this.playerAdapters);
+        const player = createLocalServerPlayer(session, this.playerAdapters);
         this.world.add(player);
         loggers.session.debug('Player session bound', {
             clientID,
@@ -191,14 +199,18 @@ LocalPlayerImplementation = __decorate([
     __param(0, inject(WorldContext)),
     __param(1, inject(IPlayerInfo)),
     __param(2, inject(IPlayerServer)),
-    __param(3, inject(IEntityServer)),
-    __param(4, inject(EventsAPI)),
-    __param(5, inject(IPlatformCapabilities)),
+    __param(3, inject(IPlayerLifecycleServer)),
+    __param(4, inject(IPlayerStateSyncServer)),
+    __param(5, inject(IEntityServer)),
+    __param(6, inject(EventsAPI)),
+    __param(7, inject(IPlatformContext)),
     __metadata("design:paramtypes", [WorldContext,
         IPlayerInfo,
         IPlayerServer,
+        IPlayerLifecycleServer,
+        IPlayerStateSyncServer,
         IEntityServer,
         EventsAPI,
-        IPlatformCapabilities])
+        IPlatformContext])
 ], LocalPlayerImplementation);
 export { LocalPlayerImplementation };

package/dist/runtime/server/implementations/remote/channel.remote.d.ts

@@ -1,4 +1,5 @@
 import { IExports } from '../../../../adapters/contracts/IExports';
+import { IResourceInfo } from '../../../../adapters/contracts/IResourceInfo';
 import { RGB } from '../../../../kernel/utils/rgb';
 import { Channel } from '../../concepts/channel';
 import { Player } from '../../entities/player';
@@ -21,7 +22,7 @@ export declare class RemoteChannelImplementation extends Channels {
     private exportsService;
     private readonly players;
     private resourceName;
-    constructor(exportsService: IExports, players: Players);
+    constructor(exportsService: IExports, resourceInfo: IResourceInfo, players: Players);
     /**
      * Gets typed access to CORE resource exports.
      */

package/dist/runtime/server/implementations/remote/channel.remote.js

@@ -12,6 +12,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 import { inject, injectable } from 'tsyringe';
 import { IExports } from '../../../../adapters/contracts/IExports';
+import { IResourceInfo } from '../../../../adapters/contracts/IResourceInfo';
 import { loggers } from '../../../../kernel/logger';
 import { Channel } from '../../concepts/channel';
 import { getRuntimeContext } from '../../runtime';
@@ -34,11 +35,11 @@ let RemoteChannelImplementation = class RemoteChannelImplementation extends Chan
     exportsService;
     players;
     resourceName;
-    constructor(exportsService, players) {
+    constructor(exportsService, resourceInfo, players) {
         super();
         this.exportsService = exportsService;
         this.players = players;
-        this.resourceName = GetCurrentResourceName();
+        this.resourceName = resourceInfo.getCurrentResourceName();
     }
     /**
      * Gets typed access to CORE resource exports.
@@ -159,7 +160,9 @@ let RemoteChannelImplementation = class RemoteChannelImplementation extends Chan
 RemoteChannelImplementation = __decorate([
     injectable(),
     __param(0, inject(IExports)),
+    __param(1, inject(IResourceInfo)),
     __metadata("design:paramtypes", [IExports,
+        IResourceInfo,
         Players])
 ], RemoteChannelImplementation);
 export { RemoteChannelImplementation };

package/dist/runtime/server/implementations/remote/command.remote.d.ts

@@ -1,4 +1,5 @@
 import { IExports } from '../../../../adapters/contracts/IExports';
+import { IResourceInfo } from '../../../../adapters/contracts/IResourceInfo';
 import { CommandMetadata } from '../../decorators/command';
 import { Player } from '../../entities';
 import { CommandExecutionPort, type CommandInfo } from '../../ports/internal/command-execution.port';
@@ -23,9 +24,10 @@ import { CommandExecutionPort, type CommandInfo } from '../../ports/internal/com
  */
 export declare class RemoteCommandImplementation extends CommandExecutionPort {
     private exportsService;
+    private readonly resourceInfo;
     private commands;
     getCommandMeta(commandName: string): CommandMetadata | undefined;
-    constructor(exportsService: IExports);
+    constructor(exportsService: IExports, resourceInfo: IResourceInfo);
     /**
      * Gets typed access to CORE resource exports.
      */

package/dist/runtime/server/implementations/remote/command.remote.js

@@ -12,6 +12,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 import { inject, injectable } from 'tsyringe';
 import { IExports } from '../../../../adapters/contracts/IExports';
+import { IResourceInfo } from '../../../../adapters/contracts/IResourceInfo';
 import { AppError } from '../../../../kernel/error/app.error';
 import { loggers } from '../../../../kernel/logger';
 import { validateAndExecuteCommand } from '../../helpers/command-validation.helper';
@@ -38,13 +39,15 @@ import { CommandExecutionPort } from '../../ports/internal/command-execution.por
  */
 let RemoteCommandImplementation = class RemoteCommandImplementation extends CommandExecutionPort {
     exportsService;
+    resourceInfo;
     commands = new Map();
     getCommandMeta(commandName) {
         return this.commands.get(commandName.toLowerCase())?.meta;
     }
-    constructor(exportsService) {
+    constructor(exportsService, resourceInfo) {
         super();
         this.exportsService = exportsService;
+        this.resourceInfo = resourceInfo;
     }
     /**
      * Gets typed access to CORE resource exports.
@@ -68,7 +71,7 @@ let RemoteCommandImplementation = class RemoteCommandImplementation extends Comm
      */
     register(metadata, handler) {
         const commandKey = metadata.command.toLowerCase();
-        const resourceName = GetCurrentResourceName();
+        const resourceName = this.resourceInfo.getCurrentResourceName();
         loggers.command.debug(`Registering command locally`, {
             command: metadata.command,
             resource: resourceName,
@@ -132,7 +135,7 @@ let RemoteCommandImplementation = class RemoteCommandImplementation extends Comm
         if (!entry) {
             loggers.command.error(`Handler not found for remote command: ${commandName}`, {
                 command: commandName,
-                resource: GetCurrentResourceName(),
+                resource: this.resourceInfo.getCurrentResourceName(),
             });
             throw new AppError('COMMAND:NOT_FOUND', `Command not found: ${commandName}`, 'server');
         }
@@ -149,6 +152,8 @@ let RemoteCommandImplementation = class RemoteCommandImplementation extends Comm
 RemoteCommandImplementation = __decorate([
     injectable(),
     __param(0, inject(IExports)),
-    __metadata("design:paramtypes", [IExports])
+    __param(1, inject(IResourceInfo)),
+    __metadata("design:paramtypes", [IExports,
+        IResourceInfo])
 ], RemoteCommandImplementation);
 export { RemoteCommandImplementation };