@narumitw/pi-sync 0.18.0 → 0.24.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@narumitw/pi-sync",
-	"version": "0.18.0",
+	"version": "0.24.0",
 	"description": "Pi extension that syncs Pi configuration through Cloudflare R2 or S3-compatible storage.",
 	"type": "module",
 	"license": "MIT",
@@ -30,8 +30,8 @@
 	},
 	"devDependencies": {
 		"@biomejs/biome": "2.5.3",
-		"@earendil-works/pi-coding-agent": "0.80.3",
-		"typescript": "6.0.3"
+		"@earendil-works/pi-coding-agent": "0.80.10",
+		"typescript": "7.0.2"
 	},
 	"repository": {
 		"type": "git",

package/src/s3-client.ts

@@ -1,4 +1,5 @@
 import { createHash, createHmac } from "node:crypto";
+import { setTimeout as sleep } from "node:timers/promises";
 import { encodeKey, posixJoin } from "./paths.js";
 import type { LatestPointer, RemoteObject, Snapshot, SyncConfig } from "./types.js";
 
@@ -34,17 +35,53 @@ export class S3Client {
 	}
 
 	async getJson<T>(key: string): Promise<RemoteObject<T>> {
-		const object = await this.request("GET", key);
-		if (object.status === 404) return { missing: true };
-		if (!object.ok) throw new Error(`S3 GET failed (${object.status}): ${await object.text()}`);
-		return { value: (await object.json()) as T, etag: normalizeEtag(object.headers.get("etag")), missing: false };
+		const maxAttempts = 3;
+		let lastError: unknown;
+		for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+			const object = await this.request("GET", key);
+			if (object.status === 404) return { missing: true };
+			if (!object.ok) throw new Error(`S3 GET failed (${object.status}): ${await object.text()}`);
+			const body = await object.text();
+			// R2 can intermittently return an empty 200 body (read-after-write
+			// inconsistency on a long-lived keep-alive connection), which makes
+			// response.json() throw "JSON Parse error: Unexpected EOF" under Bun.
+			// Retry so the transient blip is absorbed instead of surfacing as a
+			// "pi-sync auto sync skipped" warning on every session start.
+			if (body.length > 0) {
+				return { value: JSON.parse(body) as T, etag: normalizeEtag(object.headers.get("etag")), missing: false };
+			}
+			lastError = new Error(`S3 GET returned an empty body for ${key}`);
+			if (attempt < maxAttempts) {
+				await sleep(250 * attempt);
+			}
+		}
+		throw lastError;
 	}
 
 	async getBuffer(key: string): Promise<RemoteObject<Buffer>> {
-		const object = await this.request("GET", key);
-		if (object.status === 404) return { missing: true };
-		if (!object.ok) throw new Error(`S3 GET failed (${object.status}): ${await object.text()}`);
-		return { value: Buffer.from(await object.arrayBuffer()), etag: normalizeEtag(object.headers.get("etag")), missing: false };
+		const maxAttempts = 3;
+		let lastError: unknown;
+		for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+			const object = await this.request("GET", key);
+			if (object.status === 404) return { missing: true };
+			if (!object.ok) throw new Error(`S3 GET failed (${object.status}): ${await object.text()}`);
+			const buffer = Buffer.from(await object.arrayBuffer());
+			// R2 can intermittently return an empty 200 body on a long-lived
+			// keep-alive connection (same root cause as the getJson retry
+			// above). getBuffer is only used for snapshot .json.gz payloads,
+			// which are always non-empty, so an empty body is a transient
+			// blip, not a legitimate response. Retry so the checksum guard
+			// downstream doesn't surface it as "Remote snapshot checksum
+			// mismatch".
+			if (buffer.length > 0) {
+				return { value: buffer, etag: normalizeEtag(object.headers.get("etag")), missing: false };
+			}
+			lastError = new Error(`S3 GET returned an empty body for ${key}`);
+			if (attempt < maxAttempts) {
+				await sleep(250 * attempt);
+			}
+		}
+		throw lastError;
 	}
 
 	async putJson(key: string, value: unknown) {