@datatruck/cli 0.33.0 → 0.34.1

package/config.schema.json

@@ -4,6 +4,9 @@
     "$schema": {
       "type": "string"
     },
+    "hostname": {
+      "type": "string"
+    },
     "tempDir": {
       "type": "string"
     },

package/lib/actions/BackupAction.d.ts

@@ -31,12 +31,14 @@ type Context = {
     backup: {
         packageName: string;
         repositoryName: string;
+        bytes: number;
     };
     cleanup: {};
     copy: {
         packageName: string;
         repositoryName: string;
         mirrorRepositoryName: string;
+        bytes: number;
     };
     prune: {
         packageName: string;
@@ -60,14 +62,18 @@ export declare class BackupAction<TRequired extends boolean = true> {
         snapshotPath: string | undefined;
         pkg: PackageConfig;
         onProgress: (data: Progress) => void;
-    }): Promise<void>;
+    }): Promise<{
+        bytes: number;
+    }>;
     protected copy(data: {
         repositoryName: string;
         mirrorRepositoryName: string;
         snapshot: PreSnapshot;
         pkg: PackageConfig;
         onProgress: (data: Progress) => void;
-    }): Promise<void>;
+    }): Promise<{
+        bytes: number;
+    }>;
     dataFormat(result: Listr3TaskResultEnd<Context>[], options?: {
         streams?: Streams;
         verbose?: number;

package/lib/actions/BackupAction.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BackupAction = void 0;
 const DataFormat_1 = require("../utils/DataFormat");
+const bytes_1 = require("../utils/bytes");
 const cli_1 = require("../utils/cli");
 const config_1 = require("../utils/datatruck/config");
 const report_list_1 = require("../utils/datatruck/report-list");
@@ -20,6 +21,7 @@ const assert_1 = require("assert");
 const chalk_1 = __importDefault(require("chalk"));
 const crypto_1 = require("crypto");
 const dayjs_1 = __importDefault(require("dayjs"));
+const os_1 = require("os");
 class BackupAction {
     config;
     options;
@@ -72,7 +74,7 @@ class BackupAction {
             await repo.ensureFreeDiskSpace(repoConfig.config, this.config.minFreeDiskSpace);
         const packageConfig = pkg.repositoryConfigs?.find((config) => config.type === repoConfig.type &&
             (!config.names || config.names.includes(repoConfig.name)))?.config;
-        await repo.backup({
+        return await repo.backup({
             options: this.options,
             snapshot: data.snapshot,
             package: pkg,
@@ -87,7 +89,7 @@ class BackupAction {
         const mirrorRepo = await (0, repository_1.createAndInitRepo)(mirrorRepoConfig, this.options.verbose);
         if (this.config.minFreeDiskSpace)
             await mirrorRepo.ensureFreeDiskSpace(mirrorRepoConfig.config, this.config.minFreeDiskSpace);
-        await repo.copy({
+        return await repo.copy({
             options: this.options,
             package: data.pkg,
             snapshot: data.snapshot,
@@ -105,8 +107,14 @@ class BackupAction {
             return (0, cli_1.renderListTaskItem)(item, color, {
                 snapshot: (data) => data.id,
                 task: (data) => [data.packageName, data.taskName],
-                backup: (data) => [data.packageName, g(data.repositoryName)],
-                copy: (data) => [data.packageName, g(data.mirrorRepositoryName)],
+                backup: (data) => [
+                    data.packageName,
+                    g([data.repositoryName, (0, bytes_1.formatBytes)(data.bytes)].join(" ")),
+                ],
+                copy: (data) => [
+                    data.packageName,
+                    g([data.mirrorRepositoryName, (0, bytes_1.formatBytes)(data.bytes)].join(" ")),
+                ],
                 prune: (data) => [data.packageName, g(`${data.pruned}/${data.total}`)],
                 cleanup: () => "",
                 report: (data) => data.type,
@@ -220,6 +228,7 @@ class BackupAction {
                                 data: {
                                     packageName: pkg.name,
                                     repositoryName: repositoryName,
+                                    bytes: 0,
                                 },
                                 title: {
                                     initial: `Create backup: ${pkg.name} (${repositoryName})`,
@@ -229,19 +238,20 @@ class BackupAction {
                                 },
                                 exitOnError: false,
                                 runWrapper: gc.cleanupOnFinish.bind(gc),
-                                run: async (task) => {
+                                run: async (task, data) => {
                                     const taskSummary = pkg.task
                                         ? l.result("task", pkg.name)
                                         : undefined;
                                     if (taskSummary?.error)
                                         throw new Error(`Task failed`);
-                                    await this.backup({
+                                    const backup = await this.backup({
                                         pkg,
                                         repositoryName,
                                         snapshot,
                                         snapshotPath: taskResult?.snapshotPath,
                                         onProgress: (p) => pm.update(p, (t) => (task.output = t)),
                                     });
+                                    data.bytes = backup.bytes;
                                 },
                             })), l.$task({
                                 key: "cleanup",
@@ -263,6 +273,7 @@ class BackupAction {
                                     packageName: pkg.name,
                                     repositoryName: name,
                                     mirrorRepositoryName: mirror,
+                                    bytes: 0,
                                 },
                                 title: {
                                     initial: `Copy snapshot: ${pkg.name} (${mirror})`,
@@ -272,20 +283,21 @@ class BackupAction {
                                 },
                                 exitOnError: false,
                                 runWrapper: gc.cleanup.bind(gc),
-                                run: async (task) => {
+                                run: async (task, data) => {
                                     const backupSummary = l.result("backup", [
                                         pkg.name,
                                         name,
                                     ]);
                                     if (backupSummary.error)
                                         throw new Error(`Backup failed`);
-                                    await this.copy({
+                                    const copy = await this.copy({
                                         repositoryName: name,
                                         mirrorRepositoryName: mirror,
                                         pkg,
                                         snapshot,
                                         onProgress: (p) => pm.update(p, (t) => (task.output = t)),
                                     });
+                                    data.bytes = copy.bytes;
                                 },
                             })), !!this.options.prune &&
                                 l.$task({
@@ -317,6 +329,8 @@ class BackupAction {
                                 }));
                         }),
                         ...(0, report_list_1.createReportListTasks)(l, {
+                            hostname: this.config.hostname ?? (0, os_1.hostname)(),
+                            action: "backup",
                             reports: this.config.reports || [],
                             verbose: this.options.verbose,
                             onMessage: (result, report) => this.dataFormat(result).format(report.format ?? "list"),

package/lib/actions/CopyAction.d.ts

@@ -31,6 +31,7 @@ export type Context = {
         repositoryName: string;
         mirrorRepositoryName: string;
         skipped: boolean;
+        bytes: number;
     };
 } & ReportListTaskContext;
 export declare class CopyAction<TRequired extends boolean = true> {
@@ -50,6 +51,8 @@ export declare class CopyAction<TRequired extends boolean = true> {
         mirrorConfig: RepositoryConfig;
         snapshot: Snapshot;
         onProgress: (p: Progress) => void;
-    }): Promise<void>;
+    }): Promise<{
+        bytes: number;
+    }>;
     exec(): Promise<(import("../utils/list").List3SummaryResult | import("../utils/list").Listr3TaskResult<Context>)[]>;
 }

package/lib/actions/CopyAction.js

@@ -50,6 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CopyAction = void 0;
 const DataFormat_1 = require("../utils/DataFormat");
+const bytes_1 = require("../utils/bytes");
 const cli_1 = require("../utils/cli");
 const config_1 = require("../utils/datatruck/config");
 const report_list_1 = require("../utils/datatruck/report-list");
@@ -61,6 +62,7 @@ const object_1 = require("../utils/object");
 const progress_1 = require("../utils/progress");
 const temp_1 = require("../utils/temp");
 const chalk_1 = __importDefault(require("chalk"));
+const os_1 = require("os");
 class CopyAction {
     config;
     options;
@@ -79,7 +81,11 @@ class CopyAction {
                 snapshots: (data) => data.snapshots.length,
                 copy: (data) => [
                     data.packageName,
-                    g([data.snapshotId.slice(0, 8), data.mirrorRepositoryName].join(" ")),
+                    g([
+                        data.snapshotId.slice(0, 8),
+                        data.mirrorRepositoryName,
+                        (0, bytes_1.formatBytes)(data.bytes),
+                    ].join(" ")),
                 ],
                 report: (data) => data.type,
                 summary: (data) => ({
@@ -150,7 +156,7 @@ class CopyAction {
             });
             if (this.config.minFreeDiskSpace)
                 await mirrorRepo.ensureFreeDiskSpace(mirrorConfig.config, this.config.minFreeDiskSpace);
-            await mirrorRepo.backup({
+            return await mirrorRepo.backup({
                 options: {
                     verbose: this.options.verbose,
                     tags: snapshot.tags,
@@ -219,6 +225,7 @@ class CopyAction {
                                 packageName: snapshot.packageName,
                                 repositoryName: repoConfig.name,
                                 mirrorRepositoryName: repo2.name,
+                                bytes: 0,
                                 skipped: false,
                             },
                             title: {
@@ -249,16 +256,17 @@ class CopyAction {
                                     mirrorConfig,
                                 ]);
                                 if (sourceRepo.has()) {
-                                    await sourceRepo.get().copy({
+                                    const copy = await sourceRepo.get().copy({
                                         mirrorRepositoryConfig: mirrorConfig.config,
                                         options: { verbose: this.options.verbose },
                                         package: { name: snapshot.packageName },
                                         snapshot,
                                         onProgress: (p) => pm.update(p, (d) => (task.output = d)),
                                     });
+                                    data.bytes = copy.bytes;
                                 }
                                 else {
-                                    await this.copyCrossRepository({
+                                    const copy = await this.copyCrossRepository({
                                         mirrorConfig,
                                         mirrorRepo,
                                         repo,
@@ -266,6 +274,7 @@ class CopyAction {
                                         snapshot,
                                         onProgress: (p) => pm.update(p, (d) => (task.output = d)),
                                     });
+                                    data.bytes = copy.bytes;
                                     sourceRepo.set(mirrorRepo);
                                 }
                             },
@@ -274,6 +283,8 @@ class CopyAction {
                 },
             }),
             ...(0, report_list_1.createReportListTasks)(l, {
+                hostname: this.config.hostname ?? (0, os_1.hostname)(),
+                action: "copy",
                 reports: this.config.reports || [],
                 verbose: this.options.verbose,
                 onMessage: (result, report) => this.dataFormat(result).format(report.format ?? "list"),

package/lib/commands/BackupCommand.d.ts

@@ -25,12 +25,14 @@ export declare class BackupCommand extends CommandAbstract<BackupCommandOptions<
             backup: {
                 packageName: string;
                 repositoryName: string;
+                bytes: number;
             };
             cleanup: {};
             copy: {
                 packageName: string;
                 repositoryName: string;
                 mirrorRepositoryName: string;
+                bytes: number;
             };
             prune: {
                 packageName: string;

package/lib/repositories/DatatruckRepository.d.ts

@@ -50,8 +50,12 @@ export declare class DatatruckRepository extends RepositoryAbstract<DatatruckRep
     init(data: RepoInitData): Promise<void>;
     prune(data: RepoPruneData): Promise<void>;
     fetchSnapshots(data: RepoFetchSnapshotsData): Promise<Snapshot[]>;
-    backup(data: RepoBackupData<DatatruckPackageRepositoryConfig>): Promise<void>;
-    copy(data: RepoCopyData<DatatruckRepositoryConfig>): Promise<void>;
+    backup(data: RepoBackupData<DatatruckPackageRepositoryConfig>): Promise<{
+        bytes: number;
+    }>;
+    copy(data: RepoCopyData<DatatruckRepositoryConfig>): Promise<{
+        bytes: number;
+    }>;
     restore(data: RepoRestoreData<DatatruckPackageRepositoryConfig>): Promise<void>;
 }
 export {};

package/lib/repositories/DatatruckRepository.js

@@ -203,6 +203,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         }
         scanner.end();
         // Meta
+        const size = Object.values(tarStats).reduce((total, { size }) => total + size, 0);
         const metaPath = `${snapshotName}/meta.json`;
         const nodePkg = (0, fs_1.parsePackageFile)();
         const meta = {
@@ -212,12 +213,15 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
             package: data.package.name,
             task: data.package.task?.name,
             version: nodePkg.version,
-            size: Object.values(tarStats).reduce((total, { size }) => total + size, 0),
+            size,
             tarStats,
         };
         if (data.options.verbose)
             (0, cli_1.logExec)(`Writing metadata into ${fs.resolvePath(metaPath)}`);
         await fs.writeFile(`${snapshotName}/meta.json`, JSON.stringify(meta));
+        return {
+            bytes: size,
+        };
     }
     async copy(data) {
         const sourceFs = (0, client_1.createFs)(this.config.backend);
@@ -236,6 +240,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         await targetFs.ensureEmptyDir(tmpSnapshotName);
         const entries = await sourceFs.readdir(snapshotName);
         const total = entries.length;
+        let bytes = 0;
         let current = 0;
         for (const entry of entries) {
             const absolute = {
@@ -250,7 +255,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
             const sourceEntry = `${snapshotName}/${entry}`;
             const targetEntry = `${tmpSnapshotName}/${entry}`;
             if (targetFs.isLocal()) {
-                await sourceFs.download(sourceEntry, targetFs.resolvePath(targetEntry), {
+                const downloaded = await sourceFs.download(sourceEntry, targetFs.resolvePath(targetEntry), {
                     onProgress: (progress) => data.onProgress({
                         absolute,
                         relative: {
@@ -260,12 +265,13 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                         },
                     }),
                 });
+                bytes += downloaded.bytes;
             }
             else {
                 const tempDir = await (0, temp_1.mkTmpDir)(exports.datatruckRepositoryName, "repo", "remote-copy", entry);
                 const tempFile = (0, path_1.join)(tempDir, entry);
                 try {
-                    await sourceFs.download(sourceEntry, tempFile, {
+                    const downloaded = await sourceFs.download(sourceEntry, tempFile, {
                         onProgress: (progress) => data.onProgress({
                             absolute,
                             relative: {
@@ -275,6 +281,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                             },
                         }),
                     });
+                    bytes += downloaded.bytes;
                     await targetFs.upload(tempFile, targetEntry);
                 }
                 finally {
@@ -283,6 +290,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
             }
         }
         await targetFs.rename(tmpSnapshotName, snapshotName);
+        return { bytes };
     }
     async restore(data) {
         const fs = (0, client_1.createFs)(this.config.backend);

package/lib/repositories/GitRepository.d.ts

@@ -22,7 +22,11 @@ export declare class GitRepository extends RepositoryAbstract<GitRepositoryConfi
     init(data: RepoInitData): Promise<void>;
     prune(data: RepoPruneData): Promise<void>;
     fetchSnapshots(data: RepoFetchSnapshotsData): Promise<Snapshot[]>;
-    backup(data: RepoBackupData<GitPackageRepositoryConfig>): Promise<void>;
-    copy(data: RepoCopyData<GitRepositoryConfig>): Promise<void>;
+    backup(data: RepoBackupData<GitPackageRepositoryConfig>): Promise<{
+        bytes: number;
+    }>;
+    copy(data: RepoCopyData<GitRepositoryConfig>): Promise<{
+        bytes: number;
+    }>;
     restore(data: RepoRestoreData<GitPackageRepositoryConfig>): Promise<void>;
 }

package/lib/repositories/GitRepository.js

@@ -187,6 +187,8 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
         if (await git.haveChanges())
             await git.exec(["commit", "-m", data.snapshot.id]);
         const nodePkg = (0, fs_1.parsePackageFile)();
+        const size = (await (0, fs_1.fastFolderSizeAsync)(tmpPath)) -
+            (await (0, fs_1.fastFolderSizeAsync)((0, path_1.join)(tmpPath, ".git")));
         const meta = GitRepository.buildSnapshotTag({
             id: data.snapshot.id,
             shortId: data.snapshot.id.slice(0, 8),
@@ -195,16 +197,19 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
             package: data.package.name,
             task: data.package.task?.name,
             version: nodePkg.version,
-            size: ((await (0, fs_1.fastFolderSizeAsync)(tmpPath)) -
-                (await (0, fs_1.fastFolderSizeAsync)((0, path_1.join)(tmpPath, ".git")))).toString(),
+            size: size.toString(),
         });
         await git.addTag(meta.name, meta.message);
         await git.push({ branchName });
         await git.pushTags();
         await (0, promises_1.rm)(tmpPath, { recursive: true });
+        return {
+            bytes: size,
+        };
     }
-    copy(data) {
+    async copy(data) {
         throw new Error("Method not implemented.");
+        return { bytes: 0 };
     }
     async restore(data) {
         const restorePath = data.snapshotPath;

package/lib/repositories/RepositoryAbstract.d.ts

@@ -83,7 +83,11 @@ export declare abstract class RepositoryAbstract<TConfig> {
     abstract init(data: RepoInitData): Promise<void>;
     abstract prune(data: RepoPruneData): Promise<void>;
     abstract fetchSnapshots(data: RepoFetchSnapshotsData): Promise<Snapshot[]>;
-    abstract copy(data: RepoCopyData<TConfig>): Promise<void>;
-    abstract backup(data: RepoBackupData<unknown>): Promise<void>;
+    abstract copy(data: RepoCopyData<TConfig>): Promise<{
+        bytes: number;
+    }>;
+    abstract backup(data: RepoBackupData<unknown>): Promise<{
+        bytes: number;
+    }>;
     abstract restore(data: RepoRestoreData<unknown>): Promise<void>;
 }

package/lib/repositories/ResticRepository.d.ts

@@ -33,7 +33,11 @@ export declare class ResticRepository extends RepositoryAbstract<ResticRepositor
     init(data: RepoInitData): Promise<void>;
     fetchSnapshots(data: RepoFetchSnapshotsData): Promise<Snapshot[]>;
     prune(data: RepoPruneData): Promise<void>;
-    backup(data: RepoBackupData<ResticPackageRepositoryConfig>): Promise<void>;
-    copy(data: RepoCopyData<ResticRepositoryConfig>): Promise<void>;
+    backup(data: RepoBackupData<ResticPackageRepositoryConfig>): Promise<{
+        bytes: number;
+    }>;
+    copy(data: RepoCopyData<ResticRepositoryConfig>): Promise<{
+        bytes: number;
+    }>;
     restore(data: RepoRestoreData<ResticPackageRepositoryConfig>): Promise<void>;
 }

package/lib/repositories/ResticRepository.js

@@ -204,10 +204,6 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             allowEmptySnapshot: true,
             excludeFile: gitignorePath ? [gitignorePath] : undefined,
             parent: lastSnapshot?.id,
-            // https://github.com/restic/restic/pull/3200
-            ...((await restic.checkBackupSetPathSupport()) && {
-                setPaths: [`/datatruck/${data.package.name}`],
-            }),
             tags: [
                 ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.ID, data.snapshot.id),
                 ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.SHORT_ID, data.snapshot.id.slice(0, 8)),
@@ -267,6 +263,9 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 percent: 100,
             },
         });
+        return {
+            bytes: resticTotalBytes,
+        };
     }
     async copy(data) {
         const config = data.mirrorRepositoryConfig;
@@ -289,9 +288,16 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             },
             log: data.options.verbose,
         });
+        let bytes = 0;
         await restic.copy({
             id: snapshot.originalId,
+            onStream(data) {
+                if (data.message_type === "status") {
+                    bytes = data.total_bytes;
+                }
+            },
         });
+        return { bytes };
     }
     async restore(data) {
         const restorePath = data.snapshotPath;
@@ -310,7 +316,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         await restic.restore({
             id: snapshot.originalId,
             target: restorePath,
-            onStream: async (streamData) => {
+            onStream: (streamData) => {
                 if (streamData.message_type === "restore-status") {
                     const current = Math.min(streamData.total_bytes, snapshot.size);
                     data.onProgress({

package/lib/tasks/GitTask.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GitTask = exports.gitTaskName = void 0;
+const async_process_1 = require("../utils/async-process");
 const cli_1 = require("../utils/cli");
 const fs_1 = require("../utils/fs");
 const math_1 = require("../utils/math");
-const process_1 = require("../utils/process");
 const temp_1 = require("../utils/temp");
 const TaskAbstract_1 = require("./TaskAbstract");
 const assert_1 = require("assert");
@@ -12,7 +12,6 @@ const fs_2 = require("fs");
 const promises_1 = require("fs/promises");
 const micromatch_1 = require("micromatch");
 const path_1 = require("path");
-const readline_1 = require("readline");
 exports.gitTaskName = "git";
 class GitTask extends TaskAbstract_1.TaskAbstract {
     verbose;
@@ -34,10 +33,9 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
                 description: "Creating bundle",
             },
         });
-        await (0, process_1.exec)(this.command, ["bundle", "create", bundlePath, "--all"], {
+        await async_process_1.AsyncProcess.exec(this.command, ["bundle", "create", bundlePath, "--all"], {
             cwd: path,
-        }, {
-            log: this.verbose,
+            $log: this.verbose,
         });
         // Config
         if (this.config.includeConfig ?? true) {
@@ -70,48 +68,33 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
                 continue;
             option.pathsPath = (0, path_1.join)(snapshotPath, `repo.${option.name}-paths.txt`);
             const stream = (0, fs_2.createWriteStream)(option.pathsPath);
-            let streamError;
-            stream.on("error", (e) => (streamError = e));
-            try {
-                await (0, process_1.exec)(this.command, [
-                    "-c",
-                    "core.quotepath=off",
-                    "ls-files",
-                    ...option.argv,
-                    "--exclude-standard",
-                ], {
-                    cwd: data.package.path,
-                }, {
-                    log: {
-                        exec: this.verbose,
-                    },
-                    onSpawn: (p) => {
-                        const iface = (0, readline_1.createInterface)(p.stdout, stream);
-                        iface.on("close", () => stream.end());
-                        iface.on("line", (path) => {
-                            path = path.trim();
-                            if (!path.length)
-                                return;
-                            let found = false;
-                            if (option.include === true) {
-                                found = true;
-                            }
-                            else if (option.include) {
-                                found = (0, micromatch_1.isMatch)(path, option.include);
-                            }
-                            if (found) {
-                                total++;
-                                stream.write(`${path}\n`);
-                            }
-                        });
-                    },
-                });
-            }
-            finally {
-                await new Promise((resolve) => stream.end(resolve));
-                if (streamError)
-                    throw streamError;
-            }
+            const p = new async_process_1.AsyncProcess(this.command, [
+                "-c",
+                "core.quotepath=off",
+                "ls-files",
+                ...option.argv,
+                "--exclude-standard",
+            ], {
+                cwd: data.package.path,
+                $log: this.verbose,
+            });
+            await Promise.all([
+                p.stdout.parseLines((path) => {
+                    let found = false;
+                    if (option.include === true) {
+                        found = true;
+                    }
+                    else if (option.include) {
+                        found = (0, micromatch_1.isMatch)(path, option.include);
+                    }
+                    if (found) {
+                        total++;
+                        stream.write(`${path}\n`);
+                    }
+                }),
+                p.child.on("close", () => stream.end()),
+                (0, fs_1.waitForClose)(stream),
+            ]);
         }
         // Copy
         for (const option of lsFilesConfig) {
@@ -176,10 +159,9 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
         };
         // Bundle
         const bundlePath = (0, path_1.join)(snapshotPath, "repo.bundle");
-        await (0, process_1.exec)(this.command, ["clone", bundlePath, "."], {
+        await async_process_1.AsyncProcess.exec(this.command, ["clone", bundlePath, "."], {
             cwd: restorePath,
-        }, {
-            log: this.verbose,
+            $log: this.verbose,
         });
         await incrementProgress();
         // Config