chore(hash-stream-node): move fileStreamHasher to own file (#3086)

aws · Dec 9, 2021 · dd66d1a · dd66d1a
1 parent b0e1422
commit dd66d1a
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 42 deletions.
diff --git a/...h-stream-node/src/hash-calculator.spec.ts → ...sh-stream-node/src/HashCalculator.spec.ts b/...h-stream-node/src/hash-calculator.spec.ts → ...sh-stream-node/src/HashCalculator.spec.ts
@@ -1,4 +1,4 @@
-import { HashCalculator } from "./hash-calculator";
+import { HashCalculator } from "./HashCalculator";
 
 function createMockHash(): {
   updates: Buffer[];

diff --git a/...s/hash-stream-node/src/hash-calculator.ts → ...es/hash-stream-node/src/HashCalculator.ts b/...s/hash-stream-node/src/hash-calculator.ts → ...es/hash-stream-node/src/HashCalculator.ts
diff --git a/packages/hash-stream-node/src/index.spec.ts → ...-stream-node/src/fileStreamHasher.spec.ts b/packages/hash-stream-node/src/index.spec.ts → ...-stream-node/src/fileStreamHasher.spec.ts
@@ -5,7 +5,7 @@ import { tmpdir } from "os";
 import { join } from "path";
 import { Readable } from "stream";
 
-import { fileStreamHasher } from "./index";
+import { fileStreamHasher } from "./fileStreamHasher";
 
 function createTemporaryFile(contents: string): string {
   const folder = mkdtempSync(join(tmpdir(), "sha256-stream-node-"));

diff --git a/packages/hash-stream-node/src/fileStreamHasher.ts b/packages/hash-stream-node/src/fileStreamHasher.ts
@@ -0,0 +1,34 @@
+import { HashConstructor, StreamHasher } from "@aws-sdk/types";
+import { createReadStream, ReadStream } from "fs";
+import { Readable } from "stream";
+
+import { HashCalculator } from "./HashCalculator";
+
+export const fileStreamHasher: StreamHasher<Readable> = (hashCtor: HashConstructor, fileStream: Readable) =>
+  new Promise((resolve, reject) => {
+    if (!isReadStream(fileStream)) {
+      reject(new Error("Unable to calculate hash for non-file streams."));
+      return;
+    }
+
+    const fileStreamTee = createReadStream(fileStream.path, {
+      start: (fileStream as any).start,
+      end: (fileStream as any).end,
+    });
+
+    const hash = new hashCtor();
+    const hashCalculator = new HashCalculator(hash);
+
+    fileStreamTee.pipe(hashCalculator);
+    fileStreamTee.on("error", (err: any) => {
+      // if the source errors, the destination stream needs to manually end
+      hashCalculator.end();
+      reject(err);
+    });
+    hashCalculator.on("error", reject);
+    hashCalculator.on("finish", function (this: HashCalculator) {
+      hash.digest().then(resolve).catch(reject);
+    });
+  });
+
+const isReadStream = (stream: Readable): stream is ReadStream => typeof (stream as ReadStream).path === "string";
diff --git a/packages/hash-stream-node/src/index.ts b/packages/hash-stream-node/src/index.ts
@@ -1,40 +1 @@
-import { HashConstructor, StreamHasher } from "@aws-sdk/types";
-import { createReadStream, ReadStream } from "fs";
-import { Readable } from "stream";
-
-import { HashCalculator } from "./hash-calculator";
-
-export const fileStreamHasher: StreamHasher<Readable> = function fileStreamHasher(
-  hashCtor: HashConstructor,
-  fileStream: Readable
-): Promise<Uint8Array> {
-  return new Promise((resolve, reject) => {
-    if (!isReadStream(fileStream)) {
-      reject(new Error("Unable to calculate hash for non-file streams."));
-      return;
-    }
-
-    const fileStreamTee = createReadStream(fileStream.path, {
-      start: (fileStream as any).start,
-      end: (fileStream as any).end,
-    });
-
-    const hash = new hashCtor();
-    const hashCalculator = new HashCalculator(hash);
-
-    fileStreamTee.pipe(hashCalculator);
-    fileStreamTee.on("error", (err: any) => {
-      // if the source errors, the destination stream needs to manually end
-      hashCalculator.end();
-      reject(err);
-    });
-    hashCalculator.on("error", reject);
-    hashCalculator.on("finish", function (this: HashCalculator) {
-      hash.digest().then(resolve).catch(reject);
-    });
-  });
-};
-
-function isReadStream(stream: Readable): stream is ReadStream {
-  return typeof (stream as ReadStream).path === "string";
-}
+export * from "./fileStreamHasher";