@armoury/fivem-framework-server 1.0.15 → 1.0.16

package/dist/cjs/server/database/database.js

@@ -0,0 +1,101 @@
+"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);
+};
+var Database_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Database = void 0;
+const injection_js_1 = require("injection-js");
+const mysql2_1 = require("drizzle-orm/mysql2");
+const promise_1 = require("mysql2/promise");
+let Database = Database_1 = class Database {
+    constructor() {
+        this._tables = new Map();
+        console.log(`[DB:] Database service initialized! (this resource: ${Cfx.Server.GetCurrentResourceName()})`);
+    }
+    registerTable(identifier, table) {
+        if (this._tables.has(identifier)) {
+            throw new Error(`Table '${identifier}' is already registered.`);
+        }
+        this._tables.set(identifier, table);
+        return table;
+    }
+    getTable(identifier) {
+        const table = this._tables.get(identifier);
+        if (!table) {
+            throw new Error(`Table '${identifier}' is not registered.`);
+        }
+        return table;
+    }
+    getClient() {
+        if (!this._db) {
+            throw new Error('Database is not yet initialized');
+        }
+        return this._db;
+    }
+    setClient(db, rootResource) {
+        if (this._db) {
+            throw new Error('Database client is already set.');
+        }
+        this._db = db;
+        this._rootResource = rootResource;
+    }
+    isRoot() {
+        return Cfx.Server.GetCurrentResourceName() === this._rootResource;
+    }
+    static forRoot() {
+        return ({
+            provide: Database_1,
+            useFactory: () => {
+                const rootResource = Cfx.Server.GetCurrentResourceName();
+                const settings = Cfx.Server.GetConvar('mysql_connection_string', '')
+                    .split(';')
+                    .filter(Boolean)
+                    .reduce((settings, entry) => {
+                    const index = entry.indexOf('=');
+                    if (index !== -1) {
+                        settings[entry.slice(0, index)] = entry.slice(index + 1);
+                    }
+                    return settings;
+                }, {});
+                const pool = (0, promise_1.createPool)({
+                    host: settings.host || 'localhost',
+                    port: !isNaN(Number(settings.port)) ? Number(settings.port) : 3306,
+                    user: settings.user || 'root',
+                    password: settings.password,
+                    database: settings.database || 'test',
+                });
+                console.log(`[DB:] Creating Drizzle instance... (rootResource: ${rootResource})`);
+                const drizzl = (0, mysql2_1.drizzle)({ client: pool });
+                console.log(`[DB:] Drizzle instance created! (rootResource: ${rootResource})`);
+                const db = new Database_1();
+                db.setClient(drizzl, Cfx.Server.GetCurrentResourceName());
+                return db;
+            },
+            deps: [],
+        });
+    }
+    static forChild() {
+        return ({
+            provide: Database_1,
+            useFactory: () => {
+                const db = new Database_1();
+                // TODO: Set client based on main resource here
+                // db.setClient(drizzl, Cfx.Server.GetCurrentResourceName());
+                return db;
+            },
+            deps: [],
+        });
+    }
+};
+exports.Database = Database;
+exports.Database = Database = Database_1 = __decorate([
+    (0, injection_js_1.Injectable)(),
+    __metadata("design:paramtypes", [])
+], Database);

package/dist/cjs/server/database/schemas/accounts.table.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AccountsTable = void 0;
+const mysql_core_1 = require("drizzle-orm/mysql-core");
+exports.AccountsTable = (0, mysql_core_1.mysqlTable)('accounts', {
+    id: (0, mysql_core_1.int)('id').primaryKey().autoincrement(),
+    platformId: (0, mysql_core_1.varchar)('platformId', { length: 64 }).notNull(),
+    lastKnownName: (0, mysql_core_1.varchar)('lastKnownName', { length: 255 }).notNull(),
+});

package/dist/cjs/server/index.js

@@ -15,50 +15,17 @@ 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 });
-exports.SERVER_PROVIDERS = void 0;
+exports.SERVER_EAGER_PROVIDERS = exports.SERVER_LAZY_PROVIDERS = void 0;
 exports.bootstrap = bootstrap;
 require("reflect-metadata");
-const default_entities_1 = require("./services/session/default-entities");
 const fivem_framework_common_1 = require("@armoury/fivem-framework-common");
-exports.SERVER_PROVIDERS = [
-    {
-        provide: 'sessionItems',
-        useValue: new default_entities_1.SessionId(),
-        multi: true,
-    },
-    {
-        provide: 'sessionItems',
-        useValue: new default_entities_1.SessionAccountId(),
-        multi: true,
-    },
-    {
-        provide: 'sessionItems',
-        useValue: new default_entities_1.SessionName(),
-        multi: true,
-    },
-    {
-        provide: 'sessionItems',
-        useValue: new default_entities_1.SessionCash(),
-        multi: true,
-    },
-    {
-        provide: 'sessionItems',
-        useValue: new default_entities_1.SessionHoursPlayed(),
-        multi: true,
-    },
-    {
-        provide: 'sessionItems',
-        useValue: new default_entities_1.SessionLastLocation(),
-        multi: true,
-    },
-    {
-        provide: 'sessionItems',
-        useValue: new default_entities_1.SessionLanguage(),
-        multi: true,
-    },
+const database_1 = require("./database/database");
+exports.SERVER_LAZY_PROVIDERS = [];
+exports.SERVER_EAGER_PROVIDERS = [
+    database_1.Database.forChild(),
 ];
 async function bootstrap(_class, options = {}) {
-    return (0, fivem_framework_common_1.bootstrapWithProviders)(_class, exports.SERVER_PROVIDERS, options, undefined, (key, index) => Cfx.Server.GetResourceMetadata(Cfx.Server.GetCurrentResourceName(), key, index), (resourceName) => Cfx.exports[resourceName]);
+    return (0, fivem_framework_common_1.bootstrapWithProviders)(_class, exports.SERVER_LAZY_PROVIDERS, options, undefined, (key, index) => Cfx.Server.GetResourceMetadata(Cfx.Server.GetCurrentResourceName(), key, index), (resourceName) => Cfx.exports[resourceName], exports.SERVER_EAGER_PROVIDERS);
 }
 __exportStar(require("./services"), exports);
 __exportStar(require("./models"), exports);

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

@@ -18,4 +18,3 @@ __exportStar(require("./server-resource-database.service"), exports);
 __exportStar(require("./server-enterable-database.service"), exports);
 __exportStar(require("./server-virtual-worlds.service"), exports);
 __exportStar(require("./server-translate.service"), exports);
-__exportStar(require("./session"), exports);

package/dist/cjs/server/services/server-virtual-worlds.service.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServerVirtualWorldsService = void 0;
 const injection_js_1 = require("injection-js");
 const fivem_framework_common_1 = require("@armoury/fivem-framework-common");
-const session_1 = require("./session");
+const server_session_service_1 = require("./session/server-session.service");
 let ServerVirtualWorldsService = class ServerVirtualWorldsService {
     constructor(_session) {
         this._session = _session;
@@ -30,19 +30,30 @@ let ServerVirtualWorldsService = class ServerVirtualWorldsService {
         Cfx.Server.TriggerClientEvent(`${Cfx.Server.GetCurrentResourceName()}:refresh-virtual-world`, data.for);
     }
     setPlayerVirtualWorld(playerId, virtualWorld) {
-        const currentPlayerVirtualWorld = this.getPlayerVirtualWorld(playerId);
+        /*const currentPlayerVirtualWorld: number = this.getPlayerVirtualWorld(playerId);
+
         if (!isNaN(currentPlayerVirtualWorld)) {
-            this._virtualWorldsWithPlayers.set(currentPlayerVirtualWorld, (this._virtualWorldsWithPlayers.has(currentPlayerVirtualWorld) ? this._virtualWorldsWithPlayers.get(currentPlayerVirtualWorld) : []).filter((_playerId) => _playerId !== playerId));
+            this._virtualWorldsWithPlayers.set(
+                currentPlayerVirtualWorld,
+                (this._virtualWorldsWithPlayers.has(currentPlayerVirtualWorld) ? this._virtualWorldsWithPlayers.get(currentPlayerVirtualWorld) : [])!.filter((_playerId: number) => _playerId !== playerId)
+            );
         }
-        const newPlayersInVirtualWorld = [
-            ...(this._virtualWorldsWithPlayers.has(virtualWorld) ? this._virtualWorldsWithPlayers.get(virtualWorld) : []),
+
+        const newPlayersInVirtualWorld: number[] = [
+            ...(this._virtualWorldsWithPlayers.has(virtualWorld) ? this._virtualWorldsWithPlayers.get(virtualWorld) : [])!,
             playerId
         ];
-        this._virtualWorldsWithPlayers.set(virtualWorld, newPlayersInVirtualWorld);
-        this._session.setPlayerInfo(playerId, 'virtualWorld', virtualWorld);
+
+        this._virtualWorldsWithPlayers.set(
+            virtualWorld,
+            newPlayersInVirtualWorld
+        );
+
+        this._session.setPlayerInfo(playerId, 'virtualWorld', virtualWorld);*/
     }
     getPlayerVirtualWorld(playerId) {
-        return Math.max(0, this._session.getPlayerInfo(playerId, 'virtualWorld'));
+        return 0;
+        // return Math.max(0, this._session.getPlayerInfo(playerId, 'virtualWorld'));
     }
     removeClientsideVehicles() {
         Cfx.Server.TriggerClientEvent(`${Cfx.Server.GetCurrentResourceName()}:ARM_remove-vehicles`, -1);
@@ -57,6 +68,6 @@ __decorate([
 ], ServerVirtualWorldsService.prototype, "onPlayerEnteredScope", null);
 exports.ServerVirtualWorldsService = ServerVirtualWorldsService = __decorate([
     (0, injection_js_1.Injectable)(),
-    __param(0, (0, injection_js_1.Inject)(session_1.ServerSessionService)),
-    __metadata("design:paramtypes", [session_1.ServerSessionService])
+    __param(0, (0, injection_js_1.Inject)(server_session_service_1.ServerSessionService)),
+    __metadata("design:paramtypes", [server_session_service_1.ServerSessionService])
 ], ServerVirtualWorldsService);

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

@@ -8,264 +8,25 @@ 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);
 };
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-var ServerSessionService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServerSessionService = void 0;
 const injection_js_1 = require("injection-js");
-const utils_1 = require("../../../utils/utils");
-const decorators_1 = require("../../../decorators");
-let ServerSessionService = ServerSessionService_1 = class ServerSessionService {
-    get players() {
-        return Array.from(this._sessions.keys());
-    }
-    get authenticatedPlayers() {
-        return Array.from(this._sessions.entries())
-            .filter(([, session]) => session.id)
-            .map(([playerId,]) => playerId);
-    }
-    constructor(_sessionItems) {
-        var _a;
-        this._sessionItems = _sessionItems;
-        this._sessions = new Map();
-        this._untrackedSessionItems = [];
-        this._sessionItems = (_a = _sessionItems === null || _sessionItems === void 0 ? void 0 : _sessionItems.filter((item) => !!item)) !== null && _a !== void 0 ? _a : [];
-        if (!Cfx.exports['oxmysql']) {
-            console.error(`[Armoury (${Cfx.Server.GetCurrentResourceName()}):] Could not find the 'oxmysql' resource. Armoury's session service can't work without it. Did you forget to load it?`);
-            return;
+const database_1 = require("../../database/database");
+const accounts_table_1 = require("../../database/schemas/accounts.table");
+let ServerSessionService = class ServerSessionService {
+    constructor(_database) {
+        this._database = _database;
+        if (_database.isRoot()) {
+            this._database.registerTable('accounts', accounts_table_1.AccountsTable);
+            console.log('[ServerSessionService] Registered accounts table in the database.');
         }
-    }
-    /**
-     * Registers an account.
-     * @param playerId The playerId (NOT from the database) of this player
-     * @param accountName The account name of this player
-     * @param hashedPassword The hashed password of this account
-     * @param email The email of this account
-     * @returns The SQL ID of the newly-created account
-     */
-    async register(playerId, accountName, hashedPassword, email) {
-        const accountId = await Cfx.exports['oxmysql'].insert_async('INSERT INTO `accounts`(`name`, `password`, `email`) VALUES (?, ?, ?)', [accountName, hashedPassword, email]);
-        this._sessions.set(playerId, { accountId });
-        return accountId;
-    }
-    /**
-     * Logs into an account
-     * @param playerId The playerId (NOT from the database) of this player
-     * @param email The email of the account
-     * @param hashedPassword The hashed password fo this account
-     * @returns Account data for this account
-     */
-    async login(playerId, email, hashedPassword) {
-        const result = await Cfx.exports['oxmysql'].single_async('SELECT * FROM `accounts` WHERE email=? AND password=?', [email, hashedPassword]);
-        this._sessions.set(playerId, { accountId: result.id });
-        return result;
-    }
-    /**
-     * Fetches all the characters related to the provided account
-     * @param playerId The playerId (NOT from the database) of this player
-     * @param accountId The accountId of the
-     * @returns Data for all characters on the given account
-     */
-    async fetch(playerId, accountId) {
-        var _a;
-        accountId = accountId !== null && accountId !== void 0 ? accountId : (_a = this._sessions.get(playerId)) === null || _a === void 0 ? void 0 : _a.accountId;
-        return await global.exports['oxmysql'].query_async(`SELECT * FROM players WHERE accountId = ?`, [accountId]);
-    }
-    /**
-     * Loads the entire character given a character ID
-     * @param playerId The playerId (NOT from the database) of this player
-     * @param characterId The character's SQL ID
-     * @returns Data for the given characterId
-     */
-    async load(playerId, characterId) {
-        var _a;
-        if (!this._sessions.has(playerId)) {
-            throw new Error('No session has been found for that user.');
+        else {
+            console.log('[ServerSessionService] Not the root resource, skipping table registration.');
         }
-        const session = await global.exports['oxmysql'].single_async('SELECT * FROM `players` WHERE id=? AND accountId=?', [characterId, (_a = this._sessions.get(playerId)) === null || _a === void 0 ? void 0 : _a.accountId]);
-        Array.from(Object.entries(session))
-            .map(([key,]) => { var _a; return (_a = this._sessionItems) === null || _a === void 0 ? void 0 : _a.find((sessionItem) => sessionItem.name === key); })
-            .filter((sessionItem) => !!sessionItem)
-            .forEach(async (sessionItem) => {
-            var _a, _b, _c, _d;
-            console.log('for sessionItem', sessionItem.name, 'the value is', (_b = await (sessionItem === null || sessionItem === void 0 ? void 0 : sessionItem.load((_a = this._sessions.get(playerId)) === null || _a === void 0 ? void 0 : _a.accountId, characterId, session[sessionItem === null || sessionItem === void 0 ? void 0 : sessionItem.name]))) !== null && _b !== void 0 ? _b : session[sessionItem === null || sessionItem === void 0 ? void 0 : sessionItem.name].value);
-            this.setPlayerInfo(playerId, sessionItem.name, (_d = await (sessionItem === null || sessionItem === void 0 ? void 0 : sessionItem.load((_c = this._sessions.get(playerId)) === null || _c === void 0 ? void 0 : _c.accountId, characterId, session[sessionItem === null || sessionItem === void 0 ? void 0 : sessionItem.name]))) !== null && _d !== void 0 ? _d : session[sessionItem === null || sessionItem === void 0 ? void 0 : sessionItem.name].value);
-        });
-        this._sessions.set(playerId, Object.assign(Object.assign({}, this._sessions.get(playerId)), { id: characterId }));
-        return session;
-    }
-    /**
-     * Creates a character
-     * @param playerId
-     * @param accountName
-     * @param hashedPassword
-     * @param email
-     * @returns
-     */
-    async create(playerId, accountId) {
-        var _a;
-        accountId = accountId !== null && accountId !== void 0 ? accountId : (_a = this._sessions.get(playerId)) === null || _a === void 0 ? void 0 : _a.accountId;
-        const characterId = await Cfx.exports['oxmysql'].insert_async('INSERT INTO `players`(`accountId`) VALUES (?)', [accountId]);
-        this._sessions.set(playerId, { accountId });
-        return characterId;
-    }
-    setPlayerInfo(playerId, stat, value, ...args) {
-        const updater = new SessionUpdater(playerId).from(stat, value, ...args);
-        updater.execute(this.getPlayerInfo(playerId, 'accountId'), this.getPlayerInfo(playerId, 'id'), this._sessionItems);
-        const untrackedItems = updater.items
-            .filter((item) => {
-            var _a;
-            return !this._untrackedSessionItems.includes(item.stat)
-                && !((_a = this._sessionItems) === null || _a === void 0 ? void 0 : _a.some((sessionItem) => sessionItem.name === item.stat));
-        });
-        if (untrackedItems.length) {
-            this._untrackedSessionItems.push(...untrackedItems.map((item) => item.stat));
-        }
-    }
-    setPlayerCash(playerId, value, options) {
-        return this.setPlayerInfo(playerId, 'cash', value, options);
-    }
-    givePlayerCash(playerId, value, options) {
-        return this.setPlayerCash(playerId, this.getPlayerCash(playerId) + value, options);
-    }
-    getPlayerCash(playerId) {
-        return this.getPlayerInfo(playerId, 'cash');
-    }
-    saveCritical(playerId) {
-        var _a, _b;
-        const criticalStats = (_b = (_a = this._sessionItems) === null || _a === void 0 ? void 0 : _a.filter((sessionItem) => sessionItem.critical)) === null || _b === void 0 ? void 0 : _b.map((sessionItem) => sessionItem.name);
-        console.log(`${Cfx.Server.GetCurrentResourceName()}: Critical keys are`, criticalStats, 'playerId is', playerId);
-        this.setPlayerInfo(playerId, criticalStats[0], this.getPlayerInfo(playerId, criticalStats[0]), ...criticalStats.slice(1).reduce((prev, curr) => [
-            ...prev,
-            curr,
-            this.getPlayerInfo(playerId, curr)
-        ], []), {
-            executeSqlCommand: true
-        });
-    }
-    getPlayerInfo(playerId, stat) {
-        let value = Cfx.Server.GetConvar(`${playerId}_PI_${stat}`, '-1');
-        if ((0, utils_1.isJSON)(value.toString())) {
-            value = JSON.parse(value, function (_k, v) {
-                return typeof v === 'object' || isNaN(v) ? v : Number(v);
-            });
-        }
-        return value;
-    }
-    clearPlayerInfo(playerId) {
-        var _a;
-        [...(_a = this._sessionItems) === null || _a === void 0 ? void 0 : _a.map((sessionItem) => sessionItem.name), ...this._untrackedSessionItems]
-            .forEach((prop) => {
-            Cfx.Server.SetConvarReplicated(`${playerId}_PI_${prop}`, '-1');
-            Cfx.Server.SetConvarReplicated(`${playerId}_PI_${prop}_lastUpdate`, '-1');
-        });
-    }
-    onResourceStart(resource) {
-        var _a, _b;
-        if (resource !== Cfx.Server.GetCurrentResourceName()) {
-            if (Cfx.exports[resource].exchangeSessionItems) {
-                console.log(`[Armoury:] Resource (${resource}) has started. Attempting to exchange session items with it..`);
-                this.exchangeSessionItems((_b = Cfx.exports[resource].exchangeSessionItems((_a = this._sessionItems) !== null && _a !== void 0 ? _a : [])) !== null && _b !== void 0 ? _b : []);
-            }
-        }
-    }
-    exchangeSessionItems(items) {
-        var _a, _b;
-        items.forEach((item) => {
-            var _a, _b;
-            if (!((_a = this._sessionItems) === null || _a === void 0 ? void 0 : _a.some((sessionItem) => sessionItem.name === item.name))) {
-                (_b = this._sessionItems) === null || _b === void 0 ? void 0 : _b.push(item);
-            }
-        });
-        console.log(`[${Cfx.Server.GetCurrentResourceName()}:] My updated session items are now`, (_a = this._sessionItems) !== null && _a !== void 0 ? _a : []);
-        return (_b = this._sessionItems) !== null && _b !== void 0 ? _b : [];
-    }
-    static withDefaults() {
-        return ({
-            provide: ServerSessionService_1,
-            useFactory: (sessionItems) => new ServerSessionService_1(sessionItems || []),
-            deps: ['sessionItems'],
-        });
-    }
-    static withItems(...items) {
-        return [
-            ...items.map((sessionItem) => ({
-                provide: 'sessionItems',
-                useValue: new sessionItem(),
-                multi: true,
-            })),
-            ServerSessionService_1.withDefaults()
-        ];
     }
 };
 exports.ServerSessionService = ServerSessionService;
-__decorate([
-    (0, decorators_1.EventListener)({ eventName: 'onResourceStart', direction: decorators_1.EVENT_DIRECTIONS.CLIENT_TO_CLIENT }),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
-    __metadata("design:returntype", void 0)
-], ServerSessionService.prototype, "onResourceStart", null);
-__decorate([
-    (0, decorators_1.Export)(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Array]),
-    __metadata("design:returntype", Array)
-], ServerSessionService.prototype, "exchangeSessionItems", null);
-exports.ServerSessionService = ServerSessionService = ServerSessionService_1 = __decorate([
+exports.ServerSessionService = ServerSessionService = __decorate([
     (0, injection_js_1.Injectable)(),
-    __param(0, (0, injection_js_1.Optional)()),
-    __param(0, (0, injection_js_1.Inject)('sessionItems')),
-    __metadata("design:paramtypes", [Array])
+    __metadata("design:paramtypes", [database_1.Database])
 ], ServerSessionService);
-class SessionUpdater {
-    constructor(playerId) {
-        this.playerId = playerId;
-        this.items = [];
-        this.options = null;
-    }
-    from(...statsAndValues) {
-        if (statsAndValues.length % 2 !== 0 && typeof statsAndValues.slice(-1)[0] === 'object') {
-            this.options = statsAndValues.slice(-1)[0];
-        }
-        for (let i = 0; i < statsAndValues.length; i += 2) {
-            if (typeof statsAndValues[i] === 'string' && !!statsAndValues[i + 1]) {
-                this.add(statsAndValues[i], statsAndValues[i + 1]);
-            }
-        }
-        return this;
-    }
-    add(stat, value) {
-        this.items.push({ stat, value });
-        return this;
-    }
-    execute(accountId, characterId, sessionItems) {
-        var _a;
-        this.items.forEach((item) => {
-            let value = item.value;
-            const correspondingSessionItem = sessionItems.find((sessionItem) => sessionItem.name === item.stat);
-            if (correspondingSessionItem) {
-                value = correspondingSessionItem.compute(this.playerId, item.value);
-            }
-            Cfx.Server.SetConvarReplicated(`${this.playerId}_PI_${item.stat}`, Array.isArray(value) || typeof value === 'object'
-                ? JSON.stringify(value)
-                : value.toString());
-            Cfx.Server.SetConvarReplicated(`${this.playerId}_PI_${item.stat}_lastUpdate`, new Date().getTime().toString());
-        });
-        if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.executeSqlCommand) {
-            const syncableItems = this.items.filter((item) => {
-                var _a, _b;
-                return sessionItems.some((sessionItem) => sessionItem.name === item.stat) && !((_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.ignoreSqlCommandFor) === null || _b === void 0 ? void 0 : _b.includes(item.stat));
-            });
-            if (syncableItems.length) {
-                const predicate = (item) => { var _a; return (_a = sessionItems.find((sessionItem) => sessionItem.name === item.stat)) === null || _a === void 0 ? void 0 : _a.save; };
-                const simpleSyncableItems = syncableItems.filter((item) => !predicate(item)).filter((item) => !!item && item.value != null);
-                console.log('simpleSyncableItems are', simpleSyncableItems);
-                Cfx.exports['oxmysql'].update_async(`UPDATE \`players\` SET ${simpleSyncableItems.map((item) => `${item.stat} = ?`).join(', ')} WHERE id = ?`, [...simpleSyncableItems.map((item) => JSON.stringify(item.value)), characterId]);
-                const nonSimpleSyncableItems = syncableItems.filter((item) => predicate(item));
-                nonSimpleSyncableItems.forEach((item) => sessionItems.find((sessionItem) => sessionItem.name === item.stat).save(accountId, characterId, item.value));
-            }
-        }
-    }
-}

package/dist/esm/server/database/database.js

@@ -0,0 +1,98 @@
+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);
+};
+var Database_1;
+import { Injectable } from 'injection-js';
+import { drizzle } from 'drizzle-orm/mysql2';
+import { createPool } from 'mysql2/promise';
+let Database = Database_1 = class Database {
+    constructor() {
+        this._tables = new Map();
+        console.log(`[DB:] Database service initialized! (this resource: ${Cfx.Server.GetCurrentResourceName()})`);
+    }
+    registerTable(identifier, table) {
+        if (this._tables.has(identifier)) {
+            throw new Error(`Table '${identifier}' is already registered.`);
+        }
+        this._tables.set(identifier, table);
+        return table;
+    }
+    getTable(identifier) {
+        const table = this._tables.get(identifier);
+        if (!table) {
+            throw new Error(`Table '${identifier}' is not registered.`);
+        }
+        return table;
+    }
+    getClient() {
+        if (!this._db) {
+            throw new Error('Database is not yet initialized');
+        }
+        return this._db;
+    }
+    setClient(db, rootResource) {
+        if (this._db) {
+            throw new Error('Database client is already set.');
+        }
+        this._db = db;
+        this._rootResource = rootResource;
+    }
+    isRoot() {
+        return Cfx.Server.GetCurrentResourceName() === this._rootResource;
+    }
+    static forRoot() {
+        return ({
+            provide: Database_1,
+            useFactory: () => {
+                const rootResource = Cfx.Server.GetCurrentResourceName();
+                const settings = Cfx.Server.GetConvar('mysql_connection_string', '')
+                    .split(';')
+                    .filter(Boolean)
+                    .reduce((settings, entry) => {
+                    const index = entry.indexOf('=');
+                    if (index !== -1) {
+                        settings[entry.slice(0, index)] = entry.slice(index + 1);
+                    }
+                    return settings;
+                }, {});
+                const pool = createPool({
+                    host: settings.host || 'localhost',
+                    port: !isNaN(Number(settings.port)) ? Number(settings.port) : 3306,
+                    user: settings.user || 'root',
+                    password: settings.password,
+                    database: settings.database || 'test',
+                });
+                console.log(`[DB:] Creating Drizzle instance... (rootResource: ${rootResource})`);
+                const drizzl = drizzle({ client: pool });
+                console.log(`[DB:] Drizzle instance created! (rootResource: ${rootResource})`);
+                const db = new Database_1();
+                db.setClient(drizzl, Cfx.Server.GetCurrentResourceName());
+                return db;
+            },
+            deps: [],
+        });
+    }
+    static forChild() {
+        return ({
+            provide: Database_1,
+            useFactory: () => {
+                const db = new Database_1();
+                // TODO: Set client based on main resource here
+                // db.setClient(drizzl, Cfx.Server.GetCurrentResourceName());
+                return db;
+            },
+            deps: [],
+        });
+    }
+};
+Database = Database_1 = __decorate([
+    Injectable(),
+    __metadata("design:paramtypes", [])
+], Database);
+export { Database };

package/dist/esm/server/database/schemas/accounts.table.js

@@ -0,0 +1,6 @@
+import { mysqlTable, int, varchar } from 'drizzle-orm/mysql-core';
+export const AccountsTable = mysqlTable('accounts', {
+    id: int('id').primaryKey().autoincrement(),
+    platformId: varchar('platformId', { length: 64 }).notNull(),
+    lastKnownName: varchar('lastKnownName', { length: 255 }).notNull(),
+});

package/dist/esm/server/index.js

@@ -1,46 +1,13 @@
 /// <reference path = "../ambient.declarations.d.ts" />
 import 'reflect-metadata';
-import { SessionAccountId, SessionCash, SessionHoursPlayed, SessionId, SessionLanguage, SessionLastLocation, SessionName } from './services/session/default-entities';
 import { bootstrapWithProviders } from '@armoury/fivem-framework-common';
-export const SERVER_PROVIDERS = [
-    {
-        provide: 'sessionItems',
-        useValue: new SessionId(),
-        multi: true,
-    },
-    {
-        provide: 'sessionItems',
-        useValue: new SessionAccountId(),
-        multi: true,
-    },
-    {
-        provide: 'sessionItems',
-        useValue: new SessionName(),
-        multi: true,
-    },
-    {
-        provide: 'sessionItems',
-        useValue: new SessionCash(),
-        multi: true,
-    },
-    {
-        provide: 'sessionItems',
-        useValue: new SessionHoursPlayed(),
-        multi: true,
-    },
-    {
-        provide: 'sessionItems',
-        useValue: new SessionLastLocation(),
-        multi: true,
-    },
-    {
-        provide: 'sessionItems',
-        useValue: new SessionLanguage(),
-        multi: true,
-    },
+import { Database } from './database/database';
+export const SERVER_LAZY_PROVIDERS = [];
+export const SERVER_EAGER_PROVIDERS = [
+    Database.forChild(),
 ];
 export async function bootstrap(_class, options = {}) {
-    return bootstrapWithProviders(_class, SERVER_PROVIDERS, options, undefined, (key, index) => Cfx.Server.GetResourceMetadata(Cfx.Server.GetCurrentResourceName(), key, index), (resourceName) => Cfx.exports[resourceName]);
+    return bootstrapWithProviders(_class, SERVER_LAZY_PROVIDERS, options, undefined, (key, index) => Cfx.Server.GetResourceMetadata(Cfx.Server.GetCurrentResourceName(), key, index), (resourceName) => Cfx.exports[resourceName], SERVER_EAGER_PROVIDERS);
 }
 export * from './services';
 export * from './models';

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

@@ -2,4 +2,3 @@ export * from './server-resource-database.service';
 export * from './server-enterable-database.service';
 export * from './server-virtual-worlds.service';
 export * from './server-translate.service';
-export * from './session';

package/dist/esm/server/services/server-virtual-worlds.service.js

@@ -10,9 +10,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-import { Inject, Injectable } from "injection-js";
+import { Inject, Injectable } from 'injection-js';
 import { EventListener } from '@armoury/fivem-framework-common';
-import { ServerSessionService } from "./session";
+import { ServerSessionService } from './session/server-session.service';
 let ServerVirtualWorldsService = class ServerVirtualWorldsService {
     constructor(_session) {
         this._session = _session;
@@ -27,19 +27,30 @@ let ServerVirtualWorldsService = class ServerVirtualWorldsService {
         Cfx.Server.TriggerClientEvent(`${Cfx.Server.GetCurrentResourceName()}:refresh-virtual-world`, data.for);
     }
     setPlayerVirtualWorld(playerId, virtualWorld) {
-        const currentPlayerVirtualWorld = this.getPlayerVirtualWorld(playerId);
+        /*const currentPlayerVirtualWorld: number = this.getPlayerVirtualWorld(playerId);
+
         if (!isNaN(currentPlayerVirtualWorld)) {
-            this._virtualWorldsWithPlayers.set(currentPlayerVirtualWorld, (this._virtualWorldsWithPlayers.has(currentPlayerVirtualWorld) ? this._virtualWorldsWithPlayers.get(currentPlayerVirtualWorld) : []).filter((_playerId) => _playerId !== playerId));
+            this._virtualWorldsWithPlayers.set(
+                currentPlayerVirtualWorld,
+                (this._virtualWorldsWithPlayers.has(currentPlayerVirtualWorld) ? this._virtualWorldsWithPlayers.get(currentPlayerVirtualWorld) : [])!.filter((_playerId: number) => _playerId !== playerId)
+            );
         }
-        const newPlayersInVirtualWorld = [
-            ...(this._virtualWorldsWithPlayers.has(virtualWorld) ? this._virtualWorldsWithPlayers.get(virtualWorld) : []),
+
+        const newPlayersInVirtualWorld: number[] = [
+            ...(this._virtualWorldsWithPlayers.has(virtualWorld) ? this._virtualWorldsWithPlayers.get(virtualWorld) : [])!,
             playerId
         ];
-        this._virtualWorldsWithPlayers.set(virtualWorld, newPlayersInVirtualWorld);
-        this._session.setPlayerInfo(playerId, 'virtualWorld', virtualWorld);
+
+        this._virtualWorldsWithPlayers.set(
+            virtualWorld,
+            newPlayersInVirtualWorld
+        );
+
+        this._session.setPlayerInfo(playerId, 'virtualWorld', virtualWorld);*/
     }
     getPlayerVirtualWorld(playerId) {
-        return Math.max(0, this._session.getPlayerInfo(playerId, 'virtualWorld'));
+        return 0;
+        // return Math.max(0, this._session.getPlayerInfo(playerId, 'virtualWorld'));
     }
     removeClientsideVehicles() {
         Cfx.Server.TriggerClientEvent(`${Cfx.Server.GetCurrentResourceName()}:ARM_remove-vehicles`, -1);

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

@@ -7,262 +7,23 @@ 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);
 };
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-var ServerSessionService_1;
-import { Inject, Injectable, Optional } from "injection-js";
-import { isJSON } from "../../../utils/utils";
-import { EVENT_DIRECTIONS, EventListener, Export } from "../../../decorators";
-let ServerSessionService = ServerSessionService_1 = class ServerSessionService {
-    get players() {
-        return Array.from(this._sessions.keys());
-    }
-    get authenticatedPlayers() {
-        return Array.from(this._sessions.entries())
-            .filter(([, session]) => session.id)
-            .map(([playerId,]) => playerId);
-    }
-    constructor(_sessionItems) {
-        var _a;
-        this._sessionItems = _sessionItems;
-        this._sessions = new Map();
-        this._untrackedSessionItems = [];
-        this._sessionItems = (_a = _sessionItems === null || _sessionItems === void 0 ? void 0 : _sessionItems.filter((item) => !!item)) !== null && _a !== void 0 ? _a : [];
-        if (!Cfx.exports['oxmysql']) {
-            console.error(`[Armoury (${Cfx.Server.GetCurrentResourceName()}):] Could not find the 'oxmysql' resource. Armoury's session service can't work without it. Did you forget to load it?`);
-            return;
+import { Injectable } from 'injection-js';
+import { Database } from '../../database/database';
+import { AccountsTable } from '../../database/schemas/accounts.table';
+let ServerSessionService = class ServerSessionService {
+    constructor(_database) {
+        this._database = _database;
+        if (_database.isRoot()) {
+            this._database.registerTable('accounts', AccountsTable);
+            console.log('[ServerSessionService] Registered accounts table in the database.');
         }
-    }
-    /**
-     * Registers an account.
-     * @param playerId The playerId (NOT from the database) of this player
-     * @param accountName The account name of this player
-     * @param hashedPassword The hashed password of this account
-     * @param email The email of this account
-     * @returns The SQL ID of the newly-created account
-     */
-    async register(playerId, accountName, hashedPassword, email) {
-        const accountId = await Cfx.exports['oxmysql'].insert_async('INSERT INTO `accounts`(`name`, `password`, `email`) VALUES (?, ?, ?)', [accountName, hashedPassword, email]);
-        this._sessions.set(playerId, { accountId });
-        return accountId;
-    }
-    /**
-     * Logs into an account
-     * @param playerId The playerId (NOT from the database) of this player
-     * @param email The email of the account
-     * @param hashedPassword The hashed password fo this account
-     * @returns Account data for this account
-     */
-    async login(playerId, email, hashedPassword) {
-        const result = await Cfx.exports['oxmysql'].single_async('SELECT * FROM `accounts` WHERE email=? AND password=?', [email, hashedPassword]);
-        this._sessions.set(playerId, { accountId: result.id });
-        return result;
-    }
-    /**
-     * Fetches all the characters related to the provided account
-     * @param playerId The playerId (NOT from the database) of this player
-     * @param accountId The accountId of the
-     * @returns Data for all characters on the given account
-     */
-    async fetch(playerId, accountId) {
-        var _a;
-        accountId = accountId !== null && accountId !== void 0 ? accountId : (_a = this._sessions.get(playerId)) === null || _a === void 0 ? void 0 : _a.accountId;
-        return await global.exports['oxmysql'].query_async(`SELECT * FROM players WHERE accountId = ?`, [accountId]);
-    }
-    /**
-     * Loads the entire character given a character ID
-     * @param playerId The playerId (NOT from the database) of this player
-     * @param characterId The character's SQL ID
-     * @returns Data for the given characterId
-     */
-    async load(playerId, characterId) {
-        var _a;
-        if (!this._sessions.has(playerId)) {
-            throw new Error('No session has been found for that user.');
+        else {
+            console.log('[ServerSessionService] Not the root resource, skipping table registration.');
         }
-        const session = await global.exports['oxmysql'].single_async('SELECT * FROM `players` WHERE id=? AND accountId=?', [characterId, (_a = this._sessions.get(playerId)) === null || _a === void 0 ? void 0 : _a.accountId]);
-        Array.from(Object.entries(session))
-            .map(([key,]) => { var _a; return (_a = this._sessionItems) === null || _a === void 0 ? void 0 : _a.find((sessionItem) => sessionItem.name === key); })
-            .filter((sessionItem) => !!sessionItem)
-            .forEach(async (sessionItem) => {
-            var _a, _b, _c, _d;
-            console.log('for sessionItem', sessionItem.name, 'the value is', (_b = await (sessionItem === null || sessionItem === void 0 ? void 0 : sessionItem.load((_a = this._sessions.get(playerId)) === null || _a === void 0 ? void 0 : _a.accountId, characterId, session[sessionItem === null || sessionItem === void 0 ? void 0 : sessionItem.name]))) !== null && _b !== void 0 ? _b : session[sessionItem === null || sessionItem === void 0 ? void 0 : sessionItem.name].value);
-            this.setPlayerInfo(playerId, sessionItem.name, (_d = await (sessionItem === null || sessionItem === void 0 ? void 0 : sessionItem.load((_c = this._sessions.get(playerId)) === null || _c === void 0 ? void 0 : _c.accountId, characterId, session[sessionItem === null || sessionItem === void 0 ? void 0 : sessionItem.name]))) !== null && _d !== void 0 ? _d : session[sessionItem === null || sessionItem === void 0 ? void 0 : sessionItem.name].value);
-        });
-        this._sessions.set(playerId, Object.assign(Object.assign({}, this._sessions.get(playerId)), { id: characterId }));
-        return session;
-    }
-    /**
-     * Creates a character
-     * @param playerId
-     * @param accountName
-     * @param hashedPassword
-     * @param email
-     * @returns
-     */
-    async create(playerId, accountId) {
-        var _a;
-        accountId = accountId !== null && accountId !== void 0 ? accountId : (_a = this._sessions.get(playerId)) === null || _a === void 0 ? void 0 : _a.accountId;
-        const characterId = await Cfx.exports['oxmysql'].insert_async('INSERT INTO `players`(`accountId`) VALUES (?)', [accountId]);
-        this._sessions.set(playerId, { accountId });
-        return characterId;
-    }
-    setPlayerInfo(playerId, stat, value, ...args) {
-        const updater = new SessionUpdater(playerId).from(stat, value, ...args);
-        updater.execute(this.getPlayerInfo(playerId, 'accountId'), this.getPlayerInfo(playerId, 'id'), this._sessionItems);
-        const untrackedItems = updater.items
-            .filter((item) => {
-            var _a;
-            return !this._untrackedSessionItems.includes(item.stat)
-                && !((_a = this._sessionItems) === null || _a === void 0 ? void 0 : _a.some((sessionItem) => sessionItem.name === item.stat));
-        });
-        if (untrackedItems.length) {
-            this._untrackedSessionItems.push(...untrackedItems.map((item) => item.stat));
-        }
-    }
-    setPlayerCash(playerId, value, options) {
-        return this.setPlayerInfo(playerId, 'cash', value, options);
-    }
-    givePlayerCash(playerId, value, options) {
-        return this.setPlayerCash(playerId, this.getPlayerCash(playerId) + value, options);
-    }
-    getPlayerCash(playerId) {
-        return this.getPlayerInfo(playerId, 'cash');
-    }
-    saveCritical(playerId) {
-        var _a, _b;
-        const criticalStats = (_b = (_a = this._sessionItems) === null || _a === void 0 ? void 0 : _a.filter((sessionItem) => sessionItem.critical)) === null || _b === void 0 ? void 0 : _b.map((sessionItem) => sessionItem.name);
-        console.log(`${Cfx.Server.GetCurrentResourceName()}: Critical keys are`, criticalStats, 'playerId is', playerId);
-        this.setPlayerInfo(playerId, criticalStats[0], this.getPlayerInfo(playerId, criticalStats[0]), ...criticalStats.slice(1).reduce((prev, curr) => [
-            ...prev,
-            curr,
-            this.getPlayerInfo(playerId, curr)
-        ], []), {
-            executeSqlCommand: true
-        });
-    }
-    getPlayerInfo(playerId, stat) {
-        let value = Cfx.Server.GetConvar(`${playerId}_PI_${stat}`, '-1');
-        if (isJSON(value.toString())) {
-            value = JSON.parse(value, function (_k, v) {
-                return typeof v === 'object' || isNaN(v) ? v : Number(v);
-            });
-        }
-        return value;
-    }
-    clearPlayerInfo(playerId) {
-        var _a;
-        [...(_a = this._sessionItems) === null || _a === void 0 ? void 0 : _a.map((sessionItem) => sessionItem.name), ...this._untrackedSessionItems]
-            .forEach((prop) => {
-            Cfx.Server.SetConvarReplicated(`${playerId}_PI_${prop}`, '-1');
-            Cfx.Server.SetConvarReplicated(`${playerId}_PI_${prop}_lastUpdate`, '-1');
-        });
-    }
-    onResourceStart(resource) {
-        var _a, _b;
-        if (resource !== Cfx.Server.GetCurrentResourceName()) {
-            if (Cfx.exports[resource].exchangeSessionItems) {
-                console.log(`[Armoury:] Resource (${resource}) has started. Attempting to exchange session items with it..`);
-                this.exchangeSessionItems((_b = Cfx.exports[resource].exchangeSessionItems((_a = this._sessionItems) !== null && _a !== void 0 ? _a : [])) !== null && _b !== void 0 ? _b : []);
-            }
-        }
-    }
-    exchangeSessionItems(items) {
-        var _a, _b;
-        items.forEach((item) => {
-            var _a, _b;
-            if (!((_a = this._sessionItems) === null || _a === void 0 ? void 0 : _a.some((sessionItem) => sessionItem.name === item.name))) {
-                (_b = this._sessionItems) === null || _b === void 0 ? void 0 : _b.push(item);
-            }
-        });
-        console.log(`[${Cfx.Server.GetCurrentResourceName()}:] My updated session items are now`, (_a = this._sessionItems) !== null && _a !== void 0 ? _a : []);
-        return (_b = this._sessionItems) !== null && _b !== void 0 ? _b : [];
-    }
-    static withDefaults() {
-        return ({
-            provide: ServerSessionService_1,
-            useFactory: (sessionItems) => new ServerSessionService_1(sessionItems || []),
-            deps: ['sessionItems'],
-        });
-    }
-    static withItems(...items) {
-        return [
-            ...items.map((sessionItem) => ({
-                provide: 'sessionItems',
-                useValue: new sessionItem(),
-                multi: true,
-            })),
-            ServerSessionService_1.withDefaults()
-        ];
     }
 };
-__decorate([
-    EventListener({ eventName: 'onResourceStart', direction: EVENT_DIRECTIONS.CLIENT_TO_CLIENT }),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
-    __metadata("design:returntype", void 0)
-], ServerSessionService.prototype, "onResourceStart", null);
-__decorate([
-    Export(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Array]),
-    __metadata("design:returntype", Array)
-], ServerSessionService.prototype, "exchangeSessionItems", null);
-ServerSessionService = ServerSessionService_1 = __decorate([
+ServerSessionService = __decorate([
     Injectable(),
-    __param(0, Optional()),
-    __param(0, Inject('sessionItems')),
-    __metadata("design:paramtypes", [Array])
+    __metadata("design:paramtypes", [Database])
 ], ServerSessionService);
 export { ServerSessionService };
-class SessionUpdater {
-    constructor(playerId) {
-        this.playerId = playerId;
-        this.items = [];
-        this.options = null;
-    }
-    from(...statsAndValues) {
-        if (statsAndValues.length % 2 !== 0 && typeof statsAndValues.slice(-1)[0] === 'object') {
-            this.options = statsAndValues.slice(-1)[0];
-        }
-        for (let i = 0; i < statsAndValues.length; i += 2) {
-            if (typeof statsAndValues[i] === 'string' && !!statsAndValues[i + 1]) {
-                this.add(statsAndValues[i], statsAndValues[i + 1]);
-            }
-        }
-        return this;
-    }
-    add(stat, value) {
-        this.items.push({ stat, value });
-        return this;
-    }
-    execute(accountId, characterId, sessionItems) {
-        var _a;
-        this.items.forEach((item) => {
-            let value = item.value;
-            const correspondingSessionItem = sessionItems.find((sessionItem) => sessionItem.name === item.stat);
-            if (correspondingSessionItem) {
-                value = correspondingSessionItem.compute(this.playerId, item.value);
-            }
-            Cfx.Server.SetConvarReplicated(`${this.playerId}_PI_${item.stat}`, Array.isArray(value) || typeof value === 'object'
-                ? JSON.stringify(value)
-                : value.toString());
-            Cfx.Server.SetConvarReplicated(`${this.playerId}_PI_${item.stat}_lastUpdate`, new Date().getTime().toString());
-        });
-        if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.executeSqlCommand) {
-            const syncableItems = this.items.filter((item) => {
-                var _a, _b;
-                return sessionItems.some((sessionItem) => sessionItem.name === item.stat) && !((_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.ignoreSqlCommandFor) === null || _b === void 0 ? void 0 : _b.includes(item.stat));
-            });
-            if (syncableItems.length) {
-                const predicate = (item) => { var _a; return (_a = sessionItems.find((sessionItem) => sessionItem.name === item.stat)) === null || _a === void 0 ? void 0 : _a.save; };
-                const simpleSyncableItems = syncableItems.filter((item) => !predicate(item)).filter((item) => !!item && item.value != null);
-                console.log('simpleSyncableItems are', simpleSyncableItems);
-                Cfx.exports['oxmysql'].update_async(`UPDATE \`players\` SET ${simpleSyncableItems.map((item) => `${item.stat} = ?`).join(', ')} WHERE id = ?`, [...simpleSyncableItems.map((item) => JSON.stringify(item.value)), characterId]);
-                const nonSimpleSyncableItems = syncableItems.filter((item) => predicate(item));
-                nonSimpleSyncableItems.forEach((item) => sessionItems.find((sessionItem) => sessionItem.name === item.stat).save(accountId, characterId, item.value));
-            }
-        }
-    }
-}

package/dist/types/server/database/database.d.ts

@@ -0,0 +1,16 @@
+import { Provider } from 'injection-js';
+import { MySqlTable } from 'drizzle-orm/mysql-core';
+import { MySql2Database } from 'drizzle-orm/mysql2';
+export declare class Database {
+    private _rootResource?;
+    private _db?;
+    private readonly _tables;
+    constructor();
+    registerTable<T extends MySqlTable>(identifier: string, table: T): T;
+    getTable<T extends MySqlTable>(identifier: string): T;
+    getClient(): MySql2Database;
+    setClient(db: MySql2Database, rootResource: string): void;
+    isRoot(): boolean;
+    static forRoot(): Provider;
+    static forChild(): Provider;
+}

package/dist/types/server/database/schemas/accounts.table.d.ts

@@ -0,0 +1,58 @@
+export declare const AccountsTable: import("drizzle-orm/mysql-core").MySqlTableWithColumns<{
+    name: "accounts";
+    schema: undefined;
+    columns: {
+        id: import("drizzle-orm/mysql-core").MySqlColumn<{
+            name: "id";
+            tableName: "accounts";
+            dataType: "number";
+            columnType: "MySqlInt";
+            data: number;
+            driverParam: string | number;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: true;
+            isAutoincrement: true;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        platformId: import("drizzle-orm/mysql-core").MySqlColumn<{
+            name: "platformId";
+            tableName: "accounts";
+            dataType: "string";
+            columnType: "MySqlVarChar";
+            data: string;
+            driverParam: string | number;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        lastKnownName: import("drizzle-orm/mysql-core").MySqlColumn<{
+            name: "lastKnownName";
+            tableName: "accounts";
+            dataType: "string";
+            columnType: "MySqlVarChar";
+            data: string;
+            driverParam: string | number;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+    };
+    dialect: "mysql";
+}>;

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

@@ -1,21 +1,9 @@
 /// <reference path="../ambient.declarations.d.ts" />
 import 'reflect-metadata';
-import { Provider } from 'injection-js';
-import { SessionId, SessionLastLocation, SessionName } from './services/session/default-entities';
 import { BootstrapOptions } from '@armoury/fivem-framework-common';
-export declare const SERVER_PROVIDERS: ({
-    provide: string;
-    useValue: SessionId;
-    multi: boolean;
-} | {
-    provide: string;
-    useValue: SessionName;
-    multi: boolean;
-} | {
-    provide: string;
-    useValue: SessionLastLocation;
-    multi: boolean;
-})[];
+import { Provider } from 'injection-js';
+export declare const SERVER_LAZY_PROVIDERS: Provider[];
+export declare const SERVER_EAGER_PROVIDERS: Provider[];
 export declare function bootstrap<T extends {
     new (...args: any[]): any;
 } & Provider>(_class: T, options?: BootstrapOptions): Promise<InstanceType<T>>;

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

@@ -2,4 +2,3 @@ export * from './server-resource-database.service';
 export * from './server-enterable-database.service';
 export * from './server-virtual-worlds.service';
 export * from './server-translate.service';
-export * from './session';

package/dist/types/server/services/server-virtual-worlds.service.d.ts

@@ -1,4 +1,4 @@
-import { ServerSessionService } from "./session";
+import { ServerSessionService } from './session/server-session.service';
 export declare class ServerVirtualWorldsService {
     private readonly _session;
     constructor(_session: ServerSessionService);

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

@@ -1,70 +1,5 @@
-import { Provider } from "injection-js";
-import { IAccount } from "../../../shared";
-import { ISessionItemBase } from "../../models";
-import { ISession } from "../../models/session/session.model";
+import { Database } from '../../database/database';
 export declare class ServerSessionService {
-    private readonly _sessionItems?;
-    private _sessions;
-    private _untrackedSessionItems;
-    get players(): number[];
-    get authenticatedPlayers(): number[];
-    constructor(_sessionItems?: ISessionItemBase[] | undefined);
-    /**
-     * Registers an account.
-     * @param playerId The playerId (NOT from the database) of this player
-     * @param accountName The account name of this player
-     * @param hashedPassword The hashed password of this account
-     * @param email The email of this account
-     * @returns The SQL ID of the newly-created account
-     */
-    register(playerId: number, accountName: string, hashedPassword: string, email: string): Promise<number>;
-    /**
-     * Logs into an account
-     * @param playerId The playerId (NOT from the database) of this player
-     * @param email The email of the account
-     * @param hashedPassword The hashed password fo this account
-     * @returns Account data for this account
-     */
-    login(playerId: number, email: string, hashedPassword: string): Promise<IAccount>;
-    /**
-     * Fetches all the characters related to the provided account
-     * @param playerId The playerId (NOT from the database) of this player
-     * @param accountId The accountId of the
-     * @returns Data for all characters on the given account
-     */
-    fetch(playerId: number, accountId?: number): Promise<ISession[]>;
-    /**
-     * Loads the entire character given a character ID
-     * @param playerId The playerId (NOT from the database) of this player
-     * @param characterId The character's SQL ID
-     * @returns Data for the given characterId
-     */
-    load(playerId: number, characterId: number): Promise<ISession>;
-    /**
-     * Creates a character
-     * @param playerId
-     * @param accountName
-     * @param hashedPassword
-     * @param email
-     * @returns
-     */
-    create(playerId: number, accountId?: number): Promise<number>;
-    setPlayerInfo<T>(playerId: number, stat: string, value: T, ...args: any[]): void;
-    setPlayerCash(playerId: number, value: number, options?: SessionUpdaterOptions): void;
-    givePlayerCash(playerId: number, value: number, options?: SessionUpdaterOptions): void;
-    getPlayerCash(playerId: number): number;
-    saveCritical(playerId: number): void;
-    getPlayerInfo<T>(playerId: number, stat: string): T;
-    clearPlayerInfo(playerId: number): void;
-    onResourceStart(resource: string): void;
-    exchangeSessionItems(items: ISessionItemBase[]): ISessionItemBase[];
-    static withDefaults(): Provider;
-    static withItems<T extends {
-        new (...args: any[]): any;
-    }>(...items: T[]): Provider[];
+    private readonly _database;
+    constructor(_database: Database);
 }
-interface SessionUpdaterOptions {
-    executeSqlCommand?: boolean;
-    ignoreSqlCommandFor?: string[];
-}
-export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armoury/fivem-framework-server",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "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.15",
+    "@armoury/fivem-framework-common": "1.0.16",
     "drizzle-orm": "^0.45.4",
     "mysql2": "^3.24.5"
   },