From ec67b40fc4cbd9bd4269b1efe9edde9346527f66 Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Wed, 21 Aug 2019 14:00:18 -0700
Subject: [PATCH] Extract browser-only functions into Utils

This will make it easier to mock out these methods in tests to use Node apporaches to these problems
---
 modern/src/initialize.js | 33 ++++++++-------------------------
 modern/src/utils.js      | 24 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/modern/src/initialize.js b/modern/src/initialize.js
index 816d2590..472928fa 100644
--- a/modern/src/initialize.js
+++ b/modern/src/initialize.js
@@ -1,8 +1,4 @@
-import {
-  getCaseInsensitveFile,
-  readUint8array,
-  asyncTreeFlatMap,
-} from "./utils";
+import * as Utils from "./utils";
 import MakiObject from "./runtime/MakiObject";
 import GuiObject from "./runtime/GuiObject";
 import JsWinampAbstractionLayer from "./runtime/JsWinampAbstractionLayer";
@@ -23,19 +19,6 @@ import EqVis from "./runtime/EqVis";
 import AnimatedLayer from "./runtime/AnimatedLayer";
 import Component from "./runtime/Component";
 
-async function loadImage(imgUrl) {
-  return new Promise((resolve, reject) => {
-    const img = new Image();
-    img.addEventListener("load", () => {
-      resolve(img);
-    });
-    img.addEventListener("error", e => {
-      reject(e);
-    });
-    img.src = imgUrl;
-  });
-}
-
 const noop = (node, parent) => new GuiObject(node, parent);
 
 const parsers = {
@@ -66,16 +49,16 @@ const parsers = {
     let { h, w, x, y } = node.attributes;
     const { file, gammagroup, id } = node.attributes;
     // TODO: Escape file for regex
-    const img = getCaseInsensitveFile(zip, file);
+    const img = Utils.getCaseInsensitveFile(zip, file);
     if (img === undefined) {
       return new MakiObject(node, parent);
     }
     const imgBlob = await img.async("blob");
-    const imgUrl = URL.createObjectURL(imgBlob);
+    const imgUrl = await Utils.getUrlFromBlob(imgBlob);
     if (w === undefined || h === undefined) {
-      const image = await loadImage(imgUrl);
-      w = image.width;
-      h = image.height;
+      const { width, height } = await Utils.getSizeFromUrl(imgUrl);
+      w = width;
+      h = height;
       x = x !== undefined ? x : 0;
       y = y !== undefined ? y : 0;
     }
@@ -119,7 +102,7 @@ const parsers = {
   albumart: noop,
   playlistplus: noop,
   async script(node, parent, zip) {
-    const script = await readUint8array(zip, node.attributes.file);
+    const script = await Utils.readUint8array(zip, node.attributes.file);
     return new MakiObject(node, parent, { script });
   },
 };
@@ -171,7 +154,7 @@ async function parseChildren(node, children, zip) {
 }
 
 async function applyGroupDefs(root) {
-  await asyncTreeFlatMap(root, async node => {
+  await Utils.asyncTreeFlatMap(root, async node => {
     switch (node.name) {
       case "group": {
         if (!node.children || node.children.length === 0) {
diff --git a/modern/src/utils.js b/modern/src/utils.js
index 4fc935e5..ae3f523a 100644
--- a/modern/src/utils.js
+++ b/modern/src/utils.js
@@ -214,3 +214,27 @@ export function findGroupDefById(node, id) {
     );
   });
 }
+
+// This is intentionally async since we may want to sub it out for an async
+// function in a node environment
+export async function getUrlFromBlob(blob) {
+  return URL.createObjectURL(blob);
+}
+
+async function loadImage(imgUrl) {
+  return new Promise((resolve, reject) => {
+    const img = new Image();
+    img.addEventListener("load", () => {
+      resolve(img);
+    });
+    img.addEventListener("error", e => {
+      reject(e);
+    });
+    img.src = imgUrl;
+  });
+}
+
+export async function getSizeFromUrl(imgUrl) {
+  const { width, height } = await loadImage(imgUrl);
+  return { width, height };
+}