@datatruck/cli 0.36.6 → 0.36.8

package/config.schema.json

@@ -686,6 +686,13 @@
                 }
               ]
             },
+            "keepAliveTimeout": {
+              "type": "number"
+            },
+            "contentLength": {
+              "default": true,
+              "type": "boolean"
+            },
             "allowlist": {
               "type": "object",
               "properties": {

package/lib/utils/datatruck/repository-server.d.ts

@@ -14,6 +14,11 @@ export type DatatruckRepositoryServerOptions = {
     trustProxy?: true | {
         remoteAddressHeader: string;
     };
+    keepAliveTimeout?: number;
+    /**
+     * @default true
+     */
+    contentLength?: boolean;
     allowlist?: {
         /**
          * @default true

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

@@ -58,7 +58,7 @@ const getRemoteAddress = (req, options) => {
 };
 function createDatatruckRepositoryServer(inOptions, config = {}) {
     const counter = new math_1.Counter();
-    return (0, http_2.createServer)(async (req, res) => {
+    const server = (0, http_2.createServer)(async (req, res) => {
         const url = req.url || "";
         if (url === "/" || url === "/favicon.ico")
             return res.end();
@@ -67,6 +67,7 @@ function createDatatruckRepositoryServer(inOptions, config = {}) {
         let responseError;
         req.on("error", (error) => (requestError = error));
         res.on("error", (error) => (responseError = error));
+        res.setHeader("X-Accel-Buffering", "no");
         try {
             const { repository, action, params } = parseUrl(url);
             if (!repository || !action)
@@ -93,7 +94,9 @@ function createDatatruckRepositoryServer(inOptions, config = {}) {
             else if (action === "download") {
                 const [target] = params;
                 const path = fs.resolvePath(target);
-                await (0, http_1.sendFile)(req, res, path);
+                await (0, http_1.sendFile)(req, res, path, {
+                    contentLength: options.contentLength ?? true,
+                });
             }
             else if (action === "writeFile") {
                 const data = await (0, http_1.readRequestData)(req);
@@ -132,5 +135,8 @@ function createDatatruckRepositoryServer(inOptions, config = {}) {
                 res.end();
         }
     });
+    if (typeof inOptions.keepAliveTimeout === "number")
+        server.keepAliveTimeout = inOptions.keepAliveTimeout;
+    return server;
 }
 exports.createDatatruckRepositoryServer = createDatatruckRepositoryServer;

package/lib/utils/http.d.ts

@@ -10,6 +10,7 @@ export declare function fetchJson<T = any>(url: string, options?: RequestInit):
 export declare function post(url: string, data: string, options?: Omit<RequestInit, "method" | "body">): Promise<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>;

package/lib/utils/http.js

@@ -62,7 +62,7 @@ async function sendFile(req, res, path, options = {}) {
     try {
         file = (0, fs_1.createReadStream)(path);
         const fileStat = await (0, promises_1.stat)(path);
-        res.setHeader("Content-Length", fileStat.size);
+        res.setHeader(options.contentLength ?? true ? "Content-Length" : "x-content-length", fileStat.size);
         if (options.checksum)
             res.setHeader("x-checksum", await (0, crypto_1.calcFileHash)(path, "sha1"));
         file.pipe(res);
@@ -111,7 +111,9 @@ async function downloadFile(url, output, options = {}) {
             ...fetchOptions,
             signal: AbortSignal.timeout(timeout ?? 3600 * 1000), // 60m
         });
-        length.total = parseContentLength(res.headers.get("content-length") ?? undefined);
+        length.total = parseContentLength(res.headers.get("content-length") ??
+            res.headers.get("x-content-length") ??
+            undefined);
         checksum = res.headers.get("x-checksum") ?? undefined;
         const body = stream_1.Readable.fromWeb(res.body);
         const progress = onProgress &&

package/package.json

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