@datatruck/cli 0.27.0 → 0.29.0

package/Repository/GitRepository.js

@@ -4,14 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GitRepository = exports.gitPackageRepositoryDefinition = exports.gitRepositoryDefinition = exports.gitRepositoryName = void 0;
-const AppError_1 = require("../Error/AppError");
 const Git_1 = require("../utils/Git");
 const cli_1 = require("../utils/cli");
 const paths_1 = require("../utils/datatruck/paths");
 const fs_1 = require("../utils/fs");
 const string_1 = require("../utils/string");
+const temp_1 = require("../utils/temp");
 const RepositoryAbstract_1 = require("./RepositoryAbstract");
-const assert_1 = require("assert");
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const promises_1 = require("fs/promises");
 const micromatch_1 = require("micromatch");
@@ -33,9 +32,13 @@ exports.gitPackageRepositoryDefinition = {
 };
 class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
     static refPrefix = "dt";
-    onGetSource() {
+    getSource() {
         return this.config.repo;
     }
+    async fetchDiskStats(config) {
+        if ((0, fs_1.isLocalDir)(config.repo))
+            return await (0, fs_1.fetchDiskStats)(config.repo);
+    }
     static buildSnapshotTagName(tag) {
         return `${GitRepository.refPrefix}/${tag.package}/${tag.id}`;
     }
@@ -56,9 +59,9 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
     static buildBranchName(packageName) {
         return `${GitRepository.refPrefix}/${packageName}`;
     }
-    async onInit(data) {
+    async init(data) {
         const git = new Git_1.Git({
-            dir: (0, fs_1.tmpDir)(GitRepository.name + "-snapshot"),
+            dir: (0, temp_1.tmpDir)(exports.gitRepositoryName, "repository", "init"),
             log: data.options.verbose,
         });
         if (await git.canBeInit(this.config.repo)) {
@@ -83,9 +86,9 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
             await git.push({ branchName });
         }
     }
-    async onPrune(data) {
+    async prune(data) {
         const git = new Git_1.Git({
-            dir: await this.mkTmpDir(GitRepository.name + "-snapshot"),
+            dir: await (0, temp_1.mkTmpDir)(exports.gitRepositoryName, "repo", "prune"),
             log: data.options.verbose,
         });
         const branchName = GitRepository.buildBranchName(data.snapshot.packageName);
@@ -106,9 +109,9 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
         await git.exec(["push", "origin", branchName, "--force-with-lease"]);
         await git.exec(["push", "--delete", "origin", data.snapshot.originalId]);
     }
-    async onSnapshots(data) {
+    async fetchSnapshots(data) {
         const git = new Git_1.Git({
-            dir: await this.mkTmpDir(GitRepository.name + "-snapshot"),
+            dir: await (0, temp_1.mkTmpDir)(exports.gitRepositoryName, "repo", "snapshots"),
             log: data.options.verbose,
         });
         const pkgPatterns = (0, string_1.makePathPatterns)(data.options.packageNames);
@@ -143,13 +146,10 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
         }, [])
             .sort((a, b) => a.date.localeCompare(b.date));
     }
-    async onBackup(data) {
+    async backup(data) {
         const pkg = data.package;
-        const sourcePath = data.targetPath ?? pkg.path;
-        (0, assert_1.ok)(typeof sourcePath === "string");
-        if (!(await (0, fs_1.existsDir)(sourcePath)))
-            throw new AppError_1.AppError(`Package path not exists: ${sourcePath}`);
-        const tmpPath = await this.mkTmpDir(GitRepository.name + "-backup");
+        const path = pkg.path;
+        const tmpPath = await (0, temp_1.mkTmpDir)(exports.gitRepositoryName, "repo", "backup");
         const branchName = GitRepository.buildBranchName(data.package.name);
         const git = new Git_1.Git({
             dir: tmpPath,
@@ -169,7 +169,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
         const backupPathsOptions = {
             package: data.package,
             snapshot: data.snapshot,
-            targetPath: sourcePath,
+            path: path,
             verbose: data.options.verbose,
         };
         const include = await (0, paths_1.parseBackupPaths)(pkg.include ?? ["**"], backupPathsOptions);
@@ -177,13 +177,13 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
             ? await (0, paths_1.parseBackupPaths)(pkg.exclude, backupPathsOptions)
             : undefined;
         const stream = await (0, fast_glob_1.default)(include, {
-            cwd: sourcePath,
+            cwd: path,
             ignore: exclude,
             dot: true,
         });
         let files = 0;
         for await (const entry of stream) {
-            const source = (0, path_1.join)(sourcePath, entry);
+            const source = (0, path_1.join)(path, entry);
             const target = (0, path_1.join)(tmpPath, entry);
             const dir = (0, path_1.dirname)(target);
             if (!createdPaths.includes(dir)) {
@@ -215,16 +215,13 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
         await git.addTag(meta.name, meta.message);
         await git.push({ branchName });
         await git.pushTags();
-        await (0, promises_1.rm)(tmpPath, {
-            recursive: true,
-        });
+        await (0, promises_1.rm)(tmpPath, { recursive: true });
     }
-    onCopyBackup(data) {
+    copy(data) {
         throw new Error("Method not implemented.");
     }
-    async onRestore(data) {
-        const restorePath = data.targetPath ?? data.package.restorePath;
-        (0, assert_1.ok)(restorePath);
+    async restore(data) {
+        const restorePath = data.snapshotPath;
         const tagName = GitRepository.buildSnapshotTagName({
             id: data.snapshot.id,
             package: data.package.name,

package/Repository/RepositoryAbstract.d.ts

@@ -1,52 +1,54 @@
-import type { BackupActionOptionsType } from "../Action/BackupAction";
-import type { InitActionOptionsType } from "../Action/InitAction";
-import type { RestoreActionOptionsType } from "../Action/RestoreAction";
-import type { SnapshotExtendedType, SnapshotsActionOptionsType } from "../Action/SnapshotsAction";
+import type { BackupActionOptions } from "../Action/BackupAction";
+import type { InitActionOptions } from "../Action/InitAction";
+import type { RestoreActionOptions } from "../Action/RestoreAction";
+import type { ExtendedSnapshot, SnapshotsActionOptions } from "../Action/SnapshotsAction";
 import type { PackageConfigType } from "../Config/PackageConfig";
 import type { RepositoryConfigType } from "../Config/RepositoryConfig";
-import { Progress } from "../utils/progress";
-export type SnapshotType = {
+import { type DiskStats } from "../utils/fs";
+import type { Progress } from "../utils/progress";
+export type PreSnapshot = {
     id: string;
     date: string;
 };
-export type SnapshotResultType = SnapshotType & {
+export type Snapshot = PreSnapshot & {
     originalId: string;
     packageName: string;
     packageTaskName: string | undefined;
     tags: string[];
     size: number;
 };
-export type InitDataType = {
-    options: InitActionOptionsType;
+export type RepoInitData = {
+    options: InitActionOptions;
 };
-export type SnapshotsDataType = {
-    options: Pick<SnapshotsActionOptionsType, "ids" | "packageNames" | "packageTaskNames" | "verbose" | "tags">;
+export type RepoFetchSnapshotsData = {
+    options: Pick<SnapshotsActionOptions, "ids" | "packageNames" | "packageTaskNames" | "verbose" | "tags">;
 };
-export type CopyBackupType<TRepositoryConfig> = {
-    options: BackupActionOptionsType;
-    snapshot: SnapshotType;
+export type RepoCopyData<TRepositoryConfig> = {
+    options: BackupActionOptions;
+    snapshot: PreSnapshot;
     package: PackageConfigType;
     mirrorRepositoryConfig: TRepositoryConfig;
-    onProgress: (data: Progress) => Promise<void>;
+    onProgress: (data: Progress) => void;
 };
-export type BackupDataType<TPackageConfig> = {
-    options: BackupActionOptionsType;
-    snapshot: SnapshotType;
-    package: PackageConfigType;
-    targetPath: string | undefined;
+export type RepoBackupData<TPackageConfig> = {
+    options: BackupActionOptions;
+    snapshot: PreSnapshot;
+    package: Omit<PackageConfigType, "path"> & {
+        path: string;
+    };
     packageConfig: TPackageConfig | undefined;
-    onProgress: (data: Progress) => Promise<void>;
+    onProgress: (data: Progress) => void;
 };
-export type RestoreDataType<TPackageConfig> = {
-    options: RestoreActionOptionsType;
-    snapshot: SnapshotType;
+export type RepoRestoreData<TPackageConfig> = {
+    options: RestoreActionOptions;
+    snapshot: PreSnapshot;
     package: PackageConfigType;
-    targetPath: string | undefined;
+    snapshotPath: string;
     packageConfig: TPackageConfig;
-    onProgress: (data: Progress) => Promise<void>;
+    onProgress: (data: Progress) => void;
 };
-export type PruneDataType = {
-    snapshot: SnapshotExtendedType;
+export type RepoPruneData = {
+    snapshot: ExtendedSnapshot;
     options: {
         verbose?: boolean;
     };
@@ -74,14 +76,14 @@ export type SnapshotTagObjectType = {
 export declare abstract class RepositoryAbstract<TConfig> {
     readonly repository: RepositoryConfigType;
     readonly config: TConfig;
-    readonly tmpDirs: string[];
     constructor(repository: RepositoryConfigType);
-    mkTmpDir(prefix: string, id?: string): Promise<string>;
-    abstract onGetSource(): string;
-    abstract onInit(data: InitDataType): Promise<void>;
-    abstract onPrune(data: PruneDataType): Promise<void>;
-    abstract onSnapshots(data: SnapshotsDataType): Promise<SnapshotResultType[]>;
-    abstract onCopyBackup(data: CopyBackupType<TConfig>): Promise<void>;
-    abstract onBackup(data: BackupDataType<unknown>): Promise<void>;
-    abstract onRestore(data: RestoreDataType<unknown>): Promise<void>;
+    abstract getSource(): string;
+    abstract fetchDiskStats(config: TConfig): Promise<DiskStats | undefined>;
+    ensureFreeDiskSpace(config: TConfig, minFreeDiskSpace: number | string): Promise<void>;
+    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 restore(data: RepoRestoreData<unknown>): Promise<void>;
 }

package/Repository/RepositoryAbstract.js

@@ -16,15 +16,14 @@ var SnapshotTagEnum;
 class RepositoryAbstract {
     repository;
     config;
-    tmpDirs = [];
     constructor(repository) {
         this.repository = repository;
         this.config = repository.config;
     }
-    async mkTmpDir(prefix, id) {
-        const dir = await (0, fs_1.mkTmpDir)(prefix, id);
-        this.tmpDirs.push(dir);
-        return dir;
+    async ensureFreeDiskSpace(config, minFreeDiskSpace) {
+        const diskStats = await this.fetchDiskStats(config);
+        if (diskStats)
+            await (0, fs_1.ensureFreeDiskSpace)(diskStats, minFreeDiskSpace);
     }
 }
 exports.RepositoryAbstract = RepositoryAbstract;

package/Repository/ResticRepository.d.ts

@@ -1,5 +1,5 @@
 import { RepositoryType } from "../utils/Restic";
-import { RepositoryAbstract, BackupDataType, InitDataType, RestoreDataType, SnapshotsDataType, SnapshotResultType, SnapshotTagObjectType, SnapshotTagEnum, PruneDataType, CopyBackupType } from "./RepositoryAbstract";
+import { RepositoryAbstract, RepoBackupData, RepoInitData, RepoRestoreData, RepoFetchSnapshotsData, Snapshot, SnapshotTagObjectType, SnapshotTagEnum, RepoPruneData, RepoCopyData } from "./RepositoryAbstract";
 import { JSONSchema7 } from "json-schema";
 export type ResticRepositoryConfigType = {
     password: string | {
@@ -31,11 +31,12 @@ export declare class ResticRepository extends RepositoryAbstract<ResticRepositor
     static parseSnapshotTags(tags: string[]): SnapshotTagObjectType & {
         tags: string[];
     };
-    onGetSource(): string;
-    onInit(data: InitDataType): Promise<void>;
-    onSnapshots(data: SnapshotsDataType): Promise<SnapshotResultType[]>;
-    onPrune(data: PruneDataType): Promise<void>;
-    onBackup(data: BackupDataType<ResticPackageRepositoryConfigType>): Promise<void>;
-    onCopyBackup(data: CopyBackupType<ResticRepositoryConfigType>): Promise<void>;
-    onRestore(data: RestoreDataType<ResticPackageRepositoryConfigType>): Promise<void>;
+    getSource(): string;
+    fetchDiskStats(config: ResticRepositoryConfigType): Promise<import("../utils/fs").DiskStats | undefined>;
+    init(data: RepoInitData): Promise<void>;
+    fetchSnapshots(data: RepoFetchSnapshotsData): Promise<Snapshot[]>;
+    prune(data: RepoPruneData): Promise<void>;
+    backup(data: RepoBackupData<ResticPackageRepositoryConfigType>): Promise<void>;
+    copy(data: RepoCopyData<ResticRepositoryConfigType>): Promise<void>;
+    restore(data: RepoRestoreData<ResticPackageRepositoryConfigType>): Promise<void>;
 }

package/Repository/ResticRepository.js

@@ -11,8 +11,8 @@ const paths_1 = require("../utils/datatruck/paths");
 const fs_1 = require("../utils/fs");
 const math_1 = require("../utils/math");
 const string_1 = require("../utils/string");
+const temp_1 = require("../utils/temp");
 const RepositoryAbstract_1 = require("./RepositoryAbstract");
-const assert_1 = require("assert");
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const promises_1 = require("fs/promises");
 const micromatch_1 = require("micromatch");
@@ -123,10 +123,14 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         }
         return result;
     }
-    onGetSource() {
+    getSource() {
         return (0, string_1.formatUri)({ ...this.config.repository, password: undefined });
     }
-    async onInit(data) {
+    async fetchDiskStats(config) {
+        if (config.repository.backend === "local" && config.repository.path)
+            return (0, fs_1.fetchDiskStats)(config.repository.path);
+    }
+    async init(data) {
         const restic = new Restic_1.Restic({
             env: await this.buildEnv(),
             log: data.options.verbose,
@@ -136,7 +140,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         if (!(await restic.checkRepository()))
             await restic.exec(["init"]);
     }
-    async onSnapshots(data) {
+    async fetchSnapshots(data) {
         const restic = new Restic_1.Restic({
             env: await this.buildEnv(),
             log: data.options.verbose,
@@ -172,7 +176,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             return items;
         }, []);
     }
-    async onPrune(data) {
+    async prune(data) {
         const restic = new Restic_1.Restic({
             env: await this.buildEnv(),
             log: data.options.verbose,
@@ -182,30 +186,29 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             prune: true,
         });
     }
-    async onBackup(data) {
+    async backup(data) {
         const restic = new Restic_1.Restic({
             env: await this.buildEnv(),
             log: data.options.verbose,
         });
         const pkg = data.package;
-        const sourcePath = data.targetPath ?? data.package.path;
-        (0, assert_1.ok)(sourcePath);
+        const path = data.package.path;
         let gitignorePath;
         const backupPathsOptions = {
             package: data.package,
             snapshot: data.snapshot,
-            targetPath: sourcePath,
+            path,
             verbose: data.options.verbose,
         };
         if (!pkg.include && pkg.exclude) {
             const exclude = await (0, paths_1.parseBackupPaths)(pkg.exclude, backupPathsOptions);
-            await data.onProgress({
+            data.onProgress({
                 relative: {
                     description: "Writing excluded paths list",
                 },
             });
-            const tmpDir = await this.mkTmpDir("restic-exclude");
-            const ignoredContents = (0, fs_1.fastglobToGitIgnore)(exclude, sourcePath).join("\n");
+            const tmpDir = await (0, temp_1.mkTmpDir)(exports.resticRepositoryName, "repo", "backup", "exclude");
+            const ignoredContents = (0, fs_1.fastglobToGitIgnore)(exclude, path).join("\n");
             gitignorePath = (0, path_1.join)(tmpDir, "ignored.txt");
             await (0, promises_1.writeFile)(gitignorePath, ignoredContents);
         }
@@ -215,7 +218,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 ? await (0, paths_1.parseBackupPaths)(pkg.exclude, backupPathsOptions)
                 : undefined;
             const stream = fast_glob_1.default.stream(include, {
-                cwd: sourcePath,
+                cwd: path,
                 ignore: exclude,
                 dot: true,
                 onlyFiles: true,
@@ -223,20 +226,20 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             });
             if (data.options.verbose)
                 (0, cli_1.logExec)(`Writing paths lists`);
-            await data.onProgress({
+            data.onProgress({
                 relative: {
                     description: "Writing excluded paths list",
                 },
             });
             gitignorePath = await (0, fs_1.writeGitIgnoreList)({
                 paths: stream,
-                outDir: await this.mkTmpDir("gitignore-list"),
+                outDir: await (0, temp_1.mkTmpDir)(exports.resticRepositoryName, "repo", "backup", "gitignore"),
             });
         }
         if (data.options.tags?.some((tag) => tag.startsWith(ResticRepository.refPrefix)))
             throw new AppError_1.AppError(`Tag prefix is not allowed`);
         const packageTag = ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.PACKAGE, data.package.name);
-        await data.onProgress({
+        data.onProgress({
             relative: {
                 description: "Fetching last snapshot",
             },
@@ -250,7 +253,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         let lastProgress;
         let totalFilesChanges = 0;
         const totalFilesChangesLimit = 10;
-        await data.onProgress({
+        data.onProgress({
             relative: {
                 description: "Executing backup action",
             },
@@ -258,7 +261,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         let resticSnapshotId;
         let resticTotalBytes;
         await restic.backup({
-            cwd: sourcePath,
+            cwd: path,
             paths: ["."],
             allowEmptySnapshot: true,
             excludeFile: gitignorePath ? [gitignorePath] : undefined,
@@ -280,7 +283,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
                     : []),
                 ...(data.options.tags ?? []),
             ],
-            createEmptyDir: async () => await this.mkTmpDir("empty"),
+            createEmptyDir: async () => await (0, temp_1.mkTmpDir)(exports.resticRepositoryName, "repo", "backup", "empty-dir"),
             onStream: async (streamData) => {
                 if (streamData.message_type === "status") {
                     let showProgressBar = false;
@@ -293,7 +296,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
                     else {
                         totalFilesChanges++;
                     }
-                    await data.onProgress((lastProgress = {
+                    data.onProgress((lastProgress = {
                         relative: {
                             description: "Copying file",
                             payload: streamData.current_files?.join(", ") ?? "-",
@@ -319,7 +322,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             throw new AppError_1.AppError(`Restic snapshot total bytes is not defined`);
         const sizeTag = ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.SIZE, resticTotalBytes.toString());
         await restic.exec(["tag", "--add", sizeTag, resticSnapshotId]);
-        await data.onProgress({
+        data.onProgress({
             absolute: {
                 total: lastProgress?.absolute?.total || 0,
                 current: lastProgress?.absolute?.total || 0,
@@ -327,9 +330,9 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             },
         });
     }
-    async onCopyBackup(data) {
+    async copy(data) {
         const config = data.mirrorRepositoryConfig;
-        const [snapshot] = await this.onSnapshots({
+        const [snapshot] = await this.fetchSnapshots({
             options: {
                 ids: [data.snapshot.id],
                 packageNames: [data.package.name],
@@ -351,14 +354,13 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             id: snapshot.originalId,
         });
     }
-    async onRestore(data) {
-        const restorePath = data.targetPath ?? data.package.restorePath;
-        (0, assert_1.ok)(restorePath);
+    async restore(data) {
+        const restorePath = data.snapshotPath;
         const restic = new Restic_1.Restic({
             env: await this.buildEnv(),
             log: data.options.verbose,
         });
-        const [snapshot] = await this.onSnapshots({
+        const [snapshot] = await this.fetchSnapshots({
             options: {
                 ids: [data.snapshot.id],
                 packageNames: [data.package.name],
@@ -372,7 +374,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             onStream: async (streamData) => {
                 if (streamData.message_type === "restore-status") {
                     const current = Math.min(streamData.total_bytes, snapshot.size);
-                    await data.onProgress({
+                    data.onProgress({
                         absolute: {
                             total: snapshot.size,
                             current,

package/Task/GitTask.d.ts

@@ -1,4 +1,4 @@
-import { BackupDataType, RestoreDataType, TaskAbstract } from "./TaskAbstract";
+import { TaskBackupData, TaskRestoreData, TaskAbstract } from "./TaskAbstract";
 import { JSONSchema7 } from "json-schema";
 export type GitTaskConfigType = {
     command?: string;
@@ -28,12 +28,11 @@ export declare const gitTaskDefinition: JSONSchema7;
 export declare class GitTask extends TaskAbstract<GitTaskConfigType> {
     protected verbose?: boolean;
     private get command();
-    onBeforeBackup(): Promise<{
-        targetPath: string;
+    backup(data: TaskBackupData): Promise<{
+        snapshotPath: string;
     }>;
-    onBackup(data: BackupDataType): Promise<void>;
-    onBeforeRestore(): Promise<{
-        targetPath: string;
+    prepareRestore(): Promise<{
+        snapshotPath: string;
     }>;
-    onRestore(data: RestoreDataType): Promise<void>;
+    restore(data: TaskRestoreData): Promise<void>;
 }

package/Task/GitTask.js

@@ -6,6 +6,7 @@ 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");
 const fs_2 = require("fs");
@@ -59,21 +60,17 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
     get command() {
         return this.config.command ?? "git";
     }
-    async onBeforeBackup() {
-        return {
-            targetPath: await this.mkTmpDir(GitTask.name),
-        };
-    }
-    async onBackup(data) {
+    async backup(data) {
+        if (!data.package.path)
+            throw new Error(`Path is required`);
+        const snapshotPath = await (0, temp_1.mkTmpDir)(exports.gitTaskName, "task", "backup", "snapshot");
         this.verbose = data.options.verbose;
         const config = this.config;
         const path = data.package.path;
-        const targetPath = data.targetPath;
         (0, assert_1.ok)(typeof path === "string");
-        (0, assert_1.ok)(typeof targetPath === "string");
         // Bundle
-        const bundlePath = (0, path_1.join)(targetPath, "repo.bundle");
-        await data.onProgress({
+        const bundlePath = (0, path_1.join)(snapshotPath, "repo.bundle");
+        data.onProgress({
             relative: {
                 description: "Creating bundle",
             },
@@ -85,7 +82,7 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
         });
         // Config
         if (this.config.includeConfig ?? true) {
-            const configPath = (0, path_1.join)(targetPath, "repo.config");
+            const configPath = (0, path_1.join)(snapshotPath, "repo.config");
             await (0, promises_1.copyFile)((0, path_1.join)(path, ".git", "config"), configPath);
         }
         // git ls-files
@@ -112,7 +109,7 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
         for (const option of lsFilesConfig) {
             if (!option.include)
                 continue;
-            option.pathsPath = (0, path_1.join)(targetPath, `repo.${option.name}-paths.txt`);
+            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));
@@ -161,7 +158,7 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
         for (const option of lsFilesConfig) {
             if (!option.include)
                 continue;
-            const outPath = (0, path_1.join)(targetPath, `repo.${option.name}`);
+            const outPath = (0, path_1.join)(snapshotPath, `repo.${option.name}`);
             await (0, fs_1.mkdirIfNotExists)(outPath);
             if (data.options.verbose)
                 (0, cli_1.logExec)(`Copying ${option.name} files to ${outPath}`);
@@ -171,12 +168,12 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
                     path: option.pathsPath,
                     basePath: path,
                 },
-                targetPath: outPath,
+                outPath: outPath,
                 skipNotFoundError: true,
                 concurrency: this.config.fileCopyConcurrency,
                 onPath: async ({ entryPath }) => {
                     currentFiles++;
-                    await data.onProgress({
+                    data.onProgress({
                         relative: {
                             description: "Copying file",
                             payload: entryPath,
@@ -191,26 +188,23 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
             });
             await (0, promises_1.rm)(option.pathsPath);
         }
+        return { snapshotPath };
     }
-    async onBeforeRestore() {
+    async prepareRestore() {
         return {
-            targetPath: await this.mkTmpDir(GitTask.name),
+            snapshotPath: await (0, temp_1.mkTmpDir)(exports.gitTaskName, "task", "restore", "snapshot"),
         };
     }
-    async onRestore(data) {
+    async restore(data) {
         this.verbose = data.options.verbose;
-        const restorePath = data.package.restorePath;
-        const targetPath = data.targetPath;
-        (0, assert_1.ok)(typeof restorePath === "string");
-        (0, assert_1.ok)(typeof targetPath === "string");
-        await (0, fs_1.mkdirIfNotExists)(restorePath);
-        await (0, fs_1.ensureEmptyDir)(restorePath);
+        const snapshotPath = data.snapshotPath;
+        const restorePath = await (0, fs_1.initEmptyDir)(data.package.restorePath ?? data.package.path);
         // Stats
         let totalFiles = 0;
         let currentFiles = 0;
-        await (0, fs_1.forEachFile)(targetPath, () => totalFiles++, true);
+        await (0, fs_1.forEachFile)(snapshotPath, () => totalFiles++, true);
         const incrementProgress = async (description, item, count = true) => {
-            await data.onProgress({
+            data.onProgress({
                 absolute: {
                     total: totalFiles,
                     current: Math.max(currentFiles, 0),
@@ -222,7 +216,7 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
                 currentFiles++;
         };
         // Bundle
-        const bundlePath = (0, path_1.join)(targetPath, "repo.bundle");
+        const bundlePath = (0, path_1.join)(snapshotPath, "repo.bundle");
         await (0, process_1.exec)(this.command, ["clone", bundlePath, "."], {
             cwd: restorePath,
         }, {
@@ -230,14 +224,14 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
         });
         await incrementProgress();
         // Config
-        const configPath = (0, path_1.join)(targetPath, "repo.config");
+        const configPath = (0, path_1.join)(snapshotPath, "repo.config");
         if (await (0, fs_1.existsFile)(configPath)) {
             await (0, promises_1.copyFile)(configPath, (0, path_1.join)(restorePath, ".git", "config"));
             await incrementProgress();
         }
         // ls-files
         for (const name of ["untracked", "modified", "ignored"]) {
-            const sourcePath = (0, path_1.join)(targetPath, `repo.${name}`);
+            const sourcePath = (0, path_1.join)(snapshotPath, `repo.${name}`);
             if (await (0, fs_1.existsDir)(sourcePath)) {
                 if (data.options.verbose)
                     (0, cli_1.logExec)(`Copying ${name} files to ${restorePath}`);
@@ -246,7 +240,7 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
                         type: "glob",
                         sourcePath,
                     },
-                    targetPath: restorePath,
+                    outPath: restorePath,
                     concurrency: this.config.fileCopyConcurrency,
                     onProgress: async (progress) => await incrementProgress(progress.type === "end" ? "Files copied" : "Copying file", progress.path, !progress.type),
                 });