From 8672f28fb315f6c3c720d3cc52d6d3b2d8696d8e Mon Sep 17 00:00:00 2001 From: Roman Nikonov Date: Sat, 8 Feb 2025 11:19:54 +0100 Subject: [PATCH 1/2] feat(skymp5-client): revert manual host resolution --- .../src/services/services/skympClient.ts | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/skymp5-client/src/services/services/skympClient.ts b/skymp5-client/src/services/services/skympClient.ts index 2f023e0714..d1bc6b54a0 100644 --- a/skymp5-client/src/services/services/skympClient.ts +++ b/skymp5-client/src/services/services/skympClient.ts @@ -13,15 +13,11 @@ import { ConnectionMessage } from '../events/connectionMessage'; import { CreateActorMessage } from '../messages/createActorMessage'; import { AuthAttemptEvent } from '../events/authAttemptEvent'; import { logTrace } from '../../logging'; -import { resolve4 } from 'dns'; -import { promisify } from 'util'; - -const resolve4Promise = promisify(resolve4); printConsole('Hello Multiplayer!'); printConsole('settings:', settings['skymp5-client']); -const targetHost = settings['skymp5-client']['server-host'] as string; +const targetIp = settings['skymp5-client']['server-host'] as string; const targetPort = settings['skymp5-client']['server-port'] as number; export class SkympClient extends ClientListener { @@ -90,19 +86,11 @@ export class SkympClient extends ClientListener { this.sp.printConsole('SkympClient ctor'); } - private async resolveHost(host: string) { - if (!host.match(/[a-zA-Z]/g)) { - return host; - } - const addrs = await resolve4Promise(host); - return addrs[Math.floor(Math.random() * addrs.length)]; - } - private async establishConnectionConditional() { const isConnected = this.controller.lookupListener(networking.NetworkingService).isConnected(); if (!isConnected) { - storage.targetIp = await this.resolveHost(targetHost); + storage.targetIp = targetIp; storage.targetPort = targetPort; logTrace(this, `Connecting to`, storage.targetIp + ':' + storage.targetPort); From 81b6db1c12e05e1adeecb15c86db263e91073c01 Mon Sep 17 00:00:00 2001 From: Roman Nikonov Date: Sat, 8 Feb 2025 12:41:10 +0100 Subject: [PATCH 2/2] upd --- skymp5-client/src/services/services/skympClient.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skymp5-client/src/services/services/skympClient.ts b/skymp5-client/src/services/services/skympClient.ts index d1bc6b54a0..114e522d81 100644 --- a/skymp5-client/src/services/services/skympClient.ts +++ b/skymp5-client/src/services/services/skympClient.ts @@ -17,7 +17,7 @@ import { logTrace } from '../../logging'; printConsole('Hello Multiplayer!'); printConsole('settings:', settings['skymp5-client']); -const targetIp = settings['skymp5-client']['server-host'] as string; +const targetIp = settings['skymp5-client']['server-ip'] as string; const targetPort = settings['skymp5-client']['server-port'] as number; export class SkympClient extends ClientListener {