@datatruck/restic 0.0.5 → 0.0.6

package/lib/actions/backup.js

@@ -21,11 +21,16 @@ export class Backup extends Action {
                 RESTIC_REPOSITORY: repo.uri,
             },
         });
+        let logId;
         let space;
         let snapshotsAmount;
         let bytes = 0;
         let files = 0;
         return await createRunner(async () => {
+            logId = await this.ntfy.send("Backup", {
+                Repository: repo.name,
+                Package: pkg.name,
+            });
             await restic.tryInit();
             const targetPath = isLocalDir(repo.uri) ? repo.uri : undefined;
             space = await checkDiskSpace({
@@ -71,7 +76,7 @@ export class Backup extends Action {
                 Snapshots: snapshotsAmount,
                 Duration: data.duration,
                 Error: data.error?.message,
-            }, data.error);
+            }, { error: data.error, logId });
             return {
                 error: data.error,
                 files,
@@ -88,12 +93,17 @@ export class Backup extends Action {
         const sqlDumps = [];
         const backups = [];
         let localRepositoryPaths = [];
+        const tags = {
+            dt: true,
+            id: randomString(8),
+        };
         await createRunner(async () => {
             const repositories = this.cm.filterRepositories(options.repositories);
             const packages = this.cm.filterPackages(options.packages);
             const packageNames = packages.map((p) => p.name);
             const tasks = this.filterTasks(packageNames);
             await this.ntfy.send(`Backup start`, {
+                Id: tags.id,
                 Repositories: repositories.length,
                 Packages: packageNames.length,
                 Tasks: tasks?.length,
@@ -101,10 +111,6 @@ export class Backup extends Action {
             localRepositoryPaths = repositories
                 .filter((repo) => isLocalDir(repo.uri))
                 .map((repo) => repo.uri);
-            const tags = {
-                dt: true,
-                id: randomString(8),
-            };
             for (const task of tasks ?? []) {
                 if (task.type === "mysql-dump") {
                     const mysqlDump = new MySQLDump({
@@ -139,8 +145,13 @@ export class Backup extends Action {
                 }
             }
         }).start(async (data) => {
-            for (const sqlDump of sqlDumps)
-                await sqlDump.cleanup();
+            try {
+                for (const sqlDump of sqlDumps)
+                    await sqlDump.cleanup();
+            }
+            catch (error) {
+                console.error(error);
+            }
             const summary = backups.reduce((acc, p) => {
                 if (!acc[p.pkgName])
                     acc[p.pkgName] = {
@@ -169,6 +180,7 @@ export class Backup extends Action {
             if (diskStats.error)
                 console.error(diskStats.error);
             await this.ntfy.send("Backup end", {
+                Id: tags.id,
                 Duration: data.duration,
                 Size: formatBytes(size),
                 Error: data.error?.message,
@@ -176,7 +188,7 @@ export class Backup extends Action {
                     !!diskStats.result?.length && { key: "Disk stats", value: "" },
                     ...(diskStats.result?.map((p) => ({
                         key: p.name,
-                        value: `${formatBytes(p.free)}/${formatBytes(p.total)} (${progressPercent(p.total, p.total - p.free)}%)`,
+                        value: `${formatBytes(p.occupied)}/${formatBytes(p.total)} (${progressPercent(p.total, p.occupied)}%)`,
                         level: 1,
                     })) || []),
                     !!sqlDumpProcesses.length && { key: "SQL Dumps", value: "" },
@@ -192,7 +204,7 @@ export class Backup extends Action {
                         level: 1,
                     })),
                 ],
-            }, error);
+            }, { error });
             if (options.prune) {
                 await new Prune(this.config, this.global).run({
                     packages: options.packages,

package/lib/actions/copy.js

@@ -40,8 +40,14 @@ export class Copy extends Action {
                 ["GODEBUG"]: "http2client=0",
             },
         });
+        let logId;
         let space;
         await createRunner(async () => {
+            logId = await this.ntfy.send("Copy", {
+                Id: snapshot.short_id,
+                Source: sourceRepo.name,
+                Target: targetRepo.name,
+            });
             if (!this.initializedRepos.has(targetRepo.name)) {
                 await target.tryInit();
                 this.initializedRepos.add(targetRepo.name);
@@ -66,7 +72,7 @@ export class Copy extends Action {
                 }),
                 Duration: data.duration,
                 Error: data.error?.message,
-            }, data.error);
+            }, { error: data.error, logId });
         });
         return space?.diff ?? 0;
     }
@@ -99,7 +105,7 @@ export class Copy extends Action {
                 }),
                 Duration: data.duration,
                 Error: data.error?.message,
-            }, data.error);
+            }, { error: data.error });
             if (options.prune) {
                 await new Prune(this.config, this.global).run({
                     packages: options.packages,

package/lib/actions/init.js

@@ -20,7 +20,7 @@ export class Init extends Action {
                 Exists: exists ? "yes" : "no",
                 Duration: data.duration,
                 Error: data.error?.message,
-            }, data.error);
+            }, { error: data.error });
         });
     }
     async run(options) {

package/lib/actions/prune.js

@@ -8,10 +8,15 @@ import { progressPercent } from "@datatruck/cli/utils/math.js";
 import { match } from "@datatruck/cli/utils/string.js";
 export class Prune extends Action {
     async runSingle(repoName, pkgName, policy) {
+        let logId;
         let stats;
         let space;
         let removed;
         await createRunner(async () => {
+            logId = await this.ntfy.send("Prune", {
+                Repository: repoName,
+                Package: pkgName,
+            });
             const [restic, repo] = this.cm.createRestic(repoName, this.verbose);
             const targetPath = isLocalDir(repo.uri) ? repo.uri : undefined;
             space = await checkDiskSpace({
@@ -46,7 +51,7 @@ export class Prune extends Action {
                 }),
                 Duration: data.duration,
                 Error: data.error?.message,
-            }, data.error);
+            }, { error: data.error, logId });
         });
         return {
             diffSize: space?.diff ?? 0,
@@ -107,7 +112,7 @@ export class Prune extends Action {
                     !!diskStats.result?.length && { key: "Disk stats", value: "" },
                     ...(diskStats.result?.map((p) => ({
                         key: p.name,
-                        value: `${formatBytes(p.free)}/${formatBytes(p.total)} (${progressPercent(p.total, p.total - p.free)}%)`,
+                        value: `${formatBytes(p.occupied)}/${formatBytes(p.total)} (${progressPercent(p.total, p.occupied)}%)`,
                         level: 1,
                     })) || []),
                 ],

package/lib/utils/fs.d.ts

@@ -12,5 +12,6 @@ export declare function getDiskName(inPath: string): Promise<string>;
 export declare function fetchMultipleDiskStats(paths: string[]): Promise<{
     name: string;
     free: number;
+    occupied: number;
     total: number;
 }[]>;

package/lib/utils/fs.js

@@ -54,6 +54,7 @@ export async function fetchMultipleDiskStats(paths) {
         result.push({
             name: await getDiskName(path),
             ...stats,
+            occupied: stats.total - stats.free,
         });
     }
     return result;

package/lib/utils/mysql.js

@@ -54,6 +54,7 @@ import { runParallel } from "@datatruck/cli/utils/async.js";
 import { formatBytes } from "@datatruck/cli/utils/bytes.js";
 import { duration } from "@datatruck/cli/utils/date.js";
 import { ensureFreeDiskSpace, fetchDiskStats, } from "@datatruck/cli/utils/fs.js";
+import { progressPercent } from "@datatruck/cli/utils/math.js";
 import { createMysqlCli } from "@datatruck/cli/utils/mysql.js";
 import { match } from "@datatruck/cli/utils/string.js";
 import { existsSync } from "fs";
@@ -101,7 +102,7 @@ export class MySQLDump {
         for (const outPath of this.outPaths) {
             const parentFolder = basename(dirname(outPath));
             if (!parentFolder.startsWith("sql-dump"))
-                throw new Error(`sql-dump out dir must begins with 'sql-dump': ${outPath}`);
+                throw new Error(`sql-dump out dir base name must begins with 'sql-dump': ${outPath}`);
             if (existsSync(outPath))
                 await rm(outPath, { recursive: true });
             if (!init)
@@ -129,7 +130,20 @@ export class MySQLDump {
         for (const item of items)
             this.outPaths.add(dirname(item.out));
         await this.cleanup(true);
+        let logId;
+        let logIntervalId;
         try {
+            logId = await this.ntfy.send("SQL dump", {
+                Name: item.name,
+            });
+            logIntervalId = setInterval(async () => {
+                await this.ntfy.send("SQL dump", {
+                    Name: item.name,
+                    Size: formatBytes(stats.bytes),
+                    Files: `${stats.files}/${items.length} (${progressPercent(items.length, stats.files)}%)`,
+                    Duration: duration(Date.now() - now),
+                }, { logId });
+            }, 30_000);
             await runParallel({
                 items,
                 concurrency: this.options.concurrency ?? 1,
@@ -153,17 +167,20 @@ export class MySQLDump {
         catch (inError) {
             error = inError;
         }
+        finally {
+            clearInterval(logIntervalId);
+        }
         this.processes.push({
             name: item.name,
             error,
             stats,
         });
         await this.ntfy.send("SQL dump", {
-            Package: item.name,
+            Name: item.name,
             Size: formatBytes(stats.bytes),
             Files: stats.files,
             Duration: duration(Date.now() - now),
             Error: error?.message,
-        }, error);
+        }, { error, logId });
     }
 }

package/lib/utils/ntfy.d.ts

@@ -21,6 +21,9 @@ export declare class Ntfy {
     private formatTitle;
     private formatMessage;
     private formatMessageObject;
-    send(inTitle: string, message: MessageObject, error?: Error | boolean): Promise<void>;
+    send(inTitle: string, message: MessageObject, options?: {
+        error?: Error | boolean;
+        logId?: string;
+    }): Promise<string | undefined>;
 }
 export {};

package/lib/utils/ntfy.js

@@ -38,31 +38,37 @@ export class Ntfy {
         })
             .join("\n");
     }
-    async send(inTitle, message, error) {
+    async send(inTitle, message, options = {}) {
         const title = this.formatTitle(inTitle);
         const body = this.formatMessageObject(message);
         const lines = [title, body].filter((v) => v.length);
         if (lines.length)
             console.info([...lines, ""].join("\n"));
-        const options = {
-            priority: error ? "high" : "default",
-            tags: [error ? "red_circle" : "green_circle"],
+        const ntfyOptions = {
+            priority: options.error ? "high" : "default",
+            tags: [options.error ? "red_circle" : "green_circle"],
         };
         try {
-            if (this.options.token)
-                await fetch(`https://ntfy.sh/${this.options.token}`, {
+            if (this.options.token) {
+                const token = options.logId
+                    ? `${this.options.token}/${options.logId}`
+                    : this.options.token;
+                const response = await fetch(`https://ntfy.sh/${token}`, {
                     dispatcher: this.agent,
                     method: "POST",
                     body: unstyle(body),
                     headers: {
                         Markdown: "yes",
                         Title: unstyle(title),
-                        Priority: options.priority ?? "default",
-                        ...(options.tags && {
-                            Tags: options.tags?.join(","),
+                        Priority: ntfyOptions.priority ?? "default",
+                        ...(ntfyOptions.tags && {
+                            Tags: ntfyOptions.tags?.join(","),
                         }),
                     },
                 });
+                const json = (await response.json());
+                return json.id;
+            }
             await setTimeout(this.options.delay ?? 800);
         }
         catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/restic",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Tool for creating and managing backups",
   "homepage": "https://github.com/swordev/datatruck#readme",
   "bugs": {