From 98b83003a1625c6942a910b0ca3969e2b2fc3ba0 Mon Sep 17 00:00:00 2001 From: KittenTM Date: Mon, 16 Mar 2026 05:19:20 +0100 Subject: [PATCH] implement better mii fetching using now defunct mii clicker as a reference (thanks dwyazzo90)! --- equipment/equipment.js | 39 ++++++++++++++++++++++++++++++----- friend_list/friendlist.js | 43 +++++++++++++++++++++++++++++++++++---- ranking/rank.js | 41 +++++++++++++++++++++++++++++-------- stages/stages.js | 41 ++++++++++++++++++++++++++++++------- 4 files changed, 140 insertions(+), 24 deletions(-) diff --git a/equipment/equipment.js b/equipment/equipment.js index 64f4ef2..e40afbc 100644 --- a/equipment/equipment.js +++ b/equipment/equipment.js @@ -9,6 +9,32 @@ window.loadHeader(function(headerContainer) { }); } + const extractMiiName = (miiDataB64) => { + try { + const binaryString = atob(miiDataB64.replace(/-/g, '+').replace(/_/g, '/')); + const data = new Uint8Array(binaryString.length); + for (let i = 0; i < binaryString.length; i++) { + data[i] = binaryString.charCodeAt(i); + } + const size = data.length; + let offset = -1; + let isBE = false; + if ([92, 96, 104, 106, 108, 336, 72].includes(size)) offset = 0x1A; + else if ([74, 76].includes(size)) { offset = 0x02; isBE = true; } + else if (size === 88) offset = 0x10; + else if ([48, 68].includes(size)) offset = 0x1C; + if (offset === -1) return null; + const decoder = new TextDecoder(isBE ? 'utf-16be' : 'utf-16le'); + let end = offset; + while (end < offset + 20 && end + 1 < data.length && (data[end] !== 0 || data[end + 1] !== 0)) { + end += 2; + } + return decoder.decode(data.slice(offset, end)); + } catch (e) { + return null; + } + }; + const udemaeMap = { "0": "C-", "1": "C", "2": "C+", "3": "B-", "4": "B", "5": "B+", "6": "A-", "7": "A", "8": "A+", "9": "S", "10": "S+" @@ -42,9 +68,12 @@ window.loadHeader(function(headerContainer) { combinedData = { ...combinedData, ...data }; const finalData = combinedData; const equipped = finalData.last_equipped || {}; - const name = (finalData.mii && finalData.mii.name) || finalData.user_id || finalData.mii_name || "User"; + const miiBlob = (finalData.mii && finalData.mii.data) || finalData.mii_data; - const miiImgUrl = miiBlob ? `https://mii-unsecure.ariankordi.net/miis/image.png?erri=s6u7r-rsp&data=${encodeURIComponent(miiBlob)}&type=face&width=270` : ""; + const parsedName = miiBlob ? extractMiiName(miiBlob) : null; + const name = parsedName || (finalData.mii && finalData.mii.name) || finalData.nickname || finalData.user_id || finalData.mii_name || "User"; + + const miiImgUrl = miiBlob ? `https://mii-unsecure.ariankordi.net/miis/image.png?data=${encodeURIComponent(miiBlob)}&type=face&width=270` : ""; const sidebarName = document.getElementById('mii-name'); const sidebarImg = document.getElementById('mii-img'); @@ -124,7 +153,7 @@ window.loadHeader(function(headerContainer) {
- " /> +
@@ -132,7 +161,7 @@ window.loadHeader(function(headerContainer) {
- " /> +
@@ -140,7 +169,7 @@ window.loadHeader(function(headerContainer) {
- " /> +
diff --git a/friend_list/friendlist.js b/friend_list/friendlist.js index d7c6e2f..7e9f3b2 100644 --- a/friend_list/friendlist.js +++ b/friend_list/friendlist.js @@ -16,15 +16,47 @@ window.loadHeader(function(headerContainer) { }); } + const extractMiiName = (miiDataB64) => { + try { + const binaryString = atob(miiDataB64.replace(/-/g, '+').replace(/_/g, '/')); + const data = new Uint8Array(binaryString.length); + for (let i = 0; i < binaryString.length; i++) { + data[i] = binaryString.charCodeAt(i); + } + const size = data.length; + let offset = -1; + let isBE = false; + if ([92, 96, 104, 106, 108, 336, 72].includes(size)) offset = 0x1A; + else if ([74, 76].includes(size)) { offset = 0x02; isBE = true; } + else if (size === 88) offset = 0x10; + else if ([48, 68].includes(size)) offset = 0x1C; + if (offset === -1) return null; + const decoder = new TextDecoder(isBE ? 'utf-16be' : 'utf-16le'); + let end = offset; + while (end < offset + 20 && end + 1 < data.length && (data[end] !== 0 || data[end + 1] !== 0)) { + end += 2; + } + return decoder.decode(data.slice(offset, end)); + } catch (e) { + return null; + } + }; + const renderData = (data) => { if (typeof data === 'string') { try { data = JSON.parse(data); } catch (e) {} } const nameEl = document.getElementById('mii-name'); const imgEl = document.getElementById('mii-img'); - if (nameEl) nameEl.textContent = data.nickname || data.mii.name || "User"; - if (imgEl && (data.mii && data.mii.data)) { - imgEl.src = `https://mii-unsecure.ariankordi.net/miis/image.png?erri=s6u7r-rsp&data=${encodeURIComponent(data.mii.data)}&type=face&width=270`; + const miiBlob = (data.mii && data.mii.data) || data.mii_data; + + if (nameEl) { + const parsedName = miiBlob ? extractMiiName(miiBlob) : null; + nameEl.textContent = parsedName || (data.mii && data.mii.name) || data.nickname || data.username || "User"; + } + + if (imgEl && miiBlob) { + imgEl.src = `https://mii-unsecure.ariankordi.net/miis/image.png?data=${encodeURIComponent(miiBlob)}&type=face&width=270`; imgEl.style.display = 'block'; } }; @@ -39,7 +71,10 @@ window.loadHeader(function(headerContainer) { renderData(data); }) .catch(() => { - if (!cached) document.getElementById('mii-name').textContent = "Guest"; + if (!cached) { + const nameEl = document.getElementById('mii-name'); + if (nameEl) nameEl.textContent = "Guest"; + } }); const loadingOverlay = document.getElementById("loading-overlay"); diff --git a/ranking/rank.js b/ranking/rank.js index e9a3fa6..6f77aa5 100644 --- a/ranking/rank.js +++ b/ranking/rank.js @@ -5,7 +5,6 @@ window.loadHeader(function(headerContainer) { } const logoutForm = document.getElementById("logout-form"); - if (logoutForm) { logoutForm.action = "/api/v1/spfn/logout"; const originInput = document.getElementById("logout_frontend_origin"); @@ -16,6 +15,33 @@ window.loadHeader(function(headerContainer) { }); } + const extractMiiName = (miiDataB64) => { + try { + const data = Uint8Array.from(atob(miiDataB64.replace(/-/g, '+').replace(/_/g, '/')), c => c.charCodeAt(0)); + const size = data.length; + let offset = -1; + let isBE = false; + + if ([92, 96, 104, 106, 108, 336, 72].includes(size)) offset = 0x1A; // 3DS/WiiU + else if ([74, 76].includes(size)) { offset = 0x02; isBE = true; } // Wii + else if (size === 88) offset = 0x10; // Switch CharInfo + else if ([48, 68].includes(size)) offset = 0x1C; // Switch CoreData + + if (offset === -1) return null; + + const decoder = new TextDecoder(isBE ? 'utf-16be' : 'utf-16le'); + let end = offset; + while (end < offset + 20 && (data[end] !== 0 || data[end + 1] !== 0)) end += 2; + return decoder.decode(data.slice(offset, end)); + } catch (e) { + return null; + } + }; + + const getMiiRenderUrl = (data) => { + return `https://mii-unsecure.ariankordi.net/miis/image.png?data=${encodeURIComponent(data)}&type=face&width=270&resourceType=very_high`; + }; + const renderData = (data) => { if (typeof data === 'string') { try { data = JSON.parse(data); } catch (e) { console.error(e); } @@ -23,17 +49,16 @@ window.loadHeader(function(headerContainer) { const nameEl = document.getElementById('mii-name'); const imgEl = document.getElementById('mii-img'); + const miiBlob = (data.mii && data.mii.data) || data.mii_data; if (nameEl) { - nameEl.textContent = (data.mii && data.mii.name) || data.nickname || data.user_id || data.username || "User"; + const parsedName = miiBlob ? extractMiiName(miiBlob) : null; + nameEl.textContent = parsedName || (data.mii && data.mii.name) || data.nickname || data.username || "User"; } - if (imgEl) { - const miiBlob = (data.mii && data.mii.data) || data.mii_data; - if (miiBlob) { - imgEl.src = `https://mii-unsecure.ariankordi.net/miis/image.png?erri=s6u7r-rsp&data=${encodeURIComponent(miiBlob)}&type=face&width=270`; - imgEl.style.display = 'block'; - } + if (imgEl && miiBlob) { + imgEl.src = getMiiRenderUrl(miiBlob); + imgEl.style.display = 'block'; } }; diff --git a/stages/stages.js b/stages/stages.js index 308434c..426e6fd 100644 --- a/stages/stages.js +++ b/stages/stages.js @@ -21,21 +21,48 @@ window.loadHeader(function(headerContainer) { }); } + const extractMiiName = (miiDataB64) => { + try { + const binaryString = atob(miiDataB64.replace(/-/g, '+').replace(/_/g, '/')); + const data = new Uint8Array(binaryString.length); + for (let i = 0; i < binaryString.length; i++) { + data[i] = binaryString.charCodeAt(i); + } + const size = data.length; + let offset = -1; + let isBE = false; + if ([92, 96, 104, 106, 108, 336, 72].includes(size)) offset = 0x1A; + else if ([74, 76].includes(size)) { offset = 0x02; isBE = true; } + else if (size === 88) offset = 0x10; + else if ([48, 68].includes(size)) offset = 0x1C; + if (offset === -1) return null; + const decoder = new TextDecoder(isBE ? 'utf-16be' : 'utf-16le'); + let end = offset; + while (end < offset + 20 && end + 1 < data.length && (data[end] !== 0 || data[end + 1] !== 0)) { + end += 2; + } + return decoder.decode(data.slice(offset, end)); + } catch (e) { + return null; + } + }; + const renderData = (data) => { if (typeof data === 'string') { try { data = JSON.parse(data); } catch (e) { console.error(e); } } const nameEl = document.getElementById('mii-name'); const imgEl = document.getElementById('mii-img'); + const miiBlob = (data.mii && data.mii.data) || data.mii_data; + if (nameEl) { - nameEl.textContent = (data.mii && data.mii.name) || data.nickname || data.user_id || data.username || "User"; + const parsedName = miiBlob ? extractMiiName(miiBlob) : null; + nameEl.textContent = parsedName || (data.mii && data.mii.name) || data.nickname || data.user_id || data.username || "User"; } - if (imgEl) { - const miiBlob = (data.mii && data.mii.data) || data.mii_data; - if (miiBlob) { - imgEl.src = `https://mii-unsecure.ariankordi.net/miis/image.png?erri=s6u7r-rsp&data=${encodeURIComponent(miiBlob)}&type=face&width=270`; - imgEl.style.display = 'block'; - } + + if (imgEl && miiBlob) { + imgEl.src = `https://mii-unsecure.ariankordi.net/miis/image.png?data=${encodeURIComponent(miiBlob)}&type=face&width=270`; + imgEl.style.display = 'block'; } };