From 3bd702c977946ebd1e28520ff7c84306a50aaf93 Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sat, 5 Oct 2024 02:18:02 +0800
Subject: [PATCH 01/50] Update requirements.txt

---
 zodgame/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zodgame/requirements.txt b/zodgame/requirements.txt
index c12d709..819d361 100644
--- a/zodgame/requirements.txt
+++ b/zodgame/requirements.txt
@@ -1 +1 @@
-undetected-chromedriver
+nodriver

From 4a73ea8e5f81b403dc57590b6499b070b514a1ad Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sat, 5 Oct 2024 02:19:25 +0800
Subject: [PATCH 02/50] Update zodgame.py

---
 zodgame/zodgame.py | 192 +++++++++++++++++----------------------------
 1 file changed, 74 insertions(+), 118 deletions(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index c9c31ec..bcc14b8 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -1,105 +1,75 @@
-# encoding=utf8
-import io
 import re
-import sys
-import platform
-import subprocess
-sys.stdout = io.TextIOWrapper(sys.stdout.buffer,encoding='utf-8')
+import nodriver
+from nodriver import cdp
 
-import undetected_chromedriver as uc
-from selenium.webdriver.support.ui import WebDriverWait
-from selenium.webdriver.common.by import By
-import requests
+async def zodgame_checkin(tab, formhash):
 
-def zodgame_checkin(driver, formhash):
     checkin_url = "https://zodgame.xyz/plugin.php?id=dsu_paulsign:sign&operation=qiandao&infloat=1&inajax=0"    
+
     checkin_query = """
-        (function (){
-        var request = new XMLHttpRequest();
-        var fd = new FormData();
-        fd.append("formhash","%s");
-        fd.append("qdxq","kx");
-        request.open("POST","%s",false);
-        request.withCredentials=true;
-        request.send(fd);
-        return request;
+        (async function() {
+            const formdata = new FormData();
+            formdata.append("formhash","%s");
+            formdata.append("qdxq","kx");
+
+            const result = await fetch('%s', {
+                method: 'POST',
+                body: formdata
+            })
+            .then(response => {
+                return response.text();
+            })
+
+            return result;
         })();
         """ % (formhash, checkin_url)
-    checkin_query = checkin_query.replace("\n", "")
-    driver.set_script_timeout(240)
-    resp = driver.execute_script("return " + checkin_query)
-    match = re.search('<div class="c">\n(.*?)</div>\n', resp["response"], re.S)
+
+    resp = await tab.evaluate(checkin_query, await_promise=True, return_by_value=True)
+    match = re.search('<div class="c">\n(.*?)</div>\n', resp, re.S)
     message = match[1] if match is not None else "签到失败"
     print(f"【签到】{message}")
+
     return "恭喜你签到成功!" in message or "您今日已经签到，请明天再来" in message
 
-def zodgame_task(driver, formhash):
-
-    def clear_handles(driver, main_handle):
-        handles = driver.window_handles[:]
-        for handle in handles:
-            if handle != main_handle:
-                driver.switch_to.window(handle)
-                driver.close()
-        driver.switch_to.window(main_handle)
-      
-    def show_task_reward(driver):
-        driver.get("https://zodgame.xyz/plugin.php?id=jnbux")
+async def zodgame_task(broswer):
+
+    async def show_task_reward(broswer):
+        tab = await broswer.get("https://zodgame.xyz/plugin.php?id=jnbux", new_tab=True)
         try:
-            WebDriverWait(driver, 240).until(
-                lambda x: x.title != "Just a moment..."
-            )
-            reward = driver.find_element(By.XPATH, '//li[contains(text(), "点币: ")]').get_attribute("textContent")[:-2]
-            print(f"【Log】{reward}")
+            reward_li = (await tab.find('//li[contains(text(), "点币: ")]', timeout=60))
+            print(f"【Log】{reward_li.text}")
         except:
-            pass
+           pass
 
-    driver.get("https://zodgame.xyz/plugin.php?id=jnbux")
-    WebDriverWait(driver, 240).until(
-        lambda x: x.title != "Just a moment..."
-    )
+    jnbux_tab = await broswer.get("https://zodgame.xyz/plugin.php?id=jnbux")
+    
+    try:
+        join_task = await jnbux_tab.find_all('//a[text()="参与任务"]')
+    except:
+        join_task = []
+        success = True
 
-    join_bux = driver.find_elements(By.XPATH, '//font[text()="开始参与任务"]')
-    if len(join_bux) != 0 :    
-        driver.get(f"https://zodgame.xyz/plugin.php?id=jnbux:jnbux&do=join&formhash={formhash}")
-        WebDriverWait(driver, 240).until(
-            lambda x: x.title != "Just a moment..."
-        )
-        driver.get("https://zodgame.xyz/plugin.php?id=jnbux")
-        WebDriverWait(driver, 240).until(
-            lambda x: x.title != "Just a moment..."
-        )
-
-    join_task_a = driver.find_elements(By.XPATH, '//a[text()="参与任务"]')
-    success = True
-
-    if len(join_task_a) == 0:
+    if len(join_task) == 0:
         print("【任务】所有任务均已完成。")
-        return success
-    handle = driver.current_window_handle
-    for idx, a in enumerate(join_task_a):
-        on_click = a.get_attribute("onclick")
+        #return success
+
+    for idx, a in enumerate(join_task):
+        print(a.attrs)
+        on_click = a.attrs["onclick"]
+        print(on_click)
+        #await a.click()
         try:
-            function = re.search("""openNewWindow(.*?)\(\)""", on_click, re.S)[0]
-            script = driver.find_element(By.XPATH, f'//script[contains(text(), "{function}")]').get_attribute("text")
-            task_url = re.search("""window.open\("(.*)", "newwindow"\)""", script, re.S)[1]
-            driver.execute_script(f"""window.open("https://zodgame.xyz/{task_url}")""")
-            driver.switch_to.window(driver.window_handles[-1])
+            tab = broswer.tabs[-1]
             try:
-                WebDriverWait(driver, 240).until(
-                    lambda x: x.find_elements(By.XPATH, '//div[text()="成功！"]')
-                )
+                await tab.find('//div[text()="成功！"', timeout=240)
             except:
                 print(f"【Log】任务 {idx+1} 广告页检查失败。")
                 pass
 
             try:     
-                check_url = re.search("""showWindow\('check', '(.*)'\);""", on_click, re.S)[1]
-                driver.get(f"https://zodgame.xyz/{check_url}")
-                WebDriverWait(driver, 240).until(
-                    lambda x: len(x.find_elements(By.XPATH, '//p[contains(text(), "检查成功, 积分已经加入您的帐户中")]')) != 0 
-                        or x.title == "BUX广告点击赚积分 - ZodGame论坛 - Powered by Discuz!"
-                )
+                check_url = re.search("""showWindow('check', '(.*)');""", on_click, re.S)[1]
+                tab = await tab.get(f"https://zodgame.xyz/{check_url}")
+                await tab.find('//p[contains(text(), "检查成功, 积分已经加入您的帐户中")] | //title[text()="BUX广告点击赚积分 - ZodGame论坛 - Powered by Discuz!"]')
             except:
                 print(f"【Log】任务 {idx+1} 确认页检查失败。")
                 pass
@@ -108,57 +78,43 @@ def show_task_reward(driver):
         except Exception as e:
             success = False
             print(f"【任务】任务 {idx+1} 失败。", type(e))
-        finally:
-            clear_handles(driver, handle)
-    
-    show_task_reward(driver)
+
+    await show_task_reward(broswer)
 
     return success
 
-def zodgame(cookie_string):
-    options = uc.ChromeOptions()
-    options.add_argument("--disable-popup-blocking")
-    options.add_argument("--headless")
-    driver = uc.Chrome(driver_executable_path = """C:\SeleniumWebDrivers\ChromeDriver\chromedriver.exe""",
-                       browser_executable_path = """C:\Program Files\Google\Chrome\Application\chrome.exe""",
-                       options = options)
+async def zodgame(cookie_string):
 
-    # Load cookie
-    driver.get("https://zodgame.xyz/")
+    browser = await nodriver.start(
+        headless=False
+    )
+    tab = await browser.get('https://zodgame.xyz')
 
+    # Log in with cookie string
     if cookie_string.startswith("cookie:"):
         cookie_string = cookie_string[len("cookie:"):]
     cookie_string = cookie_string.replace("/","%2")
-    cookie_dict = [ 
-        {"name" : x.split('=')[0].strip(), "value": x.split('=')[1].strip()} 
+    cookie_dict = [
+        {"name": x.split('=')[0].strip(), "value": x.split('=')[1].strip()} 
         for x in cookie_string.split(';')
     ]
+    cookies = [
+        cdp.network.CookieParam(domain = 'zodgame.xyz', name = cookie["name"], value = cookie["value"], path = '/') 
+        for cookie in cookie_dict if cookie["name"] in ["qhMq_2132_saltkey", "qhMq_2132_auth"]
+    ]
+    #await browser.cookies.set_all(cookies)
+    await tab.send(cdp.storage.set_cookies(cookies))
+    await tab.reload()
 
-    driver.delete_all_cookies()
-    for cookie in cookie_dict:
-        if cookie["name"] in ["qhMq_2132_saltkey", "qhMq_2132_auth"]:
-            driver.add_cookie({
-                "domain": "zodgame.xyz",
-                "name": cookie["name"],
-                "value": cookie["value"],
-                "path": "/",
-            })
-    
-    driver.get("https://zodgame.xyz/")
-    
-    WebDriverWait(driver, 240).until(
-        lambda x: x.title != "Just a moment..."
-    )
-    assert len(driver.find_elements(By.XPATH, '//a[text()="用户名"]')) == 0, "Login fails. Please check your cookie."
-        
-    formhash = driver.find_element(By.XPATH, '//input[@name="formhash"]').get_attribute('value')
-    assert zodgame_checkin(driver, formhash) and zodgame_task(driver, formhash), "Checkin failed or task failed."
+    formhash = (await tab.find('//input[@name="formhash"]', timeout=180)).attrs["value"]
 
-    driver.close()
-    driver.quit()
-    
-if __name__ == "__main__":
+    #await zodgame_checkin(tab, formhash)
+    await zodgame_task(browser)
+
+    await tab.sleep(180)
+
+if __name__ == '__main__':
     cookie_string = sys.argv[1]
     assert cookie_string
     
-    zodgame(cookie_string)
+    nodriver.loop().run_until_complete(zodgame(cookie_string))

From 1686ca8205350703429382096283f1de4619754a Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sat, 5 Oct 2024 02:20:58 +0800
Subject: [PATCH 03/50] Update zodgame.py

---
 zodgame/zodgame.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index bcc14b8..cbbab67 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -1,4 +1,5 @@
 import re
+import sys
 import nodriver
 from nodriver import cdp
 

From 3a38bc3e16690da8dd6208ab57d59aa97d4d452c Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sat, 5 Oct 2024 02:27:53 +0800
Subject: [PATCH 04/50] Update zodgame.py

---
 zodgame/zodgame.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index cbbab67..73b5496 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -87,7 +87,8 @@ async def show_task_reward(broswer):
 async def zodgame(cookie_string):
 
     browser = await nodriver.start(
-        headless=False
+        headless=False,
+        no_sandbox=True
     )
     tab = await browser.get('https://zodgame.xyz')
 

From 43db9c829750d5471166da1a1d2e1680719ed3f8 Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sat, 5 Oct 2024 02:29:48 +0800
Subject: [PATCH 05/50] Update zodgame.py

---
 zodgame/zodgame.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index 73b5496..c1a4488 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -88,7 +88,7 @@ async def zodgame(cookie_string):
 
     browser = await nodriver.start(
         headless=False,
-        no_sandbox=True
+        sandbox=False
     )
     tab = await browser.get('https://zodgame.xyz')
 

From 492737afa9c84d936fac1f15ed4fcfae9c69726b Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sat, 5 Oct 2024 02:31:19 +0800
Subject: [PATCH 06/50] Update zodgame.py

---
 zodgame/zodgame.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index c1a4488..20233fb 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -88,7 +88,7 @@ async def zodgame(cookie_string):
 
     browser = await nodriver.start(
         headless=False,
-        sandbox=False
+        browser_executable_path = """C:\Program Files\Google\Chrome\Application\chrome.exe"""
     )
     tab = await browser.get('https://zodgame.xyz')
 

From 2be5688853a8bdc626c4b967c3d175f26b8a5e76 Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 13 Oct 2024 17:45:14 +0800
Subject: [PATCH 07/50] Update zodgame.py

---
 zodgame/zodgame.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index 20233fb..70d19ba 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -88,6 +88,7 @@ async def zodgame(cookie_string):
 
     browser = await nodriver.start(
         headless=False,
+        sandbox=True,
         browser_executable_path = """C:\Program Files\Google\Chrome\Application\chrome.exe"""
     )
     tab = await browser.get('https://zodgame.xyz')

From 3278d0525f30376fb6fd31acf0cf4dcdecd5635a Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 13 Oct 2024 17:47:49 +0800
Subject: [PATCH 08/50] Update zodgame.py

---
 zodgame/zodgame.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index 70d19ba..1152ca4 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -88,7 +88,7 @@ async def zodgame(cookie_string):
 
     browser = await nodriver.start(
         headless=False,
-        sandbox=True,
+        sandbox=False,
         browser_executable_path = """C:\Program Files\Google\Chrome\Application\chrome.exe"""
     )
     tab = await browser.get('https://zodgame.xyz')

From 9c75bb9dd729755096f2ecf021e63831c8796e56 Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 13 Oct 2024 17:50:50 +0800
Subject: [PATCH 09/50] Update zodgame.py

---
 zodgame/zodgame.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index 1152ca4..c1a4488 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -88,8 +88,7 @@ async def zodgame(cookie_string):
 
     browser = await nodriver.start(
         headless=False,
-        sandbox=False,
-        browser_executable_path = """C:\Program Files\Google\Chrome\Application\chrome.exe"""
+        sandbox=False
     )
     tab = await browser.get('https://zodgame.xyz')
 

From 0c74028ba0c353de256b7790de2bd9bc6955a070 Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 13 Oct 2024 17:53:02 +0800
Subject: [PATCH 10/50] Update zodgame.py

---
 zodgame/zodgame.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index c1a4488..addee58 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -2,6 +2,7 @@
 import sys
 import nodriver
 from nodriver import cdp
+sys.stdout = io.TextIOWrapper(sys.stdout.buffer,encoding='utf-8')
 
 async def zodgame_checkin(tab, formhash):
 
@@ -116,7 +117,7 @@ async def zodgame(cookie_string):
     await tab.sleep(180)
 
 if __name__ == '__main__':
-    cookie_string = sys.argv[1]
+    cookie_string = .argv[1]
     assert cookie_string
     
     nodriver.loop().run_until_complete(zodgame(cookie_string))

From f768f2cc6f97598c7773c219f854a9591f9c0c37 Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 13 Oct 2024 17:54:35 +0800
Subject: [PATCH 11/50] Update zodgame.py

---
 zodgame/zodgame.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index addee58..ec94666 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -117,7 +117,7 @@ async def zodgame(cookie_string):
     await tab.sleep(180)
 
 if __name__ == '__main__':
-    cookie_string = .argv[1]
+    cookie_string = sys.argv[1]
     assert cookie_string
     
     nodriver.loop().run_until_complete(zodgame(cookie_string))

From f3a0a058cc3a58d4022996a07b7f7781ce7e147a Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 13 Oct 2024 17:56:26 +0800
Subject: [PATCH 12/50] Update zodgame.py

---
 zodgame/zodgame.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index ec94666..c7e3362 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -1,3 +1,4 @@
+import io
 import re
 import sys
 import nodriver

From f5b6ea26fd6d5eed8347c3693753b5b261826c20 Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 13 Oct 2024 18:01:36 +0800
Subject: [PATCH 13/50] Update zodgame.py

---
 zodgame/zodgame.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index c7e3362..16ca797 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -3,7 +3,7 @@
 import sys
 import nodriver
 from nodriver import cdp
-sys.stdout = io.TextIOWrapper(sys.stdout.buffer,encoding='utf-8')
+#sys.stdout = io.TextIOWrapper(sys.stdout.buffer,encoding='utf-8')
 
 async def zodgame_checkin(tab, formhash):
 

From 9761d4cbff3f9eeed53edf46f3c7de38c912462c Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 13 Oct 2024 18:07:54 +0800
Subject: [PATCH 14/50] Update zodgame.py

---
 zodgame/zodgame.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index 16ca797..c7e3362 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -3,7 +3,7 @@
 import sys
 import nodriver
 from nodriver import cdp
-#sys.stdout = io.TextIOWrapper(sys.stdout.buffer,encoding='utf-8')
+sys.stdout = io.TextIOWrapper(sys.stdout.buffer,encoding='utf-8')
 
 async def zodgame_checkin(tab, formhash):
 

From 29e1c5230b2fb688bee6ac327e710ad389799e9f Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 13 Oct 2024 18:11:53 +0800
Subject: [PATCH 15/50] Update zodgame.py

---
 zodgame/zodgame.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index c7e3362..3cee94a 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -1,9 +1,8 @@
-import io
 import re
 import sys
 import nodriver
 from nodriver import cdp
-sys.stdout = io.TextIOWrapper(sys.stdout.buffer,encoding='utf-8')
+sys.stdout.reconfigure(encoding='utf-8')
 
 async def zodgame_checkin(tab, formhash):
 

From 347a0157862e2d7352df8f2592ed93191f447704 Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 13 Oct 2024 18:15:00 +0800
Subject: [PATCH 16/50] Update zodgame.py

---
 zodgame/zodgame.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index 3cee94a..e5bdace 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -2,7 +2,7 @@
 import sys
 import nodriver
 from nodriver import cdp
-sys.stdout.reconfigure(encoding='utf-8')
+#sys.stdout.reconfigure(encoding='utf-8')
 
 async def zodgame_checkin(tab, formhash):
 
@@ -29,7 +29,7 @@ async def zodgame_checkin(tab, formhash):
     resp = await tab.evaluate(checkin_query, await_promise=True, return_by_value=True)
     match = re.search('<div class="c">\n(.*?)</div>\n', resp, re.S)
     message = match[1] if match is not None else "签到失败"
-    print(f"【签到】{message}")
+    #print(f"【签到】{message}")
 
     return "恭喜你签到成功!" in message or "您今日已经签到，请明天再来" in message
 
@@ -52,7 +52,7 @@ async def show_task_reward(broswer):
         success = True
 
     if len(join_task) == 0:
-        print("【任务】所有任务均已完成。")
+        #print("【任务】所有任务均已完成。")
         #return success
 
     for idx, a in enumerate(join_task):
@@ -65,7 +65,7 @@ async def show_task_reward(broswer):
             try:
                 await tab.find('//div[text()="成功！"', timeout=240)
             except:
-                print(f"【Log】任务 {idx+1} 广告页检查失败。")
+                #print(f"【Log】任务 {idx+1} 广告页检查失败。")
                 pass
 
             try:     
@@ -73,13 +73,13 @@ async def show_task_reward(broswer):
                 tab = await tab.get(f"https://zodgame.xyz/{check_url}")
                 await tab.find('//p[contains(text(), "检查成功, 积分已经加入您的帐户中")] | //title[text()="BUX广告点击赚积分 - ZodGame论坛 - Powered by Discuz!"]')
             except:
-                print(f"【Log】任务 {idx+1} 确认页检查失败。")
+                #print(f"【Log】任务 {idx+1} 确认页检查失败。")
                 pass
 
-            print(f"【任务】任务 {idx+1} 成功。")
+            #print(f"【任务】任务 {idx+1} 成功。")
         except Exception as e:
             success = False
-            print(f"【任务】任务 {idx+1} 失败。", type(e))
+            #print(f"【任务】任务 {idx+1} 失败。", type(e))
 
     await show_task_reward(broswer)
 

From 16cc263e2710bdceee794da86ac073845841fec0 Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 13 Oct 2024 18:16:29 +0800
Subject: [PATCH 17/50] Update zodgame.py

---
 zodgame/zodgame.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index e5bdace..4e99e4b 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -53,6 +53,7 @@ async def show_task_reward(broswer):
 
     if len(join_task) == 0:
         #print("【任务】所有任务均已完成。")
+        pass
         #return success
 
     for idx, a in enumerate(join_task):

From 04f62233beb1a0d6c9bbca46b1367496977051f6 Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 13 Oct 2024 18:26:42 +0800
Subject: [PATCH 18/50] Update zodgame.py

---
 zodgame/zodgame.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index 4e99e4b..16ca797 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -1,8 +1,9 @@
+import io
 import re
 import sys
 import nodriver
 from nodriver import cdp
-#sys.stdout.reconfigure(encoding='utf-8')
+#sys.stdout = io.TextIOWrapper(sys.stdout.buffer,encoding='utf-8')
 
 async def zodgame_checkin(tab, formhash):
 
@@ -29,7 +30,7 @@ async def zodgame_checkin(tab, formhash):
     resp = await tab.evaluate(checkin_query, await_promise=True, return_by_value=True)
     match = re.search('<div class="c">\n(.*?)</div>\n', resp, re.S)
     message = match[1] if match is not None else "签到失败"
-    #print(f"【签到】{message}")
+    print(f"【签到】{message}")
 
     return "恭喜你签到成功!" in message or "您今日已经签到，请明天再来" in message
 
@@ -52,8 +53,7 @@ async def show_task_reward(broswer):
         success = True
 
     if len(join_task) == 0:
-        #print("【任务】所有任务均已完成。")
-        pass
+        print("【任务】所有任务均已完成。")
         #return success
 
     for idx, a in enumerate(join_task):
@@ -66,7 +66,7 @@ async def show_task_reward(broswer):
             try:
                 await tab.find('//div[text()="成功！"', timeout=240)
             except:
-                #print(f"【Log】任务 {idx+1} 广告页检查失败。")
+                print(f"【Log】任务 {idx+1} 广告页检查失败。")
                 pass
 
             try:     
@@ -74,13 +74,13 @@ async def show_task_reward(broswer):
                 tab = await tab.get(f"https://zodgame.xyz/{check_url}")
                 await tab.find('//p[contains(text(), "检查成功, 积分已经加入您的帐户中")] | //title[text()="BUX广告点击赚积分 - ZodGame论坛 - Powered by Discuz!"]')
             except:
-                #print(f"【Log】任务 {idx+1} 确认页检查失败。")
+                print(f"【Log】任务 {idx+1} 确认页检查失败。")
                 pass
 
-            #print(f"【任务】任务 {idx+1} 成功。")
+            print(f"【任务】任务 {idx+1} 成功。")
         except Exception as e:
             success = False
-            #print(f"【任务】任务 {idx+1} 失败。", type(e))
+            print(f"【任务】任务 {idx+1} 失败。", type(e))
 
     await show_task_reward(broswer)
 

From 02cd982762364e7d270a12d54e18ac2043dfff53 Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 13 Oct 2024 18:29:11 +0800
Subject: [PATCH 19/50] Update zodgame.py

---
 zodgame/zodgame.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index 16ca797..c1a4488 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -1,9 +1,7 @@
-import io
 import re
 import sys
 import nodriver
 from nodriver import cdp
-#sys.stdout = io.TextIOWrapper(sys.stdout.buffer,encoding='utf-8')
 
 async def zodgame_checkin(tab, formhash):
 

From f05ea76cd1ee437d7e4b1f41834e956a2f756aa9 Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 13 Oct 2024 18:32:43 +0800
Subject: [PATCH 20/50] Update zodgame.py

---
 zodgame/zodgame.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index c1a4488..f4bf67b 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -28,7 +28,7 @@ async def zodgame_checkin(tab, formhash):
     resp = await tab.evaluate(checkin_query, await_promise=True, return_by_value=True)
     match = re.search('<div class="c">\n(.*?)</div>\n', resp, re.S)
     message = match[1] if match is not None else "签到失败"
-    print(f"【签到】{message}")
+    #print(f"【签到】{message}")
 
     return "恭喜你签到成功!" in message or "您今日已经签到，请明天再来" in message
 
@@ -51,8 +51,9 @@ async def show_task_reward(broswer):
         success = True
 
     if len(join_task) == 0:
-        print("【任务】所有任务均已完成。")
+        #print("【任务】所有任务均已完成。")
         #return success
+        pass
 
     for idx, a in enumerate(join_task):
         print(a.attrs)
@@ -64,7 +65,7 @@ async def show_task_reward(broswer):
             try:
                 await tab.find('//div[text()="成功！"', timeout=240)
             except:
-                print(f"【Log】任务 {idx+1} 广告页检查失败。")
+                #print(f"【Log】任务 {idx+1} 广告页检查失败。")
                 pass
 
             try:     
@@ -72,13 +73,13 @@ async def show_task_reward(broswer):
                 tab = await tab.get(f"https://zodgame.xyz/{check_url}")
                 await tab.find('//p[contains(text(), "检查成功, 积分已经加入您的帐户中")] | //title[text()="BUX广告点击赚积分 - ZodGame论坛 - Powered by Discuz!"]')
             except:
-                print(f"【Log】任务 {idx+1} 确认页检查失败。")
+                #print(f"【Log】任务 {idx+1} 确认页检查失败。")
                 pass
 
             print(f"【任务】任务 {idx+1} 成功。")
         except Exception as e:
             success = False
-            print(f"【任务】任务 {idx+1} 失败。", type(e))
+            #print(f"【任务】任务 {idx+1} 失败。", type(e))
 
     await show_task_reward(broswer)
 

From fd7544dd759f9fea167d0ea7e19be861bf9f315a Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 13 Oct 2024 18:47:49 +0800
Subject: [PATCH 21/50] Update zodgame.py

---
 zodgame/zodgame.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index f4bf67b..ee9d8f6 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -89,7 +89,8 @@ async def zodgame(cookie_string):
 
     browser = await nodriver.start(
         headless=False,
-        sandbox=False
+        sandbox=False,
+        browser_executable_path = """C:\Program Files\Google\Chrome\Application\chrome.exe"""
     )
     tab = await browser.get('https://zodgame.xyz')
 

From 53f78167f147746efc8485dcd8e7fd4520cc90b1 Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 13 Oct 2024 18:54:59 +0800
Subject: [PATCH 22/50] Update zodgame.py

---
 zodgame/zodgame.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index ee9d8f6..557998f 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -2,6 +2,7 @@
 import sys
 import nodriver
 from nodriver import cdp
+sys.stdout.reconfigure(encoding='utf-8')
 
 async def zodgame_checkin(tab, formhash):
 
@@ -28,7 +29,7 @@ async def zodgame_checkin(tab, formhash):
     resp = await tab.evaluate(checkin_query, await_promise=True, return_by_value=True)
     match = re.search('<div class="c">\n(.*?)</div>\n', resp, re.S)
     message = match[1] if match is not None else "签到失败"
-    #print(f"【签到】{message}")
+    print(f"【签到】{message}")
 
     return "恭喜你签到成功!" in message or "您今日已经签到，请明天再来" in message
 
@@ -112,7 +113,7 @@ async def zodgame(cookie_string):
 
     formhash = (await tab.find('//input[@name="formhash"]', timeout=180)).attrs["value"]
 
-    #await zodgame_checkin(tab, formhash)
+    await zodgame_checkin(tab, formhash)
     await zodgame_task(browser)
 
     await tab.sleep(180)

From fc1f62302bd133a8e4c7c86002da64103ef0edc1 Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 13 Oct 2024 18:55:09 +0800
Subject: [PATCH 23/50] Update zodgame.py

---
 zodgame/zodgame.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index 557998f..61153f8 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -116,8 +116,6 @@ async def zodgame(cookie_string):
     await zodgame_checkin(tab, formhash)
     await zodgame_task(browser)
 
-    await tab.sleep(180)
-
 if __name__ == '__main__':
     cookie_string = sys.argv[1]
     assert cookie_string

From 9682b6a7ca1fee2f0b2326dbfd178f2fb7e47075 Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 13 Oct 2024 19:01:44 +0800
Subject: [PATCH 24/50] Update zodgame.py

---
 zodgame/zodgame.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index 61153f8..f8e35c0 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -4,9 +4,10 @@
 from nodriver import cdp
 sys.stdout.reconfigure(encoding='utf-8')
 
-async def zodgame_checkin(tab, formhash):
+async def zodgame_checkin(tab):
 
     checkin_url = "https://zodgame.xyz/plugin.php?id=dsu_paulsign:sign&operation=qiandao&infloat=1&inajax=0"    
+    formhash = (await tab.find('//input[@name="formhash"]', timeout=180)).attrs["value"]
 
     checkin_query = """
         (async function() {
@@ -52,9 +53,8 @@ async def show_task_reward(broswer):
         success = True
 
     if len(join_task) == 0:
-        #print("【任务】所有任务均已完成。")
+        print("【任务】所有任务均已完成。")
         #return success
-        pass
 
     for idx, a in enumerate(join_task):
         print(a.attrs)
@@ -66,7 +66,7 @@ async def show_task_reward(broswer):
             try:
                 await tab.find('//div[text()="成功！"', timeout=240)
             except:
-                #print(f"【Log】任务 {idx+1} 广告页检查失败。")
+                print(f"【Log】任务 {idx+1} 广告页检查失败。")
                 pass
 
             try:     
@@ -74,13 +74,13 @@ async def show_task_reward(broswer):
                 tab = await tab.get(f"https://zodgame.xyz/{check_url}")
                 await tab.find('//p[contains(text(), "检查成功, 积分已经加入您的帐户中")] | //title[text()="BUX广告点击赚积分 - ZodGame论坛 - Powered by Discuz!"]')
             except:
-                #print(f"【Log】任务 {idx+1} 确认页检查失败。")
+                print(f"【Log】任务 {idx+1} 确认页检查失败。")
                 pass
 
             print(f"【任务】任务 {idx+1} 成功。")
         except Exception as e:
             success = False
-            #print(f"【任务】任务 {idx+1} 失败。", type(e))
+            print(f"【任务】任务 {idx+1} 失败。", type(e))
 
     await show_task_reward(broswer)
 
@@ -111,11 +111,11 @@ async def zodgame(cookie_string):
     await tab.send(cdp.storage.set_cookies(cookies))
     await tab.reload()
 
-    formhash = (await tab.find('//input[@name="formhash"]', timeout=180)).attrs["value"]
-
-    await zodgame_checkin(tab, formhash)
-    await zodgame_task(browser)
-
+    task_manager = []
+    task_manager.append(await zodgame_checkin(tab))
+    task_manager.append(await zodgame_task(browser))
+    assert False in task_manager, "部分任务失败，请检查相关Log。"
+    
 if __name__ == '__main__':
     cookie_string = sys.argv[1]
     assert cookie_string

From f8f4ad72fc5c4e95766a3426a6bbc223c1c3378f Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 13 Oct 2024 19:22:41 +0800
Subject: [PATCH 25/50] Update zodgame.yml

---
 .github/workflows/zodgame.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/zodgame.yml b/.github/workflows/zodgame.yml
index c45236b..c9466aa 100644
--- a/.github/workflows/zodgame.yml
+++ b/.github/workflows/zodgame.yml
@@ -15,10 +15,17 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v3
+    - name: Create a new user
+      run: |
+          net user nonAdminUser password /add
+          net localgroup "Users" nonAdminUser /add
+      shell: cmd
     - name: Install requirements
       run: |
-        pip3 install -r ./zodgame/requirements.txt
-    - name: Run 
+        runas /user:nonAdminUser "pip3 install -r ./zodgame/requirements.txt"
+        shell: cmd
+    - name: Run
       run: |
-        python3 ./zodgame/zodgame.py "${{secrets.ZODGAME_COOKIE}}"
+        runas /user:nonAdminUser "python3 ./zodgame/zodgame.py ${{secrets.ZODGAME_COOKIE}}"
+        shell: cmd
     - uses: gautamkrishnar/keepalive-workflow@master

From cba505c6cdbb8ede364fd4b99dde6bd1d12cf68d Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 13 Oct 2024 19:25:05 +0800
Subject: [PATCH 26/50] Update zodgame.yml

---
 .github/workflows/zodgame.yml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/zodgame.yml b/.github/workflows/zodgame.yml
index c9466aa..c45236b 100644
--- a/.github/workflows/zodgame.yml
+++ b/.github/workflows/zodgame.yml
@@ -15,17 +15,10 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Create a new user
-      run: |
-          net user nonAdminUser password /add
-          net localgroup "Users" nonAdminUser /add
-      shell: cmd
     - name: Install requirements
       run: |
-        runas /user:nonAdminUser "pip3 install -r ./zodgame/requirements.txt"
-        shell: cmd
-    - name: Run
+        pip3 install -r ./zodgame/requirements.txt
+    - name: Run 
       run: |
-        runas /user:nonAdminUser "python3 ./zodgame/zodgame.py ${{secrets.ZODGAME_COOKIE}}"
-        shell: cmd
+        python3 ./zodgame/zodgame.py "${{secrets.ZODGAME_COOKIE}}"
     - uses: gautamkrishnar/keepalive-workflow@master

From 1ec07571deababe2bd78956c8475a527b70baa78 Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 13 Oct 2024 21:40:48 +0800
Subject: [PATCH 27/50] Update zodgame.py

---
 zodgame/zodgame.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index f8e35c0..516b5e6 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -89,9 +89,10 @@ async def show_task_reward(broswer):
 async def zodgame(cookie_string):
 
     browser = await nodriver.start(
-        headless=False,
-        sandbox=False,
-        browser_executable_path = """C:\Program Files\Google\Chrome\Application\chrome.exe"""
+        headless = False,
+        sandbox = False,
+        browser_executable_path = """C:\Program Files\Google\Chrome\Application\chrome.exe""",
+        browser_args = ["--no-sandbox"]
     )
     tab = await browser.get('https://zodgame.xyz')
 

From a20d162fb8c64057a394e1d9ae88a0c5fc8e5485 Mon Sep 17 00:00:00 2001
From: ytai <653297351@qq.com>
Date: Sun, 8 Dec 2024 16:22:41 +0800
Subject: [PATCH 28/50] Update zodgame.yml

---
 .github/workflows/zodgame.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/zodgame.yml b/.github/workflows/zodgame.yml
index c45236b..7d55675 100644
--- a/.github/workflows/zodgame.yml
+++ b/.github/workflows/zodgame.yml
@@ -20,5 +20,6 @@ jobs:
         pip3 install -r ./zodgame/requirements.txt
     - name: Run 
       run: |
+        Get-Process chrome | ForEach-Object { $_.Kill() }
         python3 ./zodgame/zodgame.py "${{secrets.ZODGAME_COOKIE}}"
     - uses: gautamkrishnar/keepalive-workflow@master

From 2716298f4cf4302957a3e209dc3db70a2d624fdf Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Sun, 8 Dec 2024 18:42:27 +0800
Subject: [PATCH 29/50] Update zodgame.py

---
 zodgame/zodgame.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index 516b5e6..6fdcfdc 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -121,4 +121,4 @@ async def zodgame(cookie_string):
     cookie_string = sys.argv[1]
     assert cookie_string
     
-    nodriver.loop().run_until_complete(zodgame(cookie_string))
+    asyncio.run(zodgame(cookie_string))

From 9d060bfb0180c8732f9cd5351fb2a99b6b33ee2c Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Sun, 8 Dec 2024 18:44:06 +0800
Subject: [PATCH 30/50] Update zodgame.yml

---
 .github/workflows/zodgame.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/zodgame.yml b/.github/workflows/zodgame.yml
index 7d55675..c45236b 100644
--- a/.github/workflows/zodgame.yml
+++ b/.github/workflows/zodgame.yml
@@ -20,6 +20,5 @@ jobs:
         pip3 install -r ./zodgame/requirements.txt
     - name: Run 
       run: |
-        Get-Process chrome | ForEach-Object { $_.Kill() }
         python3 ./zodgame/zodgame.py "${{secrets.ZODGAME_COOKIE}}"
     - uses: gautamkrishnar/keepalive-workflow@master

From 2c1624202ec4ae0d6b1e343f87014094b3544c2e Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Sun, 8 Dec 2024 18:49:37 +0800
Subject: [PATCH 31/50] Update zodgame.py

---
 zodgame/zodgame.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index 6fdcfdc..a1a1ccc 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -1,5 +1,6 @@
 import re
 import sys
+import asyncio
 import nodriver
 from nodriver import cdp
 sys.stdout.reconfigure(encoding='utf-8')

From ad9d5a581018fead9a6167cd8760e9a04e28263a Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Sun, 8 Dec 2024 18:52:19 +0800
Subject: [PATCH 32/50] Update zodgame.py

---
 zodgame/zodgame.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index a1a1ccc..1ae03e9 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -1,8 +1,8 @@
 import re
 import sys
 import asyncio
-import nodriver
-from nodriver import cdp
+import zendriver as zd
+from zendriver import cdp
 sys.stdout.reconfigure(encoding='utf-8')
 
 async def zodgame_checkin(tab):
@@ -89,7 +89,7 @@ async def show_task_reward(broswer):
 
 async def zodgame(cookie_string):
 
-    browser = await nodriver.start(
+    browser = await zd.start(
         headless = False,
         sandbox = False,
         browser_executable_path = """C:\Program Files\Google\Chrome\Application\chrome.exe""",

From 3847cb0b5a6c95a6d722a332f4399ccb70657d96 Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Sun, 8 Dec 2024 18:52:39 +0800
Subject: [PATCH 33/50] Update requirements.txt

---
 zodgame/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zodgame/requirements.txt b/zodgame/requirements.txt
index 819d361..de52f10 100644
--- a/zodgame/requirements.txt
+++ b/zodgame/requirements.txt
@@ -1 +1 @@
-nodriver
+zendriver

From 5c930f5c2fc37a70160891a409e71af9619e3ea8 Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Sun, 8 Dec 2024 18:59:07 +0800
Subject: [PATCH 34/50] Update zodgame.yml

---
 .github/workflows/zodgame.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/zodgame.yml b/.github/workflows/zodgame.yml
index c45236b..d1649aa 100644
--- a/.github/workflows/zodgame.yml
+++ b/.github/workflows/zodgame.yml
@@ -15,6 +15,7 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v3
+    - uses: actions/setup-python@v5
     - name: Install requirements
       run: |
         pip3 install -r ./zodgame/requirements.txt

From dc0cc49f2df0ae22d630d93518c5e32ecfb27bd9 Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Sun, 8 Dec 2024 19:02:37 +0800
Subject: [PATCH 35/50] Update zodgame.yml

---
 .github/workflows/zodgame.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/zodgame.yml b/.github/workflows/zodgame.yml
index d1649aa..afd6eb2 100644
--- a/.github/workflows/zodgame.yml
+++ b/.github/workflows/zodgame.yml
@@ -16,6 +16,8 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-python@v5
+      with:
+        python-version: "3.13"
     - name: Install requirements
       run: |
         pip3 install -r ./zodgame/requirements.txt

From 5b2d0cbcbe6c5e7624c82d728c20be4f15e7e627 Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Sun, 8 Dec 2024 19:07:44 +0800
Subject: [PATCH 36/50] Update zodgame.py

---
 zodgame/zodgame.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index 1ae03e9..3561820 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -92,8 +92,7 @@ async def zodgame(cookie_string):
     browser = await zd.start(
         headless = False,
         sandbox = False,
-        browser_executable_path = """C:\Program Files\Google\Chrome\Application\chrome.exe""",
-        browser_args = ["--no-sandbox"]
+        browser_executable_path = r"C:\Program Files\Google\Chrome\Application\chrome.exe"
     )
     tab = await browser.get('https://zodgame.xyz')
 

From fa8c55af4d7e3e7630c02b01333cfc9b35f39e07 Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Mon, 9 Dec 2024 21:52:43 +0800
Subject: [PATCH 37/50] Update zodgame.yml

---
 .github/workflows/zodgame.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/zodgame.yml b/.github/workflows/zodgame.yml
index afd6eb2..24967f5 100644
--- a/.github/workflows/zodgame.yml
+++ b/.github/workflows/zodgame.yml
@@ -18,10 +18,14 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: "3.13"
+    - name: Create non-root user
+      run: |
+        net user myuser MyPassword123! /add
+        net localgroup Users myuser /add
     - name: Install requirements
       run: |
-        pip3 install -r ./zodgame/requirements.txt
+        runas /user:myuser "pip3 install -r ./zodgame/requirements.txt"
     - name: Run 
       run: |
-        python3 ./zodgame/zodgame.py "${{secrets.ZODGAME_COOKIE}}"
+        runas /user:myuser "python3 ./zodgame/zodgame.py '${{secrets.ZODGAME_COOKIE}}'"
     - uses: gautamkrishnar/keepalive-workflow@master

From 565fea287ccd9b8447342928cd27db3b6e67c495 Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Mon, 9 Dec 2024 21:56:00 +0800
Subject: [PATCH 38/50] Update zodgame.yml

---
 .github/workflows/zodgame.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/zodgame.yml b/.github/workflows/zodgame.yml
index 24967f5..af85720 100644
--- a/.github/workflows/zodgame.yml
+++ b/.github/workflows/zodgame.yml
@@ -18,10 +18,6 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: "3.13"
-    - name: Create non-root user
-      run: |
-        net user myuser MyPassword123! /add
-        net localgroup Users myuser /add
     - name: Install requirements
       run: |
         runas /user:myuser "pip3 install -r ./zodgame/requirements.txt"

From ab2b2ac80dd9ddde7418489d06a28305730d3af8 Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Mon, 9 Dec 2024 22:00:01 +0800
Subject: [PATCH 39/50] Update zodgame.yml

---
 .github/workflows/zodgame.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/zodgame.yml b/.github/workflows/zodgame.yml
index af85720..ab23a32 100644
--- a/.github/workflows/zodgame.yml
+++ b/.github/workflows/zodgame.yml
@@ -18,10 +18,15 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: "3.13"
+  
+    - name: Create non-root user
+      run: |
+        net user tempuser MyPassword123! /add
+        net localgroup Users tempuser /add
     - name: Install requirements
       run: |
-        runas /user:myuser "pip3 install -r ./zodgame/requirements.txt"
+        runas /user:tempuser "pip3 install -r ./zodgame/requirements.txt"
     - name: Run 
       run: |
-        runas /user:myuser "python3 ./zodgame/zodgame.py '${{secrets.ZODGAME_COOKIE}}'"
+        runas /user:tempuser "python3 ./zodgame/zodgame.py '${{secrets.ZODGAME_COOKIE}}'"
     - uses: gautamkrishnar/keepalive-workflow@master

From 9f2dd781441302d1416ed03753e9511c82285c2f Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Mon, 9 Dec 2024 22:02:49 +0800
Subject: [PATCH 40/50] Update zodgame.yml

---
 .github/workflows/zodgame.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/zodgame.yml b/.github/workflows/zodgame.yml
index ab23a32..afd6eb2 100644
--- a/.github/workflows/zodgame.yml
+++ b/.github/workflows/zodgame.yml
@@ -18,15 +18,10 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: "3.13"
-  
-    - name: Create non-root user
-      run: |
-        net user tempuser MyPassword123! /add
-        net localgroup Users tempuser /add
     - name: Install requirements
       run: |
-        runas /user:tempuser "pip3 install -r ./zodgame/requirements.txt"
+        pip3 install -r ./zodgame/requirements.txt
     - name: Run 
       run: |
-        runas /user:tempuser "python3 ./zodgame/zodgame.py '${{secrets.ZODGAME_COOKIE}}'"
+        python3 ./zodgame/zodgame.py "${{secrets.ZODGAME_COOKIE}}"
     - uses: gautamkrishnar/keepalive-workflow@master

From ff5937cb5a8b04f41d0ccace0cb88575445f0baf Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Mon, 9 Dec 2024 22:06:46 +0800
Subject: [PATCH 41/50] Update zodgame.py

---
 zodgame/zodgame.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index 3561820..1ae03e9 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -92,7 +92,8 @@ async def zodgame(cookie_string):
     browser = await zd.start(
         headless = False,
         sandbox = False,
-        browser_executable_path = r"C:\Program Files\Google\Chrome\Application\chrome.exe"
+        browser_executable_path = """C:\Program Files\Google\Chrome\Application\chrome.exe""",
+        browser_args = ["--no-sandbox"]
     )
     tab = await browser.get('https://zodgame.xyz')
 

From 24b027aabe39e1d7bf9d3705b8c3b7a46377434d Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Mon, 9 Dec 2024 22:56:44 +0800
Subject: [PATCH 42/50] Create entry.py

---
 zodgame/entry.py | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 zodgame/entry.py

diff --git a/zodgame/entry.py b/zodgame/entry.py
new file mode 100644
index 0000000..011f61e
--- /dev/null
+++ b/zodgame/entry.py
@@ -0,0 +1,42 @@
+import nodriver as uc
+import os
+import requests
+import json
+import sys
+import random
+from nodriver.core.config import find_chrome_executable
+
+def cmd_start_brower(chrome_path, port, user_data_dir):
+  chrome_path_temp = chrome_path.replace('\chrome.exe', '')
+  start_params = r'cd {} && chrome.exe --remote-debugging-port={} --user-data-dir={} --no-first-run --disable-infobars --allow-file-access-from-files --no-default-browser-check --profile-directory=Profile1'
+  os.popen(start_params.format(chrome_path_temp, port, user_data_dir))
+
+def get_session_url(chrome_path, port, user_data_dir):
+  url = f'http://127.0.0.1:{port}/json/version'
+  try:
+    res = requests.get(url)
+    print(res.text)
+    webSocketDebuggerUrl = json.loads(res.text)['webSocketDebuggerUrl']
+  except Exception as e:
+    print('error:', e)
+    cmd_start_brower(chrome_path, port, user_data_dir)
+    time.sleep(random.randint(4, 6))
+
+async def main1():
+  config = uc.Config()
+  config.host = "127.0.0.1"
+  config.port = 9315
+  config.user_data_dir = user_data_dir
+  driver = await uc.start(config=config)
+  page = await driver.get('https://www.bing.com')
+  get_content = await page.get_content()
+  print(get_content)
+  await page.scroll_down(150)
+
+port = 9315
+chrome_path = find_chrome_executable()
+current_path = os.path.dirname(os.path.realpath(sys.argv[0]))
+user_data_dir = os.path.join(current_path, "pyppeteer_chrome")
+
+get_session_url(chrome_path, port, user_data_dir)
+uc.loop().run_until_complete(main1())

From 34a1c618d7ca71e9f60d29fc7841a442034c8ad9 Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Mon, 9 Dec 2024 22:56:58 +0800
Subject: [PATCH 43/50] Update requirements.txt

---
 zodgame/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zodgame/requirements.txt b/zodgame/requirements.txt
index de52f10..819d361 100644
--- a/zodgame/requirements.txt
+++ b/zodgame/requirements.txt
@@ -1 +1 @@
-zendriver
+nodriver

From f1f211e96b2c4c63553419ca69243bd3b21f4495 Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Mon, 9 Dec 2024 22:57:32 +0800
Subject: [PATCH 44/50] Update zodgame.yml

---
 .github/workflows/zodgame.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/zodgame.yml b/.github/workflows/zodgame.yml
index afd6eb2..1ea6699 100644
--- a/.github/workflows/zodgame.yml
+++ b/.github/workflows/zodgame.yml
@@ -23,5 +23,5 @@ jobs:
         pip3 install -r ./zodgame/requirements.txt
     - name: Run 
       run: |
-        python3 ./zodgame/zodgame.py "${{secrets.ZODGAME_COOKIE}}"
+        python3 ./zodgame/entry.py "${{secrets.ZODGAME_COOKIE}}"
     - uses: gautamkrishnar/keepalive-workflow@master

From f4a66086f1301b46e914dff1e89ee0f3ce4a8f16 Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Mon, 9 Dec 2024 23:00:06 +0800
Subject: [PATCH 45/50] Update requirements.txt

---
 zodgame/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zodgame/requirements.txt b/zodgame/requirements.txt
index 819d361..8ca2da6 100644
--- a/zodgame/requirements.txt
+++ b/zodgame/requirements.txt
@@ -1 +1,2 @@
 nodriver
+requests

From 5776acf2b8a8951911a8d046a45e65e1219d3a94 Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Mon, 9 Dec 2024 23:04:26 +0800
Subject: [PATCH 46/50] Update entry.py

---
 zodgame/entry.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/zodgame/entry.py b/zodgame/entry.py
index 011f61e..0d8697d 100644
--- a/zodgame/entry.py
+++ b/zodgame/entry.py
@@ -4,10 +4,12 @@
 import json
 import sys
 import random
+import time
 from nodriver.core.config import find_chrome_executable
 
 def cmd_start_brower(chrome_path, port, user_data_dir):
-  chrome_path_temp = chrome_path.replace('\chrome.exe', '')
+  chrome_path_temp = chrome_path.replace(r'\chrome.exe', '')
+  print(chrome_path_temp)
   start_params = r'cd {} && chrome.exe --remote-debugging-port={} --user-data-dir={} --no-first-run --disable-infobars --allow-file-access-from-files --no-default-browser-check --profile-directory=Profile1'
   os.popen(start_params.format(chrome_path_temp, port, user_data_dir))
 

From 5563e7e356bddbbc400db84dc724d0b5bee5ed3e Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Mon, 9 Dec 2024 23:09:06 +0800
Subject: [PATCH 47/50] Delete zodgame/entry.py

---
 zodgame/entry.py | 44 --------------------------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 zodgame/entry.py

diff --git a/zodgame/entry.py b/zodgame/entry.py
deleted file mode 100644
index 0d8697d..0000000
--- a/zodgame/entry.py
+++ /dev/null
@@ -1,44 +0,0 @@
-import nodriver as uc
-import os
-import requests
-import json
-import sys
-import random
-import time
-from nodriver.core.config import find_chrome_executable
-
-def cmd_start_brower(chrome_path, port, user_data_dir):
-  chrome_path_temp = chrome_path.replace(r'\chrome.exe', '')
-  print(chrome_path_temp)
-  start_params = r'cd {} && chrome.exe --remote-debugging-port={} --user-data-dir={} --no-first-run --disable-infobars --allow-file-access-from-files --no-default-browser-check --profile-directory=Profile1'
-  os.popen(start_params.format(chrome_path_temp, port, user_data_dir))
-
-def get_session_url(chrome_path, port, user_data_dir):
-  url = f'http://127.0.0.1:{port}/json/version'
-  try:
-    res = requests.get(url)
-    print(res.text)
-    webSocketDebuggerUrl = json.loads(res.text)['webSocketDebuggerUrl']
-  except Exception as e:
-    print('error:', e)
-    cmd_start_brower(chrome_path, port, user_data_dir)
-    time.sleep(random.randint(4, 6))
-
-async def main1():
-  config = uc.Config()
-  config.host = "127.0.0.1"
-  config.port = 9315
-  config.user_data_dir = user_data_dir
-  driver = await uc.start(config=config)
-  page = await driver.get('https://www.bing.com')
-  get_content = await page.get_content()
-  print(get_content)
-  await page.scroll_down(150)
-
-port = 9315
-chrome_path = find_chrome_executable()
-current_path = os.path.dirname(os.path.realpath(sys.argv[0]))
-user_data_dir = os.path.join(current_path, "pyppeteer_chrome")
-
-get_session_url(chrome_path, port, user_data_dir)
-uc.loop().run_until_complete(main1())

From ff7e089d508a6663dc54498f14e1d6a5fc2e4de1 Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Mon, 9 Dec 2024 23:09:23 +0800
Subject: [PATCH 48/50] Update zodgame.yml

---
 .github/workflows/zodgame.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/zodgame.yml b/.github/workflows/zodgame.yml
index 1ea6699..afd6eb2 100644
--- a/.github/workflows/zodgame.yml
+++ b/.github/workflows/zodgame.yml
@@ -23,5 +23,5 @@ jobs:
         pip3 install -r ./zodgame/requirements.txt
     - name: Run 
       run: |
-        python3 ./zodgame/entry.py "${{secrets.ZODGAME_COOKIE}}"
+        python3 ./zodgame/zodgame.py "${{secrets.ZODGAME_COOKIE}}"
     - uses: gautamkrishnar/keepalive-workflow@master

From df63582477e9e6bc3672d741b3c46e9a489a7b91 Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Mon, 9 Dec 2024 23:09:44 +0800
Subject: [PATCH 49/50] Update zodgame.py

---
 zodgame/zodgame.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zodgame/zodgame.py b/zodgame/zodgame.py
index 1ae03e9..a1a1ccc 100644
--- a/zodgame/zodgame.py
+++ b/zodgame/zodgame.py
@@ -1,8 +1,8 @@
 import re
 import sys
 import asyncio
-import zendriver as zd
-from zendriver import cdp
+import nodriver
+from nodriver import cdp
 sys.stdout.reconfigure(encoding='utf-8')
 
 async def zodgame_checkin(tab):
@@ -89,7 +89,7 @@ async def show_task_reward(broswer):
 
 async def zodgame(cookie_string):
 
-    browser = await zd.start(
+    browser = await nodriver.start(
         headless = False,
         sandbox = False,
         browser_executable_path = """C:\Program Files\Google\Chrome\Application\chrome.exe""",

From 1827161b57cc0b157b2656b03a6d2a1e3b1e5dda Mon Sep 17 00:00:00 2001
From: ytai <ytai.chn@outlook.com>
Date: Mon, 9 Dec 2024 23:09:56 +0800
Subject: [PATCH 50/50] Update requirements.txt

---
 zodgame/requirements.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/zodgame/requirements.txt b/zodgame/requirements.txt
index 8ca2da6..819d361 100644
--- a/zodgame/requirements.txt
+++ b/zodgame/requirements.txt
@@ -1,2 +1 @@
 nodriver
-requests