Splatlogger 1.6.3__tar.gz → 1.6.4__tar.gz

{splatlogger-1.6.3/src/Splatlogger.egg-info → splatlogger-1.6.4}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: Splatlogger
-Version: 1.6.3
-Summary: PID (Principal ID)/PNID grabber and match logger for Splatoon
+Version: 1.6.4
+Summary: PID (Principal ID)/Network ID grabber and match logger for Splatoon
 Author-email: Shadow Doggo <shadowdoggo@protonmail.com>
 License-Expression: MIT
 Project-URL: Source Code, https://codeberg.org/ShadowDoggo/Splatlogger
@@ -13,18 +13,15 @@ Requires-Dist: userpaths
 Requires-Dist: requests
 Requires-Dist: psutil
 Requires-Dist: pymemoryeditor
+Requires-Dist: colorama
 
 # Splatlogger
-A CLI PID (Principal ID)/PNID grabber and match logger for Splatoon (Wii U), written in Python.
-
-## Prerequisites
-To install the package, you'll need to have Python 3.11 or newer installed on your system.
-On Android devices you can use Termux.
-Python is not required for the Windows executable.
+A CLI PID (Principal ID)/Network ID grabber and match logger for Splatoon, written in Python.
 
 Both the Wii U and Cemu (Windows and Linux only) are supported.
 
-Your Wii U will need to have either the Tiramisu or Aroma environment set up or have another way to run homebrew,
+## Prerequisites (Wii U)
+Your console will need to have either the Tiramisu or Aroma environment set up or have another way to run homebrew,
 such as Haxchi or the browser exploit.
 
 On Tiramisu, use [TCPGecko](https://github.com/BullyWiiPlaza/tcpgecko), [Geckiine](https://hb-app.store/wiiu/geckiine),
@@ -33,10 +30,15 @@ or any other app with the TCPGecko server.
 On Aroma, install the [TCPGecko Aroma plugin](https://codeberg.org/ShadowDoggo/TCPGeckoAroma).
 
 ## Installation
+### Windows executable
 On Windows, you can use the executable provided on the releases page.
-Though if you already have Python installed, it's recommended to use the package.
+Though if you already have Python installed, it's recommended to use the package instead.
 
-To install the package from PyPI, run:
+### Python package
+To use the package, you'll need to have Python 3.11 or newer installed on your system.
+On Android devices you can use Termux.
+
+Install the package from PyPI:
 ```
 pip install Splatlogger
 ```
@@ -47,14 +49,14 @@ Or download the latest release from Codeberg and run:
 pip install path/to/Splatlogger-v1.x.zip
 ```
 
-If you do have Python installed but do not wish to install the package, you can run the module directly from the source code.
+If you do have Python installed but do not wish to install the package, you can run it from the source code.
 
 Install the required dependencies:
 ```
 cd path/to/Splatlogger-v1.x/ && pip install -r requirements.txt
 ```
 
-Then run the module:
+Then run:
 ```
 cd src/ && python -m splatlogger
 ```
@@ -76,7 +78,7 @@ Options:
 - `-aroma` - Switch to Aroma mode. Enable if using the TCPGecko Aroma plugin.
 
 - `-cemu [PID]` - Switch to Cemu mode. The `-ip` argument is not required.
-  Note: If you have ptrace protection enabled, you'll need to run Python as root. It's best to run the module from source in that case.
+  Note: If you have ptrace protection enabled, you'll need to run Python as root. It's best to run the package from source in that case.
   - `PID` - PID of the Cemu process (optional).
 
 - `-log-level option` - Set how much data should be logged.
@@ -100,6 +102,9 @@ Only required for logging stats. If the default values don't work, you'll need t
 
 - `-silent` - Disable printing logs to the console.
 
+For example, `splatlogger -ip 192.168.1.100 -log-level extended -auto latest` will save an extended log of the latest match you play
+(replace `192.168.1.100` with your actual IP address).
+
 Logs are saved in `(User)/Documents/Splatlogger/logs/`.
 
 To always run with the same IP and options without having to type them in manually, create an `args.txt` file in

{splatlogger-1.6.3 → splatlogger-1.6.4}/README.md

@@ -1,14 +1,10 @@
 # Splatlogger
-A CLI PID (Principal ID)/PNID grabber and match logger for Splatoon (Wii U), written in Python.
-
-## Prerequisites
-To install the package, you'll need to have Python 3.11 or newer installed on your system.
-On Android devices you can use Termux.
-Python is not required for the Windows executable.
+A CLI PID (Principal ID)/Network ID grabber and match logger for Splatoon, written in Python.
 
 Both the Wii U and Cemu (Windows and Linux only) are supported.
 
-Your Wii U will need to have either the Tiramisu or Aroma environment set up or have another way to run homebrew,
+## Prerequisites (Wii U)
+Your console will need to have either the Tiramisu or Aroma environment set up or have another way to run homebrew,
 such as Haxchi or the browser exploit.
 
 On Tiramisu, use [TCPGecko](https://github.com/BullyWiiPlaza/tcpgecko), [Geckiine](https://hb-app.store/wiiu/geckiine),
@@ -17,10 +13,15 @@ or any other app with the TCPGecko server.
 On Aroma, install the [TCPGecko Aroma plugin](https://codeberg.org/ShadowDoggo/TCPGeckoAroma).
 
 ## Installation
+### Windows executable
 On Windows, you can use the executable provided on the releases page.
-Though if you already have Python installed, it's recommended to use the package.
+Though if you already have Python installed, it's recommended to use the package instead.
 
-To install the package from PyPI, run:
+### Python package
+To use the package, you'll need to have Python 3.11 or newer installed on your system.
+On Android devices you can use Termux.
+
+Install the package from PyPI:
 ```
 pip install Splatlogger
 ```
@@ -31,14 +32,14 @@ Or download the latest release from Codeberg and run:
 pip install path/to/Splatlogger-v1.x.zip
 ```
 
-If you do have Python installed but do not wish to install the package, you can run the module directly from the source code.
+If you do have Python installed but do not wish to install the package, you can run it from the source code.
 
 Install the required dependencies:
 ```
 cd path/to/Splatlogger-v1.x/ && pip install -r requirements.txt
 ```
 
-Then run the module:
+Then run:
 ```
 cd src/ && python -m splatlogger
 ```
@@ -60,7 +61,7 @@ Options:
 - `-aroma` - Switch to Aroma mode. Enable if using the TCPGecko Aroma plugin.
 
 - `-cemu [PID]` - Switch to Cemu mode. The `-ip` argument is not required.
-  Note: If you have ptrace protection enabled, you'll need to run Python as root. It's best to run the module from source in that case.
+  Note: If you have ptrace protection enabled, you'll need to run Python as root. It's best to run the package from source in that case.
   - `PID` - PID of the Cemu process (optional).
 
 - `-log-level option` - Set how much data should be logged.
@@ -84,6 +85,9 @@ Only required for logging stats. If the default values don't work, you'll need t
 
 - `-silent` - Disable printing logs to the console.
 
+For example, `splatlogger -ip 192.168.1.100 -log-level extended -auto latest` will save an extended log of the latest match you play
+(replace `192.168.1.100` with your actual IP address).
+
 Logs are saved in `(User)/Documents/Splatlogger/logs/`.
 
 To always run with the same IP and options without having to type them in manually, create an `args.txt` file in

{splatlogger-1.6.3 → splatlogger-1.6.4}/pyproject.toml

@@ -4,18 +4,19 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "Splatlogger"
-version = "1.6.3"
+version = "1.6.4"
 authors = [
     { name="Shadow Doggo", email="shadowdoggo@protonmail.com" }
 ]
-description = "PID (Principal ID)/PNID grabber and match logger for Splatoon"
+description = "PID (Principal ID)/Network ID grabber and match logger for Splatoon"
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
     "userpaths",
     "requests",
     "psutil",
-    "pymemoryeditor"
+    "pymemoryeditor",
+    "colorama"
 ]
 classifiers = [
     "Programming Language :: Python :: 3",

{splatlogger-1.6.3 → splatlogger-1.6.4/src/Splatlogger.egg-info}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: Splatlogger
-Version: 1.6.3
-Summary: PID (Principal ID)/PNID grabber and match logger for Splatoon
+Version: 1.6.4
+Summary: PID (Principal ID)/Network ID grabber and match logger for Splatoon
 Author-email: Shadow Doggo <shadowdoggo@protonmail.com>
 License-Expression: MIT
 Project-URL: Source Code, https://codeberg.org/ShadowDoggo/Splatlogger
@@ -13,18 +13,15 @@ Requires-Dist: userpaths
 Requires-Dist: requests
 Requires-Dist: psutil
 Requires-Dist: pymemoryeditor
+Requires-Dist: colorama
 
 # Splatlogger
-A CLI PID (Principal ID)/PNID grabber and match logger for Splatoon (Wii U), written in Python.
-
-## Prerequisites
-To install the package, you'll need to have Python 3.11 or newer installed on your system.
-On Android devices you can use Termux.
-Python is not required for the Windows executable.
+A CLI PID (Principal ID)/Network ID grabber and match logger for Splatoon, written in Python.
 
 Both the Wii U and Cemu (Windows and Linux only) are supported.
 
-Your Wii U will need to have either the Tiramisu or Aroma environment set up or have another way to run homebrew,
+## Prerequisites (Wii U)
+Your console will need to have either the Tiramisu or Aroma environment set up or have another way to run homebrew,
 such as Haxchi or the browser exploit.
 
 On Tiramisu, use [TCPGecko](https://github.com/BullyWiiPlaza/tcpgecko), [Geckiine](https://hb-app.store/wiiu/geckiine),
@@ -33,10 +30,15 @@ or any other app with the TCPGecko server.
 On Aroma, install the [TCPGecko Aroma plugin](https://codeberg.org/ShadowDoggo/TCPGeckoAroma).
 
 ## Installation
+### Windows executable
 On Windows, you can use the executable provided on the releases page.
-Though if you already have Python installed, it's recommended to use the package.
+Though if you already have Python installed, it's recommended to use the package instead.
 
-To install the package from PyPI, run:
+### Python package
+To use the package, you'll need to have Python 3.11 or newer installed on your system.
+On Android devices you can use Termux.
+
+Install the package from PyPI:
 ```
 pip install Splatlogger
 ```
@@ -47,14 +49,14 @@ Or download the latest release from Codeberg and run:
 pip install path/to/Splatlogger-v1.x.zip
 ```
 
-If you do have Python installed but do not wish to install the package, you can run the module directly from the source code.
+If you do have Python installed but do not wish to install the package, you can run it from the source code.
 
 Install the required dependencies:
 ```
 cd path/to/Splatlogger-v1.x/ && pip install -r requirements.txt
 ```
 
-Then run the module:
+Then run:
 ```
 cd src/ && python -m splatlogger
 ```
@@ -76,7 +78,7 @@ Options:
 - `-aroma` - Switch to Aroma mode. Enable if using the TCPGecko Aroma plugin.
 
 - `-cemu [PID]` - Switch to Cemu mode. The `-ip` argument is not required.
-  Note: If you have ptrace protection enabled, you'll need to run Python as root. It's best to run the module from source in that case.
+  Note: If you have ptrace protection enabled, you'll need to run Python as root. It's best to run the package from source in that case.
   - `PID` - PID of the Cemu process (optional).
 
 - `-log-level option` - Set how much data should be logged.
@@ -100,6 +102,9 @@ Only required for logging stats. If the default values don't work, you'll need t
 
 - `-silent` - Disable printing logs to the console.
 
+For example, `splatlogger -ip 192.168.1.100 -log-level extended -auto latest` will save an extended log of the latest match you play
+(replace `192.168.1.100` with your actual IP address).
+
 Logs are saved in `(User)/Documents/Splatlogger/logs/`.
 
 To always run with the same IP and options without having to type them in manually, create an `args.txt` file in

{splatlogger-1.6.3 → splatlogger-1.6.4}/src/Splatlogger.egg-info/SOURCES.txt

@@ -15,5 +15,6 @@ src/splatlogger/match_logger.py
 src/splatlogger/tcpgecko.py
 src/splatlogger/tcpgecko_aroma.py
 src/splatlogger/tuples.py
+src/splatlogger/utility_functions.py
 src/splatlogger/data/api.json
 src/splatlogger/data/names.json

{splatlogger-1.6.3 → splatlogger-1.6.4}/src/Splatlogger.egg-info/requires.txt

@@ -2,3 +2,4 @@ userpaths
 requests
 psutil
 pymemoryeditor
+colorama

splatlogger-1.6.4/src/splatlogger/__main__.py

@@ -0,0 +1,373 @@
+# Splatlogger (c) 2025 Shadow Doggo.
+
+import argparse
+import binascii
+import ipaddress
+import json
+import platform
+import sys
+import time
+import webbrowser
+from base64 import b64decode
+from datetime import datetime
+from importlib import resources
+from pathlib import Path
+
+import requests
+import userpaths  # type: ignore[import-untyped]
+from colorama import Fore, Style, just_fix_windows_console
+
+from . import utility_functions as uf
+from .cemu_gecko import CemuGecko, CemuGeckoError
+from .enums import Pointers
+from .match_logger import MatchLogger
+from .tcpgecko import TCPGecko, GeckoConnectionFailedError
+from .tcpgecko_aroma import TCPGeckoAroma
+from .tuples import Options, AccountInfo, PlayerInfo
+
+VERSION = "1.6.4"
+OPTIONS: Options
+GECKO: TCPGecko | TCPGeckoAroma | CemuGecko
+STATIC_MEM_ADR: int
+API: dict[str, str]
+
+
+def main() -> None:
+    if platform.system() == "Windows":
+        just_fix_windows_console()
+
+    print(f"Splatlogger v{VERSION} by Shadow Doggo\n")
+
+    global API, OPTIONS, GECKO, STATIC_MEM_ADR
+    API = get_api_keys()
+    OPTIONS = parse_args()
+    GECKO = create_tcpgecko_instance()
+
+    uf.set_consts(OPTIONS, GECKO)
+
+    STATIC_MEM_ADR = get_static_mem_adr()
+
+    uf.print_success("Success.\n" if OPTIONS.cemu else "Connected.\n")
+
+    if match_logger := create_match_logger_instance():
+        if OPTIONS.auto_logging:
+            print("Auto logging enabled.")
+            auto_log(match_logger)
+        else:
+            uf.create_log_file(match_logger)
+            splatlog(match_logger, match_count=1)
+    else:
+        splatlog(None, match_count=1)
+
+    GECKO.close()
+
+
+def get_api_keys() -> dict[str, str]:
+    try:
+        api_path = resources.files(__package__).joinpath("data", "api.json")
+        with api_path.open("r", encoding="utf-8") as api_f:
+            return json.load(api_f)
+    except FileNotFoundError:
+        uf.print_error("Couldn't find 'api.json'. The package may have been installed incorrectly.")
+        sys.exit()
+
+
+def parse_args() -> Options:
+    parser = argparse.ArgumentParser(description="PID (Principal ID)/Network ID grabber and match logger for Splatoon")
+    add_parser_arguments(parser)
+
+    if (args_path := Path(userpaths.get_my_documents()) / "Splatlogger/args.txt").is_file():
+        with open(args_path, encoding="utf-8") as args_f:
+            args = parser.parse_args(args_f.read().split())
+    else:
+        args = parser.parse_args()
+
+    if len(sys.argv) == 1 and not args_path.is_file():
+        print(f'{Fore.YELLOW}No arguments were provided. Run "splatlogger -h" for help.{Style.RESET_ALL}'
+              "\nWould you like to open the README? (y/n)")
+        if input().lower() in ("y", "yes"):
+            webbrowser.open("https://codeberg.org/ShadowDoggo/Splatlogger/src/branch/main/README.md")
+
+        sys.exit()
+
+    if args.aroma and args.cemu:
+        uf.print_error("Cannot use both Aroma and Cemu modes.")
+        sys.exit()
+
+    stack_addr: int | None = None
+    if args.stack and args.cemu:
+        try:
+            stack_addr = int(args.stack, 16)
+        except ValueError:
+            uf.print_error("Invalid stack address. Please provide a valid hex value.")
+            sys.exit()
+
+    if args.log_level == "none" and args.silent:
+        uf.print_warning("You have disabled printing logs to the console as well as creating a log file. "
+                         "Are you sure this wasn't a mistake?\n")
+
+    return Options(ip=args.ip, log_level=args.log_level, auto_logging=args.auto in ("all", "latest"),
+                   log_latest=args.auto == "latest", aroma=args.aroma, cemu=args.cemu is not None, cemu_pid=args.cemu,
+                   ptr_offset=0x503000 if args.cemu else 0, spfn=args.spfn, no_pnid=args.no_pnid,
+                   silent_logging=args.silent, stack=stack_addr)
+
+
+def add_parser_arguments(parser: argparse.ArgumentParser) -> None:
+    parser.add_argument("-ip", help="Your Wii U's LAN IP address.")
+    parser.add_argument("-aroma", help="Switch to Aroma mode. Enable if using the TCPGecko Aroma plugin.",
+                        action="store_true")
+    parser.add_argument("-cemu",
+                        help="Switch to Cemu mode (optional: PID of the Cemu process).", metavar="PID",
+                        nargs="?", const=-1)
+    parser.add_argument("-log-level", help="Set how much data should be logged (see README).",
+                        choices=["none", "standard", "extended", "stats"], default="standard")
+    parser.add_argument("-auto",
+                        help="Enable auto logging (see README).",
+                        choices=["all", "latest"], nargs="?", const="all")
+    parser.add_argument("-stack",
+                        help="Beginning address of the stack space for Default Core 1 (Cemu only, see README).",
+                        metavar="Address (in hex)")
+    parser.add_argument("-spfn", help="Fetch SFID instead of PNID. Enable if playing on SPFN.",
+                        action="store_true")
+    parser.add_argument("-no-pnid", help="Disable fetching PNIDs.", action="store_true")
+    parser.add_argument("-silent", help="Disable printing logs to the console.", action="store_true")
+
+
+def create_tcpgecko_instance() -> TCPGecko | TCPGeckoAroma | CemuGecko:
+    try:
+        if OPTIONS.cemu:
+            print("Opening Cemu process...")
+            return CemuGecko(OPTIONS.cemu_pid)
+
+        ipaddress.ip_address(OPTIONS.ip)
+        print("Connecting to:", OPTIONS.ip)
+        return TCPGeckoAroma(OPTIONS.ip) if OPTIONS.aroma else TCPGecko(OPTIONS.ip)
+    except ValueError:
+        uf.print_error("Please provide a valid IP address.")
+        sys.exit()
+    except (GeckoConnectionFailedError, CemuGeckoError) as e:
+        uf.print_error(str(e))
+        sys.exit()
+
+
+@uf.handle_gecko_errors
+def get_static_mem_adr() -> int:
+    static_mem_adr = GECKO.peek32(Pointers.STATIC_MEM - OPTIONS.ptr_offset)
+    if static_mem_adr == 0:
+        uf.exit_with_close(
+            f"\n{Fore.YELLOW}Could not find StaticMem address."
+            "\nIf you're on Cemu, this is likely due to the program not being able to read process memory"
+            f"due to ptrace protection.{Style.RESET_ALL}"
+        )
+
+    return static_mem_adr
+
+
+def create_match_logger_instance() -> MatchLogger | None:
+    if OPTIONS.log_level != "none":
+        try:
+            return MatchLogger(OPTIONS, GECKO, STATIC_MEM_ADR)
+        except FileNotFoundError:
+            uf.exit_with_close("Couldn't find 'names.json'. The package may have been installed incorrectly.")
+
+    return None
+
+
+@uf.handle_gecko_errors_and_kb_interrupt
+def auto_log(match_logger: MatchLogger) -> None:
+    match_in_progress = False
+    count = 0
+    while True:
+        if not uf.is_player_in_vs_match():
+            match_in_progress = False
+
+        if not match_in_progress and uf.is_player_in_vs_match():
+            match_in_progress = True
+            count += 1
+
+            uf.create_log_file(match_logger)
+            uf.print_if_not_silent(f"\nMatch {count}\n")
+            time.sleep(1)
+
+            splatlog(match_logger, count)
+
+        time.sleep(10)
+
+
+@uf.handle_gecko_errors
+def splatlog(match_logger: MatchLogger | None, match_count: int) -> None:
+    date = datetime.now()
+    adrs = uf.get_common_addresses(STATIC_MEM_ADR)
+    session_id = uf.get_session_id()
+    player_count = uf.get_player_count(adrs.main_mgr_base_adr)
+
+    print(uf.player_table_header(OPTIONS.spfn))
+
+    player_info_list, request_errors = collect_player_info(player_count, adrs.player_info_ary_adr)
+
+    uf.print_if_not_silent("")
+    if request_errors:
+        uf.print_if_not_silent(f"Failed to get account data for one or more players: {'; '.join(request_errors)}\n")
+
+    uf.print_if_not_silent(f"Session ID: {session_id}")
+    uf.print_if_not_silent(f"Fetched at: {date.strftime('%Y-%m-%d %H:%M:%S')} (UTC {uf.get_utc_offset(date):+})")
+
+    if match_logger:
+        match_logger.log_match(date, session_id, match_count, player_info_list, adrs)
+
+
+def collect_player_info(player_count: int, player_info_ary_adr: int) -> tuple[list[PlayerInfo], list[str]]:
+    request_errors: list[str] = []
+    player_info_list: list[PlayerInfo] = []
+
+    for player_idx in range(player_count):
+        if player_info_tuple := get_player_info(player_idx, player_info_ary_adr):
+            player_info, act_info = player_info_tuple
+        else:
+            continue
+
+        if act_info.request_error:
+            request_errors.append(act_info.request_error)
+
+        player_info_list.append(player_info)
+        print(uf.player_table_entry(player_info, act_info))
+
+    return player_info_list, request_errors
+
+
+def get_player_info(player_idx: int, player_info_ary_adr: int) -> tuple[PlayerInfo, AccountInfo] | None:
+    player_info_adr = GECKO.peek32(player_info_ary_adr + player_idx * 0x4)
+    if player_info_adr == 0:
+        return None
+
+    player_info_raw = GECKO.peek_raw(player_info_adr, length=0xD4)
+    player_pid = uf.read_int(player_info_raw, 0xD0, 0xD4)
+
+    if player_pid == 0:
+        return None
+
+    player_name = decode_player_name(player_info_raw)
+    act_info = get_player_account_info(player_pid, player_name)
+    player_info = build_player_info(player_idx, player_pid, player_name, act_info, player_info_raw)
+
+    return player_info, act_info
+
+
+def decode_player_name(player_info_raw: bytes) -> str:
+    return (player_info_raw[0x6:0x26]
+            .decode("utf-16-be", errors="replace")
+            .split("\u0000")[0]
+            .replace("\n", "")
+            .replace("\r", ""))
+
+
+def get_player_account_info(player_pid: int, player_name: str) -> AccountInfo:
+    if OPTIONS.no_pnid:
+        return AccountInfo("", player_name, "")
+
+    act_info = get_spfn_account_info(player_pid) if OPTIONS.spfn else get_pn_account_info(player_pid)
+    if act_info.request_error:
+        return AccountInfo("", player_name, act_info.request_error)
+
+    return act_info
+
+
+def build_player_info(player_idx: int, player_pid: int, player_name: str, act_info: AccountInfo,
+                      player_info_raw: bytes) -> PlayerInfo:
+    return PlayerInfo(
+        idx=player_idx,
+        pid=player_pid,
+        network_id=act_info.network_id,
+        name=player_name,
+        mii_name=act_info.mii_name,
+        team=uf.read_int(player_info_raw, 0x33, 0x34),
+        gender=uf.read_int(player_info_raw, 0x37, 0x38),
+        skin_tone=uf.read_int(player_info_raw, 0x3B, 0x3C),
+        eye_color=uf.read_int(player_info_raw, 0x3F, 0x40),
+        weapon=uf.read_int(player_info_raw, 0x46, 0x48),
+        sub_weapon=uf.read_int(player_info_raw, 0x4A, 0x4C),
+        special_weapon=uf.read_int(player_info_raw, 0x4D, 0x50),
+        shoes=uf.read_int(player_info_raw, 0x54, 0x58),
+        clothes=uf.read_int(player_info_raw, 0x70, 0x74),
+        headgear=uf.read_int(player_info_raw, 0x8C, 0x90),
+        level=uf.read_int(player_info_raw, 0xAF, 0xB0, signed=True) + 1,
+        rank=uf.read_int(player_info_raw, 0xB3, 0xB4, signed=True)
+    )
+
+
+def get_pn_account_info(player_pid: int) -> AccountInfo:
+    user_id = ""
+    mii_name = ""
+    request_error = ""
+
+    for _ in range(3):
+        try:
+            response = uf.process_response(requests.get(
+                f"https://account.pretendo.cc/v1/api/miis?pids={player_pid}",
+                headers={"X-Nintendo-Client-ID": API["client_id"],
+                         "X-Nintendo-Client-Secret": API["client_secret"]},
+                timeout=5
+            ), spfn=False)
+        except requests.RequestException as ex:
+            request_error = str(ex)
+            time.sleep(1)
+            continue
+
+        if response is None:
+            request_error = "Got empty or invalid response."
+            time.sleep(1)
+            continue
+
+        user_id = response[0]
+        mii_name = response[1].replace("\n", "").replace("\r", "")
+
+        request_error = ""
+        break
+
+    return AccountInfo(user_id, mii_name, request_error)
+
+
+def get_spfn_account_info(player_pid: int) -> AccountInfo:
+    user_id = ""
+    mii_name = ""
+    request_error = ""
+
+    for _ in range(3):
+        try:
+            response = uf.process_response(requests.get(
+                f"https://account.spfn.net/v1/api/miis?pids={player_pid}",
+                timeout=5
+            ), spfn=True)
+            mii_data_response = requests.get(
+                f"https://account.spfn.net/api/v2/users/{player_pid}/mii",
+                timeout=5
+            )
+        except requests.RequestException as ex:
+            request_error = str(ex)
+            time.sleep(1)
+            continue
+
+        if None in (response, mii_data_response):
+            request_error = "Got empty or invalid response."
+            time.sleep(1)
+            continue
+
+        user_id = response[0]  # type: ignore[index]
+
+        try:
+            mii_data = b64decode(
+                mii_data_response.text.replace("\\n", "").replace("\\r", ""))
+            mii_name = mii_data.decode("utf-16")[13:23]
+        except (binascii.Error, UnicodeDecodeError):
+            request_error = "Got empty or invalid response."
+            time.sleep(1)
+            continue
+
+        request_error = ""
+        break
+
+    return AccountInfo(user_id, mii_name, request_error)
+
+
+if __name__ == "__main__":
+    main()

{splatlogger-1.6.3 → splatlogger-1.6.4}/src/splatlogger/cemu_gecko.py

@@ -5,13 +5,15 @@ import struct
 import psutil
 from PyMemoryEditor import OpenProcess, ProcessIDNotExistsError  # type: ignore[import-untyped]
 
+from .tcpgecko import TCPGeckoError
+
 
 class CemuGecko:
     """Wrapper around PyMemoryEditor to provide Cemu memory access.
     Compatible with existing code written for TCPGecko.
     """
 
-    def __init__(self, pid: int = -1):
+    def __init__(self, pid: int):
         cemu_pid = self._find_cemu_process() if pid == -1 else pid
         if cemu_pid is None:
             raise CemuGeckoError("Cemu process not found.")
@@ -83,4 +85,4 @@ class CemuGecko:
         return None
 
 
-class CemuGeckoError(Exception): pass
+class CemuGeckoError(TCPGeckoError): pass