@datatruck/cli 0.16.0 → 0.16.2

package/Config/RepositoryConfig.d.ts

@@ -3,9 +3,9 @@ import { GitRepositoryConfigType, gitRepositoryName } from "../Repository/GitRep
 import { ResticRepositoryConfigType, resticRepositoryName } from "../Repository/ResticRepository";
 import type { JSONSchema7 } from "json-schema";
 export declare const repositoryConfigDefinition: JSONSchema7;
-export declare type RepositoryConfigTypeType = RepositoryConfigType["type"];
-export declare type RepositoryConfigEnabledActionType = "backup" | "init" | "prune" | "restore" | "snapshots";
-export declare type RepositoryConfigType = {
+export type RepositoryConfigTypeType = RepositoryConfigType["type"];
+export type RepositoryConfigEnabledActionType = "backup" | "init" | "prune" | "restore" | "snapshots";
+export type RepositoryConfigType = {
     name: string;
     mirrorRepoNames?: string[];
     enabled?: boolean | {

package/Config/TaskConfig.d.ts

@@ -6,7 +6,7 @@ import { PostgresqlDumpTaskConfigType, postgresqlDumpTaskName } from "../Task/Po
 import { ScriptTaskConfigType, scriptTaskName } from "../Task/ScriptTask";
 import { JSONSchema7 } from "json-schema";
 export declare const taskConfigDefinition: JSONSchema7;
-export declare type TaskConfigType = {
+export type TaskConfigType = {
     name: typeof gitTaskName;
     config?: GitTaskConfigType;
 } | {

package/Decorator/EntityDecorator.d.ts

@@ -1,4 +1,4 @@
-export declare type EntityDecoratorDataType = {
+export type EntityDecoratorDataType = {
     tableName: string;
 };
 export declare function EntityDecorator(data: EntityDecoratorDataType): (constructor: Function) => void;

package/Factory/CommandFactory.d.ts

@@ -20,7 +20,7 @@ export declare enum CommandEnum {
     restoreSessions = "restore-sessions",
     cleanCache = "clean-cache"
 }
-export declare type OptionsMapType = {
+export type OptionsMapType = {
     [CommandEnum.config]: ConfigCommandOptionsType;
     [CommandEnum.init]: InitCommandOptionsType;
     [CommandEnum.snapshots]: SnapshotsCommandOptionsType;
@@ -31,7 +31,7 @@ export declare type OptionsMapType = {
     [CommandEnum.restoreSessions]: RestoreSessionsCommandOptionsType;
     [CommandEnum.cleanCache]: CleanCacheActionOptionsType;
 };
-export declare type LogMapType = {
+export type LogMapType = {
     [CommandEnum.config]: ConfigCommandLogType;
     [CommandEnum.init]: InitCommandLogType;
     [CommandEnum.snapshots]: SnapshotsCommandLogType;

package/Repository/DatatruckRepository.d.ts

@@ -1,6 +1,6 @@
 import { RepositoryAbstract, BackupDataType, InitDataType, RestoreDataType, SnapshotsDataType, SnapshotResultType, PruneDataType, CopyBackupType } from "./RepositoryAbstract";
 import type { JSONSchema7 } from "json-schema";
-export declare type MetaDataType = {
+export type MetaDataType = {
     id: string;
     date: string;
     package: string;
@@ -9,7 +9,7 @@ export declare type MetaDataType = {
     version: string;
     size: number;
 };
-export declare type DatatruckRepositoryConfigType = {
+export type DatatruckRepositoryConfigType = {
     outPath: string;
     compress?: boolean;
     /**
@@ -17,7 +17,7 @@ export declare type DatatruckRepositoryConfigType = {
      */
     fileCopyConcurrency?: number;
 };
-declare type CompressObjectType = {
+type CompressObjectType = {
     packs?: {
         name?: string;
         include: string[];
@@ -25,7 +25,7 @@ declare type CompressObjectType = {
         onePackByResult?: boolean;
     }[];
 };
-export declare type DatatruckPackageRepositoryConfigType = {
+export type DatatruckPackageRepositoryConfigType = {
     compress?: CompressObjectType | boolean;
 };
 export declare const datatruckRepositoryName = "datatruck";

package/Repository/DatatruckRepository.js

@@ -123,30 +123,29 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                     object.current += data.current;
                 }
             },
+            updateProgress: async (end) => {
+                const currentTime = perf_hooks_1.performance.now();
+                const diff = currentTime - lastTime;
+                if (end || diff > 1000) {
+                    await options.onProgress({
+                        relative: {
+                            description: end ? "Scanned files" : "Scanning files",
+                            payload: object.total.toString(),
+                        },
+                    });
+                    lastTime = currentTime;
+                }
+            },
             start: async (cb) => {
                 for await (const entry of (0, fs_util_1.pathIterator)(stream)) {
                     if (!options.disableCounting)
                         object.total++;
-                    const currentTime = perf_hooks_1.performance.now();
-                    const diff = currentTime - lastTime;
-                    if (diff > 1000) {
-                        await options.onProgress({
-                            relative: {
-                                description: "Scanning files",
-                                payload: object.total.toString(),
-                            },
-                        });
-                        lastTime = currentTime;
-                    }
+                    await object.updateProgress();
                     if (cb)
                         await cb(entry);
                 }
-                await options.onProgress({
-                    relative: {
-                        description: "Scanned files",
-                        payload: object.total.toString(),
-                    },
-                });
+                if (!options.disableEndProgress)
+                    await object.updateProgress(true);
             },
         };
         await options.onProgress({
@@ -257,7 +256,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
             })
             : undefined;
         const packs = compress?.packs || [];
-        const tmpDir = await (0, fs_util_1.mkTmpDir)("path-lists");
+        const tmpDir = await this.mkTmpDir("path-lists");
         const unpackedStream = (0, fs_1.createWriteStream)((0, path_1.join)(tmpDir, "unpacked.txt"));
         const singlePackStream = (0, fs_1.createWriteStream)((0, path_1.join)(tmpDir, "single-pack.txt"));
         const packStreams = Array.from({ length: packs.length }).map((v, i) => (0, fs_1.createWriteStream)((0, path_1.join)(tmpDir, `pack-${i}.txt`)));
@@ -439,6 +438,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 cwd: sourcePath,
             },
             onProgress: data.onProgress,
+            disableEndProgress: true,
         });
         await scanner.start();
         const it = await (0, promises_1.opendir)(sourcePath);
@@ -446,6 +446,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
             const path = (0, path_1.join)(sourcePath, dirent.name);
             if (dirent.name === "permissions.txt") {
                 scanner.total++;
+                await scanner.updateProgress();
             }
             else if (dirent.name.endsWith(".zip")) {
                 await (0, zip_util_1.listZip)({
@@ -455,10 +456,12 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                         const isDir = item.Folder === "+";
                         if (!isDir)
                             scanner.total++;
+                        await scanner.updateProgress();
                     },
                 });
             }
         }
+        await scanner.updateProgress(true);
         if (data.options.verbose)
             (0, cli_util_1.logExec)(`Copying files to ${restorePath}`);
         await (0, fs_util_1.cpy)({

package/Repository/GitRepository.d.ts

@@ -1,10 +1,10 @@
 import { RepositoryAbstract, BackupDataType, InitDataType, RestoreDataType, SnapshotsDataType, SnapshotResultType, SnapshotTagEnum, SnapshotTagObjectType, PruneDataType, CopyBackupType } from "./RepositoryAbstract";
 import { JSONSchema7 } from "json-schema";
-export declare type GitRepositoryConfigType = {
+export type GitRepositoryConfigType = {
     repo: string;
     branch?: string;
 };
-export declare type GitPackageRepositoryConfigType = {};
+export type GitPackageRepositoryConfigType = {};
 export declare const gitRepositoryName = "git";
 export declare const gitRepositoryDefinition: JSONSchema7;
 export declare const gitPackageRepositoryDefinition: JSONSchema7;

package/Repository/GitRepository.js

@@ -84,7 +84,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
     }
     async onPrune(data) {
         const git = new GitUtil_1.GitUtil({
-            dir: await (0, fs_util_1.mkTmpDir)(GitRepository.name + "-snapshot"),
+            dir: await this.mkTmpDir(GitRepository.name + "-snapshot"),
             log: data.options.verbose,
         });
         const branchName = GitRepository.buildBranchName(data.snapshot.packageName);
@@ -107,7 +107,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
     }
     async onSnapshots(data) {
         const git = new GitUtil_1.GitUtil({
-            dir: await (0, fs_util_1.mkTmpDir)(GitRepository.name + "-snapshot"),
+            dir: await this.mkTmpDir(GitRepository.name + "-snapshot"),
             log: data.options.verbose,
         });
         const pkgPatterns = (0, string_util_1.makePathPatterns)(data.options.packageNames);
@@ -148,7 +148,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
         (0, assert_1.ok)(typeof sourcePath === "string");
         if (!(await (0, fs_util_1.existsDir)(sourcePath)))
             throw new AppError_1.AppError(`Package path not exists: ${sourcePath}`);
-        const tmpPath = await (0, fs_util_1.mkTmpDir)(GitRepository.name + "-backup");
+        const tmpPath = await this.mkTmpDir(GitRepository.name + "-backup");
         const branchName = GitRepository.buildBranchName(data.package.name);
         const git = new GitUtil_1.GitUtil({
             dir: tmpPath,

package/Repository/RepositoryAbstract.d.ts

@@ -5,31 +5,31 @@ import type { SnapshotExtendedType, SnapshotsActionOptionsType } from "../Action
 import type { PackageConfigType } from "../Config/PackageConfig";
 import type { RepositoryConfigType } from "../Config/RepositoryConfig";
 import { Progress } from "../util/progress";
-export declare type SnapshotType = {
+export type SnapshotType = {
     id: string;
     date: string;
 };
-export declare type SnapshotResultType = SnapshotType & {
+export type SnapshotResultType = SnapshotType & {
     originalId: string;
     packageName: string;
     packageTaskName: string | undefined;
     tags: string[];
     size: number;
 };
-export declare type InitDataType = {
+export type InitDataType = {
     options: InitActionOptionsType;
 };
-export declare type SnapshotsDataType = {
+export type SnapshotsDataType = {
     options: Pick<SnapshotsActionOptionsType, "ids" | "packageNames" | "packageTaskNames" | "verbose" | "tags">;
 };
-export declare type CopyBackupType<TRepositoryConfig> = {
+export type CopyBackupType<TRepositoryConfig> = {
     options: BackupActionOptionsType;
     snapshot: SnapshotType;
     package: PackageConfigType;
     mirrorRepositoryConfig: TRepositoryConfig;
     onProgress: (data: Progress) => Promise<void>;
 };
-export declare type BackupDataType<TPackageConfig> = {
+export type BackupDataType<TPackageConfig> = {
     options: BackupActionOptionsType;
     snapshot: SnapshotType;
     package: PackageConfigType;
@@ -37,7 +37,7 @@ export declare type BackupDataType<TPackageConfig> = {
     packageConfig: TPackageConfig | undefined;
     onProgress: (data: Progress) => Promise<void>;
 };
-export declare type RestoreDataType<TPackageConfig> = {
+export type RestoreDataType<TPackageConfig> = {
     options: RestoreActionOptionsType;
     snapshot: SnapshotType;
     package: PackageConfigType;
@@ -45,7 +45,7 @@ export declare type RestoreDataType<TPackageConfig> = {
     packageConfig: TPackageConfig;
     onProgress: (data: Progress) => Promise<void>;
 };
-export declare type PruneDataType = {
+export type PruneDataType = {
     snapshot: SnapshotExtendedType;
     options: {
         verbose?: boolean;
@@ -61,7 +61,7 @@ export declare enum SnapshotTagEnum {
     VERSION = "version",
     SIZE = "size"
 }
-export declare type SnapshotTagObjectType = {
+export type SnapshotTagObjectType = {
     [SnapshotTagEnum.ID]: string;
     [SnapshotTagEnum.SHORT_ID]: string;
     [SnapshotTagEnum.DATE]: string;
@@ -74,7 +74,9 @@ export declare 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>;

package/Repository/RepositoryAbstract.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RepositoryAbstract = exports.SnapshotTagEnum = void 0;
+const fs_util_1 = require("../util/fs-util");
 var SnapshotTagEnum;
 (function (SnapshotTagEnum) {
     SnapshotTagEnum["ID"] = "id";
@@ -15,7 +16,13 @@ var SnapshotTagEnum;
 class RepositoryAbstract {
     constructor(repository) {
         this.repository = repository;
+        this.tmpDirs = [];
         this.config = repository.config;
     }
+    async mkTmpDir(prefix, id) {
+        const dir = await (0, fs_util_1.mkTmpDir)(prefix, id);
+        this.tmpDirs.push(dir);
+        return dir;
+    }
 }
 exports.RepositoryAbstract = RepositoryAbstract;

package/Repository/ResticRepository.d.ts

@@ -1,13 +1,13 @@
 import { RepositoryType } from "../util/ResticUtil";
 import { RepositoryAbstract, BackupDataType, InitDataType, RestoreDataType, SnapshotsDataType, SnapshotResultType, SnapshotTagObjectType, SnapshotTagEnum, PruneDataType, CopyBackupType } from "./RepositoryAbstract";
 import { JSONSchema7 } from "json-schema";
-export declare type ResticRepositoryConfigType = {
+export type ResticRepositoryConfigType = {
     password: string | {
         path: string;
     };
     repository: RepositoryType;
 };
-export declare type ResticPackageRepositoryConfigType = {};
+export type ResticPackageRepositoryConfigType = {};
 export declare const resticRepositoryName = "restic";
 export declare const resticRepositoryDefinition: JSONSchema7;
 export declare const resticPackageRepositoryDefinition: JSONSchema7;

package/Repository/ResticRepository.js

@@ -199,7 +199,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
                     description: "Writing excluded paths list",
                 },
             });
-            const tmpDir = await (0, fs_util_1.mkTmpDir)("restic-exclude");
+            const tmpDir = await this.mkTmpDir("restic-exclude");
             const ignoredContents = (0, fs_util_1.fastglobToGitIgnore)(exclude, sourcePath).join("\n");
             gitignorePath = (0, path_1.join)(tmpDir, "ignored.txt");
             await (0, promises_1.writeFile)(gitignorePath, ignoredContents);
@@ -231,6 +231,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             });
             gitignorePath = await (0, fs_util_1.writeGitIgnoreList)({
                 paths: stream,
+                outDir: await this.mkTmpDir("gitignore-list"),
             });
         }
         if (data.options.tags?.some((tag) => tag.startsWith(ResticRepository.refPrefix)))
@@ -280,6 +281,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
                     : []),
                 ...(data.options.tags ?? []),
             ],
+            createEmptyDir: async () => await this.mkTmpDir("empty"),
             onStream: async (streamData) => {
                 if (streamData.message_type === "status") {
                     let showProgressBar = false;

package/SessionDriver/ConsoleSessionDriver.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="node" />
 import { Progress } from "../util/progress";
 import { WriteDataType, ReadResultType, SessionDriverAbstract, SessionDriverOptions } from "./SessionDriverAbstract";
-declare type BadgeType = {
+type BadgeType = {
     name: string;
     value: string;
     color: (input: string) => string;
 };
-declare type MessageType = {
+type MessageType = {
     sessionId: number;
     level?: number;
     textPrefix?: string;
@@ -15,7 +15,7 @@ declare type MessageType = {
     errorBadge?: BadgeType;
     progress?: Progress;
 };
-declare type ConsoleSessionDriverOptions = SessionDriverOptions & {
+type ConsoleSessionDriverOptions = SessionDriverOptions & {
     progress?: "auto" | "tty" | "plain";
 };
 export declare class ConsoleSessionDriver extends SessionDriverAbstract<ConsoleSessionDriverOptions> {

package/SessionDriver/SessionDriverAbstract.d.ts

@@ -18,7 +18,7 @@ export declare enum EntityEnum {
     RestoreSessionTask = 4,
     RestoreSessionRepository = 5
 }
-export declare type WriteDataType = {
+export type WriteDataType = {
     action: ActionEnum;
     entity: EntityEnum.BackupSession;
     data: BackupSessionEntity;
@@ -47,14 +47,14 @@ export declare type WriteDataType = {
     data: RestoreSessionRepositoryEntity;
     sessionData: RestoreSessionEntity;
 };
-export declare type ReadDataType = {
+export type ReadDataType = {
     repositoryNames?: string[];
     packageNames?: string[];
     tags?: string[];
     limit?: number | null;
     verbose?: boolean;
 };
-export declare type ReadResultType = {
+export type ReadResultType = {
     id: number;
     snapshotId: string;
     creationDate: string;
@@ -64,7 +64,7 @@ export declare type ReadResultType = {
     repositoryType: string;
     error: string | null;
 };
-export declare type SessionDriverOptions = {
+export type SessionDriverOptions = {
     verbose?: boolean;
 };
 export declare abstract class SessionDriverAbstract<TOptions extends SessionDriverOptions = SessionDriverOptions> {

package/SessionManager/SessionManagerAbstract.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { SessionDriverAbstract } from "../SessionDriver/SessionDriverAbstract";
-export declare type OptionsType = {
+export type OptionsType = {
     driver: SessionDriverAbstract;
     altDrivers?: SessionDriverAbstract[];
     progressInterval?: number;

package/Task/GitTask.d.ts

@@ -1,6 +1,6 @@
 import { BackupDataType, RestoreDataType, TaskAbstract } from "./TaskAbstract";
 import { JSONSchema7 } from "json-schema";
-export declare type GitTaskConfigType = {
+export type GitTaskConfigType = {
     command?: string;
     /**
      * @default true

package/Task/GitTask.js

@@ -60,7 +60,7 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
     }
     async onBeforeBackup() {
         return {
-            targetPath: await (0, fs_util_1.mkTmpDir)(GitTask.name),
+            targetPath: await this.mkTmpDir(GitTask.name),
         };
     }
     async onBackup(data) {
@@ -193,7 +193,7 @@ class GitTask extends TaskAbstract_1.TaskAbstract {
     }
     async onBeforeRestore() {
         return {
-            targetPath: await (0, fs_util_1.mkTmpDir)(GitTask.name),
+            targetPath: await this.mkTmpDir(GitTask.name),
         };
     }
     async onRestore(data) {

package/Task/MariadbTask.d.ts

@@ -1,6 +1,6 @@
 import { BackupDataType, RestoreDataType, TaskAbstract } from "./TaskAbstract";
 import { JSONSchema7 } from "json-schema";
-export declare type MariadbTaskConfigType = {
+export type MariadbTaskConfigType = {
     command?: string;
     hostname: string;
     username: string;

package/Task/MariadbTask.js

@@ -47,7 +47,7 @@ class MariadbTask extends TaskAbstract_1.TaskAbstract {
     }
     async onBeforeBackup() {
         return {
-            targetPath: await (0, fs_util_1.mkTmpDir)(MariadbTask.name),
+            targetPath: await this.mkTmpDir(MariadbTask.name),
         };
     }
     async onBackup(data) {

package/Task/MssqlTask.d.ts

@@ -1,6 +1,6 @@
 import { BackupDataType, RestoreDataType, TaskAbstract } from "./TaskAbstract";
 import { JSONSchema7 } from "json-schema";
-export declare type MssqlTaskConfigType = {
+export type MssqlTaskConfigType = {
     command?: string;
     hostname?: string;
     username?: string;

package/Task/MysqlDumpTask.d.ts

@@ -1,7 +1,7 @@
 import { SqlDumpTaskAbstract, SqlDumpTaskConfigType, TargetDatabaseType } from "./SqlDumpTaskAbstract";
 import { JSONSchema7 } from "json-schema";
 export declare const mysqlDumpTaskName = "mysql-dump";
-export declare type MysqlDumpTaskConfigType = {} & SqlDumpTaskConfigType;
+export type MysqlDumpTaskConfigType = {} & SqlDumpTaskConfigType;
 export declare const mysqlDumpTaskDefinition: JSONSchema7;
 export declare class MysqlDumpTask extends SqlDumpTaskAbstract<MysqlDumpTaskConfigType> {
     buildConnectionArgs(database?: boolean): Promise<string[]>;

package/Task/PostgresqlDumpTask.d.ts

@@ -1,7 +1,7 @@
 import { SqlDumpTaskAbstract, SqlDumpTaskConfigType, TargetDatabaseType } from "./SqlDumpTaskAbstract";
 import { JSONSchema7 } from "json-schema";
 export declare const postgresqlDumpTaskName = "postgresql-dump";
-export declare type PostgresqlDumpTaskConfigType = {} & SqlDumpTaskConfigType;
+export type PostgresqlDumpTaskConfigType = {} & SqlDumpTaskConfigType;
 export declare const postgresqlDumpTaskDefinition: JSONSchema7;
 export declare class PostgresqlDumpTask extends SqlDumpTaskAbstract<PostgresqlDumpTaskConfigType> {
     buildConnectionArgs(database?: string): Promise<string[]>;

package/Task/ScriptTask.d.ts

@@ -1,22 +1,22 @@
 import { BackupDataType, RestoreDataType, TaskAbstract } from "./TaskAbstract";
 import { JSONSchema7 } from "json-schema";
-export declare type ProcessStepConfig = {
+export type ProcessStepConfig = {
     command: string;
     env?: Record<string, string>;
     args?: string[];
 };
-export declare type NodeStepConfig = {
+export type NodeStepConfig = {
     env?: Record<string, string>;
     code: string | string[];
 };
-export declare type Step = {
+export type Step = {
     type: "process";
     config: ProcessStepConfig;
 } | {
     type: "node";
     config: NodeStepConfig;
 };
-export declare type ScriptTaskConfigType = {
+export type ScriptTaskConfigType = {
     env?: Record<string, string | undefined>;
     backupSteps: Step[];
     restoreSteps: Step[];
@@ -29,7 +29,7 @@ export declare class ScriptTask extends TaskAbstract<ScriptTaskConfigType> {
         targetPath: string;
     }>;
     protected getVars(data: BackupDataType | RestoreDataType): Record<string, string | undefined>;
-    static processSteps(input: Step[] | Step, options: {
+    protected processSteps(input: Step[] | Step, options: {
         env?: Record<string, string | undefined>;
         vars: Record<string, string | undefined>;
         verbose?: boolean;

package/Task/ScriptTask.js

@@ -94,7 +94,7 @@ exports.scriptTaskDefinition = {
 class ScriptTask extends TaskAbstract_1.TaskAbstract {
     async onBeforeBackup() {
         return {
-            targetPath: await (0, fs_util_1.mkTmpDir)(ScriptTask.name),
+            targetPath: await this.mkTmpDir(ScriptTask.name),
         };
     }
     getVars(data) {
@@ -106,7 +106,7 @@ class ScriptTask extends TaskAbstract_1.TaskAbstract {
             DTT_TARGET_PATH: data.targetPath,
         };
     }
-    static async processSteps(input, options) {
+    async processSteps(input, options) {
         const steps = Array.isArray(input) ? input : [input];
         for (const step of steps) {
             if (step.type === "process") {
@@ -122,7 +122,7 @@ class ScriptTask extends TaskAbstract_1.TaskAbstract {
                 });
             }
             else if (step.type === "node") {
-                const tempDir = await (0, fs_util_1.mkTmpDir)("script-task-node-step");
+                const tempDir = await this.mkTmpDir("script-task-node-step");
                 const scriptPath = (0, path_1.join)(tempDir, "script.js");
                 await (0, promises_1.writeFile)(scriptPath, Array.isArray(step.config.code)
                     ? step.config.code.join("\n")
@@ -150,7 +150,7 @@ class ScriptTask extends TaskAbstract_1.TaskAbstract {
         const targetPath = data.targetPath;
         (0, assert_1.ok)(typeof path === "string");
         (0, assert_1.ok)(typeof targetPath === "string");
-        await ScriptTask.processSteps(config.backupSteps, {
+        await this.processSteps(config.backupSteps, {
             env: config.env,
             vars: this.getVars(data),
             verbose: this.verbose,
@@ -158,7 +158,7 @@ class ScriptTask extends TaskAbstract_1.TaskAbstract {
     }
     async onBeforeRestore() {
         return {
-            targetPath: await (0, fs_util_1.mkTmpDir)(ScriptTask.name),
+            targetPath: await this.mkTmpDir(ScriptTask.name),
         };
     }
     async onRestore(data) {
@@ -170,7 +170,7 @@ class ScriptTask extends TaskAbstract_1.TaskAbstract {
         (0, assert_1.ok)(typeof targetPath === "string");
         await (0, fs_util_1.mkdirIfNotExists)(restorePath);
         await (0, fs_util_1.ensureEmptyDir)(restorePath);
-        await ScriptTask.processSteps(config.restoreSteps, {
+        await this.processSteps(config.restoreSteps, {
             env: config.env,
             vars: this.getVars(data),
             verbose: this.verbose,

package/Task/SqlDumpTaskAbstract.d.ts

@@ -1,12 +1,12 @@
 import { exec } from "../util/process-util";
 import { BackupDataType, RestoreDataType, TaskAbstract } from "./TaskAbstract";
 import { JSONSchema7 } from "json-schema";
-export declare type TargetDatabaseType = {
+export type TargetDatabaseType = {
     name: string;
     charset?: string;
     collate?: string;
 };
-export declare type SqlDumpTaskConfigType = {
+export type SqlDumpTaskConfigType = {
     password: string | {
         path: string;
     };

package/Task/SqlDumpTaskAbstract.js

@@ -118,7 +118,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
             await (0, promises_1.mkdir)(outputPath, { recursive: true });
         if (!this.config.oneFileByTable) {
             const outPath = (0, path_1.join)(outputPath, serializeSqlFile({ database: this.config.database }));
-            data.onProgress({
+            await data.onProgress({
                 relative: {
                     description: "Exporting",
                 },
@@ -168,7 +168,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
         }
         if (this.config.storedPrograms) {
             const outPath = (0, path_1.join)(outputPath, "stored-programs.sql");
-            data.onProgress({
+            await data.onProgress({
                 relative: {
                     description: "Exporting storaged programs",
                 },

package/Task/TaskAbstract.d.ts

@@ -3,14 +3,14 @@ import { RestoreActionOptionsType } from "../Action/RestoreAction";
 import { PackageConfigType } from "../Config/PackageConfig";
 import { SnapshotType } from "../Repository/RepositoryAbstract";
 import { Progress } from "../util/progress";
-export declare type BackupDataType = {
+export type BackupDataType = {
     onProgress: (data: Progress) => Promise<void>;
     options: BackupActionOptionsType;
     package: PackageConfigType;
     targetPath: string | undefined;
     snapshot: SnapshotType;
 };
-export declare type RestoreDataType = {
+export type RestoreDataType = {
     onProgress: (data: Progress) => Promise<void>;
     options: RestoreActionOptionsType;
     package: PackageConfigType;
@@ -19,7 +19,9 @@ export declare type RestoreDataType = {
 };
 export declare abstract class TaskAbstract<TConfig = any> {
     readonly config: TConfig;
+    readonly tmpDirs: string[];
     constructor(config: TConfig);
+    mkTmpDir(prefix: string, id?: string): Promise<string>;
     onBeforeBackup(data: Omit<BackupDataType, "onProgress" | "targetPath">): Promise<{
         targetPath?: string;
     } | undefined>;