weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: added compatibility checks with v1.0.4

Browse Source
This commit is contained in:
Davide Passoni
2025-03-07 16:39:33 +01:00
parent f1fb3073d2
commit d90ef540f9
4 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/react/src/audio/audiomanager.ts
View File

@@ -54,7 +54,10 @@ export class AudioManager {
constructor() { constructor() {
ConfigLoadedEvent.on((config: OlympusConfig) => { ConfigLoadedEvent.on((config: OlympusConfig) => {
config.audio.WSPort ? this.setPort(config.audio.WSPort) : this.setEndpoint(config.audio.WSEndpoint); if (config.audio)
config.audio.WSPort ? this.setPort(config.audio.WSPort) : this.setEndpoint(config.audio.WSEndpoint);
else
console.error("No audio configuration found in the Olympus configuration file");
}); });
CommandModeOptionsChangedEvent.on((options: CommandModeOptions) => { CommandModeOptionsChangedEvent.on((options: CommandModeOptions) => {

26
frontend/react/src/interfaces.ts
View File

@@ -5,11 +5,6 @@ export interface OlympusConfig {
/* Set by user */ /* Set by user */
frontend: { frontend: {
port: number; port: number;
customAuthHeaders: {
enabled: boolean;
username: string;
group: string;
};
elevationProvider: { elevationProvider: {
provider: string; provider: string;
username: string | null; username: string | null;
@@ -26,23 +21,30 @@ export interface OlympusConfig {
mapMirrors: { mapMirrors: {
[key: string]: string; [key: string]: string;
}; };
autoconnectWhenLocal: boolean; /* New with v2.0.0 */
customAuthHeaders?: {
enabled: boolean;
username: string;
group: string;
};
autoconnectWhenLocal?: boolean;
}; };
audio: { /* New with v2.0.0 */
audio?: {
SRSPort: number; SRSPort: number;
WSPort?: number; WSPort?: number;
WSEndpoint?: string; WSEndpoint?: string;
}; };
controllers: [{ type: string; coalition: Coalition; frequency: number; modulation: number; callsign: string }]; controllers?: [{ type: string; coalition: Coalition; frequency: number; modulation: number; callsign: string }];
profiles?: { [key: string]: ProfileOptions }; profiles?: { [key: string]: ProfileOptions };
authentication?: {
/* Set by server */
local?: boolean;
authentication?: { // Only sent when in localhost mode for autologin
gameMasterPassword: string; gameMasterPassword: string;
blueCommanderPasword: string; blueCommanderPasword: string;
redCommanderPassword: string; redCommanderPassword: string;
}; };
/* Set by server */
local: boolean;
} }
export interface SessionData { export interface SessionData {

2
frontend/react/src/olympusapp.ts
View File

@@ -172,7 +172,7 @@ export class OlympusApp {
}) })
.then(([result, headers]) => { .then(([result, headers]) => {
this.#config = result; this.#config = result;
if (this.#config.frontend.customAuthHeaders.enabled) { if (this.#config.frontend.customAuthHeaders?.enabled) {
if (headers.has(this.#config.frontend.customAuthHeaders.username) && headers.has(this.#config.frontend.customAuthHeaders.group)) { if (headers.has(this.#config.frontend.customAuthHeaders.username) && headers.has(this.#config.frontend.customAuthHeaders.group)) {
this.getServerManager().setUsername(headers.get(this.#config.frontend.customAuthHeaders.username)); this.getServerManager().setUsername(headers.get(this.#config.frontend.customAuthHeaders.username));
this.setState(OlympusState.LOGIN, LoginSubState.COMMAND_MODE); this.setState(OlympusState.LOGIN, LoginSubState.COMMAND_MODE);

8
manager/javascripts/dcsinstance.js
View File

@@ -186,8 +186,12 @@ class DCSInstance {
this.backendPort = config["backend"]["port"]; this.backendPort = config["backend"]["port"];
this.backendAddress = config["backend"]["address"]; this.backendAddress = config["backend"]["address"];
this.gameMasterPasswordHash = config["authentication"]["gameMasterPassword"]; this.gameMasterPasswordHash = config["authentication"]["gameMasterPassword"];
this.autoconnectWhenLocal = config["frontend"]["autoconnectWhenLocal"];
this.SRSPort = config["audio"]["SRSPort"]; /* Read the new configurations added in v2.0.0 */
if ( config["frontend"]["autoconnectWhenLocal"] !== undefined)
this.autoconnectWhenLocal = config["frontend"]["autoconnectWhenLocal"];
if (config["frontend"]["audio"] !== undefined && config["frontend"]["audio"]["SRSPort"] !== undefined)
this.SRSPort = config["audio"]["SRSPort"];
this.gameMasterPasswordEdited = false; this.gameMasterPasswordEdited = false;
this.blueCommanderPasswordEdited = false; this.blueCommanderPasswordEdited = false;