feat(cli): add contentLength options and disable response buffer

swordev · Mar 20, 2024 · f7d4c83 · f7d4c83
1 parent 6023968
commit f7d4c83
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/.changeset/tasty-days-yawn.md b/.changeset/tasty-days-yawn.md
@@ -0,0 +1,5 @@
+---
+"@datatruck/cli": patch
+---
+
+Add options to allow nginx as reverse proxy
diff --git a/packages/cli/src/utils/datatruck/repository-server.ts b/packages/cli/src/utils/datatruck/repository-server.ts
@@ -19,6 +19,10 @@ export type DatatruckRepositoryServerOptions = {
   };
   trustProxy?: true | { remoteAddressHeader: string };
   keepAliveTimeout?: number;
+  /**
+   * @default true
+   */
+  contentLength?: boolean;
   allowlist?: {
     /**
      * @default true
@@ -118,6 +122,7 @@ export function createDatatruckRepositoryServer(
     let responseError: Error | undefined;
     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) return res.writeHead(404);
@@ -146,7 +151,9 @@ export function createDatatruckRepositoryServer(
       } else if (action === "download") {
         const [target] = params;
         const path = fs.resolvePath(target);
-        await sendFile(req, res, path);
+        await sendFile(req, res, path, {
+          contentLength: options.contentLength ?? true,
+        });
       } else if (action === "writeFile") {
         const data = await readRequestData(req);
         const [target] = params;

diff --git a/packages/cli/src/utils/http.ts b/packages/cli/src/utils/http.ts
@@ -74,6 +74,7 @@ export async function sendFile(
   res: ServerResponse,
   path: string,
   options: {
+    contentLength?: boolean;
     end?: boolean;
     checksum?: boolean;
   } = {},
@@ -82,7 +83,10 @@ export async function sendFile(
   try {
     file = createReadStream(path);
     const fileStat = await 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 calcFileHash(path, "sha1"));
     file.pipe(res);
@@ -142,7 +146,9 @@ export async function downloadFile(
       signal: AbortSignal.timeout(timeout ?? 3600 * 1000), // 60m
     });
     length.total = parseContentLength(
-      res.headers.get("content-length") ?? undefined,
+      res.headers.get("content-length") ??
+        res.headers.get("x-content-length") ??
+        undefined,
     );
     checksum = res.headers.get("x-checksum") ?? undefined;
     const body = Readable.fromWeb(res.body!);