@doubling/compound-sync 1.2.1 → 1.3.0

package/dual-write.js

@@ -19,7 +19,7 @@ import {
   doc, getDocs, setDoc, updateDoc, deleteDoc, query, where,
 } from 'firebase/firestore';
 import {
-  ref as storageRef, uploadString, deleteObject,
+  ref as storageRef, uploadString, deleteObject, getBytes,
 } from 'firebase/storage';
 
 // ---- Pure helpers ----
@@ -53,11 +53,26 @@ export async function deleteBlob({ storage, orgId, fileId }) {
   }
 }
 
+/**
+ * Read file content from Cloud Storage. Throws on any failure
+ * (missing blob, permission error, network). The Firestore content
+ * field is no longer written or read as of PR 6, so the read path
+ * has no fallback. Backfill (PR 4) is a prerequisite.
+ */
+export async function readFileContent({ storage, orgId, fileId }) {
+  const blobPath = storagePathFor(orgId, fileId);
+  const bytes = await getBytes(storageRef(storage, blobPath));
+  return new TextDecoder('utf-8').decode(new Uint8Array(bytes));
+}
+
 // ---- Core dual-write ----
 
 /**
- * Write a file's content to both the Firestore `content` field and a
- * Cloud Storage blob at `orgs/{orgId}/files/{fileId}/current.md`.
+ * Write a file's content to Cloud Storage at
+ * orgs/{orgId}/files/{fileId}/current.md and update the Firestore
+ * metadata doc with storagePath/contentHash/size. As of PR 6 the
+ * Firestore `content` field is no longer written; the blob is the
+ * sole source of file content.
  *
  * Returns one of:
  *   { action: 'skipped', reason: 'shared-scope' }
@@ -66,8 +81,8 @@ export async function deleteBlob({ storage, orgId, fileId }) {
  *   { action: 'updated', fileId, storageError? }
  *
  * `storageError` is populated when the Firestore write succeeded but
- * the Storage upload failed. Callers should log and continue; the next
- * save will re-upload because the hash on the metadata will not match.
+ * the Storage upload failed. Callers should log and retry; the next
+ * save attempts the upload again.
  */
 export async function pushFileToCloud({
   filesRef,
@@ -109,7 +124,6 @@ export async function pushFileToCloud({
     const fileId = newDocRef.id;
     const fileData = {
       path: docPath,
-      content,
       createdAt: now,
       updatedAt: now,
       scope,
@@ -132,11 +146,10 @@ export async function pushFileToCloud({
 
   const docSnap = snapshot.docs[0];
   const existing = docSnap.data();
-  if (existing.content === content && existing.contentHash === contentHash) {
+  if (existing.contentHash === contentHash) {
     return { action: 'noop', fileId: docSnap.id };
   }
   await updateDoc(docSnap.ref, {
-    content,
     updatedAt: now,
     storagePath: storagePathFor(orgId, docSnap.id),
     contentHash,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@doubling/compound-sync",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Bidirectional sync between Compound and local markdown files",
   "type": "module",
   "bin": {

package/sync.js

@@ -30,7 +30,7 @@ import os from 'os';
 import http from 'http';
 import { exec } from 'child_process';
 import { fileURLToPath } from 'url';
-import { pushFileToCloud, deleteFileFromCloud } from './dual-write.js';
+import { pushFileToCloud, deleteFileFromCloud, readFileContent } from './dual-write.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -615,7 +615,7 @@ ensureFolderStructure();
 
 // --- Firestore → Local (multiple listeners) ---
 
-function handleFirestoreChange(change, getLocalPath) {
+async function handleFirestoreChange(change, getLocalPath) {
   const data = change.doc.data();
   const docPath = data.path;
   if (!docPath) return;
@@ -648,7 +648,16 @@ function handleFirestoreChange(change, getLocalPath) {
   console.log(`  [firestore → local] ${action} ${docPath} (${data.scope || 'team'})`);
   ensureDir(localPath);
   suppressLocal.add(localPath);
-  fs.writeFileSync(localPath, data.content || '', 'utf-8');
+
+  // Read content from Cloud Storage. As of PR 6 there is no
+  // fallback; any read failure propagates to the caller's catch
+  // handler (handleFirestoreChange's promise rejection logger).
+  const content = await readFileContent({
+    storage,
+    orgId: ORG_ID,
+    fileId: change.doc.id,
+  });
+  fs.writeFileSync(localPath, content || '', 'utf-8');
   lastKnownUpdate.set(trackingKey, remoteUpdated);
   setTimeout(() => suppressLocal.delete(localPath), 1000);
 }
@@ -663,7 +672,7 @@ function startFirestoreListeners() {
       snapshot.docChanges().forEach(change => {
         handleFirestoreChange(change, (data) => {
           return path.join(LOCAL_PATH, teamFolder, data.path);
-        });
+        }).catch(err => console.error('Firestore change handler error:', err && err.message));
       });
     }, err => console.error(`Team "${teamFolder}" listener error:`, err));
     console.log(`  Listening: ${teamFolder}`);
@@ -676,7 +685,8 @@ function startFirestoreListeners() {
         const data = change.doc.data();
         const realPath = path.join(LOCAL_PATH, PRIVATE_FOLDER, data.path);
 
-        handleFirestoreChange(change, () => realPath);
+        handleFirestoreChange(change, () => realPath)
+          .catch(err => console.error('Firestore change handler error:', err && err.message));
 
         if (change.type !== 'removed') {
           updateSharedByMeSymlink(data, realPath);
@@ -695,7 +705,7 @@ function startFirestoreListeners() {
         if (data.ownerId === USER_ID) return;
         handleFirestoreChange(change, () => {
           return path.join(LOCAL_PATH, SHARED_WITH_ME_FOLDER, data.path);
-        });
+        }).catch(err => console.error('Firestore change handler error:', err && err.message));
       });
     }, err => console.error('Shared with me listener error:', err));
     console.log('  Listening: Shared with Me');