@datatruck/cli 0.41.5 → 0.41.7

package/lib/utils/bytes.d.ts

@@ -1,2 +1,2 @@
-export declare function formatBytes(bytes: number): string;
+export declare function formatBytes(inBytes: number, sign?: boolean): string;
 export declare function parseSize(size: string): number;

package/lib/utils/bytes.js

@@ -4,14 +4,15 @@ exports.formatBytes = formatBytes;
 exports.parseSize = parseSize;
 const units = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
 const sizeRegex = new RegExp(`^(\\d+(?:\\.\\d+)?)\\s*(${units.join("|")})$`, "i");
-function formatBytes(bytes) {
+function formatBytes(inBytes, sign = false) {
     let u = 0;
-    let n = bytes;
-    if (bytes < 0n)
-        throw new Error(`Invalid bytes: ${bytes.toString()}`);
+    let n = Math.abs(inBytes);
+    if (n < 0n)
+        throw new Error(`Invalid bytes: ${n.toString()}`);
     while (n >= 1024n && ++u)
         n = n / 1024;
-    return Number(n).toFixed(n < 10 && u > 0 ? 1 : 0) + units[u];
+    const result = Number(n).toFixed(n < 10 && u > 0 ? 1 : 0) + units[u];
+    return inBytes < 0 ? `-${result}` : `${sign ? "+" : ""}${result}`;
 }
 function parseSize(size) {
     const matches = sizeRegex.exec(size);

package/lib/utils/mysql.d.ts

@@ -7,6 +7,8 @@ export type MysqlCliOptions = {
     username: string;
     verbose?: boolean;
     database?: string;
+    ssl?: boolean;
+    vars?: Record<string, string | number>;
 };
 export declare function assertDumpFile(path: string): Promise<void>;
 export declare function createMysqlCli(options: MysqlCliOptions): Promise<{

package/lib/utils/mysql.js

@@ -66,9 +66,11 @@ async function createMysqlCli(options) {
         const data = [
             `[client]`,
             `host = "${options.hostname}"`,
+            ...(options.ssl === false ? [`skip-ssl`] : []),
             ...(options.port ? [`port = "${options.port}"`] : []),
             `user = "${options.username}"`,
             `password = "${password}"`,
+            ...Object.entries(options.vars || {}).map(([key, value]) => `${key} = "${value}"`),
         ];
         const path = (0, path_1.join)(dir, "mysql.conf");
         await (0, promises_1.writeFile)(path, data.join("\n"));

package/lib/utils/restic.d.ts

@@ -58,8 +58,10 @@ export declare class Restic {
     private createProcess;
     exec(args: string[], options?: AsyncProcessOptions): Promise<number>;
     json<T>(args: string[], options?: AsyncProcessOptions): Promise<T>;
+    init(): Promise<void>;
+    tryInit(): Promise<boolean>;
     checkRepository(): Promise<boolean>;
-    forget(options: {
+    forget<JSON extends boolean = false>(options: {
         snapshotId?: string;
         keepLast?: number;
         keepHourly?: number;
@@ -72,11 +74,22 @@ export declare class Restic {
         tag?: string[];
         prune?: boolean;
         args?: string[];
-    }): Promise<void>;
+        json?: JSON;
+    }): Promise<[
+        true
+    ] extends [JSON] ? {
+        tags: any;
+        host: any;
+        paths: any;
+        keep: any[] | null;
+        remove: any[] | null;
+        reason: any[] | null;
+    }[] : string>;
     snapshots(options: {
         ids?: string[];
         tags?: string[];
         paths?: string[];
+        host?: string;
         latest?: number;
         json?: boolean;
         group?: ("path" | "tags" | "host")[];
@@ -96,6 +109,7 @@ export declare class Restic {
         cwd?: string;
         tags?: string[];
         paths: string[];
+        host?: string;
         setPaths?: string[];
         exclude?: string[];
         excludeFile?: string[];

package/lib/utils/restic.js

@@ -109,15 +109,27 @@ class Restic {
         const stdout = await this.createProcess(args, options).stdout.fetch();
         return JSON.parse(stdout);
     }
+    async init() {
+        await this.exec(["init"]);
+    }
+    async tryInit() {
+        const exists = await this.checkRepository();
+        if ((0, fs_1.isLocalDir)(this.options.env.RESTIC_REPOSITORY) && !exists)
+            await this.init();
+        return exists;
+    }
     async checkRepository() {
         return ((await this.exec(["cat", "config"], {
             $exitCode: false,
         })) === 0);
     }
     async forget(options) {
-        await this.exec([
+        const p = this.createProcess([
             "forget",
-            ...(options.keepLast ? ["--keep-last", options.keepLast.toString()] : []),
+            ...(options.json ? ["--json"] : []),
+            ...(options.keepLast
+                ? ["--keep-last", options.keepLast.toString()]
+                : []),
             ...(options.keepHourly
                 ? ["--keep-hourly", options.keepHourly.toString()]
                 : []),
@@ -143,13 +155,24 @@ class Restic {
             ...(options.prune ? ["--prune"] : []),
             ...(options.args || []),
             ...(options.snapshotId ? [options.snapshotId] : []),
-        ]);
+        ], {});
+        const stdout = await p.stdout.fetch();
+        if (options.json) {
+            if (stdout === "")
+                return [];
+            const [json] = stdout.split("\n");
+            return JSON.parse(json);
+        }
+        else {
+            return stdout;
+        }
     }
     async snapshots(options) {
         const json = options.json ?? true;
         return await this.json([
             "snapshots",
             ...(json ? ["--json"] : []),
+            ...(options.host ? ["--host", options.host] : []),
             ...(options.tags?.flatMap((tag) => [`--tag`, tag]) ?? []),
             ...(options.paths?.flatMap((path) => ["--path", path]) ?? []),
             ...(options.group ? ["--group-by", options.group.join(",")] : []),
@@ -163,6 +186,7 @@ class Restic {
             const backup = this.createProcess([
                 "backup",
                 "--json",
+                ...(options.host ? ["--host", options.host] : []),
                 ...(options.exclude?.flatMap((v) => ["-e", v]) ?? []),
                 ...(options.excludeFile?.flatMap((v) => ["--exclude-file", v]) ?? []),
                 ...(options.tags?.flatMap((v) => ["--tag", v]) ?? []),

package/package.json

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