@armoury/fivem-framework-server 1.0.26 → 1.0.28

package/dist/cjs/server/services/session/session.service.js

@@ -19,12 +19,6 @@ let SessionService = class SessionService {
     constructor(armouryResource) {
         this.armouryResource = armouryResource;
     }
-    getClaimValue(sessionId, claimName) {
-        return this.armouryResource.instance.getClaimValue(sessionId, claimName);
-    }
-    setClaim(sessionId, claimName, value) {
-        return this.armouryResource.instance.setClaim(sessionId, claimName, value);
-    }
     getNumPlayersConnected() {
         return this.armouryResource.instance.getNumPlayersConnected();
     }

package/dist/cjs/shared/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./models"), exports);
+__exportStar(require("./services"), exports);

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

@@ -20,3 +20,5 @@ __exportStar(require("./character"), exports);
 __exportStar(require("./session"), exports);
 __exportStar(require("./session-update-type"), exports);
 __exportStar(require("./session-claim"), exports);
+/** Zones */
+__exportStar(require("./zone"), exports);

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

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -0,0 +1,17 @@
+"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("./zone"), exports);

package/dist/cjs/shared/services/zone/index.js

@@ -0,0 +1,18 @@
+"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("./zone.detector"), exports);
+__exportStar(require("./zone.registry"), exports);

package/dist/cjs/shared/services/zone/zone.detector.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZoneDetector = void 0;
+class ZoneDetector {
+    static contains(zone, x, y, z) {
+        switch (zone.type) {
+            case 'sphere':
+                return this.containsSphere(zone, x, y, z);
+            case 'box':
+                return this.containsBox(zone, x, y, z);
+            case 'polygon':
+                return this.containsPolygon(zone, x, y, z);
+        }
+    }
+    static containsSphere(zone, x, y, z) {
+        const dx = x - zone.center[0];
+        const dy = y - zone.center[1];
+        const dz = z - zone.center[2];
+        return dx * dx + dy * dy + dz * dz <= zone.radius * zone.radius;
+    }
+    static containsBox(zone, x, y, z) {
+        const dx = x - zone.center[0];
+        const dy = y - zone.center[1];
+        const angle = (zone.heading * Math.PI) / 180;
+        const cos = Math.cos(angle);
+        const sin = Math.sin(angle);
+        const localX = dx * cos + dy * sin;
+        const localY = -dx * sin + dy * cos;
+        return (Math.abs(localX) <= zone.size[0] / 2 &&
+            Math.abs(localY) <= zone.size[1] / 2 &&
+            Math.abs(z - zone.center[2]) <= zone.size[2] / 2);
+    }
+    static containsPolygon(zone, x, y, z) {
+        if (z < zone.minZ || z > zone.maxZ)
+            return false;
+        let inside = false;
+        const points = zone.points;
+        for (let i = 0, j = points.length - 1; i < points.length; j = i++) {
+            const a = points[i];
+            const b = points[j];
+            const intersects = a.y > y !== b.y > y && x < ((b.x - a.x) * (y - a.y)) / (b.y - a.y) + a.x;
+            if (intersects)
+                inside = !inside;
+        }
+        return inside;
+    }
+}
+exports.ZoneDetector = ZoneDetector;

package/dist/cjs/shared/services/zone/zone.registry.js

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZoneRegistry = void 0;
+class ZoneRegistry {
+    constructor() {
+        this._cellSize = 128;
+        this._zones = new Map();
+        this._cells = new Map();
+    }
+    replace(zones) {
+        this._zones.clear();
+        this._cells.clear();
+        for (const zone of zones) {
+            this.add(zone);
+        }
+    }
+    add(zone) {
+        this.remove(zone.id);
+        this._zones.set(zone.id, zone);
+        const bounds = this.getBounds(zone);
+        const minX = Math.floor(bounds.minX / this._cellSize);
+        const maxX = Math.floor(bounds.maxX / this._cellSize);
+        const minY = Math.floor(bounds.minY / this._cellSize);
+        const maxY = Math.floor(bounds.maxY / this._cellSize);
+        for (let x = minX; x <= maxX; x++) {
+            for (let y = minY; y <= maxY; y++) {
+                const key = `${x}:${y}`;
+                let cell = this._cells.get(key);
+                if (!cell) {
+                    cell = new Set();
+                    this._cells.set(key, cell);
+                }
+                cell.add(zone.id);
+            }
+        }
+        console.log(`Added zone with id ${zone.id}. Cells: ${this._cells.size}, Zones: ${this._zones.size}`);
+    }
+    remove(id) {
+        if (!this._zones.delete(id))
+            return;
+        const entries = this._cells.entries();
+        for (let entry = entries.next(); !entry.done; entry = entries.next()) {
+            const [key, cell] = entry.value;
+            cell.delete(id);
+            if (cell.size === 0) {
+                this._cells.delete(key);
+            }
+        }
+    }
+    getNearby(x, y, _) {
+        const localX = Math.floor(x / this._cellSize);
+        const localY = Math.floor(y / this._cellSize);
+        const ids = this._cells.get(`${localX}:${localY}`);
+        if (!ids)
+            return [];
+        return Array.from(ids, (id) => this._zones.get(id)).filter((zone) => zone !== undefined);
+    }
+    getBounds(zone) {
+        switch (zone.type) {
+            case 'sphere':
+                return {
+                    minX: zone.center[0] - zone.radius,
+                    maxX: zone.center[0] + zone.radius,
+                    minY: zone.center[1] - zone.radius,
+                    maxY: zone.center[1] + zone.radius,
+                };
+            case 'box': {
+                const angle = (zone.heading * Math.PI) / 180;
+                const hx = zone.size[0] / 2;
+                const hy = zone.size[1] / 2;
+                const extentX = Math.abs(Math.cos(angle)) * hx + Math.abs(Math.sin(angle)) * hy;
+                const extentY = Math.abs(Math.sin(angle)) * hx + Math.abs(Math.cos(angle)) * hy;
+                return {
+                    minX: zone.center[0] - extentX,
+                    maxX: zone.center[0] + extentX,
+                    minY: zone.center[1] - extentY,
+                    maxY: zone.center[1] + extentY,
+                };
+            }
+            case 'polygon':
+                return {
+                    minX: Math.min(...zone.points.map((p) => p.x)),
+                    maxX: Math.max(...zone.points.map((p) => p.x)),
+                    minY: Math.min(...zone.points.map((p) => p.y)),
+                    maxY: Math.max(...zone.points.map((p) => p.y)),
+                };
+        }
+    }
+}
+exports.ZoneRegistry = ZoneRegistry;

package/dist/esm/server/services/session/session.service.js

@@ -16,12 +16,6 @@ let SessionService = class SessionService {
     constructor(armouryResource) {
         this.armouryResource = armouryResource;
     }
-    getClaimValue(sessionId, claimName) {
-        return this.armouryResource.instance.getClaimValue(sessionId, claimName);
-    }
-    setClaim(sessionId, claimName, value) {
-        return this.armouryResource.instance.setClaim(sessionId, claimName, value);
-    }
     getNumPlayersConnected() {
         return this.armouryResource.instance.getNumPlayersConnected();
     }

package/dist/esm/shared/index.js

@@ -1 +1,2 @@
 export * from './models';
+export * from './services';

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

@@ -4,3 +4,5 @@ export * from './character';
 export * from './session';
 export * from './session-update-type';
 export * from './session-claim';
+/** Zones */
+export * from './zone';

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

@@ -0,0 +1 @@
+export {};

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

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

package/dist/esm/shared/services/zone/index.js

@@ -0,0 +1,2 @@
+export * from './zone.detector';
+export * from './zone.registry';

package/dist/esm/shared/services/zone/zone.detector.js

@@ -0,0 +1,44 @@
+export class ZoneDetector {
+    static contains(zone, x, y, z) {
+        switch (zone.type) {
+            case 'sphere':
+                return this.containsSphere(zone, x, y, z);
+            case 'box':
+                return this.containsBox(zone, x, y, z);
+            case 'polygon':
+                return this.containsPolygon(zone, x, y, z);
+        }
+    }
+    static containsSphere(zone, x, y, z) {
+        const dx = x - zone.center[0];
+        const dy = y - zone.center[1];
+        const dz = z - zone.center[2];
+        return dx * dx + dy * dy + dz * dz <= zone.radius * zone.radius;
+    }
+    static containsBox(zone, x, y, z) {
+        const dx = x - zone.center[0];
+        const dy = y - zone.center[1];
+        const angle = (zone.heading * Math.PI) / 180;
+        const cos = Math.cos(angle);
+        const sin = Math.sin(angle);
+        const localX = dx * cos + dy * sin;
+        const localY = -dx * sin + dy * cos;
+        return (Math.abs(localX) <= zone.size[0] / 2 &&
+            Math.abs(localY) <= zone.size[1] / 2 &&
+            Math.abs(z - zone.center[2]) <= zone.size[2] / 2);
+    }
+    static containsPolygon(zone, x, y, z) {
+        if (z < zone.minZ || z > zone.maxZ)
+            return false;
+        let inside = false;
+        const points = zone.points;
+        for (let i = 0, j = points.length - 1; i < points.length; j = i++) {
+            const a = points[i];
+            const b = points[j];
+            const intersects = a.y > y !== b.y > y && x < ((b.x - a.x) * (y - a.y)) / (b.y - a.y) + a.x;
+            if (intersects)
+                inside = !inside;
+        }
+        return inside;
+    }
+}

package/dist/esm/shared/services/zone/zone.registry.js

@@ -0,0 +1,86 @@
+export class ZoneRegistry {
+    constructor() {
+        this._cellSize = 128;
+        this._zones = new Map();
+        this._cells = new Map();
+    }
+    replace(zones) {
+        this._zones.clear();
+        this._cells.clear();
+        for (const zone of zones) {
+            this.add(zone);
+        }
+    }
+    add(zone) {
+        this.remove(zone.id);
+        this._zones.set(zone.id, zone);
+        const bounds = this.getBounds(zone);
+        const minX = Math.floor(bounds.minX / this._cellSize);
+        const maxX = Math.floor(bounds.maxX / this._cellSize);
+        const minY = Math.floor(bounds.minY / this._cellSize);
+        const maxY = Math.floor(bounds.maxY / this._cellSize);
+        for (let x = minX; x <= maxX; x++) {
+            for (let y = minY; y <= maxY; y++) {
+                const key = `${x}:${y}`;
+                let cell = this._cells.get(key);
+                if (!cell) {
+                    cell = new Set();
+                    this._cells.set(key, cell);
+                }
+                cell.add(zone.id);
+            }
+        }
+        console.log(`Added zone with id ${zone.id}. Cells: ${this._cells.size}, Zones: ${this._zones.size}`);
+    }
+    remove(id) {
+        if (!this._zones.delete(id))
+            return;
+        const entries = this._cells.entries();
+        for (let entry = entries.next(); !entry.done; entry = entries.next()) {
+            const [key, cell] = entry.value;
+            cell.delete(id);
+            if (cell.size === 0) {
+                this._cells.delete(key);
+            }
+        }
+    }
+    getNearby(x, y, _) {
+        const localX = Math.floor(x / this._cellSize);
+        const localY = Math.floor(y / this._cellSize);
+        const ids = this._cells.get(`${localX}:${localY}`);
+        if (!ids)
+            return [];
+        return Array.from(ids, (id) => this._zones.get(id)).filter((zone) => zone !== undefined);
+    }
+    getBounds(zone) {
+        switch (zone.type) {
+            case 'sphere':
+                return {
+                    minX: zone.center[0] - zone.radius,
+                    maxX: zone.center[0] + zone.radius,
+                    minY: zone.center[1] - zone.radius,
+                    maxY: zone.center[1] + zone.radius,
+                };
+            case 'box': {
+                const angle = (zone.heading * Math.PI) / 180;
+                const hx = zone.size[0] / 2;
+                const hy = zone.size[1] / 2;
+                const extentX = Math.abs(Math.cos(angle)) * hx + Math.abs(Math.sin(angle)) * hy;
+                const extentY = Math.abs(Math.sin(angle)) * hx + Math.abs(Math.cos(angle)) * hy;
+                return {
+                    minX: zone.center[0] - extentX,
+                    maxX: zone.center[0] + extentX,
+                    minY: zone.center[1] - extentY,
+                    maxY: zone.center[1] + extentY,
+                };
+            }
+            case 'polygon':
+                return {
+                    minX: Math.min(...zone.points.map((p) => p.x)),
+                    maxX: Math.max(...zone.points.map((p) => p.x)),
+                    minY: Math.min(...zone.points.map((p) => p.y)),
+                    maxY: Math.max(...zone.points.map((p) => p.y)),
+                };
+        }
+    }
+}

package/dist/types/server/services/session/session.service.d.ts

@@ -2,8 +2,6 @@ import { ResourceRef, Session } from '@armoury/fivem-framework-common';
 export declare class SessionService {
     private readonly armouryResource;
     constructor(armouryResource: ResourceRef);
-    getClaimValue<T>(sessionId: number, claimName: string): T | null;
-    setClaim<T>(sessionId: number, claimName: string, value: T): T | null;
     getNumPlayersConnected(): number;
     getAllPlayerIds(): number[];
     getAllPlayerPrincipals(): number[];

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

@@ -1 +1,2 @@
 export * from './models';
+export * from './services';

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

@@ -4,3 +4,5 @@ export * from './character';
 export * from './session';
 export * from './session-update-type';
 export * from './session-claim';
+/** Zones */
+export * from './zone';

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

@@ -0,0 +1,24 @@
+export interface BaseZone {
+    id: number;
+}
+export interface SphereZone extends BaseZone {
+    type: 'sphere';
+    center: [number, number, number];
+    radius: number;
+}
+export interface BoxZone extends BaseZone {
+    type: 'box';
+    center: [number, number, number];
+    size: [number, number, number];
+    heading: number;
+}
+export interface PolygonZone extends BaseZone {
+    type: 'polygon';
+    points: {
+        x: number;
+        y: number;
+    }[];
+    minZ: number;
+    maxZ: number;
+}
+export type Zone = SphereZone | BoxZone | PolygonZone;

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

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

package/dist/types/shared/services/zone/index.d.ts

@@ -0,0 +1,2 @@
+export * from './zone.detector';
+export * from './zone.registry';

package/dist/types/shared/services/zone/zone.detector.d.ts

@@ -0,0 +1,7 @@
+import { Zone } from '../../models/zone';
+export declare class ZoneDetector {
+    static contains(zone: Zone, x: number, y: number, z: number): boolean;
+    private static containsSphere;
+    private static containsBox;
+    private static containsPolygon;
+}

package/dist/types/shared/services/zone/zone.registry.d.ts

@@ -0,0 +1,11 @@
+import { Zone } from '../../models/zone';
+export declare class ZoneRegistry {
+    private readonly _cellSize;
+    private readonly _zones;
+    private readonly _cells;
+    replace(zones: Zone[]): void;
+    add(zone: Zone): void;
+    remove(id: number): void;
+    getNearby(x: number, y: number, _: number): Zone[];
+    private getBounds;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armoury/fivem-framework-server",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "description": "Server APIs for the Armoury FiveM framework",
   "main": "dist/cjs/server/index.js",
   "module": "dist/esm/server/index.js",
@@ -27,7 +27,7 @@
     "rxjs": "^7.8.1"
   },
   "peerDependencies": {
-    "@armoury/fivem-framework-common": "1.0.26"
+    "@armoury/fivem-framework-common": "1.0.28"
   },
   "publishConfig": {
     "access": "public"