@seedvault/cli 0.4.3 → 0.4.4

package/dist/sv.js

@@ -158,6 +158,9 @@ function createClient(serverUrl, token) {
     if (opts.contentType) {
       headers["Content-Type"] = opts.contentType;
     }
+    if (opts.extraHeaders) {
+      Object.assign(headers, opts.extraHeaders);
+    }
     const res = await fetch(`${base}${path}`, {
       method,
       headers,
@@ -199,10 +202,16 @@ function createClient(serverUrl, token) {
       const res = await request("GET", "/v1/contributors");
       return res.json();
     },
-    async putFile(username, path, content) {
+    async putFile(username, path, content, opts) {
+      const extraHeaders = {};
+      if (opts?.originCtime)
+        extraHeaders["X-Origin-Ctime"] = opts.originCtime;
+      if (opts?.originMtime)
+        extraHeaders["X-Origin-Mtime"] = opts.originMtime;
       const res = await request("PUT", `/v1/files/${username}/${encodePath(path)}`, {
         body: content,
-        contentType: "text/markdown"
+        contentType: "text/markdown",
+        extraHeaders: Object.keys(extraHeaders).length > 0 ? extraHeaders : undefined
       });
       return res.json();
     },
@@ -2148,7 +2157,8 @@ class RetryQueue {
       const op = this.items[0];
       try {
         if (op.type === "put" && op.content !== null) {
-          await this.client.putFile(op.username, op.serverPath, op.content);
+          const opts = op.originCtime || op.originMtime ? { originCtime: op.originCtime ?? undefined, originMtime: op.originMtime ?? undefined } : undefined;
+          await this.client.putFile(op.username, op.serverPath, op.content, opts);
         } else if (op.type === "delete") {
           await this.client.deleteFile(op.username, op.serverPath);
         }
@@ -2228,7 +2238,9 @@ class Syncer {
           username: this.username,
           serverPath: f.path,
           content: null,
-          queuedAt: new Date().toISOString()
+          queuedAt: new Date().toISOString(),
+          originCtime: null,
+          originMtime: null
         });
       }
     });
@@ -2244,7 +2256,7 @@ class Syncer {
       const { files: serverFiles } = await this.client.listFiles(this.username, collection.name + "/");
       const serverMap = new Map;
       for (const f of serverFiles) {
-        serverMap.set(f.path, f.modifiedAt);
+        serverMap.set(f.path, f);
       }
       const localFiles = await walkMd(collection.path);
       const localServerPaths = new Set;
@@ -2253,8 +2265,9 @@ class Syncer {
         const relPath = toPosixPath(relative5(collection.path, localFile.path));
         const serverPath = `${collection.name}/${relPath}`;
         localServerPaths.add(serverPath);
-        const serverMod = serverMap.get(serverPath);
-        if (serverMod) {
+        const serverEntry = serverMap.get(serverPath);
+        if (serverEntry) {
+          const serverMod = serverEntry.originMtime || serverEntry.modifiedAt;
           const serverDate = new Date(serverMod).getTime();
           const localDate = localFile.mtimeMs;
           if (localDate <= serverDate) {
@@ -2263,11 +2276,16 @@ class Syncer {
           }
         }
         const content = await readFile(localFile.path, "utf-8");
-        toUpload.push({ serverPath, content });
+        const originCtime = new Date(localFile.birthtimeMs).toISOString();
+        const originMtime = new Date(localFile.mtimeMs).toISOString();
+        toUpload.push({ serverPath, content, originCtime, originMtime });
       }
       await pooled(toUpload, SYNC_CONCURRENCY, async (item) => {
         try {
-          await this.client.putFile(this.username, item.serverPath, item.content);
+          await this.client.putFile(this.username, item.serverPath, item.content, {
+            originCtime: item.originCtime,
+            originMtime: item.originMtime
+          });
           uploaded++;
         } catch {
           this.queue.enqueue({
@@ -2275,7 +2293,9 @@ class Syncer {
             username: this.username,
             serverPath: item.serverPath,
             content: item.content,
-            queuedAt: new Date().toISOString()
+            queuedAt: new Date().toISOString(),
+            originCtime: item.originCtime,
+            originMtime: item.originMtime
           });
         }
       });
@@ -2329,14 +2349,21 @@ class Syncer {
   }
   async handleEvent(event) {
     if (event.type === "add" || event.type === "change") {
-      const content = await readFile(event.localPath, "utf-8");
+      const [content, s] = await Promise.all([
+        readFile(event.localPath, "utf-8"),
+        stat4(event.localPath)
+      ]);
+      const originCtime = new Date(s.birthtimeMs).toISOString();
+      const originMtime = new Date(s.mtimeMs).toISOString();
       this.log(`PUT ${event.serverPath} (${content.length} bytes)`);
       this.queue.enqueue({
         type: "put",
         username: this.username,
         serverPath: event.serverPath,
         content,
-        queuedAt: new Date().toISOString()
+        queuedAt: new Date().toISOString(),
+        originCtime,
+        originMtime
       });
     } else if (event.type === "unlink") {
       this.log(`DELETE ${event.serverPath}`);
@@ -2345,7 +2372,9 @@ class Syncer {
         username: this.username,
         serverPath: event.serverPath,
         content: null,
-        queuedAt: new Date().toISOString()
+        queuedAt: new Date().toISOString(),
+        originCtime: null,
+        originMtime: null
       });
     }
   }
@@ -2384,7 +2413,7 @@ async function walkDirRecursive(dir, results) {
       await walkDirRecursive(full, results);
     } else if (entry.isFile() && entry.name.endsWith(".md")) {
       const s = await stat4(full);
-      results.push({ path: full, mtimeMs: s.mtimeMs });
+      results.push({ path: full, mtimeMs: s.mtimeMs, birthtimeMs: s.birthtimeMs });
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seedvault/cli",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "type": "module",
   "bin": {
     "sv": "bin/sv.mjs"