@armoury/fivem-framework-common 1.0.21 → 1.0.23

package/dist/cjs/common/index.js

@@ -111,7 +111,18 @@ async function bootstrapWithProviders(entryPoint, parentProviders, options = {},
     const injector = injection_js_1.ReflectiveInjector.resolveAndCreate([...configProviders, ...resourceProviders, ...providers, entryPoint], parentInjector);
     const instance = injector.get(entryPoint);
     (0, decorator_utils_2.Decorate)(instance, entryPoint.prototype, [...parentProviders, ...providers], decorationType);
-    eagerTokens.forEach((token) => injector.get(token));
+    const decoratedInstances = new Set([instance]);
+    for (const token of eagerTokens) {
+        const eagerInstance = injector.get(token);
+        if (typeof eagerInstance !== 'object' || eagerInstance === null || decoratedInstances.has(eagerInstance)) {
+            continue;
+        }
+        const prototype = Object.getPrototypeOf(eagerInstance);
+        if (prototype && prototype !== Object.prototype) {
+            (0, decorator_utils_2.Decorate)(eagerInstance, prototype, [...parentProviders, ...providers], decorationType);
+            decoratedInstances.add(eagerInstance);
+        }
+    }
     const initializers = injector.get(exports.APP_INITIALIZER, []);
     await Promise.all(initializers.map((initializer) => initializer()));
     return instance;

package/dist/cjs/decorators/decorator.utils.js

@@ -7,6 +7,7 @@ const event_listener_decorator_1 = require("./event-listener.decorator");
 const export_decorator_1 = require("./export.decorator");
 const key_binding_decorator_1 = require("./key-binding.decorator");
 const ui_listener_decorator_1 = require("./ui-listener.decorator");
+const decoratedTargets = new WeakSet();
 class DecoratorUtils {
     static map(target, _prototype, providers) {
         return [
@@ -25,9 +26,16 @@ class DecoratorUtils {
 }
 exports.DecoratorUtils = DecoratorUtils;
 function Decorate(instance, _prototype, providers, decorationType = DecorationType.SERVER) {
+    if (decoratedTargets.has(instance)) {
+        return;
+    }
     const relevantProvidersForClass = Object.values(instance)
         .filter((provider) => typeof provider === 'object'
+        && provider !== null
+        && !decoratedTargets.has(provider)
         && Reflect.getMetadataKeys(provider).some((key) => key.startsWith('arm_')));
+    decoratedTargets.add(instance);
+    relevantProvidersForClass.forEach((provider) => decoratedTargets.add(provider));
     (0, command_decorator_1.Commands)(instance, _prototype, relevantProvidersForClass);
     (0, event_listener_decorator_1.EventListeners)(instance, _prototype, relevantProvidersForClass);
     (0, export_decorator_1.Exports)(instance, _prototype, relevantProvidersForClass);

package/dist/cjs/decorators/event-listener.decorator.js

@@ -48,17 +48,28 @@ var EVENT_DIRECTIONS;
 })(EVENT_DIRECTIONS || (exports.EVENT_DIRECTIONS = EVENT_DIRECTIONS = {}));
 // TODO: Refactor this, so resources can add to it
 exports.DEFAULT_EVENTS = {
-    onAccountAuthenticate: 'authentication:account-success',
+    /** Session */
+    onPlayerSessionCreated: 'armoury:session-created',
+    onPlayerSessionUpdated: 'armoury:session-updated',
+    onPlayerSessionDestroyed: 'armoury:session-destroyed',
+    /** Authentication */
+    onAuthenticationCreated: 'armoury:account-authentication-created',
+    onAuthenticationDestroyed: 'armoury:account-authentication-destroyed',
+    /** Connection */
     onPlayerConnect: 'playerJoining',
-    onPlayerDeath: 'armoury:onPlayerDeath',
-    onPlayerAuthenticate: 'authentication:player-authenticated',
-    onPlayerLogout: 'armoury:player-logout',
     onPlayerDisconnect: 'playerDropped',
-    onResourceStop: 'onResourceStop',
-    onContextMenuItemPressed: 'armoury-overlay:context-menu-item-pressed',
+    /** Vehicle */
     onPlayerEnterVehicle: 'armoury:onPlayerEnterVehicle',
     onPlayerExitVehicle: 'armoury:onPlayerExitVehicle',
-    onPlayerClientsidedCacheLoaded: 'armoury:player-resource-cache-loaded',
     onPlayerStartTowVehicle: 'armoury:onPlayerStartTowVehicle',
     onPlayerStopTowVehicle: 'armoury:onPlayerStopTowVehicle',
+    /** Native */
+    onResourceStop: 'onResourceStop',
+    /** Other */
+    onAccountAuthenticate: 'authentication:account-success',
+    onPlayerDeath: 'armoury:onPlayerDeath',
+    onPlayerAuthenticate: 'authentication:player-authenticated',
+    onPlayerLogout: 'armoury:player-logout',
+    onContextMenuItemPressed: 'armoury-overlay:context-menu-item-pressed',
+    onPlayerClientsidedCacheLoaded: 'armoury:player-resource-cache-loaded',
 };

package/dist/cjs/shared/models/index.js

@@ -16,4 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./account"), exports);
 __exportStar(require("./character"), exports);
+/** Session */
 __exportStar(require("./session"), exports);
+__exportStar(require("./session-update-type"), exports);

package/dist/cjs/shared/models/session-update-type.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SessionUpdateType = void 0;
+var SessionUpdateType;
+(function (SessionUpdateType) {
+    SessionUpdateType[SessionUpdateType["PrincipalUpdate"] = 0] = "PrincipalUpdate";
+})(SessionUpdateType || (exports.SessionUpdateType = SessionUpdateType = {}));

package/dist/cjs/shared/models/session.js

@@ -6,7 +6,7 @@ class Session {
         this.id = id;
         this.platformId = platformId;
         this.lastKnownName = lastKnownName;
-        this.principal = principal !== null && principal !== void 0 ? principal : id;
+        this.principal = principal;
     }
 }
 exports.Session = Session;

package/dist/esm/common/index.js

@@ -88,7 +88,18 @@ export async function bootstrapWithProviders(entryPoint, parentProviders, option
     const injector = ReflectiveInjector.resolveAndCreate([...configProviders, ...resourceProviders, ...providers, entryPoint], parentInjector);
     const instance = injector.get(entryPoint);
     Decorate(instance, entryPoint.prototype, [...parentProviders, ...providers], decorationType);
-    eagerTokens.forEach((token) => injector.get(token));
+    const decoratedInstances = new Set([instance]);
+    for (const token of eagerTokens) {
+        const eagerInstance = injector.get(token);
+        if (typeof eagerInstance !== 'object' || eagerInstance === null || decoratedInstances.has(eagerInstance)) {
+            continue;
+        }
+        const prototype = Object.getPrototypeOf(eagerInstance);
+        if (prototype && prototype !== Object.prototype) {
+            Decorate(eagerInstance, prototype, [...parentProviders, ...providers], decorationType);
+            decoratedInstances.add(eagerInstance);
+        }
+    }
     const initializers = injector.get(APP_INITIALIZER, []);
     await Promise.all(initializers.map((initializer) => initializer()));
     return instance;

package/dist/esm/decorators/decorator.utils.js

@@ -3,6 +3,7 @@ import { EventListeners } from "./event-listener.decorator";
 import { Exports } from "./export.decorator";
 import { KeyBindings } from "./key-binding.decorator";
 import { UIListeners } from "./ui-listener.decorator";
+const decoratedTargets = new WeakSet();
 export class DecoratorUtils {
     static map(target, _prototype, providers) {
         return [
@@ -20,9 +21,16 @@ export class DecoratorUtils {
     }
 }
 export function Decorate(instance, _prototype, providers, decorationType = DecorationType.SERVER) {
+    if (decoratedTargets.has(instance)) {
+        return;
+    }
     const relevantProvidersForClass = Object.values(instance)
         .filter((provider) => typeof provider === 'object'
+        && provider !== null
+        && !decoratedTargets.has(provider)
         && Reflect.getMetadataKeys(provider).some((key) => key.startsWith('arm_')));
+    decoratedTargets.add(instance);
+    relevantProvidersForClass.forEach((provider) => decoratedTargets.add(provider));
     Commands(instance, _prototype, relevantProvidersForClass);
     EventListeners(instance, _prototype, relevantProvidersForClass);
     Exports(instance, _prototype, relevantProvidersForClass);

package/dist/esm/decorators/event-listener.decorator.js

@@ -43,17 +43,28 @@ export var EVENT_DIRECTIONS;
 })(EVENT_DIRECTIONS || (EVENT_DIRECTIONS = {}));
 // TODO: Refactor this, so resources can add to it
 export const DEFAULT_EVENTS = {
-    onAccountAuthenticate: 'authentication:account-success',
+    /** Session */
+    onPlayerSessionCreated: 'armoury:session-created',
+    onPlayerSessionUpdated: 'armoury:session-updated',
+    onPlayerSessionDestroyed: 'armoury:session-destroyed',
+    /** Authentication */
+    onAuthenticationCreated: 'armoury:account-authentication-created',
+    onAuthenticationDestroyed: 'armoury:account-authentication-destroyed',
+    /** Connection */
     onPlayerConnect: 'playerJoining',
-    onPlayerDeath: 'armoury:onPlayerDeath',
-    onPlayerAuthenticate: 'authentication:player-authenticated',
-    onPlayerLogout: 'armoury:player-logout',
     onPlayerDisconnect: 'playerDropped',
-    onResourceStop: 'onResourceStop',
-    onContextMenuItemPressed: 'armoury-overlay:context-menu-item-pressed',
+    /** Vehicle */
     onPlayerEnterVehicle: 'armoury:onPlayerEnterVehicle',
     onPlayerExitVehicle: 'armoury:onPlayerExitVehicle',
-    onPlayerClientsidedCacheLoaded: 'armoury:player-resource-cache-loaded',
     onPlayerStartTowVehicle: 'armoury:onPlayerStartTowVehicle',
     onPlayerStopTowVehicle: 'armoury:onPlayerStopTowVehicle',
+    /** Native */
+    onResourceStop: 'onResourceStop',
+    /** Other */
+    onAccountAuthenticate: 'authentication:account-success',
+    onPlayerDeath: 'armoury:onPlayerDeath',
+    onPlayerAuthenticate: 'authentication:player-authenticated',
+    onPlayerLogout: 'armoury:player-logout',
+    onContextMenuItemPressed: 'armoury-overlay:context-menu-item-pressed',
+    onPlayerClientsidedCacheLoaded: 'armoury:player-resource-cache-loaded',
 };

package/dist/esm/shared/models/index.js

@@ -1,3 +1,5 @@
 export * from './account';
 export * from './character';
+/** Session */
 export * from './session';
+export * from './session-update-type';

package/dist/esm/shared/models/session-update-type.js

@@ -0,0 +1,4 @@
+export var SessionUpdateType;
+(function (SessionUpdateType) {
+    SessionUpdateType[SessionUpdateType["PrincipalUpdate"] = 0] = "PrincipalUpdate";
+})(SessionUpdateType || (SessionUpdateType = {}));

package/dist/esm/shared/models/session.js

@@ -3,6 +3,6 @@ export class Session {
         this.id = id;
         this.platformId = platformId;
         this.lastKnownName = lastKnownName;
-        this.principal = principal !== null && principal !== void 0 ? principal : id;
+        this.principal = principal;
     }
 }

package/dist/types/shared/models/index.d.ts

@@ -1,3 +1,5 @@
 export * from './account';
 export * from './character';
+/** Session */
 export * from './session';
+export * from './session-update-type';

package/dist/types/shared/models/session-update-type.d.ts

@@ -0,0 +1,3 @@
+export declare enum SessionUpdateType {
+    PrincipalUpdate = 0
+}

package/dist/types/shared/models/session.d.ts

@@ -2,11 +2,12 @@ export interface Session {
     readonly id: number;
     readonly platformId: string;
     readonly lastKnownName: string;
-    principal: number;
+    principal?: number;
 }
 export declare class Session {
     readonly id: number;
     readonly platformId: string;
     readonly lastKnownName: string;
-    constructor(id: number, platformId: string, lastKnownName: string, principal?: number);
+    principal?: number | undefined;
+    constructor(id: number, platformId: string, lastKnownName: string, principal?: number | undefined);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armoury/fivem-framework-common",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "description": "Shared APIs for the Armoury FiveM framework",
   "main": "dist/cjs/common/index.js",
   "module": "dist/esm/common/index.js",