backupdrill 1.0.0 → 2.0.0

package/dist/storage.js

@@ -37,6 +37,30 @@ async function* listObjects(client, bucket) {
         token = res.IsTruncated ? res.NextContinuationToken : undefined;
     } while (token);
 }
+/**
+ * 从 GetObject 响应提取文件的可恢复元数据。Supabase 的 S3 handler 把这些头直接
+ * 从 storage.objects.metadata / user_metadata 取出(content-type、cache-control、
+ * x-amz-meta-*,源码实证 2026-07-24)——所以这份元数据与刚流过的字节**原子一致**,
+ * 不存在"拷完再查 DB"的并发漂移窗口,也不依赖 DB 上 storage schema 的读权限。
+ * 缺席的头不落字段(= 源端未设置/未提供),不猜测。
+ */
+export function fileMetadataFromS3(got) {
+    const meta = {};
+    if (got.ContentType)
+        meta.contentType = got.ContentType;
+    if (got.CacheControl)
+        meta.cacheControl = got.CacheControl;
+    if (got.ContentEncoding)
+        meta.contentEncoding = got.ContentEncoding;
+    // MissingMeta > 0 = 服务端明确声明有元数据条目没能放进 x-amz-meta 头(非法头名等)。
+    // 记一份自知残缺的 metadata 违反"未捕获就不写"原则 → 整个字段省略,如实缺席。
+    if (got.Metadata && Object.keys(got.Metadata).length && !(got.MissingMeta && got.MissingMeta > 0)) {
+        meta.metadata = got.Metadata;
+    }
+    if (got.LastModified)
+        meta.lastModified = got.LastModified.toISOString();
+    return meta;
+}
 /**
  * 仅列举、不下载 —— 用于接入时的容量/egress 估算,几乎不产生 egress。
  */
@@ -95,10 +119,17 @@ export async function syncStorage(cfg, target) {
                 await upload.abort().catch(() => { });
                 throw error;
             }
-            files.push({ bucket, key: obj.key, bytes, sha256: hash.digest("hex") });
+            files.push({
+                bucket,
+                key: obj.key,
+                bytes,
+                sha256: hash.digest("hex"),
+                ...fileMetadataFromS3(got),
+            });
             totalBytes += bytes;
         }
         log.step(`  ${bucket}: ${files.filter((f) => f.bucket === bucket).length} files`);
     }
-    return { fileCount: files.length, totalBytes, files };
+    // buckets 含空 bucket(files 推不出来)——manifest v2 的 bucket 属性采集要按它查
+    return { fileCount: files.length, totalBytes, files, buckets };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backupdrill",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "Open-source CLI to back up a Supabase project — Postgres database and Storage files — to your own S3/R2/B2 bucket, with a checksummed manifest.",
   "type": "module",
   "bin": {