Use hubs-proxy for fetching media in development

.env.defaults

@@ -13,4 +13,5 @@
 HUBS_SERVER="dev.reticulum.io"
 RETICULUM_SERVER="dev.reticulum.io"
 FARSPARK_SERVER="farspark-dev.reticulum.io"
-NON_CORS_PROXY_DOMAINS="hubs.local,localhost"
+NON_CORS_PROXY_DOMAINS="hubs.local,localhost"
+CORS_PROXY_SERVER="hubs-proxy.com"

src/api/Api.js

@@ -7,6 +7,7 @@ import PublishDialog from "./PublishDialog";
 import ProgressDialog from "../ui/dialogs/ProgressDialog";
 import Fuse from "fuse.js";
 import jwtDecode from "jwt-decode";
+import { buildAbsoluteURL } from "url-toolkit";
 
 // Media related functions should be kept up to date with Hubs media-utils:
 // https://github.com/mozilla/hubs/blob/master/src/utils/media-utils.js
@@ -278,6 +279,28 @@ export default class Project extends EventEmitter {
     return { canonicalUrl, accessibleUrl, contentType };
   }
 
+  unproxyUrl(baseUrl, url) {
+    if (process.env.CORS_PROXY_SERVER) {
+      const corsProxyPrefix = `https://${process.env.CORS_PROXY_SERVER}/`;
+
+      if (baseUrl.startsWith(corsProxyPrefix)) {
+        baseUrl = baseUrl.substring(corsProxyPrefix.length);
+      }
+
+      if (url.startsWith(corsProxyPrefix)) {
+        url = url.substring(corsProxyPrefix.length);
+      }
+    }
+
+    // HACK HLS.js resolves relative urls internally, but our CORS proxying screws it up. Resolve relative to the original unproxied url.
+    // TODO extend HLS.js to allow overriding of its internal resolving instead
+    if (!url.startsWith("http")) {
+      url = buildAbsoluteURL(baseUrl, url.startsWith("/") ? url : `/${url}`);
+    }
+
+    return proxiedUrlFor(url);
+  }
+
   async searchMedia(source, params, cursor, signal) {
     const url = new URL(`https://${RETICULUM_SERVER}/api/v1/media/search`);
 

src/editor/nodes/VideoNode.js

@@ -1,6 +1,5 @@
 import EditorNodeMixin from "./EditorNodeMixin";
 import Video from "../objects/Video";
-import { buildAbsoluteURL } from "url-toolkit";
 import Hls from "hls.js/dist/hls.light";
 import isHLS from "../utils/isHLS";
 
@@ -90,21 +89,9 @@ export default class VideoNode extends EditorNodeMixin(Video) {
       const isHls = isHLS(src, contentType);
 
       if (isHls) {
-        const corsProxyPrefix = `http://localhost:9090/api/cors-proxy/`;
-        const baseUrl = src.startsWith(corsProxyPrefix) ? src.substring(corsProxyPrefix.length) : src;
         this.hls = new Hls({
-          xhrSetup: (xhr, u) => {
-            if (u.startsWith(corsProxyPrefix)) {
-              u = u.substring(corsProxyPrefix.length);
-            }
-
-            // HACK HLS.js resolves relative urls internally, but our CORS proxying screws it up. Resolve relative to the original unproxied url.
-            // TODO extend HLS.js to allow overriding of its internal resolving instead
-            if (!u.startsWith("http")) {
-              u = buildAbsoluteURL(baseUrl, u.startsWith("/") ? u : `/${u}`);
-            }
-
-            xhr.open("GET", new URL(`/api/cors-proxy/${u}`, window.location).href);
+          xhrSetup: (xhr, url) => {
+            xhr.open("GET", this.editor.api.unproxyUrl(src, url));
           }
         });
       }