feat(skymp5-client): make server settings more flexible

skymp5-client/src/index.ts

@@ -51,6 +51,7 @@ import { WorldView } from "./view/worldView";
 import { KeyboardEventsService } from "./services/services/keyboardEventsService";
 import { MagicSyncService } from "./services/services/magicSyncService";
 import { ProfilingService } from "./services/services/profilingService";
+import { SettingsService } from "./services/services/settingsService";
 
 once("update", () => {
   Utility.setINIBool("bAlwaysActive:General", true);
@@ -62,6 +63,7 @@ const main = () => {
     const controller = SpApiInteractor.getControllerInstance();
 
     const listeners = [
+      new SettingsService(sp, controller),
       new BlockPapyrusEventsService(sp, controller),
       new LoadGameService(sp, controller),
       new SinglePlayerService(sp, controller),

skymp5-client/src/services/services/authService.ts

@@ -15,6 +15,7 @@ import { NetworkingService } from "./networkingService";
 import { CustomPacketMessage2 } from "../messages/customPacketMessage2";
 import { MsgType } from "../../messages";
 import { ConnectionDenied } from "../events/connectionDenied";
+import { SettingsService } from "./settingsService";
 
 // for browsersideWidgetSetter
 declare const window: any;
@@ -42,6 +43,7 @@ let authData: RemoteAuthGameData | null = null;
 export class AuthService extends ClientListener {
   constructor(private sp: Sp, private controller: CombinedController) {
     super();
+
     this.controller.emitter.on("authNeeded", (e) => this.onAuthNeeded(e));
     this.controller.emitter.on("browserWindowLoaded", (e) => this.onBrowserWindowLoaded(e));
     this.controller.emitter.on("createActorMessage", (e) => this.onCreateActorMessage(e));
@@ -53,27 +55,6 @@ export class AuthService extends ClientListener {
     this.controller.once("update", () => this.onceUpdate());
   }
 
-  // TODO: consider moving to a separate service called SettingsService
-  public getServerMasterKey() {
-    let masterKey = this.sp.settings["skymp5-client"]["server-master-key"];
-    if (!masterKey) {
-      masterKey = this.sp.settings["skymp5-client"]["master-key"];
-    }
-    if (!masterKey) {
-      masterKey = this.sp.settings["skymp5-client"]["server-ip"] + ":" + this.sp.settings["skymp5-client"]["server-port"];
-    }
-    return masterKey;
-  }
-
-  // TODO: consider moving to a separate service called SettingsService
-  public getMasterUrl() {
-    return this.normalizeUrl((this.sp.settings["skymp5-client"]["master"] as string) || "https://gateway.skymp.net");
-  }
-
-  public getMasterApiId() {
-    return authData?.masterApiId;
-  }
-
   private onAuthNeeded(e: AuthNeededEvent) {
     logTrace(this, `Received authNeeded event`);
 
@@ -196,14 +177,16 @@ export class AuthService extends ClientListener {
       return;
     }
 
+    const settingsService = this.controller.lookupListener(SettingsService);
+
     logTrace(this, `onBrowserMessage:`, JSON.stringify(e.arguments));
 
     const eventKey = e.arguments[0];
     switch (eventKey) {
       case events.openDiscordOauth:
         browserState.comment = 'открываем браузер...';
         this.refreshWidgets();
-        this.sp.win32.loadUrl(`${this.getMasterUrl()}/api/users/login-discord?state=${this.discordAuthState}`);
+        this.sp.win32.loadUrl(`${settingsService.getMasterUrl()}/api/users/login-discord?state=${this.discordAuthState}`);
         break;
       case events.authAttempt:
         if (authData === null) {
@@ -243,10 +226,10 @@ export class AuthService extends ClientListener {
   }
 
   private createPlaySession(token: string, callback: (res: string, err: string) => void) {
-    const client = new this.sp.HttpClient(this.getMasterUrl());
-
-    const route = `/api/users/me/play/${this.getServerMasterKey()}`;
+    const settingsService = this.controller.lookupListener(SettingsService);
+    const client = new this.sp.HttpClient(settingsService.getMasterUrl());
 
+    const route = `/api/users/me/play/${settingsService.getServerMasterKey()}`;
     logTrace(this, `Creating play session ${route}`);
 
     client.post(route, {
@@ -259,8 +242,7 @@ export class AuthService extends ClientListener {
     }, (res) => {
       if (res.status != 200) {
         callback('', 'status code ' + res.status);
-      }
-      else {
+      } else {
         // TODO: handle JSON.parse failure?
         callback(JSON.parse(res.body).session, '');
       }
@@ -273,9 +255,10 @@ export class AuthService extends ClientListener {
       return;
     }
 
+    const settingsService = this.controller.lookupListener(SettingsService);
     const timersService = this.controller.lookupListener(TimersService);
 
-    new this.sp.HttpClient(this.getMasterUrl())
+    new this.sp.HttpClient(settingsService.getMasterUrl())
       .get("/api/users/login-discord/status?state=" + this.discordAuthState, undefined,
         // @ts-ignore
         (response) => {
@@ -334,7 +317,7 @@ export class AuthService extends ClientListener {
     this.authDialogOpen = true;
   };
 
-  private readAuthDataFromDisk(): RemoteAuthGameData | null {
+  public readAuthDataFromDisk(): RemoteAuthGameData | null {
     logTrace(this, `Reading`, this.pluginAuthDataName, `from disk`);
 
     try {
@@ -371,13 +354,6 @@ export class AuthService extends ClientListener {
     }
   };
 
-  private normalizeUrl(url: string) {
-    if (url.endsWith('/')) {
-      return url.slice(0, url.length - 1);
-    }
-    return url;
-  };
-
   private deniedWidgetSetter = () => {
     const widget = {
       type: "form",

skymp5-client/src/services/services/loadOrderVerificationService.ts

@@ -4,6 +4,7 @@ import { ClientListener, CombinedController, Sp } from "./clientListener";
 import { Mod, ServerManifest } from "../messages_http/serverManifest";
 import { logTrace } from "../../logging";
 import { AuthService } from "./authService";
+import { SettingsService } from "./settingsService";
 
 const STATE_KEY = 'loadOrderCheckState';
 
@@ -106,35 +107,33 @@ export class LoadOrderVerificationService extends ClientListener {
     }
   }
 
-  private getServerMods(retriesLeft: number): Promise<Mod[]> {
-    const authService = this.controller.lookupListener(AuthService);
+  private async getServerMods(retriesLeft: number): Promise<Mod[]> {
+    const settingsService = this.controller.lookupListener(SettingsService);
+    const masterApiClient = await settingsService.makeMasterApiClient();
 
-    const addr = authService.getMasterUrl();
-    const masterKey = authService.getServerMasterKey();
-    printConsole(addr);
+    const masterKey = settingsService.getServerMasterKey();
     printConsole(masterKey);
 
-    return new HttpClient(addr)
-      .get(`/api/servers/${masterKey}/manifest.json`)
-      .then((res) => {
+    for (let attempt = 0; attempt < 5; ++attempt) {
+      try {
+        printConsole(`Trying to get server mods, attempt ${attempt}`);
+        const res = await masterApiClient.get(`/api/servers/${masterKey}/manifest.json`);
         if (res.status != 200) {
-          throw new Error(`Status code ${res.status}, error ${res.error}`);
+          throw new Error(`status code ${res.status}, error ${res.error}`);
         }
         const manifest = JSON.parse(res.body) as ServerManifest;
         if (manifest.versionMajor !== 1) {
-          throw new Error(`Server manifest version is ${manifest.versionMajor}, we expect 1`);
+          printConsole(`server manifest version is ${manifest.versionMajor}, we expect 1`);
+          return [];
         }
         return manifest.mods;
-      })
-      .catch((err) => {
-        printConsole("Can't get server mods", err);
-        if (retriesLeft > 0) {
-          printConsole(`${retriesLeft} retries left...`);
-          return Utility.wait(0.1 + Math.random())
-            .then(() => this.getServerMods(retriesLeft - 1));
-        }
-        return [];
-      });
+      } catch (e) {
+        printConsole(`Request/parse error: ${e}`);
+        await Utility.wait(0.1 + Math.random());
+      }
+    }
+
+    return [];
   };
 
   private enumerateClientMods(getCount: (() => number), getAt: ((idx: number) => string)) {

skymp5-client/src/services/services/settingsService.ts

@@ -0,0 +1,76 @@
+import { HttpClient, HttpHeaders, HttpResponse, printConsole } from "skyrimPlatform";
+import { AuthService } from "./authService";
+import { ClientListener, CombinedController, Sp } from "./clientListener";
+
+interface IHttpClient {
+  get(path: string, options?: { headers?: HttpHeaders }): Promise<HttpResponse>;
+  post(path: string, options: { body: string, contentType: string, headers?: HttpHeaders }): Promise<HttpResponse>;
+}
+
+interface TargetPeer {
+  host: string;
+  port: number;
+}
+
+export class SettingsService extends ClientListener {
+  constructor(private sp: Sp, private controller: CombinedController) {
+    super();
+  }
+
+  public getServerMasterKey() {
+    let masterKey = this.sp.settings["skymp5-client"]["server-master-key"];
+    if (!masterKey) {
+      masterKey = this.sp.settings["skymp5-client"]["master-key"];
+    }
+    if (!masterKey) {
+      masterKey = this.sp.settings["skymp5-client"]["server-ip"] + ":" + this.sp.settings["skymp5-client"]["server-port"];
+    }
+    return masterKey;
+  }
+
+  // TODO: make async?
+  public getMasterUrl() {
+    return this.normalizeUrl((this.sp.settings["skymp5-client"]["master"] as string) || "https://gateway.skymp.net");
+  }
+
+  public async makeMasterApiClient(): Promise<IHttpClient> {
+    const addr = this.getMasterUrl();
+    return new HttpClient(addr);
+  }
+
+  public async getTargetPeer(): Promise<TargetPeer> {
+    const masterApiClient = await this.makeMasterApiClient();
+    const masterKey = this.getServerMasterKey();
+    try {
+      let headers: HttpHeaders = {};
+      let session = this.controller.lookupListener(AuthService).readAuthDataFromDisk()?.session;
+      if (session) {
+        headers['X-Session'] = session;
+      }
+
+      const res = await masterApiClient.get(`/api/servers/${masterKey}/serverinfo`, { headers });
+      if (res.status != 200) {
+        throw new Error(`status ${res.status}`);
+      }
+      const resJson = JSON.parse(res.body);
+      return {
+        host: resJson.host,
+        port: resJson.port,
+      };
+    } catch (e) {
+      printConsole(`Server info request failed, falling back; error: ${e}`);
+    }
+
+    return {
+      host: this.sp.settings['skymp5-client']['server-ip'] as string,
+      port: this.sp.settings['skymp5-client']['server-port'] as number,
+    };
+  }
+
+  private normalizeUrl(url: string) {
+    if (url.endsWith('/')) {
+      return url.slice(0, url.length - 1);
+    }
+    return url;
+  };
+}

skymp5-client/src/services/services/skympClient.ts

@@ -13,13 +13,11 @@ import { ConnectionMessage } from '../events/connectionMessage';
 import { CreateActorMessage } from '../messages/createActorMessage';
 import { AuthAttemptEvent } from '../events/authAttemptEvent';
 import { logTrace } from '../../logging';
+import { SettingsService } from './settingsService';
 
 printConsole('Hello Multiplayer!');
 printConsole('settings:', settings['skymp5-client']);
 
-const targetIp = settings['skymp5-client']['server-ip'] as string;
-const targetPort = settings['skymp5-client']['server-port'] as number;
-
 export class SkympClient extends ClientListener {
   constructor(private sp: Sp, private controller: CombinedController) {
     super();
@@ -90,11 +88,13 @@ export class SkympClient extends ClientListener {
     const isConnected = this.controller.lookupListener(networking.NetworkingService).isConnected();
 
     if (!isConnected) {
-      storage.targetIp = targetIp;
-      storage.targetPort = targetPort;
+      const { host, port } = await this.controller.lookupListener(SettingsService).getTargetPeer();
+
+      storage.targetIp = host;
+      storage.targetPort = port;
 
       logTrace(this, `Connecting to`, storage.targetIp + ':' + storage.targetPort);
-      this.controller.lookupListener(networking.NetworkingService).connect(storage.targetIp as string, targetPort);
+      this.controller.lookupListener(networking.NetworkingService).connect(host, port);
     } else {
       logTrace(this, 'Reconnect is not required');
     }