Use new API

plugin/src/database/database.ts

@@ -3,7 +3,7 @@ import { DEFAULT_SETTINGS, SyncSettings } from "./sync-settings";
 import {
 	RelativePath,
 	DocumentMetadata,
-	DocumentVersionId,
+	VaultUpdateId,
 } from "./document-metadata";
 
 interface StoredDatabase {
@@ -91,7 +91,7 @@ export class Database {
 		hash,
 	}: {
 		relativePath: RelativePath;
-		parentVersionId: DocumentVersionId;
+		parentVersionId: VaultUpdateId;
 		hash: string;
 	}): Promise<void> {
 		this._documents.set(relativePath, {
@@ -109,7 +109,7 @@ export class Database {
 	}: {
 		oldRelativePath: RelativePath;
 		relativePath: RelativePath;
-		parentVersionId: DocumentVersionId;
+		parentVersionId: VaultUpdateId;
 		hash: string;
 	}): Promise<void> {
 		this._documents.delete(oldRelativePath);

plugin/src/database/document-metadata.ts

@@ -1,7 +1,7 @@
-export type DocumentVersionId = number;
+export type VaultUpdateId = number;
 export type RelativePath = string;
 
 export interface DocumentMetadata {
-	parentVersionId: DocumentVersionId;
+	parentVersionId: VaultUpdateId;
 	hash: string;
 }

plugin/src/services/sync_service.ts

@@ -5,10 +5,7 @@ import type { components, paths } from "./types"; // generated by openapi-typesc
 import { Logger } from "src/logger";
 import { Database } from "src/database/database";
 import { SyncSettings } from "src/database/sync-settings";
-import {
+import { VaultUpdateId, RelativePath } from "src/database/document-metadata.js";
-	DocumentVersionId,
-	RelativePath,
-} from "src/database/document-metadata.js";
 
 export class SyncServer {
 	private static VAULT_ID = "default";
@@ -53,7 +50,7 @@ export class SyncServer {
 		createdDate,
 	}: {
 		relativePath: RelativePath;
-		parentVersionId: DocumentVersionId | undefined;
+		parentVersionId: VaultUpdateId | undefined;
 		contentBytes: Uint8Array;
 		createdDate: Date;
 	}): Promise<components["schemas"]["DocumentVersion"]> {
@@ -160,9 +157,9 @@ export class SyncServer {
 		return response.data;
 	}
 
-	public async getAll(): Promise<
+	public async getAll(
-		components["schemas"]["DocumentVersionWithoutContent"][]
+		since?: VaultUpdateId
-	> {
+	): Promise<components["schemas"]["FetchLatestDocumentsResponse"]> {
 		const response = await this.client.GET("/vaults/{vault_id}/documents", {
 			params: {
 				path: {
@@ -172,6 +169,9 @@ export class SyncServer {
 					authorization:
 						"Bearer " + this.database.getSettings().token,
 				},
+				query: {
+					since_update_id: since,
+				},
 			},
 		});
 

plugin/src/services/types.ts

@@ -49,7 +49,9 @@ export interface paths {
         };
         get: {
             parameters: {
-                query?: never;
+                query?: {
+                    since_update_id?: number | null;
+                };
                 header: {
                     authorization: string;
                 };
@@ -65,7 +67,7 @@ export interface paths {
                         [name: string]: unknown;
                     };
                     content: {
-                        "application/json": components["schemas"]["DocumentVersionWithoutContent"][];
+                        "application/json": components["schemas"]["FetchLatestDocumentsResponse"];
                     };
                 };
             };
@@ -225,7 +227,7 @@ export interface components {
             updatedDate: string;
             vaultId: string;
             /** Format: int64 */
-            versionId: number;
+            vaultUpdateId: number;
         };
         DocumentVersionWithoutContent: {
             /** Format: date-time */
@@ -236,7 +238,12 @@ export interface components {
             updatedDate: string;
             vaultId: string;
             /** Format: int64 */
-            versionId: number;
+            vaultUpdateId: number;
+        };
+        FetchLatestDocumentsResponse: {
+            /** Format: int64 */
+            lastUpdateId: number;
+            latestDocuments: components["schemas"]["DocumentVersionWithoutContent"][];
         };
         PathParams: {
             vault_id: string;
@@ -257,6 +264,10 @@ export interface components {
             isAuthenticated: boolean;
             serverVersion: string;
         };
+        QueryParams: {
+            /** Format: int64 */
+            since_update_id?: number | null;
+        };
         UpdateDocumentVersion: {
             contentBase64: string;
             /** Format: date-time */

plugin/src/sync-functions/sync-locally-updated-file.ts

@@ -3,7 +3,8 @@ import { TFile } from "obsidian";
 import { Database } from "src/database/database";
 import { Logger } from "src/logger";
 import { SyncServer } from "src/services/sync_service";
-import { hash, isEqualBytes } from "src/utils";
+import { hash } from "src/utils/hash.js";
+import { isEqualBytes } from "src/utils/is-equal-bytes.js";
 
 export async function syncLocallyUpdatedFile({
 	database,
@@ -43,7 +44,7 @@ export async function syncLocallyUpdatedFile({
 	const localDbUpdatePromise = database.moveDocument({
 		oldRelativePath: oldPath || file.path,
 		relativePath: file.path,
-		parentVersionId: response.versionId,
+		parentVersionId: response.vaultUpdateId,
 		hash: contentHash,
 	});