From 95e4057a4953f9c6eba36ebf7b63374079885a75 Mon Sep 17 00:00:00 2001
From: katboi01 <katboiofficial@gmail.com>
Date: Sat, 25 Jan 2025 04:28:38 +0100
Subject: [PATCH] updated file downloading code, error handling

---
 README.md     | 20 ++++++++++++++++++++
 dmmBypass.py  | 14 ++++++++++++--
 dmmUpdater.py | 18 +++++++++++++-----
 3 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..8a8c6c2
--- /dev/null
+++ b/README.md
@@ -0,0 +1,20 @@
+# Japari Bypass
+Efficient KF3/DMM game launcher.
+
+## Requirements
+Python 3
+KF3 installed from DMM. DMM itself does not need to be running.
+
+## Instructions
+Download the files from this repo. Unzip them to a safe place.
+
+Run `run_KF3.bat`, it will ask you for some information.
+
+It will ask for the location of the KF3 executable. Generally this will be `C:\users\[your name]\KFP2G\けもフレ３.exe`.
+
+Input your DMM email and then password when prompted, and `yes` if you want to use the public VPN to connect to DMM's server. If you choose not to use the public VPN, then you will need to enable your own Japanese VPN while logging in to the game.
+
+If you make a mistake or you want to change login details, edit the `kfp2g.cfg` config file, or delete it to run the configuration again.
+
+## Known issues
+Retrieving launch arguments - error 308: Every once in a while, DMM games may have updated terms of service that need to be accepted. This can only be done via the official DMM app.
\ No newline at end of file
diff --git a/dmmBypass.py b/dmmBypass.py
index 8f2e899..328577d 100644
--- a/dmmBypass.py
+++ b/dmmBypass.py
@@ -78,6 +78,7 @@ def retrieve_auth_keys(login, password, token, captcha, session : requests.Sessi
         return cookies["login_secure_id"], cookies["login_session_id"]
     except Exception as e:
         print("Failed to log in:", e)
+        return None, None
     
 def retrieve_update_params(game_id, login_secure, login_session, use_proxy):
     try:
@@ -88,7 +89,10 @@ def retrieve_update_params(game_id, login_secure, login_session, use_proxy):
         url = "https://katworks.sytes.net/KF/Api/DMM/filelist" if use_proxy else "https://apidgp-gameplayer.games.dmm.com/v5/r2/filelist/cl"
         result = requests.post(url, cookies=cookies, headers=headers, json=data)
         result.raise_for_status()
-        data = result.json()["data"]
+        result_json = result.json()
+        if result_json["result_code"] != 100:
+            raise Exception(f'{result_json["result_code"]}: {result_json["error"]}')
+        data = result_json["data"]
         game_version = data["latest_version"]
         print("Latest version:", game_version)
         file_list_url = data["file_list_url"]
@@ -97,6 +101,7 @@ def retrieve_update_params(game_id, login_secure, login_session, use_proxy):
         return file_list_url, file_list_params
     except Exception as e:
         print("Failed to retrieve update file list:", e)
+        return None, None
     
 def retrieve_launch_params(game_id, mac_addr, hdd_serial, motherboard, login_secure, login_session, use_proxy):
     try:
@@ -107,7 +112,10 @@ def retrieve_launch_params(game_id, mac_addr, hdd_serial, motherboard, login_sec
         url = "https://katworks.sytes.net/KF/Api/DMM/launch" if use_proxy else "https://apidgp-gameplayer.games.dmm.com/v5/r2/launch/cl"
         result = requests.post(url, cookies=cookies, headers=headers, json=data)
         result.raise_for_status()
-        data = result.json()["data"]
+        result_json = result.json()
+        if result_json["result_code"] != 100:
+            raise Exception(f'{result_json["result_code"]}: {result_json["error"]}')
+        data = result_json["data"]
         return data["execute_args"]
     except Exception as e:
         print("Failed to retrieve launch arguments:", e)
@@ -132,6 +140,8 @@ def main(config):
             return
 
         login_secure, login_session = retrieve_auth_keys(login, password, token, captcha, session)
+        if login_secure == None or login_session == None:
+            return
         
         if not use_proxy: input("Enable VPN now and press Enter")
 
diff --git a/dmmUpdater.py b/dmmUpdater.py
index f339c12..eb33f46 100644
--- a/dmmUpdater.py
+++ b/dmmUpdater.py
@@ -67,9 +67,6 @@ def update_game(game_path, files_url, files_param):
             string = "Downloading: [{}{}] {}/{} ({}/{})".format("#"*x, "."*(40-x), j, count, min(downloaded,total_size), total_size)
             max_len = max(len(string), max_len)
             print(string.ljust(max_len, ' '), end='\r', file=sys.stdout, flush=True)
-        def show_progress(block_num, block_size, total_size):
-            downloaded = block_num * block_size
-            show(index + 1, downloaded, total_size)
 
         retries = 3
         show(0, 0, 0)
@@ -77,11 +74,22 @@ def update_game(game_path, files_url, files_param):
             try:
                 file = files_to_download[index]
                 url, path = file["url"], file["path"]
+                
+                response = requests.get(url, timeout=10, stream=True)
+                total_size = int(response.headers.get("content-length", 0))
+                block_size = 1024 * 1024
+                downloaded = 0
+
                 os.makedirs(os.path.dirname(path), exist_ok=True)
-                urlretrieve(url, path, reporthook=show_progress)
+                with open(path, 'wb') as out_file:
+                    for data in response.iter_content(block_size):
+                        out_file.write(data)
+                        downloaded += len(data)
+                        show(index + 1, downloaded, total_size)
                 index += 1
                 retries = 3
-            except:
+            except Exception as e:
+                print(e, "retrying")
                 retries -= 1
                 if retries == 0:
                     print(f'Retry for file {file["url"]} failed 3 times')