@ivotoby/postgram-cli 1.6.0 → 1.8.0

package/dist/client.js

@@ -134,6 +134,24 @@ export function createPgmClient(options) {
                 body: input
             });
         },
+        diffSync(input) {
+            return request(options, '/api/sync/diff', {
+                method: 'POST',
+                body: input
+            });
+        },
+        uploadSyncFiles(input) {
+            return request(options, '/api/sync/upload', {
+                method: 'POST',
+                body: input
+            });
+        },
+        finalizeSync(input) {
+            return request(options, '/api/sync/finalize', {
+                method: 'POST',
+                body: input
+            });
+        },
         getSyncStatus(repo) {
             return request(options, `/api/sync/status/${encodeURIComponent(repo)}`);
         },

package/dist/pgm.js

@@ -540,7 +540,7 @@ program
     try {
         const resolvedDir = path.resolve(dir);
         const repoName = options.repo ?? path.basename(resolvedDir);
-        const files = [];
+        const manifest = [];
         const SKIP_DIRS = new Set(['.git', 'node_modules', '.obsidian', '.trash']);
         async function walk(dirPath, prefix) {
             const entries = await readdir(dirPath, { withFileTypes: true });
@@ -557,43 +557,23 @@ program
                     const relativePath = prefix
                         ? `${prefix}/${entry.name}`
                         : entry.name;
-                    files.push({ path: relativePath, sha, content });
+                    manifest.push({ path: relativePath, sha, fullPath });
                 }
             }
         }
         await walk(resolvedDir, '');
         const config = await resolvePgmConfig();
         const client = createPgmClient(config);
+        const manifestForServer = manifest.map(({ path: p, sha }) => ({ path: p, sha }));
+        const diff = await client.diffSync({ repo: repoName, files: manifestForServer });
         if (options.dryRun) {
-            const status = await client.getSyncStatus(repoName);
-            const existingByPath = new Map(status.files.map((f) => [f.path, f]));
-            const incomingPaths = new Set(files.map((f) => f.path));
-            let newCount = 0;
-            let changedCount = 0;
-            let unchangedCount = 0;
-            for (const file of files) {
-                const existing = existingByPath.get(file.path);
-                if (!existing) {
-                    newCount += 1;
-                }
-                else if (existing.sha !== file.sha) {
-                    changedCount += 1;
-                }
-                else {
-                    unchangedCount += 1;
-                }
-            }
-            let deletedCount = 0;
-            for (const [existingPath, entry] of existingByPath) {
-                if (!incomingPaths.has(existingPath) && entry.syncStatus !== 'stale') {
-                    deletedCount += 1;
-                }
-            }
+            const newCount = diff.toUpload.filter((f) => f.reason === 'new').length;
+            const changedCount = diff.toUpload.filter((f) => f.reason === 'changed').length;
             const result = {
                 created: newCount,
                 updated: changedCount,
-                unchanged: unchangedCount,
-                deleted: deletedCount
+                unchanged: diff.unchanged,
+                deleted: diff.toDelete.length
             };
             if (json) {
                 printJson(result);
@@ -605,7 +585,49 @@ program
             }
             return;
         }
-        const result = await client.syncRepo({ repo: repoName, files });
+        const pathToFile = new Map(manifest.map((f) => [f.path, f]));
+        const BATCH_BYTES = 4 * 1024 * 1024;
+        const BATCH_FILES = 50;
+        let totalCreated = 0;
+        let totalUpdated = 0;
+        let batch = [];
+        let batchBytes = 0;
+        async function flushBatch() {
+            if (batch.length === 0)
+                return;
+            const result = await client.uploadSyncFiles({
+                repo: repoName,
+                files: batch
+            });
+            totalCreated += result.created;
+            totalUpdated += result.updated;
+            batch = [];
+            batchBytes = 0;
+        }
+        for (const toUpload of diff.toUpload) {
+            const entry = pathToFile.get(toUpload.path);
+            if (!entry) {
+                throw new AppError(ErrorCode.INTERNAL, `Server asked to upload ${toUpload.path} but it was not in the local manifest`);
+            }
+            const content = await fsReadFile(entry.fullPath, 'utf8');
+            const size = Buffer.byteLength(content, 'utf8');
+            if (batch.length > 0 && (batch.length >= BATCH_FILES || batchBytes + size > BATCH_BYTES)) {
+                await flushBatch();
+            }
+            batch.push({ path: toUpload.path, sha: toUpload.sha, content });
+            batchBytes += size;
+        }
+        await flushBatch();
+        const finalize = await client.finalizeSync({
+            repo: repoName,
+            files: manifestForServer
+        });
+        const result = {
+            created: totalCreated,
+            updated: totalUpdated,
+            unchanged: diff.unchanged,
+            deleted: finalize.deleted
+        };
         if (json) {
             printJson(result);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ivotoby/postgram-cli",
-  "version": "1.6.0",
+  "version": "1.8.0",
   "description": "Postgram CLI — store, search, and manage entities from the command line",
   "type": "module",
   "bin": {