..

frontend/sync-client/src/persistence/database.ts

@@ -1,11 +1,6 @@
+import type { PendingRequest, UnconfirmedRequest } from "./requests";
 import { upgradeState } from "./upgrade-state";
-import type { StoredSnapshot } from "../snapshot";
-import type { DocumentUpdateResponse } from "../services/types/DocumentUpdateResponse";
-import type { DocumentVersionWithoutContent } from "../services/types/DocumentVersionWithoutContent";
 import type { FileManifest } from "../services/types/FileManifest";
-import type { FileManifestUpdateResponse } from "../services/types/FileManifestUpdateResponse";
-import type { PushFileManifest } from "../services/types/PushFileManifest";
-import type { PutFileContent } from "../services/types/PutFileContent";
 import type { FileManifestEntries } from "../types/file-manifest-entries";
 
 export type VaultUpdateId = number;
@@ -17,29 +12,21 @@ export interface DocumentMetadata {
     hash: string;
 }
 
+export interface ContentHead {
+    vaultUpdateId: number;
+    contentSize: number;
+}
+
 export interface DocumentState {
     /** A null version retains only the clean hash after a server history reset. */
     base?: { vaultUpdateId: number | null; hash: string };
     /** Last observed disk hash; an empty string means a notification awaits scanning. */
     observedHash?: string;
     /** A remote version still to be incorporated, including excluded downloads. */
-    remote?: DocumentVersionWithoutContent;
+    remote?: ContentHead;
 }
 
-export type PendingRequest = { rejection?: string } & (
-    | {
-          type: "content";
-          documentId: string;
-          request: PutFileContent;
-          snapshot: StoredSnapshot;
-          response?: DocumentUpdateResponse;
-      }
-    | {
-          type: "fileManifest";
-          request: PushFileManifest;
-          response?: FileManifestUpdateResponse;
-      }
-);
+export type { PendingRequest, UnconfirmedRequest } from "./requests";
 
 export interface EngineState {
     vaultKey: string;
@@ -50,7 +37,7 @@ export interface EngineState {
     lastSeenUpdateId?: number;
     pending?: PendingRequest;
     /** A rejected retry does not prove an earlier attempt failed to commit. */
-    unconfirmed?: PendingRequest[];
+    unconfirmed?: UnconfirmedRequest[];
     /** Commits consumption of the saved notification queue with the identity map. */
     lastAppliedLocalChangeId?: string;
     /** Original server paths while local files are excluded; null means absent. */