Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Add explicit network timeout error code to browser extension
Leendert de Borst8784d7ce12e8
diff --git a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.tsindex eb243a99a..91822659f 100644--- a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts+++ b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts@@ -18,6 +18,7 @@ import { ApiRequestError } from '@/utils/types/errors/ApiRequestError';import { AppErrorCode, formatErrorWithCode } from '@/utils/types/errors/AppErrorCodes';import { NetworkError } from '@/utils/types/errors/NetworkError';import { PayloadTooLargeError } from '@/utils/types/errors/PayloadTooLargeError';+import { RequestTimeoutError } from '@/utils/types/errors/RequestTimeoutError';import { VaultVersionIncompatibleError } from '@/utils/types/errors/VaultVersionIncompatibleError';import { BoolResponse as messageBoolResponse } from '@/utils/types/messaging/BoolResponse';import type { DuplicateCheckResponse } from '@/utils/types/messaging/DuplicateCheckResponse';@@ -674,6 +675,13 @@ export async function handleUploadVault(} catch (error) {console.error('Failed to upload vault:', error);+ /*+ * E-805: Vault transfer timed out.+ */+ if (error instanceof RequestTimeoutError) {+ return { success: false, error: formatErrorWithCode(await t('common.errors.vaultSyncTimeout'), AppErrorCode.UPLOAD_TIMEOUT) };+ }+/** Let network and auth errors propagate.*/@@ -1455,6 +1463,11 @@ async function handleFullVaultSyncInternal(): Promise<FullVaultSyncResult> {return { success: false, hasNewVault: false, wasOffline: false, upgradeRequired: false, requiresLogout: true, errorKey: 'sessionExpired' };}+ // E-805: Vault transfer timed out - show a targeted error instead of entering offline mode+ if (err instanceof RequestTimeoutError) {+ return { success: false, hasNewVault: false, wasOffline: false, upgradeRequired: false, requiresLogout: false, error: formatErrorWithCode(await t('common.errors.vaultSyncTimeout'), AppErrorCode.UPLOAD_TIMEOUT) };+ }+// Network error - enter offline mode if we have a local vaultif (err instanceof NetworkError) {const encryptedVault = await storage.getItem('local:encryptedVault');diff --git a/apps/browser-extension/src/i18n/locales/en.json b/apps/browser-extension/src/i18n/locales/en.jsonindex 8efb2b3b6..c7df2de4e 100644--- a/apps/browser-extension/src/i18n/locales/en.json+++ b/apps/browser-extension/src/i18n/locales/en.json@@ -111,6 +111,7 @@"syncConflictMaxRetries": "Could not sync vault after multiple attempts. Please try again later.","mergeFailed": "Failed to merge vault changes. Please try again.","vaultTooLarge": "The vault is too large for the server to accept. Try to remove some items or attachments to reduce the size and try again.",+ "vaultSyncTimeout": "Vault sync timed out. This can happen when the vault is large or the internet connection is slow. Please try again.","invalidCode": "Please enter a valid 6-digit authentication code.","serverError": "Could not reach AliasVault server. Please try again later or contact support if the problem persists.","wrongPassword": "Incorrect password. Please try again.",diff --git a/apps/browser-extension/src/utils/WebApiService.ts b/apps/browser-extension/src/utils/WebApiService.tsindex 6856f5493..db242a664 100644--- a/apps/browser-extension/src/utils/WebApiService.ts+++ b/apps/browser-extension/src/utils/WebApiService.ts@@ -7,6 +7,7 @@ import { ApiAuthError } from './types/errors/ApiAuthError';import { ApiRequestError } from './types/errors/ApiRequestError';import { NetworkError } from './types/errors/NetworkError';import { PayloadTooLargeError } from './types/errors/PayloadTooLargeError';+import { RequestTimeoutError } from './types/errors/RequestTimeoutError';import { storage } from '#imports';@@ -144,7 +145,8 @@ export class WebApiService {/*** Fetch data from the API without authentication headers and without access token refresh retry.- * Throws NetworkError for network-related failures (offline, timeout, DNS, etc.)+ * Throws RequestTimeoutError when the request exceeds its timeout, and NetworkError for other+ * network-related failures (offline, DNS, etc.)*/public async rawFetch(endpoint: string,@@ -168,6 +170,13 @@ export class WebApiService {return response;} catch (error) {console.error('API request failed:', error);+ /*+ * The timeout signal aborts with a DOMException; no caller passes its own abort signal,+ * so any abort here means the request exceeded its timeout.+ */+ if (error instanceof DOMException && (error.name === 'TimeoutError' || error.name === 'AbortError')) {+ throw new RequestTimeoutError(`Request timed out: ${endpoint}`, error);+ }// Convert fetch errors to NetworkError for proper error handlingthrow new NetworkError(error instanceof Error ? error.message : 'Network request failed',diff --git a/apps/browser-extension/src/utils/types/errors/AppErrorCodes.ts b/apps/browser-extension/src/utils/types/errors/AppErrorCodes.tsindex 807366ed7..d90813b5b 100644--- a/apps/browser-extension/src/utils/types/errors/AppErrorCodes.ts+++ b/apps/browser-extension/src/utils/types/errors/AppErrorCodes.ts@@ -67,6 +67,7 @@ export enum AppErrorCode {UPLOAD_OUTDATED = 'E-802', // Server has newer versionUPLOAD_ENCRYPT_FAILED = 'E-803',UPLOAD_TOO_LARGE = 'E-804', // Server rejected upload with HTTP 413 (vault exceeds MAX_UPLOAD_SIZE_MB)+ UPLOAD_TIMEOUT = 'E-805', // Vault transfer exceeded the request timeout (large vault and/or slow connection)// Migration/version errors (E-9xx)MIGRATION_CHECK_FAILED = 'E-901',@@ -161,6 +162,7 @@ export function getErrorTranslationKey(code: AppErrorCode): string {[AppErrorCode.UPLOAD_OUTDATED]: 'common.errors.unknownErrorTryAgain',[AppErrorCode.UPLOAD_ENCRYPT_FAILED]: 'common.errors.unknownErrorTryAgain',[AppErrorCode.UPLOAD_TOO_LARGE]: 'common.errors.vaultTooLarge',+ [AppErrorCode.UPLOAD_TIMEOUT]: 'common.errors.vaultSyncTimeout',// Migration/version errors (E-9xx)[AppErrorCode.MIGRATION_CHECK_FAILED]: 'common.errors.unknownErrorTryAgain',diff --git a/apps/browser-extension/src/utils/types/errors/RequestTimeoutError.ts b/apps/browser-extension/src/utils/types/errors/RequestTimeoutError.tsnew file mode 100644index 000000000..a6a54b8be--- /dev/null+++ b/apps/browser-extension/src/utils/types/errors/RequestTimeoutError.ts@@ -0,0 +1,20 @@+import { NetworkError } from './NetworkError';++/**+ * Thrown when an API request is aborted because it exceeded its timeout+ * (see WebApiService.buildTimeoutSignal). Extends NetworkError so generic+ * offline handling still applies, while letting the vault sync flow surface+ * a specific timeout message instead of silently entering offline mode.+ */+export class RequestTimeoutError extends NetworkError {+ /**+ * Creates a new instance of RequestTimeoutError.+ * @param message - The error message.+ * @param cause - The original abort/timeout error.+ */+ public constructor(message: string = 'Request timed out', cause?: Error) {+ super(message, cause);+ this.name = 'RequestTimeoutError';+ Object.setPrototypeOf(this, RequestTimeoutError.prototype);+ }+}