@docstack/pouchdb-adapter-googledrive 0.1.4 → 0.1.6

package/lib/types.d.ts

@@ -36,6 +36,16 @@ export interface ChangeEntry {
     doc?: Record<string, any>;
     /** Timestamp of the change */
     timestamp: number;
+    /**
+     * When set (computed by adapter.ts's `_bulkDocs` via pouchdb-merge before
+     * appending), fully describes the resulting IndexEntry for this doc - any
+     * `location`/`conflictLocations[rev]` that should point at *this* change's own
+     * (not-yet-uploaded) file is left as `{fileId: '__SELF__'}`;
+     * `DriveHandler.updateIndex()` substitutes the real fileId once known.
+     * Absent for the low-level `DriveHandler.appendChange()` API's raw callers
+     * (e.g. concurrency tests), which fall back to a synthesized single-node tree.
+     */
+    nextIndexEntry?: Omit<IndexEntry, 'seq'>;
 }
 /** Location pointer for lazy loading */
 export interface FilePointer {
@@ -49,14 +59,24 @@ export interface FilePointer {
 }
 /** In-Memory Index Entry */
 export interface IndexEntry {
-    /** Current revision */
+    /** Opaque pouchdb-merge rev tree, JSON-stringified. JS (this file's callers)
+     *  owns tree shape entirely - nothing here parses it beyond handing it to
+     *  pouchdb-merge's own functions. */
+    tree: string;
+    /** Winning revision, computed via pouchdb-merge's winningRev() - the real
+     *  deterministic CouchDB algorithm (generation, then lexicographic rev-hash
+     *  tie-break), not "whichever write landed last". */
     rev: string;
     /** Sequence number where this rev was minted */
     seq: number;
-    /** Whether it is a deletion marker */
+    /** Whether the winning revision is a deletion marker */
     deleted?: boolean;
-    /** Pointer to the file containing the body (changes-*.ndjson or snapshot-data-*.json) */
+    /** Pointer to the file containing the winning revision's body (changes-*.ndjson
+     *  or snapshot-data-*.json) */
     location: FilePointer;
+    /** Every OTHER known leaf's body location, keyed by rev string. Absent/empty
+     *  when there's no conflict. */
+    conflictLocations?: Record<string, FilePointer>;
 }
 /** Old Legacy Snapshot (Compact + Data) - Kept for migration */
 export interface LegacySnapshotData {
@@ -75,8 +95,11 @@ export interface SnapshotIndex {
 }
 /** New Snapshot Data (Bulk Content) */
 export interface SnapshotDataChunk {
-    /** Map of DocID -> Document Body */
+    /** Map of DocID -> Document Body (winning revision only) */
     docs: Record<string, any>;
+    /** Non-winning leaf bodies carried forward through compaction, DocID -> rev ->
+     *  Document Body. Absent when nothing in this chunk has a conflict. */
+    conflicts?: Record<string, Record<string, any>>;
 }
 /** Metadata file content */
 export interface MetaData {
@@ -84,6 +107,13 @@ export interface MetaData {
     seq: number;
     /** List of active change log file IDs */
     changeLogIds: string[];
+    /** Change logs a compaction has folded into the snapshot and deleted.
+     *  Tombstones: without them a writer that still remembers writing one of these
+     *  would keep putting it back (see DriveHandler.reconcileOwnLogs). Capped at
+     *  RETIRED_LOG_HISTORY entries - a writer that slept through more compactions
+     *  than that may resurrect a dead file id, which replays as a skipped 404 and is
+     *  pruned by the next compaction. */
+    retiredLogIds?: string[];
     /** Snapshot Index file ID */
     snapshotIndexId: string | null;
     /** Last compaction timestamp */

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@docstack/pouchdb-adapter-googledrive",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "PouchDB adapter for Google Drive",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
     "build": "tsc",
     "test": "jest",
-    "test:prod": "TEST_ENV=production jest"
+    "test:prod": "TEST_ENV=production jest",
+    "test:prod:explore": "TEST_ENV=production jest tests/production.explore.test.ts",
+    "test:prod:replication": "TEST_ENV=production jest tests/production.replication.test.ts"
   },
   "keywords": [
     "pouchdb",
@@ -28,7 +30,9 @@
     "node": ">=18"
   },
   "dependencies": {
-    "pouchdb-core": "^7.3.1"
+    "pouchdb-core": "^7.3.1",
+    "pouchdb-merge": "^9.0.0",
+    "pouchdb-adapter-utils": "^9.0.0"
   },
   "devDependencies": {
     "@types/express": "^5.0.6",

package/.env.example

@@ -1,9 +0,0 @@
-# Google Drive API Credentials
-GOOGLE_CLIENT_ID=your_client_id
-GOOGLE_CLIENT_SECRET=your_client_secret
-GOOGLE_REDIRECT_URL=your_redirect_url
-GOOGLE_ACCESS_TOKEN=your_access_token
-GOOGLE_REFRESH_TOKEN=your_refresh_token
-
-# Used for testing purposes
-GOOGLE_ACCESS_TOKEN=your_pasted_token_here