Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from Dec 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -1,4 +1,4 @@
import { HashCalculator } from "./hash-calculator";
import { HashCalculator } from "./HashCalculator";

function createMockHash(): {
updates: Buffer[];
Expand Down
Expand Up @@ -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-"));
Expand Down
34 changes: 34 additions & 0 deletions 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";
41 changes: 1 addition & 40 deletions 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";