Refactor reporter.ts and reporterCommand.ts

Refactoring:

1. Make reporterCommand use functions of reporter.ts
2. Reduce amount of functions in reporter.ts
3. Remove some complexity. For example, only have one property determine if we print something to console during generation.

src/commands/collectorCommand.ts

@@ -9,7 +9,7 @@
 import { create } from "../lib/logger.js";
 import { CollectionResult, Collector } from "../collector/index.js";
 import Inspector from "../inspector/inspector.js";
-import { Reporter, ReporterArguments } from "../reporter/reporter.js";
+import { Reporter, ReporterOptions } from "../reporter/reporter.js";
 
 let collectorCommand = "collect";
 
@@ -186,31 +186,29 @@ async function runCollector(args: CollectorCommandArguments): Promise<any> {
 
   const inspectionResult: any = inspector.run();
 
-  let reporterArgs: ReporterArguments = {
+  let reporterArgs: ReporterOptions = {
     outputPath: args.output,
-    json: args.json,
-    yaml: args.yaml,
-    html: args.html,
+    printJsonToConsole: args.json,
+    printYamlToConsole: args.yaml,
+    printHtmlToConsole: args.html,
     pdf: args.pdf,
     usePandoc: args.usePandoc,
+    extraFiles: [],
   };
 
-  const reporter = new Reporter(reporterArgs);
+  const reporter = new Reporter(reporterArgs, logger);
 
-  reporter.saveJson(
-    inspectionResult.websocketLog,
-    "websockets-log.json",
-    false,
-  );
-  reporter.saveJson(inspectionResult, "inspection.json");
-  reporter.saveYaml(inspectionResult.cookies, "cookies.yml", false);
-  reporter.saveYaml(inspectionResult.localStorage, "local-storage.yml", false);
-  reporter.saveYaml(inspectionResult.beacons, "beacons.yml", false);
-  reporter.saveYaml(inspectionResult, "inspection.yml");
-  reporter.generateHtml(inspectionResult);
-  await reporter.generateOfficeDoc(inspectionResult);
-  await reporter.convertHtmlToPdf();
-  reporter.saveSource(collectionResult.source);
+  reporter.saveJsonToFile(inspectionResult.websocketLog, "websockets-log.json");
+  reporter.saveJsonToFile(inspectionResult, "inspection.json");
+  reporter.saveYamlToFile(inspectionResult.cookies, "cookies.yml");
+  reporter.saveYamlToFile(inspectionResult.localStorage, "local-storage.yml");
+  reporter.saveYamlToFile(inspectionResult.beacons, "beacons.yml");
+  reporter.saveYamlToFile(inspectionResult, "inspection.yml");
+  const htmlReport = reporter.generateHtmlReport(inspectionResult);
+  await reporter.saveAsOfficeDoc(inspectionResult);
+  const pdfReport = await reporter.convertHtmlToPdfInMemory(htmlReport);
+  reporter.saveFile("inspection.pdf", pdfReport);
+  reporter.saveFile("source.html", collectionResult.source);
 
   return inspectionResult;
 }