@datatruck/cli 0.36.3 → 0.36.5

package/lib/actions/CopyAction.js

@@ -151,9 +151,8 @@ class CopyAction {
     async copyCrossRepository(options) {
         const env_1 = { stack: [], error: void 0, hasError: false };
         try {
-            const { repo, repoConfig, mirrorRepo, mirrorConfig, snapshot } = options;
+            const { repo, mirrorRepo, mirrorConfig, snapshot } = options;
             const tmp = __addDisposableResource(env_1, await (0, temp_1.useTempDir)("copy", "restore"), true);
-            const pkg = (0, config_1.findPackageOrFail)(this.config, snapshot.packageName);
             await repo.restore({
                 options: {
                     verbose: this.options.verbose,
@@ -161,7 +160,7 @@ class CopyAction {
                 },
                 snapshot: { id: snapshot.id, date: snapshot.date },
                 package: { name: snapshot.packageName },
-                packageConfig: (0, config_1.findPackageRepositoryConfig)(pkg, repoConfig),
+                packageConfig: undefined,
                 snapshotPath: tmp.path,
                 onProgress: options.onProgress,
             });
@@ -178,7 +177,7 @@ class CopyAction {
                     name: snapshot.packageName,
                     path: tmp.path,
                 },
-                packageConfig: (0, config_1.findPackageRepositoryConfig)(pkg, mirrorConfig),
+                packageConfig: undefined,
                 onProgress: options.onProgress,
             });
         }

package/lib/repositories/RepositoryAbstract.d.ts

@@ -27,7 +27,7 @@ export type RepoFetchSnapshotsData = {
 export type RepoCopyData<TRepositoryConfig> = {
     options: BackupActionOptions;
     snapshot: PreSnapshot;
-    package: PackageConfig;
+    package: Pick<PackageConfig, "name">;
     mirrorRepositoryConfig: TRepositoryConfig;
     onProgress: (data: Progress) => void;
 };
@@ -35,8 +35,9 @@ export type RepoBackupData<TPackageConfig> = {
     options: BackupActionOptions;
     snapshot: PreSnapshot;
     hostname: string;
-    package: Omit<PackageConfig, "path"> & {
-        path: string;
+    package: Pick<PackageConfig, "name" | "include" | "exclude"> & {
+        path: NonNullable<PackageConfig["path"]>;
+        task?: Pick<NonNullable<PackageConfig["task"]>, "name">;
     };
     packageConfig: TPackageConfig | undefined;
     onProgress: (data: Progress) => void;
@@ -44,9 +45,9 @@ export type RepoBackupData<TPackageConfig> = {
 export type RepoRestoreData<TPackageConfig> = {
     options: RestoreActionOptions;
     snapshot: PreSnapshot;
-    package: PackageConfig;
+    package: Pick<PackageConfig, "name">;
     snapshotPath: string;
-    packageConfig: TPackageConfig;
+    packageConfig: TPackageConfig | undefined;
     onProgress: (data: Progress) => void;
 };
 export type RepoPruneData = {

package/lib/utils/cli.js

@@ -173,10 +173,11 @@ function colorizeObject(input) {
     const object = {};
     for (const key in input) {
         const value = input[key];
-        object[colorizeValue(key)] =
-            typeof value === "object" && !!value && !Array.isArray(value)
-                ? colorizeObject(value)
-                : colorizeValue(value, "green");
+        if (value !== undefined)
+            object[colorizeValue(key)] =
+                typeof value === "object" && !!value && !Array.isArray(value)
+                    ? colorizeObject(value)
+                    : colorizeValue(value, "green");
     }
     const values = Object.entries(object)
         .map(([key, value]) => `${key}: ${value}`)

package/lib/utils/datatruck/paths.d.ts

@@ -9,7 +9,7 @@ export type ParsePathsOptions = {
 };
 export declare function parsePaths(values: (string | SpawnStep)[], options: ParsePathsOptions): Promise<string[]>;
 export type BackupPathsOptions = {
-    package: PackageConfig;
+    package: Pick<PackageConfig, "name" | "path" | "include" | "exclude">;
     snapshot: PreSnapshot;
     path: string;
     verbose?: boolean;

package/lib/utils/datatruck/paths.js

@@ -12,6 +12,7 @@ async function parsePaths(values, options) {
             await (0, spawnSteps_1.runSpawnSteps)(value, {
                 tempDir: options.tempDir,
                 verbose: options.verbose,
+                data: options.data,
                 onLine: (path) => paths.push(path),
             });
         }

package/lib/utils/datatruck/repository-server.js

@@ -4,10 +4,12 @@ exports.createDatatruckRepositoryServer = exports.headerKey = void 0;
 const ConfigAction_1 = require("../../actions/ConfigAction");
 const cli_1 = require("../cli");
 const http_1 = require("../http");
+const math_1 = require("../math");
 const virtual_fs_1 = require("../virtual-fs");
 const fs_1 = require("fs");
 const promises_1 = require("fs/promises");
 const http_2 = require("http");
+const promises_2 = require("stream/promises");
 exports.headerKey = {
     user: "x-dtt-user",
     password: "x-dtt-password",
@@ -58,33 +60,31 @@ const getRemoteAddress = (req, options) => {
         : undefined) ?? req.socket.remoteAddress);
 };
 function createDatatruckRepositoryServer(inOptions, config = {}) {
+    const counter = new math_1.Counter();
     return (0, http_2.createServer)(async (req, res) => {
+        const url = req.url || "";
+        if (url === "/" || url === "/favicon.ico")
+            return res.end();
+        const id = counter.next();
+        let requestError;
+        let responseError;
+        req.on("error", (error) => (requestError = error));
+        res.on("error", (error) => (responseError = error));
         try {
-            if (req.url === "/" || req.url === "/favicon.ico")
-                return res.end();
-            const { repository, action, params } = parseUrl(req.url);
-            if (!repository || !action) {
-                res.statusCode = 404;
-                return res.end();
-            }
+            const { repository, action, params } = parseUrl(url);
+            if (!repository || !action)
+                return res.writeHead(404);
             const fileOptions = config.configPath
                 ? (await ConfigAction_1.ConfigAction.findAndParseFile(config.configPath)).server
                     ?.repository
                 : undefined;
             const options = fileOptions ?? inOptions;
             const backend = findRepositoryBackend(req, repository, options);
-            if (!backend) {
-                res.statusCode = 401;
-                return res.end();
-            }
+            if (!backend)
+                return res.writeHead(401);
             if (config.log)
-                (0, cli_1.logJson)("repository-server", "request", {
-                    repository,
-                    url: req.url,
-                });
-            const fs = new virtual_fs_1.LocalFs({
-                backend: backend.path,
-            });
+                (0, cli_1.logJson)("repository-server", "request", { id, repository, url });
+            const fs = new virtual_fs_1.LocalFs({ backend: backend.path });
             if (action === "comcheck") {
                 res.write(JSON.stringify({ success: true }));
             }
@@ -92,12 +92,7 @@ function createDatatruckRepositoryServer(inOptions, config = {}) {
                 const [target] = params;
                 const path = fs.resolvePath(target);
                 const file = (0, fs_1.createWriteStream)(path);
-                req.pipe(file);
-                await new Promise((resolve, reject) => {
-                    req.on("error", reject);
-                    file.on("error", reject);
-                    file.on("close", resolve);
-                });
+                await (0, promises_2.pipeline)(req, file);
             }
             else if (action === "download") {
                 const [target] = params;
@@ -105,13 +100,7 @@ function createDatatruckRepositoryServer(inOptions, config = {}) {
                 const file = (0, fs_1.createReadStream)(path);
                 const fileStat = await (0, promises_1.stat)(path);
                 res.setHeader("Content-Length", fileStat.size);
-                file.pipe(res);
-                await new Promise((resolve, reject) => {
-                    req.on("error", reject);
-                    file.on("error", reject);
-                    res.on("error", reject);
-                    res.on("close", resolve);
-                });
+                await (0, promises_2.pipeline)(file, res, { end: false });
             }
             else if (action === "writeFile") {
                 const data = await (0, http_1.readRequestData)(req);
@@ -127,21 +116,31 @@ function createDatatruckRepositoryServer(inOptions, config = {}) {
                     res.write(JSON.stringify(json));
             }
             if (config.log)
-                (0, cli_1.logJson)("repository-server", "request finished", {
-                    url: req.url,
-                });
-            res.end();
+                (0, cli_1.logJson)("repository-server", "request finished", { id });
         }
         catch (error) {
             if (config.log) {
-                (0, cli_1.logJson)("repository-server", "request failed", {
-                    url: req.url,
-                });
+                (0, cli_1.logJson)("repository-server", "request failed", { id });
                 console.error(error);
             }
-            res.statusCode = 500;
-            res.statusMessage = error.message;
-            res.end();
+            if (!res.headersSent)
+                res.writeHead(500, error.message);
+        }
+        finally {
+            if (requestError) {
+                (0, cli_1.logJson)("repository-server", "request error", { id });
+                console.error(requestError);
+            }
+            if (responseError) {
+                (0, cli_1.logJson)("repository-server", "response error", { id });
+                console.error(responseError);
+            }
+            if (requestError || responseError) {
+                res.destroy();
+            }
+            else {
+                res.end();
+            }
         }
     });
 }

package/lib/utils/math.d.ts

@@ -1 +1,7 @@
 export declare function progressPercent(total: number, current: number): number;
+export declare class Counter {
+    protected maxValue: number;
+    protected value: number;
+    constructor(maxValue?: number);
+    next(): number;
+}

package/lib/utils/math.js

@@ -1,9 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.progressPercent = void 0;
+exports.Counter = exports.progressPercent = void 0;
 function progressPercent(total, current) {
     if (total === 0 && current === 0)
         return 0;
     return Number(((current / total) * 100).toFixed(2));
 }
 exports.progressPercent = progressPercent;
+class Counter {
+    maxValue;
+    value = 0;
+    constructor(maxValue = 4294967295) {
+        this.maxValue = maxValue;
+    }
+    next() {
+        if (this.maxValue && this.value >= this.maxValue)
+            this.value = 0;
+        return ++this.value;
+    }
+}
+exports.Counter = Counter;

package/package.json

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