backupdrill 0.1.0 → 0.1.1

package/README.md

@@ -1,10 +1,10 @@
 # backupdrill
 
-Open-source CLI to back up a **Supabase** project to **your own** S3/R2/B2 bucket — the Postgres database now, Storage files next — with a checksummed `manifest.json` so you can prove what was captured.
+Open-source CLI to back up a **Supabase** project to **your own** S3/R2/B2 bucket — the Postgres database **and** Storage files, together — with a checksummed `manifest.json` so you can prove what was captured.
 
 Backups stream through the CLI on your machine (or your CI) straight to your bucket. **Your data never touches our servers, because there are none — this is just a CLI.**
 
-> Want this on a schedule, with **restore drills that prove your backup actually restores**, plus Storage-file backup and alerts? That's the hosted service → **[backupdrill.com](https://backupdrill.com)**. This CLI is the DIY layer; the cloud adds scheduling, drills, alerting, and reports on top.
+> Want this on a schedule, with **restore drills that prove your backup actually restores**, plus alerts and reports? That's the hosted service → **[backupdrill.com](https://backupdrill.com)**. This CLI is the DIY layer; the cloud adds scheduling, drills, alerting, and reports on top.
 
 ## Why
 

package/dist/backup.js

@@ -7,6 +7,7 @@ import { S3Client, PutObjectCommand } from "@aws-sdk/client-s3";
 import { Upload } from "@aws-sdk/lib-storage";
 import { syncStorage } from "./storage.js";
 import { log } from "./log.js";
+import { TOOL_VERSION } from "./version.js";
 const execFileAsync = promisify(execFile);
 function majorOf(serverVersionNum) {
     // server_version_num: 150004 → 15,  170002 → 17
@@ -109,16 +110,19 @@ async function dumpToS3(config, s3, key, pgDumpBin) {
         },
     });
     const uploadDone = upload.done();
-    // 正确性以 pg_dump 退出码为准:dump 失败则中止上传,绝不把半截转储当成功
+    // 失败双向联动:dump 失败要中止上传(绝不把半截转储当成功);上传失败也必须
+    // 杀掉 pg_dump —— 否则上传侧停止消费后,背压会让 pg_dump 永远阻塞在 stdout
+    // 写入上,调用方(worker 的串行队列)随之永久挂起。Promise.all 会订阅两侧,
+    // 先失败的一方抛出后,另一方稍后的 rejection 也已被视为 handled。
     try {
-        await dumpDone;
+        await Promise.all([dumpDone, uploadDone]);
     }
     catch (error) {
-        meter.destroy(error);
+        dump.kill("SIGKILL");
+        meter.destroy();
         await upload.abort().catch(() => { });
         throw error;
     }
-    await uploadDone;
     return { bytes, sha256: hash.digest("hex") };
 }
 export async function runBackup(config) {
@@ -170,7 +174,7 @@ export async function runBackup(config) {
     }
     const manifest = {
         tool: "backupdrill-cli",
-        toolVersion: process.env.npm_package_version || "0.1.0",
+        toolVersion: TOOL_VERSION,
         createdAt: new Date().toISOString(),
         projectName: config.projectName,
         database: {

package/dist/config.js

@@ -50,6 +50,13 @@ async function fromFile(path) {
         throw new Error(`Could not read config file ${path}: ${error.message}`);
     }
 }
+// spread 里显式的 undefined 会覆盖前一层的值(CLI 未传的 flag 正是 undefined),
+// 合并前必须剔除,否则 env/配置文件里的 storage 配置会被整体清空。
+function definedOnly(obj) {
+    if (!obj)
+        return {};
+    return Object.fromEntries(Object.entries(obj).filter(([, value]) => value !== undefined));
+}
 /** 合并优先级:显式 flag > 环境变量 > 配置文件。 */
 export async function loadConfig(opts) {
     const file = await fromFile(opts.configPath);
@@ -59,14 +66,14 @@ export async function loadConfig(opts) {
     const projectName = o.projectName ?? env.projectName ?? file.projectName ?? "supabase";
     const schemas = o.schemas ?? env.schemas ?? file.schemas ?? ["public"];
     const storage = {
-        ...file.storage,
-        ...env.storage,
-        ...o.storage,
+        ...definedOnly(file.storage),
+        ...definedOnly(env.storage),
+        ...definedOnly(o.storage),
     };
     const src = {
-        ...file.supabaseStorage,
-        ...env.supabaseStorage,
-        ...o.supabaseStorage,
+        ...definedOnly(file.supabaseStorage),
+        ...definedOnly(env.supabaseStorage),
+        ...definedOnly(o.supabaseStorage),
     };
     const missing = [];
     if (!databaseUrl)

package/dist/index.js

@@ -6,6 +6,7 @@ import { runEstimate } from "./estimate.js";
 import { runDrill } from "./drill.js";
 import { runRestore } from "./restore.js";
 import { log } from "./log.js";
+import { TOOL_VERSION } from "./version.js";
 // Supabase egress 定价表(2026-07-04 核实,来源见 README「Egress & cost」)。
 // 备份流量 100% 未缓存,故用 uncached 单价 $0.09/GB;included 用 uncached 额度。
 // Free 硬上限(超额即限流,不计费);Pro/Team 由 Spend Cap 决定超额限流还是计费。
@@ -17,10 +18,10 @@ const EGRESS_PRICING = {
 const program = new Command();
 program
     .name("backupdrill")
-    .description("Back up a Supabase project — Postgres database (and, soon, Storage files) — " +
+    .description("Back up a Supabase project — Postgres database and Storage files — " +
     "to your own S3/R2/B2 bucket, with a checksummed manifest.\n\n" +
     "Want scheduling, restore drills, and alerts? → https://backupdrill.com")
-    .version(process.env.npm_package_version || "0.1.0");
+    .version(TOOL_VERSION);
 program
     .command("backup")
     .description("Run a one-off backup to your own bucket")

package/dist/storage.js

@@ -1,5 +1,6 @@
 import { createHash } from "node:crypto";
 import { Transform } from "node:stream";
+import { pipeline } from "node:stream/promises";
 import { S3Client, ListBucketsCommand, ListObjectsV2Command, GetObjectCommand, } from "@aws-sdk/client-s3";
 import { Upload } from "@aws-sdk/lib-storage";
 import { log } from "./log.js";
@@ -74,15 +75,26 @@ export async function syncStorage(cfg, target) {
                     cb(null, chunk);
                 },
             });
-            body.pipe(meter);
-            await new Upload({
+            // pipeline(而非裸 pipe)才会传播源流错误;否则 Supabase 侧读取中断时
+            // meter 永不 end,Upload.done() 永久挂起。两侧任一失败都终止另一侧。
+            const copy = pipeline(body, meter);
+            const upload = new Upload({
                 client: target.client,
                 params: {
                     Bucket: target.bucket,
                     Key: `${target.base}/storage/${bucket}/${obj.key}`,
                     Body: meter,
                 },
-            }).done();
+            });
+            try {
+                await Promise.all([copy, upload.done()]);
+            }
+            catch (error) {
+                meter.destroy();
+                body.destroy();
+                await upload.abort().catch(() => { });
+                throw error;
+            }
             files.push({ bucket, key: obj.key, bytes, sha256: hash.digest("hex") });
             totalBytes += bytes;
         }

package/dist/version.d.ts

@@ -0,0 +1 @@
+export declare const TOOL_VERSION: string;

package/dist/version.js

@@ -0,0 +1,4 @@
+import { createRequire } from "node:module";
+// npm_package_version 只在 npm scripts 环境里存在;全局安装 / npx 场景必须
+// 从包内 package.json 读,否则 --version 与 manifest.toolVersion 永远是旧值。
+export const TOOL_VERSION = createRequire(import.meta.url)("../package.json").version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backupdrill",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "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": {
@@ -22,6 +22,7 @@
   ],
   "scripts": {
     "build": "tsc",
+    "prepublishOnly": "npm run build && npm test",
     "dev": "node src/index.ts",
     "typecheck": "tsc --noEmit",
     "pretest": "tsc",