Use new subdomains (#773)

* Use new subdomains

* Set crossOrigin on images

* Fix more URLs

Author: patapancakes

chat.js

@@ -896,7 +896,7 @@ function tryEmbedScreenshot(node, uuid) {
           const imageNode = document.createElement('img');
           imageNode.classList.add('screenshotEmbed');
           imageNode.classList.toggle('screenshotBlur', globalConfig.blurScreenshotEmbeds || !!(flags & SCREENSHOT_FLAGS.SPOILER));
-          imageNode.src = `${serverUrl}/screenshots/${isTemp ? 'temp/' : ''}${uuid}/${screenshotResult[2]}.png`;
+          imageNode.src = `${ugcUrl}/screenshots/${isTemp ? 'temp/' : ''}${uuid}/${screenshotResult[2]}.png`;
           const date = new Date();
           imageNode.onclick = function () {
             sendSessionCommand('psi', [ uuid, screenshotResult[2] ], args => {

init.js

@@ -57,22 +57,26 @@ Object.defineProperty(String.prototype, 'title', {
   get() { return this; },
 })
 
+const loggedInKey = 'ynoproject_loggedIn';
+const hostBase = 'ynoproject.net';
+const serverUrlBase = `api.${hostBase}`;
+const serverUrl = `https://${serverUrlBase}/${ynoGameId}`;
+const authApiUrl = `https://auth.${hostBase}`;
+const cdnUrl = `https://cdn.${hostBase}`;
+const ugcUrl = `https://ugc.${hostBase}`;
+const rankUrl = `https://rank.${hostBase}`
+const apiUrl = `${serverUrl}/api`;
+const adminApiUrl = `${serverUrl}/admin`;
+const ynomojiUrlPrefix = 'images/ynomoji/';
+
 let easyrpgPlayer = {
   initialized: false,
   game: ynoGameId,
   saveFs: undefined,
-  wsUrl: 'wss://connect.ynoproject.net/' + ynoGameId + '/'
+  wsUrl: `wss://${serverUrlBase}/${ynoGameId}/`
 };
 let easyrpgPlayerLoadFuncs = [];
 
-const loggedInKey = 'ynoproject_loggedIn';
-const serverUrlBase = 'https://connect.ynoproject.net';
-const serverUrl = `${serverUrlBase}/${ynoGameId}`;
-const apiUrl = `${serverUrl}/api`;
-const authApiUrl = `${serverUrlBase}/seiko`;
-const adminApiUrl = `${serverUrl}/admin`;
-const ynomojiUrlPrefix = 'images/ynomoji/';
-
 let initBlocker = Promise.resolve();
 
 async function injectScripts() {
@@ -89,7 +93,7 @@ async function injectScripts() {
   }
   for (let script of scripts)
     dependencyFiles[script] = null;
-  dependencyFiles[`${window.location.origin}/data/${ynoGameId}/index.json`] = null;
+  dependencyFiles[`${cdnUrl}/${ynoGameId}/index.json`] = null;
   dependencyFiles[`ynoengine${supportsSimd ? '-simd' : ''}.wasm`] = null;
 
   const injectScript = function (index) {

loader.js

@@ -125,12 +125,13 @@ async function getLoaderSpriteImg(sprite, idx, frameIdx, dir) {
     if (spriteUrl)
       return resolve(spriteUrl);
     const img = new Image();
+    img.setAttribute('crossOrigin', 'anonymous');
     img.onload = function () {
       getSpriteImg(img, spriteData, sprite, idx, frameIdx, 24, 32, 0, false, isBrave)
         .then(url => resolve(url));
     };
     if (!dir) {
-      dir = `../data/${ynoGameId}/CharSet/`;
+      dir = `${cdnUrl}/${ynoGameId}/CharSet/`;
       img.onerror = () => getLoaderSpriteImg(sprite, idx, frameIdx, `images/charsets/${ynoGameId}/`).then(url => resolve(url));
     } else {
       img.onerror = () => {

play.js

@@ -375,6 +375,7 @@ populateUiThemes();
 
 const gameLogoUrl = `../images/logo_${gameId}.png`;
 const gameLogoImg = new Image();
+gameLogoImg.setAttribute('crossOrigin', 'anonymous');
 gameLogoImg.onload = function () {
   let width = gameLogoImg.width;
   let height = gameLogoImg.height;
@@ -1990,7 +1991,7 @@ function setLang(lang, isInit) {
 
   globalConfig.lang = lang;
   initBlocker = initBlocker.then(() => withTimeout(800, 
-    fetchNewest(`../data/${gameId}/Language/${lang}/meta.ini`).then(response => { // Prevent a crash when the --language argument is used and the game doesn't have a Language folder
+    fetchNewest(`${cdnUrl}/${gameId}/Language/${lang}/meta.ini`).then(response => { // Prevent a crash when the --language argument is used and the game doesn't have a Language folder
       if (response.ok && response.status < 400 && isInit && gameIds.indexOf(gameId) > -1) {
         easyrpgPlayer.language = (gameDefaultLangs.hasOwnProperty(gameId) ? gameDefaultLangs[gameId] !== lang : lang !== 'en') ? lang : 'default';
       }
@@ -2272,7 +2273,7 @@ function initLocalization(isInitial) {
         for (let langOpt of languages) {
           const lang = langOpt.value;
           if (gameDefaultLangs.hasOwnProperty(gameId) ? gameDefaultLangs[gameId] !== lang : lang !== 'en')
-            fetchNewest(`../data/${gameId}/Language/${lang}/meta.ini`).then(response => {
+            fetchNewest(`${cdnUrl}/${gameId}/Language/${lang}/meta.ini`).then(response => {
               if (!response.ok && response.status === 404 && gameId !== 'tsushin') { // Don't display that the game is not localized for Yume Tsushin since it uses a conlang
                 langOpt.innerText += '*';
                 langOpt.dataset.noGameLoc = true;

playerlist.js

@@ -988,12 +988,13 @@ async function getSpriteProfileImg(sprite, idx, favicon, dir, gameId) {
     if (!sprite || idx === -1)
       return getDefaultSpriteImg.then(defaultSpriteImg => resolve(defaultSpriteImg));
     const img = new Image();
+    img.setAttribute('crossOrigin', 'anonymous');
     img.onload = function () {
       getSpriteImg(img, spriteData[cacheKey], sprite, idx, 1, favicon ? 16 : 20, 16, favicon ? 4 : 2, true, isBrave)
         .then(url => resolve(url));
     };
     if (!dir) {
-      dir = `../data/${gameId}/CharSet/`;
+      dir = `${cdnUrl}/${gameId}/CharSet/`;
       img.onerror = () => getSpriteProfileImg(sprite, idx, favicon, `images/charsets/${gameId}/`, gameId).then(url => resolve(url));
     } else {
       img.onerror = () => {

preloads.js

@@ -180,7 +180,7 @@ function preloadFilesFromMapId(mapId) {
 }
 
 function getFilePathForPreloads(path) {
-  return path.replace(`/data/${gameId}`, "").replace("Language/", "");
+  return path.replace(`${cdnUrl}/${gameId}`, "").replace("Language/", "");
 }
 
 let preloadsGameLang = "default";

rankings.js

@@ -1,5 +1,3 @@
-const rankingsUrl = `https://connect.ynoproject.net/rankings`;
-
 const perGameCategoryIds = [];
 
 let rankingCategoryCache = [];
@@ -27,7 +25,7 @@ function initRankingControls() {
 
 function rankingsApiFetch(path) {
   return new Promise((resolve, reject) => {
-    fetch(`${rankingsUrl}/${path}`, { credentials: "include" })
+    fetch(`${rankUrl}/${path}`, { credentials: "include" })
       .then(response => resolve(response))
       .catch(err => reject(err));
   });

screenshots.js

@@ -262,6 +262,7 @@ async function downloadScreenshot(url, date, screenshotData, resized) {
     scaleContext.imageSmoothingEnabled = false;
 
     const img = new Image(320, 240);
+    img.setAttribute('crossOrigin', 'anonymous');
     img.onload = async () => {
       scaleContext.drawImage(img, 0, 0, width, height);
       scaleCanvas.toBlob(async blob => {
@@ -447,7 +448,7 @@ function initScreenshotsModal(isCommunity) {
 
       const screenshotThumbnail = document.createElement('img');
       screenshotThumbnail.classList.add('screenshotThumbnail', 'imageThumbnail', 'unselectable');
-      screenshotThumbnail.src = `${serverUrl}/screenshots/${uuid}/${screenshot.id}.png`;
+      screenshotThumbnail.src = `${ugcUrl}/screenshots/${uuid}/${screenshot.id}.png`;
       screenshotThumbnail.onclick = () => viewScreenshot(screenshotThumbnail.src, new Date(screenshot.timestamp), screenshot, screenshotsModal.id);
 
       screenshotThumbnailContainer.append(screenshotThumbnail);

session.js

@@ -14,7 +14,7 @@ function initSessionWs(attempt) {
       resolve();
       return;
     }
-    let url = `wss://connect.ynoproject.net/${ynoGameId}/session`;
+    let url = `wss://${serverUrlBase}/${ynoGameId}/session`;
     sessionWs = new WebSocket(url);
     sessionWs.onclose = e => {
       if (e.code === 1028)