imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Try to find out the Matrix homeserver version and include in rageshakes (#11212)

Browse source
This commit is contained in:
Michael Telatynski 2023-07-19 09:25:38 +01:00 • committed by GitHub
parent 689089d9e6
commit 42d8e4f1a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/components/views/dialogs/devtools/ServerInfo.tsx
View file

@ -15,6 +15,7 @@ limitations under the License.
*/
import React, { useContext } from "react";
import { MatrixClient } from "matrix-js-sdk/src/matrix";
import BaseTool, { IDevtoolsProps } from "./BaseTool";
import { _t } from "../../../../languageHandler";
@ -33,28 +34,32 @@ interface IServerWellKnown {
};
}
export async function getServerVersionFromFederationApi(client: MatrixClient): Promise<IServerWellKnown> {
let baseUrl = client.getHomeserverUrl();
try {
const hsName = MatrixClientPeg.getHomeserverName();
// We don't use the js-sdk Autodiscovery module here as it only support client well-known, not server ones.
const response = await fetch(`https://${hsName}/.well-known/matrix/server`);
const json = await response.json();
if (json["m.server"]) {
baseUrl = `https://${json["m.server"]}`;
}
} catch (e) {
console.warn(e);
}
const response = await fetch(`${baseUrl}/_matrix/federation/v1/version`);
return response.json();
}
const ServerInfo: React.FC<IDevtoolsProps> = ({ onBack }) => {
const cli = useContext(MatrixClientContext);
const capabilities = useAsyncMemo(() => cli.getCapabilities(true).catch(() => FAILED_TO_LOAD), [cli]);
const clientVersions = useAsyncMemo(() => cli.getVersions().catch(() => FAILED_TO_LOAD), [cli]);
const serverVersions = useAsyncMemo(async (): Promise<IServerWellKnown | symbol> => {
let baseUrl = cli.getHomeserverUrl();
try {
const hsName = MatrixClientPeg.getHomeserverName();
// We don't use the js-sdk Autodiscovery module here as it only support client well-known, not server ones.
const response = await fetch(`https://${hsName}/.well-known/matrix/server`);
const json = await response.json();
if (json["m.server"]) {
baseUrl = `https://${json["m.server"]}`;
}
} catch (e) {
console.warn(e);
}
try {
const response = await fetch(`${baseUrl}/_matrix/federation/v1/version`);
return response.json();
return await getServerVersionFromFederationApi(cli);
} catch (e) {
console.warn(e);
}