Merge pull request #221 from vitalygashkov/next

Fixed episode numbers parsing, fixed evaluation of JS objects from string
vitalygashkov · Sep 17, 2024 · 60e099c · 60e099c
2 parents c7a1d63 + b42274d
commit 60e099c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 15 deletions.
diff --git a/apps/cli b/apps/cli
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/lib/utils.ts b/packages/core/lib/utils.ts
@@ -25,17 +25,13 @@ export const execUrlPatterns = (url: string, patterns: string[], baseUrls: strin
   return { pathname, search };
 };
 
-// Like global eval but just for JS objects
+// Like eval but just for JS objects
 export const safeEval = <T = any>(jsObjectString: string): T | null => {
-  const jsonString = jsObjectString
-    .trim()
-    .replace(/(\w+):/g, '"$1":')
-    .replace(/'/g, '"');
   try {
-    return JSON.parse(jsonString);
+    return new Function('return ' + jsObjectString)();
   } catch (e) {
-    logger.error('JSON parsing failed');
-    logger.debug(jsonString);
+    logger.error('Evaluation JS object failed. Input:');
+    logger.debug(jsObjectString);
     logger.debug(e);
     return null as T;
   }
@@ -62,7 +58,7 @@ export const extendEpisodes = (episodesBySeasons: Map<number, Set<number>>) => {
     else episodesBySeasons.set(s, new Set([e]));
   };
   const getAllEpisodeNumbers = () =>
-    Array.from(episodesBySeasons.values()).flatMap(Array.from) as number[];
+    Array.from(episodesBySeasons.values()).flatMap((value) => Array.from(value)) as number[];
   const seasonsCount = episodesBySeasons.size;
   const episodes = getAllEpisodeNumbers();
   const episodesCount = episodes.length;

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@streamyx/core",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "author": "Vitaly Gashkov <[email protected]>",
   "description": "Core modules for Streamyx",
   "license": "AGPL-3.0",

diff --git a/packages/crunchyroll b/packages/crunchyroll
+4 −4		package-lock.json
+1 −1		package.json
+3 −6		test/crunchyroll.test.ts