Fixed #65

FlorianRappl · Feb 23, 2024 · 987037e · 987037e
1 parent 48eefbe
commit 987037e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 0.16.0
 
+- Fixed error handling with wrong JSON format (#65)
 - Replaced `request` with `axios`
 - Updated dependencies
 

diff --git a/src/server/helpers/io.ts b/src/server/helpers/io.ts
@@ -36,13 +36,17 @@ export function toAbsolute(directory: string) {
   return (file: string) => join(directory, file);
 }
 
-export function asJson<T = {}>(file: string): T {
+export function asJson<T = {}>(file: string, defaultValue: T): T {
   if (existsSync(file)) {
-    const content = readFileSync(file, 'utf8');
-    return JSON.parse(content);
+    try {
+      const content = readFileSync(file, 'utf8');
+      return JSON.parse(content);
+    } catch {
+      return defaultValue;
+    }
   }
 
-  return undefined;
+  return defaultValue;
 }
 
 export function asScript(file: string) {

diff --git a/src/server/helpers/json-store.ts b/src/server/helpers/json-store.ts
@@ -13,14 +13,14 @@ export class JsonStore<T> {
 
   insert(item: T) {
     const file = this.file;
-    const items = asJson<Array<T>>(file) || [];
+    const items = asJson<Array<T>>(file, []);
     items.push(item);
     toFile(file, items);
   }
 
   delete(predicate?: (item: T) => boolean) {
     const file = this.file;
-    const items = asJson<Array<T>>(file);
+    const items = asJson<Array<T>>(file, undefined);
 
     if (items && items.length) {
       for (let i = items.length; i--; ) {
@@ -35,7 +35,7 @@ export class JsonStore<T> {
 
   select(predicate?: (item: T) => boolean) {
     const file = this.file;
-    const items = asJson<Array<T>>(file) || [];
+    const items = asJson<Array<T>>(file, []);
     return items.filter(predicate || all);
   }
 

diff --git a/src/server/injectors/har-injector.ts b/src/server/injectors/har-injector.ts
@@ -188,7 +188,7 @@ export default class HarInjector implements KrasInjector {
   }
 
   private load(fileName: string, position: number) {
-    const content = asJson(fileName);
+    const content = asJson(fileName, undefined);
     const entries = findEntries(content);
     const files = entries.map((entry) => this.transformEntry(fileName, entry));
     this.unload(fileName);

diff --git a/src/server/injectors/json-injector.ts b/src/server/injectors/json-injector.ts
@@ -134,7 +134,7 @@ export default class JsonInjector implements KrasInjector {
   }
 
   private load(fileName: string, position: number) {
-    const content = asJson(fileName);
+    const content = asJson(fileName, []);
     const items = Array.isArray(content) ? content : [content];
 
     for (const item of items) {