Browse Source

增加cookies

dongzhaorui 2 months ago
parent
commit
8a5b9d3eeb

+ 2 - 2
FworkSpider/feapder/network/downloader/_drissionpage.py

@@ -55,7 +55,7 @@ class DrissionPageDownloader(RenderDownloader):
         try:
         try:
             if cookies:
             if cookies:
                 driver.url = url
                 driver.url = url
-                driver.tab.set.cookies = cookies
+                driver.cookies = cookies
 
 
             retry = setting.DRISSIONPAGE.get("retry")
             retry = setting.DRISSIONPAGE.get("retry")
             interval = setting.DRISSIONPAGE.get("interval")
             interval = setting.DRISSIONPAGE.get("interval")
@@ -66,7 +66,7 @@ class DrissionPageDownloader(RenderDownloader):
             if driver.tab.mode == "s":
             if driver.tab.mode == "s":
                 response = Response(driver.tab.response)
                 response = Response(driver.tab.response)
             else:
             else:
-                cookies = driver.tab.cookies().as_dict()
+                cookies = driver.cookies
                 html = driver.tab.html
                 html = driver.tab.html
                 response = Response.from_dict(
                 response = Response.from_dict(
                     {
                     {

+ 12 - 0
FworkSpider/feapder/utils/webdriver/drissionpage_driver.py

@@ -275,6 +275,18 @@ class DrissionPageDriver(WebDriver):
     def domain(self):
     def domain(self):
         return tools.get_domain(self.url or self.tab.url)
         return tools.get_domain(self.url or self.tab.url)
 
 
+    @property
+    def cookies(self):
+        return self.tab.cookies().as_dict()
+
+    @cookies.setter
+    def cookies(self, val):
+        self.tab.set.cookies(val)
+
+    @property
+    def user_agent(self):
+        return self.tab.run_js("() => navigator.userAgent")
+
     def quit(self):
     def quit(self):
         if self.tab:
         if self.tab:
             self.tab.close()
             self.tab.close()