andras/vault-link
1
0
Fork 0
Code Issues Pull requests 18 Projects Releases 55 Packages Wiki Activity Actions 1

Try fixing E2E tests more

Browse source
This commit is contained in:
Andras Schmelczer 2025-12-11 22:08:48 +00:00
parent 387e7afd58
commit f6dccc4492
6 changed files with 33 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/sync-client/src/file-operations/file-operations.test.ts
View file

@ -12,7 +12,7 @@ import type { TextWithCursors } from "reconcile-text";
import type { ServerConfig, ServerConfigData } from "../services/server-config";
class MockServerConfig implements Pick<ServerConfig, "getConfig"> {
public getConfig(): ServerConfigData {
public async getConfig(): Promise<ServerConfigData> {
return {
mergeableFileExtensions: ["md", "txt"],
supportedApiVersion: 1,

2
frontend/sync-client/src/file-operations/file-operations.ts
View file

@ -97,7 +97,7 @@ export class FileOperations {
if (
!isFileTypeMergable(
path,
this.serverConfig.getConfig().mergeableFileExtensions
(await this.serverConfig.getConfig()).mergeableFileExtensions
) ||
isBinary(expectedContent) ||
isBinary(newContent)

36
frontend/sync-client/src/services/server-config.ts
View file

@ -16,41 +16,40 @@ export class ServerConfig {
public constructor(private readonly syncService: SyncService) {}
public async initialize(): Promise<void> {
this.response = this.syncService.ping();
this.config = await this.response;
if (this.config.supportedApiVersion !== SUPPORTED_API_VERSION) {
private static validateConfig(config: ServerConfigData): void {
if (config.supportedApiVersion !== SUPPORTED_API_VERSION) {
const shouldUpgradeClient =
this.config.supportedApiVersion > SUPPORTED_API_VERSION;
config.supportedApiVersion > SUPPORTED_API_VERSION;
throw new ServerVersionMismatchError(
`Unsupported API version: ${this.config.supportedApiVersion}. Consider upgrading the ${
`Unsupported API version: ${config.supportedApiVersion}. Consider upgrading the ${
shouldUpgradeClient ? "client" : "sync-server"
} to ensure compatibility.`
} to ensure compatibility`
);
}
if (!this.config.isAuthenticated) {
if (!config.isAuthenticated) {
throw new AuthenticationError(
"Failed to authenticate with the sync-server."
"Failed to authenticate with the sync-server"
);
}
}
// warm the cache
public async initialize(): Promise<void> {
await this.getConfig();
}
public async checkConnection(forceUpdate = false): Promise<{
isSuccessful: boolean;
message: string;
}> {
try {
let { response } = this;
if (!response && !forceUpdate) {
throw new Error("ServerConfig not initialized");
} else if (forceUpdate) {
if (!response || forceUpdate) {
response = this.response = this.syncService.ping();
}
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const result: PingResponse = (await response)!; // it must be defined, otherwise we would have thrown above
const result: PingResponse = await response; // it must be defined, otherwise we would have thrown above
this.config = result;
if (result.isAuthenticated) {
@ -72,11 +71,14 @@ export class ServerConfig {
}
}
public getConfig(): ServerConfigData {
public async getConfig(): Promise<ServerConfigData> {
if (!this.config) {
throw new Error("ServerConfig not initialized");
this.response ??= this.syncService.ping();
this.config = await this.response;
}
ServerConfig.validateConfig(this.config);
return this.config;
}

17
frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
View file

@ -108,7 +108,7 @@ export class UnrestrictedSyncer {
);
this.database.addSeenUpdateId(response.vaultUpdateId);
this.updateCache(
await this.updateCache(
response.vaultUpdateId,
contentBytes,
response.relativePath
@ -206,7 +206,8 @@ export class UnrestrictedSyncer {
!isBinary(contentBytes) &&
isFileTypeMergable(
document.relativePath,
this.serverConfig.getConfig().mergeableFileExtensions
(await this.serverConfig.getConfig())
.mergeableFileExtensions
);
const cachedVersion = this.contentCache.get(
document.metadata.parentVersionId
@ -300,7 +301,7 @@ export class UnrestrictedSyncer {
contentBytes,
responseBytes
);
this.updateCache(
await this.updateCache(
response.vaultUpdateId,
responseBytes,
actualPath
@ -322,7 +323,7 @@ export class UnrestrictedSyncer {
},
document
);
this.updateCache(
await this.updateCache(
response.vaultUpdateId,
contentBytes,
actualPath
@ -451,7 +452,7 @@ export class UnrestrictedSyncer {
remoteVersion.relativePath,
contentBytes
);
this.updateCache(
await this.updateCache(
remoteVersion.vaultUpdateId,
contentBytes,
remoteVersion.relativePath
@ -547,15 +548,15 @@ export class UnrestrictedSyncer {
}
}
private updateCache(
private async updateCache(
updateId: number,
contentBytes: Uint8Array,
filePath: RelativePath
): void {
): Promise<void> {
if (
isFileTypeMergable(
filePath,
this.serverConfig.getConfig().mergeableFileExtensions
(await this.serverConfig.getConfig()).mergeableFileExtensions
) &&
!isBinary(contentBytes)
) {