use new server-discovery everywhere

Author: debdutdeb

packages/core/src/index.ts

@@ -84,3 +84,5 @@ export * from './errors';
 export * from './url';
 
 export { makeUnsignedRequest } from './utils/makeRequest';
+
+export * from './server-discovery/discovery';

packages/core/src/procedures/getPublicKeyFromServer.spec.ts

@@ -1,4 +1,4 @@
-import { afterEach, beforeEach, describe, expect, it } from 'bun:test';
+import { afterEach, beforeEach, describe, expect, it, mock } from 'bun:test';
 import nacl from 'tweetnacl';
 import { EncryptionValidAlgorithm } from '../types';
 import { generateKeyPairs } from '../utils/keys';
@@ -68,6 +68,10 @@ describe('getPublicKeyFromRemoteServer', () => {
 		};
 		mockFetch.preconnect = async () => undefined;
 		globalThis.fetch = mockFetch;
+
+		await mock.module('../server-discovery/discovery', () => ({
+			resolveHostname: () => Promise.resolve('127.0.0.1:443'),
+		}));
 	});
 
 	afterEach(() => {

packages/core/src/server-discovery/_multi-error.d.ts

@@ -0,0 +1,8 @@
+export declare class MultiError extends Error {
+    private _finalMessage;
+    append(message: string, error: Error): void;
+    concat(other: MultiError): MultiError;
+    get message(): string;
+    static isMultiError(error: unknown): error is MultiError;
+}
+//# sourceMappingURL=_multi-error.d.ts.map

packages/federation-sdk/src/server-discovery/_multi-error.ts renamed to packages/core/src/server-discovery/_multi-error.ts

@@ -0,0 +1,8 @@
+import { Resolver } from 'node:dns/promises';
+declare class _Resolver extends Resolver {
+    constructor();
+    resolve4And6(hostname: string): Promise<string[]>;
+}
+export declare const resolver: _Resolver;
+export {};
+//# sourceMappingURL=_resolver.d.ts.map

packages/core/src/server-discovery/_resolver.d.ts

@@ -0,0 +1,8 @@
+export declare class _URL extends URL {
+    private __url;
+    constructor(url: string);
+    isIP(): boolean;
+    get ipv6(): string;
+    get port(): string;
+}
+//# sourceMappingURL=_url.d.ts.map

packages/federation-sdk/src/server-discovery/_resolver.ts renamed to packages/core/src/server-discovery/_resolver.ts

@@ -0,0 +1,13 @@
+type PortString = string;
+type IP4or6String = string | `[${string}]`;
+type AddressString = string;
+type AddressWithPortString = `${AddressString}:${PortString | number}`;
+type IP4or6WithPortString = `${IP4or6String}:${PortString | number}`;
+type IP4or6WithPortAndProtocolString = `${'http' | 'https'}://${IP4or6WithPortString}`;
+type HostHeaders = {
+    Host: AddressString | AddressWithPortString | IP4or6WithPortString;
+};
+export declare function resolveHostname(hostname: string, resolveCname: boolean): Promise<IP4or6String>;
+export declare function getHomeserverFinalAddress(addr: AddressString): Promise<[IP4or6WithPortAndProtocolString, HostHeaders]>;
+export {};
+//# sourceMappingURL=discovery.d.ts.map

packages/core/src/server-discovery/_url.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=discovery.spec.d.ts.map