@datatruck/cli 0.40.0 → 0.40.1

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { DiskStats } from "../fs";
 import { BasicProgress } from "../progress";
 import { AbstractFs, FsOptions } from "../virtual-fs";
@@ -13,7 +12,7 @@ export declare class RemoteFs extends AbstractFs {
     });
     isLocal(): boolean;
     protected fetchJson(name: string, params: any[]): Promise<any>;
-    protected post(name: string, params: any[], data: string): Promise<Response>;
+    protected post(name: string, params: any[], data: string): Promise<import("undici").Response>;
     existsDir(path: string): Promise<boolean>;
     rename(source: string, target: string): Promise<void>;
     mkdir(path: string): Promise<void>;

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

@@ -65,7 +65,8 @@ function createDatatruckRepositoryServer(inOptions, config = {}) {
         const id = counter.next();
         let requestError;
         let responseError;
-        req.on("error", (error) => (requestError = error));
+        const requestErrorListener = (error) => (requestError = error);
+        req.on("error", requestErrorListener);
         res.on("error", (error) => (responseError = error));
         res.setHeader("X-Accel-Buffering", "no");
         try {
@@ -88,16 +89,19 @@ function createDatatruckRepositoryServer(inOptions, config = {}) {
             else if (action === "upload") {
                 const [target] = params;
                 const path = fs.resolvePath(target);
+                req.off("error", requestErrorListener);
                 await (0, http_1.recvFile)(req, res, path);
             }
             else if (action === "download") {
                 const [target] = params;
                 const path = fs.resolvePath(target);
+                req.off("error", requestErrorListener);
                 await (0, http_1.sendFile)(req, res, path, {
                     contentLength: options.contentLength ?? true,
                 });
             }
             else if (action === "writeFile") {
+                req.off("error", requestErrorListener);
                 const data = await (0, http_1.readRequestData)(req);
                 const [target] = params;
                 await fs.writeFile(target, data);

package/lib/utils/http.d.ts

@@ -1,22 +1,19 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { BasicProgress } from "./progress";
 import { IncomingMessage, Server, ServerResponse } from "http";
+import { fetch, type RequestInit } from "undici";
 export declare function createHref(inUrl: string, query?: Record<string, string>): string;
 export declare function closeServer(server: Server): Promise<void>;
 export declare function readRequestData(req: IncomingMessage): Promise<string | undefined>;
 export declare const safeFetch: typeof fetch;
 export declare function fetchJson<T = any>(url: string, options?: RequestInit): Promise<T | undefined>;
-export declare function post(url: string, data: string, options?: Omit<RequestInit, "method" | "body">): Promise<Response>;
+export declare function post(url: string, data: string, options?: Omit<RequestInit, "method" | "body">): Promise<import("undici").Response>;
 export declare function parseContentLength(value: string | undefined): number;
 export declare function sendFile(req: IncomingMessage, res: ServerResponse, path: string, options?: {
     contentLength?: boolean;
-    end?: boolean;
     checksum?: boolean;
 }): Promise<void>;
-export declare function recvFile(req: IncomingMessage, res: ServerResponse, path: string, options?: {
-    end?: boolean;
-}): Promise<void>;
+export declare function recvFile(req: IncomingMessage, res: ServerResponse, path: string): Promise<void>;
 export declare function downloadFile(url: string, output: string, options?: Omit<RequestInit, "signal"> & {
     timeout?: number;
     onProgress?: (progress: BasicProgress) => void;

package/lib/utils/http.js

@@ -7,6 +7,7 @@ const fs_1 = require("fs");
 const promises_1 = require("fs/promises");
 const stream_1 = require("stream");
 const promises_2 = require("stream/promises");
+const undici_1 = require("undici");
 function createHref(inUrl, query) {
     const url = new URL(inUrl);
     for (const key in query || {})
@@ -35,7 +36,7 @@ function readRequestData(req) {
 }
 exports.readRequestData = readRequestData;
 const safeFetch = async (...args) => {
-    const res = await fetch(...args);
+    const res = await (0, undici_1.fetch)(...args);
     if (res.status !== 200)
         throw new Error(`Fetch request failed: ${res.status} ${res.statusText}`);
     return res;
@@ -74,12 +75,12 @@ async function sendFile(req, res, path, options = {}) {
     }
     finally {
         file?.close();
-        if (options.end)
+        if (!res.writableEnded)
             res.end();
     }
 }
 exports.sendFile = sendFile;
-async function recvFile(req, res, path, options = {}) {
+async function recvFile(req, res, path) {
     let file;
     try {
         file = (0, fs_1.createWriteStream)(path);
@@ -95,8 +96,7 @@ async function recvFile(req, res, path, options = {}) {
     }
     finally {
         file?.close();
-        if (options.end)
-            res.end();
+        res.end();
     }
 }
 exports.recvFile = recvFile;
@@ -162,7 +162,7 @@ async function uploadFile(url, path, options = {}) {
     const { size } = await (0, promises_1.stat)(path);
     const file = (0, fs_1.createReadStream)(path);
     try {
-        const res = await fetch(url, {
+        const res = await (0, undici_1.fetch)(url, {
             ...options,
             method: "POST",
             duplex: "half",

package/lib/utils/options.js

@@ -49,7 +49,9 @@ function createCommand(config, action) {
         for (const name in config.options) {
             const option = config.options[name];
             if (option.flag !== false) {
-                const parse = typeof option.value === "string" ? parsers[option.value] : undefined;
+                const parse = typeof option.value === "string"
+                    ? parsers[option.value]
+                    : option.value;
                 const cliValue = cliOptions[option.flag ?? name] ?? option.defaults;
                 if (cliValue !== undefined)
                     commandOptions[name] = parse ? parse(cliValue) : cliValue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.40.0",
+  "version": "0.40.1",
   "description": "Tool for creating and managing backups",
   "homepage": "https://github.com/swordev/datatruck#readme",
   "bugs": {
@@ -27,25 +27,26 @@
   ],
   "dependencies": {
     "@supercharge/promise-pool": "^3.2.0",
-    "ajv": "^8.12.0",
+    "ajv": "^8.13.0",
     "async": "^3.2.5",
     "chalk": "^4.1.2",
     "commander": "^12.0.0",
     "croner": "^8.0.2",
-    "dayjs": "^1.11.10",
+    "dayjs": "^1.11.11",
     "fast-folder-size": "^2.2.0",
     "fast-glob": "^3.3.2",
     "listr2": "^8.2.1",
     "micromatch": "^4.0.5",
-    "mongodb": "^6.5.0",
-    "mysql2": "^3.9.4",
+    "mongodb": "^6.6.1",
+    "mysql2": "^3.9.7",
     "tty-table": "^4.2.3",
-    "yaml": "^2.4.1"
+    "undici": "^6.15.0",
+    "yaml": "^2.4.2"
   },
   "devDependencies": {
     "@types/async": "^3.2.24",
-    "@types/micromatch": "^4.0.6",
-    "mongodb-memory-server": "^9.1.8"
+    "@types/micromatch": "^4.0.7",
+    "mongodb-memory-server": "^9.2.0"
   },
   "optionalDependencies": {
     "ts-node": "^10.9.2"