@open-core/framework 1.0.2-beta.1 → 1.0.4-beta.1

package/dist/server/system/processors/fivemEvent.processor.js

@@ -0,0 +1,40 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FiveMEventProcessor = void 0;
+const tsyringe_1 = require("tsyringe");
+const metadata_server_keys_1 = require("../metadata-server.keys");
+const logger_1 = require("../../../shared/logger");
+const resolve_method_1 = require("../../helpers/resolve-method");
+let FiveMEventProcessor = class FiveMEventProcessor {
+    constructor() {
+        this.metadataKey = metadata_server_keys_1.METADATA_KEYS.FIVEM_EVENT;
+    }
+    process(instance, methodName, metadata) {
+        const result = (0, resolve_method_1.resolveMethod)(instance, methodName, `[FiveMEventProcessor] Method "${methodName}" not found`);
+        if (!result)
+            return;
+        const { handler, handlerName } = result;
+        on(metadata.event, (...args) => {
+            try {
+                handler(...args);
+            }
+            catch (error) {
+                logger_1.loggers.eventBus.error(`Handler error in FiveMEvent`, {
+                    event: metadata.event,
+                    handler: handlerName,
+                }, error);
+            }
+        });
+        logger_1.loggers.eventBus.debug(`Registered FiveM event: ${metadata.event} -> ${handlerName}`);
+    }
+};
+exports.FiveMEventProcessor = FiveMEventProcessor;
+exports.FiveMEventProcessor = FiveMEventProcessor = __decorate([
+    (0, tsyringe_1.injectable)()
+], FiveMEventProcessor);

package/dist/server/system/processors/netEvent.processor.d.ts

@@ -7,5 +7,5 @@ export declare class NetEventProcessor implements DecoratorProcessor {
     private securityHandler;
     readonly metadataKey: string;
     constructor(playerService: PlayerService, securityHandler: SecurityHandlerContract);
-    process(target: any, methodName: string, metadata: NetEventOptions): void;
+    process(instance: any, methodName: string, metadata: NetEventOptions): void;
 }

package/dist/server/system/processors/netEvent.processor.js

@@ -21,19 +21,21 @@ const utils_1 = require("../../../utils");
 const logger_1 = require("../../../shared/logger");
 const zod_1 = __importDefault(require("zod"));
 const schema_generator_1 = require("../schema-generator");
+const resolve_method_1 = require("../../helpers/resolve-method");
 let NetEventProcessor = class NetEventProcessor {
     constructor(playerService, securityHandler) {
         this.playerService = playerService;
         this.securityHandler = securityHandler;
         this.metadataKey = metadata_server_keys_1.METADATA_KEYS.NET_EVENT;
     }
-    process(target, methodName, metadata) {
-        const handler = target[methodName].bind(target);
-        const handlerName = `${target.constructor.name}.${methodName}`;
-        const proto = Object.getPrototypeOf(target);
+    process(instance, methodName, metadata) {
+        const result = (0, resolve_method_1.resolveMethod)(instance, methodName, `[NetEventProcessor] Method "${methodName}" not found`);
+        if (!result)
+            return;
+        const { handler, handlerName, proto } = result;
         const isPublic = Reflect.getMetadata(metadata_server_keys_1.METADATA_KEYS.PUBLIC, proto, methodName) === true;
         onNet(metadata.eventName, async (...args) => {
-            const sourceId = Number(global.source);
+            const sourceId = Number(source);
             const player = this.playerService.getByClient(sourceId);
             if (!player) {
                 logger_1.loggers.netEvent.warn(`Event ignored: Player session not found`, {

package/dist/server/system/processors.register.js

@@ -7,6 +7,7 @@ const security_handler_contract_1 = require("../templates/security/security-hand
 const command_processor_1 = require("./processors/command.processor");
 const coreEvent_processor_1 = require("./processors/coreEvent.processor");
 const export_processor_1 = require("./processors/export.processor");
+const fivemEvent_processor_1 = require("./processors/fivemEvent.processor");
 const netEvent_processor_1 = require("./processors/netEvent.processor");
 const tick_processor_1 = require("./processors/tick.processor");
 function registerSystemServer() {
@@ -15,6 +16,7 @@ function registerSystemServer() {
     container_1.di.register('DecoratorProcessor', { useClass: export_processor_1.ExportProcessor });
     container_1.di.register('DecoratorProcessor', { useClass: coreEvent_processor_1.CoreEventProcessor });
     container_1.di.register('DecoratorProcessor', { useClass: command_processor_1.CommandProcessor });
+    container_1.di.register('DecoratorProcessor', { useClass: fivemEvent_processor_1.FiveMEventProcessor });
     if (!container_1.di.isRegistered(security_handler_contract_1.SecurityHandlerContract)) {
         container_1.di.registerSingleton(security_handler_contract_1.SecurityHandlerContract, default_security_handler_1.DefaultSecurityHandler);
     }

package/dist/server/system/schema-generator.js

@@ -8,12 +8,18 @@ const zod_1 = __importDefault(require("zod"));
 const player_1 = require("../entities/player");
 function typeToZodSchema(type) {
     switch (type) {
-        case String: return zod_1.default.coerce.string();
-        case Number: return zod_1.default.coerce.number();
-        case Boolean: return zod_1.default.coerce.boolean();
-        case Array: return zod_1.default.array(zod_1.default.any());
-        case Object: return zod_1.default.any();
-        default: return zod_1.default.any();
+        case String:
+            return zod_1.default.coerce.string();
+        case Number:
+            return zod_1.default.coerce.number();
+        case Boolean:
+            return zod_1.default.coerce.boolean();
+        case Array:
+            return zod_1.default.array(zod_1.default.any());
+        case Object:
+            return zod_1.default.any();
+        default:
+            return zod_1.default.any();
     }
 }
 function generateSchemaFromTypes(paramTypes) {

package/dist/server/templates/admin/admin.controller-template.d.ts

@@ -1,4 +1,4 @@
-import { Player } from "../../entities";
+import type { Player } from '../../entities';
 type CommandArgs = string[] | any;
 /**
  * Template for admin controller implementations.

package/dist/server/templates/auth/auth-provider.contract.d.ts

@@ -1,5 +1,5 @@
-import { LinkedID } from '../../services';
-import { Server } from '../../..';
+import type { LinkedID } from '../../services';
+import type { Server } from '../../..';
 export interface AuthCredentials {
     /** Standard username/password auth */
     username?: string;

package/dist/server/types/core-events.d.ts

@@ -10,8 +10,13 @@ export interface TransferCompletedPayload {
     amount: number;
     targetId: number;
 }
+export interface PlayerFullyConnectedPayload {
+    clientId: number;
+    license: string;
+}
 export type CoreEventMap = {
     'core:playerSessionCreated': PlayerSessionCreatedPayload;
     'core:playerSessionDestroyed': PlayerSessionDestroyedPayload;
     'core:transfer:completed': TransferCompletedPayload;
+    'core:playerFullyConnected': PlayerFullyConnectedPayload;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-core/framework",
-  "version": "1.0.2-beta.1",
+  "version": "1.0.4-beta.1",
   "description": "Secure, Event-Driven, OOP Engine for FiveM. Stop scripting, start engineering.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -34,6 +34,16 @@
       "import": "./dist/client/index.js",
       "require": "./dist/client/index.js"
     },
+    "./shared": {
+      "types": "./dist/shared/index.d.ts",
+      "import": "./dist/shared/index.js",
+      "require": "./dist/shared/index.js"
+    },
+    "./utils": {
+      "types": "./dist/utils/index.d.ts",
+      "import": "./dist/utils/index.js",
+      "require": "./dist/utils/index.js"
+    },
     "./package.json": "./package.json"
   },
   "scripts": {

package/dist/client/loaders/exports.loader.d.ts

@@ -1 +0,0 @@
-export declare const loadClientExports: () => void;

package/dist/client/loaders/exports.loader.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadClientExports = void 0;
-const logger_1 = require("../../shared/logger");
-const clientExports = logger_1.coreLogger.child('Exports', logger_1.LogDomain.CLIENT);
-const loadClientExports = () => {
-    exports('core:sendcommand', (commandName, args = []) => {
-        const rawCommand = `/${commandName} ${args.join(' ')}`;
-        emitNet('core:internal:executeCommand', commandName, args, rawCommand);
-    });
-    clientExports.debug('Client exports loaded: SendCommand');
-};
-exports.loadClientExports = loadClientExports;

package/dist/client/services/core/index.d.ts

@@ -1 +0,0 @@
-export * from './spawn.service';

package/dist/client/services/core/index.js

@@ -1,17 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./spawn.service"), exports);

package/dist/client/services/core/spawn.service.d.ts

@@ -1,20 +0,0 @@
-import { Vector3 } from '../../../utils';
-export declare class Spawner {
-    private spawned;
-    init(): Promise<void>;
-    handleSpawn(data: {
-        position: Vector3;
-        model: string;
-    }): Promise<void>;
-    handleRespawn(position: Vector3, heading?: number): Promise<void>;
-    handleTeleport(position: Vector3, heading?: number): Promise<void>;
-    spawn(position: Vector3, model: string, heading?: number): Promise<void>;
-    teleportTo(position: Vector3, heading?: number): Promise<void>;
-    respawn(position: Vector3, heading?: number): Promise<void>;
-    isSpawned(): boolean;
-    private ensureNetworkReady;
-    private closeLoadingScreens;
-    private setPlayerModel;
-    private ensurePed;
-    private placePed;
-}

package/dist/client/services/core/spawn.service.js

@@ -1,143 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Spawner = void 0;
-const tsyringe_1 = require("tsyringe");
-const onNet_1 = require("../../decorators/onNet");
-const logger_1 = require("../../../shared/logger");
-const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-let Spawner = class Spawner {
-    constructor() {
-        this.spawned = false;
-    }
-    async init() {
-        logger_1.loggers.spawn.debug('SpawnService initialized');
-    }
-    async handleSpawn(data) {
-        await this.spawn(data.position, data.model);
-    }
-    async handleRespawn(position, heading = 0.0) {
-        await this.respawn(position, heading);
-    }
-    async handleTeleport(position, heading) {
-        await this.teleportTo(position, heading);
-    }
-    async spawn(position, model, heading = 0.0) {
-        logger_1.loggers.spawn.info('First spawn requested', {
-            position: { x: position.x, y: position.y, z: position.z },
-            model,
-        });
-        await this.ensureNetworkReady();
-        this.closeLoadingScreens();
-        await this.setPlayerModel(model);
-        const ped = await this.ensurePed();
-        await this.placePed(ped, position, heading);
-        this.spawned = true;
-        logger_1.loggers.spawn.info('Player spawned successfully (first spawn)');
-    }
-    async teleportTo(position, heading) {
-        const ped = await this.ensurePed();
-        FreezeEntityPosition(ped, true);
-        SetEntityCoordsNoOffset(ped, position.x, position.y, position.z, false, false, false);
-        if (heading !== undefined) {
-            SetEntityHeading(ped, heading);
-        }
-        FreezeEntityPosition(ped, false);
-        logger_1.loggers.spawn.debug('Teleported', {
-            position: { x: position.x, y: position.y, z: position.z },
-        });
-    }
-    async respawn(position, heading = 0.0) {
-        const ped = await this.ensurePed();
-        ClearPedTasksImmediately(ped);
-        SetEntityHealth(ped, GetEntityMaxHealth(ped));
-        await this.teleportTo(position, heading);
-        logger_1.loggers.spawn.info('Player respawned', {
-            position: { x: position.x, y: position.y, z: position.z },
-        });
-    }
-    isSpawned() {
-        return this.spawned;
-    }
-    async ensureNetworkReady() {
-        while (!NetworkIsSessionStarted()) {
-            await delay(0);
-        }
-    }
-    closeLoadingScreens() {
-        try {
-            ShutdownLoadingScreen();
-        }
-        catch (_a) { }
-        try {
-            ShutdownLoadingScreenNui();
-        }
-        catch (_b) { }
-    }
-    async setPlayerModel(model) {
-        const modelHash = GetHashKey(model);
-        if (!IsModelInCdimage(modelHash) || !IsModelValid(modelHash)) {
-            logger_1.loggers.spawn.error(`Invalid model requested`, { model });
-            throw new Error('MODEL_INVALID');
-        }
-        RequestModel(modelHash);
-        while (!HasModelLoaded(modelHash)) {
-            await delay(0);
-        }
-        SetPlayerModel(PlayerId(), modelHash);
-        SetModelAsNoLongerNeeded(modelHash);
-    }
-    async ensurePed() {
-        let ped = PlayerPedId();
-        while (ped === 0) {
-            await delay(0);
-            ped = PlayerPedId();
-        }
-        return ped;
-    }
-    async placePed(ped, position, heading) {
-        FreezeEntityPosition(ped, true);
-        SetEntityCoordsNoOffset(ped, position.x, position.y, position.z, false, false, false);
-        SetEntityHeading(ped, heading);
-        ResetEntityAlpha(ped);
-        SetEntityVisible(ped, true, false);
-        SetEntityCollision(ped, true, true);
-        SetEntityInvincible(ped, false);
-        ClearPedTasksImmediately(ped);
-        RemoveAllPedWeapons(ped, true);
-        FreezeEntityPosition(ped, false);
-        if (!IsScreenFadedIn() && !IsScreenFadingIn()) {
-            DoScreenFadeIn(500);
-        }
-    }
-};
-exports.Spawner = Spawner;
-__decorate([
-    (0, onNet_1.OnNet)('core:spawner:spawn'),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], Spawner.prototype, "handleSpawn", null);
-__decorate([
-    (0, onNet_1.OnNet)('core:spawner:respawn'),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
-    __metadata("design:returntype", Promise)
-], Spawner.prototype, "handleRespawn", null);
-__decorate([
-    (0, onNet_1.OnNet)('core:spawner:teleport'),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Number]),
-    __metadata("design:returntype", Promise)
-], Spawner.prototype, "handleTeleport", null);
-exports.Spawner = Spawner = __decorate([
-    (0, tsyringe_1.injectable)()
-], Spawner);

package/dist/client/services/streaming/index.d.ts

@@ -1 +0,0 @@
-export * from './streaming.service';

package/dist/client/services/streaming/index.js

@@ -1,17 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./streaming.service"), exports);

package/dist/client/services/ui/index.d.ts

@@ -1,3 +0,0 @@
-export * from './notification.service';
-export * from './textui.service';
-export * from './progress.service';

package/dist/client/services/ui/index.js

@@ -1,19 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./notification.service"), exports);
-__exportStar(require("./textui.service"), exports);
-__exportStar(require("./progress.service"), exports);

package/dist/client/services/world/index.d.ts

@@ -1,4 +0,0 @@
-export * from './marker.service';
-export * from './blip.service';
-export * from './vehicle.service';
-export * from './ped.service';

package/dist/client/services/world/index.js

@@ -1,20 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./marker.service"), exports);
-__exportStar(require("./blip.service"), exports);
-__exportStar(require("./vehicle.service"), exports);
-__exportStar(require("./ped.service"), exports);