Merge pull request #10 from NoamGaash/fix/encoding

NoamGaash · Dec 17, 2023 · 8f4d9c0 · 8f4d9c0
2 parents 580971e + fd1fc95
commit 8f4d9c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 86 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
diff --git a/src/utils/serveFromHar.ts b/src/utils/serveFromHar.ts
@@ -62,16 +62,17 @@ function findEntry(
 	return bestEntry?.entry ?? null;
 }
 
-async function parseContent(content: Content & { _file?: string }, dirName: string = ".") {
+async function parseContent(
+	content: Omit<Content & { _file?: string }, "text"> & { text?: Buffer | string },
+	dirName: string = ".",
+) {
 	if (!content) return undefined;
 	if (content._file && !content.text) {
 		const contentFilePath = path.join(dirName, content._file);
-		content.text = await promises.readFile(contentFilePath, {
-			encoding: "utf8",
-		});
+		content.text = await promises.readFile(contentFilePath);
 	}
 	if (!content.text) return undefined;
-	if (content.encoding === "base64") {
+	if (content.encoding === "base64" && typeof content.text === "string") {
 		return Buffer.from(content.text, "base64");
 	} else {
 		return content.text;