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

lgtm

Browse source
This commit is contained in:
Andras Schmelczer 2026-04-27 22:50:01 +01:00
parent cc44b66fcd
commit 1163da826e
45 changed files with 192 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

6
frontend/history-ui/src/lib/types/ClientCursors.ts
View file

@ -1,8 +1,4 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { DocumentWithCursors } from "./DocumentWithCursors";
export type ClientCursors = {
userName: string;
deviceId: string;
documentsWithCursors: Array<DocumentWithCursors>;
};
export type ClientCursors = { userName: string, deviceId: string, documentsWithCursors: Array<DocumentWithCursors>, };

6
frontend/history-ui/src/lib/types/CreateDocumentVersion.ts
View file

@ -1,7 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
export type CreateDocumentVersion = {
relative_path: string;
last_seen_vault_update_id: number;
content: Array<number>;
};
export type CreateDocumentVersion = { relative_path: string, last_seen_vault_update_id: number, content: Array<number>, };

4
frontend/history-ui/src/lib/types/CursorPositionFromClient.ts
View file

@ -1,6 +1,4 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { DocumentWithCursors } from "./DocumentWithCursors";
export type CursorPositionFromClient = {
documentsWithCursors: Array<DocumentWithCursors>;
};
export type CursorPositionFromClient = { documentsWithCursors: Array<DocumentWithCursors>, };

2
frontend/history-ui/src/lib/types/CursorPositionFromServer.ts
View file

@ -1,4 +1,4 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { ClientCursors } from "./ClientCursors";
export type CursorPositionFromServer = { clients: Array<ClientCursors> };
export type CursorPositionFromServer = { clients: Array<ClientCursors>, };

2
frontend/history-ui/src/lib/types/CursorSpan.ts
View file

@ -1,3 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
export type CursorSpan = { start: number; end: number };
export type CursorSpan = { start: number, end: number, };

4
frontend/history-ui/src/lib/types/DocumentUpdateResponse.ts
View file

@ -5,6 +5,4 @@ import type { DocumentVersionWithoutContent } from "./DocumentVersionWithoutCont
/**
* Response to a create/update document request.
*/
export type DocumentUpdateResponse =
| ({ type: "FastForwardUpdate" } & DocumentVersionWithoutContent)
| ({ type: "MergingUpdate" } & DocumentVersion);
export type DocumentUpdateResponse = { "type": "FastForwardUpdate" } & DocumentVersionWithoutContent | { "type": "MergingUpdate" } & DocumentVersion;

11
frontend/history-ui/src/lib/types/DocumentVersion.ts
View file

@ -1,12 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
export type DocumentVersion = {
vaultUpdateId: number;
documentId: string;
relativePath: string;
updatedDate: string;
contentBase64: string;
isDeleted: boolean;
userId: string;
deviceId: string;
};
export type DocumentVersion = { vaultUpdateId: number, documentId: string, relativePath: string, updatedDate: string, contentBase64: string, isDeleted: boolean, userId: string, deviceId: string, };

15
frontend/history-ui/src/lib/types/DocumentVersionWithoutContent.ts
View file

@ -1,12 +1,7 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
export type DocumentVersionWithoutContent = {
vaultUpdateId: number;
documentId: string;
relativePath: string;
updatedDate: string;
isDeleted: boolean;
userId: string;
deviceId: string;
contentSize: number;
};
export type DocumentVersionWithoutContent = { vaultUpdateId: number, documentId: string, relativePath: string, updatedDate: string, isDeleted: boolean, userId: string, deviceId: string, contentSize: number,
/**
* True iff this is the first version of the document
*/
isNewFile: boolean, };

7
frontend/history-ui/src/lib/types/DocumentWithCursors.ts
View file

@ -1,9 +1,4 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { CursorSpan } from "./CursorSpan";
export type DocumentWithCursors = {
vaultUpdateId: number | null;
documentId: string;
relativePath: string;
cursors: Array<CursorSpan>;
};
export type DocumentWithCursors = { vaultUpdateId: number | null, documentId: string, relativePath: string, cursors: Array<CursorSpan>, };

6
frontend/history-ui/src/lib/types/FetchLatestDocumentsResponse.ts
View file

@ -4,10 +4,8 @@ import type { DocumentVersionWithoutContent } from "./DocumentVersionWithoutCont
/**
* Response to a fetch latest documents request.
*/
export type FetchLatestDocumentsResponse = {
latestDocuments: Array<DocumentVersionWithoutContent>;
export type FetchLatestDocumentsResponse = { latestDocuments: Array<DocumentVersionWithoutContent>,
/**
* The update ID of the latest document in the response.
*/
lastUpdateId: bigint;
};
lastUpdateId: bigint, };

6
frontend/history-ui/src/lib/types/ListVaultsResponse.ts
View file

@ -4,8 +4,4 @@ import type { VaultInfo } from "./VaultInfo";
/**
* Response to listing vaults accessible to the authenticated user.
*/
export type ListVaultsResponse = {
vaults: Array<VaultInfo>;
hasMore: boolean;
userName: string;
};
export type ListVaultsResponse = { vaults: Array<VaultInfo>, hasMore: boolean, userName: string, };

9
frontend/history-ui/src/lib/types/PingResponse.ts
View file

@ -7,19 +7,18 @@ export type PingResponse = {
/**
* Semantic version of the server.
*/
serverVersion: string;
serverVersion: string,
/**
* Whether the client is authenticated based on the sent Authorization
* header.
*/
isAuthenticated: boolean;
isAuthenticated: boolean,
/**
* List of file extensions that are allowed to be merged.
*/
mergeableFileExtensions: Array<string>;
mergeableFileExtensions: Array<string>,
/**
* API version ensuring backwards & forwards compatibility between the client
* and server.
*/
supportedApiVersion: number;
};
supportedApiVersion: number, };

6
frontend/history-ui/src/lib/types/SerializedError.ts
View file

@ -1,7 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
export type SerializedError = {
errorType: string;
message: string;
causes: Array<string>;
};
export type SerializedError = { errorType: string, message: string, causes: Array<string>, };

6
frontend/history-ui/src/lib/types/UpdateTextDocumentVersion.ts
View file

@ -1,7 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
export type UpdateTextDocumentVersion = {
parentVersionId: number;
relativePath: string;
content: Array<number | string>;
};
export type UpdateTextDocumentVersion = { parentVersionId: number, relativePath: string | null, content: Array<number | string>, };

5
frontend/history-ui/src/lib/types/VaultHistoryResponse.ts
View file

@ -4,7 +4,4 @@ import type { DocumentVersionWithoutContent } from "./DocumentVersionWithoutCont
/**
* Response to a vault history request (paginated).
*/
export type VaultHistoryResponse = {
versions: Array<DocumentVersionWithoutContent>;
hasMore: boolean;
};
export type VaultHistoryResponse = { versions: Array<DocumentVersionWithoutContent>, hasMore: boolean, };

6
frontend/history-ui/src/lib/types/VaultInfo.ts
View file

@ -3,8 +3,4 @@
/**
* Summary of a single vault returned by the list-vaults endpoint.
*/
export type VaultInfo = {
name: string;
documentCount: number;
createdAt: string | null;
};
export type VaultInfo = { name: string, documentCount: number, createdAt: string | null, };

4
frontend/history-ui/src/lib/types/WebSocketClientMessage.ts
View file

@ -2,6 +2,4 @@
import type { CursorPositionFromClient } from "./CursorPositionFromClient";
import type { WebSocketHandshake } from "./WebSocketHandshake";
export type WebSocketClientMessage =
| ({ type: "handshake" } & WebSocketHandshake)
| ({ type: "cursorPositions" } & CursorPositionFromClient);
export type WebSocketClientMessage = { "type": "handshake" } & WebSocketHandshake | { "type": "cursorPositions" } & CursorPositionFromClient;

6
frontend/history-ui/src/lib/types/WebSocketHandshake.ts
View file

@ -1,7 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
export type WebSocketHandshake = {
token: string;
deviceId: string;
lastSeenVaultUpdateId: number | null;
};
export type WebSocketHandshake = { token: string, deviceId: string, lastSeenVaultUpdateId: number | null, };

4
frontend/history-ui/src/lib/types/WebSocketServerMessage.ts
View file

@ -2,6 +2,4 @@
import type { CursorPositionFromServer } from "./CursorPositionFromServer";
import type { WebSocketVaultUpdate } from "./WebSocketVaultUpdate";
export type WebSocketServerMessage =
| ({ type: "vaultUpdate" } & WebSocketVaultUpdate)
| ({ type: "cursorPositions" } & CursorPositionFromServer);
export type WebSocketServerMessage = { "type": "vaultUpdate" } & WebSocketVaultUpdate | { "type": "cursorPositions" } & CursorPositionFromServer;

2
frontend/history-ui/src/lib/types/WebSocketVaultUpdate.ts
View file

@ -1,4 +1,4 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { DocumentVersionWithoutContent } from "./DocumentVersionWithoutContent";
export type WebSocketVaultUpdate = { document: DocumentVersionWithoutContent };
export type WebSocketVaultUpdate = { document: DocumentVersionWithoutContent, };

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

@ -16,6 +16,20 @@ export enum MoveOnConflict {
NEW = "NEW"
}
/**
* Outcome of a `move`/`create`. `actualPath` is where the new file
* ended up (which may differ from the requested path under
* `MoveOnConflict.NEW` if the target was occupied). `displacedTo` is
* set only when an existing file at the requested path was bumped to
* a `conflict-…` path under `MoveOnConflict.EXISTING`; the caller
* uses it to repoint any tracking for the displaced doc before its
* own follow-up `setDocument` clobbers the old slot.
*/
export interface FileOpResult {
actualPath: RelativePath;
displacedTo?: RelativePath;
}
export class FileOperations {
private readonly fs: SafeFileSystemOperations;
@ -67,29 +81,27 @@ export class FileOperations {
*
* If a file with the same name already exists, it is moved before creating the new one.
* Parent directories are created if necessary.
*
* Returns the actual path the file was created at.
*/
public async create(
path: RelativePath,
newContent: Uint8Array,
moveOnConflict: MoveOnConflict
): Promise<RelativePath> {
const actualPath = await this.ensureClearPath(path, moveOnConflict);
): Promise<FileOpResult> {
const result = await this.ensureClearPath(path, moveOnConflict);
// ensureClearPath leaves actualPath empty: either the file never
// existed, or it was just renamed away. The upcoming write therefore
// looks like a fresh create to the watcher.
this.expectedFsEvents.expectCreate(actualPath);
this.expectedFsEvents.expectCreate(result.actualPath);
try {
await this.fs.write(
actualPath,
result.actualPath,
this.toNativeLineEndings(newContent)
);
} catch (e) {
this.expectedFsEvents.unexpectCreate(actualPath);
this.expectedFsEvents.unexpectCreate(result.actualPath);
throw e;
}
return actualPath;
return result;
}
/**
@ -215,37 +227,36 @@ export class FileOperations {
// Returns the actual path the file got moved to.
public async move(
oldPath: RelativePath,
newPath: RelativePath,
moveOnConflict: MoveOnConflict
): Promise<RelativePath> {
): Promise<FileOpResult> {
if (oldPath === newPath) {
return oldPath;
return { actualPath: oldPath };
}
const actualPath = await this.ensureClearPath(newPath, moveOnConflict);
this.expectedFsEvents.expectRename(oldPath, actualPath);
const cleared = await this.ensureClearPath(newPath, moveOnConflict);
this.expectedFsEvents.expectRename(oldPath, cleared.actualPath);
try {
await this.fs.rename(oldPath, actualPath);
await this.fs.rename(oldPath, cleared.actualPath);
} catch (e) {
this.expectedFsEvents.unexpectRename(oldPath, actualPath);
this.expectedFsEvents.unexpectRename(oldPath, cleared.actualPath);
throw e;
}
await this.deletingEmptyParentDirectoriesOfDeletedFile(oldPath);
return actualPath;
return cleared;
}
private async ensureClearPath(
path: RelativePath,
moveOnConflict: MoveOnConflict
): Promise<RelativePath> {
): Promise<FileOpResult> {
if (await this.fs.exists(path)) {
const conflictPath = FileOperations.buildConflictPath(path);
if (moveOnConflict === MoveOnConflict.NEW) {
return conflictPath;
return { actualPath: conflictPath };
}
this.logger.debug(
@ -266,7 +277,7 @@ export class FileOperations {
`No existing file at ${path}, creating parent directories if needed`
);
await this.createParentDirectories(path);
return path;
return { actualPath: path };
}
private async deletingEmptyParentDirectoriesOfDeletedFile(

18
frontend/sync-client/src/services/sync-service.ts
View file

@ -154,17 +154,17 @@ export class SyncService {
}: {
parentVersionId: VaultUpdateId;
documentId: DocumentId;
relativePath: RelativePath;
relativePath: RelativePath | undefined;
content: (number | string)[];
}): Promise<DocumentUpdateResponse> {
return this.retryForever(async () => {
this.logger.debug(
`Updating text document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath}, content [${content.join(", ")}]`
`Updating text document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath ?? "<unchanged>"}, content [${content.join(", ")}]`
);
const request: UpdateTextDocumentVersion = {
parentVersionId,
relativePath,
relativePath: relativePath ?? null,
content
};
@ -199,16 +199,18 @@ export class SyncService {
}: {
parentVersionId: VaultUpdateId;
documentId: DocumentId;
relativePath: RelativePath;
relativePath: RelativePath | undefined;
contentBytes: Uint8Array;
}): Promise<DocumentUpdateResponse> {
return this.retryForever(async () => {
this.logger.debug(
`Updating binary document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath}`
`Updating binary document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath ?? "<unchanged>"}`
);
const formData = new FormData();
formData.append("parent_version_id", parentVersionId.toString());
if (relativePath !== undefined) {
formData.append("relative_path", relativePath);
}
formData.append(
"content",
new Blob([new Uint8Array(contentBytes)])
@ -239,14 +241,12 @@ export class SyncService {
public async delete({
documentId,
relativePath
}: {
documentId: DocumentId;
relativePath: RelativePath;
}): Promise<DocumentVersionWithoutContent> {
return this.retryForever(async () => {
this.logger.debug(
`Delete document with id ${documentId} and relative path ${relativePath}`
`Delete document with id ${documentId}`
);
// The server identifies the document by its URL path; no body
@ -265,7 +265,7 @@ export class SyncService {
(await response.json()) as DocumentVersionWithoutContent; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
this.logger.debug(
`Deleted document ${relativePath} with id ${documentId}`
`Deleted document with id ${documentId}`
);
return result;

6
frontend/sync-client/src/services/types/ClientCursors.ts
View file

@ -1,8 +1,4 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { DocumentWithCursors } from "./DocumentWithCursors";
export interface ClientCursors {
userName: string;
deviceId: string;
documentsWithCursors: DocumentWithCursors[];
}
export interface ClientCursors { userName: string, deviceId: string, documentsWithCursors: DocumentWithCursors[], }

6
frontend/sync-client/src/services/types/CreateDocumentVersion.ts
View file

@ -1,7 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
export interface CreateDocumentVersion {
relative_path: string;
last_seen_vault_update_id: number;
content: number[];
}
export interface CreateDocumentVersion { relative_path: string, last_seen_vault_update_id: number, content: number[], }

4
frontend/sync-client/src/services/types/CursorPositionFromClient.ts
View file

@ -1,6 +1,4 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { DocumentWithCursors } from "./DocumentWithCursors";
export interface CursorPositionFromClient {
documentsWithCursors: DocumentWithCursors[];
}
export interface CursorPositionFromClient { documentsWithCursors: DocumentWithCursors[], }

4
frontend/sync-client/src/services/types/CursorPositionFromServer.ts
View file

@ -1,6 +1,4 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { ClientCursors } from "./ClientCursors";
export interface CursorPositionFromServer {
clients: ClientCursors[];
}
export interface CursorPositionFromServer { clients: ClientCursors[], }

5
frontend/sync-client/src/services/types/CursorSpan.ts
View file

@ -1,6 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
export interface CursorSpan {
start: number;
end: number;
}
export interface CursorSpan { start: number, end: number, }

4
frontend/sync-client/src/services/types/DocumentUpdateResponse.ts
View file

@ -5,6 +5,4 @@ import type { DocumentVersionWithoutContent } from "./DocumentVersionWithoutCont
/**
* Response to a create/update document request.
*/
export type DocumentUpdateResponse =
| ({ type: "FastForwardUpdate" } & DocumentVersionWithoutContent)
| ({ type: "MergingUpdate" } & DocumentVersion);
export type DocumentUpdateResponse = { "type": "FastForwardUpdate" } & DocumentVersionWithoutContent | { "type": "MergingUpdate" } & DocumentVersion;

11
frontend/sync-client/src/services/types/DocumentVersion.ts
View file

@ -1,12 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
export interface DocumentVersion {
vaultUpdateId: number;
documentId: string;
relativePath: string;
updatedDate: string;
contentBase64: string;
isDeleted: boolean;
userId: string;
deviceId: string;
}
export interface DocumentVersion { vaultUpdateId: number, documentId: string, relativePath: string, updatedDate: string, contentBase64: string, isDeleted: boolean, userId: string, deviceId: string, }

15
frontend/sync-client/src/services/types/DocumentVersionWithoutContent.ts
View file

@ -1,12 +1,7 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
export interface DocumentVersionWithoutContent {
vaultUpdateId: number;
documentId: string;
relativePath: string;
updatedDate: string;
isDeleted: boolean;
userId: string;
deviceId: string;
contentSize: number;
}
export interface DocumentVersionWithoutContent { vaultUpdateId: number, documentId: string, relativePath: string, updatedDate: string, isDeleted: boolean, userId: string, deviceId: string, contentSize: number,
/**
* True iff this is the first version of the document
*/
isNewFile: boolean, }

7
frontend/sync-client/src/services/types/DocumentWithCursors.ts
View file

@ -1,9 +1,4 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { CursorSpan } from "./CursorSpan";
export interface DocumentWithCursors {
vaultUpdateId: number | null;
documentId: string;
relativePath: string;
cursors: CursorSpan[];
}
export interface DocumentWithCursors { vaultUpdateId: number | null, documentId: string, relativePath: string, cursors: CursorSpan[], }

6
frontend/sync-client/src/services/types/FetchLatestDocumentsResponse.ts
View file

@ -4,10 +4,8 @@ import type { DocumentVersionWithoutContent } from "./DocumentVersionWithoutCont
/**
* Response to a fetch latest documents request.
*/
export interface FetchLatestDocumentsResponse {
latestDocuments: DocumentVersionWithoutContent[];
export interface FetchLatestDocumentsResponse { latestDocuments: DocumentVersionWithoutContent[],
/**
* The update ID of the latest document in the response.
*/
lastUpdateId: bigint;
}
lastUpdateId: bigint, }

6
frontend/sync-client/src/services/types/ListVaultsResponse.ts
View file

@ -4,8 +4,4 @@ import type { VaultInfo } from "./VaultInfo";
/**
* Response to listing vaults accessible to the authenticated user.
*/
export interface ListVaultsResponse {
vaults: VaultInfo[];
hasMore: boolean;
userName: string;
}
export interface ListVaultsResponse { vaults: VaultInfo[], hasMore: boolean, userName: string, }

9
frontend/sync-client/src/services/types/PingResponse.ts
View file

@ -7,19 +7,18 @@ export interface PingResponse {
/**
* Semantic version of the server.
*/
serverVersion: string;
serverVersion: string,
/**
* Whether the client is authenticated based on the sent Authorization
* header.
*/
isAuthenticated: boolean;
isAuthenticated: boolean,
/**
* List of file extensions that are allowed to be merged.
*/
mergeableFileExtensions: string[];
mergeableFileExtensions: string[],
/**
* API version ensuring backwards & forwards compatibility between the client
* and server.
*/
supportedApiVersion: number;
}
supportedApiVersion: number, }

6
frontend/sync-client/src/services/types/SerializedError.ts
View file

@ -1,7 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
export interface SerializedError {
errorType: string;
message: string;
causes: string[];
}
export interface SerializedError { errorType: string, message: string, causes: string[], }

6
frontend/sync-client/src/services/types/UpdateTextDocumentVersion.ts
View file

@ -1,7 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
export interface UpdateTextDocumentVersion {
parentVersionId: number;
relativePath: string;
content: (number | string)[];
}
export interface UpdateTextDocumentVersion { parentVersionId: number, relativePath: string | null, content: (number | string)[], }

5
frontend/sync-client/src/services/types/VaultHistoryResponse.ts
View file

@ -4,7 +4,4 @@ import type { DocumentVersionWithoutContent } from "./DocumentVersionWithoutCont
/**
* Response to a vault history request (paginated).
*/
export interface VaultHistoryResponse {
versions: DocumentVersionWithoutContent[];
hasMore: boolean;
}
export interface VaultHistoryResponse { versions: DocumentVersionWithoutContent[], hasMore: boolean, }

6
frontend/sync-client/src/services/types/VaultInfo.ts
View file

@ -3,8 +3,4 @@
/**
* Summary of a single vault returned by the list-vaults endpoint.
*/
export interface VaultInfo {
name: string;
documentCount: number;
createdAt: string | null;
}
export interface VaultInfo { name: string, documentCount: number, createdAt: string | null, }

4
frontend/sync-client/src/services/types/WebSocketClientMessage.ts
View file

@ -2,6 +2,4 @@
import type { CursorPositionFromClient } from "./CursorPositionFromClient";
import type { WebSocketHandshake } from "./WebSocketHandshake";
export type WebSocketClientMessage =
| ({ type: "handshake" } & WebSocketHandshake)
| ({ type: "cursorPositions" } & CursorPositionFromClient);
export type WebSocketClientMessage = { "type": "handshake" } & WebSocketHandshake | { "type": "cursorPositions" } & CursorPositionFromClient;

6
frontend/sync-client/src/services/types/WebSocketHandshake.ts
View file

@ -1,7 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
export interface WebSocketHandshake {
token: string;
deviceId: string;
lastSeenVaultUpdateId: number | null;
}
export interface WebSocketHandshake { token: string, deviceId: string, lastSeenVaultUpdateId: number | null, }

4
frontend/sync-client/src/services/types/WebSocketServerMessage.ts
View file

@ -2,6 +2,4 @@
import type { CursorPositionFromServer } from "./CursorPositionFromServer";
import type { WebSocketVaultUpdate } from "./WebSocketVaultUpdate";
export type WebSocketServerMessage =
| ({ type: "vaultUpdate" } & WebSocketVaultUpdate)
| ({ type: "cursorPositions" } & CursorPositionFromServer);
export type WebSocketServerMessage = { "type": "vaultUpdate" } & WebSocketVaultUpdate | { "type": "cursorPositions" } & CursorPositionFromServer;

4
frontend/sync-client/src/services/types/WebSocketVaultUpdate.ts
View file

@ -1,6 +1,4 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { DocumentVersionWithoutContent } from "./DocumentVersionWithoutContent";
export interface WebSocketVaultUpdate {
document: DocumentVersionWithoutContent;
}
export interface WebSocketVaultUpdate { document: DocumentVersionWithoutContent, }

1
frontend/sync-client/src/sync-operations/sync-event-queue.test.ts
View file

@ -30,6 +30,7 @@ function fakeRemoteVersion(
userId: "user",
deviceId: "device",
contentSize: 100,
isNewFile: true,
...overrides
};
}

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

@ -446,19 +446,8 @@ export class Syncer {
): Promise<void> {
const documentId = await event.documentId;
const doc = this.queue.getDocumentByDocumentId(documentId);
if (doc === undefined) {
// Already deleted (e.g. a remote delete drained ahead of
// this redundant local one). Nothing to do.
this.logger.debug(
`Skipping local-delete for ${documentId} — doc no longer tracked`
);
return;
}
const response = await this.syncService.delete({
documentId,
relativePath: doc.path
});
// Don't remove the doc from the queue or advance lastSeenUpdateId
@ -471,7 +460,7 @@ export class Syncer {
status: SyncStatus.SUCCESS,
details: {
type: SyncType.DELETE,
relativePath: doc.path
relativePath: event.path
},
message: "Successfully deleted file on the server",
author: response.userId,
@ -499,8 +488,21 @@ export class Syncer {
const contentBytes = await this.operations.read(diskPath);
const contentHash = await hash(contentBytes);
// For a user-driven rename the user's intent is `event.originalPath`
// — that's the rename target. For a content-only edit the user is
// agnostic to the path; sending one would be wrong if a remote
// rename processed first, because the server would interpret the
// user's (now-stale) path as a rename back. So content-only PUTs
// omit the path and the server keeps the doc at its current
// server-known location.
const renameTarget = event.isUserRename
? event.originalPath
: undefined;
const hashChanged = contentHash !== record.remoteHash;
const pathChanged = record.remoteRelativePath !== event.originalPath;
const pathChanged =
renameTarget !== undefined &&
record.remoteRelativePath !== renameTarget;
if (!hashChanged && !pathChanged) {
this.logger.debug(
@ -511,12 +513,16 @@ export class Syncer {
const response = await this.sendUpdate({
record,
relativePath: event.originalPath,
relativePath: renameTarget,
contentBytes
});
if (response.isDeleted) {
await this.processRemoteDelete(diskPath, { ...response, contentSize: 0 });
await this.processRemoteDelete(diskPath, {
...response,
contentSize: 0,
isNewFile: false
});
return;
}
@ -716,6 +722,14 @@ export class Syncer {
);
}
if (!remoteVersion.isNewFile) {
this.queue.lastSeenUpdateId = remoteVersion.vaultUpdateId;
this.logger.debug(
`Ignoring stale RemoteChange for untracked, non-new document ${remoteVersion.documentId}`
);
return;
}
return this.processRemoteCreateForNewDocument(remoteVersion);
}
@ -889,13 +903,15 @@ export class Syncer {
contentBytes
}: {
record: DocumentRecord;
relativePath: RelativePath;
// `undefined` for content-only edits; the server keeps the doc's
// current path. A string is sent only on a user-driven rename.
relativePath: RelativePath | undefined;
contentBytes: Uint8Array;
}): Promise<DocumentUpdateResponse> {
const isText =
!isBinary(contentBytes) &&
isFileTypeMergable(
relativePath,
relativePath ?? record.remoteRelativePath,
(await this.serverConfig.getConfig()).mergeableFileExtensions
);

3
frontend/sync-client/src/sync-operations/types.ts
View file

@ -57,11 +57,12 @@ export type SyncEvent =
documentId: DocumentId | Promise<DocumentId>; // if it's a promise, the promise is fulfilled once the document's create event is processed
path: RelativePath; // current path on disk
originalPath: RelativePath; // original path on disk when the event was queued
// no need to store the old path in case of a rename; the server will figure it out from the parent's path
isUserRename: boolean; // true iff this event was queued because the user renamed the file
}
| {
type: SyncEventType.LocalDelete;
documentId: DocumentId | Promise<DocumentId>; // if it's a promise, the promise is fulfilled once the document's create event is processed
path: RelativePath; // only used for showing on the UI
}
| {
type: SyncEventType.RemoteChange;