nikdoof/pocket-id
1
0
Fork 0
mirror of https://github.com/nikdoof/pocket-id.git synced 2025-12-13 23:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't return error page if version info fetching failed

Browse Source
This commit is contained in:
Elias Schneider
2025-02-04 18:19:06 +01:00
parent 19ef4833e9
commit d06257ec9b
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
frontend/src/lib/services/app-config-service.ts
View File

@@ -1,6 +1,6 @@
import { version as currentVersion } from '$app/environment'; import { version as currentVersion } from '$app/environment';
import type { AllAppConfig, AppConfigRawResponse } from '$lib/types/application-configuration'; import type { AllAppConfig, AppConfigRawResponse } from '$lib/types/application-configuration';
import axios from 'axios'; import axios, { AxiosError } from 'axios';
import APIService from './api-service'; import APIService from './api-service';
export default class AppConfigService extends APIService { export default class AppConfigService extends APIService {
@@ -56,12 +56,23 @@ export default class AppConfigService extends APIService {
} }
async getVersionInformation() { async getVersionInformation() {
const response = ( const response = await axios
await axios.get('https://api.github.com/repos/stonith404/pocket-id/releases/latest') .get('https://api.github.com/repos/stonith404/pocket-id/releases/latest')
).data; .then((res) => res.data)
.catch((e) => {
console.error(
'Failed to fetch version information',
e instanceof AxiosError && e.response ? e.response.data.message : e
);
return null;
});
const newestVersion = response.tag_name.replace('v', ''); let newestVersion: string | null = null;
const isUpToDate = newestVersion === currentVersion; let isUpToDate: boolean | null = null;
if (response) {
newestVersion = response.tag_name.replace('v', '');
isUpToDate = newestVersion === currentVersion;
}
return { return {
isUpToDate, isUpToDate,

6
frontend/src/lib/types/application-configuration.ts
View File

@@ -41,7 +41,7 @@ export type AppConfigRawResponse = {
}[]; }[];
export type AppVersionInformation = { export type AppVersionInformation = {
isUpToDate: boolean; isUpToDate: boolean | null;
newestVersion: string; newestVersion: string | null;
currentVersion: string; currentVersion: string
}; };

3
frontend/src/routes/settings/+layout.server.ts
View File

@@ -15,6 +15,9 @@ export const load: LayoutServerLoad = async () => {
if (!versionInformation || cacheExpired) { if (!versionInformation || cacheExpired) {
versionInformation = await appConfigService.getVersionInformation(); versionInformation = await appConfigService.getVersionInformation();
if (versionInformation.newestVersion == null) {
console.error('Failed to fetch version information. Trying again in 3 hours.');
}
versionInformationLastUpdated = Date.now(); versionInformationLastUpdated = Date.now();
} }

2
frontend/src/routes/settings/+layout.svelte
View File

@@ -50,7 +50,7 @@
{label} {label}
</a> </a>
{/each} {/each}
{#if $userStore?.isAdmin && !versionInformation.isUpToDate} {#if $userStore?.isAdmin && versionInformation.isUpToDate === false}
<a <a
href="https://github.com/stonith404/pocket-id/releases/latest" href="https://github.com/stonith404/pocket-id/releases/latest"
target="_blank" target="_blank"