rock-mod 0.21.0 → 0.22.0

package/dist/client/net/ccmp/events/CCMPSyncedMetaBridge.js

@@ -1,35 +1,45 @@
 import { ClientInternalEventName } from "../../common/events/types";
 /**
- * Переводит нативное CCMP-событие `streamSyncedMetaChange` в internal-bus
- * `rm::syncedMetaChange`.
- *
- * Вынесено в отдельный класс от `CCMPEventsBridge` из-за порядка
- * инстанцирования: bridge'у нужна ссылка на `CCMPPlayersManager` чтобы
- * резолвить `payload.entityId → CCMPPlayer`, а players manager создаётся
- * в `CCMPManagersFactory` **после** `CCMPNetManager` (внутри которого
- * живёт `CCMPEventsBridge`). Поэтому этот bridge создаётся вторым
- * шагом из `createPlayersManager`, когда обе зависимости уже доступны.
- *
- * Сейчас обслуживается только `entityType === Player` (=0) — на клиенте
- * rock-mod-CCMP других сущностей пока нет. Остальные типы тихо
- * игнорируем (snapshot прилетает на каждом stream-in, для несуществующих
- * на клиенте сущностей это нормально).
+ * Translates CCMP `streamSyncedMetaChange` into Rock-Mod's internal
+ * `rm::syncedMetaChange` for stream-synced base objects.
  */
 export class CCMPSyncedMetaBridge {
-    constructor(events, playersManager) {
+    constructor(events, managers) {
+        this._registered = false;
         this._events = events;
-        this._playersManager = playersManager;
+        this._managers = managers;
     }
     register() {
+        if (this._registered) {
+            return;
+        }
+        this._registered = true;
         ccmp.on("streamSyncedMetaChange", (payload) => {
-            if (payload.entityType !== ccmp.entities.ENTITY_TYPE.Player) {
+            const object = this._resolveObject(payload.entityType, payload.entityId);
+            if (!object) {
                 return;
             }
-            const player = this._playersManager.findByRemoteId(payload.entityId);
-            if (!player) {
-                return;
-            }
-            this._events.emitInternal(ClientInternalEventName.SyncedMetaChange, player, payload.key, payload.newValue, payload.oldValue);
+            this._events.emitInternal(ClientInternalEventName.SyncedMetaChange, object, payload.key, payload.newValue, payload.oldValue);
         });
     }
+    _resolveObject(entityType, entityId) {
+        switch (entityType) {
+            case ccmp.entities.ENTITY_TYPE.Player:
+                return this._managers.players.findByRemoteId(entityId);
+            case ccmp.entities.ENTITY_TYPE.Vehicle:
+                return this._managers.vehicles.findByRemoteID(entityId);
+            case ccmp.entities.ENTITY_TYPE.Object:
+                return this._managers.objects.findByRemoteID(entityId);
+            case ccmp.entities.ENTITY_TYPE.Ped:
+                return this._managers.peds.findByRemoteID(entityId);
+            case ccmp.entities.ENTITY_TYPE.Marker:
+                return this._managers.markers.findByRemoteID(entityId);
+            case ccmp.entities.ENTITY_TYPE.Blip:
+                return this._managers.blips.findByRemoteID(entityId);
+            case ccmp.entities.ENTITY_TYPE.Colshape:
+                return this._managers.colshapes.findByRemoteID(entityId);
+            default:
+                return null;
+        }
+    }
 }

package/dist/client/net/common/dataHandler/IDataHandler.d.ts

@@ -1,4 +1,4 @@
-import { type IEntity } from "../../../entities";
+import { type IBaseObject } from "../../../entities";
 export interface IDataHandler {
-    addDataHandler(key: string, callback: (entity: IEntity, value: unknown, oldValue?: unknown) => void): void;
+    addDataHandler(key: string, callback: (object: IBaseObject, value: unknown, oldValue?: unknown) => void): void;
 }

package/dist/client/net/common/events/types.d.ts

@@ -1,4 +1,4 @@
-import { type IBaseObject, type IEntity, type IPlayer, type IVehicle } from "../../../entities";
+import { type IBaseObject, type IPlayer, type IVehicle } from "../../../entities";
 import { type IVector3D } from "../../../../shared/common/utils";
 export declare enum ClientInternalEventName {
     PlayerConnected = "rm::playerConnected",
@@ -35,8 +35,8 @@ export interface IClientInternalEvents {
     [ClientInternalEventName.EntityDestroyed]: (object: IBaseObject) => void;
     [ClientInternalEventName.PlayerReady]: (localPlayer: IPlayer) => void;
     [ClientInternalEventName.BrowserDomReady]: () => void;
-    [ClientInternalEventName.EntityStreamIn]: (entity: IEntity) => void;
-    [ClientInternalEventName.EntityStreamOut]: (entity: IEntity) => void;
+    [ClientInternalEventName.EntityStreamIn]: (object: IBaseObject) => void;
+    [ClientInternalEventName.EntityStreamOut]: (object: IBaseObject) => void;
     [ClientInternalEventName.PlayerEnterVehicle]: (vehicle: IVehicle, seat: number) => void;
     [ClientInternalEventName.PlayerLeaveVehicle]: (vehicle: IVehicle, seat: number) => void;
     [ClientInternalEventName.PlayerDeath]: (player: IPlayer) => void;
@@ -44,5 +44,5 @@ export interface IClientInternalEvents {
     [ClientInternalEventName.PlayerWeaponShot]: () => void;
     [ClientInternalEventName.Render]: () => void;
     [ClientInternalEventName.Click]: (options: IClickOptions) => void;
-    [ClientInternalEventName.SyncedMetaChange]: (entity: IEntity, key: string, value: unknown, oldValue: unknown) => void;
+    [ClientInternalEventName.SyncedMetaChange]: (object: IBaseObject, key: string, value: unknown, oldValue: unknown) => void;
 }

package/dist/client/net/ragemp/dataHandler/RageDataHandler.d.ts

@@ -1,7 +1,7 @@
-import { type IEntity, type IEntityPoolRouter } from "../../../entities";
+import { type IBaseObject, type IEntityPoolRouter } from "../../../entities";
 import { type IDataHandler } from "../../../net/common/dataHandler/IDataHandler";
 export declare class RageDataHandler implements IDataHandler {
     private readonly _entityPoolRouter;
     constructor(entityPoolRouter: IEntityPoolRouter);
-    addDataHandler(key: string, callback: (entity: IEntity, value: unknown, oldValue?: unknown) => void): void;
+    addDataHandler(key: string, callback: (object: IBaseObject, value: unknown, oldValue?: unknown) => void): void;
 }

package/dist/server/entities/ccmp/baseObject/CCMPBaseObjectsManager.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CCMPBaseObjectsManager = void 0;
 const CCMPBaseObjectsIterator_1 = require("./CCMPBaseObjectsIterator");
+const RockMod_1 = require("../../../RockMod");
+const types_1 = require("../../../net/common/events/types");
 class CCMPBaseObjectsManager {
     _baseObjects;
     _baseObjectsType;
@@ -35,15 +37,13 @@ class CCMPBaseObjectsManager {
             throw new Error(`BaseObject [${this._baseObjectsType}] with id ${baseObject.id} already exists`);
         }
         this._baseObjects.set(baseObject.id, baseObject);
-        // TODO: emit ServerInternalEventName.EntityCreated and broadcast EntityCreated DTO
-        // through net.events once CCMPEventsManager is implemented (parity with RageBaseObjectsManager).
+        RockMod_1.RockMod.instance.net.events.emitInternal(types_1.ServerInternalEventName.EntityCreated, baseObject);
     }
     unregisterBaseObject(baseObject) {
         if (!this._baseObjects.delete(baseObject.id)) {
             throw new Error(`BaseObject [${this._baseObjectsType}] with id ${baseObject.id} not found`);
         }
-        // TODO: emit ServerInternalEventName.EntityDestroyed and broadcast EntityDestroyed DTO
-        // through net.events once CCMPEventsManager is implemented.
+        RockMod_1.RockMod.instance.net.events.emitInternal(types_1.ServerInternalEventName.EntityDestroyed, baseObject);
     }
 }
 exports.CCMPBaseObjectsManager = CCMPBaseObjectsManager;

package/dist/server/entities/ccmp/blip/CCMPBlip.d.ts

@@ -27,6 +27,8 @@ export declare class CCMPBlip extends CCMPWorldObject implements IBlip {
     destroy(): void;
     setPosition(value: IVector3D): void;
     setDimension(value: number): void;
+    getNetData(name: string): unknown;
+    setNetData(name: string, value: unknown): void;
     setName(value: string): void;
     setSprite(value: IBlipSprite): void;
     setColor(value: IBlipColor): void;

package/dist/server/entities/ccmp/blip/CCMPBlip.js

@@ -64,6 +64,12 @@ class CCMPBlip extends CCMPWorldObject_1.CCMPWorldObject {
     setDimension(value) {
         this._ccmpBlip.dimension = value;
     }
+    getNetData(name) {
+        return this._ccmpBlip.getStreamSyncedMeta(name);
+    }
+    setNetData(name, value) {
+        this._ccmpBlip.setStreamSyncedMeta(name, value);
+    }
     setName(value) {
         this._ccmpBlip.name = value;
     }

package/dist/server/entities/ccmp/colshape/CCMPColshape.d.ts

@@ -16,6 +16,8 @@ export declare abstract class CCMPColshape extends CCMPWorldObject implements IC
     get position(): IVector3D;
     get dimension(): number;
     get playersInside(): readonly CcmpPlayer[];
+    getNetData(name: string): unknown;
+    setNetData(name: string, value: unknown): void;
     protected constructor(options: ICCMPColshapeOptions);
     destroy(): void;
     setPosition(value: IVector3D): void;

package/dist/server/entities/ccmp/colshape/CCMPColshape.js

@@ -26,6 +26,12 @@ class CCMPColshape extends CCMPWorldObject_1.CCMPWorldObject {
     get playersInside() {
         return this._ccmpColshape.playersInside;
     }
+    getNetData(name) {
+        return this._ccmpColshape.getStreamSyncedMeta(name);
+    }
+    setNetData(name, value) {
+        this._ccmpColshape.setStreamSyncedMeta(name, value);
+    }
     constructor(options) {
         super();
         this._ccmpColshape = options.ccmpColshape;

package/dist/server/entities/ccmp/marker/CCMPMarker.d.ts

@@ -25,6 +25,8 @@ export declare class CCMPMarker extends CCMPWorldObject implements IMarker {
     destroy(): void;
     setPosition(value: IVector3D): void;
     setDimension(value: number): void;
+    getNetData(name: string): unknown;
+    setNetData(name: string, value: unknown): void;
     setVisible(value: boolean): void;
     setScale(value: number): void;
     setColor(value: IRGBA): void;

package/dist/server/entities/ccmp/marker/CCMPMarker.js

@@ -58,6 +58,12 @@ class CCMPMarker extends CCMPWorldObject_1.CCMPWorldObject {
     setDimension(value) {
         this._ccmpMarker.dimension = value;
     }
+    getNetData(name) {
+        return this._ccmpMarker.getStreamSyncedMeta(name);
+    }
+    setNetData(name, value) {
+        this._ccmpMarker.setStreamSyncedMeta(name, value);
+    }
     setVisible(value) {
         this._ccmpMarker.visible = value;
     }

package/dist/server/entities/ccmp/object/CCMPObject.d.ts

@@ -18,6 +18,7 @@ export interface ICCMPObjectNative extends StreamSyncedMeta {
     };
     model: number;
     dimension: number;
+    alpha: number;
     destroy(): boolean;
 }
 export interface ICCMPObjectOptions {
@@ -28,7 +29,6 @@ export interface ICCMPObjectOptions {
 export declare class CCMPObject extends CCMPEntity implements IObject {
     private readonly _ccmpObject;
     private readonly _onDestroy;
-    private _alpha;
     get id(): number;
     get type(): BaseObjectType;
     get isExists(): boolean;

package/dist/server/entities/ccmp/object/CCMPObject.js

@@ -8,7 +8,6 @@ const RockMod_1 = require("../../../RockMod");
 class CCMPObject extends CCMPEntity_1.CCMPEntity {
     _ccmpObject;
     _onDestroy;
-    _alpha;
     get id() {
         return this._ccmpObject.id;
     }
@@ -33,7 +32,7 @@ class CCMPObject extends CCMPEntity_1.CCMPEntity {
         return new Vectors_1.Vector3D(r.x, r.y, r.z);
     }
     get alpha() {
-        return this._alpha;
+        return this._ccmpObject.alpha;
     }
     get ccmpMeta() {
         return this._ccmpObject;
@@ -41,7 +40,7 @@ class CCMPObject extends CCMPEntity_1.CCMPEntity {
     constructor(options) {
         super();
         this._ccmpObject = options.ccmpObject;
-        this._alpha = options.alpha;
+        this._ccmpObject.alpha = options.alpha;
         this._onDestroy = options.onDestroy;
     }
     destroy() {
@@ -62,9 +61,8 @@ class CCMPObject extends CCMPEntity_1.CCMPEntity {
     setRotation(value) {
         this._ccmpObject.rotation = { x: value.x, y: value.y, z: value.z };
     }
-    // CCMP runtime currently has no object alpha op; keep an API-level cache.
     setAlpha(value) {
-        this._alpha = value;
+        this._ccmpObject.alpha = value;
     }
 }
 exports.CCMPObject = CCMPObject;

package/dist/server/entities/ccmp/object/CCMPObjectsManager.js

@@ -11,11 +11,10 @@ class CCMPObjectsManager extends CCMPEntitiesManager_1.CCMPEntitiesManager {
     }
     create(options) {
         const { model, position, dimension, rotation, alpha } = options;
-        const ccmpObject = ccmp.objects.create(ccmp.hash(model), position.x, position.y, position.z, rotation.x, rotation.y, rotation.z);
+        const ccmpObject = ccmp.objects.create(ccmp.hash(model), position.x, position.y, position.z, rotation.x, rotation.y, rotation.z, { dimension, alpha });
         if (!ccmpObject) {
             throw new Error("CCMPObjectsManager.create: ccmp.objects.create failed (server full?)");
         }
-        ccmpObject.dimension = dimension;
         const object = new CCMPObject_1.CCMPObject({
             ccmpObject,
             alpha,

package/dist/server/entities/ccmp/vehicle/CCMPVehicle.d.ts

@@ -40,7 +40,7 @@ export declare class CCMPVehicle extends CCMPEntity implements IVehicle {
     setBodyHealth(_value: number): void;
     setEngineHealth(_value: number): void;
     setEngineOn(value: boolean): void;
-    setNumberPlate(_value: string): void;
+    setNumberPlate(value: string): void;
     setLocked(_value: boolean): void;
     setPrimaryColor(_value: number): void;
     setSecondaryColor(_value: number): void;
@@ -52,7 +52,7 @@ export declare class CCMPVehicle extends CCMPEntity implements IVehicle {
     setNeonColor(_r: number, _g: number, _b: number): void;
     setWindowTint(_tintType: number): void;
     setWheelType(_wheelType: number): void;
-    setPlateType(_plateType: number): void;
+    setPlateType(plateType: number): void;
     explode(): void;
     repair(): void;
 }

package/dist/server/entities/ccmp/vehicle/CCMPVehicle.js

@@ -41,7 +41,7 @@ class CCMPVehicle extends CCMPEntity_1.CCMPEntity {
         return notImplemented("CCMPVehicle.engineHealth");
     }
     get numberPlate() {
-        return notImplemented("CCMPVehicle.numberPlate");
+        return this._ccmpVehicle.numberPlateText;
     }
     get isLocked() {
         return notImplemented("CCMPVehicle.isLocked");
@@ -112,8 +112,8 @@ class CCMPVehicle extends CCMPEntity_1.CCMPEntity {
     setEngineOn(value) {
         this._ccmpVehicle.engineOn = value;
     }
-    setNumberPlate(_value) {
-        notImplemented("CCMPVehicle.setNumberPlate");
+    setNumberPlate(value) {
+        this._ccmpVehicle.numberPlateText = value;
     }
     setLocked(_value) {
         notImplemented("CCMPVehicle.setLocked");
@@ -148,8 +148,8 @@ class CCMPVehicle extends CCMPEntity_1.CCMPEntity {
     setWheelType(_wheelType) {
         notImplemented("CCMPVehicle.setWheelType");
     }
-    setPlateType(_plateType) {
-        notImplemented("CCMPVehicle.setPlateType");
+    setPlateType(plateType) {
+        this._ccmpVehicle.numberPlateType = plateType;
     }
     explode() {
         notImplemented("CCMPVehicle.explode");

package/dist/server/entities/ragemp/entity/RageEntity.d.ts

@@ -1,9 +1,11 @@
 import { type IEntity } from "../../common/entity/IEntity";
 import { type IRageWorldObjectOptions, RageWorldObject } from "../worldObject/RageWorldObject";
-import { Vector3D } from "../../../../shared/common/utils";
+import { type IVector3D, Vector3D } from "../../../../shared/common/utils";
 export interface IRageEntityOptions<T extends EntityMp> extends IRageWorldObjectOptions<T> {
+    rotation?: IVector3D;
 }
 export declare abstract class RageEntity<T extends EntityMp> extends RageWorldObject<T> implements IEntity {
+    private _rotation;
     get model(): number;
     get rotation(): Vector3D;
     protected constructor(options: IRageEntityOptions<T>);
@@ -11,4 +13,6 @@ export declare abstract class RageEntity<T extends EntityMp> extends RageWorldOb
     setRotation(value: Vector3D): void;
     getNetData(name: string): unknown;
     setNetData(name: string, value: unknown): void;
+    private _getEntityRotationProperty;
+    private _isVectorLike;
 }

package/dist/server/entities/ragemp/entity/RageEntity.js

@@ -4,20 +4,23 @@ exports.RageEntity = void 0;
 const RageWorldObject_1 = require("../worldObject/RageWorldObject");
 const utils_1 = require("../../../../shared/common/utils");
 class RageEntity extends RageWorldObject_1.RageWorldObject {
+    _rotation;
     get model() {
         return this.mpEntity.model;
     }
     get rotation() {
-        const { x, y, z } = this.mpEntity.rotation;
+        const { x, y, z } = this._getEntityRotationProperty() ?? this._rotation ?? new utils_1.Vector3D(0, 0, 0);
         return new utils_1.Vector3D(x, y, z);
     }
     constructor(options) {
         super(options);
+        this._rotation = options.rotation;
     }
     setModel(value) {
         this.mpEntity.model = mp.joaat(value);
     }
     setRotation(value) {
+        this._rotation = value;
         this.mpEntity.rotation = new mp.Vector3(value);
     }
     getNetData(name) {
@@ -26,5 +29,18 @@ class RageEntity extends RageWorldObject_1.RageWorldObject {
     setNetData(name, value) {
         this.mpEntity.setVariable(name, value);
     }
+    _getEntityRotationProperty() {
+        const rotation = this.mpEntity.rotation;
+        if (!this._isVectorLike(rotation))
+            return null;
+        return rotation;
+    }
+    _isVectorLike(value) {
+        return (typeof value === "object" &&
+            value !== null &&
+            typeof value.x === "number" &&
+            typeof value.y === "number" &&
+            typeof value.z === "number");
+    }
 }
 exports.RageEntity = RageEntity;

package/dist/server/entities/ragemp/object/RageObjectsManager.js

@@ -17,7 +17,7 @@ class RageObjectsManager extends RageEntitiesManager_1.RageEntitiesManager {
             alpha,
         });
         mpEntity.isExists = () => mp.objects.exists(mpEntity);
-        const object = new RageObject_1.RageObject({ mpEntity });
+        const object = new RageObject_1.RageObject({ mpEntity, rotation });
         this.registerBaseObject(object);
         return object;
     }

package/dist/server/entities/ragemp/ped/RagePedsManager.js

@@ -17,7 +17,7 @@ class RagePedsManager extends RageEntitiesManager_1.RageEntitiesManager {
             frozen,
         });
         mpEntity.isExists = () => mp.peds.exists(mpEntity);
-        const ped = new RagePed_1.RagePed({ mpEntity });
+        const ped = new RagePed_1.RagePed({ mpEntity, rotation });
         this.registerBaseObject(ped);
         return ped;
     }

package/dist/server/entities/ragemp/vehicle/RageVehiclesManager.js

@@ -19,7 +19,7 @@ class RageVehiclesManager extends RageEntitiesManager_1.RageEntitiesManager {
         });
         mpEntity.rotation = new mp.Vector3(rotation);
         mpEntity.isExists = () => mp.vehicles.exists(mpEntity);
-        const vehicle = new RageVehicle_1.RageVehicle({ mpEntity });
+        const vehicle = new RageVehicle_1.RageVehicle({ mpEntity, rotation });
         this.registerBaseObject(vehicle);
         return vehicle;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rock-mod",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Rock-Mod is a powerful framework designed for creating and managing mods for Grand Theft Auto (GTA) games.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -87,7 +87,7 @@
     "@swc/helpers": "^0.5.15"
   },
   "devDependencies": {
-    "@classic-mp/types": "^1.4.1",
+    "@classic-mp/types": "^1.6.0",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",