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

package/dist/runtime/client/services/vehicle-client.service.js

@@ -7,477 +7,331 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { injectable } from 'tsyringe';
-/**
- * Client-side vehicle service.
- *
- * This service provides a simplified interface for vehicle operations on the client.
- * Most operations delegate to the server for security and synchronization.
- *
- * @remarks
- * - Vehicle creation is server-authoritative (prevents spawning exploits)
- * - Modifications require server validation
- * - Local operations (queries, visual changes) are safe to perform client-side
- */
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+import { inject, injectable } from 'tsyringe';
+import { EventsAPI } from '../../../adapters/contracts/transport/events.api';
+import { IClientPlatformBridge } from '../adapter/platform-bridge';
+import { IClientRuntimeBridge } from '../adapter/runtime-bridge';
 let VehicleClientService = class VehicleClientService {
+    events;
+    platform;
+    runtime;
     pendingCreations = new Map();
+    pendingDeletes = new Map();
+    pendingRepairs = new Map();
+    pendingData = new Map();
+    pendingPlayerVehicles = null;
     requestIdCounter = 0;
-    constructor() {
+    constructor(events, platform, runtime) {
+        this.events = events;
+        this.platform = platform;
+        this.runtime = runtime;
         this.registerEventHandlers();
     }
-    /**
-     * Requests vehicle creation from the server.
-     *
-     * @param options - Vehicle creation options
-     * @returns Promise resolving to spawn result
-     */
     async createVehicle(options) {
         return new Promise((resolve) => {
             const requestId = this.requestIdCounter++;
             this.pendingCreations.set(requestId, resolve);
-            emitNet('opencore:vehicle:create', {
-                ...options,
-                _requestId: requestId,
-            });
+            this.events.emit('opencore:vehicle:create', { ...options, _requestId: requestId });
             setTimeout(() => {
-                if (this.pendingCreations.has(requestId)) {
-                    this.pendingCreations.delete(requestId);
-                    resolve({
-                        networkId: 0,
-                        handle: 0,
-                        success: false,
-                        error: 'Request timeout',
-                    });
-                }
+                if (!this.pendingCreations.has(requestId))
+                    return;
+                this.pendingCreations.delete(requestId);
+                resolve({ networkId: 0, handle: 0, success: false, error: 'Request timeout' });
             }, 5000);
         });
     }
-    /**
-     * Requests vehicle deletion from the server.
-     *
-     * @param networkId - Network ID of the vehicle
-     * @returns Promise resolving to success status
-     */
     async deleteVehicle(networkId) {
         return new Promise((resolve) => {
-            const handler = (result) => {
-                if (result.networkId === networkId) {
-                    resolve(result.success);
-                }
-            };
-            const eventName = 'opencore:vehicle:deleteResult';
-            onNet(eventName, handler);
-            emitNet('opencore:vehicle:delete', networkId);
+            this.pendingDeletes.set(networkId, resolve);
+            this.events.emit('opencore:vehicle:delete', networkId);
             setTimeout(() => {
-                removeEventListener(eventName, handler);
+                if (!this.pendingDeletes.has(networkId))
+                    return;
+                this.pendingDeletes.delete(networkId);
                 resolve(false);
             }, 5000);
         });
     }
-    /**
-     * Requests vehicle repair from the server.
-     *
-     * @param networkId - Network ID of the vehicle
-     * @returns Promise resolving to success status
-     */
     async repairVehicle(networkId) {
         return new Promise((resolve) => {
-            const handler = (result) => {
-                if (result.networkId === networkId) {
-                    resolve(result.success);
-                }
-            };
-            const eventName = 'opencore:vehicle:repairResult';
-            onNet(eventName, handler);
-            emitNet('opencore:vehicle:repair', networkId);
+            this.pendingRepairs.set(networkId, resolve);
+            this.events.emit('opencore:vehicle:repair', networkId);
             setTimeout(() => {
-                removeEventListener(eventName, handler);
+                if (!this.pendingRepairs.has(networkId))
+                    return;
+                this.pendingRepairs.delete(networkId);
                 resolve(false);
             }, 5000);
         });
     }
-    /**
-     * Gets the closest vehicle to the player.
-     *
-     * @param radius - Search radius
-     * @returns Vehicle handle or null
-     */
     getClosestVehicle(radius = 10.0) {
-        const playerPed = PlayerPedId();
-        const [px, py, pz] = GetEntityCoords(playerPed, true);
-        const vehicle = GetClosestVehicle(px, py, pz, radius, 0, 71);
-        return vehicle !== 0 ? vehicle : null;
+        const playerPed = this.platform.getLocalPlayerPed();
+        return this.platform.getClosestVehicle(this.platform.getEntityCoords(playerPed), radius);
     }
-    /**
-     * Checks if the player is in a vehicle.
-     */
     isPlayerInVehicle() {
-        return IsPedInAnyVehicle(PlayerPedId(), false);
+        return this.platform.isPedInAnyVehicle(this.platform.getLocalPlayerPed());
     }
-    /**
-     * Gets the vehicle the player is currently in.
-     *
-     * @returns Vehicle handle or null
-     */
     getCurrentVehicle() {
-        const ped = PlayerPedId();
-        if (!IsPedInAnyVehicle(ped, false))
+        const ped = this.platform.getLocalPlayerPed();
+        if (!this.platform.isPedInAnyVehicle(ped))
             return null;
-        return GetVehiclePedIsIn(ped, false);
+        return this.platform.getVehiclePedIsIn(ped, false);
     }
-    /**
-     * Gets the last vehicle the player was in.
-     *
-     * @returns Vehicle handle or null
-     */
     getLastVehicle() {
-        const vehicle = GetVehiclePedIsIn(PlayerPedId(), true);
-        return vehicle !== 0 ? vehicle : null;
+        return this.platform.getVehiclePedIsIn(this.platform.getLocalPlayerPed(), true);
     }
-    /**
-     * Checks if player is the driver of their current vehicle.
-     */
     isPlayerDriver() {
         const vehicle = this.getCurrentVehicle();
         if (!vehicle)
             return false;
-        return GetPedInVehicleSeat(vehicle, -1) === PlayerPedId();
+        return this.platform.getPedInVehicleSeat(vehicle, -1) === this.platform.getLocalPlayerPed();
     }
-    /**
-     * Gets vehicle speed in km/h.
-     *
-     * @param vehicle - Vehicle handle
-     */
     getSpeed(vehicle) {
-        if (!DoesEntityExist(vehicle))
+        if (!this.platform.doesEntityExist(vehicle))
             return 0;
-        return GetEntitySpeed(vehicle) * 3.6;
+        return this.platform.getEntitySpeed(vehicle) * 3.6;
     }
-    /**
-     * Gets the network ID from a vehicle handle.
-     *
-     * @param vehicle - Vehicle handle
-     * @returns Network ID or 0 if invalid
-     */
     getNetworkId(vehicle) {
-        if (!DoesEntityExist(vehicle))
+        if (!this.platform.doesEntityExist(vehicle))
             return 0;
-        return NetworkGetNetworkIdFromEntity(vehicle);
+        return this.platform.networkGetNetworkIdFromEntity(vehicle);
     }
-    /**
-     * Gets the vehicle handle from a network ID.
-     *
-     * @param networkId - Network ID
-     * @returns Vehicle handle or 0 if not found
-     */
     getVehicleFromNetworkId(networkId) {
-        if (!NetworkDoesEntityExistWithNetworkId(networkId))
+        if (!this.platform.networkDoesEntityExistWithNetworkId(networkId))
             return 0;
-        return NetworkGetEntityFromNetworkId(networkId);
+        return this.platform.networkGetEntityFromNetworkId(networkId);
     }
-    /**
-     * Gets vehicle data from state bag.
-     *
-     * @param vehicle - Vehicle handle
-     * @param key - State bag key
-     * @returns State value or undefined
-     */
     getVehicleState(vehicle, key) {
-        if (!DoesEntityExist(vehicle))
+        if (!this.platform.doesEntityExist(vehicle))
             return undefined;
-        const stateBag = Entity(vehicle).state;
-        return stateBag[key];
+        return this.platform.getEntityState(vehicle, key);
     }
-    /**
-     * Requests to lock/unlock vehicle doors.
-     *
-     * @param networkId - Network ID of the vehicle
-     * @param locked - Whether to lock or unlock
-     */
     setDoorsLocked(networkId, locked) {
-        emitNet('opencore:vehicle:setLocked', networkId, locked);
+        this.events.emit('opencore:vehicle:setLocked', networkId, locked);
     }
-    /**
-     * Requests vehicle data from the server.
-     *
-     * @param networkId - Network ID of the vehicle
-     * @returns Promise resolving to vehicle data
-     */
     async getVehicleData(networkId) {
         return new Promise((resolve) => {
-            const handler = (data) => {
-                resolve(data);
-            };
-            const eventName = 'opencore:vehicle:dataResult';
-            onNet(eventName, handler);
-            emitNet('opencore:vehicle:getData', networkId);
+            this.pendingData.set(networkId, resolve);
+            this.events.emit('opencore:vehicle:getData', networkId);
             setTimeout(() => {
-                removeEventListener(eventName, handler);
+                if (!this.pendingData.has(networkId))
+                    return;
+                this.pendingData.delete(networkId);
                 resolve(null);
             }, 5000);
         });
     }
-    /**
-     * Requests all player vehicles from the server.
-     *
-     * @returns Promise resolving to array of vehicle data
-     */
     async getPlayerVehicles() {
         return new Promise((resolve) => {
-            const handler = (vehicles) => {
-                resolve(vehicles);
-            };
-            const eventName = 'opencore:vehicle:playerVehiclesResult';
-            onNet(eventName, handler);
-            emitNet('opencore:vehicle:getPlayerVehicles');
+            this.pendingPlayerVehicles = resolve;
+            this.events.emit('opencore:vehicle:getPlayerVehicles');
             setTimeout(() => {
-                removeEventListener(eventName, handler);
+                if (!this.pendingPlayerVehicles)
+                    return;
+                this.pendingPlayerVehicles = null;
                 resolve([]);
             }, 5000);
         });
     }
-    /**
-     * Local-only: Warps player into a vehicle.
-     *
-     * @param vehicle - Vehicle handle
-     * @param seatIndex - Seat index (-1 = driver)
-     */
     warpIntoVehicle(vehicle, seatIndex = -1) {
-        if (!DoesEntityExist(vehicle))
+        if (!this.platform.doesEntityExist(vehicle))
             return;
-        TaskWarpPedIntoVehicle(PlayerPedId(), vehicle, seatIndex);
+        this.platform.taskWarpPedIntoVehicle(this.platform.getLocalPlayerPed(), vehicle, seatIndex);
     }
-    /**
-     * Local-only: Sets vehicle heading.
-     *
-     * @param vehicle - Vehicle handle
-     * @param heading - Heading in degrees
-     */
     setHeading(vehicle, heading) {
-        if (!DoesEntityExist(vehicle))
+        if (!this.platform.doesEntityExist(vehicle))
             return;
-        SetEntityHeading(vehicle, heading);
+        this.platform.setEntityHeading(vehicle, heading);
     }
-    /**
-     * Local-only: Gets vehicle position.
-     *
-     * @param vehicle - Vehicle handle
-     * @returns Position vector
-     */
     getPosition(vehicle) {
-        if (!DoesEntityExist(vehicle))
+        if (!this.platform.doesEntityExist(vehicle))
             return null;
-        const coords = GetEntityCoords(vehicle, true);
-        return { x: coords[0], y: coords[1], z: coords[2] };
+        return this.platform.getEntityCoords(vehicle);
     }
-    /**
-     * Local-only: Gets vehicle heading.
-     *
-     * @param vehicle - Vehicle handle
-     * @returns Heading in degrees
-     */
     getHeading(vehicle) {
-        if (!DoesEntityExist(vehicle))
+        if (!this.platform.doesEntityExist(vehicle))
             return 0;
-        return GetEntityHeading(vehicle);
+        return this.platform.getEntityHeading(vehicle);
     }
-    /**
-     * Local-only: Gets vehicle model hash.
-     *
-     * @param vehicle - Vehicle handle
-     * @returns Model hash
-     */
     getModel(vehicle) {
-        if (!DoesEntityExist(vehicle))
+        if (!this.platform.doesEntityExist(vehicle))
             return 0;
-        return GetEntityModel(vehicle);
+        return this.platform.getEntityModel(vehicle);
     }
-    /**
-     * Local-only: Gets vehicle license plate.
-     *
-     * @param vehicle - Vehicle handle
-     * @returns License plate text
-     */
     getPlate(vehicle) {
-        if (!DoesEntityExist(vehicle))
+        if (!this.platform.doesEntityExist(vehicle))
             return '';
-        return GetVehicleNumberPlateText(vehicle);
+        return this.platform.getVehicleNumberPlateText(vehicle);
     }
-    /**
-     * Applies vehicle mods from state bag data.
-     *
-     * @param vehicle - Vehicle handle
-     * @param mods - Mods object from state bag
-     */
     applyMods(vehicle, mods) {
-        if (!DoesEntityExist(vehicle))
+        if (!this.platform.doesEntityExist(vehicle))
             return;
-        SetVehicleModKit(vehicle, 0);
+        this.platform.setVehicleModKit(vehicle, 0);
         if (mods.spoiler !== undefined)
-            SetVehicleMod(vehicle, 0, mods.spoiler, false);
+            this.platform.setVehicleMod(vehicle, 0, mods.spoiler, false);
         if (mods.frontBumper !== undefined)
-            SetVehicleMod(vehicle, 1, mods.frontBumper, false);
+            this.platform.setVehicleMod(vehicle, 1, mods.frontBumper, false);
         if (mods.rearBumper !== undefined)
-            SetVehicleMod(vehicle, 2, mods.rearBumper, false);
+            this.platform.setVehicleMod(vehicle, 2, mods.rearBumper, false);
         if (mods.sideSkirt !== undefined)
-            SetVehicleMod(vehicle, 3, mods.sideSkirt, false);
+            this.platform.setVehicleMod(vehicle, 3, mods.sideSkirt, false);
         if (mods.exhaust !== undefined)
-            SetVehicleMod(vehicle, 4, mods.exhaust, false);
+            this.platform.setVehicleMod(vehicle, 4, mods.exhaust, false);
         if (mods.frame !== undefined)
-            SetVehicleMod(vehicle, 5, mods.frame, false);
+            this.platform.setVehicleMod(vehicle, 5, mods.frame, false);
         if (mods.grille !== undefined)
-            SetVehicleMod(vehicle, 6, mods.grille, false);
+            this.platform.setVehicleMod(vehicle, 6, mods.grille, false);
         if (mods.hood !== undefined)
-            SetVehicleMod(vehicle, 7, mods.hood, false);
+            this.platform.setVehicleMod(vehicle, 7, mods.hood, false);
         if (mods.fender !== undefined)
-            SetVehicleMod(vehicle, 8, mods.fender, false);
+            this.platform.setVehicleMod(vehicle, 8, mods.fender, false);
         if (mods.rightFender !== undefined)
-            SetVehicleMod(vehicle, 9, mods.rightFender, false);
+            this.platform.setVehicleMod(vehicle, 9, mods.rightFender, false);
         if (mods.roof !== undefined)
-            SetVehicleMod(vehicle, 10, mods.roof, false);
+            this.platform.setVehicleMod(vehicle, 10, mods.roof, false);
         if (mods.engine !== undefined)
-            SetVehicleMod(vehicle, 11, mods.engine, false);
+            this.platform.setVehicleMod(vehicle, 11, mods.engine, false);
         if (mods.brakes !== undefined)
-            SetVehicleMod(vehicle, 12, mods.brakes, false);
+            this.platform.setVehicleMod(vehicle, 12, mods.brakes, false);
         if (mods.transmission !== undefined)
-            SetVehicleMod(vehicle, 13, mods.transmission, false);
+            this.platform.setVehicleMod(vehicle, 13, mods.transmission, false);
         if (mods.horns !== undefined)
-            SetVehicleMod(vehicle, 14, mods.horns, false);
+            this.platform.setVehicleMod(vehicle, 14, mods.horns, false);
         if (mods.suspension !== undefined)
-            SetVehicleMod(vehicle, 15, mods.suspension, false);
+            this.platform.setVehicleMod(vehicle, 15, mods.suspension, false);
         if (mods.armor !== undefined)
-            SetVehicleMod(vehicle, 16, mods.armor, false);
+            this.platform.setVehicleMod(vehicle, 16, mods.armor, false);
         if (mods.turbo !== undefined)
-            ToggleVehicleMod(vehicle, 18, mods.turbo);
+            this.platform.toggleVehicleMod(vehicle, 18, mods.turbo);
         if (mods.xenon !== undefined)
-            ToggleVehicleMod(vehicle, 22, mods.xenon);
+            this.platform.toggleVehicleMod(vehicle, 22, mods.xenon);
         if (mods.wheelType !== undefined)
-            SetVehicleWheelType(vehicle, mods.wheelType);
+            this.platform.setVehicleWheelType(vehicle, mods.wheelType);
         if (mods.wheels !== undefined)
-            SetVehicleMod(vehicle, 23, mods.wheels, false);
+            this.platform.setVehicleMod(vehicle, 23, mods.wheels, false);
         if (mods.windowTint !== undefined)
-            SetVehicleWindowTint(vehicle, mods.windowTint);
+            this.platform.setVehicleWindowTint(vehicle, mods.windowTint);
         if (mods.livery !== undefined)
-            SetVehicleLivery(vehicle, mods.livery);
+            this.platform.setVehicleLivery(vehicle, mods.livery);
         if (mods.plateStyle !== undefined)
-            SetVehicleNumberPlateTextIndex(vehicle, mods.plateStyle);
+            this.platform.setVehicleNumberPlateTextIndex(vehicle, mods.plateStyle);
         if (mods.neonEnabled !== undefined) {
-            SetVehicleNeonLightEnabled(vehicle, 0, mods.neonEnabled[0]);
-            SetVehicleNeonLightEnabled(vehicle, 1, mods.neonEnabled[1]);
-            SetVehicleNeonLightEnabled(vehicle, 2, mods.neonEnabled[2]);
-            SetVehicleNeonLightEnabled(vehicle, 3, mods.neonEnabled[3]);
+            this.platform.setVehicleNeonLightEnabled(vehicle, 0, mods.neonEnabled[0]);
+            this.platform.setVehicleNeonLightEnabled(vehicle, 1, mods.neonEnabled[1]);
+            this.platform.setVehicleNeonLightEnabled(vehicle, 2, mods.neonEnabled[2]);
+            this.platform.setVehicleNeonLightEnabled(vehicle, 3, mods.neonEnabled[3]);
         }
         if (mods.neonColor !== undefined) {
-            SetVehicleNeonLightsColour(vehicle, mods.neonColor[0], mods.neonColor[1], mods.neonColor[2]);
+            this.platform.setVehicleNeonLightsColour(vehicle, mods.neonColor[0], mods.neonColor[1], mods.neonColor[2]);
         }
         if (mods.extras) {
             for (const [extraId, enabled] of Object.entries(mods.extras)) {
-                SetVehicleExtra(vehicle, Number(extraId), !enabled);
+                this.platform.setVehicleExtra(vehicle, Number(extraId), !enabled);
             }
         }
         if (mods.pearlescentColor !== undefined || mods.wheelColor !== undefined) {
-            const [currentPearl, currentWheel] = GetVehicleExtraColours(vehicle);
-            SetVehicleExtraColours(vehicle, mods.pearlescentColor ?? currentPearl, mods.wheelColor ?? currentWheel);
+            const [currentPearl, currentWheel] = this.platform.getVehicleExtraColours(vehicle);
+            this.platform.setVehicleExtraColours(vehicle, mods.pearlescentColor ?? currentPearl, mods.wheelColor ?? currentWheel);
         }
     }
-    /**
-     * Repairs a vehicle completely (client-side).
-     *
-     * @param vehicle - Vehicle handle
-     */
     repair(vehicle) {
-        if (!DoesEntityExist(vehicle))
+        if (!this.platform.doesEntityExist(vehicle))
             return;
-        SetVehicleFixed(vehicle);
-        SetVehicleDeformationFixed(vehicle);
-        SetVehicleUndriveable(vehicle, false);
-        SetVehicleEngineOn(vehicle, true, true, false);
-        SetVehicleEngineHealth(vehicle, 1000.0);
-        SetVehiclePetrolTankHealth(vehicle, 1000.0);
+        this.platform.setVehicleFixed(vehicle);
+        this.platform.setVehicleDeformationFixed(vehicle);
+        this.platform.setVehicleUndriveable(vehicle, false);
+        this.platform.setVehicleEngineOn(vehicle, true, true, false);
+        this.platform.setVehicleEngineHealth(vehicle, 1000.0);
+        this.platform.setVehiclePetrolTankHealth(vehicle, 1000.0);
     }
-    /**
-     * Sets fuel level on a vehicle (client-side).
-     *
-     * @param vehicle - Vehicle handle
-     * @param level - Fuel level (0-100)
-     */
     setFuel(vehicle, level) {
-        if (!DoesEntityExist(vehicle))
+        if (!this.platform.doesEntityExist(vehicle))
             return;
-        SetVehicleFuelLevel(vehicle, Math.max(0, Math.min(100, level)));
+        this.platform.setVehicleFuelLevel(vehicle, Math.max(0, Math.min(100, level)));
     }
-    /**
-     * Registers event handlers for server responses.
-     */
     registerEventHandlers() {
-        onNet('opencore:vehicle:createResult', (result) => {
-            if (result._requestId !== undefined) {
-                const callback = this.pendingCreations.get(result._requestId);
-                if (callback) {
-                    callback(result);
-                    this.pendingCreations.delete(result._requestId);
-                }
-            }
+        this.events.on('opencore:vehicle:createResult', (_ctx, result) => {
+            if (result._requestId === undefined)
+                return;
+            const callback = this.pendingCreations.get(result._requestId);
+            if (!callback)
+                return;
+            callback(result);
+            this.pendingCreations.delete(result._requestId);
         });
-        onNet('opencore:vehicle:created', async (data) => {
-            // Wait for vehicle to exist locally
-            const started = GetGameTimer();
-            let veh = 0;
-            while (GetGameTimer() - started < 5000) {
-                veh = this.getVehicleFromNetworkId(data.networkId);
-                if (veh && DoesEntityExist(veh))
-                    break;
-                await new Promise((r) => setTimeout(r, 0));
-            }
-            if (veh && DoesEntityExist(veh)) {
-                // Apply mods from server data
-                if (data.mods && Object.keys(data.mods).length > 0) {
-                    this.applyMods(veh, data.mods);
-                }
-                // Apply fuel from metadata
-                if (data.metadata?.fuel !== undefined) {
-                    this.setFuel(veh, data.metadata.fuel);
-                }
-            }
+        this.events.on('opencore:vehicle:deleteResult', (_ctx, result) => {
+            const callback = this.pendingDeletes.get(result.networkId);
+            if (!callback)
+                return;
+            callback(result.success);
+            this.pendingDeletes.delete(result.networkId);
+        });
+        this.events.on('opencore:vehicle:repairResult', (_ctx, result) => {
+            const callback = this.pendingRepairs.get(result.networkId);
+            if (!callback)
+                return;
+            callback(result.success);
+            this.pendingRepairs.delete(result.networkId);
         });
-        onNet('opencore:vehicle:deleted', (networkId) => {
-            console.log('[VehicleClient] Vehicle deleted:', networkId);
+        this.events.on('opencore:vehicle:dataResult', (_ctx, data) => {
+            if (!data)
+                return;
+            const callback = this.pendingData.get(data.networkId);
+            if (!callback)
+                return;
+            callback(data);
+            this.pendingData.delete(data.networkId);
         });
-        onNet('opencore:vehicle:modified', (data) => {
+        this.events.on('opencore:vehicle:playerVehiclesResult', (_ctx, vehicles) => {
+            this.pendingPlayerVehicles?.(vehicles);
+            this.pendingPlayerVehicles = null;
+        });
+        this.events.on('opencore:vehicle:created', async (_ctx, data) => {
+            const veh = await this.waitForVehicle(data.networkId);
+            if (!veh)
+                return;
+            if (data.mods && Object.keys(data.mods).length > 0)
+                this.applyMods(veh, data.mods);
+            if (data.metadata?.fuel !== undefined)
+                this.setFuel(veh, data.metadata.fuel);
+        });
+        this.events.on('opencore:vehicle:modified', (_ctx, data) => {
             const veh = this.getVehicleFromNetworkId(data.networkId);
-            if (veh && DoesEntityExist(veh)) {
+            if (veh && this.platform.doesEntityExist(veh))
                 this.applyMods(veh, data.mods);
-            }
         });
-        onNet('opencore:vehicle:repaired', (networkId) => {
+        this.events.on('opencore:vehicle:repaired', (_ctx, networkId) => {
             const veh = this.getVehicleFromNetworkId(networkId);
-            if (veh && DoesEntityExist(veh)) {
+            if (veh && this.platform.doesEntityExist(veh))
                 this.repair(veh);
-            }
-        });
-        onNet('opencore:vehicle:lockedChanged', (data) => {
-            console.log('[VehicleClient] Vehicle lock changed:', data.networkId, data.locked);
         });
-        onNet('opencore:vehicle:warpInto', async (networkId, seatIndex = -1) => {
-            const started = GetGameTimer();
-            let veh = 0;
-            while (GetGameTimer() - started < 5000) {
-                veh = this.getVehicleFromNetworkId(networkId);
-                if (veh && DoesEntityExist(veh))
-                    break;
-                await new Promise((r) => setTimeout(r, 0));
-            }
-            if (veh && DoesEntityExist(veh)) {
+        this.events.on('opencore:vehicle:warpInto', async (_ctx, networkId, seatIndex = -1) => {
+            const veh = await this.waitForVehicle(networkId);
+            if (veh)
                 this.warpIntoVehicle(veh, seatIndex);
-            }
-            else {
-                console.error('[VehicleClient] Failed to warp into vehicle:', networkId);
-            }
         });
     }
+    async waitForVehicle(networkId) {
+        const started = this.runtime.getGameTimer();
+        while (this.runtime.getGameTimer() - started < 5000) {
+            const veh = this.getVehicleFromNetworkId(networkId);
+            if (veh && this.platform.doesEntityExist(veh))
+                return veh;
+            await new Promise((r) => setTimeout(r, 0));
+        }
+        return null;
+    }
 };
 VehicleClientService = __decorate([
     injectable(),
-    __metadata("design:paramtypes", [])
+    __param(0, inject(EventsAPI)),
+    __param(1, inject(IClientPlatformBridge)),
+    __param(2, inject(IClientRuntimeBridge)),
+    __metadata("design:paramtypes", [EventsAPI,
+        IClientPlatformBridge,
+        IClientRuntimeBridge])
 ], VehicleClientService);
 export { VehicleClientService };